From f6c57b63843844bdd162d028fe5237406f0df55a Mon Sep 17 00:00:00 2001 From: "Mark D. Roth" Date: Fri, 20 Sep 2024 13:15:58 -0700 Subject: [PATCH 01/75] [reorg] move a bunch of stuff to src/core/util (#36792) The following files have been moved: - src/core/lib/avl/* - src/core/lib/backoff/* - src/core/lib/debug/event_log* - src/core/lib/iomgr/gethostname* - src/core/lib/iomgr/grpc_if_nametoindex* - src/core/lib/matchers/* - src/core/lib/uri/* (renamed from uri_parser.* to uri.*) - src/core/lib/gprpp/* (existing src/core/util/time.cc was renamed to gpr_time.cc to avoid conflict) Closes #36792 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/36792 from markdroth:reorg_util d4e8996f481c611ffbb06a8b04924ff81bc1bc2b PiperOrigin-RevId: 676947640 --- BUILD | 96 +- CMakeLists.txt | 546 +++---- Makefile | 76 +- Package.swift | 190 +-- build_autogenerated.yaml | 1302 ++++++++--------- config.m4 | 83 +- config.w32 | 83 +- examples/cpp/csm/csm_greeter_server.cc | 2 +- .../chttp2/hpack_encoder_timeout_test.cc | 2 +- gRPC-C++.podspec | 228 +-- gRPC-Core.podspec | 304 ++-- grpc.gemspec | 190 +-- include/grpcpp/impl/sync.h | 4 +- package.xml | 190 +-- src/core/BUILD | 164 +-- src/core/channelz/channel_trace.cc | 2 +- src/core/channelz/channel_trace.h | 4 +- src/core/channelz/channelz.cc | 2 +- src/core/channelz/channelz.h | 8 +- src/core/channelz/channelz_registry.cc | 2 +- src/core/channelz/channelz_registry.h | 4 +- src/core/client_channel/backup_poller.cc | 4 +- src/core/client_channel/client_channel.cc | 8 +- src/core/client_channel/client_channel.h | 2 +- .../client_channel/client_channel_factory.h | 2 +- .../client_channel/client_channel_filter.cc | 16 +- .../client_channel/client_channel_filter.h | 12 +- .../client_channel/client_channel_internal.h | 4 +- .../client_channel_service_config.h | 6 +- src/core/client_channel/config_selector.h | 6 +- src/core/client_channel/connector.h | 6 +- src/core/client_channel/direct_channel.cc | 2 +- src/core/client_channel/dynamic_filters.cc | 2 +- src/core/client_channel/dynamic_filters.h | 8 +- .../client_channel/global_subchannel_pool.h | 4 +- .../load_balanced_call_destination.cc | 2 +- .../client_channel/local_subchannel_pool.h | 2 +- src/core/client_channel/retry_filter.cc | 4 +- src/core/client_channel/retry_filter.h | 2 +- .../retry_filter_legacy_call_data.cc | 16 +- .../retry_filter_legacy_call_data.h | 12 +- .../client_channel/retry_service_config.h | 4 +- src/core/client_channel/retry_throttle.h | 6 +- src/core/client_channel/subchannel.cc | 14 +- src/core/client_channel/subchannel.h | 20 +- .../subchannel_interface_internal.h | 2 +- .../subchannel_pool_interface.h | 4 +- .../subchannel_stream_client.cc | 8 +- .../client_channel/subchannel_stream_client.h | 8 +- .../legacy_channel_idle_filter.cc | 12 +- .../channel_idle/legacy_channel_idle_filter.h | 8 +- .../fault_injection/fault_injection_filter.cc | 2 +- .../fault_injection/fault_injection_filter.h | 2 +- .../fault_injection_service_config_parser.h | 4 +- .../gcp_authentication_filter.h | 4 +- ...gcp_authentication_service_config_parser.h | 2 +- .../server_load_reporting_filter.cc | 2 +- .../ext/filters/logging/logging_filter.cc | 6 +- src/core/ext/filters/logging/logging_sink.h | 2 +- .../message_size/message_size_filter.h | 2 +- .../rbac/rbac_service_config_parser.cc | 2 +- .../filters/rbac/rbac_service_config_parser.h | 2 +- .../stateful_session_filter.cc | 4 +- .../stateful_session_filter.h | 4 +- .../stateful_session_service_config_parser.h | 4 +- .../transport/binder/client/channel_create.cc | 2 +- .../binder/client/connection_id_generator.h | 2 +- .../binder/client/endpoint_binder_pool.h | 2 +- .../ext/transport/binder/client/jni_utils.cc | 2 +- .../binder/client/security_policy_setting.h | 2 +- .../security_policy/binder_security_policy.cc | 2 +- .../binder/transport/binder_transport.cc | 2 +- .../binder/transport/binder_transport.h | 2 +- .../ext/transport/binder/utils/ndk_binder.cc | 4 +- .../utils/transport_stream_receiver_impl.cc | 2 +- .../utils/transport_stream_receiver_impl.h | 2 +- .../ext/transport/binder/wire_format/binder.h | 2 +- .../binder/wire_format/binder_android.cc | 4 +- .../binder/wire_format/transaction.h | 2 +- .../binder/wire_format/wire_reader.h | 2 +- .../binder/wire_format/wire_reader_impl.cc | 4 +- .../binder/wire_format/wire_reader_impl.h | 2 +- .../binder/wire_format/wire_writer.cc | 2 +- .../binder/wire_format/wire_writer.h | 2 +- .../client/chaotic_good_connector.cc | 8 +- .../client/chaotic_good_connector.h | 6 +- .../chaotic_good/client_transport.cc | 4 +- .../transport/chaotic_good/client_transport.h | 2 +- src/core/ext/transport/chaotic_good/frame.cc | 6 +- src/core/ext/transport/chaotic_good/frame.h | 2 +- .../ext/transport/chaotic_good/frame_header.h | 2 +- .../server/chaotic_good_server.cc | 10 +- .../chaotic_good/server/chaotic_good_server.h | 4 +- .../chaotic_good/server_transport.cc | 2 +- .../transport/chaotic_good/server_transport.h | 4 +- .../chaotic_good/settings_metadata.cc | 2 +- .../chttp2/client/chttp2_connector.cc | 10 +- .../chttp2/client/chttp2_connector.h | 4 +- .../transport/chttp2/server/chttp2_server.cc | 16 +- .../chttp2/transport/chttp2_transport.cc | 12 +- .../chttp2/transport/chttp2_transport.h | 4 +- .../transport/chttp2/transport/flow_control.h | 2 +- .../ext/transport/chttp2/transport/frame.cc | 2 +- .../transport/chttp2/transport/frame_data.cc | 2 +- .../chttp2/transport/frame_rst_stream.cc | 2 +- .../chttp2/transport/frame_settings.cc | 2 +- .../chttp2/transport/frame_settings.h | 2 +- .../chttp2/transport/hpack_encoder.cc | 2 +- .../chttp2/transport/hpack_encoder.h | 2 +- .../chttp2/transport/hpack_parse_result.cc | 2 +- .../chttp2/transport/hpack_parse_result.h | 6 +- .../chttp2/transport/hpack_parser.cc | 2 +- .../transport/chttp2/transport/hpack_parser.h | 2 +- .../chttp2/transport/hpack_parser_table.h | 2 +- .../ext/transport/chttp2/transport/internal.h | 10 +- .../ext/transport/chttp2/transport/parsing.cc | 6 +- .../chttp2/transport/ping_abuse_policy.h | 2 +- .../chttp2/transport/ping_callbacks.h | 2 +- .../chttp2/transport/ping_rate_policy.cc | 2 +- .../chttp2/transport/ping_rate_policy.h | 2 +- .../chttp2/transport/stream_lists.cc | 2 +- .../chttp2/transport/write_size_policy.h | 2 +- .../ext/transport/chttp2/transport/writing.cc | 10 +- .../client/secure/cronet_channel_create.cc | 2 +- .../cronet/transport/cronet_transport.cc | 6 +- .../ext/transport/inproc/inproc_transport.cc | 4 +- .../inproc/legacy_inproc_transport.cc | 8 +- .../endpoint_info/endpoint_info_handshaker.cc | 4 +- src/core/handshaker/handshaker.cc | 7 +- src/core/handshaker/handshaker.h | 10 +- .../http_connect/http_connect_handshaker.cc | 5 +- .../http_connect/http_proxy_mapper.cc | 8 +- .../handshaker/security/secure_endpoint.cc | 8 +- .../handshaker/security/secure_endpoint.h | 2 +- .../security/security_handshaker.cc | 8 +- .../handshaker/security/security_handshaker.h | 2 +- .../tcp_connect/tcp_connect_handshaker.cc | 8 +- src/core/lib/address_utils/parse_address.cc | 6 +- src/core/lib/address_utils/parse_address.h | 2 +- src/core/lib/address_utils/sockaddr_utils.cc | 6 +- src/core/lib/channel/channel_args.h | 14 +- src/core/lib/channel/channel_stack.h | 8 +- src/core/lib/channel/channel_stack_builder.h | 2 +- .../lib/channel/channel_stack_builder_impl.cc | 4 +- .../lib/channel/channel_stack_builder_impl.h | 2 +- src/core/lib/channel/connected_channel.cc | 8 +- src/core/lib/channel/promise_based_filter.cc | 6 +- src/core/lib/channel/promise_based_filter.h | 6 +- .../lib/compression/compression_internal.cc | 6 +- .../lib/compression/compression_internal.h | 2 +- src/core/lib/config/load_config.cc | 2 +- src/core/lib/debug/trace.cc | 2 +- src/core/lib/debug/trace_flags.cc | 2 +- src/core/lib/event_engine/ares_resolver.cc | 8 +- src/core/lib/event_engine/ares_resolver.h | 4 +- .../lib/event_engine/cf_engine/cf_engine.cc | 2 +- .../lib/event_engine/cf_engine/cf_engine.h | 2 +- .../cf_engine/cfstream_endpoint.cc | 2 +- .../cf_engine/cfstream_endpoint.h | 6 +- .../cf_engine/dns_service_resolver.cc | 2 +- .../cf_engine/dns_service_resolver.h | 4 +- .../lib/event_engine/default_event_engine.cc | 6 +- .../lib/event_engine/default_event_engine.h | 2 +- src/core/lib/event_engine/grpc_polled_fd.h | 2 +- .../posix_engine/ev_epoll1_linux.cc | 10 +- .../posix_engine/ev_epoll1_linux.h | 2 +- .../posix_engine/ev_poll_posix.cc | 14 +- .../event_engine/posix_engine/ev_poll_posix.h | 2 +- .../event_poller_posix_default.cc | 2 +- .../posix_engine/grpc_polled_fd_posix.h | 2 +- .../posix_engine/internal_errqueue.cc | 2 +- .../posix_engine/lockfree_event.cc | 4 +- .../posix_engine/native_posix_dns_resolver.cc | 2 +- .../posix_engine/posix_endpoint.cc | 14 +- .../posix_engine/posix_endpoint.h | 6 +- .../event_engine/posix_engine/posix_engine.cc | 6 +- .../event_engine/posix_engine/posix_engine.h | 4 +- .../posix_engine/posix_engine_listener.cc | 6 +- .../posix_engine/posix_engine_listener.h | 4 +- .../posix_engine_listener_utils.cc | 4 +- .../posix_engine/tcp_socket_utils.cc | 8 +- .../posix_engine/tcp_socket_utils.h | 2 +- .../lib/event_engine/posix_engine/timer.cc | 2 +- .../lib/event_engine/posix_engine/timer.h | 6 +- .../event_engine/posix_engine/timer_manager.h | 6 +- .../posix_engine/traced_buffer_list.cc | 4 +- .../posix_engine/traced_buffer_list.h | 2 +- .../posix_engine/wakeup_fd_eventfd.cc | 6 +- .../posix_engine/wakeup_fd_pipe.cc | 4 +- .../ref_counted_dns_resolver_interface.h | 2 +- src/core/lib/event_engine/tcp_socket_utils.cc | 6 +- .../event_engine/thread_pool/thread_count.cc | 2 +- .../event_engine/thread_pool/thread_count.h | 4 +- .../thread_pool/thread_pool_factory.cc | 2 +- .../thread_pool/work_stealing_thread_pool.cc | 12 +- .../thread_pool/work_stealing_thread_pool.h | 8 +- .../thready_event_engine.cc | 6 +- src/core/lib/event_engine/utils.cc | 2 +- src/core/lib/event_engine/utils.h | 2 +- .../windows/grpc_polled_fd_windows.cc | 4 +- .../windows/grpc_polled_fd_windows.h | 2 +- src/core/lib/event_engine/windows/iocp.cc | 2 +- .../windows/native_windows_dns_resolver.cc | 4 +- .../lib/event_engine/windows/win_socket.cc | 4 +- .../lib/event_engine/windows/win_socket.h | 4 +- .../event_engine/windows/windows_endpoint.cc | 4 +- .../event_engine/windows/windows_engine.cc | 8 +- .../lib/event_engine/windows/windows_engine.h | 4 +- .../event_engine/windows/windows_listener.cc | 4 +- .../event_engine/windows/windows_listener.h | 2 +- .../work_queue/basic_work_queue.cc | 2 +- .../work_queue/basic_work_queue.h | 2 +- src/core/lib/experiments/config.cc | 4 +- src/core/lib/gprpp/.clang-format | 50 - src/core/lib/gprpp/README.md | 8 - src/core/lib/gprpp/time.cc | 241 --- src/core/lib/iomgr/buffer_list.cc | 4 +- src/core/lib/iomgr/buffer_list.h | 2 +- src/core/lib/iomgr/call_combiner.cc | 2 +- src/core/lib/iomgr/call_combiner.h | 6 +- src/core/lib/iomgr/cfstream_handle.cc | 2 +- src/core/lib/iomgr/cfstream_handle.h | 2 +- src/core/lib/iomgr/closure.h | 8 +- src/core/lib/iomgr/combiner.cc | 4 +- src/core/lib/iomgr/endpoint_pair_posix.cc | 2 +- src/core/lib/iomgr/endpoint_pair_windows.cc | 2 +- src/core/lib/iomgr/error.cc | 4 +- src/core/lib/iomgr/error.h | 4 +- src/core/lib/iomgr/ev_apple.cc | 4 +- src/core/lib/iomgr/ev_epoll1_linux.cc | 6 +- src/core/lib/iomgr/ev_poll_posix.cc | 4 +- src/core/lib/iomgr/ev_posix.cc | 2 +- .../lib/iomgr/event_engine_shims/endpoint.cc | 6 +- src/core/lib/iomgr/exec_ctx.cc | 2 +- src/core/lib/iomgr/exec_ctx.h | 7 +- src/core/lib/iomgr/executor.cc | 4 +- src/core/lib/iomgr/executor.h | 2 +- src/core/lib/iomgr/fork_posix.cc | 6 +- src/core/lib/iomgr/internal_errqueue.cc | 2 +- src/core/lib/iomgr/iocp_windows.cc | 4 +- src/core/lib/iomgr/iomgr.cc | 4 +- src/core/lib/iomgr/iomgr_windows.cc | 2 +- src/core/lib/iomgr/lockfree_event.cc | 2 +- src/core/lib/iomgr/polling_entity.cc | 2 +- src/core/lib/iomgr/pollset_windows.cc | 4 +- src/core/lib/iomgr/resolve_address.cc | 4 +- src/core/lib/iomgr/resolve_address.h | 4 +- src/core/lib/iomgr/resolve_address_posix.cc | 6 +- src/core/lib/iomgr/resolve_address_windows.cc | 6 +- src/core/lib/iomgr/sockaddr_utils_posix.cc | 2 +- src/core/lib/iomgr/socket_mutator.cc | 2 +- .../lib/iomgr/socket_utils_common_posix.cc | 4 +- src/core/lib/iomgr/socket_utils_linux.cc | 2 +- src/core/lib/iomgr/socket_utils_posix.cc | 4 +- src/core/lib/iomgr/socket_utils_windows.cc | 2 +- src/core/lib/iomgr/socket_windows.cc | 2 +- src/core/lib/iomgr/tcp_client_cfstream.cc | 4 +- src/core/lib/iomgr/tcp_client_posix.cc | 2 +- src/core/lib/iomgr/tcp_client_windows.cc | 2 +- src/core/lib/iomgr/tcp_posix.cc | 10 +- src/core/lib/iomgr/tcp_server_posix.cc | 2 +- .../iomgr/tcp_server_utils_posix_common.cc | 2 +- .../iomgr/tcp_server_utils_posix_ifaddrs.cc | 2 +- src/core/lib/iomgr/tcp_server_windows.cc | 2 +- src/core/lib/iomgr/tcp_windows.cc | 2 +- src/core/lib/iomgr/timer_generic.cc | 8 +- src/core/lib/iomgr/timer_manager.cc | 4 +- src/core/lib/iomgr/unix_sockets_posix.cc | 2 +- src/core/lib/iomgr/unix_sockets_posix_noop.cc | 2 - src/core/lib/iomgr/vsock.cc | 2 +- src/core/lib/iomgr/wakeup_fd_eventfd.cc | 4 +- src/core/lib/iomgr/wakeup_fd_pipe.cc | 4 +- src/core/lib/promise/activity.cc | 2 +- src/core/lib/promise/activity.h | 10 +- src/core/lib/promise/arena_promise.h | 2 +- src/core/lib/promise/context.h | 2 +- src/core/lib/promise/detail/basic_seq.h | 2 +- src/core/lib/promise/detail/join_state.h | 4 +- src/core/lib/promise/detail/seq_state.h | 4 +- .../lib/promise/exec_ctx_wakeup_scheduler.h | 2 +- src/core/lib/promise/for_each.h | 2 +- src/core/lib/promise/if.h | 2 +- src/core/lib/promise/inter_activity_latch.h | 2 +- src/core/lib/promise/inter_activity_pipe.h | 6 +- src/core/lib/promise/interceptor_list.h | 4 +- src/core/lib/promise/loop.h | 2 +- src/core/lib/promise/mpsc.h | 6 +- src/core/lib/promise/observable.h | 2 +- src/core/lib/promise/party.cc | 4 +- src/core/lib/promise/party.h | 10 +- src/core/lib/promise/pipe.h | 4 +- src/core/lib/promise/poll.h | 2 +- src/core/lib/promise/seq.h | 2 +- src/core/lib/promise/sleep.cc | 2 +- src/core/lib/promise/sleep.h | 2 +- src/core/lib/promise/wait_for_callback.h | 2 +- src/core/lib/resource_quota/api.cc | 2 +- src/core/lib/resource_quota/arena.h | 2 +- .../lib/resource_quota/connection_quota.h | 6 +- src/core/lib/resource_quota/memory_quota.cc | 2 +- src/core/lib/resource_quota/memory_quota.h | 8 +- src/core/lib/resource_quota/periodic_update.h | 2 +- src/core/lib/resource_quota/resource_quota.h | 6 +- src/core/lib/resource_quota/thread_quota.h | 6 +- .../security/authorization/audit_logging.cc | 2 +- .../security/authorization/audit_logging.h | 2 +- .../authorization/authorization_engine.h | 2 +- .../authorization_policy_provider.h | 4 +- .../authorization_policy_provider_vtable.cc | 2 +- .../security/authorization/evaluate_args.cc | 4 +- .../grpc_authorization_policy_provider.cc | 4 +- .../grpc_authorization_policy_provider.h | 6 +- .../authorization/grpc_server_authz_filter.h | 2 +- .../lib/security/authorization/matchers.h | 2 +- .../lib/security/authorization/rbac_policy.h | 2 +- .../security/authorization/rbac_translator.cc | 2 +- .../certificate_provider_factory.h | 6 +- .../lib/security/context/security_context.cc | 2 +- .../lib/security/context/security_context.h | 6 +- .../credentials/alts/alts_credentials.h | 4 +- .../alts/check_gcp_environment_no_op.cc | 2 +- .../alts/check_gcp_environment_windows.cc | 2 +- .../security/credentials/call_creds_util.cc | 2 +- .../credentials/channel_creds_registry.h | 6 +- .../channel_creds_registry_init.cc | 6 +- .../composite/composite_credentials.cc | 2 +- .../composite/composite_credentials.h | 4 +- .../lib/security/credentials/credentials.cc | 1 - .../lib/security/credentials/credentials.h | 8 +- .../aws_external_account_credentials.cc | 4 +- .../aws_external_account_credentials.h | 4 +- .../credentials/external/aws_request_signer.h | 2 +- .../external/external_account_credentials.cc | 4 +- .../external/external_account_credentials.h | 6 +- .../file_external_account_credentials.cc | 2 +- .../file_external_account_credentials.h | 2 +- .../url_external_account_credentials.h | 6 +- .../credentials/fake/fake_credentials.cc | 2 +- .../credentials/fake/fake_credentials.h | 4 +- ...cp_service_account_identity_credentials.cc | 6 +- ...gcp_service_account_identity_credentials.h | 8 +- .../google_default/credentials_generic.cc | 2 +- .../google_default_credentials.cc | 16 +- .../google_default_credentials.h | 4 +- .../credentials/iam/iam_credentials.cc | 2 +- .../credentials/iam/iam_credentials.h | 2 +- .../insecure/insecure_credentials.h | 4 +- .../credentials/jwt/jwt_credentials.cc | 4 +- .../credentials/jwt/jwt_credentials.h | 4 +- .../security/credentials/jwt/jwt_verifier.cc | 8 +- .../security/credentials/jwt/jwt_verifier.h | 2 +- .../credentials/local/local_credentials.h | 4 +- .../credentials/oauth2/oauth2_credentials.cc | 10 +- .../credentials/oauth2/oauth2_credentials.h | 12 +- .../credentials/plugin/plugin_credentials.h | 6 +- .../credentials/ssl/ssl_credentials.h | 4 +- .../tls/grpc_tls_certificate_distributor.h | 4 +- .../tls/grpc_tls_certificate_provider.cc | 6 +- .../tls/grpc_tls_certificate_provider.h | 10 +- .../tls/grpc_tls_certificate_verifier.cc | 2 +- .../tls/grpc_tls_certificate_verifier.h | 6 +- .../tls/grpc_tls_credentials_options.cc | 2 +- .../tls/grpc_tls_credentials_options.h | 2 +- .../credentials/tls/grpc_tls_crl_provider.cc | 4 +- .../credentials/tls/grpc_tls_crl_provider.h | 6 +- .../credentials/tls/tls_credentials.h | 4 +- .../token_fetcher/token_fetcher_credentials.h | 12 +- .../credentials/xds/xds_credentials.h | 6 +- .../alts/alts_security_connector.cc | 4 +- .../alts/alts_security_connector.h | 2 +- .../fake/fake_security_connector.cc | 8 +- .../fake/fake_security_connector.h | 2 +- .../insecure/insecure_security_connector.cc | 4 +- .../insecure/insecure_security_connector.h | 2 +- .../load_system_roots_supported.cc | 2 +- .../local/local_security_connector.cc | 6 +- .../local/local_security_connector.h | 2 +- .../security_connector/security_connector.cc | 2 +- .../security_connector/security_connector.h | 6 +- .../ssl/ssl_security_connector.cc | 8 +- .../ssl/ssl_security_connector.h | 2 +- .../security/security_connector/ssl_utils.cc | 6 +- .../security/security_connector/ssl_utils.h | 2 +- .../tls/tls_security_connector.cc | 6 +- .../tls/tls_security_connector.h | 4 +- .../lib/security/transport/auth_filters.h | 2 +- .../security/transport/client_auth_filter.cc | 4 +- .../security/transport/server_auth_filter.cc | 6 +- src/core/lib/slice/percent_encoding.cc | 2 +- src/core/lib/slice/slice.cc | 2 +- src/core/lib/slice/slice.h | 2 +- src/core/lib/slice/slice_internal.h | 2 +- src/core/lib/slice/slice_refcount.h | 2 +- src/core/lib/surface/call.cc | 18 +- src/core/lib/surface/call.h | 4 +- src/core/lib/surface/call_utils.cc | 6 +- src/core/lib/surface/call_utils.h | 2 +- src/core/lib/surface/channel.h | 10 +- src/core/lib/surface/channel_init.cc | 6 +- src/core/lib/surface/channel_init.h | 4 +- src/core/lib/surface/client_call.cc | 8 +- src/core/lib/surface/client_call.h | 8 +- src/core/lib/surface/completion_queue.cc | 10 +- src/core/lib/surface/completion_queue.h | 4 +- src/core/lib/surface/filter_stack_call.cc | 10 +- src/core/lib/surface/filter_stack_call.h | 4 +- src/core/lib/surface/init.cc | 6 +- src/core/lib/surface/lame_client.cc | 8 +- src/core/lib/surface/lame_client.h | 2 +- src/core/lib/surface/legacy_channel.cc | 10 +- src/core/lib/surface/legacy_channel.h | 4 +- src/core/lib/surface/server_call.cc | 2 +- src/core/lib/surface/server_call.h | 6 +- src/core/lib/surface/validate_metadata.cc | 2 +- src/core/lib/transport/bdp_estimator.h | 2 +- src/core/lib/transport/call_arena_allocator.h | 2 +- src/core/lib/transport/call_destination.h | 2 +- src/core/lib/transport/call_filters.cc | 2 +- src/core/lib/transport/call_filters.h | 6 +- src/core/lib/transport/call_spine.h | 2 +- src/core/lib/transport/call_state.h | 2 +- src/core/lib/transport/connectivity_state.cc | 4 +- src/core/lib/transport/connectivity_state.h | 4 +- src/core/lib/transport/error_utils.cc | 2 +- src/core/lib/transport/error_utils.h | 2 +- src/core/lib/transport/interception_chain.cc | 2 +- src/core/lib/transport/interception_chain.h | 2 +- src/core/lib/transport/metadata_batch.h | 10 +- src/core/lib/transport/parsed_metadata.h | 2 +- src/core/lib/transport/promise_endpoint.cc | 2 +- src/core/lib/transport/promise_endpoint.h | 2 +- src/core/lib/transport/status_conversion.h | 2 +- src/core/lib/transport/timeout_encoding.h | 2 +- src/core/lib/transport/transport.cc | 2 +- src/core/lib/transport/transport.h | 4 +- src/core/lib/transport/transport_op_string.cc | 4 +- src/core/load_balancing/address_filtering.cc | 2 +- src/core/load_balancing/address_filtering.h | 4 +- .../load_balancing/child_policy_handler.cc | 2 +- .../load_balancing/child_policy_handler.h | 4 +- src/core/load_balancing/delegating_helper.h | 4 +- src/core/load_balancing/endpoint_list.cc | 6 +- src/core/load_balancing/endpoint_list.h | 8 +- .../grpclb/client_load_reporting_filter.cc | 2 +- src/core/load_balancing/grpclb/grpclb.cc | 20 +- .../grpclb/grpclb_client_stats.cc | 2 +- .../grpclb/grpclb_client_stats.h | 6 +- .../grpclb/load_balancer_api.cc | 2 +- .../load_balancing/grpclb/load_balancer_api.h | 2 +- .../load_balancing/health_check_client.cc | 10 +- src/core/load_balancing/health_check_client.h | 2 +- .../health_check_client_internal.h | 10 +- src/core/load_balancing/lb_policy.h | 14 +- src/core/load_balancing/lb_policy_factory.h | 4 +- src/core/load_balancing/lb_policy_registry.h | 4 +- src/core/load_balancing/oob_backend_metric.cc | 12 +- src/core/load_balancing/oob_backend_metric.h | 2 +- .../oob_backend_metric_internal.h | 10 +- .../outlier_detection/outlier_detection.cc | 16 +- .../outlier_detection/outlier_detection.h | 4 +- .../load_balancing/pick_first/pick_first.cc | 12 +- src/core/load_balancing/priority/priority.cc | 14 +- .../load_balancing/ring_hash/ring_hash.cc | 16 +- src/core/load_balancing/ring_hash/ring_hash.h | 4 +- src/core/load_balancing/rls/rls.cc | 24 +- .../load_balancing/round_robin/round_robin.cc | 8 +- .../load_balancing/subchannel_interface.h | 4 +- .../weighted_round_robin.cc | 16 +- .../weighted_target/weighted_target.cc | 14 +- src/core/load_balancing/xds/cds.cc | 16 +- .../load_balancing/xds/xds_cluster_impl.cc | 16 +- .../load_balancing/xds/xds_cluster_manager.cc | 12 +- .../load_balancing/xds/xds_override_host.cc | 16 +- .../load_balancing/xds/xds_override_host.h | 4 +- .../load_balancing/xds/xds_wrr_locality.cc | 10 +- src/core/resolver/binder/binder_resolver.cc | 6 +- .../resolver/dns/c_ares/dns_resolver_ares.cc | 16 +- .../resolver/dns/c_ares/grpc_ares_ev_driver.h | 2 +- .../dns/c_ares/grpc_ares_ev_driver_posix.cc | 2 +- .../dns/c_ares/grpc_ares_ev_driver_windows.cc | 4 +- .../resolver/dns/c_ares/grpc_ares_wrapper.cc | 8 +- .../resolver/dns/c_ares/grpc_ares_wrapper.h | 2 +- src/core/resolver/dns/dns_resolver_plugin.cc | 2 +- .../event_engine_client_channel_resolver.cc | 12 +- .../event_engine_client_channel_resolver.h | 4 +- .../dns/event_engine/service_config_helper.cc | 4 +- src/core/resolver/dns/native/dns_resolver.cc | 12 +- src/core/resolver/fake/fake_resolver.cc | 8 +- src/core/resolver/fake/fake_resolver.h | 8 +- .../google_c2p/google_c2p_resolver.cc | 14 +- src/core/resolver/polling_resolver.cc | 10 +- src/core/resolver/polling_resolver.h | 8 +- src/core/resolver/resolver.h | 4 +- src/core/resolver/resolver_factory.h | 4 +- src/core/resolver/resolver_registry.h | 4 +- .../resolver/sockaddr/sockaddr_resolver.cc | 4 +- src/core/resolver/xds/xds_config.cc | 2 +- src/core/resolver/xds/xds_config.h | 2 +- .../resolver/xds/xds_dependency_manager.cc | 4 +- .../resolver/xds/xds_dependency_manager.h | 2 +- src/core/resolver/xds/xds_resolver.cc | 20 +- .../resolver/xds/xds_resolver_attributes.h | 2 +- src/core/server/server.cc | 10 +- src/core/server/server.h | 14 +- src/core/server/server_config_selector.h | 6 +- .../server/server_config_selector_filter.cc | 6 +- src/core/server/xds_channel_stack_modifier.h | 4 +- src/core/server/xds_server_config_fetcher.cc | 14 +- src/core/service_config/service_config.h | 2 +- .../service_config/service_config_call_data.h | 8 +- .../service_config_channel_arg_filter.cc | 2 +- .../service_config/service_config_impl.cc | 4 +- src/core/service_config/service_config_impl.h | 4 +- .../service_config/service_config_parser.h | 2 +- src/core/telemetry/call_tracer.h | 2 +- src/core/telemetry/metrics.cc | 2 +- src/core/telemetry/metrics.h | 6 +- src/core/telemetry/stats.h | 2 +- src/core/telemetry/stats_data.h | 2 +- .../frame_protector/alts_frame_protector.cc | 2 +- .../tsi/alts/frame_protector/frame_handler.cc | 4 +- .../alts/handshaker/alts_handshaker_client.cc | 6 +- .../alts/handshaker/alts_shared_resource.cc | 2 +- .../alts/handshaker/alts_shared_resource.h | 2 +- .../alts/handshaker/alts_tsi_handshaker.cc | 4 +- .../transport_security_common_api.h | 2 +- ...lts_grpc_integrity_only_record_protocol.cc | 2 +- ..._grpc_privacy_integrity_record_protocol.cc | 2 +- .../alts_grpc_record_protocol_common.cc | 2 +- .../alts_iovec_record_protocol.cc | 2 +- src/core/tsi/fake_transport_security.cc | 5 +- src/core/tsi/local_transport_security.cc | 2 +- .../tsi/ssl/key_logging/ssl_key_logging.cc | 4 +- .../tsi/ssl/key_logging/ssl_key_logging.h | 6 +- src/core/tsi/ssl/session_cache/ssl_session.h | 2 +- .../ssl/session_cache/ssl_session_cache.cc | 4 +- .../tsi/ssl/session_cache/ssl_session_cache.h | 8 +- .../ssl/session_cache/ssl_session_openssl.cc | 2 +- src/core/tsi/ssl_transport_security.cc | 2 +- src/core/util/README.md | 11 +- src/core/util/alloc.cc | 2 +- src/core/{lib/gprpp => util}/atomic_utils.h | 10 +- src/core/{lib/avl => util}/avl.h | 14 +- src/core/{lib/backoff => util}/backoff.cc | 4 +- src/core/{lib/backoff => util}/backoff.h | 8 +- src/core/{lib/gprpp => util}/bitset.h | 10 +- src/core/{lib/gprpp => util}/chunked_vector.h | 12 +- .../{lib/gprpp => util}/construct_destruct.h | 10 +- src/core/{lib/gprpp => util}/cpp_impl_of.h | 6 +- src/core/{lib/gprpp => util}/crash.cc | 6 +- src/core/{lib/gprpp => util}/crash.h | 12 +- src/core/{lib/gprpp => util}/debug_location.h | 10 +- .../{lib/gprpp => util}/directory_reader.h | 10 +- src/core/{lib/gprpp => util}/down_cast.h | 10 +- .../{lib/gprpp => util}/dual_ref_counted.h | 20 +- src/core/{lib/gprpp => util}/dump_args.cc | 2 +- src/core/{lib/gprpp => util}/dump_args.h | 6 +- src/core/{lib/gprpp => util}/env.h | 10 +- src/core/{lib/debug => util}/event_log.cc | 6 +- src/core/{lib/debug => util}/event_log.h | 14 +- src/core/{lib/gprpp => util}/examine_stack.cc | 4 +- src/core/{lib/gprpp => util}/examine_stack.h | 10 +- src/core/{lib/gprpp => util}/fork.cc | 7 +- src/core/{lib/gprpp => util}/fork.h | 10 +- src/core/util/gcp_metadata_query.cc | 8 +- src/core/util/gcp_metadata_query.h | 4 +- src/core/{lib/iomgr => util}/gethostname.h | 6 +- .../iomgr => util}/gethostname_fallback.cc | 2 +- .../gethostname_host_name_max.cc | 2 +- .../iomgr => util}/gethostname_sysconf.cc | 2 +- src/core/{lib/gprpp => util}/glob.cc | 0 src/core/{lib/gprpp => util}/glob.h | 6 +- src/core/util/gpr_time.cc | 271 ++++ .../{lib/iomgr => util}/grpc_if_nametoindex.h | 10 +- .../grpc_if_nametoindex_posix.cc | 4 +- .../grpc_if_nametoindex_unsupported.cc | 4 +- src/core/{lib/gprpp => util}/host_port.cc | 6 +- src/core/{lib/gprpp => util}/host_port.h | 10 +- src/core/util/http_client/httpcli.cc | 2 +- src/core/util/http_client/httpcli.h | 12 +- .../http_client/httpcli_security_connector.cc | 6 +- .../http_client/httpcli_ssl_credentials.h | 2 +- src/core/{lib/gprpp => util}/if_list.h | 6 +- src/core/util/json/json_object_loader.h | 8 +- src/core/util/json/json_reader.cc | 2 +- src/core/util/json/json_util.cc | 4 +- src/core/util/json/json_util.h | 2 +- src/core/util/latent_see.cc | 2 +- src/core/util/latent_see.h | 4 +- src/core/util/linux/cpu.cc | 4 +- src/core/{lib/gprpp => util}/linux/env.cc | 6 +- src/core/{lib/gprpp => util}/load_file.cc | 5 +- src/core/{lib/gprpp => util}/load_file.h | 10 +- src/core/util/log.cc | 2 +- .../{lib/gprpp => util}/manual_constructor.h | 12 +- src/core/{lib/gprpp => util}/match.h | 12 +- src/core/{lib/matchers => util}/matchers.cc | 6 +- src/core/{lib/matchers => util}/matchers.h | 10 +- src/core/{lib/gprpp => util}/memory.h | 9 +- src/core/{lib/gprpp => util}/mpscq.cc | 4 +- src/core/{lib/gprpp => util}/mpscq.h | 12 +- src/core/util/msys/tmpfile.cc | 2 +- src/core/{lib/gprpp => util}/no_destruct.h | 12 +- src/core/{lib/gprpp => util}/notification.h | 12 +- src/core/{lib/gprpp => util}/orphanable.h | 18 +- src/core/{lib/gprpp => util}/overload.h | 10 +- src/core/{lib/gprpp => util}/packed_table.h | 10 +- src/core/{lib/gprpp => util}/per_cpu.cc | 5 +- src/core/{lib/gprpp => util}/per_cpu.h | 9 +- src/core/util/posix/cpu.cc | 2 +- .../gprpp => util}/posix/directory_reader.cc | 6 +- src/core/{lib/gprpp => util}/posix/env.cc | 2 +- src/core/{lib/gprpp => util}/posix/stat.cc | 8 +- src/core/util/posix/sync.cc | 2 +- src/core/{lib/gprpp => util}/posix/thd.cc | 12 +- src/core/util/posix/time.cc | 6 +- src/core/util/posix/tmpfile.cc | 4 +- .../random_early_detection.cc | 6 +- .../backoff => util}/random_early_detection.h | 10 +- src/core/{lib/gprpp => util}/ref_counted.h | 18 +- .../{lib/gprpp => util}/ref_counted_ptr.h | 14 +- .../{lib/gprpp => util}/ref_counted_string.cc | 5 +- .../{lib/gprpp => util}/ref_counted_string.h | 14 +- src/core/{lib/gprpp => util}/single_set_ptr.h | 10 +- src/core/{lib/gprpp => util}/sorted_pack.h | 12 +- src/core/{lib/gprpp => util}/stat.h | 10 +- src/core/{lib/gprpp => util}/status_helper.cc | 6 +- src/core/{lib/gprpp => util}/status_helper.h | 12 +- src/core/{lib/gprpp => util}/strerror.cc | 6 +- src/core/{lib/gprpp => util}/strerror.h | 10 +- src/core/util/string.cc | 2 +- src/core/util/subprocess_posix.cc | 4 +- src/core/util/subprocess_windows.cc | 4 +- src/core/{lib/gprpp => util}/sync.h | 11 +- src/core/util/sync_abseil.cc | 4 +- src/core/{lib/gprpp => util}/table.h | 12 +- src/core/{lib/gprpp => util}/tchar.cc | 4 +- src/core/{lib/gprpp => util}/tchar.h | 6 +- src/core/{lib/gprpp => util}/thd.h | 9 +- src/core/util/time.cc | 380 +++-- src/core/{lib/gprpp => util}/time.h | 9 +- .../gprpp => util}/time_averaged_stats.cc | 4 +- .../{lib/gprpp => util}/time_averaged_stats.h | 6 +- src/core/util/time_precise.cc | 2 +- src/core/{lib/gprpp => util}/time_util.cc | 5 +- src/core/{lib/gprpp => util}/time_util.h | 9 +- src/core/{lib/gprpp => util}/type_list.h | 6 +- .../{lib/gprpp => util}/unique_type_name.h | 10 +- .../{lib/uri/uri_parser.cc => util/uri.cc} | 6 +- src/core/{lib/uri/uri_parser.h => util/uri.h} | 10 +- src/core/{lib/gprpp => util}/uuid_v4.cc | 6 +- src/core/{lib/gprpp => util}/uuid_v4.h | 10 +- .../{lib/gprpp => util}/validation_errors.cc | 6 +- .../{lib/gprpp => util}/validation_errors.h | 10 +- src/core/util/windows/cpu.cc | 2 +- .../windows/directory_reader.cc | 3 +- src/core/{lib/gprpp => util}/windows/env.cc | 4 +- src/core/{lib/gprpp => util}/windows/stat.cc | 6 +- src/core/util/windows/string_util.cc | 2 +- src/core/util/windows/sync.cc | 2 +- src/core/{lib/gprpp => util}/windows/thd.cc | 6 +- src/core/util/windows/time.cc | 2 +- src/core/util/windows/tmpfile.cc | 4 +- .../{lib/gprpp => util}/work_serializer.cc | 13 +- .../{lib/gprpp => util}/work_serializer.h | 13 +- src/core/{lib/gprpp => util}/xxhash_inline.h | 6 +- .../xds/grpc/certificate_provider_store.h | 10 +- ...ile_watcher_certificate_provider_factory.h | 6 +- .../xds/grpc/xds_audit_logger_registry.cc | 4 +- src/core/xds/grpc/xds_audit_logger_registry.h | 2 +- src/core/xds/grpc/xds_bootstrap_grpc.cc | 3 +- src/core/xds/grpc/xds_bootstrap_grpc.h | 3 +- src/core/xds/grpc/xds_certificate_provider.h | 8 +- src/core/xds/grpc/xds_client_grpc.cc | 14 +- src/core/xds/grpc/xds_client_grpc.h | 4 +- src/core/xds/grpc/xds_cluster.cc | 4 +- src/core/xds/grpc/xds_cluster_parser.cc | 6 +- .../xds/grpc/xds_cluster_specifier_plugin.h | 2 +- src/core/xds/grpc/xds_common_types.cc | 2 +- src/core/xds/grpc/xds_common_types.h | 4 +- src/core/xds/grpc/xds_common_types_parser.cc | 2 +- src/core/xds/grpc/xds_common_types_parser.h | 4 +- src/core/xds/grpc/xds_endpoint.h | 6 +- src/core/xds/grpc/xds_endpoint_parser.cc | 4 +- src/core/xds/grpc/xds_http_fault_filter.cc | 4 +- src/core/xds/grpc/xds_http_fault_filter.h | 2 +- src/core/xds/grpc/xds_http_filter.h | 2 +- src/core/xds/grpc/xds_http_filter_registry.h | 2 +- .../xds/grpc/xds_http_gcp_authn_filter.cc | 2 +- src/core/xds/grpc/xds_http_gcp_authn_filter.h | 2 +- src/core/xds/grpc/xds_http_rbac_filter.cc | 2 +- src/core/xds/grpc/xds_http_rbac_filter.h | 2 +- .../grpc/xds_http_stateful_session_filter.cc | 4 +- .../grpc/xds_http_stateful_session_filter.h | 2 +- src/core/xds/grpc/xds_lb_policy_registry.cc | 4 +- src/core/xds/grpc/xds_lb_policy_registry.h | 2 +- src/core/xds/grpc/xds_listener.cc | 2 +- src/core/xds/grpc/xds_listener.h | 2 +- src/core/xds/grpc/xds_listener_parser.cc | 7 +- src/core/xds/grpc/xds_metadata.h | 4 +- src/core/xds/grpc/xds_metadata_parser.cc | 4 +- src/core/xds/grpc/xds_metadata_parser.h | 2 +- src/core/xds/grpc/xds_route_config.cc | 4 +- src/core/xds/grpc/xds_route_config.h | 4 +- src/core/xds/grpc/xds_route_config_parser.cc | 10 +- src/core/xds/grpc/xds_route_config_parser.h | 5 +- src/core/xds/grpc/xds_routing.cc | 2 +- src/core/xds/grpc/xds_server_grpc.h | 4 +- src/core/xds/grpc/xds_transport_grpc.cc | 8 +- src/core/xds/grpc/xds_transport_grpc.h | 4 +- src/core/xds/xds_client/xds_api.h | 4 +- src/core/xds/xds_client/xds_bootstrap.cc | 2 +- src/core/xds/xds_client/xds_client.cc | 12 +- src/core/xds/xds_client/xds_client.h | 16 +- src/core/xds/xds_client/xds_client_stats.cc | 2 +- src/core/xds/xds_client/xds_client_stats.h | 8 +- .../xds/xds_client/xds_resource_type_impl.h | 2 +- src/core/xds/xds_client/xds_transport.h | 2 +- src/cpp/client/client_context.cc | 2 +- src/cpp/client/client_interceptor.cc | 2 +- src/cpp/client/client_stats_interceptor.cc | 2 +- src/cpp/client/secure_credentials.cc | 4 +- src/cpp/common/alarm.cc | 2 +- src/cpp/common/completion_queue_cc.cc | 4 +- src/cpp/common/secure_auth_context.h | 2 +- src/cpp/common/secure_create_auth_context.cc | 2 +- src/cpp/common/validate_service_config.cc | 2 +- src/cpp/ext/csm/BUILD | 2 +- src/cpp/ext/csm/csm_observability.cc | 2 +- src/cpp/ext/csm/metadata_exchange.cc | 4 +- src/cpp/ext/filters/census/client_filter.cc | 2 +- .../filters/census/open_census_call_tracer.h | 2 +- src/cpp/ext/gcp/environment_autodetect.cc | 12 +- src/cpp/ext/gcp/environment_autodetect.h | 2 +- src/cpp/ext/gcp/observability.cc | 4 +- src/cpp/ext/gcp/observability_config.cc | 8 +- src/cpp/ext/gcp/observability_config.h | 2 +- src/cpp/ext/gcp/observability_logging_sink.cc | 6 +- src/cpp/ext/gcp/observability_logging_sink.h | 2 +- src/cpp/ext/otel/otel_client_call_tracer.cc | 2 +- src/cpp/ext/otel/otel_client_call_tracer.h | 2 +- src/cpp/ext/otel/otel_plugin.cc | 2 +- .../external_connection_acceptor_impl.h | 2 +- .../health/default_health_check_service.h | 4 +- .../get_cpu_stats_unsupported.cc | 2 +- src/cpp/server/load_reporter/load_reporter.h | 2 +- .../load_reporter_async_service_impl.h | 4 +- src/cpp/server/orca/orca_service.cc | 8 +- src/cpp/server/server_cc.cc | 2 +- src/cpp/server/server_context.cc | 6 +- src/cpp/server/server_credentials.cc | 2 +- src/cpp/thread_manager/thread_manager.cc | 6 +- src/cpp/thread_manager/thread_manager.h | 4 +- .../tests/CronetTests/CronetUnitTests.mm | 4 +- src/python/grpcio/grpc_core_dependencies.py | 76 +- .../observability_lib_deps.py | 36 +- .../parse_address_with_named_scope_id_test.cc | 6 +- .../sockaddr_utils_fuzzer_test.cc | 2 +- test/core/avl/BUILD | 47 - test/core/backoff/BUILD | 52 - test/core/bad_client/bad_client.cc | 2 +- .../core/bad_client/tests/duplicate_header.cc | 2 +- test/core/bad_connection/close_fd_test.cc | 6 +- test/core/bad_ssl/bad_ssl_test.cc | 4 +- test/core/call/client_call_test.cc | 2 +- test/core/call/yodel/fuzzer_main.cc | 2 +- test/core/call/yodel/yodel_test.h | 2 +- test/core/channel/call_finalization_test.cc | 2 +- test/core/channel/channel_args_test.cc | 6 +- test/core/channel/channel_stack_test.cc | 2 +- .../server_call_tracer_factory_test.cc | 2 +- test/core/channelz/channelz_test.cc | 2 +- .../client_channel_service_config_test.cc | 2 +- .../retry_service_config_test.cc | 4 +- test/core/config/load_config_test.cc | 2 +- test/core/end2end/bad_server_response_test.cc | 8 +- test/core/end2end/connection_refused_test.cc | 2 +- test/core/end2end/cq_verifier.cc | 5 +- test/core/end2end/cq_verifier.h | 4 +- test/core/end2end/dualstack_socket_test.cc | 2 +- test/core/end2end/end2end_test_fuzzer.cc | 2 +- test/core/end2end/end2end_test_suites.cc | 8 +- test/core/end2end/end2end_tests.cc | 2 +- test/core/end2end/end2end_tests.h | 6 +- .../end2end/fixtures/http_proxy_fixture.cc | 10 +- test/core/end2end/fixtures/proxy.cc | 6 +- test/core/end2end/fixtures/secure_fixture.h | 2 +- test/core/end2end/fixtures/sockpair_fixture.h | 2 +- test/core/end2end/fuzzers/api_fuzzer.cc | 8 +- test/core/end2end/fuzzers/client_fuzzer.cc | 6 +- test/core/end2end/fuzzers/connector_fuzzer.cc | 2 +- test/core/end2end/fuzzers/fuzzing_common.cc | 2 +- test/core/end2end/fuzzers/fuzzing_common.h | 4 +- test/core/end2end/fuzzers/network_input.h | 2 +- test/core/end2end/fuzzers/server_fuzzer.cc | 2 +- test/core/end2end/goaway_server_test.cc | 4 +- test/core/end2end/h2_ssl_cert_test.cc | 2 +- .../core/end2end/h2_ssl_session_reuse_test.cc | 2 +- ...ls_peer_property_external_verifier_test.cc | 2 +- .../end2end/invalid_call_argument_test.cc | 2 +- test/core/end2end/no_server_test.cc | 2 +- test/core/end2end/tests/bad_ping.cc | 2 +- test/core/end2end/tests/binary_metadata.cc | 2 +- test/core/end2end/tests/call_creds.cc | 2 +- test/core/end2end/tests/call_host_override.cc | 2 +- .../core/end2end/tests/cancel_after_accept.cc | 2 +- .../end2end/tests/cancel_after_client_done.cc | 2 +- .../core/end2end/tests/cancel_after_invoke.cc | 2 +- .../end2end/tests/cancel_after_round_trip.cc | 2 +- test/core/end2end/tests/cancel_with_status.cc | 2 +- test/core/end2end/tests/channelz.cc | 2 +- test/core/end2end/tests/client_streaming.cc | 2 +- test/core/end2end/tests/compressed_payload.cc | 4 +- test/core/end2end/tests/connectivity.cc | 2 +- test/core/end2end/tests/default_host.cc | 2 +- .../core/end2end/tests/disappearing_server.cc | 2 +- .../core/end2end/tests/filter_causes_close.cc | 6 +- test/core/end2end/tests/filter_init_fails.cc | 4 +- test/core/end2end/tests/filtered_metadata.cc | 2 +- .../end2end/tests/graceful_server_shutdown.cc | 2 +- test/core/end2end/tests/grpc_authz.cc | 4 +- test/core/end2end/tests/high_initial_seqno.cc | 2 +- test/core/end2end/tests/hpack_size.cc | 2 +- test/core/end2end/tests/http2_stats.cc | 6 +- .../end2end/tests/invoke_large_request.cc | 2 +- test/core/end2end/tests/keepalive_timeout.cc | 2 +- test/core/end2end/tests/large_metadata.cc | 2 +- .../end2end/tests/max_concurrent_streams.cc | 2 +- test/core/end2end/tests/max_connection_age.cc | 2 +- .../core/end2end/tests/max_connection_idle.cc | 2 +- test/core/end2end/tests/negative_deadline.cc | 2 +- test/core/end2end/tests/no_logging.cc | 2 +- test/core/end2end/tests/payload.cc | 2 +- test/core/end2end/tests/ping.cc | 2 +- .../core/end2end/tests/ping_pong_streaming.cc | 2 +- test/core/end2end/tests/proxy_auth.cc | 2 +- test/core/end2end/tests/registered_call.cc | 2 +- test/core/end2end/tests/request_with_flags.cc | 2 +- .../end2end/tests/request_with_payload.cc | 2 +- .../end2end/tests/resource_quota_server.cc | 4 +- test/core/end2end/tests/retry.cc | 2 +- ...retry_cancel_after_first_attempt_starts.cc | 2 +- .../tests/retry_cancel_during_delay.cc | 2 +- ...retry_cancel_with_multiple_send_batches.cc | 4 +- test/core/end2end/tests/retry_cancellation.cc | 2 +- test/core/end2end/tests/retry_disabled.cc | 2 +- .../retry_exceeds_buffer_size_in_delay.cc | 2 +- ...ry_exceeds_buffer_size_in_initial_batch.cc | 2 +- ...exceeds_buffer_size_in_subsequent_batch.cc | 2 +- test/core/end2end/tests/retry_lb_drop.cc | 6 +- test/core/end2end/tests/retry_lb_fail.cc | 2 +- .../tests/retry_non_retriable_status.cc | 2 +- ...ry_non_retriable_status_before_trailers.cc | 2 +- .../tests/retry_per_attempt_recv_timeout.cc | 2 +- ...er_attempt_recv_timeout_on_last_attempt.cc | 2 +- .../tests/retry_recv_initial_metadata.cc | 2 +- test/core/end2end/tests/retry_recv_message.cc | 2 +- .../tests/retry_recv_message_replay.cc | 6 +- .../retry_recv_trailing_metadata_error.cc | 6 +- .../tests/retry_send_initial_metadata_refs.cc | 2 +- .../core/end2end/tests/retry_send_op_fails.cc | 4 +- .../end2end/tests/retry_send_recv_batch.cc | 2 +- .../tests/retry_server_pushback_delay.cc | 2 +- .../tests/retry_server_pushback_disabled.cc | 2 +- test/core/end2end/tests/retry_streaming.cc | 2 +- .../tests/retry_streaming_after_commit.cc | 2 +- ...reaming_succeeds_before_replay_finished.cc | 2 +- test/core/end2end/tests/retry_throttled.cc | 2 +- .../end2end/tests/retry_too_many_attempts.cc | 2 +- .../end2end/tests/retry_transparent_goaway.cc | 6 +- ...etry_transparent_max_concurrent_streams.cc | 2 +- .../retry_transparent_not_sent_on_wire.cc | 6 +- .../tests/retry_unref_before_finish.cc | 2 +- .../end2end/tests/retry_unref_before_recv.cc | 2 +- .../end2end/tests/server_finishes_request.cc | 2 +- test/core/end2end/tests/server_streaming.cc | 2 +- .../end2end/tests/shutdown_finishes_calls.cc | 2 +- .../end2end/tests/simple_delayed_request.cc | 2 +- test/core/end2end/tests/simple_metadata.cc | 2 +- test/core/end2end/tests/simple_request.cc | 2 +- .../end2end/tests/streaming_error_response.cc | 2 +- .../tests/timeout_before_request_call.cc | 2 +- test/core/end2end/tests/trailing_metadata.cc | 2 +- test/core/end2end/tests/write_buffering.cc | 2 +- .../end2end/tests/write_buffering_at_end.cc | 2 +- .../core/event_engine/common_closures_test.cc | 2 +- .../event_engine/event_engine_test_utils.cc | 6 +- .../event_engine/event_engine_test_utils.h | 4 +- test/core/event_engine/forkable_test.cc | 2 +- .../fuzzing_event_engine.cc | 6 +- .../fuzzing_event_engine.h | 4 +- .../fuzzing_event_engine_unittest.cc | 2 +- .../posix/event_poller_posix_test.cc | 10 +- .../posix/lock_free_event_test.cc | 2 +- .../posix/log_too_many_open_files_test.cc | 2 +- .../event_engine/posix/posix_endpoint_test.cc | 6 +- .../posix/posix_engine_test_utils.cc | 2 +- .../posix/posix_event_engine_connect_test.cc | 4 +- .../event_engine/posix/timer_heap_test.cc | 2 +- .../event_engine/posix/timer_list_test.cc | 2 +- .../posix/traced_buffer_list_test.cc | 2 +- .../event_engine/query_extensions_test.cc | 2 +- .../posix/oracle_event_engine_posix.cc | 4 +- .../posix/oracle_event_engine_posix.h | 8 +- .../test_suite/tests/client_test.cc | 2 +- .../event_engine/test_suite/tests/dns_test.cc | 4 +- .../test_suite/tests/server_test.cc | 2 +- .../test_suite/tests/timer_test.cc | 2 +- .../test_suite/tools/echo_client.cc | 2 +- test/core/event_engine/thread_pool_test.cc | 6 +- test/core/event_engine/windows/iocp_test.cc | 2 +- .../event_engine/windows/win_socket_test.cc | 2 +- .../windows/windows_endpoint_test.cc | 2 +- .../resolver_fuzzer.cc | 8 +- .../rbac/rbac_service_config_parser_test.cc | 2 +- test/core/filters/client_auth_filter_test.cc | 4 +- test/core/filters/filter_test.cc | 2 +- test/core/filters/filter_test.h | 2 +- .../filters/gcp_authentication_filter_test.cc | 4 +- test/core/gprpp/BUILD | 516 ------- test/core/gprpp/time_test.cc | 113 -- test/core/handshake/client_ssl.cc | 6 +- .../readahead_handshaker_server_ssl.cc | 4 +- test/core/handshake/server_ssl_common.cc | 6 +- test/core/handshake/verify_peer_options.cc | 4 +- test/core/http/httpcli_test.cc | 6 +- test/core/http/httpscli_test.cc | 12 +- test/core/iomgr/buffer_list_test.cc | 2 +- test/core/iomgr/combiner_test.cc | 6 +- test/core/iomgr/endpoint_pair_test.cc | 2 +- test/core/iomgr/endpoint_tests.cc | 4 +- test/core/iomgr/error_test.cc | 4 +- test/core/iomgr/fd_conservation_posix_test.cc | 2 +- test/core/iomgr/fd_posix_test.cc | 4 +- .../grpc_ipv6_loopback_available_test.cc | 2 +- .../iomgr/pollset_windows_starvation_test.cc | 2 +- test/core/iomgr/resolve_address_posix_test.cc | 8 +- test/core/iomgr/resolve_address_test.cc | 6 +- test/core/iomgr/socket_utils_test.cc | 2 +- test/core/iomgr/tcp_client_posix_test.cc | 4 +- test/core/iomgr/tcp_posix_test.cc | 6 +- test/core/iomgr/tcp_server_posix_test.cc | 8 +- test/core/iomgr/timer_heap_test.cc | 2 +- test/core/iomgr/timer_list_test.cc | 4 +- test/core/json/json_object_loader_test.cc | 4 +- test/core/load_balancing/lb_policy_test_lib.h | 18 +- ...outlier_detection_lb_config_parser_test.cc | 2 +- .../load_balancing/outlier_detection_test.cc | 6 +- test/core/load_balancing/pick_first_test.cc | 10 +- test/core/load_balancing/ring_hash_test.cc | 4 +- .../rls_lb_config_parser_test.cc | 2 +- test/core/load_balancing/round_robin_test.cc | 4 +- .../static_stride_scheduler_benchmark.cc | 2 +- .../weighted_round_robin_config_test.cc | 2 +- .../weighted_round_robin_test.cc | 8 +- ...xds_override_host_lb_config_parser_test.cc | 2 +- .../load_balancing/xds_override_host_test.cc | 3 +- test/core/matchers/BUILD | 32 - test/core/memory_usage/callback_client.cc | 2 +- test/core/memory_usage/memory_usage_test.cc | 2 +- test/core/memory_usage/server.cc | 2 +- .../message_size_service_config_test.cc | 2 +- .../network_benchmarks/low_level_ping_pong.cc | 4 +- test/core/promise/arena_promise_test.cc | 2 +- .../event_engine_wakeup_scheduler_test.cc | 2 +- test/core/promise/for_each_test.cc | 2 +- .../core/promise/inter_activity_latch_test.cc | 2 +- test/core/promise/interceptor_list_test.cc | 2 +- test/core/promise/map_pipe_test.cc | 2 +- test/core/promise/observable_test.cc | 2 +- test/core/promise/party_test.cc | 8 +- test/core/promise/pipe_test.cc | 4 +- test/core/promise/sleep_test.cc | 4 +- test/core/promise/wait_for_callback_test.cc | 2 +- test/core/resolver/binder_resolver_test.cc | 4 +- .../resolver/dns_resolver_cooldown_test.cc | 14 +- test/core/resolver/dns_resolver_test.cc | 6 +- test/core/resolver/endpoint_addresses_test.cc | 2 +- test/core/resolver/fake_resolver_test.cc | 10 +- .../core/resolver/google_c2p_resolver_test.cc | 2 +- test/core/resolver/sockaddr_resolver_test.cc | 6 +- test/core/resource_quota/arena_test.cc | 4 +- .../resource_quota/memory_quota_fuzzer.cc | 2 +- .../memory_quota_stress_test.cc | 2 +- test/core/security/alts_credentials_fuzzer.cc | 4 +- .../security/alts_security_connector_test.cc | 2 +- test/core/security/auth_context_test.cc | 4 +- .../check_gcp_environment_linux_test.cc | 2 +- .../check_gcp_environment_windows_test.cc | 2 +- test/core/security/create_jwt.cc | 2 +- test/core/security/credentials_test.cc | 12 +- test/core/security/fetch_oauth2.cc | 2 +- .../grpc_alts_credentials_options_test.cc | 2 +- .../grpc_tls_certificate_distributor_test.cc | 2 +- .../grpc_tls_certificate_provider_test.cc | 2 +- .../grpc_tls_certificate_verifier_test.cc | 2 +- .../grpc_tls_credentials_options_test.cc | 2 +- test/core/security/json_token_test.cc | 2 +- test/core/security/jwt_verifier_test.cc | 2 +- test/core/security/oauth2_utils.cc | 4 +- .../print_google_default_creds_token.cc | 2 +- test/core/security/rbac_translator_test.cc | 2 +- test/core/security/secure_endpoint_test.cc | 2 +- test/core/security/security_connector_test.cc | 4 +- test/core/security/ssl_credentials_test.cc | 2 +- test/core/security/ssl_server_fuzzer.cc | 2 +- test/core/security/system_roots_test.cc | 6 +- .../security/tls_security_connector_test.cc | 4 +- test/core/security/verify_jwt.cc | 2 +- .../service_config/service_config_test.cc | 4 +- test/core/slice/slice_test.cc | 4 +- .../completion_queue_threading_test.cc | 4 +- .../surface/concurrent_connectivity_test.cc | 4 +- test/core/surface/lame_client_test.cc | 2 +- ...num_external_connectivity_watchers_test.cc | 2 +- .../surface/sequential_connectivity_test.cc | 4 +- test/core/surface/server_chttp2_test.cc | 2 +- test/core/surface/server_test.cc | 2 +- test/core/telemetry/call_tracer_test.cc | 2 +- test/core/test_util/BUILD | 6 +- test/core/test_util/cmdline.cc | 2 +- test/core/test_util/evaluate_args_test_util.h | 2 +- test/core/test_util/fake_stats_plugin.h | 2 +- test/core/test_util/fuzzer_corpus_test.cc | 2 +- test/core/test_util/fuzzing_channel_args.h | 2 +- test/core/test_util/mock_endpoint.cc | 2 +- .../core/test_util/one_corpus_entry_fuzzer.cc | 2 +- test/core/test_util/passthrough_endpoint.h | 2 +- test/core/test_util/port.cc | 2 +- .../port_isolated_runtime_environment.cc | 2 +- test/core/test_util/port_server_client.cc | 10 +- test/core/test_util/scoped_env_var.h | 2 +- test/core/test_util/stack_tracer.cc | 2 +- test/core/test_util/test_config.cc | 2 +- test/core/test_util/test_lb_policies.cc | 12 +- test/core/test_util/test_tcp_server.cc | 2 +- test/core/test_util/tls_utils.cc | 2 +- test/core/test_util/tls_utils.h | 4 +- .../transport/binder/binder_transport_test.cc | 2 +- .../transport/binder/end2end/fake_binder.cc | 2 +- .../transport/binder/end2end/fake_binder.h | 4 +- .../binder/end2end/fuzzers/fuzzer_utils.h | 2 +- .../transport/call_arena_allocator_test.cc | 4 +- test/core/transport/call_spine_benchmarks.h | 2 +- test/core/transport/chaotic_good/BUILD | 2 +- .../chaotic_good/chaotic_good_server_test.cc | 6 +- .../client_transport_error_test.cc | 2 +- .../transport/chaotic_good/frame_fuzzer.cc | 2 +- .../chaotic_good/server_transport_test.cc | 2 +- .../transport/chttp2/flow_control_fuzzer.cc | 2 +- .../transport/chttp2/flow_control_test.cc | 4 +- .../chttp2/graceful_shutdown_test.cc | 8 +- .../transport/chttp2/hpack_encoder_test.cc | 2 +- .../chttp2/hpack_parser_fuzzer_test.cc | 4 +- .../chttp2/hpack_parser_input_size_fuzzer.cc | 4 +- .../transport/chttp2/hpack_parser_test.cc | 6 +- .../transport/chttp2/hpack_sync_fuzzer.cc | 4 +- .../transport/chttp2/ping_callbacks_test.cc | 2 +- .../chttp2/ping_configuration_test.cc | 3 +- .../remove_stream_from_stalled_lists_test.cc | 4 +- .../transport/chttp2/settings_timeout_test.cc | 4 +- ...ak_with_queued_flow_control_update_test.cc | 4 +- .../transport/chttp2/streams_not_seen_test.cc | 10 +- .../transport/chttp2/too_many_pings_test.cc | 10 +- test/core/transport/error_utils_test.cc | 2 +- test/core/transport/metadata_map_test.cc | 4 +- test/core/transport/timeout_encoding_test.cc | 2 +- .../fake_handshaker/fake_handshaker_server.cc | 2 +- .../fake_handshaker_server_main.cc | 2 +- .../alts/frame_protector/alts_counter_test.cc | 2 +- .../alts_frame_protector_test.cc | 2 +- .../frame_protector/frame_handler_test.cc | 2 +- .../alts_concurrent_connectivity_test.cc | 6 +- .../handshaker/alts_handshaker_client_test.cc | 2 +- .../handshaker/alts_tsi_handshaker_test.cc | 2 +- .../tsi/crl_ssl_transport_security_test.cc | 2 +- test/core/tsi/fake_transport_security_test.cc | 2 +- test/core/tsi/ssl_session_cache_test.cc | 2 +- test/core/tsi/ssl_transport_security_test.cc | 2 +- .../tsi/ssl_transport_security_utils_test.cc | 2 +- test/core/tsi/transport_security_test.cc | 2 +- test/core/tsi/transport_security_test_lib.cc | 4 +- test/core/uri/BUILD | 53 - test/core/util/BUILD | 607 +++++++- test/core/{avl => util}/avl_fuzzer.cc | 4 +- test/core/{avl => util}/avl_fuzzer.proto | 0 test/core/{avl => util}/avl_fuzzer_corpus/0 | 0 ...h-060a9a897130ba7bb2f4313daa604c47f7c7c907 | 0 ...h-1fbe8edb82f9a7aa4c2dffe4a6eaa40c34b1e360 | 0 test/core/{avl => util}/avl_test.cc | 2 +- test/core/{backoff => util}/backoff_test.cc | 4 +- test/core/{gprpp => util}/bitset_test.cc | 2 +- ...h-a0868ce3a0f76feefcc715148ed9e71fa0738c2a | 0 .../testcase-5405829431427072 | 0 .../{gprpp => util}/chunked_vector_fuzzer.cc | 6 +- .../chunked_vector_fuzzer.proto | 0 .../{gprpp => util}/chunked_vector_test.cc | 4 +- test/core/{gprpp => util}/cpp_impl_of_test.cc | 2 +- test/core/util/cpu_test.cc | 2 +- .../{gprpp => util}/directory_reader_test.cc | 2 +- test/core/{gprpp => util}/down_cast_test.cc | 2 +- .../{gprpp => util}/dual_ref_counted_test.cc | 6 +- test/core/{gprpp => util}/dump_args_test.cc | 2 +- test/core/util/env_test.cc | 2 +- .../{gprpp => util}/examine_stack_test.cc | 2 +- test/core/{gprpp => util}/fork_test.cc | 4 +- test/core/{gprpp => util}/glob_test.cc | 2 +- test/core/util/gpr_time_test.cc | 268 ++++ test/core/{gprpp => util}/host_port_test.cc | 2 +- test/core/{gprpp => util}/if_list_test.cc | 2 +- test/core/{gprpp => util}/load_file_test.cc | 2 +- test/core/{gprpp => util}/match_test.cc | 2 +- test/core/{matchers => util}/matchers_test.cc | 2 +- test/core/{gprpp => util}/mpscq_test.cc | 4 +- test/core/{gprpp => util}/no_destruct_test.cc | 2 +- .../core/{gprpp => util}/notification_test.cc | 2 +- test/core/{gprpp => util}/orphanable_test.cc | 2 +- test/core/{gprpp => util}/overload_test.cc | 2 +- .../random_early_detection_test.cc | 2 +- .../{gprpp => util}/ref_counted_ptr_test.cc | 6 +- test/core/{gprpp => util}/ref_counted_test.cc | 2 +- .../{gprpp => util}/single_set_ptr_test.cc | 2 +- test/core/{gprpp => util}/sorted_pack_test.cc | 2 +- test/core/util/spinlock_test.cc | 2 +- test/core/{gprpp => util}/stat_test.cc | 2 +- .../{gprpp => util}/status_helper_test.cc | 2 +- test/core/util/sync_test.cc | 2 +- test/core/{gprpp => util}/table_test.cc | 2 +- test/core/{gprpp => util}/thd_test.cc | 2 +- .../time_averaged_stats_test.cc | 2 +- test/core/util/time_test.cc | 297 +--- test/core/{gprpp => util}/time_util_test.cc | 2 +- .../{gprpp => util}/unique_type_name_test.cc | 2 +- .../02d156dc5e6f2c11c90c2e06fcee04adf036a342 | 0 .../042dc4512fa3d391c5170cf3aa61e6a638f84342 | 0 .../0e9bbe975f2027e8c39c89f85f667530368e7d11 | 0 .../1155aa6ea7ef262a81a63692513ea395f84dad6f | 0 .../13856a5569ffd085a4d5c07af5f8e9310835a118 | 0 .../14b57bcbf1e17b1db1de491ef2ba3768f704b7dc | 0 .../1794310671a060eead6e5ee66ac978a18ec7e84f | 0 .../1d30b2a79afbaf2828ff42b9a9647e942ba1ab80 | 0 .../1fcf5d9c333b70596cf5ba04d1f7affdf445b971 | 0 .../23162c8a8936e20b195404c21337ee734d02a6bc | 0 .../23f3198b815ca60bdadcaae682b9f965dda387f1 | 0 .../2ef3893b43f1f60b77b59ce06a6bce9815d78eaf | 0 .../356c3c129e203b5c74550b4209764d74b9caefce | 0 .../396568fc41c8ccb31ec925b4a862e4d29ead1327 | 0 .../3b1e7526a99918006b87e499d2beb6c4ac9c3c0c | 0 .../3b58860f3451d3e7aad99690a8d39782ca5116fc | 0 .../41963cc10752f70c3af7e3d85868efb097a0ea9c | 0 .../47b5228404451fc9d4071fa69192514bb4ce33c1 | 0 .../56a2da4b2e6fb795243901023ed8d0aa083d1aab | 0 .../574c2f13858a9a6d724654bd913ede9ae3abf822 | 0 .../582f789c19033a152094cbf8565f14154a778ddb | 0 .../636c5606fc23713a1bae88c8899c0541cfad4fd8 | 0 .../63fe493b270b17426d77a27cbf3abac5b2c2794a | 0 .../655300a902b62662296a8e46bfb04fbcb07182cb | 0 .../6ae3acd9d8507b61bf235748026080a4138dba58 | 0 .../6b70979a70a038ff6607d6cf85485ee95baf58e6 | 0 .../7314ab3545a7535a26e0e8aad67caea5534d68b1 | 0 .../7ff4d8b8d1ffd0d42c48bbb91e5856a9ec31aecb | 0 .../87daa131e0973b77a232a870ed749ef29cf58e6d | 0 .../884dcaee2908ffe5f12b65b8eba81016099c4266 | 0 .../8d7e944fd5d0ede94097fcc98b47b09a3f9c76cb | 0 .../9671149af0b444f59bbdf71340d3441dadd8a7b4 | 0 .../96c8d266b7dc037288ef305c996608270f72e7fb | 0 .../975536c71ade4800415a7e9c2f1b45c35a6d5ea8 | 0 .../99750aa67d30beaea8af565c829d4999aa8cb91b | 0 .../a1140f3f8b5cffc1010221b9a4084a25fb75c1f6 | 0 .../a1f0f9b75bb354eb063d7cba4fcfa2d0b88d63de | 0 .../a296eb3d1d436ed7df7195b10aa3c4de3896f98d | 0 .../a8b8e66050b424f1b8c07d46f868199fb7f60e38 | 0 .../aba1472880406a318ce207ee79815b7acf087757 | 0 .../af55baf8c8855e563befdf1eefbcbd46c5ddb8d2 | 0 .../b3c0bf66c2bf5d24ef1daf4cc5a9d6d5bd0e8bfd | 0 .../c28a47409cf5d95bb372238d01e73d8b831408e4 | 0 .../c3ef1d41888063a08700c3add1e4465aabcf8807 | 0 .../c550a76af21f9b9cc92a386d5c8998b26f8f2e4d | 0 .../c79721406d0ab80495f186fd88e37fba98637ae9 | 0 .../ceb4e2264ba7a8d5be47d276b37ec09489e00245 | 0 .../cf4395958f5bfb46fd6f535a39657d016c75114c | 0 .../d46668372b7e20154a89409a7430a28e642afdca | 0 .../d6fe7412a0a1d1c733160246f3fa425f4f97682a | 0 test/core/{uri => util}/uri_corpus/dns.txt | 0 .../e241f29957b0e30ec11aaaf91b2339f7015fa5fd | 0 .../ea02d9fea9bad5b89cf353a0169238f584177e71 | 0 .../ec4731dddf94ed3ea92ae4d5a71f145ab6e3f6ee | 0 .../ed2f78646f19fc47dd85ff0877c232b71913ece2 | 0 .../f6889f4a6350fea1596a3adea5cdac02bd5d1ff3 | 0 .../f6f3bd030f0d321efe7c51ca3f057de23509af67 | 0 .../f97598cff03306af3c70400608fec47268b5075d | 0 .../f9e1ec1fc642b575bc9955618b7065747f56b101 | 0 .../fe0630a3aeed2ec6f474f362e4c839478290d5c4 | 0 test/core/{uri => util}/uri_corpus/ipv4.txt | 0 test/core/{uri => util}/uri_corpus/ipv6.txt | 0 test/core/{uri => util}/uri_corpus/unix.txt | 0 test/core/{uri => util}/uri_fuzzer_test.cc | 2 +- .../uri_parser_test.cc => util/uri_test.cc} | 2 +- test/core/{gprpp => util}/uuid_v4_test.cc | 2 +- .../{gprpp => util}/validation_errors_test.cc | 2 +- .../{gprpp => util}/work_serializer_test.cc | 6 +- .../xds/certificate_provider_store_test.cc | 2 +- .../xds/xds_audit_logger_registry_test.cc | 2 +- test/core/xds/xds_bootstrap_test.cc | 6 +- .../core/xds/xds_certificate_provider_test.cc | 2 +- test/core/xds/xds_client_fuzzer.cc | 4 +- test/core/xds/xds_client_test.cc | 6 +- .../xds/xds_cluster_resource_type_test.cc | 6 +- test/core/xds/xds_common_types_test.cc | 10 +- .../xds/xds_endpoint_resource_type_test.cc | 4 +- test/core/xds/xds_http_filters_test.cc | 4 +- test/core/xds/xds_lb_policy_registry_test.cc | 8 +- .../xds/xds_listener_resource_type_test.cc | 6 +- test/core/xds/xds_metadata_test.cc | 4 +- .../xds_route_config_resource_type_test.cc | 8 +- test/core/xds/xds_transport_fake.cc | 4 +- test/core/xds/xds_transport_fake.h | 8 +- test/cpp/client/credentials_test.cc | 2 +- ...channel_with_active_connect_stress_test.cc | 6 +- test/cpp/cocoapods/generic/generic.mm | 2 +- test/cpp/common/alarm_test.cc | 2 +- test/cpp/common/time_jump_test.cc | 4 +- test/cpp/common/timer_test.cc | 4 +- test/cpp/end2end/async_end2end_test.cc | 4 +- test/cpp/end2end/cfstream_test.cc | 6 +- test/cpp/end2end/channelz_service_test.cc | 2 +- .../end2end/client_callback_end2end_test.cc | 2 +- test/cpp/end2end/client_crash_test.cc | 2 +- test/cpp/end2end/client_crash_test_server.cc | 2 +- test/cpp/end2end/client_fork_test.cc | 2 +- test/cpp/end2end/client_lb_end2end_test.cc | 14 +- .../end2end/connection_attempt_injector.cc | 2 +- .../cpp/end2end/connection_attempt_injector.h | 2 +- test/cpp/end2end/counted_service.h | 2 +- test/cpp/end2end/end2end_test.cc | 4 +- test/cpp/end2end/flaky_network_test.cc | 6 +- test/cpp/end2end/grpclb_end2end_test.cc | 10 +- .../end2end/health_service_end2end_test.cc | 2 +- test/cpp/end2end/hybrid_end2end_test.cc | 2 +- test/cpp/end2end/interceptors_util.h | 2 +- test/cpp/end2end/mock_test.cc | 2 +- test/cpp/end2end/orca_service_end2end_test.cc | 2 +- test/cpp/end2end/port_sharing_end2end_test.cc | 6 +- test/cpp/end2end/raw_end2end_test.cc | 4 +- .../resource_quota_end2end_stress_test.cc | 2 +- test/cpp/end2end/rls_end2end_test.cc | 8 +- test/cpp/end2end/rls_server.h | 2 +- test/cpp/end2end/server_crash_test.cc | 2 +- test/cpp/end2end/server_crash_test_client.cc | 2 +- test/cpp/end2end/server_early_return_test.cc | 2 +- .../server_load_reporting_end2end_test.cc | 2 +- .../end2end/service_config_end2end_test.cc | 8 +- test/cpp/end2end/shutdown_test.cc | 4 +- test/cpp/end2end/streaming_throughput_test.cc | 2 +- test/cpp/end2end/test_service_impl.cc | 4 +- test/cpp/end2end/test_service_impl.h | 2 +- test/cpp/end2end/thread_stress_test.cc | 2 +- test/cpp/end2end/time_change_test.cc | 2 +- .../xds/xds_cluster_type_end2end_test.cc | 2 +- test/cpp/end2end/xds/xds_end2end_test.cc | 12 +- test/cpp/end2end/xds/xds_end2end_test_lib.cc | 2 +- .../xds/xds_override_host_end2end_test.cc | 2 +- .../xds/xds_pick_first_end2end_test.cc | 2 +- .../end2end/xds/xds_ring_hash_end2end_test.cc | 2 +- test/cpp/end2end/xds/xds_rls_end2end_test.cc | 2 +- test/cpp/end2end/xds/xds_server.cc | 4 +- test/cpp/end2end/xds/xds_server.h | 4 +- test/cpp/end2end/xds/xds_utils.cc | 2 +- test/cpp/ext/csm/mesh_id_test.cc | 2 +- test/cpp/ext/csm/metadata_exchange_test.cc | 2 +- test/cpp/ext/filters/logging/library.h | 2 +- .../logging_census_integration_test.cc | 2 +- test/cpp/ext/filters/logging/logging_test.cc | 4 +- .../ext/gcp/environment_autodetect_test.cc | 4 +- test/cpp/ext/gcp/observability_config_test.cc | 2 +- test/cpp/ext/otel/otel_test_library.cc | 2 +- .../interop/backend_metrics_lb_policy_test.cc | 2 +- test/cpp/interop/client.cc | 2 +- test/cpp/interop/grpclb_fallback_test.cc | 2 +- test/cpp/interop/http2_client.cc | 2 +- test/cpp/interop/interop_client.cc | 2 +- test/cpp/interop/interop_server.cc | 4 +- test/cpp/interop/interop_test.cc | 2 +- test/cpp/interop/istio_echo_server.cc | 6 +- test/cpp/interop/istio_echo_server_lib.cc | 2 +- test/cpp/interop/istio_echo_server_test.cc | 4 +- test/cpp/interop/metrics_client.cc | 2 +- test/cpp/interop/observability_client.cc | 2 +- test/cpp/interop/pre_stop_hook_server.cc | 2 +- test/cpp/interop/pre_stop_hook_server.h | 2 +- test/cpp/interop/pre_stop_hook_server_test.cc | 2 +- test/cpp/interop/reconnect_interop_client.cc | 2 +- test/cpp/interop/reconnect_interop_server.cc | 2 +- test/cpp/interop/stress_interop_client.cc | 2 +- test/cpp/interop/stress_test.cc | 2 +- test/cpp/interop/xds_interop_client.cc | 2 +- test/cpp/interop/xds_interop_server.cc | 2 +- test/cpp/interop/xds_interop_server_test.cc | 2 +- .../microbenchmarks/bm_basic_work_queue.cc | 2 +- test/cpp/microbenchmarks/bm_chttp2_hpack.cc | 4 +- test/cpp/microbenchmarks/bm_cq.cc | 2 +- .../microbenchmarks/bm_cq_multiple_threads.cc | 4 +- .../microbenchmarks/bm_event_engine_run.cc | 4 +- test/cpp/microbenchmarks/bm_exec_ctx.cc | 2 +- test/cpp/microbenchmarks/bm_huffman_decode.cc | 2 +- test/cpp/microbenchmarks/bm_rng.cc | 2 +- test/cpp/microbenchmarks/bm_thread_pool.cc | 4 +- .../fullstack_context_mutators.h | 2 +- test/cpp/microbenchmarks/fullstack_fixtures.h | 2 +- test/cpp/naming/address_sorting_test.cc | 4 +- test/cpp/naming/cancel_ares_query_test.cc | 10 +- test/cpp/naming/resolver_component_test.cc | 8 +- ...resolver_component_tests_runner_invoker.cc | 4 +- test/cpp/performance/writes_per_rpc_test.cc | 2 +- test/cpp/qps/benchmark_config.cc | 2 +- test/cpp/qps/client.h | 4 +- test/cpp/qps/client_async.cc | 2 +- test/cpp/qps/client_callback.cc | 2 +- test/cpp/qps/client_sync.cc | 2 +- test/cpp/qps/driver.cc | 6 +- .../qps/inproc_sync_unary_ping_pong_test.cc | 2 +- test/cpp/qps/json_run_localhost.cc | 4 +- test/cpp/qps/parse_json.cc | 2 +- test/cpp/qps/qps_json_driver.cc | 2 +- test/cpp/qps/qps_openloop_test.cc | 2 +- test/cpp/qps/qps_worker.cc | 4 +- test/cpp/qps/report.cc | 2 +- .../qps/secure_sync_unary_ping_pong_test.cc | 2 +- test/cpp/qps/server.h | 2 +- test/cpp/qps/server_async.cc | 4 +- test/cpp/qps/server_callback.cc | 2 +- test/cpp/qps/server_sync.cc | 2 +- test/cpp/qps/usage_timer.cc | 2 +- test/cpp/server/server_builder_test.cc | 2 +- test/cpp/server/server_request_call_test.cc | 2 +- .../cpp/thread_manager/thread_manager_test.cc | 2 +- test/cpp/util/channel_trace_proto_helper.cc | 2 +- test/cpp/util/channelz_sampler_test.cc | 2 +- test/cpp/util/cli_call.cc | 2 +- test/cpp/util/cli_credentials.cc | 4 +- test/cpp/util/create_test_channel.cc | 2 +- test/cpp/util/get_grpc_test_runfile_dir.cc | 2 +- test/cpp/util/grpc_tool_test.cc | 2 +- test/cpp/util/metrics_server.cc | 2 +- .../proto_reflection_descriptor_database.cc | 2 +- test/cpp/util/test_credentials_provider.cc | 2 +- test/cpp/util/tls_test_utils.cc | 2 +- test/cpp/util/tls_test_utils.h | 2 +- test/cpp/util/windows/manifest_file.cc | 2 +- .../core/gen_grpc_tls_credentials_options.py | 2 +- .../codegen/core/gen_huffman_decompressor.cc | 4 +- tools/codegen/core/gen_if_list.py | 8 +- tools/codegen/core/gen_join.py | 4 +- tools/codegen/core/gen_seq.py | 4 +- tools/codegen/core/gen_stats_data.py | 2 +- .../core/templates/trace_flags.cc.mako | 2 +- .../distrib/check_namespace_qualification.py | 5 +- tools/distrib/fix_build_deps.py | 4 +- tools/doxygen/Doxyfile.c++.internal | 190 +-- tools/doxygen/Doxyfile.core.internal | 191 ++- tools/run_tests/generated/tests.json | 50 +- tools/run_tests/sanity/check_absl_mutex.sh | 2 +- .../run_tests/sanity/cpp_banned_constructs.sh | 4 +- 1363 files changed, 6082 insertions(+), 6242 deletions(-) delete mode 100644 src/core/lib/gprpp/.clang-format delete mode 100644 src/core/lib/gprpp/README.md delete mode 100644 src/core/lib/gprpp/time.cc rename src/core/{lib/gprpp => util}/atomic_utils.h (90%) rename src/core/{lib/avl => util}/avl.h (97%) rename src/core/{lib/backoff => util}/backoff.cc (94%) rename src/core/{lib/backoff => util}/backoff.h (93%) rename src/core/{lib/gprpp => util}/bitset.h (98%) rename src/core/{lib/gprpp => util}/chunked_vector.h (97%) rename src/core/{lib/gprpp => util}/construct_destruct.h (87%) rename src/core/{lib/gprpp => util}/cpp_impl_of.h (90%) rename src/core/{lib/gprpp => util}/crash.cc (96%) rename src/core/{lib/gprpp => util}/crash.h (86%) rename src/core/{lib/gprpp => util}/debug_location.h (94%) rename src/core/{lib/gprpp => util}/directory_reader.h (89%) rename src/core/{lib/gprpp => util}/down_cast.h (91%) rename src/core/{lib/gprpp => util}/dual_ref_counted.h (97%) rename src/core/{lib/gprpp => util}/dump_args.cc (97%) rename src/core/{lib/gprpp => util}/dump_args.h (95%) rename src/core/{lib/gprpp => util}/env.h (92%) rename src/core/{lib/debug => util}/event_log.cc (98%) rename src/core/{lib/debug => util}/event_log.h (91%) rename src/core/{lib/gprpp => util}/examine_stack.cc (96%) rename src/core/{lib/gprpp => util}/examine_stack.h (89%) rename src/core/{lib/gprpp => util}/fork.cc (98%) rename src/core/{lib/gprpp => util}/fork.h (95%) rename src/core/{lib/iomgr => util}/gethostname.h (83%) rename src/core/{lib/iomgr => util}/gethostname_fallback.cc (94%) rename src/core/{lib/iomgr => util}/gethostname_host_name_max.cc (95%) rename src/core/{lib/iomgr => util}/gethostname_sysconf.cc (95%) rename src/core/{lib/gprpp => util}/glob.cc (100%) rename src/core/{lib/gprpp => util}/glob.h (88%) create mode 100644 src/core/util/gpr_time.cc rename src/core/{lib/iomgr => util}/grpc_if_nametoindex.h (83%) rename src/core/{lib/iomgr => util}/grpc_if_nametoindex_posix.cc (92%) rename src/core/{lib/iomgr => util}/grpc_if_nametoindex_unsupported.cc (92%) rename src/core/{lib/gprpp => util}/host_port.cc (98%) rename src/core/{lib/gprpp => util}/host_port.h (93%) rename src/core/{lib/gprpp => util}/if_list.h (99%) rename src/core/{lib/gprpp => util}/linux/env.cc (97%) rename src/core/{lib/gprpp => util}/load_file.cc (98%) rename src/core/{lib/gprpp => util}/load_file.h (88%) rename src/core/{lib/gprpp => util}/manual_constructor.h (95%) rename src/core/{lib/gprpp => util}/match.h (93%) rename src/core/{lib/matchers => util}/matchers.cc (99%) rename src/core/{lib/matchers => util}/matchers.h (97%) rename src/core/{lib/gprpp => util}/memory.h (91%) rename src/core/{lib/gprpp => util}/mpscq.cc (98%) rename src/core/{lib/gprpp => util}/mpscq.h (94%) rename src/core/{lib/gprpp => util}/no_destruct.h (93%) rename src/core/{lib/gprpp => util}/notification.h (89%) rename src/core/{lib/gprpp => util}/orphanable.h (93%) rename src/core/{lib/gprpp => util}/overload.h (93%) rename src/core/{lib/gprpp => util}/packed_table.h (83%) rename src/core/{lib/gprpp => util}/per_cpu.cc (96%) rename src/core/{lib/gprpp => util}/per_cpu.h (95%) rename src/core/{lib/gprpp => util}/posix/directory_reader.cc (97%) rename src/core/{lib/gprpp => util}/posix/env.cc (96%) rename src/core/{lib/gprpp => util}/posix/stat.cc (94%) rename src/core/{lib/gprpp => util}/posix/thd.cc (97%) rename src/core/{lib/backoff => util}/random_early_detection.cc (94%) rename src/core/{lib/backoff => util}/random_early_detection.h (91%) rename src/core/{lib/gprpp => util}/ref_counted.h (97%) rename src/core/{lib/gprpp => util}/ref_counted_ptr.h (98%) rename src/core/{lib/gprpp => util}/ref_counted_string.cc (96%) rename src/core/{lib/gprpp => util}/ref_counted_string.h (94%) rename src/core/{lib/gprpp => util}/single_set_ptr.h (94%) rename src/core/{lib/gprpp => util}/sorted_pack.h (94%) rename src/core/{lib/gprpp => util}/stat.h (89%) rename src/core/{lib/gprpp => util}/status_helper.cc (99%) rename src/core/{lib/gprpp => util}/status_helper.h (96%) rename src/core/{lib/gprpp => util}/strerror.cc (96%) rename src/core/{lib/gprpp => util}/strerror.h (85%) rename src/core/{lib/gprpp => util}/sync.h (97%) rename src/core/{lib/gprpp => util}/table.h (99%) rename src/core/{lib/gprpp => util}/tchar.cc (97%) rename src/core/{lib/gprpp => util}/tchar.h (87%) rename src/core/{lib/gprpp => util}/thd.h (98%) rename src/core/{lib/gprpp => util}/time.h (99%) rename src/core/{lib/gprpp => util}/time_averaged_stats.cc (97%) rename src/core/{lib/gprpp => util}/time_averaged_stats.h (95%) rename src/core/{lib/gprpp => util}/time_util.cc (98%) rename src/core/{lib/gprpp => util}/time_util.h (89%) rename src/core/{lib/gprpp => util}/type_list.h (86%) rename src/core/{lib/gprpp => util}/unique_type_name.h (95%) rename src/core/{lib/uri/uri_parser.cc => util/uri.cc} (99%) rename src/core/{lib/uri/uri_parser.h => util/uri.h} (96%) rename src/core/{lib/gprpp => util}/uuid_v4.cc (96%) rename src/core/{lib/gprpp => util}/uuid_v4.h (87%) rename src/core/{lib/gprpp => util}/validation_errors.cc (97%) rename src/core/{lib/gprpp => util}/validation_errors.h (96%) rename src/core/{lib/gprpp => util}/windows/directory_reader.cc (97%) rename src/core/{lib/gprpp => util}/windows/env.cc (95%) rename src/core/{lib/gprpp => util}/windows/stat.cc (92%) rename src/core/{lib/gprpp => util}/windows/thd.cc (97%) rename src/core/{lib/gprpp => util}/work_serializer.cc (98%) rename src/core/{lib/gprpp => util}/work_serializer.h (94%) rename src/core/{lib/gprpp => util}/xxhash_inline.h (86%) delete mode 100644 test/core/avl/BUILD delete mode 100644 test/core/backoff/BUILD delete mode 100644 test/core/gprpp/BUILD delete mode 100644 test/core/gprpp/time_test.cc delete mode 100644 test/core/matchers/BUILD delete mode 100644 test/core/uri/BUILD rename test/core/{avl => util}/avl_fuzzer.cc (97%) rename test/core/{avl => util}/avl_fuzzer.proto (100%) rename test/core/{avl => util}/avl_fuzzer_corpus/0 (100%) rename test/core/{avl => util}/avl_fuzzer_corpus/crash-060a9a897130ba7bb2f4313daa604c47f7c7c907 (100%) rename test/core/{avl => util}/avl_fuzzer_corpus/crash-1fbe8edb82f9a7aa4c2dffe4a6eaa40c34b1e360 (100%) rename test/core/{avl => util}/avl_test.cc (97%) rename test/core/{backoff => util}/backoff_test.cc (98%) rename test/core/{gprpp => util}/bitset_test.cc (98%) rename test/core/{gprpp => util}/chunked_vector_corpora/crash-a0868ce3a0f76feefcc715148ed9e71fa0738c2a (100%) rename test/core/{gprpp => util}/chunked_vector_corpora/testcase-5405829431427072 (100%) rename test/core/{gprpp => util}/chunked_vector_fuzzer.cc (97%) rename test/core/{gprpp => util}/chunked_vector_fuzzer.proto (100%) rename test/core/{gprpp => util}/chunked_vector_test.cc (97%) rename test/core/{gprpp => util}/cpp_impl_of_test.cc (95%) rename test/core/{gprpp => util}/directory_reader_test.cc (97%) rename test/core/{gprpp => util}/down_cast_test.cc (96%) rename test/core/{gprpp => util}/dual_ref_counted_test.cc (96%) rename test/core/{gprpp => util}/dump_args_test.cc (96%) rename test/core/{gprpp => util}/examine_stack_test.cc (98%) rename test/core/{gprpp => util}/fork_test.cc (98%) rename test/core/{gprpp => util}/glob_test.cc (98%) create mode 100644 test/core/util/gpr_time_test.cc rename test/core/{gprpp => util}/host_port_test.cc (98%) rename test/core/{gprpp => util}/if_list_test.cc (96%) rename test/core/{gprpp => util}/load_file_test.cc (98%) rename test/core/{gprpp => util}/match_test.cc (98%) rename test/core/{matchers => util}/matchers_test.cc (99%) rename test/core/{gprpp => util}/mpscq_test.cc (98%) rename test/core/{gprpp => util}/no_destruct_test.cc (97%) rename test/core/{gprpp => util}/notification_test.cc (97%) rename test/core/{gprpp => util}/orphanable_test.cc (98%) rename test/core/{gprpp => util}/overload_test.cc (96%) rename test/core/{backoff => util}/random_early_detection_test.cc (97%) rename test/core/{gprpp => util}/ref_counted_ptr_test.cc (99%) rename test/core/{gprpp => util}/ref_counted_test.cc (99%) rename test/core/{gprpp => util}/single_set_ptr_test.cc (97%) rename test/core/{gprpp => util}/sorted_pack_test.cc (97%) rename test/core/{gprpp => util}/stat_test.cc (98%) rename test/core/{gprpp => util}/status_helper_test.cc (99%) rename test/core/{gprpp => util}/table_test.cc (99%) rename test/core/{gprpp => util}/thd_test.cc (98%) rename test/core/{gprpp => util}/time_averaged_stats_test.cc (99%) rename test/core/{gprpp => util}/time_util_test.cc (99%) rename test/core/{gprpp => util}/unique_type_name_test.cc (98%) rename test/core/{uri => util}/uri_corpus/02d156dc5e6f2c11c90c2e06fcee04adf036a342 (100%) rename test/core/{uri => util}/uri_corpus/042dc4512fa3d391c5170cf3aa61e6a638f84342 (100%) rename test/core/{uri => util}/uri_corpus/0e9bbe975f2027e8c39c89f85f667530368e7d11 (100%) rename test/core/{uri => util}/uri_corpus/1155aa6ea7ef262a81a63692513ea395f84dad6f (100%) rename test/core/{uri => util}/uri_corpus/13856a5569ffd085a4d5c07af5f8e9310835a118 (100%) rename test/core/{uri => util}/uri_corpus/14b57bcbf1e17b1db1de491ef2ba3768f704b7dc (100%) rename test/core/{uri => util}/uri_corpus/1794310671a060eead6e5ee66ac978a18ec7e84f (100%) rename test/core/{uri => util}/uri_corpus/1d30b2a79afbaf2828ff42b9a9647e942ba1ab80 (100%) rename test/core/{uri => util}/uri_corpus/1fcf5d9c333b70596cf5ba04d1f7affdf445b971 (100%) rename test/core/{uri => util}/uri_corpus/23162c8a8936e20b195404c21337ee734d02a6bc (100%) rename test/core/{uri => util}/uri_corpus/23f3198b815ca60bdadcaae682b9f965dda387f1 (100%) rename test/core/{uri => util}/uri_corpus/2ef3893b43f1f60b77b59ce06a6bce9815d78eaf (100%) rename test/core/{uri => util}/uri_corpus/356c3c129e203b5c74550b4209764d74b9caefce (100%) rename test/core/{uri => util}/uri_corpus/396568fc41c8ccb31ec925b4a862e4d29ead1327 (100%) rename test/core/{uri => util}/uri_corpus/3b1e7526a99918006b87e499d2beb6c4ac9c3c0c (100%) rename test/core/{uri => util}/uri_corpus/3b58860f3451d3e7aad99690a8d39782ca5116fc (100%) rename test/core/{uri => util}/uri_corpus/41963cc10752f70c3af7e3d85868efb097a0ea9c (100%) rename test/core/{uri => util}/uri_corpus/47b5228404451fc9d4071fa69192514bb4ce33c1 (100%) rename test/core/{uri => util}/uri_corpus/56a2da4b2e6fb795243901023ed8d0aa083d1aab (100%) rename test/core/{uri => util}/uri_corpus/574c2f13858a9a6d724654bd913ede9ae3abf822 (100%) rename test/core/{uri => util}/uri_corpus/582f789c19033a152094cbf8565f14154a778ddb (100%) rename test/core/{uri => util}/uri_corpus/636c5606fc23713a1bae88c8899c0541cfad4fd8 (100%) rename test/core/{uri => util}/uri_corpus/63fe493b270b17426d77a27cbf3abac5b2c2794a (100%) rename test/core/{uri => util}/uri_corpus/655300a902b62662296a8e46bfb04fbcb07182cb (100%) rename test/core/{uri => util}/uri_corpus/6ae3acd9d8507b61bf235748026080a4138dba58 (100%) rename test/core/{uri => util}/uri_corpus/6b70979a70a038ff6607d6cf85485ee95baf58e6 (100%) rename test/core/{uri => util}/uri_corpus/7314ab3545a7535a26e0e8aad67caea5534d68b1 (100%) rename test/core/{uri => util}/uri_corpus/7ff4d8b8d1ffd0d42c48bbb91e5856a9ec31aecb (100%) rename test/core/{uri => util}/uri_corpus/87daa131e0973b77a232a870ed749ef29cf58e6d (100%) rename test/core/{uri => util}/uri_corpus/884dcaee2908ffe5f12b65b8eba81016099c4266 (100%) rename test/core/{uri => util}/uri_corpus/8d7e944fd5d0ede94097fcc98b47b09a3f9c76cb (100%) rename test/core/{uri => util}/uri_corpus/9671149af0b444f59bbdf71340d3441dadd8a7b4 (100%) rename test/core/{uri => util}/uri_corpus/96c8d266b7dc037288ef305c996608270f72e7fb (100%) rename test/core/{uri => util}/uri_corpus/975536c71ade4800415a7e9c2f1b45c35a6d5ea8 (100%) rename test/core/{uri => util}/uri_corpus/99750aa67d30beaea8af565c829d4999aa8cb91b (100%) rename test/core/{uri => util}/uri_corpus/a1140f3f8b5cffc1010221b9a4084a25fb75c1f6 (100%) rename test/core/{uri => util}/uri_corpus/a1f0f9b75bb354eb063d7cba4fcfa2d0b88d63de (100%) rename test/core/{uri => util}/uri_corpus/a296eb3d1d436ed7df7195b10aa3c4de3896f98d (100%) rename test/core/{uri => util}/uri_corpus/a8b8e66050b424f1b8c07d46f868199fb7f60e38 (100%) rename test/core/{uri => util}/uri_corpus/aba1472880406a318ce207ee79815b7acf087757 (100%) rename test/core/{uri => util}/uri_corpus/af55baf8c8855e563befdf1eefbcbd46c5ddb8d2 (100%) rename test/core/{uri => util}/uri_corpus/b3c0bf66c2bf5d24ef1daf4cc5a9d6d5bd0e8bfd (100%) rename test/core/{uri => util}/uri_corpus/c28a47409cf5d95bb372238d01e73d8b831408e4 (100%) rename test/core/{uri => util}/uri_corpus/c3ef1d41888063a08700c3add1e4465aabcf8807 (100%) rename test/core/{uri => util}/uri_corpus/c550a76af21f9b9cc92a386d5c8998b26f8f2e4d (100%) rename test/core/{uri => util}/uri_corpus/c79721406d0ab80495f186fd88e37fba98637ae9 (100%) rename test/core/{uri => util}/uri_corpus/ceb4e2264ba7a8d5be47d276b37ec09489e00245 (100%) rename test/core/{uri => util}/uri_corpus/cf4395958f5bfb46fd6f535a39657d016c75114c (100%) rename test/core/{uri => util}/uri_corpus/d46668372b7e20154a89409a7430a28e642afdca (100%) rename test/core/{uri => util}/uri_corpus/d6fe7412a0a1d1c733160246f3fa425f4f97682a (100%) rename test/core/{uri => util}/uri_corpus/dns.txt (100%) rename test/core/{uri => util}/uri_corpus/e241f29957b0e30ec11aaaf91b2339f7015fa5fd (100%) rename test/core/{uri => util}/uri_corpus/ea02d9fea9bad5b89cf353a0169238f584177e71 (100%) rename test/core/{uri => util}/uri_corpus/ec4731dddf94ed3ea92ae4d5a71f145ab6e3f6ee (100%) rename test/core/{uri => util}/uri_corpus/ed2f78646f19fc47dd85ff0877c232b71913ece2 (100%) rename test/core/{uri => util}/uri_corpus/f6889f4a6350fea1596a3adea5cdac02bd5d1ff3 (100%) rename test/core/{uri => util}/uri_corpus/f6f3bd030f0d321efe7c51ca3f057de23509af67 (100%) rename test/core/{uri => util}/uri_corpus/f97598cff03306af3c70400608fec47268b5075d (100%) rename test/core/{uri => util}/uri_corpus/f9e1ec1fc642b575bc9955618b7065747f56b101 (100%) rename test/core/{uri => util}/uri_corpus/fe0630a3aeed2ec6f474f362e4c839478290d5c4 (100%) rename test/core/{uri => util}/uri_corpus/ipv4.txt (100%) rename test/core/{uri => util}/uri_corpus/ipv6.txt (100%) rename test/core/{uri => util}/uri_corpus/unix.txt (100%) rename test/core/{uri => util}/uri_fuzzer_test.cc (96%) rename test/core/{uri/uri_parser_test.cc => util/uri_test.cc} (99%) rename test/core/{gprpp => util}/uuid_v4_test.cc (96%) rename test/core/{gprpp => util}/validation_errors_test.cc (98%) rename test/core/{gprpp => util}/work_serializer_test.cc (99%) diff --git a/BUILD b/BUILD index c8c1d72af9d..b5a5a5754b9 100644 --- a/BUILD +++ b/BUILD @@ -681,7 +681,7 @@ grpc_cc_library( "server", "sockaddr_utils", "tsi_base", - "uri_parser", + "uri", "//src/core:channel_args", "//src/core:channel_init", "//src/core:channel_stack_type", @@ -719,50 +719,50 @@ grpc_cc_library( grpc_cc_library( name = "gpr", srcs = [ - "//src/core:lib/gprpp/crash.cc", - "//src/core:lib/gprpp/fork.cc", - "//src/core:lib/gprpp/host_port.cc", - "//src/core:lib/gprpp/mpscq.cc", - "//src/core:lib/gprpp/posix/stat.cc", - "//src/core:lib/gprpp/posix/thd.cc", - "//src/core:lib/gprpp/time_util.cc", - "//src/core:lib/gprpp/windows/stat.cc", - "//src/core:lib/gprpp/windows/thd.cc", "//src/core:util/alloc.cc", + "//src/core:util/crash.cc", + "//src/core:util/fork.cc", + "//src/core:util/gpr_time.cc", + "//src/core:util/host_port.cc", "//src/core:util/iphone/cpu.cc", "//src/core:util/linux/cpu.cc", "//src/core:util/log.cc", + "//src/core:util/mpscq.cc", "//src/core:util/msys/tmpfile.cc", "//src/core:util/posix/cpu.cc", + "//src/core:util/posix/stat.cc", "//src/core:util/posix/string.cc", "//src/core:util/posix/sync.cc", + "//src/core:util/posix/thd.cc", "//src/core:util/posix/time.cc", "//src/core:util/posix/tmpfile.cc", "//src/core:util/string.cc", "//src/core:util/sync.cc", "//src/core:util/sync_abseil.cc", - "//src/core:util/time.cc", "//src/core:util/time_precise.cc", + "//src/core:util/time_util.cc", "//src/core:util/windows/cpu.cc", + "//src/core:util/windows/stat.cc", "//src/core:util/windows/string.cc", "//src/core:util/windows/string_util.cc", "//src/core:util/windows/sync.cc", + "//src/core:util/windows/thd.cc", "//src/core:util/windows/time.cc", "//src/core:util/windows/tmpfile.cc", ], hdrs = [ - "//src/core:lib/gprpp/crash.h", - "//src/core:lib/gprpp/fork.h", - "//src/core:lib/gprpp/host_port.h", - "//src/core:lib/gprpp/memory.h", - "//src/core:lib/gprpp/mpscq.h", - "//src/core:lib/gprpp/stat.h", - "//src/core:lib/gprpp/sync.h", - "//src/core:lib/gprpp/thd.h", - "//src/core:lib/gprpp/time_util.h", "//src/core:util/alloc.h", + "//src/core:util/crash.h", + "//src/core:util/fork.h", + "//src/core:util/host_port.h", + "//src/core:util/memory.h", + "//src/core:util/mpscq.h", + "//src/core:util/stat.h", "//src/core:util/string.h", + "//src/core:util/sync.h", + "//src/core:util/thd.h", "//src/core:util/time_precise.h", + "//src/core:util/time_util.h", "//src/core:util/tmpfile.h", ], external_deps = [ @@ -820,7 +820,7 @@ grpc_cc_library( grpc_cc_library( name = "cpp_impl_of", - hdrs = ["//src/core:lib/gprpp/cpp_impl_of.h"], + hdrs = ["//src/core:util/cpp_impl_of.h"], language = "c++", ) @@ -1392,7 +1392,7 @@ grpc_cc_library( "parse_address", "ref_counted_ptr", "sockaddr_utils", - "uri_parser", + "uri", "//src/core:channel_args", "//src/core:connectivity_state", "//src/core:json", @@ -1507,9 +1507,6 @@ grpc_cc_library( "//src/core:lib/iomgr/ev_posix.cc", "//src/core:lib/iomgr/fork_posix.cc", "//src/core:lib/iomgr/fork_windows.cc", - "//src/core:lib/iomgr/gethostname_fallback.cc", - "//src/core:lib/iomgr/gethostname_host_name_max.cc", - "//src/core:lib/iomgr/gethostname_sysconf.cc", "//src/core:lib/iomgr/iocp_windows.cc", "//src/core:lib/iomgr/iomgr.cc", "//src/core:lib/iomgr/iomgr_posix.cc", @@ -1548,6 +1545,9 @@ grpc_cc_library( "//src/core:lib/iomgr/wakeup_fd_nospecial.cc", "//src/core:lib/iomgr/wakeup_fd_pipe.cc", "//src/core:lib/iomgr/wakeup_fd_posix.cc", + "//src/core:util/gethostname_fallback.cc", + "//src/core:util/gethostname_host_name_max.cc", + "//src/core:util/gethostname_sysconf.cc", ] + # TODO(vigneshbabu): remove these # These headers used to be vended by this target, but they have to be @@ -1568,7 +1568,6 @@ grpc_cc_library( "//src/core:lib/iomgr/ev_epoll1_linux.h", "//src/core:lib/iomgr/ev_poll_posix.h", "//src/core:lib/iomgr/ev_posix.h", - "//src/core:lib/iomgr/gethostname.h", "//src/core:lib/iomgr/iocp_windows.h", "//src/core:lib/iomgr/iomgr.h", "//src/core:lib/iomgr/lockfree_event.h", @@ -1599,6 +1598,7 @@ grpc_cc_library( "//src/core:lib/iomgr/vsock.h", "//src/core:lib/iomgr/wakeup_fd_pipe.h", "//src/core:lib/iomgr/wakeup_fd_posix.h", + "//src/core:util/gethostname.h", ] + # TODO(vigneshbabu): remove these # These headers used to be vended by this target, but they have to be @@ -2982,10 +2982,10 @@ grpc_cc_library( grpc_cc_library( name = "work_serializer", srcs = [ - "//src/core:lib/gprpp/work_serializer.cc", + "//src/core:util/work_serializer.cc", ], hdrs = [ - "//src/core:lib/gprpp/work_serializer.h", + "//src/core:util/work_serializer.h", ], external_deps = [ "absl/base:core_headers", @@ -3114,7 +3114,7 @@ grpc_cc_library( name = "debug_location", external_deps = ["absl/strings"], language = "c++", - public_hdrs = ["//src/core:lib/gprpp/debug_location.h"], + public_hdrs = ["//src/core:util/debug_location.h"], visibility = ["@grpc:debug_location"], deps = ["gpr_platform"], ) @@ -3122,7 +3122,7 @@ grpc_cc_library( grpc_cc_library( name = "orphanable", language = "c++", - public_hdrs = ["//src/core:lib/gprpp/orphanable.h"], + public_hdrs = ["//src/core:util/orphanable.h"], visibility = [ "@grpc:client_channel", "@grpc:xds_client_core", @@ -3159,7 +3159,7 @@ grpc_cc_library( name = "ref_counted_ptr", external_deps = ["absl/hash"], language = "c++", - public_hdrs = ["//src/core:lib/gprpp/ref_counted_ptr.h"], + public_hdrs = ["//src/core:util/ref_counted_ptr.h"], visibility = ["@grpc:ref_counted_ptr"], deps = [ "debug_location", @@ -3306,7 +3306,7 @@ grpc_cc_library( visibility = ["@grpc:alt_grpc_base_legacy"], deps = [ "gpr", - "uri_parser", + "uri", "//src/core:grpc_sockaddr", "//src/core:iomgr_port", "//src/core:resolved_address", @@ -3398,12 +3398,12 @@ grpc_cc_library( ) grpc_cc_library( - name = "uri_parser", + name = "uri", srcs = [ - "//src/core:lib/uri/uri_parser.cc", + "//src/core:util/uri.cc", ], hdrs = [ - "//src/core:lib/uri/uri_parser.h", + "//src/core:util/uri.h", ], external_deps = [ "absl/log:check", @@ -3420,12 +3420,12 @@ grpc_cc_library( name = "parse_address", srcs = [ "//src/core:lib/address_utils/parse_address.cc", - "//src/core:lib/iomgr/grpc_if_nametoindex_posix.cc", - "//src/core:lib/iomgr/grpc_if_nametoindex_unsupported.cc", + "//src/core:util/grpc_if_nametoindex_posix.cc", + "//src/core:util/grpc_if_nametoindex_unsupported.cc", ], hdrs = [ "//src/core:lib/address_utils/parse_address.h", - "//src/core:lib/iomgr/grpc_if_nametoindex.h", + "//src/core:util/grpc_if_nametoindex.h", ], external_deps = [ "absl/log:check", @@ -3437,7 +3437,7 @@ grpc_cc_library( visibility = ["@grpc:alt_grpc_base_legacy"], deps = [ "gpr", - "uri_parser", + "uri", "//src/core:error", "//src/core:grpc_sockaddr", "//src/core:iomgr_port", @@ -3449,10 +3449,10 @@ grpc_cc_library( grpc_cc_library( name = "backoff", srcs = [ - "//src/core:lib/backoff/backoff.cc", + "//src/core:util/backoff.cc", ], hdrs = [ - "//src/core:lib/backoff/backoff.h", + "//src/core:util/backoff.h", ], external_deps = ["absl/random"], language = "c++", @@ -3612,7 +3612,7 @@ grpc_cc_library( "orphanable", "ref_counted_ptr", "server_address", - "uri_parser", + "uri", "//src/core:channel_args", "//src/core:grpc_service_config", "//src/core:iomgr_fwd", @@ -3770,7 +3770,7 @@ grpc_cc_library( "ref_counted_ptr", "sockaddr_utils", "stats", - "uri_parser", + "uri", "work_serializer", "//src/core:arena", "//src/core:arena_promise", @@ -3893,7 +3893,7 @@ grpc_cc_library( "parse_address", "ref_counted_ptr", "sockaddr_utils", - "uri_parser", + "uri", "//src/core:channel_args", "//src/core:closure", "//src/core:error", @@ -3952,7 +3952,7 @@ grpc_cc_library( "ref_counted_ptr", "resource_quota_api", "sockaddr_utils", - "uri_parser", + "uri", "//src/core:channel_args", "//src/core:channel_args_preconditioning", "//src/core:closure", @@ -4082,7 +4082,7 @@ grpc_cc_library( "orphanable", "promise", "ref_counted_ptr", - "uri_parser", + "uri", "//src/core:arena_promise", "//src/core:closure", "//src/core:error", @@ -4451,7 +4451,7 @@ grpc_cc_library( "protobuf_struct_upb", "protobuf_timestamp_upb", "ref_counted_ptr", - "uri_parser", + "uri", "work_serializer", "//src/core:default_event_engine", "//src/core:dual_ref_counted", @@ -4512,7 +4512,7 @@ grpc_cc_library( "grpc_resolver", "orphanable", "ref_counted_ptr", - "uri_parser", + "uri", "work_serializer", "//src/core:channel_args", "//src/core:notification", diff --git a/CMakeLists.txt b/CMakeLists.txt index 169d6d553e3..30472acaacf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1128,6 +1128,7 @@ if(gRPC_BUILD_TESTS) add_dependencies(buildtests_cxx glob_test) add_dependencies(buildtests_cxx goaway_server_test) add_dependencies(buildtests_cxx google_c2p_resolver_test) + add_dependencies(buildtests_cxx gpr_time_test) add_dependencies(buildtests_cxx graceful_server_shutdown_test) add_dependencies(buildtests_cxx graceful_shutdown_test) add_dependencies(buildtests_cxx grpc_alts_credentials_options_test) @@ -1482,7 +1483,6 @@ if(gRPC_BUILD_TESTS) add_dependencies(buildtests_cxx test_core_event_engine_posix_timer_heap_test) add_dependencies(buildtests_cxx test_core_event_engine_posix_timer_list_test) add_dependencies(buildtests_cxx test_core_event_engine_slice_buffer_test) - add_dependencies(buildtests_cxx test_core_gprpp_time_test) add_dependencies(buildtests_cxx test_core_iomgr_timer_heap_test) add_dependencies(buildtests_cxx test_core_security_credentials_test) add_dependencies(buildtests_cxx test_core_security_ssl_credentials_test) @@ -1535,7 +1535,7 @@ if(gRPC_BUILD_TESTS) add_dependencies(buildtests_cxx unique_ptr_with_bitset_test) add_dependencies(buildtests_cxx unique_type_name_test) add_dependencies(buildtests_cxx unknown_frame_bad_client_test) - add_dependencies(buildtests_cxx uri_parser_test) + add_dependencies(buildtests_cxx uri_test) add_dependencies(buildtests_cxx useful_test) add_dependencies(buildtests_cxx uuid_v4_test) add_dependencies(buildtests_cxx validation_errors_test) @@ -1691,41 +1691,41 @@ add_library(gpr src/core/lib/config/config_vars_non_generated.cc src/core/lib/config/load_config.cc src/core/lib/event_engine/thread_local.cc - src/core/lib/gprpp/crash.cc - src/core/lib/gprpp/examine_stack.cc - src/core/lib/gprpp/fork.cc - src/core/lib/gprpp/host_port.cc - src/core/lib/gprpp/linux/env.cc - src/core/lib/gprpp/mpscq.cc - src/core/lib/gprpp/posix/env.cc - src/core/lib/gprpp/posix/stat.cc - src/core/lib/gprpp/posix/thd.cc - src/core/lib/gprpp/strerror.cc - src/core/lib/gprpp/tchar.cc - src/core/lib/gprpp/time_util.cc - src/core/lib/gprpp/windows/env.cc - src/core/lib/gprpp/windows/stat.cc - src/core/lib/gprpp/windows/thd.cc src/core/util/alloc.cc src/core/util/atm.cc + src/core/util/crash.cc + src/core/util/examine_stack.cc + src/core/util/fork.cc + src/core/util/gpr_time.cc + src/core/util/host_port.cc src/core/util/iphone/cpu.cc src/core/util/linux/cpu.cc + src/core/util/linux/env.cc src/core/util/log.cc + src/core/util/mpscq.cc src/core/util/msys/tmpfile.cc src/core/util/posix/cpu.cc + src/core/util/posix/env.cc + src/core/util/posix/stat.cc src/core/util/posix/string.cc src/core/util/posix/sync.cc + src/core/util/posix/thd.cc src/core/util/posix/time.cc src/core/util/posix/tmpfile.cc + src/core/util/strerror.cc src/core/util/string.cc src/core/util/sync.cc src/core/util/sync_abseil.cc - src/core/util/time.cc + src/core/util/tchar.cc src/core/util/time_precise.cc + src/core/util/time_util.cc src/core/util/windows/cpu.cc + src/core/util/windows/env.cc + src/core/util/windows/stat.cc src/core/util/windows/string.cc src/core/util/windows/string_util.cc src/core/util/windows/sync.cc + src/core/util/windows/thd.cc src/core/util/windows/time.cc src/core/util/windows/tmpfile.cc ) @@ -2255,8 +2255,6 @@ add_library(grpc src/core/handshaker/tcp_connect/tcp_connect_handshaker.cc src/core/lib/address_utils/parse_address.cc src/core/lib/address_utils/sockaddr_utils.cc - src/core/lib/backoff/backoff.cc - src/core/lib/backoff/random_early_detection.cc src/core/lib/channel/channel_args.cc src/core/lib/channel/channel_args_preconditioning.cc src/core/lib/channel/channel_stack.cc @@ -2269,7 +2267,6 @@ add_library(grpc src/core/lib/compression/compression_internal.cc src/core/lib/compression/message_compress.cc src/core/lib/config/core_configuration.cc - src/core/lib/debug/event_log.cc src/core/lib/debug/trace.cc src/core/lib/debug/trace_flags.cc src/core/lib/event_engine/ares_resolver.cc @@ -2320,19 +2317,6 @@ add_library(grpc src/core/lib/event_engine/work_queue/basic_work_queue.cc src/core/lib/experiments/config.cc src/core/lib/experiments/experiments.cc - src/core/lib/gprpp/dump_args.cc - src/core/lib/gprpp/glob.cc - src/core/lib/gprpp/load_file.cc - src/core/lib/gprpp/per_cpu.cc - src/core/lib/gprpp/posix/directory_reader.cc - src/core/lib/gprpp/ref_counted_string.cc - src/core/lib/gprpp/status_helper.cc - src/core/lib/gprpp/time.cc - src/core/lib/gprpp/time_averaged_stats.cc - src/core/lib/gprpp/uuid_v4.cc - src/core/lib/gprpp/validation_errors.cc - src/core/lib/gprpp/windows/directory_reader.cc - src/core/lib/gprpp/work_serializer.cc src/core/lib/iomgr/buffer_list.cc src/core/lib/iomgr/call_combiner.cc src/core/lib/iomgr/cfstream_handle.cc @@ -2356,11 +2340,6 @@ add_library(grpc src/core/lib/iomgr/executor.cc src/core/lib/iomgr/fork_posix.cc src/core/lib/iomgr/fork_windows.cc - src/core/lib/iomgr/gethostname_fallback.cc - src/core/lib/iomgr/gethostname_host_name_max.cc - src/core/lib/iomgr/gethostname_sysconf.cc - src/core/lib/iomgr/grpc_if_nametoindex_posix.cc - src/core/lib/iomgr/grpc_if_nametoindex_unsupported.cc src/core/lib/iomgr/internal_errqueue.cc src/core/lib/iomgr/iocp_windows.cc src/core/lib/iomgr/iomgr.cc @@ -2409,7 +2388,6 @@ add_library(grpc src/core/lib/iomgr/wakeup_fd_nospecial.cc src/core/lib/iomgr/wakeup_fd_pipe.cc src/core/lib/iomgr/wakeup_fd_posix.cc - src/core/lib/matchers/matchers.cc src/core/lib/promise/activity.cc src/core/lib/promise/party.cc src/core/lib/promise/sleep.cc @@ -2529,7 +2507,6 @@ add_library(grpc src/core/lib/transport/timeout_encoding.cc src/core/lib/transport/transport.cc src/core/lib/transport/transport_op_string.cc - src/core/lib/uri/uri_parser.cc src/core/load_balancing/address_filtering.cc src/core/load_balancing/backend_metric_parser.cc src/core/load_balancing/child_policy_handler.cc @@ -2622,7 +2599,16 @@ add_library(grpc src/core/tsi/ssl_transport_security_utils.cc src/core/tsi/transport_security.cc src/core/tsi/transport_security_grpc.cc + src/core/util/backoff.cc + src/core/util/dump_args.cc + src/core/util/event_log.cc src/core/util/gcp_metadata_query.cc + src/core/util/gethostname_fallback.cc + src/core/util/gethostname_host_name_max.cc + src/core/util/gethostname_sysconf.cc + src/core/util/glob.cc + src/core/util/grpc_if_nametoindex_posix.cc + src/core/util/grpc_if_nametoindex_unsupported.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 @@ -2632,6 +2618,20 @@ add_library(grpc src/core/util/json/json_util.cc src/core/util/json/json_writer.cc src/core/util/latent_see.cc + src/core/util/load_file.cc + src/core/util/matchers.cc + src/core/util/per_cpu.cc + src/core/util/posix/directory_reader.cc + src/core/util/random_early_detection.cc + src/core/util/ref_counted_string.cc + src/core/util/status_helper.cc + src/core/util/time.cc + src/core/util/time_averaged_stats.cc + src/core/util/uri.cc + src/core/util/uuid_v4.cc + src/core/util/validation_errors.cc + src/core/util/windows/directory_reader.cc + src/core/util/work_serializer.cc src/core/xds/grpc/certificate_provider_store.cc src/core/xds/grpc/file_watcher_certificate_provider_factory.cc src/core/xds/grpc/xds_audit_logger_registry.cc @@ -3061,8 +3061,6 @@ add_library(grpc_unsecure src/core/handshaker/tcp_connect/tcp_connect_handshaker.cc src/core/lib/address_utils/parse_address.cc src/core/lib/address_utils/sockaddr_utils.cc - src/core/lib/backoff/backoff.cc - src/core/lib/backoff/random_early_detection.cc src/core/lib/channel/channel_args.cc src/core/lib/channel/channel_args_preconditioning.cc src/core/lib/channel/channel_stack.cc @@ -3075,7 +3073,6 @@ add_library(grpc_unsecure src/core/lib/compression/compression_internal.cc src/core/lib/compression/message_compress.cc src/core/lib/config/core_configuration.cc - src/core/lib/debug/event_log.cc src/core/lib/debug/trace.cc src/core/lib/debug/trace_flags.cc src/core/lib/event_engine/ares_resolver.cc @@ -3126,17 +3123,6 @@ add_library(grpc_unsecure src/core/lib/event_engine/work_queue/basic_work_queue.cc src/core/lib/experiments/config.cc src/core/lib/experiments/experiments.cc - src/core/lib/gprpp/dump_args.cc - src/core/lib/gprpp/glob.cc - src/core/lib/gprpp/load_file.cc - src/core/lib/gprpp/per_cpu.cc - src/core/lib/gprpp/ref_counted_string.cc - src/core/lib/gprpp/status_helper.cc - src/core/lib/gprpp/time.cc - src/core/lib/gprpp/time_averaged_stats.cc - src/core/lib/gprpp/uuid_v4.cc - src/core/lib/gprpp/validation_errors.cc - src/core/lib/gprpp/work_serializer.cc src/core/lib/iomgr/buffer_list.cc src/core/lib/iomgr/call_combiner.cc src/core/lib/iomgr/cfstream_handle.cc @@ -3160,11 +3146,6 @@ add_library(grpc_unsecure src/core/lib/iomgr/executor.cc src/core/lib/iomgr/fork_posix.cc src/core/lib/iomgr/fork_windows.cc - src/core/lib/iomgr/gethostname_fallback.cc - src/core/lib/iomgr/gethostname_host_name_max.cc - src/core/lib/iomgr/gethostname_sysconf.cc - src/core/lib/iomgr/grpc_if_nametoindex_posix.cc - src/core/lib/iomgr/grpc_if_nametoindex_unsupported.cc src/core/lib/iomgr/internal_errqueue.cc src/core/lib/iomgr/iocp_windows.cc src/core/lib/iomgr/iomgr.cc @@ -3296,7 +3277,6 @@ add_library(grpc_unsecure src/core/lib/transport/timeout_encoding.cc src/core/lib/transport/transport.cc src/core/lib/transport/transport_op_string.cc - src/core/lib/uri/uri_parser.cc src/core/load_balancing/address_filtering.cc src/core/load_balancing/backend_metric_parser.cc src/core/load_balancing/child_policy_handler.cc @@ -3352,6 +3332,15 @@ add_library(grpc_unsecure src/core/tsi/local_transport_security.cc src/core/tsi/transport_security.cc src/core/tsi/transport_security_grpc.cc + src/core/util/backoff.cc + src/core/util/dump_args.cc + src/core/util/event_log.cc + src/core/util/gethostname_fallback.cc + src/core/util/gethostname_host_name_max.cc + src/core/util/gethostname_sysconf.cc + src/core/util/glob.cc + src/core/util/grpc_if_nametoindex_posix.cc + src/core/util/grpc_if_nametoindex_unsupported.cc src/core/util/http_client/format_request.cc src/core/util/http_client/httpcli.cc src/core/util/http_client/parser.cc @@ -3359,6 +3348,17 @@ add_library(grpc_unsecure src/core/util/json/json_reader.cc src/core/util/json/json_writer.cc src/core/util/latent_see.cc + src/core/util/load_file.cc + src/core/util/per_cpu.cc + src/core/util/random_early_detection.cc + src/core/util/ref_counted_string.cc + src/core/util/status_helper.cc + src/core/util/time.cc + src/core/util/time_averaged_stats.cc + src/core/util/uri.cc + src/core/util/uuid_v4.cc + src/core/util/validation_errors.cc + src/core/util/work_serializer.cc ${gRPC_ADDITIONAL_DLL_SRC} ) @@ -5282,7 +5282,6 @@ add_library(grpc_authorization_provider src/core/handshaker/security/security_handshaker.cc src/core/lib/address_utils/parse_address.cc src/core/lib/address_utils/sockaddr_utils.cc - src/core/lib/backoff/backoff.cc src/core/lib/channel/channel_args.cc src/core/lib/channel/channel_args_preconditioning.cc src/core/lib/channel/channel_stack.cc @@ -5295,7 +5294,6 @@ add_library(grpc_authorization_provider src/core/lib/compression/compression_internal.cc src/core/lib/compression/message_compress.cc src/core/lib/config/core_configuration.cc - src/core/lib/debug/event_log.cc src/core/lib/debug/trace.cc src/core/lib/debug/trace_flags.cc src/core/lib/event_engine/ares_resolver.cc @@ -5346,16 +5344,6 @@ add_library(grpc_authorization_provider src/core/lib/event_engine/work_queue/basic_work_queue.cc src/core/lib/experiments/config.cc src/core/lib/experiments/experiments.cc - src/core/lib/gprpp/dump_args.cc - src/core/lib/gprpp/glob.cc - src/core/lib/gprpp/load_file.cc - src/core/lib/gprpp/per_cpu.cc - src/core/lib/gprpp/ref_counted_string.cc - src/core/lib/gprpp/status_helper.cc - src/core/lib/gprpp/time.cc - src/core/lib/gprpp/time_averaged_stats.cc - src/core/lib/gprpp/validation_errors.cc - src/core/lib/gprpp/work_serializer.cc src/core/lib/iomgr/buffer_list.cc src/core/lib/iomgr/call_combiner.cc src/core/lib/iomgr/cfstream_handle.cc @@ -5379,11 +5367,6 @@ add_library(grpc_authorization_provider src/core/lib/iomgr/executor.cc src/core/lib/iomgr/fork_posix.cc src/core/lib/iomgr/fork_windows.cc - src/core/lib/iomgr/gethostname_fallback.cc - src/core/lib/iomgr/gethostname_host_name_max.cc - src/core/lib/iomgr/gethostname_sysconf.cc - src/core/lib/iomgr/grpc_if_nametoindex_posix.cc - src/core/lib/iomgr/grpc_if_nametoindex_unsupported.cc src/core/lib/iomgr/internal_errqueue.cc src/core/lib/iomgr/iocp_windows.cc src/core/lib/iomgr/iomgr.cc @@ -5432,7 +5415,6 @@ add_library(grpc_authorization_provider src/core/lib/iomgr/wakeup_fd_nospecial.cc src/core/lib/iomgr/wakeup_fd_pipe.cc src/core/lib/iomgr/wakeup_fd_posix.cc - src/core/lib/matchers/matchers.cc src/core/lib/promise/activity.cc src/core/lib/promise/party.cc src/core/lib/resource_quota/api.cc @@ -5513,7 +5495,6 @@ add_library(grpc_authorization_provider src/core/lib/transport/timeout_encoding.cc src/core/lib/transport/transport.cc src/core/lib/transport/transport_op_string.cc - src/core/lib/uri/uri_parser.cc src/core/load_balancing/lb_policy.cc src/core/load_balancing/lb_policy_registry.cc src/core/resolver/endpoint_addresses.cc @@ -5528,9 +5509,28 @@ add_library(grpc_authorization_provider src/core/tsi/alts/handshaker/transport_security_common_api.cc src/core/tsi/transport_security.cc src/core/tsi/transport_security_grpc.cc + src/core/util/backoff.cc + src/core/util/dump_args.cc + src/core/util/event_log.cc + src/core/util/gethostname_fallback.cc + src/core/util/gethostname_host_name_max.cc + src/core/util/gethostname_sysconf.cc + src/core/util/glob.cc + src/core/util/grpc_if_nametoindex_posix.cc + src/core/util/grpc_if_nametoindex_unsupported.cc src/core/util/json/json_reader.cc src/core/util/json/json_writer.cc src/core/util/latent_see.cc + src/core/util/load_file.cc + src/core/util/matchers.cc + src/core/util/per_cpu.cc + src/core/util/ref_counted_string.cc + src/core/util/status_helper.cc + src/core/util/time.cc + src/core/util/time_averaged_stats.cc + src/core/util/uri.cc + src/core/util/validation_errors.cc + src/core/util/work_serializer.cc ) target_compile_features(grpc_authorization_provider PUBLIC cxx_std_14) @@ -6089,11 +6089,11 @@ if(gRPC_BUILD_TESTS) add_executable(activity_test src/core/lib/debug/trace.cc src/core/lib/debug/trace_flags.cc - src/core/lib/gprpp/dump_args.cc - src/core/lib/gprpp/glob.cc - src/core/lib/gprpp/per_cpu.cc src/core/lib/promise/activity.cc + src/core/util/dump_args.cc + src/core/util/glob.cc src/core/util/latent_see.cc + src/core/util/per_cpu.cc test/core/promise/activity_test.cc ) if(WIN32 AND MSVC) @@ -6367,7 +6367,7 @@ if(gRPC_BUILD_TESTS) add_executable(all_ok_test src/core/lib/debug/trace.cc src/core/lib/debug/trace_flags.cc - src/core/lib/gprpp/glob.cc + src/core/util/glob.cc test/core/promise/all_ok_test.cc ) if(WIN32 AND MSVC) @@ -7422,7 +7422,7 @@ endif() if(gRPC_BUILD_TESTS) add_executable(avl_test - test/core/avl/avl_test.cc + test/core/util/avl_test.cc ) if(WIN32 AND MSVC) if(BUILD_SHARED_LIBS) @@ -7575,7 +7575,7 @@ endif() if(gRPC_BUILD_TESTS) add_executable(backoff_test - test/core/backoff/backoff_test.cc + test/core/util/backoff_test.cc ) if(WIN32 AND MSVC) if(BUILD_SHARED_LIBS) @@ -8370,7 +8370,7 @@ endif() if(gRPC_BUILD_TESTS) add_executable(bitset_test - test/core/gprpp/bitset_test.cc + test/core/util/bitset_test.cc ) target_compile_features(bitset_test PUBLIC cxx_std_14) target_include_directories(bitset_test @@ -8656,12 +8656,6 @@ add_executable(call_filters_test src/core/lib/debug/trace_flags.cc src/core/lib/experiments/config.cc src/core/lib/experiments/experiments.cc - src/core/lib/gprpp/dump_args.cc - src/core/lib/gprpp/glob.cc - src/core/lib/gprpp/per_cpu.cc - src/core/lib/gprpp/ref_counted_string.cc - src/core/lib/gprpp/status_helper.cc - src/core/lib/gprpp/time.cc src/core/lib/iomgr/closure.cc src/core/lib/iomgr/combiner.cc src/core/lib/iomgr/error.cc @@ -8690,7 +8684,13 @@ add_executable(call_filters_test src/core/lib/transport/parsed_metadata.cc src/core/lib/transport/status_conversion.cc src/core/lib/transport/timeout_encoding.cc + src/core/util/dump_args.cc + src/core/util/glob.cc src/core/util/latent_see.cc + src/core/util/per_cpu.cc + src/core/util/ref_counted_string.cc + src/core/util/status_helper.cc + src/core/util/time.cc test/core/transport/call_filters_test.cc ) if(WIN32 AND MSVC) @@ -8903,12 +8903,12 @@ if(gRPC_BUILD_TESTS) add_executable(call_state_test src/core/lib/debug/trace.cc src/core/lib/debug/trace_flags.cc - src/core/lib/gprpp/dump_args.cc - src/core/lib/gprpp/glob.cc - src/core/lib/gprpp/per_cpu.cc src/core/lib/promise/activity.cc src/core/lib/transport/call_state.cc + src/core/util/dump_args.cc + src/core/util/glob.cc src/core/util/latent_see.cc + src/core/util/per_cpu.cc test/core/transport/call_state_test.cc ) if(WIN32 AND MSVC) @@ -9010,7 +9010,6 @@ add_executable(call_utils_test src/core/handshaker/proxy_mapper_registry.cc src/core/lib/address_utils/parse_address.cc src/core/lib/address_utils/sockaddr_utils.cc - src/core/lib/backoff/backoff.cc src/core/lib/channel/channel_args.cc src/core/lib/channel/channel_args_preconditioning.cc src/core/lib/channel/channel_stack.cc @@ -9023,7 +9022,6 @@ add_executable(call_utils_test src/core/lib/compression/compression_internal.cc src/core/lib/compression/message_compress.cc src/core/lib/config/core_configuration.cc - src/core/lib/debug/event_log.cc src/core/lib/debug/trace.cc src/core/lib/debug/trace_flags.cc src/core/lib/event_engine/ares_resolver.cc @@ -9074,16 +9072,6 @@ add_executable(call_utils_test src/core/lib/event_engine/work_queue/basic_work_queue.cc src/core/lib/experiments/config.cc src/core/lib/experiments/experiments.cc - src/core/lib/gprpp/dump_args.cc - src/core/lib/gprpp/glob.cc - src/core/lib/gprpp/load_file.cc - src/core/lib/gprpp/per_cpu.cc - src/core/lib/gprpp/ref_counted_string.cc - src/core/lib/gprpp/status_helper.cc - src/core/lib/gprpp/time.cc - src/core/lib/gprpp/time_averaged_stats.cc - src/core/lib/gprpp/validation_errors.cc - src/core/lib/gprpp/work_serializer.cc src/core/lib/iomgr/buffer_list.cc src/core/lib/iomgr/call_combiner.cc src/core/lib/iomgr/cfstream_handle.cc @@ -9107,11 +9095,6 @@ add_executable(call_utils_test src/core/lib/iomgr/executor.cc src/core/lib/iomgr/fork_posix.cc src/core/lib/iomgr/fork_windows.cc - src/core/lib/iomgr/gethostname_fallback.cc - src/core/lib/iomgr/gethostname_host_name_max.cc - src/core/lib/iomgr/gethostname_sysconf.cc - src/core/lib/iomgr/grpc_if_nametoindex_posix.cc - src/core/lib/iomgr/grpc_if_nametoindex_unsupported.cc src/core/lib/iomgr/internal_errqueue.cc src/core/lib/iomgr/iocp_windows.cc src/core/lib/iomgr/iomgr.cc @@ -9217,7 +9200,6 @@ add_executable(call_utils_test src/core/lib/transport/timeout_encoding.cc src/core/lib/transport/transport.cc src/core/lib/transport/transport_op_string.cc - src/core/lib/uri/uri_parser.cc src/core/load_balancing/lb_policy.cc src/core/load_balancing/lb_policy_registry.cc src/core/resolver/endpoint_addresses.cc @@ -9230,8 +9212,26 @@ add_executable(call_utils_test src/core/telemetry/stats.cc src/core/telemetry/stats_data.cc src/core/tsi/alts/handshaker/transport_security_common_api.cc + src/core/util/backoff.cc + src/core/util/dump_args.cc + src/core/util/event_log.cc + src/core/util/gethostname_fallback.cc + src/core/util/gethostname_host_name_max.cc + src/core/util/gethostname_sysconf.cc + src/core/util/glob.cc + src/core/util/grpc_if_nametoindex_posix.cc + src/core/util/grpc_if_nametoindex_unsupported.cc src/core/util/json/json_writer.cc src/core/util/latent_see.cc + src/core/util/load_file.cc + src/core/util/per_cpu.cc + src/core/util/ref_counted_string.cc + src/core/util/status_helper.cc + src/core/util/time.cc + src/core/util/time_averaged_stats.cc + src/core/util/uri.cc + src/core/util/validation_errors.cc + src/core/util/work_serializer.cc test/core/call/call_utils_test.cc ) if(WIN32 AND MSVC) @@ -9657,11 +9657,6 @@ add_executable(cancel_callback_test src/core/lib/debug/trace_flags.cc src/core/lib/experiments/config.cc src/core/lib/experiments/experiments.cc - src/core/lib/gprpp/dump_args.cc - src/core/lib/gprpp/glob.cc - src/core/lib/gprpp/per_cpu.cc - src/core/lib/gprpp/status_helper.cc - src/core/lib/gprpp/time.cc src/core/lib/iomgr/closure.cc src/core/lib/iomgr/combiner.cc src/core/lib/iomgr/error.cc @@ -9678,7 +9673,12 @@ add_executable(cancel_callback_test src/core/lib/slice/percent_encoding.cc src/core/lib/slice/slice.cc src/core/lib/slice/slice_string_helpers.cc + src/core/util/dump_args.cc + src/core/util/glob.cc src/core/util/latent_see.cc + src/core/util/per_cpu.cc + src/core/util/status_helper.cc + src/core/util/time.cc test/core/promise/cancel_callback_test.cc ) if(WIN32 AND MSVC) @@ -10757,11 +10757,6 @@ add_executable(chunked_vector_test src/core/lib/debug/trace_flags.cc src/core/lib/experiments/config.cc src/core/lib/experiments/experiments.cc - src/core/lib/gprpp/dump_args.cc - src/core/lib/gprpp/glob.cc - src/core/lib/gprpp/per_cpu.cc - src/core/lib/gprpp/status_helper.cc - src/core/lib/gprpp/time.cc src/core/lib/iomgr/closure.cc src/core/lib/iomgr/combiner.cc src/core/lib/iomgr/error.cc @@ -10778,8 +10773,13 @@ add_executable(chunked_vector_test src/core/lib/slice/percent_encoding.cc src/core/lib/slice/slice.cc src/core/lib/slice/slice_string_helpers.cc + src/core/util/dump_args.cc + src/core/util/glob.cc src/core/util/latent_see.cc - test/core/gprpp/chunked_vector_test.cc + src/core/util/per_cpu.cc + src/core/util/status_helper.cc + src/core/util/time.cc + test/core/util/chunked_vector_test.cc ) if(WIN32 AND MSVC) if(BUILD_SHARED_LIBS) @@ -12380,7 +12380,7 @@ endif() if(gRPC_BUILD_TESTS) add_executable(cpp_impl_of_test - test/core/gprpp/cpp_impl_of_test.cc + test/core/util/cpp_impl_of_test.cc ) target_compile_features(cpp_impl_of_test PUBLIC cxx_std_14) target_include_directories(cpp_impl_of_test @@ -12767,7 +12767,7 @@ endif() if(gRPC_BUILD_TESTS) add_executable(directory_reader_test - test/core/gprpp/directory_reader_test.cc + test/core/util/directory_reader_test.cc ) if(WIN32 AND MSVC) if(BUILD_SHARED_LIBS) @@ -12956,7 +12956,7 @@ endif() if(gRPC_BUILD_TESTS) add_executable(down_cast_test - test/core/gprpp/down_cast_test.cc + test/core/util/down_cast_test.cc ) if(WIN32 AND MSVC) if(BUILD_SHARED_LIBS) @@ -12998,7 +12998,7 @@ endif() if(gRPC_BUILD_TESTS) add_executable(dual_ref_counted_test - test/core/gprpp/dual_ref_counted_test.cc + test/core/util/dual_ref_counted_test.cc ) if(WIN32 AND MSVC) if(BUILD_SHARED_LIBS) @@ -13085,8 +13085,8 @@ endif() if(gRPC_BUILD_TESTS) add_executable(dump_args_test - src/core/lib/gprpp/dump_args.cc - test/core/gprpp/dump_args_test.cc + src/core/util/dump_args.cc + test/core/util/dump_args_test.cc ) target_compile_features(dump_args_test PUBLIC cxx_std_14) target_include_directories(dump_args_test @@ -13512,9 +13512,9 @@ if(gRPC_BUILD_TESTS) add_executable(endpoint_config_test src/core/lib/channel/channel_args.cc src/core/lib/event_engine/channel_args_endpoint_config.cc - src/core/lib/gprpp/ref_counted_string.cc - src/core/lib/gprpp/time.cc src/core/lib/surface/channel_stack_type.cc + src/core/util/ref_counted_string.cc + src/core/util/time.cc test/core/event_engine/endpoint_config_test.cc ) if(WIN32 AND MSVC) @@ -13952,7 +13952,7 @@ if(gRPC_BUILD_TESTS) if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) add_executable(examine_stack_test - test/core/gprpp/examine_stack_test.cc + test/core/util/examine_stack_test.cc ) if(WIN32 AND MSVC) if(BUILD_SHARED_LIBS) @@ -14060,11 +14060,6 @@ add_executable(exec_ctx_wakeup_scheduler_test src/core/lib/debug/trace_flags.cc src/core/lib/experiments/config.cc src/core/lib/experiments/experiments.cc - src/core/lib/gprpp/dump_args.cc - src/core/lib/gprpp/glob.cc - src/core/lib/gprpp/per_cpu.cc - src/core/lib/gprpp/status_helper.cc - src/core/lib/gprpp/time.cc src/core/lib/iomgr/closure.cc src/core/lib/iomgr/combiner.cc src/core/lib/iomgr/error.cc @@ -14075,7 +14070,12 @@ add_executable(exec_ctx_wakeup_scheduler_test src/core/lib/slice/percent_encoding.cc src/core/lib/slice/slice.cc src/core/lib/slice/slice_string_helpers.cc + src/core/util/dump_args.cc + src/core/util/glob.cc src/core/util/latent_see.cc + src/core/util/per_cpu.cc + src/core/util/status_helper.cc + src/core/util/time.cc test/core/promise/exec_ctx_wakeup_scheduler_test.cc ) if(WIN32 AND MSVC) @@ -14854,11 +14854,6 @@ add_executable(flow_control_test src/core/lib/debug/trace_flags.cc src/core/lib/experiments/config.cc src/core/lib/experiments/experiments.cc - src/core/lib/gprpp/dump_args.cc - src/core/lib/gprpp/glob.cc - src/core/lib/gprpp/per_cpu.cc - src/core/lib/gprpp/status_helper.cc - src/core/lib/gprpp/time.cc src/core/lib/iomgr/closure.cc src/core/lib/iomgr/combiner.cc src/core/lib/iomgr/error.cc @@ -14876,7 +14871,12 @@ add_executable(flow_control_test src/core/lib/slice/slice_buffer.cc src/core/lib/slice/slice_string_helpers.cc src/core/lib/transport/bdp_estimator.cc + src/core/util/dump_args.cc + src/core/util/glob.cc src/core/util/latent_see.cc + src/core/util/per_cpu.cc + src/core/util/status_helper.cc + src/core/util/time.cc test/core/transport/chttp2/flow_control_test.cc ) if(WIN32 AND MSVC) @@ -14933,11 +14933,6 @@ add_executable(for_each_test src/core/lib/debug/trace_flags.cc src/core/lib/experiments/config.cc src/core/lib/experiments/experiments.cc - src/core/lib/gprpp/dump_args.cc - src/core/lib/gprpp/glob.cc - src/core/lib/gprpp/per_cpu.cc - src/core/lib/gprpp/status_helper.cc - src/core/lib/gprpp/time.cc src/core/lib/iomgr/closure.cc src/core/lib/iomgr/combiner.cc src/core/lib/iomgr/error.cc @@ -14954,7 +14949,12 @@ add_executable(for_each_test src/core/lib/slice/percent_encoding.cc src/core/lib/slice/slice.cc src/core/lib/slice/slice_string_helpers.cc + src/core/util/dump_args.cc + src/core/util/glob.cc src/core/util/latent_see.cc + src/core/util/per_cpu.cc + src/core/util/status_helper.cc + src/core/util/time.cc test/core/promise/for_each_test.cc ) if(WIN32 AND MSVC) @@ -15005,7 +15005,7 @@ if(gRPC_BUILD_TESTS) if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) add_executable(fork_test - test/core/gprpp/fork_test.cc + test/core/util/fork_test.cc ) if(WIN32 AND MSVC) if(BUILD_SHARED_LIBS) @@ -15051,7 +15051,7 @@ add_executable(forkable_test src/core/lib/debug/trace.cc src/core/lib/debug/trace_flags.cc src/core/lib/event_engine/forkable.cc - src/core/lib/gprpp/glob.cc + src/core/util/glob.cc test/core/event_engine/forkable_test.cc ) if(WIN32 AND MSVC) @@ -15196,10 +15196,10 @@ add_executable(frame_test src/core/ext/transport/chttp2/transport/frame.cc src/core/lib/debug/trace.cc src/core/lib/debug/trace_flags.cc - src/core/lib/gprpp/glob.cc src/core/lib/slice/slice.cc src/core/lib/slice/slice_buffer.cc src/core/lib/slice/slice_string_helpers.cc + src/core/util/glob.cc test/core/transport/chttp2/frame_test.cc ) if(WIN32 AND MSVC) @@ -15460,7 +15460,7 @@ endif() if(gRPC_BUILD_TESTS) add_executable(glob_test - test/core/gprpp/glob_test.cc + test/core/util/glob_test.cc ) if(WIN32 AND MSVC) if(BUILD_SHARED_LIBS) @@ -15585,6 +15585,48 @@ target_link_libraries(google_c2p_resolver_test ) +endif() +if(gRPC_BUILD_TESTS) + +add_executable(gpr_time_test + test/core/util/gpr_time_test.cc +) +if(WIN32 AND MSVC) + if(BUILD_SHARED_LIBS) + target_compile_definitions(gpr_time_test + PRIVATE + "GPR_DLL_IMPORTS" + "GRPC_DLL_IMPORTS" + ) + endif() +endif() +target_compile_features(gpr_time_test PUBLIC cxx_std_14) +target_include_directories(gpr_time_test + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_RE2_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_XXHASH_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} +) + +target_link_libraries(gpr_time_test + ${_gRPC_ALLTARGETS_LIBRARIES} + gtest + grpc_test_util +) + + endif() if(gRPC_BUILD_TESTS) @@ -17461,7 +17503,7 @@ endif() if(gRPC_BUILD_TESTS) add_executable(host_port_test - test/core/gprpp/host_port_test.cc + test/core/util/host_port_test.cc ) if(WIN32 AND MSVC) if(BUILD_SHARED_LIBS) @@ -18108,7 +18150,7 @@ endif() if(gRPC_BUILD_TESTS) add_executable(if_list_test - test/core/gprpp/if_list_test.cc + test/core/util/if_list_test.cc ) target_compile_features(if_list_test PUBLIC cxx_std_14) target_include_directories(if_list_test @@ -18422,11 +18464,11 @@ if(gRPC_BUILD_TESTS) add_executable(inter_activity_pipe_test src/core/lib/debug/trace.cc src/core/lib/debug/trace_flags.cc - src/core/lib/gprpp/dump_args.cc - src/core/lib/gprpp/glob.cc - src/core/lib/gprpp/per_cpu.cc src/core/lib/promise/activity.cc + src/core/util/dump_args.cc + src/core/util/glob.cc src/core/util/latent_see.cc + src/core/util/per_cpu.cc test/core/promise/inter_activity_pipe_test.cc ) if(WIN32 AND MSVC) @@ -18521,11 +18563,6 @@ add_executable(interceptor_list_test src/core/lib/debug/trace_flags.cc src/core/lib/experiments/config.cc src/core/lib/experiments/experiments.cc - src/core/lib/gprpp/dump_args.cc - src/core/lib/gprpp/glob.cc - src/core/lib/gprpp/per_cpu.cc - src/core/lib/gprpp/status_helper.cc - src/core/lib/gprpp/time.cc src/core/lib/iomgr/closure.cc src/core/lib/iomgr/combiner.cc src/core/lib/iomgr/error.cc @@ -18542,7 +18579,12 @@ add_executable(interceptor_list_test src/core/lib/slice/percent_encoding.cc src/core/lib/slice/slice.cc src/core/lib/slice/slice_string_helpers.cc + src/core/util/dump_args.cc + src/core/util/glob.cc src/core/util/latent_see.cc + src/core/util/per_cpu.cc + src/core/util/status_helper.cc + src/core/util/time.cc test/core/promise/interceptor_list_test.cc ) if(WIN32 AND MSVC) @@ -18904,7 +18946,7 @@ if(gRPC_BUILD_TESTS) add_executable(join_test src/core/lib/debug/trace.cc src/core/lib/debug/trace_flags.cc - src/core/lib/gprpp/glob.cc + src/core/util/glob.cc test/core/promise/join_test.cc ) if(WIN32 AND MSVC) @@ -19306,11 +19348,11 @@ if(gRPC_BUILD_TESTS) add_executable(latch_test src/core/lib/debug/trace.cc src/core/lib/debug/trace_flags.cc - src/core/lib/gprpp/dump_args.cc - src/core/lib/gprpp/glob.cc - src/core/lib/gprpp/per_cpu.cc src/core/lib/promise/activity.cc + src/core/util/dump_args.cc + src/core/util/glob.cc src/core/util/latent_see.cc + src/core/util/per_cpu.cc test/core/promise/latch_test.cc ) if(WIN32 AND MSVC) @@ -19585,7 +19627,7 @@ endif() if(gRPC_BUILD_TESTS) add_executable(load_file_test - test/core/gprpp/load_file_test.cc + test/core/util/load_file_test.cc ) if(WIN32 AND MSVC) if(BUILD_SHARED_LIBS) @@ -19673,7 +19715,7 @@ if(gRPC_BUILD_TESTS) add_executable(loop_test src/core/lib/debug/trace.cc src/core/lib/debug/trace_flags.cc - src/core/lib/gprpp/glob.cc + src/core/util/glob.cc test/core/promise/loop_test.cc ) if(WIN32 AND MSVC) @@ -19760,11 +19802,6 @@ add_executable(map_pipe_test src/core/lib/debug/trace_flags.cc src/core/lib/experiments/config.cc src/core/lib/experiments/experiments.cc - src/core/lib/gprpp/dump_args.cc - src/core/lib/gprpp/glob.cc - src/core/lib/gprpp/per_cpu.cc - src/core/lib/gprpp/status_helper.cc - src/core/lib/gprpp/time.cc src/core/lib/iomgr/closure.cc src/core/lib/iomgr/combiner.cc src/core/lib/iomgr/error.cc @@ -19781,7 +19818,12 @@ add_executable(map_pipe_test src/core/lib/slice/percent_encoding.cc src/core/lib/slice/slice.cc src/core/lib/slice/slice_string_helpers.cc + src/core/util/dump_args.cc + src/core/util/glob.cc src/core/util/latent_see.cc + src/core/util/per_cpu.cc + src/core/util/status_helper.cc + src/core/util/time.cc test/core/promise/map_pipe_test.cc ) if(WIN32 AND MSVC) @@ -19831,7 +19873,7 @@ endif() if(gRPC_BUILD_TESTS) add_executable(match_test - test/core/gprpp/match_test.cc + test/core/util/match_test.cc ) target_compile_features(match_test PUBLIC cxx_std_14) target_include_directories(match_test @@ -19863,7 +19905,6 @@ endif() if(gRPC_BUILD_TESTS) add_executable(matchers_test - test/core/matchers/matchers_test.cc test/core/test_util/cmdline.cc test/core/test_util/fuzzer_util.cc test/core/test_util/grpc_profiler.cc @@ -19873,6 +19914,7 @@ add_executable(matchers_test test/core/test_util/resolve_localhost_ip46.cc test/core/test_util/slice_splitter.cc test/core/test_util/tracer_util.cc + test/core/util/matchers_test.cc ) if(WIN32 AND MSVC) if(BUILD_SHARED_LIBS) @@ -20697,11 +20739,11 @@ if(gRPC_BUILD_TESTS) add_executable(mpsc_test src/core/lib/debug/trace.cc src/core/lib/debug/trace_flags.cc - src/core/lib/gprpp/dump_args.cc - src/core/lib/gprpp/glob.cc - src/core/lib/gprpp/per_cpu.cc src/core/lib/promise/activity.cc + src/core/util/dump_args.cc + src/core/util/glob.cc src/core/util/latent_see.cc + src/core/util/per_cpu.cc test/core/promise/mpsc_test.cc ) if(WIN32 AND MSVC) @@ -20749,7 +20791,7 @@ if(gRPC_BUILD_TESTS) if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) add_executable(mpscq_test - test/core/gprpp/mpscq_test.cc + test/core/util/mpscq_test.cc ) if(WIN32 AND MSVC) if(BUILD_SHARED_LIBS) @@ -20855,7 +20897,7 @@ endif() if(gRPC_BUILD_TESTS) add_executable(no_destruct_test - test/core/gprpp/no_destruct_test.cc + test/core/util/no_destruct_test.cc ) target_compile_features(no_destruct_test PUBLIC cxx_std_14) target_include_directories(no_destruct_test @@ -21115,7 +21157,7 @@ endif() if(gRPC_BUILD_TESTS) add_executable(notification_test - test/core/gprpp/notification_test.cc + test/core/util/notification_test.cc ) if(WIN32 AND MSVC) if(BUILD_SHARED_LIBS) @@ -21200,11 +21242,11 @@ if(gRPC_BUILD_TESTS) add_executable(observable_test src/core/lib/debug/trace.cc src/core/lib/debug/trace_flags.cc - src/core/lib/gprpp/dump_args.cc - src/core/lib/gprpp/glob.cc - src/core/lib/gprpp/per_cpu.cc src/core/lib/promise/activity.cc + src/core/util/dump_args.cc + src/core/util/glob.cc src/core/util/latent_see.cc + src/core/util/per_cpu.cc test/core/promise/observable_test.cc ) if(WIN32 AND MSVC) @@ -21352,7 +21394,7 @@ endif() if(gRPC_BUILD_TESTS) add_executable(orphanable_test - test/core/gprpp/orphanable_test.cc + test/core/util/orphanable_test.cc ) if(WIN32 AND MSVC) if(BUILD_SHARED_LIBS) @@ -21629,7 +21671,7 @@ endif() if(gRPC_BUILD_TESTS) add_executable(overload_test - test/core/gprpp/overload_test.cc + test/core/util/overload_test.cc ) target_compile_features(overload_test PUBLIC cxx_std_14) target_include_directories(overload_test @@ -21997,10 +22039,6 @@ add_executable(periodic_update_test src/core/lib/debug/trace_flags.cc src/core/lib/experiments/config.cc src/core/lib/experiments/experiments.cc - src/core/lib/gprpp/glob.cc - src/core/lib/gprpp/per_cpu.cc - src/core/lib/gprpp/status_helper.cc - src/core/lib/gprpp/time.cc src/core/lib/iomgr/closure.cc src/core/lib/iomgr/combiner.cc src/core/lib/iomgr/error.cc @@ -22011,7 +22049,11 @@ add_executable(periodic_update_test src/core/lib/slice/percent_encoding.cc src/core/lib/slice/slice.cc src/core/lib/slice/slice_string_helpers.cc + src/core/util/glob.cc src/core/util/latent_see.cc + src/core/util/per_cpu.cc + src/core/util/status_helper.cc + src/core/util/time.cc test/core/resource_quota/periodic_update_test.cc ) if(WIN32 AND MSVC) @@ -23077,11 +23119,11 @@ if(gRPC_BUILD_TESTS) add_executable(promise_mutex_test src/core/lib/debug/trace.cc src/core/lib/debug/trace_flags.cc - src/core/lib/gprpp/dump_args.cc - src/core/lib/gprpp/glob.cc - src/core/lib/gprpp/per_cpu.cc src/core/lib/promise/activity.cc + src/core/util/dump_args.cc + src/core/util/glob.cc src/core/util/latent_see.cc + src/core/util/per_cpu.cc test/core/promise/promise_mutex_test.cc ) if(WIN32 AND MSVC) @@ -23664,8 +23706,8 @@ endif() if(gRPC_BUILD_TESTS) add_executable(random_early_detection_test - src/core/lib/backoff/random_early_detection.cc - test/core/backoff/random_early_detection_test.cc + src/core/util/random_early_detection.cc + test/core/util/random_early_detection_test.cc ) target_compile_features(random_early_detection_test PUBLIC cxx_std_14) target_include_directories(random_early_detection_test @@ -23858,7 +23900,7 @@ endif() if(gRPC_BUILD_TESTS) add_executable(ref_counted_ptr_test - test/core/gprpp/ref_counted_ptr_test.cc + test/core/util/ref_counted_ptr_test.cc ) if(WIN32 AND MSVC) if(BUILD_SHARED_LIBS) @@ -23900,7 +23942,7 @@ endif() if(gRPC_BUILD_TESTS) add_executable(ref_counted_test - test/core/gprpp/ref_counted_test.cc + test/core/util/ref_counted_test.cc ) if(WIN32 AND MSVC) if(BUILD_SHARED_LIBS) @@ -27212,7 +27254,7 @@ if(gRPC_BUILD_TESTS) add_executable(seq_test src/core/lib/debug/trace.cc src/core/lib/debug/trace_flags.cc - src/core/lib/gprpp/glob.cc + src/core/util/glob.cc test/core/promise/seq_test.cc ) if(WIN32 AND MSVC) @@ -28757,7 +28799,7 @@ endif() if(gRPC_BUILD_TESTS) add_executable(single_set_ptr_test - test/core/gprpp/single_set_ptr_test.cc + test/core/util/single_set_ptr_test.cc ) if(WIN32 AND MSVC) if(BUILD_SHARED_LIBS) @@ -28842,9 +28884,9 @@ if(gRPC_BUILD_TESTS) add_executable(slice_string_helpers_test src/core/lib/debug/trace.cc src/core/lib/debug/trace_flags.cc - src/core/lib/gprpp/glob.cc src/core/lib/slice/slice.cc src/core/lib/slice/slice_string_helpers.cc + src/core/util/glob.cc test/core/slice/slice_string_helpers_test.cc ) if(WIN32 AND MSVC) @@ -29068,7 +29110,7 @@ endif() if(gRPC_BUILD_TESTS) add_executable(sorted_pack_test - test/core/gprpp/sorted_pack_test.cc + test/core/util/sorted_pack_test.cc ) target_compile_features(sorted_pack_test PUBLIC cxx_std_14) target_include_directories(sorted_pack_test @@ -29276,7 +29318,7 @@ endif() if(gRPC_BUILD_TESTS) add_executable(stat_test - test/core/gprpp/stat_test.cc + test/core/util/stat_test.cc ) if(WIN32 AND MSVC) if(BUILD_SHARED_LIBS) @@ -29496,7 +29538,7 @@ endif() if(gRPC_BUILD_TESTS) add_executable(status_helper_test - test/core/gprpp/status_helper_test.cc + test/core/util/status_helper_test.cc ) if(WIN32 AND MSVC) if(BUILD_SHARED_LIBS) @@ -30066,7 +30108,7 @@ endif() if(gRPC_BUILD_TESTS) add_executable(table_test - test/core/gprpp/table_test.cc + test/core/util/table_test.cc ) target_compile_features(table_test PUBLIC cxx_std_14) target_include_directories(table_test @@ -30463,8 +30505,8 @@ if(gRPC_BUILD_TESTS) add_executable(test_core_event_engine_posix_timer_heap_test src/core/lib/event_engine/posix_engine/timer.cc src/core/lib/event_engine/posix_engine/timer_heap.cc - src/core/lib/gprpp/time.cc - src/core/lib/gprpp/time_averaged_stats.cc + src/core/util/time.cc + src/core/util/time_averaged_stats.cc test/core/event_engine/posix/timer_heap_test.cc ) if(WIN32 AND MSVC) @@ -30509,8 +30551,8 @@ if(gRPC_BUILD_TESTS) add_executable(test_core_event_engine_posix_timer_list_test src/core/lib/event_engine/posix_engine/timer.cc src/core/lib/event_engine/posix_engine/timer_heap.cc - src/core/lib/gprpp/time.cc - src/core/lib/gprpp/time_averaged_stats.cc + src/core/util/time.cc + src/core/util/time_averaged_stats.cc test/core/event_engine/posix/timer_list_test.cc ) if(WIN32 AND MSVC) @@ -30559,10 +30601,10 @@ add_executable(test_core_event_engine_slice_buffer_test src/core/lib/event_engine/resolved_address.cc src/core/lib/event_engine/slice.cc src/core/lib/event_engine/slice_buffer.cc - src/core/lib/gprpp/glob.cc src/core/lib/slice/slice.cc src/core/lib/slice/slice_buffer.cc src/core/lib/slice/slice_string_helpers.cc + src/core/util/glob.cc test/core/event_engine/slice_buffer_test.cc ) if(WIN32 AND MSVC) @@ -30604,49 +30646,6 @@ target_link_libraries(test_core_event_engine_slice_buffer_test ) -endif() -if(gRPC_BUILD_TESTS) - -add_executable(test_core_gprpp_time_test - src/core/lib/gprpp/time.cc - test/core/gprpp/time_test.cc -) -if(WIN32 AND MSVC) - if(BUILD_SHARED_LIBS) - target_compile_definitions(test_core_gprpp_time_test - PRIVATE - "GPR_DLL_IMPORTS" - ) - endif() -endif() -target_compile_features(test_core_gprpp_time_test PUBLIC cxx_std_14) -target_include_directories(test_core_gprpp_time_test - PRIVATE - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/include - ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_RE2_INCLUDE_DIR} - ${_gRPC_SSL_INCLUDE_DIR} - ${_gRPC_UPB_GENERATED_DIR} - ${_gRPC_UPB_GRPC_GENERATED_DIR} - ${_gRPC_UPB_INCLUDE_DIR} - ${_gRPC_XXHASH_INCLUDE_DIR} - ${_gRPC_ZLIB_INCLUDE_DIR} - third_party/googletest/googletest/include - third_party/googletest/googletest - third_party/googletest/googlemock/include - third_party/googletest/googlemock - ${_gRPC_PROTO_GENS_DIR} -) - -target_link_libraries(test_core_gprpp_time_test - ${_gRPC_ALLTARGETS_LIBRARIES} - gtest - absl::statusor - gpr -) - - endif() if(gRPC_BUILD_TESTS) @@ -30959,6 +30958,7 @@ endif() if(gRPC_BUILD_TESTS) add_executable(test_core_util_time_test + src/core/util/time.cc test/core/util/time_test.cc ) if(WIN32 AND MSVC) @@ -30966,7 +30966,6 @@ if(WIN32 AND MSVC) target_compile_definitions(test_core_util_time_test PRIVATE "GPR_DLL_IMPORTS" - "GRPC_DLL_IMPORTS" ) endif() endif() @@ -30993,7 +30992,8 @@ target_include_directories(test_core_util_time_test target_link_libraries(test_core_util_time_test ${_gRPC_ALLTARGETS_LIBRARIES} gtest - grpc_test_util + absl::statusor + gpr ) @@ -31290,7 +31290,7 @@ endif() if(gRPC_BUILD_TESTS) add_executable(thd_test - test/core/gprpp/thd_test.cc + test/core/util/thd_test.cc ) if(WIN32 AND MSVC) if(BUILD_SHARED_LIBS) @@ -31624,7 +31624,7 @@ endif() if(gRPC_BUILD_TESTS) add_executable(time_util_test - test/core/gprpp/time_util_test.cc + test/core/util/time_util_test.cc ) if(WIN32 AND MSVC) if(BUILD_SHARED_LIBS) @@ -32471,7 +32471,7 @@ if(gRPC_BUILD_TESTS) add_executable(try_join_test src/core/lib/debug/trace.cc src/core/lib/debug/trace_flags.cc - src/core/lib/gprpp/glob.cc + src/core/util/glob.cc test/core/promise/try_join_test.cc ) if(WIN32 AND MSVC) @@ -32561,7 +32561,7 @@ if(gRPC_BUILD_TESTS) add_executable(try_seq_test src/core/lib/debug/trace.cc src/core/lib/debug/trace_flags.cc - src/core/lib/gprpp/glob.cc + src/core/util/glob.cc test/core/promise/try_seq_test.cc ) if(WIN32 AND MSVC) @@ -32640,7 +32640,7 @@ endif() if(gRPC_BUILD_TESTS) add_executable(unique_type_name_test - test/core/gprpp/unique_type_name_test.cc + test/core/util/unique_type_name_test.cc ) target_compile_features(unique_type_name_test PUBLIC cxx_std_14) target_include_directories(unique_type_name_test @@ -32719,20 +32719,20 @@ target_link_libraries(unknown_frame_bad_client_test endif() if(gRPC_BUILD_TESTS) -add_executable(uri_parser_test - test/core/uri/uri_parser_test.cc +add_executable(uri_test + test/core/util/uri_test.cc ) if(WIN32 AND MSVC) if(BUILD_SHARED_LIBS) - target_compile_definitions(uri_parser_test + target_compile_definitions(uri_test PRIVATE "GPR_DLL_IMPORTS" "GRPC_DLL_IMPORTS" ) endif() endif() -target_compile_features(uri_parser_test PUBLIC cxx_std_14) -target_include_directories(uri_parser_test +target_compile_features(uri_test PUBLIC cxx_std_14) +target_include_directories(uri_test PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include @@ -32751,7 +32751,7 @@ target_include_directories(uri_parser_test ${_gRPC_PROTO_GENS_DIR} ) -target_link_libraries(uri_parser_test +target_link_libraries(uri_test ${_gRPC_ALLTARGETS_LIBRARIES} gtest grpc_test_util_unsecure @@ -32796,7 +32796,7 @@ endif() if(gRPC_BUILD_TESTS) add_executable(uuid_v4_test - test/core/gprpp/uuid_v4_test.cc + test/core/util/uuid_v4_test.cc ) if(WIN32 AND MSVC) if(BUILD_SHARED_LIBS) @@ -32838,7 +32838,7 @@ endif() if(gRPC_BUILD_TESTS) add_executable(validation_errors_test - test/core/gprpp/validation_errors_test.cc + test/core/util/validation_errors_test.cc ) if(WIN32 AND MSVC) if(BUILD_SHARED_LIBS) @@ -32924,11 +32924,11 @@ if(gRPC_BUILD_TESTS) add_executable(wait_for_callback_test src/core/lib/debug/trace.cc src/core/lib/debug/trace_flags.cc - src/core/lib/gprpp/dump_args.cc - src/core/lib/gprpp/glob.cc - src/core/lib/gprpp/per_cpu.cc src/core/lib/promise/activity.cc + src/core/util/dump_args.cc + src/core/util/glob.cc src/core/util/latent_see.cc + src/core/util/per_cpu.cc test/core/promise/wait_for_callback_test.cc ) if(WIN32 AND MSVC) @@ -33470,7 +33470,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) add_executable(work_serializer_test test/core/event_engine/event_engine_test_utils.cc - test/core/gprpp/work_serializer_test.cc + test/core/util/work_serializer_test.cc ) if(WIN32 AND MSVC) if(BUILD_SHARED_LIBS) @@ -33640,7 +33640,7 @@ if(gRPC_BUILD_TESTS) add_executable(write_size_policy_test src/core/ext/transport/chttp2/transport/write_size_policy.cc - src/core/lib/gprpp/time.cc + src/core/util/time.cc test/core/transport/chttp2/write_size_policy_test.cc ) if(WIN32 AND MSVC) diff --git a/Makefile b/Makefile index 767a9f3a335..17e4b30baa4 100644 --- a/Makefile +++ b/Makefile @@ -1068,8 +1068,6 @@ LIBGRPC_SRC = \ src/core/handshaker/tcp_connect/tcp_connect_handshaker.cc \ src/core/lib/address_utils/parse_address.cc \ src/core/lib/address_utils/sockaddr_utils.cc \ - src/core/lib/backoff/backoff.cc \ - src/core/lib/backoff/random_early_detection.cc \ src/core/lib/channel/channel_args.cc \ src/core/lib/channel/channel_args_preconditioning.cc \ src/core/lib/channel/channel_stack.cc \ @@ -1085,7 +1083,6 @@ LIBGRPC_SRC = \ src/core/lib/config/config_vars_non_generated.cc \ src/core/lib/config/core_configuration.cc \ src/core/lib/config/load_config.cc \ - src/core/lib/debug/event_log.cc \ src/core/lib/debug/trace.cc \ src/core/lib/debug/trace_flags.cc \ src/core/lib/event_engine/ares_resolver.cc \ @@ -1137,34 +1134,6 @@ LIBGRPC_SRC = \ src/core/lib/event_engine/work_queue/basic_work_queue.cc \ src/core/lib/experiments/config.cc \ src/core/lib/experiments/experiments.cc \ - src/core/lib/gprpp/crash.cc \ - src/core/lib/gprpp/dump_args.cc \ - src/core/lib/gprpp/examine_stack.cc \ - src/core/lib/gprpp/fork.cc \ - src/core/lib/gprpp/glob.cc \ - src/core/lib/gprpp/host_port.cc \ - src/core/lib/gprpp/linux/env.cc \ - src/core/lib/gprpp/load_file.cc \ - src/core/lib/gprpp/mpscq.cc \ - src/core/lib/gprpp/per_cpu.cc \ - src/core/lib/gprpp/posix/directory_reader.cc \ - src/core/lib/gprpp/posix/env.cc \ - src/core/lib/gprpp/posix/stat.cc \ - src/core/lib/gprpp/posix/thd.cc \ - src/core/lib/gprpp/ref_counted_string.cc \ - src/core/lib/gprpp/status_helper.cc \ - src/core/lib/gprpp/strerror.cc \ - src/core/lib/gprpp/tchar.cc \ - src/core/lib/gprpp/time.cc \ - src/core/lib/gprpp/time_averaged_stats.cc \ - src/core/lib/gprpp/time_util.cc \ - src/core/lib/gprpp/uuid_v4.cc \ - src/core/lib/gprpp/validation_errors.cc \ - src/core/lib/gprpp/windows/directory_reader.cc \ - src/core/lib/gprpp/windows/env.cc \ - src/core/lib/gprpp/windows/stat.cc \ - src/core/lib/gprpp/windows/thd.cc \ - src/core/lib/gprpp/work_serializer.cc \ src/core/lib/iomgr/buffer_list.cc \ src/core/lib/iomgr/call_combiner.cc \ src/core/lib/iomgr/cfstream_handle.cc \ @@ -1188,11 +1157,6 @@ LIBGRPC_SRC = \ src/core/lib/iomgr/executor.cc \ src/core/lib/iomgr/fork_posix.cc \ src/core/lib/iomgr/fork_windows.cc \ - src/core/lib/iomgr/gethostname_fallback.cc \ - src/core/lib/iomgr/gethostname_host_name_max.cc \ - src/core/lib/iomgr/gethostname_sysconf.cc \ - src/core/lib/iomgr/grpc_if_nametoindex_posix.cc \ - src/core/lib/iomgr/grpc_if_nametoindex_unsupported.cc \ src/core/lib/iomgr/internal_errqueue.cc \ src/core/lib/iomgr/iocp_windows.cc \ src/core/lib/iomgr/iomgr.cc \ @@ -1241,7 +1205,6 @@ LIBGRPC_SRC = \ src/core/lib/iomgr/wakeup_fd_nospecial.cc \ src/core/lib/iomgr/wakeup_fd_pipe.cc \ src/core/lib/iomgr/wakeup_fd_posix.cc \ - src/core/lib/matchers/matchers.cc \ src/core/lib/promise/activity.cc \ src/core/lib/promise/party.cc \ src/core/lib/promise/sleep.cc \ @@ -1361,7 +1324,6 @@ LIBGRPC_SRC = \ src/core/lib/transport/timeout_encoding.cc \ src/core/lib/transport/transport.cc \ src/core/lib/transport/transport_op_string.cc \ - src/core/lib/uri/uri_parser.cc \ src/core/load_balancing/address_filtering.cc \ src/core/load_balancing/backend_metric_parser.cc \ src/core/load_balancing/child_policy_handler.cc \ @@ -1456,7 +1418,21 @@ LIBGRPC_SRC = \ src/core/tsi/transport_security_grpc.cc \ src/core/util/alloc.cc \ src/core/util/atm.cc \ + src/core/util/backoff.cc \ + src/core/util/crash.cc \ + src/core/util/dump_args.cc \ + src/core/util/event_log.cc \ + src/core/util/examine_stack.cc \ + src/core/util/fork.cc \ src/core/util/gcp_metadata_query.cc \ + src/core/util/gethostname_fallback.cc \ + src/core/util/gethostname_host_name_max.cc \ + src/core/util/gethostname_sysconf.cc \ + src/core/util/glob.cc \ + src/core/util/gpr_time.cc \ + src/core/util/grpc_if_nametoindex_posix.cc \ + src/core/util/grpc_if_nametoindex_unsupported.cc \ + src/core/util/host_port.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 \ @@ -1468,24 +1444,48 @@ LIBGRPC_SRC = \ src/core/util/json/json_writer.cc \ src/core/util/latent_see.cc \ src/core/util/linux/cpu.cc \ + src/core/util/linux/env.cc \ + src/core/util/load_file.cc \ src/core/util/log.cc \ + src/core/util/matchers.cc \ + src/core/util/mpscq.cc \ src/core/util/msys/tmpfile.cc \ + src/core/util/per_cpu.cc \ src/core/util/posix/cpu.cc \ + src/core/util/posix/directory_reader.cc \ + src/core/util/posix/env.cc \ + src/core/util/posix/stat.cc \ src/core/util/posix/string.cc \ src/core/util/posix/sync.cc \ + src/core/util/posix/thd.cc \ src/core/util/posix/time.cc \ src/core/util/posix/tmpfile.cc \ + src/core/util/random_early_detection.cc \ + src/core/util/ref_counted_string.cc \ + src/core/util/status_helper.cc \ + src/core/util/strerror.cc \ src/core/util/string.cc \ src/core/util/sync.cc \ src/core/util/sync_abseil.cc \ + src/core/util/tchar.cc \ src/core/util/time.cc \ + src/core/util/time_averaged_stats.cc \ src/core/util/time_precise.cc \ + src/core/util/time_util.cc \ + src/core/util/uri.cc \ + src/core/util/uuid_v4.cc \ + src/core/util/validation_errors.cc \ src/core/util/windows/cpu.cc \ + src/core/util/windows/directory_reader.cc \ + src/core/util/windows/env.cc \ + src/core/util/windows/stat.cc \ src/core/util/windows/string.cc \ src/core/util/windows/string_util.cc \ src/core/util/windows/sync.cc \ + src/core/util/windows/thd.cc \ src/core/util/windows/time.cc \ src/core/util/windows/tmpfile.cc \ + src/core/util/work_serializer.cc \ src/core/xds/grpc/certificate_provider_store.cc \ src/core/xds/grpc/file_watcher_certificate_provider_factory.cc \ src/core/xds/grpc/xds_audit_logger_registry.cc \ diff --git a/Package.swift b/Package.swift index a550e5f6dac..64e851e770a 100644 --- a/Package.swift +++ b/Package.swift @@ -1093,11 +1093,6 @@ let package = Package( "src/core/lib/address_utils/parse_address.h", "src/core/lib/address_utils/sockaddr_utils.cc", "src/core/lib/address_utils/sockaddr_utils.h", - "src/core/lib/avl/avl.h", - "src/core/lib/backoff/backoff.cc", - "src/core/lib/backoff/backoff.h", - "src/core/lib/backoff/random_early_detection.cc", - "src/core/lib/backoff/random_early_detection.h", "src/core/lib/channel/call_finalization.h", "src/core/lib/channel/channel_args.cc", "src/core/lib/channel/channel_args.h", @@ -1128,8 +1123,6 @@ let package = Package( "src/core/lib/config/core_configuration.h", "src/core/lib/config/load_config.cc", "src/core/lib/config/load_config.h", - "src/core/lib/debug/event_log.cc", - "src/core/lib/debug/event_log.h", "src/core/lib/debug/trace.cc", "src/core/lib/debug/trace.h", "src/core/lib/debug/trace_flags.cc", @@ -1250,83 +1243,6 @@ let package = Package( "src/core/lib/experiments/config.h", "src/core/lib/experiments/experiments.cc", "src/core/lib/experiments/experiments.h", - "src/core/lib/gprpp/atomic_utils.h", - "src/core/lib/gprpp/bitset.h", - "src/core/lib/gprpp/chunked_vector.h", - "src/core/lib/gprpp/construct_destruct.h", - "src/core/lib/gprpp/cpp_impl_of.h", - "src/core/lib/gprpp/crash.cc", - "src/core/lib/gprpp/crash.h", - "src/core/lib/gprpp/debug_location.h", - "src/core/lib/gprpp/directory_reader.h", - "src/core/lib/gprpp/down_cast.h", - "src/core/lib/gprpp/dual_ref_counted.h", - "src/core/lib/gprpp/dump_args.cc", - "src/core/lib/gprpp/dump_args.h", - "src/core/lib/gprpp/env.h", - "src/core/lib/gprpp/examine_stack.cc", - "src/core/lib/gprpp/examine_stack.h", - "src/core/lib/gprpp/fork.cc", - "src/core/lib/gprpp/fork.h", - "src/core/lib/gprpp/glob.cc", - "src/core/lib/gprpp/glob.h", - "src/core/lib/gprpp/host_port.cc", - "src/core/lib/gprpp/host_port.h", - "src/core/lib/gprpp/if_list.h", - "src/core/lib/gprpp/linux/env.cc", - "src/core/lib/gprpp/load_file.cc", - "src/core/lib/gprpp/load_file.h", - "src/core/lib/gprpp/manual_constructor.h", - "src/core/lib/gprpp/match.h", - "src/core/lib/gprpp/memory.h", - "src/core/lib/gprpp/mpscq.cc", - "src/core/lib/gprpp/mpscq.h", - "src/core/lib/gprpp/no_destruct.h", - "src/core/lib/gprpp/notification.h", - "src/core/lib/gprpp/orphanable.h", - "src/core/lib/gprpp/overload.h", - "src/core/lib/gprpp/packed_table.h", - "src/core/lib/gprpp/per_cpu.cc", - "src/core/lib/gprpp/per_cpu.h", - "src/core/lib/gprpp/posix/directory_reader.cc", - "src/core/lib/gprpp/posix/env.cc", - "src/core/lib/gprpp/posix/stat.cc", - "src/core/lib/gprpp/posix/thd.cc", - "src/core/lib/gprpp/ref_counted.h", - "src/core/lib/gprpp/ref_counted_ptr.h", - "src/core/lib/gprpp/ref_counted_string.cc", - "src/core/lib/gprpp/ref_counted_string.h", - "src/core/lib/gprpp/single_set_ptr.h", - "src/core/lib/gprpp/sorted_pack.h", - "src/core/lib/gprpp/stat.h", - "src/core/lib/gprpp/status_helper.cc", - "src/core/lib/gprpp/status_helper.h", - "src/core/lib/gprpp/strerror.cc", - "src/core/lib/gprpp/strerror.h", - "src/core/lib/gprpp/sync.h", - "src/core/lib/gprpp/table.h", - "src/core/lib/gprpp/tchar.cc", - "src/core/lib/gprpp/tchar.h", - "src/core/lib/gprpp/thd.h", - "src/core/lib/gprpp/time.cc", - "src/core/lib/gprpp/time.h", - "src/core/lib/gprpp/time_averaged_stats.cc", - "src/core/lib/gprpp/time_averaged_stats.h", - "src/core/lib/gprpp/time_util.cc", - "src/core/lib/gprpp/time_util.h", - "src/core/lib/gprpp/type_list.h", - "src/core/lib/gprpp/unique_type_name.h", - "src/core/lib/gprpp/uuid_v4.cc", - "src/core/lib/gprpp/uuid_v4.h", - "src/core/lib/gprpp/validation_errors.cc", - "src/core/lib/gprpp/validation_errors.h", - "src/core/lib/gprpp/windows/directory_reader.cc", - "src/core/lib/gprpp/windows/env.cc", - "src/core/lib/gprpp/windows/stat.cc", - "src/core/lib/gprpp/windows/thd.cc", - "src/core/lib/gprpp/work_serializer.cc", - "src/core/lib/gprpp/work_serializer.h", - "src/core/lib/gprpp/xxhash_inline.h", "src/core/lib/iomgr/block_annotate.h", "src/core/lib/iomgr/buffer_list.cc", "src/core/lib/iomgr/buffer_list.h", @@ -1371,13 +1287,6 @@ let package = Package( "src/core/lib/iomgr/executor.h", "src/core/lib/iomgr/fork_posix.cc", "src/core/lib/iomgr/fork_windows.cc", - "src/core/lib/iomgr/gethostname.h", - "src/core/lib/iomgr/gethostname_fallback.cc", - "src/core/lib/iomgr/gethostname_host_name_max.cc", - "src/core/lib/iomgr/gethostname_sysconf.cc", - "src/core/lib/iomgr/grpc_if_nametoindex.h", - "src/core/lib/iomgr/grpc_if_nametoindex_posix.cc", - "src/core/lib/iomgr/grpc_if_nametoindex_unsupported.cc", "src/core/lib/iomgr/internal_errqueue.cc", "src/core/lib/iomgr/internal_errqueue.h", "src/core/lib/iomgr/iocp_windows.cc", @@ -1468,8 +1377,6 @@ let package = Package( "src/core/lib/iomgr/wakeup_fd_pipe.h", "src/core/lib/iomgr/wakeup_fd_posix.cc", "src/core/lib/iomgr/wakeup_fd_posix.h", - "src/core/lib/matchers/matchers.cc", - "src/core/lib/matchers/matchers.h", "src/core/lib/promise/activity.cc", "src/core/lib/promise/activity.h", "src/core/lib/promise/all_ok.h", @@ -1734,8 +1641,6 @@ let package = Package( "src/core/lib/transport/transport.h", "src/core/lib/transport/transport_fwd.h", "src/core/lib/transport/transport_op_string.cc", - "src/core/lib/uri/uri_parser.cc", - "src/core/lib/uri/uri_parser.h", "src/core/load_balancing/address_filtering.cc", "src/core/load_balancing/address_filtering.h", "src/core/load_balancing/backend_metric_data.h", @@ -1920,8 +1825,43 @@ let package = Package( "src/core/util/alloc.cc", "src/core/util/alloc.h", "src/core/util/atm.cc", + "src/core/util/atomic_utils.h", + "src/core/util/avl.h", + "src/core/util/backoff.cc", + "src/core/util/backoff.h", + "src/core/util/bitset.h", + "src/core/util/chunked_vector.h", + "src/core/util/construct_destruct.h", + "src/core/util/cpp_impl_of.h", + "src/core/util/crash.cc", + "src/core/util/crash.h", + "src/core/util/debug_location.h", + "src/core/util/directory_reader.h", + "src/core/util/down_cast.h", + "src/core/util/dual_ref_counted.h", + "src/core/util/dump_args.cc", + "src/core/util/dump_args.h", + "src/core/util/env.h", + "src/core/util/event_log.cc", + "src/core/util/event_log.h", + "src/core/util/examine_stack.cc", + "src/core/util/examine_stack.h", + "src/core/util/fork.cc", + "src/core/util/fork.h", "src/core/util/gcp_metadata_query.cc", "src/core/util/gcp_metadata_query.h", + "src/core/util/gethostname.h", + "src/core/util/gethostname_fallback.cc", + "src/core/util/gethostname_host_name_max.cc", + "src/core/util/gethostname_sysconf.cc", + "src/core/util/glob.cc", + "src/core/util/glob.h", + "src/core/util/gpr_time.cc", + "src/core/util/grpc_if_nametoindex.h", + "src/core/util/grpc_if_nametoindex_posix.cc", + "src/core/util/grpc_if_nametoindex_unsupported.cc", + "src/core/util/host_port.cc", + "src/core/util/host_port.h", "src/core/util/http_client/format_request.cc", "src/core/util/http_client/format_request.h", "src/core/util/http_client/httpcli.cc", @@ -1930,6 +1870,7 @@ let package = Package( "src/core/util/http_client/httpcli_ssl_credentials.h", "src/core/util/http_client/parser.cc", "src/core/util/http_client/parser.h", + "src/core/util/if_list.h", "src/core/util/iphone/cpu.cc", "src/core/util/json/json.h", "src/core/util/json/json_args.h", @@ -1945,33 +1886,92 @@ let package = Package( "src/core/util/latent_see.cc", "src/core/util/latent_see.h", "src/core/util/linux/cpu.cc", + "src/core/util/linux/env.cc", + "src/core/util/load_file.cc", + "src/core/util/load_file.h", "src/core/util/log.cc", "src/core/util/lru_cache.h", + "src/core/util/manual_constructor.h", + "src/core/util/match.h", + "src/core/util/matchers.cc", + "src/core/util/matchers.h", + "src/core/util/memory.h", + "src/core/util/mpscq.cc", + "src/core/util/mpscq.h", "src/core/util/msys/tmpfile.cc", + "src/core/util/no_destruct.h", + "src/core/util/notification.h", + "src/core/util/orphanable.h", + "src/core/util/overload.h", + "src/core/util/packed_table.h", + "src/core/util/per_cpu.cc", + "src/core/util/per_cpu.h", "src/core/util/posix/cpu.cc", + "src/core/util/posix/directory_reader.cc", + "src/core/util/posix/env.cc", + "src/core/util/posix/stat.cc", "src/core/util/posix/string.cc", "src/core/util/posix/sync.cc", + "src/core/util/posix/thd.cc", "src/core/util/posix/time.cc", "src/core/util/posix/tmpfile.cc", + "src/core/util/random_early_detection.cc", + "src/core/util/random_early_detection.h", + "src/core/util/ref_counted.h", + "src/core/util/ref_counted_ptr.h", + "src/core/util/ref_counted_string.cc", + "src/core/util/ref_counted_string.h", "src/core/util/ring_buffer.h", + "src/core/util/single_set_ptr.h", + "src/core/util/sorted_pack.h", "src/core/util/spinlock.h", + "src/core/util/stat.h", + "src/core/util/status_helper.cc", + "src/core/util/status_helper.h", + "src/core/util/strerror.cc", + "src/core/util/strerror.h", "src/core/util/string.cc", "src/core/util/string.h", "src/core/util/sync.cc", + "src/core/util/sync.h", "src/core/util/sync_abseil.cc", + "src/core/util/table.h", + "src/core/util/tchar.cc", + "src/core/util/tchar.h", + "src/core/util/thd.h", "src/core/util/time.cc", + "src/core/util/time.h", + "src/core/util/time_averaged_stats.cc", + "src/core/util/time_averaged_stats.h", "src/core/util/time_precise.cc", "src/core/util/time_precise.h", + "src/core/util/time_util.cc", + "src/core/util/time_util.h", "src/core/util/tmpfile.h", + "src/core/util/type_list.h", "src/core/util/unique_ptr_with_bitset.h", + "src/core/util/unique_type_name.h", "src/core/util/upb_utils.h", + "src/core/util/uri.cc", + "src/core/util/uri.h", "src/core/util/useful.h", + "src/core/util/uuid_v4.cc", + "src/core/util/uuid_v4.h", + "src/core/util/validation_errors.cc", + "src/core/util/validation_errors.h", "src/core/util/windows/cpu.cc", + "src/core/util/windows/directory_reader.cc", + "src/core/util/windows/env.cc", + "src/core/util/windows/stat.cc", "src/core/util/windows/string.cc", "src/core/util/windows/string_util.cc", "src/core/util/windows/sync.cc", + "src/core/util/windows/thd.cc", "src/core/util/windows/time.cc", "src/core/util/windows/tmpfile.cc", + "src/core/util/work_serializer.cc", + "src/core/util/work_serializer.h", + "src/core/util/xxhash_inline.h", "src/core/xds/grpc/certificate_provider_store.cc", "src/core/xds/grpc/certificate_provider_store.h", "src/core/xds/grpc/file_watcher_certificate_provider_factory.cc", diff --git a/build_autogenerated.yaml b/build_autogenerated.yaml index 2d75546550c..c70e708cea4 100644 --- a/build_autogenerated.yaml +++ b/build_autogenerated.yaml @@ -55,25 +55,25 @@ libs: - src/core/lib/config/config_vars.h - src/core/lib/config/load_config.h - src/core/lib/event_engine/thread_local.h - - src/core/lib/gprpp/construct_destruct.h - - src/core/lib/gprpp/crash.h - - src/core/lib/gprpp/debug_location.h - - src/core/lib/gprpp/env.h - - src/core/lib/gprpp/examine_stack.h - - src/core/lib/gprpp/fork.h - - src/core/lib/gprpp/host_port.h - - src/core/lib/gprpp/memory.h - - src/core/lib/gprpp/mpscq.h - - src/core/lib/gprpp/no_destruct.h - - src/core/lib/gprpp/stat.h - - src/core/lib/gprpp/strerror.h - - src/core/lib/gprpp/sync.h - - src/core/lib/gprpp/tchar.h - - src/core/lib/gprpp/thd.h - - src/core/lib/gprpp/time_util.h - src/core/util/alloc.h + - src/core/util/construct_destruct.h + - src/core/util/crash.h + - src/core/util/debug_location.h + - src/core/util/env.h + - src/core/util/examine_stack.h + - src/core/util/fork.h + - src/core/util/host_port.h + - src/core/util/memory.h + - src/core/util/mpscq.h + - src/core/util/no_destruct.h + - src/core/util/stat.h + - src/core/util/strerror.h - src/core/util/string.h + - src/core/util/sync.h + - src/core/util/tchar.h + - src/core/util/thd.h - src/core/util/time_precise.h + - src/core/util/time_util.h - src/core/util/tmpfile.h - src/core/util/useful.h src: @@ -81,41 +81,41 @@ libs: - src/core/lib/config/config_vars_non_generated.cc - src/core/lib/config/load_config.cc - src/core/lib/event_engine/thread_local.cc - - src/core/lib/gprpp/crash.cc - - src/core/lib/gprpp/examine_stack.cc - - src/core/lib/gprpp/fork.cc - - src/core/lib/gprpp/host_port.cc - - src/core/lib/gprpp/linux/env.cc - - src/core/lib/gprpp/mpscq.cc - - src/core/lib/gprpp/posix/env.cc - - src/core/lib/gprpp/posix/stat.cc - - src/core/lib/gprpp/posix/thd.cc - - src/core/lib/gprpp/strerror.cc - - src/core/lib/gprpp/tchar.cc - - src/core/lib/gprpp/time_util.cc - - src/core/lib/gprpp/windows/env.cc - - src/core/lib/gprpp/windows/stat.cc - - src/core/lib/gprpp/windows/thd.cc - src/core/util/alloc.cc - src/core/util/atm.cc + - src/core/util/crash.cc + - src/core/util/examine_stack.cc + - src/core/util/fork.cc + - src/core/util/gpr_time.cc + - src/core/util/host_port.cc - src/core/util/iphone/cpu.cc - src/core/util/linux/cpu.cc + - src/core/util/linux/env.cc - src/core/util/log.cc + - src/core/util/mpscq.cc - src/core/util/msys/tmpfile.cc - src/core/util/posix/cpu.cc + - src/core/util/posix/env.cc + - src/core/util/posix/stat.cc - src/core/util/posix/string.cc - src/core/util/posix/sync.cc + - src/core/util/posix/thd.cc - src/core/util/posix/time.cc - src/core/util/posix/tmpfile.cc + - src/core/util/strerror.cc - src/core/util/string.cc - src/core/util/sync.cc - src/core/util/sync_abseil.cc - - src/core/util/time.cc + - src/core/util/tchar.cc - src/core/util/time_precise.cc + - src/core/util/time_util.cc - src/core/util/windows/cpu.cc + - src/core/util/windows/env.cc + - src/core/util/windows/stat.cc - src/core/util/windows/string.cc - src/core/util/windows/string_util.cc - src/core/util/windows/sync.cc + - src/core/util/windows/thd.cc - src/core/util/windows/time.cc - src/core/util/windows/tmpfile.cc deps: @@ -793,9 +793,6 @@ libs: - src/core/handshaker/tcp_connect/tcp_connect_handshaker.h - src/core/lib/address_utils/parse_address.h - src/core/lib/address_utils/sockaddr_utils.h - - src/core/lib/avl/avl.h - - src/core/lib/backoff/backoff.h - - src/core/lib/backoff/random_early_detection.h - src/core/lib/channel/call_finalization.h - src/core/lib/channel/channel_args.h - src/core/lib/channel/channel_args_preconditioning.h @@ -809,7 +806,6 @@ libs: - src/core/lib/compression/compression_internal.h - src/core/lib/compression/message_compress.h - src/core/lib/config/core_configuration.h - - src/core/lib/debug/event_log.h - src/core/lib/debug/trace.h - src/core/lib/debug/trace_flags.h - src/core/lib/debug/trace_impl.h @@ -878,39 +874,6 @@ libs: - src/core/lib/event_engine/work_queue/work_queue.h - src/core/lib/experiments/config.h - src/core/lib/experiments/experiments.h - - src/core/lib/gprpp/atomic_utils.h - - src/core/lib/gprpp/bitset.h - - src/core/lib/gprpp/chunked_vector.h - - src/core/lib/gprpp/cpp_impl_of.h - - src/core/lib/gprpp/directory_reader.h - - src/core/lib/gprpp/down_cast.h - - src/core/lib/gprpp/dual_ref_counted.h - - src/core/lib/gprpp/dump_args.h - - src/core/lib/gprpp/glob.h - - src/core/lib/gprpp/if_list.h - - src/core/lib/gprpp/load_file.h - - src/core/lib/gprpp/manual_constructor.h - - src/core/lib/gprpp/match.h - - src/core/lib/gprpp/notification.h - - src/core/lib/gprpp/orphanable.h - - src/core/lib/gprpp/overload.h - - src/core/lib/gprpp/packed_table.h - - src/core/lib/gprpp/per_cpu.h - - src/core/lib/gprpp/ref_counted.h - - src/core/lib/gprpp/ref_counted_ptr.h - - src/core/lib/gprpp/ref_counted_string.h - - src/core/lib/gprpp/single_set_ptr.h - - src/core/lib/gprpp/sorted_pack.h - - src/core/lib/gprpp/status_helper.h - - src/core/lib/gprpp/table.h - - src/core/lib/gprpp/time.h - - src/core/lib/gprpp/time_averaged_stats.h - - src/core/lib/gprpp/type_list.h - - src/core/lib/gprpp/unique_type_name.h - - src/core/lib/gprpp/uuid_v4.h - - src/core/lib/gprpp/validation_errors.h - - src/core/lib/gprpp/work_serializer.h - - src/core/lib/gprpp/xxhash_inline.h - src/core/lib/iomgr/block_annotate.h - src/core/lib/iomgr/buffer_list.h - src/core/lib/iomgr/call_combiner.h @@ -932,8 +895,6 @@ libs: - src/core/lib/iomgr/event_engine_shims/tcp_client.h - src/core/lib/iomgr/exec_ctx.h - src/core/lib/iomgr/executor.h - - src/core/lib/iomgr/gethostname.h - - src/core/lib/iomgr/grpc_if_nametoindex.h - src/core/lib/iomgr/internal_errqueue.h - src/core/lib/iomgr/iocp_windows.h - src/core/lib/iomgr/iomgr.h @@ -976,7 +937,6 @@ libs: - src/core/lib/iomgr/vsock.h - src/core/lib/iomgr/wakeup_fd_pipe.h - src/core/lib/iomgr/wakeup_fd_posix.h - - src/core/lib/matchers/matchers.h - src/core/lib/promise/activity.h - src/core/lib/promise/all_ok.h - src/core/lib/promise/arena_promise.h @@ -1118,7 +1078,6 @@ libs: - src/core/lib/transport/timeout_encoding.h - src/core/lib/transport/transport.h - src/core/lib/transport/transport_fwd.h - - src/core/lib/uri/uri_parser.h - src/core/load_balancing/address_filtering.h - src/core/load_balancing/backend_metric_data.h - src/core/load_balancing/backend_metric_parser.h @@ -1208,11 +1167,26 @@ libs: - src/core/tsi/transport_security.h - src/core/tsi/transport_security_grpc.h - src/core/tsi/transport_security_interface.h + - src/core/util/atomic_utils.h + - src/core/util/avl.h + - src/core/util/backoff.h + - src/core/util/bitset.h + - src/core/util/chunked_vector.h + - src/core/util/cpp_impl_of.h + - src/core/util/directory_reader.h + - src/core/util/down_cast.h + - src/core/util/dual_ref_counted.h + - src/core/util/dump_args.h + - src/core/util/event_log.h - src/core/util/gcp_metadata_query.h + - src/core/util/gethostname.h + - src/core/util/glob.h + - src/core/util/grpc_if_nametoindex.h - src/core/util/http_client/format_request.h - src/core/util/http_client/httpcli.h - src/core/util/http_client/httpcli_ssl_credentials.h - src/core/util/http_client/parser.h + - src/core/util/if_list.h - src/core/util/json/json.h - src/core/util/json/json_args.h - src/core/util/json/json_channel_args.h @@ -1221,11 +1195,37 @@ libs: - src/core/util/json/json_util.h - src/core/util/json/json_writer.h - src/core/util/latent_see.h + - src/core/util/load_file.h - src/core/util/lru_cache.h + - src/core/util/manual_constructor.h + - src/core/util/match.h + - src/core/util/matchers.h + - src/core/util/notification.h + - src/core/util/orphanable.h + - src/core/util/overload.h + - src/core/util/packed_table.h + - src/core/util/per_cpu.h + - src/core/util/random_early_detection.h + - src/core/util/ref_counted.h + - src/core/util/ref_counted_ptr.h + - src/core/util/ref_counted_string.h - src/core/util/ring_buffer.h + - src/core/util/single_set_ptr.h + - src/core/util/sorted_pack.h - src/core/util/spinlock.h + - src/core/util/status_helper.h + - src/core/util/table.h + - src/core/util/time.h + - src/core/util/time_averaged_stats.h + - src/core/util/type_list.h - src/core/util/unique_ptr_with_bitset.h + - src/core/util/unique_type_name.h - src/core/util/upb_utils.h + - src/core/util/uri.h + - src/core/util/uuid_v4.h + - src/core/util/validation_errors.h + - src/core/util/work_serializer.h + - src/core/util/xxhash_inline.h - src/core/xds/grpc/certificate_provider_store.h - src/core/xds/grpc/file_watcher_certificate_provider_factory.h - src/core/xds/grpc/xds_audit_logger_registry.h @@ -1670,8 +1670,6 @@ libs: - src/core/handshaker/tcp_connect/tcp_connect_handshaker.cc - src/core/lib/address_utils/parse_address.cc - src/core/lib/address_utils/sockaddr_utils.cc - - src/core/lib/backoff/backoff.cc - - src/core/lib/backoff/random_early_detection.cc - src/core/lib/channel/channel_args.cc - src/core/lib/channel/channel_args_preconditioning.cc - src/core/lib/channel/channel_stack.cc @@ -1684,7 +1682,6 @@ libs: - src/core/lib/compression/compression_internal.cc - src/core/lib/compression/message_compress.cc - src/core/lib/config/core_configuration.cc - - src/core/lib/debug/event_log.cc - src/core/lib/debug/trace.cc - src/core/lib/debug/trace_flags.cc - src/core/lib/event_engine/ares_resolver.cc @@ -1735,19 +1732,6 @@ libs: - src/core/lib/event_engine/work_queue/basic_work_queue.cc - src/core/lib/experiments/config.cc - src/core/lib/experiments/experiments.cc - - src/core/lib/gprpp/dump_args.cc - - src/core/lib/gprpp/glob.cc - - src/core/lib/gprpp/load_file.cc - - src/core/lib/gprpp/per_cpu.cc - - src/core/lib/gprpp/posix/directory_reader.cc - - src/core/lib/gprpp/ref_counted_string.cc - - src/core/lib/gprpp/status_helper.cc - - src/core/lib/gprpp/time.cc - - src/core/lib/gprpp/time_averaged_stats.cc - - src/core/lib/gprpp/uuid_v4.cc - - src/core/lib/gprpp/validation_errors.cc - - src/core/lib/gprpp/windows/directory_reader.cc - - src/core/lib/gprpp/work_serializer.cc - src/core/lib/iomgr/buffer_list.cc - src/core/lib/iomgr/call_combiner.cc - src/core/lib/iomgr/cfstream_handle.cc @@ -1771,11 +1755,6 @@ libs: - src/core/lib/iomgr/executor.cc - src/core/lib/iomgr/fork_posix.cc - src/core/lib/iomgr/fork_windows.cc - - src/core/lib/iomgr/gethostname_fallback.cc - - src/core/lib/iomgr/gethostname_host_name_max.cc - - src/core/lib/iomgr/gethostname_sysconf.cc - - src/core/lib/iomgr/grpc_if_nametoindex_posix.cc - - src/core/lib/iomgr/grpc_if_nametoindex_unsupported.cc - src/core/lib/iomgr/internal_errqueue.cc - src/core/lib/iomgr/iocp_windows.cc - src/core/lib/iomgr/iomgr.cc @@ -1824,7 +1803,6 @@ libs: - src/core/lib/iomgr/wakeup_fd_nospecial.cc - src/core/lib/iomgr/wakeup_fd_pipe.cc - src/core/lib/iomgr/wakeup_fd_posix.cc - - src/core/lib/matchers/matchers.cc - src/core/lib/promise/activity.cc - src/core/lib/promise/party.cc - src/core/lib/promise/sleep.cc @@ -1944,7 +1922,6 @@ libs: - src/core/lib/transport/timeout_encoding.cc - src/core/lib/transport/transport.cc - src/core/lib/transport/transport_op_string.cc - - src/core/lib/uri/uri_parser.cc - src/core/load_balancing/address_filtering.cc - src/core/load_balancing/backend_metric_parser.cc - src/core/load_balancing/child_policy_handler.cc @@ -2037,7 +2014,16 @@ libs: - src/core/tsi/ssl_transport_security_utils.cc - src/core/tsi/transport_security.cc - src/core/tsi/transport_security_grpc.cc + - src/core/util/backoff.cc + - src/core/util/dump_args.cc + - src/core/util/event_log.cc - src/core/util/gcp_metadata_query.cc + - src/core/util/gethostname_fallback.cc + - src/core/util/gethostname_host_name_max.cc + - src/core/util/gethostname_sysconf.cc + - src/core/util/glob.cc + - src/core/util/grpc_if_nametoindex_posix.cc + - src/core/util/grpc_if_nametoindex_unsupported.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 @@ -2047,6 +2033,20 @@ libs: - src/core/util/json/json_util.cc - src/core/util/json/json_writer.cc - src/core/util/latent_see.cc + - src/core/util/load_file.cc + - src/core/util/matchers.cc + - src/core/util/per_cpu.cc + - src/core/util/posix/directory_reader.cc + - src/core/util/random_early_detection.cc + - src/core/util/ref_counted_string.cc + - src/core/util/status_helper.cc + - src/core/util/time.cc + - src/core/util/time_averaged_stats.cc + - src/core/util/uri.cc + - src/core/util/uuid_v4.cc + - src/core/util/validation_errors.cc + - src/core/util/windows/directory_reader.cc + - src/core/util/work_serializer.cc - src/core/xds/grpc/certificate_provider_store.cc - src/core/xds/grpc/file_watcher_certificate_provider_factory.cc - src/core/xds/grpc/xds_audit_logger_registry.cc @@ -2367,9 +2367,6 @@ libs: - src/core/handshaker/tcp_connect/tcp_connect_handshaker.h - src/core/lib/address_utils/parse_address.h - src/core/lib/address_utils/sockaddr_utils.h - - src/core/lib/avl/avl.h - - src/core/lib/backoff/backoff.h - - src/core/lib/backoff/random_early_detection.h - src/core/lib/channel/call_finalization.h - src/core/lib/channel/channel_args.h - src/core/lib/channel/channel_args_preconditioning.h @@ -2383,7 +2380,6 @@ libs: - src/core/lib/compression/compression_internal.h - src/core/lib/compression/message_compress.h - src/core/lib/config/core_configuration.h - - src/core/lib/debug/event_log.h - src/core/lib/debug/trace.h - src/core/lib/debug/trace_flags.h - src/core/lib/debug/trace_impl.h @@ -2452,37 +2448,6 @@ libs: - src/core/lib/event_engine/work_queue/work_queue.h - src/core/lib/experiments/config.h - src/core/lib/experiments/experiments.h - - src/core/lib/gprpp/atomic_utils.h - - src/core/lib/gprpp/bitset.h - - src/core/lib/gprpp/chunked_vector.h - - src/core/lib/gprpp/cpp_impl_of.h - - src/core/lib/gprpp/down_cast.h - - src/core/lib/gprpp/dual_ref_counted.h - - src/core/lib/gprpp/dump_args.h - - src/core/lib/gprpp/glob.h - - src/core/lib/gprpp/if_list.h - - src/core/lib/gprpp/load_file.h - - src/core/lib/gprpp/manual_constructor.h - - src/core/lib/gprpp/match.h - - src/core/lib/gprpp/notification.h - - src/core/lib/gprpp/orphanable.h - - src/core/lib/gprpp/overload.h - - src/core/lib/gprpp/packed_table.h - - src/core/lib/gprpp/per_cpu.h - - src/core/lib/gprpp/ref_counted.h - - src/core/lib/gprpp/ref_counted_ptr.h - - src/core/lib/gprpp/ref_counted_string.h - - src/core/lib/gprpp/single_set_ptr.h - - src/core/lib/gprpp/sorted_pack.h - - src/core/lib/gprpp/status_helper.h - - src/core/lib/gprpp/table.h - - src/core/lib/gprpp/time.h - - src/core/lib/gprpp/time_averaged_stats.h - - src/core/lib/gprpp/type_list.h - - src/core/lib/gprpp/unique_type_name.h - - src/core/lib/gprpp/uuid_v4.h - - src/core/lib/gprpp/validation_errors.h - - src/core/lib/gprpp/work_serializer.h - src/core/lib/iomgr/block_annotate.h - src/core/lib/iomgr/buffer_list.h - src/core/lib/iomgr/call_combiner.h @@ -2504,8 +2469,6 @@ libs: - src/core/lib/iomgr/event_engine_shims/tcp_client.h - src/core/lib/iomgr/exec_ctx.h - src/core/lib/iomgr/executor.h - - src/core/lib/iomgr/gethostname.h - - src/core/lib/iomgr/grpc_if_nametoindex.h - src/core/lib/iomgr/internal_errqueue.h - src/core/lib/iomgr/iocp_windows.h - src/core/lib/iomgr/iomgr.h @@ -2656,7 +2619,6 @@ libs: - src/core/lib/transport/timeout_encoding.h - src/core/lib/transport/transport.h - src/core/lib/transport/transport_fwd.h - - src/core/lib/uri/uri_parser.h - src/core/load_balancing/address_filtering.h - src/core/load_balancing/backend_metric_data.h - src/core/load_balancing/backend_metric_parser.h @@ -2714,9 +2676,23 @@ libs: - src/core/tsi/transport_security.h - src/core/tsi/transport_security_grpc.h - src/core/tsi/transport_security_interface.h + - src/core/util/atomic_utils.h + - src/core/util/avl.h + - src/core/util/backoff.h + - src/core/util/bitset.h + - src/core/util/chunked_vector.h + - src/core/util/cpp_impl_of.h + - src/core/util/down_cast.h + - src/core/util/dual_ref_counted.h + - src/core/util/dump_args.h + - src/core/util/event_log.h + - src/core/util/gethostname.h + - src/core/util/glob.h + - src/core/util/grpc_if_nametoindex.h - src/core/util/http_client/format_request.h - src/core/util/http_client/httpcli.h - src/core/util/http_client/parser.h + - src/core/util/if_list.h - src/core/util/json/json.h - src/core/util/json/json_args.h - src/core/util/json/json_channel_args.h @@ -2724,10 +2700,34 @@ libs: - src/core/util/json/json_reader.h - src/core/util/json/json_writer.h - src/core/util/latent_see.h + - src/core/util/load_file.h + - src/core/util/manual_constructor.h + - src/core/util/match.h + - src/core/util/notification.h + - src/core/util/orphanable.h + - src/core/util/overload.h + - src/core/util/packed_table.h + - src/core/util/per_cpu.h + - src/core/util/random_early_detection.h + - src/core/util/ref_counted.h + - src/core/util/ref_counted_ptr.h + - src/core/util/ref_counted_string.h - src/core/util/ring_buffer.h + - src/core/util/single_set_ptr.h + - src/core/util/sorted_pack.h - src/core/util/spinlock.h + - src/core/util/status_helper.h + - src/core/util/table.h + - src/core/util/time.h + - src/core/util/time_averaged_stats.h + - src/core/util/type_list.h - src/core/util/unique_ptr_with_bitset.h + - src/core/util/unique_type_name.h - src/core/util/upb_utils.h + - src/core/util/uri.h + - src/core/util/uuid_v4.h + - src/core/util/validation_errors.h + - src/core/util/work_serializer.h - third_party/upb/upb/generated_code_support.h src: - src/core/channelz/channel_trace.cc @@ -2825,8 +2825,6 @@ libs: - src/core/handshaker/tcp_connect/tcp_connect_handshaker.cc - src/core/lib/address_utils/parse_address.cc - src/core/lib/address_utils/sockaddr_utils.cc - - src/core/lib/backoff/backoff.cc - - src/core/lib/backoff/random_early_detection.cc - src/core/lib/channel/channel_args.cc - src/core/lib/channel/channel_args_preconditioning.cc - src/core/lib/channel/channel_stack.cc @@ -2839,7 +2837,6 @@ libs: - src/core/lib/compression/compression_internal.cc - src/core/lib/compression/message_compress.cc - src/core/lib/config/core_configuration.cc - - src/core/lib/debug/event_log.cc - src/core/lib/debug/trace.cc - src/core/lib/debug/trace_flags.cc - src/core/lib/event_engine/ares_resolver.cc @@ -2890,17 +2887,6 @@ libs: - src/core/lib/event_engine/work_queue/basic_work_queue.cc - src/core/lib/experiments/config.cc - src/core/lib/experiments/experiments.cc - - src/core/lib/gprpp/dump_args.cc - - src/core/lib/gprpp/glob.cc - - src/core/lib/gprpp/load_file.cc - - src/core/lib/gprpp/per_cpu.cc - - src/core/lib/gprpp/ref_counted_string.cc - - src/core/lib/gprpp/status_helper.cc - - src/core/lib/gprpp/time.cc - - src/core/lib/gprpp/time_averaged_stats.cc - - src/core/lib/gprpp/uuid_v4.cc - - src/core/lib/gprpp/validation_errors.cc - - src/core/lib/gprpp/work_serializer.cc - src/core/lib/iomgr/buffer_list.cc - src/core/lib/iomgr/call_combiner.cc - src/core/lib/iomgr/cfstream_handle.cc @@ -2924,11 +2910,6 @@ libs: - src/core/lib/iomgr/executor.cc - src/core/lib/iomgr/fork_posix.cc - src/core/lib/iomgr/fork_windows.cc - - src/core/lib/iomgr/gethostname_fallback.cc - - src/core/lib/iomgr/gethostname_host_name_max.cc - - src/core/lib/iomgr/gethostname_sysconf.cc - - src/core/lib/iomgr/grpc_if_nametoindex_posix.cc - - src/core/lib/iomgr/grpc_if_nametoindex_unsupported.cc - src/core/lib/iomgr/internal_errqueue.cc - src/core/lib/iomgr/iocp_windows.cc - src/core/lib/iomgr/iomgr.cc @@ -3060,7 +3041,6 @@ libs: - src/core/lib/transport/timeout_encoding.cc - src/core/lib/transport/transport.cc - src/core/lib/transport/transport_op_string.cc - - src/core/lib/uri/uri_parser.cc - src/core/load_balancing/address_filtering.cc - src/core/load_balancing/backend_metric_parser.cc - src/core/load_balancing/child_policy_handler.cc @@ -3116,6 +3096,15 @@ libs: - src/core/tsi/local_transport_security.cc - src/core/tsi/transport_security.cc - src/core/tsi/transport_security_grpc.cc + - src/core/util/backoff.cc + - src/core/util/dump_args.cc + - src/core/util/event_log.cc + - src/core/util/gethostname_fallback.cc + - src/core/util/gethostname_host_name_max.cc + - src/core/util/gethostname_sysconf.cc + - src/core/util/glob.cc + - src/core/util/grpc_if_nametoindex_posix.cc + - src/core/util/grpc_if_nametoindex_unsupported.cc - src/core/util/http_client/format_request.cc - src/core/util/http_client/httpcli.cc - src/core/util/http_client/parser.cc @@ -3123,6 +3112,17 @@ libs: - src/core/util/json/json_reader.cc - src/core/util/json/json_writer.cc - src/core/util/latent_see.cc + - src/core/util/load_file.cc + - src/core/util/per_cpu.cc + - src/core/util/random_early_detection.cc + - src/core/util/ref_counted_string.cc + - src/core/util/status_helper.cc + - src/core/util/time.cc + - src/core/util/time_averaged_stats.cc + - src/core/util/uri.cc + - src/core/util/uuid_v4.cc + - src/core/util/validation_errors.cc + - src/core/util/work_serializer.cc deps: - upb_mini_descriptor_lib - upb_wire_lib @@ -4465,8 +4465,6 @@ libs: - src/core/handshaker/security/security_handshaker.h - src/core/lib/address_utils/parse_address.h - src/core/lib/address_utils/sockaddr_utils.h - - src/core/lib/avl/avl.h - - src/core/lib/backoff/backoff.h - src/core/lib/channel/call_finalization.h - src/core/lib/channel/channel_args.h - src/core/lib/channel/channel_args_preconditioning.h @@ -4480,7 +4478,6 @@ libs: - src/core/lib/compression/compression_internal.h - src/core/lib/compression/message_compress.h - src/core/lib/config/core_configuration.h - - src/core/lib/debug/event_log.h - src/core/lib/debug/trace.h - src/core/lib/debug/trace_flags.h - src/core/lib/debug/trace_impl.h @@ -4549,36 +4546,6 @@ libs: - src/core/lib/event_engine/work_queue/work_queue.h - src/core/lib/experiments/config.h - src/core/lib/experiments/experiments.h - - src/core/lib/gprpp/atomic_utils.h - - src/core/lib/gprpp/bitset.h - - src/core/lib/gprpp/chunked_vector.h - - src/core/lib/gprpp/cpp_impl_of.h - - src/core/lib/gprpp/down_cast.h - - src/core/lib/gprpp/dual_ref_counted.h - - src/core/lib/gprpp/dump_args.h - - src/core/lib/gprpp/glob.h - - src/core/lib/gprpp/if_list.h - - src/core/lib/gprpp/load_file.h - - src/core/lib/gprpp/manual_constructor.h - - src/core/lib/gprpp/match.h - - src/core/lib/gprpp/notification.h - - src/core/lib/gprpp/orphanable.h - - src/core/lib/gprpp/overload.h - - src/core/lib/gprpp/packed_table.h - - src/core/lib/gprpp/per_cpu.h - - src/core/lib/gprpp/ref_counted.h - - src/core/lib/gprpp/ref_counted_ptr.h - - src/core/lib/gprpp/ref_counted_string.h - - src/core/lib/gprpp/single_set_ptr.h - - src/core/lib/gprpp/sorted_pack.h - - src/core/lib/gprpp/status_helper.h - - src/core/lib/gprpp/table.h - - src/core/lib/gprpp/time.h - - src/core/lib/gprpp/time_averaged_stats.h - - src/core/lib/gprpp/type_list.h - - src/core/lib/gprpp/unique_type_name.h - - src/core/lib/gprpp/validation_errors.h - - src/core/lib/gprpp/work_serializer.h - src/core/lib/iomgr/block_annotate.h - src/core/lib/iomgr/buffer_list.h - src/core/lib/iomgr/call_combiner.h @@ -4600,8 +4567,6 @@ libs: - src/core/lib/iomgr/event_engine_shims/tcp_client.h - src/core/lib/iomgr/exec_ctx.h - src/core/lib/iomgr/executor.h - - src/core/lib/iomgr/gethostname.h - - src/core/lib/iomgr/grpc_if_nametoindex.h - src/core/lib/iomgr/internal_errqueue.h - src/core/lib/iomgr/iocp_windows.h - src/core/lib/iomgr/iomgr.h @@ -4644,7 +4609,6 @@ libs: - src/core/lib/iomgr/vsock.h - src/core/lib/iomgr/wakeup_fd_pipe.h - src/core/lib/iomgr/wakeup_fd_posix.h - - src/core/lib/matchers/matchers.h - src/core/lib/promise/activity.h - src/core/lib/promise/all_ok.h - src/core/lib/promise/arena_promise.h @@ -4749,7 +4713,6 @@ libs: - src/core/lib/transport/timeout_encoding.h - src/core/lib/transport/transport.h - src/core/lib/transport/transport_fwd.h - - src/core/lib/uri/uri_parser.h - src/core/load_balancing/backend_metric_data.h - src/core/load_balancing/lb_policy.h - src/core/load_balancing/lb_policy_factory.h @@ -4774,13 +4737,50 @@ libs: - src/core/tsi/transport_security.h - src/core/tsi/transport_security_grpc.h - src/core/tsi/transport_security_interface.h + - src/core/util/atomic_utils.h + - src/core/util/avl.h + - src/core/util/backoff.h + - src/core/util/bitset.h + - src/core/util/chunked_vector.h + - src/core/util/cpp_impl_of.h + - src/core/util/down_cast.h + - src/core/util/dual_ref_counted.h + - src/core/util/dump_args.h + - src/core/util/event_log.h + - src/core/util/gethostname.h + - src/core/util/glob.h + - src/core/util/grpc_if_nametoindex.h + - src/core/util/if_list.h - src/core/util/json/json.h - src/core/util/json/json_args.h - src/core/util/json/json_reader.h - src/core/util/json/json_writer.h - src/core/util/latent_see.h + - src/core/util/load_file.h + - src/core/util/manual_constructor.h + - src/core/util/match.h + - src/core/util/matchers.h + - src/core/util/notification.h + - src/core/util/orphanable.h + - src/core/util/overload.h + - src/core/util/packed_table.h + - src/core/util/per_cpu.h + - src/core/util/ref_counted.h + - src/core/util/ref_counted_ptr.h + - src/core/util/ref_counted_string.h - src/core/util/ring_buffer.h + - src/core/util/single_set_ptr.h + - src/core/util/sorted_pack.h - src/core/util/spinlock.h + - src/core/util/status_helper.h + - src/core/util/table.h + - src/core/util/time.h + - src/core/util/time_averaged_stats.h + - src/core/util/type_list.h + - src/core/util/unique_type_name.h + - src/core/util/uri.h + - src/core/util/validation_errors.h + - src/core/util/work_serializer.h - third_party/upb/upb/generated_code_support.h src: - src/core/channelz/channel_trace.cc @@ -4799,7 +4799,6 @@ libs: - src/core/handshaker/security/security_handshaker.cc - src/core/lib/address_utils/parse_address.cc - src/core/lib/address_utils/sockaddr_utils.cc - - src/core/lib/backoff/backoff.cc - src/core/lib/channel/channel_args.cc - src/core/lib/channel/channel_args_preconditioning.cc - src/core/lib/channel/channel_stack.cc @@ -4812,7 +4811,6 @@ libs: - src/core/lib/compression/compression_internal.cc - src/core/lib/compression/message_compress.cc - src/core/lib/config/core_configuration.cc - - src/core/lib/debug/event_log.cc - src/core/lib/debug/trace.cc - src/core/lib/debug/trace_flags.cc - src/core/lib/event_engine/ares_resolver.cc @@ -4863,16 +4861,6 @@ libs: - src/core/lib/event_engine/work_queue/basic_work_queue.cc - src/core/lib/experiments/config.cc - src/core/lib/experiments/experiments.cc - - src/core/lib/gprpp/dump_args.cc - - src/core/lib/gprpp/glob.cc - - src/core/lib/gprpp/load_file.cc - - src/core/lib/gprpp/per_cpu.cc - - src/core/lib/gprpp/ref_counted_string.cc - - src/core/lib/gprpp/status_helper.cc - - src/core/lib/gprpp/time.cc - - src/core/lib/gprpp/time_averaged_stats.cc - - src/core/lib/gprpp/validation_errors.cc - - src/core/lib/gprpp/work_serializer.cc - src/core/lib/iomgr/buffer_list.cc - src/core/lib/iomgr/call_combiner.cc - src/core/lib/iomgr/cfstream_handle.cc @@ -4896,11 +4884,6 @@ libs: - src/core/lib/iomgr/executor.cc - src/core/lib/iomgr/fork_posix.cc - src/core/lib/iomgr/fork_windows.cc - - src/core/lib/iomgr/gethostname_fallback.cc - - src/core/lib/iomgr/gethostname_host_name_max.cc - - src/core/lib/iomgr/gethostname_sysconf.cc - - src/core/lib/iomgr/grpc_if_nametoindex_posix.cc - - src/core/lib/iomgr/grpc_if_nametoindex_unsupported.cc - src/core/lib/iomgr/internal_errqueue.cc - src/core/lib/iomgr/iocp_windows.cc - src/core/lib/iomgr/iomgr.cc @@ -4949,7 +4932,6 @@ libs: - src/core/lib/iomgr/wakeup_fd_nospecial.cc - src/core/lib/iomgr/wakeup_fd_pipe.cc - src/core/lib/iomgr/wakeup_fd_posix.cc - - src/core/lib/matchers/matchers.cc - src/core/lib/promise/activity.cc - src/core/lib/promise/party.cc - src/core/lib/resource_quota/api.cc @@ -5030,7 +5012,6 @@ libs: - src/core/lib/transport/timeout_encoding.cc - src/core/lib/transport/transport.cc - src/core/lib/transport/transport_op_string.cc - - src/core/lib/uri/uri_parser.cc - src/core/load_balancing/lb_policy.cc - src/core/load_balancing/lb_policy_registry.cc - src/core/resolver/endpoint_addresses.cc @@ -5045,9 +5026,28 @@ libs: - src/core/tsi/alts/handshaker/transport_security_common_api.cc - src/core/tsi/transport_security.cc - src/core/tsi/transport_security_grpc.cc + - src/core/util/backoff.cc + - src/core/util/dump_args.cc + - src/core/util/event_log.cc + - src/core/util/gethostname_fallback.cc + - src/core/util/gethostname_host_name_max.cc + - src/core/util/gethostname_sysconf.cc + - src/core/util/glob.cc + - src/core/util/grpc_if_nametoindex_posix.cc + - src/core/util/grpc_if_nametoindex_unsupported.cc - src/core/util/json/json_reader.cc - src/core/util/json/json_writer.cc - src/core/util/latent_see.cc + - src/core/util/load_file.cc + - src/core/util/matchers.cc + - src/core/util/per_cpu.cc + - src/core/util/ref_counted_string.cc + - src/core/util/status_helper.cc + - src/core/util/time.cc + - src/core/util/time_averaged_stats.cc + - src/core/util/uri.cc + - src/core/util/validation_errors.cc + - src/core/util/work_serializer.cc deps: - upb_mini_descriptor_lib - upb_wire_lib @@ -5230,15 +5230,6 @@ targets: - src/core/lib/debug/trace.h - src/core/lib/debug/trace_flags.h - src/core/lib/debug/trace_impl.h - - src/core/lib/gprpp/atomic_utils.h - - src/core/lib/gprpp/bitset.h - - src/core/lib/gprpp/down_cast.h - - src/core/lib/gprpp/dump_args.h - - src/core/lib/gprpp/glob.h - - src/core/lib/gprpp/orphanable.h - - src/core/lib/gprpp/per_cpu.h - - src/core/lib/gprpp/ref_counted.h - - src/core/lib/gprpp/ref_counted_ptr.h - src/core/lib/promise/activity.h - src/core/lib/promise/context.h - src/core/lib/promise/detail/basic_seq.h @@ -5253,17 +5244,26 @@ targets: - src/core/lib/promise/promise.h - src/core/lib/promise/seq.h - src/core/lib/promise/wait_set.h + - src/core/util/atomic_utils.h + - src/core/util/bitset.h + - src/core/util/down_cast.h + - src/core/util/dump_args.h + - src/core/util/glob.h - src/core/util/latent_see.h + - src/core/util/orphanable.h + - src/core/util/per_cpu.h + - src/core/util/ref_counted.h + - src/core/util/ref_counted_ptr.h - src/core/util/ring_buffer.h - test/core/promise/test_wakeup_schedulers.h src: - src/core/lib/debug/trace.cc - src/core/lib/debug/trace_flags.cc - - src/core/lib/gprpp/dump_args.cc - - src/core/lib/gprpp/glob.cc - - src/core/lib/gprpp/per_cpu.cc - src/core/lib/promise/activity.cc + - src/core/util/dump_args.cc + - src/core/util/glob.cc - src/core/util/latent_see.cc + - src/core/util/per_cpu.cc - test/core/promise/activity_test.cc deps: - gtest @@ -5395,8 +5395,6 @@ targets: - src/core/lib/debug/trace.h - src/core/lib/debug/trace_flags.h - src/core/lib/debug/trace_impl.h - - src/core/lib/gprpp/bitset.h - - src/core/lib/gprpp/glob.h - src/core/lib/promise/all_ok.h - src/core/lib/promise/detail/join_state.h - src/core/lib/promise/detail/promise_like.h @@ -5404,10 +5402,12 @@ targets: - src/core/lib/promise/map.h - src/core/lib/promise/poll.h - src/core/lib/promise/status_flag.h + - src/core/util/bitset.h + - src/core/util/glob.h src: - src/core/lib/debug/trace.cc - src/core/lib/debug/trace_flags.cc - - src/core/lib/gprpp/glob.cc + - src/core/util/glob.cc - test/core/promise/all_ok_test.cc deps: - gtest @@ -5750,13 +5750,13 @@ targets: build: test language: c++ headers: - - src/core/lib/avl/avl.h - - src/core/lib/gprpp/atomic_utils.h - - src/core/lib/gprpp/down_cast.h - - src/core/lib/gprpp/ref_counted.h - - src/core/lib/gprpp/ref_counted_ptr.h + - src/core/util/atomic_utils.h + - src/core/util/avl.h + - src/core/util/down_cast.h + - src/core/util/ref_counted.h + - src/core/util/ref_counted_ptr.h src: - - test/core/avl/avl_test.cc + - test/core/util/avl_test.cc deps: - gtest - absl/base:config @@ -5816,7 +5816,7 @@ targets: language: c++ headers: [] src: - - test/core/backoff/backoff_test.cc + - test/core/util/backoff_test.cc deps: - gtest - grpc_test_util @@ -6257,10 +6257,10 @@ targets: build: test language: c++ headers: - - src/core/lib/gprpp/bitset.h + - src/core/util/bitset.h - src/core/util/useful.h src: - - test/core/gprpp/bitset_test.cc + - test/core/util/bitset_test.cc deps: - gtest - absl/log:check @@ -6405,7 +6405,6 @@ targets: - src/core/ext/upb-gen/google/protobuf/any.upb_minitable.h - src/core/ext/upb-gen/google/rpc/status.upb.h - src/core/ext/upb-gen/google/rpc/status.upb_minitable.h - - src/core/lib/avl/avl.h - src/core/lib/channel/channel_args.h - src/core/lib/compression/compression_internal.h - src/core/lib/debug/trace.h @@ -6413,27 +6412,6 @@ targets: - src/core/lib/debug/trace_impl.h - src/core/lib/experiments/config.h - src/core/lib/experiments/experiments.h - - src/core/lib/gprpp/atomic_utils.h - - src/core/lib/gprpp/bitset.h - - src/core/lib/gprpp/chunked_vector.h - - src/core/lib/gprpp/cpp_impl_of.h - - src/core/lib/gprpp/down_cast.h - - src/core/lib/gprpp/dual_ref_counted.h - - src/core/lib/gprpp/dump_args.h - - src/core/lib/gprpp/glob.h - - src/core/lib/gprpp/if_list.h - - src/core/lib/gprpp/manual_constructor.h - - src/core/lib/gprpp/orphanable.h - - src/core/lib/gprpp/packed_table.h - - src/core/lib/gprpp/per_cpu.h - - src/core/lib/gprpp/ref_counted.h - - src/core/lib/gprpp/ref_counted_ptr.h - - src/core/lib/gprpp/ref_counted_string.h - - src/core/lib/gprpp/sorted_pack.h - - src/core/lib/gprpp/status_helper.h - - src/core/lib/gprpp/table.h - - src/core/lib/gprpp/time.h - - src/core/lib/gprpp/type_list.h - src/core/lib/iomgr/closure.h - src/core/lib/iomgr/combiner.h - src/core/lib/iomgr/error.h @@ -6485,9 +6463,31 @@ targets: - src/core/lib/transport/simple_slice_based_metadata.h - src/core/lib/transport/status_conversion.h - src/core/lib/transport/timeout_encoding.h + - src/core/util/atomic_utils.h + - src/core/util/avl.h + - src/core/util/bitset.h + - src/core/util/chunked_vector.h + - src/core/util/cpp_impl_of.h + - src/core/util/down_cast.h + - src/core/util/dual_ref_counted.h + - src/core/util/dump_args.h + - src/core/util/glob.h + - src/core/util/if_list.h - src/core/util/latent_see.h + - src/core/util/manual_constructor.h + - src/core/util/orphanable.h + - src/core/util/packed_table.h + - src/core/util/per_cpu.h + - src/core/util/ref_counted.h + - src/core/util/ref_counted_ptr.h + - src/core/util/ref_counted_string.h - src/core/util/ring_buffer.h + - src/core/util/sorted_pack.h - src/core/util/spinlock.h + - src/core/util/status_helper.h + - src/core/util/table.h + - src/core/util/time.h + - src/core/util/type_list.h - test/core/promise/poll_matcher.h - third_party/upb/upb/generated_code_support.h src: @@ -6500,12 +6500,6 @@ targets: - src/core/lib/debug/trace_flags.cc - src/core/lib/experiments/config.cc - src/core/lib/experiments/experiments.cc - - src/core/lib/gprpp/dump_args.cc - - src/core/lib/gprpp/glob.cc - - src/core/lib/gprpp/per_cpu.cc - - src/core/lib/gprpp/ref_counted_string.cc - - src/core/lib/gprpp/status_helper.cc - - src/core/lib/gprpp/time.cc - src/core/lib/iomgr/closure.cc - src/core/lib/iomgr/combiner.cc - src/core/lib/iomgr/error.cc @@ -6534,7 +6528,13 @@ targets: - src/core/lib/transport/parsed_metadata.cc - src/core/lib/transport/status_conversion.cc - src/core/lib/transport/timeout_encoding.cc + - src/core/util/dump_args.cc + - src/core/util/glob.cc - src/core/util/latent_see.cc + - src/core/util/per_cpu.cc + - src/core/util/ref_counted_string.cc + - src/core/util/status_helper.cc + - src/core/util/time.cc - test/core/transport/call_filters_test.cc deps: - gtest @@ -6657,14 +6657,6 @@ targets: - src/core/lib/debug/trace.h - src/core/lib/debug/trace_flags.h - src/core/lib/debug/trace_impl.h - - src/core/lib/gprpp/atomic_utils.h - - src/core/lib/gprpp/down_cast.h - - src/core/lib/gprpp/dump_args.h - - src/core/lib/gprpp/glob.h - - src/core/lib/gprpp/orphanable.h - - src/core/lib/gprpp/per_cpu.h - - src/core/lib/gprpp/ref_counted.h - - src/core/lib/gprpp/ref_counted_ptr.h - src/core/lib/promise/activity.h - src/core/lib/promise/context.h - src/core/lib/promise/detail/promise_factory.h @@ -6673,18 +6665,26 @@ targets: - src/core/lib/promise/poll.h - src/core/lib/promise/status_flag.h - src/core/lib/transport/call_state.h + - src/core/util/atomic_utils.h + - src/core/util/down_cast.h + - src/core/util/dump_args.h + - src/core/util/glob.h - src/core/util/latent_see.h + - src/core/util/orphanable.h + - src/core/util/per_cpu.h + - src/core/util/ref_counted.h + - src/core/util/ref_counted_ptr.h - src/core/util/ring_buffer.h - test/core/promise/poll_matcher.h src: - src/core/lib/debug/trace.cc - src/core/lib/debug/trace_flags.cc - - src/core/lib/gprpp/dump_args.cc - - src/core/lib/gprpp/glob.cc - - src/core/lib/gprpp/per_cpu.cc - src/core/lib/promise/activity.cc - src/core/lib/transport/call_state.cc + - src/core/util/dump_args.cc + - src/core/util/glob.cc - src/core/util/latent_see.cc + - src/core/util/per_cpu.cc - test/core/transport/call_state_test.cc deps: - gtest @@ -6732,8 +6732,6 @@ targets: - src/core/handshaker/proxy_mapper_registry.h - src/core/lib/address_utils/parse_address.h - src/core/lib/address_utils/sockaddr_utils.h - - src/core/lib/avl/avl.h - - src/core/lib/backoff/backoff.h - src/core/lib/channel/call_finalization.h - src/core/lib/channel/channel_args.h - src/core/lib/channel/channel_args_preconditioning.h @@ -6747,7 +6745,6 @@ targets: - src/core/lib/compression/compression_internal.h - src/core/lib/compression/message_compress.h - src/core/lib/config/core_configuration.h - - src/core/lib/debug/event_log.h - src/core/lib/debug/trace.h - src/core/lib/debug/trace_flags.h - src/core/lib/debug/trace_impl.h @@ -6816,36 +6813,6 @@ targets: - src/core/lib/event_engine/work_queue/work_queue.h - src/core/lib/experiments/config.h - src/core/lib/experiments/experiments.h - - src/core/lib/gprpp/atomic_utils.h - - src/core/lib/gprpp/bitset.h - - src/core/lib/gprpp/chunked_vector.h - - src/core/lib/gprpp/cpp_impl_of.h - - src/core/lib/gprpp/down_cast.h - - src/core/lib/gprpp/dual_ref_counted.h - - src/core/lib/gprpp/dump_args.h - - src/core/lib/gprpp/glob.h - - src/core/lib/gprpp/if_list.h - - src/core/lib/gprpp/load_file.h - - src/core/lib/gprpp/manual_constructor.h - - src/core/lib/gprpp/match.h - - src/core/lib/gprpp/notification.h - - src/core/lib/gprpp/orphanable.h - - src/core/lib/gprpp/overload.h - - src/core/lib/gprpp/packed_table.h - - src/core/lib/gprpp/per_cpu.h - - src/core/lib/gprpp/ref_counted.h - - src/core/lib/gprpp/ref_counted_ptr.h - - src/core/lib/gprpp/ref_counted_string.h - - src/core/lib/gprpp/single_set_ptr.h - - src/core/lib/gprpp/sorted_pack.h - - src/core/lib/gprpp/status_helper.h - - src/core/lib/gprpp/table.h - - src/core/lib/gprpp/time.h - - src/core/lib/gprpp/time_averaged_stats.h - - src/core/lib/gprpp/type_list.h - - src/core/lib/gprpp/unique_type_name.h - - src/core/lib/gprpp/validation_errors.h - - src/core/lib/gprpp/work_serializer.h - src/core/lib/iomgr/block_annotate.h - src/core/lib/iomgr/buffer_list.h - src/core/lib/iomgr/call_combiner.h @@ -6867,8 +6834,6 @@ targets: - src/core/lib/iomgr/event_engine_shims/tcp_client.h - src/core/lib/iomgr/exec_ctx.h - src/core/lib/iomgr/executor.h - - src/core/lib/iomgr/gethostname.h - - src/core/lib/iomgr/grpc_if_nametoindex.h - src/core/lib/iomgr/internal_errqueue.h - src/core/lib/iomgr/iocp_windows.h - src/core/lib/iomgr/iomgr.h @@ -6993,7 +6958,6 @@ targets: - src/core/lib/transport/timeout_encoding.h - src/core/lib/transport/transport.h - src/core/lib/transport/transport_fwd.h - - src/core/lib/uri/uri_parser.h - src/core/load_balancing/backend_metric_data.h - src/core/load_balancing/lb_policy.h - src/core/load_balancing/lb_policy_factory.h @@ -7015,12 +6979,48 @@ targets: - src/core/telemetry/stats_data.h - src/core/telemetry/tcp_tracer.h - src/core/tsi/alts/handshaker/transport_security_common_api.h + - src/core/util/atomic_utils.h + - src/core/util/avl.h + - src/core/util/backoff.h + - src/core/util/bitset.h + - src/core/util/chunked_vector.h + - src/core/util/cpp_impl_of.h + - src/core/util/down_cast.h + - src/core/util/dual_ref_counted.h + - src/core/util/dump_args.h + - src/core/util/event_log.h + - src/core/util/gethostname.h + - src/core/util/glob.h + - src/core/util/grpc_if_nametoindex.h + - src/core/util/if_list.h - src/core/util/json/json.h - src/core/util/json/json_args.h - src/core/util/json/json_writer.h - src/core/util/latent_see.h + - src/core/util/load_file.h + - src/core/util/manual_constructor.h + - src/core/util/match.h + - src/core/util/notification.h + - src/core/util/orphanable.h + - src/core/util/overload.h + - src/core/util/packed_table.h + - src/core/util/per_cpu.h + - src/core/util/ref_counted.h + - src/core/util/ref_counted_ptr.h + - src/core/util/ref_counted_string.h - src/core/util/ring_buffer.h + - src/core/util/single_set_ptr.h + - src/core/util/sorted_pack.h - src/core/util/spinlock.h + - src/core/util/status_helper.h + - src/core/util/table.h + - src/core/util/time.h + - src/core/util/time_averaged_stats.h + - src/core/util/type_list.h + - src/core/util/unique_type_name.h + - src/core/util/uri.h + - src/core/util/validation_errors.h + - src/core/util/work_serializer.h - third_party/upb/upb/generated_code_support.h src: - src/core/channelz/channel_trace.cc @@ -7035,7 +7035,6 @@ targets: - src/core/handshaker/proxy_mapper_registry.cc - src/core/lib/address_utils/parse_address.cc - src/core/lib/address_utils/sockaddr_utils.cc - - src/core/lib/backoff/backoff.cc - src/core/lib/channel/channel_args.cc - src/core/lib/channel/channel_args_preconditioning.cc - src/core/lib/channel/channel_stack.cc @@ -7048,7 +7047,6 @@ targets: - src/core/lib/compression/compression_internal.cc - src/core/lib/compression/message_compress.cc - src/core/lib/config/core_configuration.cc - - src/core/lib/debug/event_log.cc - src/core/lib/debug/trace.cc - src/core/lib/debug/trace_flags.cc - src/core/lib/event_engine/ares_resolver.cc @@ -7099,16 +7097,6 @@ targets: - src/core/lib/event_engine/work_queue/basic_work_queue.cc - src/core/lib/experiments/config.cc - src/core/lib/experiments/experiments.cc - - src/core/lib/gprpp/dump_args.cc - - src/core/lib/gprpp/glob.cc - - src/core/lib/gprpp/load_file.cc - - src/core/lib/gprpp/per_cpu.cc - - src/core/lib/gprpp/ref_counted_string.cc - - src/core/lib/gprpp/status_helper.cc - - src/core/lib/gprpp/time.cc - - src/core/lib/gprpp/time_averaged_stats.cc - - src/core/lib/gprpp/validation_errors.cc - - src/core/lib/gprpp/work_serializer.cc - src/core/lib/iomgr/buffer_list.cc - src/core/lib/iomgr/call_combiner.cc - src/core/lib/iomgr/cfstream_handle.cc @@ -7132,11 +7120,6 @@ targets: - src/core/lib/iomgr/executor.cc - src/core/lib/iomgr/fork_posix.cc - src/core/lib/iomgr/fork_windows.cc - - src/core/lib/iomgr/gethostname_fallback.cc - - src/core/lib/iomgr/gethostname_host_name_max.cc - - src/core/lib/iomgr/gethostname_sysconf.cc - - src/core/lib/iomgr/grpc_if_nametoindex_posix.cc - - src/core/lib/iomgr/grpc_if_nametoindex_unsupported.cc - src/core/lib/iomgr/internal_errqueue.cc - src/core/lib/iomgr/iocp_windows.cc - src/core/lib/iomgr/iomgr.cc @@ -7242,7 +7225,6 @@ targets: - src/core/lib/transport/timeout_encoding.cc - src/core/lib/transport/transport.cc - src/core/lib/transport/transport_op_string.cc - - src/core/lib/uri/uri_parser.cc - src/core/load_balancing/lb_policy.cc - src/core/load_balancing/lb_policy_registry.cc - src/core/resolver/endpoint_addresses.cc @@ -7255,8 +7237,26 @@ targets: - src/core/telemetry/stats.cc - src/core/telemetry/stats_data.cc - src/core/tsi/alts/handshaker/transport_security_common_api.cc + - src/core/util/backoff.cc + - src/core/util/dump_args.cc + - src/core/util/event_log.cc + - src/core/util/gethostname_fallback.cc + - src/core/util/gethostname_host_name_max.cc + - src/core/util/gethostname_sysconf.cc + - src/core/util/glob.cc + - src/core/util/grpc_if_nametoindex_posix.cc + - src/core/util/grpc_if_nametoindex_unsupported.cc - src/core/util/json/json_writer.cc - src/core/util/latent_see.cc + - src/core/util/load_file.cc + - src/core/util/per_cpu.cc + - src/core/util/ref_counted_string.cc + - src/core/util/status_helper.cc + - src/core/util/time.cc + - src/core/util/time_averaged_stats.cc + - src/core/util/uri.cc + - src/core/util/validation_errors.cc + - src/core/util/work_serializer.cc - test/core/call/call_utils_test.cc deps: - gtest @@ -7628,19 +7628,6 @@ targets: - src/core/lib/debug/trace_impl.h - src/core/lib/experiments/config.h - src/core/lib/experiments/experiments.h - - src/core/lib/gprpp/atomic_utils.h - - src/core/lib/gprpp/bitset.h - - src/core/lib/gprpp/cpp_impl_of.h - - src/core/lib/gprpp/down_cast.h - - src/core/lib/gprpp/dump_args.h - - src/core/lib/gprpp/glob.h - - src/core/lib/gprpp/manual_constructor.h - - src/core/lib/gprpp/orphanable.h - - src/core/lib/gprpp/per_cpu.h - - src/core/lib/gprpp/ref_counted.h - - src/core/lib/gprpp/ref_counted_ptr.h - - src/core/lib/gprpp/status_helper.h - - src/core/lib/gprpp/time.h - src/core/lib/iomgr/closure.h - src/core/lib/iomgr/combiner.h - src/core/lib/iomgr/error.h @@ -7672,9 +7659,22 @@ targets: - src/core/lib/slice/slice_internal.h - src/core/lib/slice/slice_refcount.h - src/core/lib/slice/slice_string_helpers.h + - src/core/util/atomic_utils.h + - src/core/util/bitset.h + - src/core/util/cpp_impl_of.h + - src/core/util/down_cast.h + - src/core/util/dump_args.h + - src/core/util/glob.h - src/core/util/latent_see.h + - src/core/util/manual_constructor.h + - src/core/util/orphanable.h + - src/core/util/per_cpu.h + - src/core/util/ref_counted.h + - src/core/util/ref_counted_ptr.h - src/core/util/ring_buffer.h - src/core/util/spinlock.h + - src/core/util/status_helper.h + - src/core/util/time.h - third_party/upb/upb/generated_code_support.h src: - src/core/ext/upb-gen/google/protobuf/any.upb_minitable.c @@ -7683,11 +7683,6 @@ targets: - src/core/lib/debug/trace_flags.cc - src/core/lib/experiments/config.cc - src/core/lib/experiments/experiments.cc - - src/core/lib/gprpp/dump_args.cc - - src/core/lib/gprpp/glob.cc - - src/core/lib/gprpp/per_cpu.cc - - src/core/lib/gprpp/status_helper.cc - - src/core/lib/gprpp/time.cc - src/core/lib/iomgr/closure.cc - src/core/lib/iomgr/combiner.cc - src/core/lib/iomgr/error.cc @@ -7704,7 +7699,12 @@ targets: - src/core/lib/slice/percent_encoding.cc - src/core/lib/slice/slice.cc - src/core/lib/slice/slice_string_helpers.cc + - src/core/util/dump_args.cc + - src/core/util/glob.cc - src/core/util/latent_see.cc + - src/core/util/per_cpu.cc + - src/core/util/status_helper.cc + - src/core/util/time.cc - test/core/promise/cancel_callback_test.cc deps: - gtest @@ -8424,20 +8424,6 @@ targets: - src/core/lib/debug/trace_impl.h - src/core/lib/experiments/config.h - src/core/lib/experiments/experiments.h - - src/core/lib/gprpp/atomic_utils.h - - src/core/lib/gprpp/bitset.h - - src/core/lib/gprpp/chunked_vector.h - - src/core/lib/gprpp/cpp_impl_of.h - - src/core/lib/gprpp/down_cast.h - - src/core/lib/gprpp/dump_args.h - - src/core/lib/gprpp/glob.h - - src/core/lib/gprpp/manual_constructor.h - - src/core/lib/gprpp/orphanable.h - - src/core/lib/gprpp/per_cpu.h - - src/core/lib/gprpp/ref_counted.h - - src/core/lib/gprpp/ref_counted_ptr.h - - src/core/lib/gprpp/status_helper.h - - src/core/lib/gprpp/time.h - src/core/lib/iomgr/closure.h - src/core/lib/iomgr/combiner.h - src/core/lib/iomgr/error.h @@ -8468,9 +8454,23 @@ targets: - src/core/lib/slice/slice_internal.h - src/core/lib/slice/slice_refcount.h - src/core/lib/slice/slice_string_helpers.h + - src/core/util/atomic_utils.h + - src/core/util/bitset.h + - src/core/util/chunked_vector.h + - src/core/util/cpp_impl_of.h + - src/core/util/down_cast.h + - src/core/util/dump_args.h + - src/core/util/glob.h - src/core/util/latent_see.h + - src/core/util/manual_constructor.h + - src/core/util/orphanable.h + - src/core/util/per_cpu.h + - src/core/util/ref_counted.h + - src/core/util/ref_counted_ptr.h - src/core/util/ring_buffer.h - src/core/util/spinlock.h + - src/core/util/status_helper.h + - src/core/util/time.h - third_party/upb/upb/generated_code_support.h src: - src/core/ext/upb-gen/google/protobuf/any.upb_minitable.c @@ -8479,11 +8479,6 @@ targets: - src/core/lib/debug/trace_flags.cc - src/core/lib/experiments/config.cc - src/core/lib/experiments/experiments.cc - - src/core/lib/gprpp/dump_args.cc - - src/core/lib/gprpp/glob.cc - - src/core/lib/gprpp/per_cpu.cc - - src/core/lib/gprpp/status_helper.cc - - src/core/lib/gprpp/time.cc - src/core/lib/iomgr/closure.cc - src/core/lib/iomgr/combiner.cc - src/core/lib/iomgr/error.cc @@ -8500,8 +8495,13 @@ targets: - src/core/lib/slice/percent_encoding.cc - src/core/lib/slice/slice.cc - src/core/lib/slice/slice_string_helpers.cc + - src/core/util/dump_args.cc + - src/core/util/glob.cc - src/core/util/latent_see.cc - - test/core/gprpp/chunked_vector_test.cc + - src/core/util/per_cpu.cc + - src/core/util/status_helper.cc + - src/core/util/time.cc + - test/core/util/chunked_vector_test.cc deps: - gtest - upb_mini_descriptor_lib @@ -8905,7 +8905,7 @@ targets: language: c++ headers: - src/core/lib/event_engine/common_closures.h - - src/core/lib/gprpp/notification.h + - src/core/util/notification.h src: - test/core/event_engine/common_closures_test.cc deps: @@ -9170,8 +9170,8 @@ targets: build: test language: c++ headers: - - src/core/lib/gprpp/down_cast.h - src/core/lib/promise/context.h + - src/core/util/down_cast.h src: - test/core/promise/context_test.cc deps: @@ -9196,9 +9196,9 @@ targets: build: test language: c++ headers: - - src/core/lib/gprpp/cpp_impl_of.h + - src/core/util/cpp_impl_of.h src: - - test/core/gprpp/cpp_impl_of_test.cc + - test/core/util/cpp_impl_of_test.cc deps: - gtest uses_polling: false @@ -9351,7 +9351,7 @@ targets: language: c++ headers: [] src: - - test/core/gprpp/directory_reader_test.cc + - test/core/util/directory_reader_test.cc deps: - gtest - grpc_test_util @@ -9445,9 +9445,9 @@ targets: build: test language: c++ headers: - - src/core/lib/gprpp/down_cast.h + - src/core/util/down_cast.h src: - - test/core/gprpp/down_cast_test.cc + - test/core/util/down_cast_test.cc deps: - gtest - absl/base:config @@ -9459,7 +9459,7 @@ targets: language: c++ headers: [] src: - - test/core/gprpp/dual_ref_counted_test.cc + - test/core/util/dual_ref_counted_test.cc deps: - gtest - grpc_test_util @@ -9484,10 +9484,10 @@ targets: build: test language: c++ headers: - - src/core/lib/gprpp/dump_args.h + - src/core/util/dump_args.h src: - - src/core/lib/gprpp/dump_args.cc - - test/core/gprpp/dump_args_test.cc + - src/core/util/dump_args.cc + - test/core/util/dump_args_test.cc deps: - gtest - absl/functional:any_invocable @@ -9744,24 +9744,24 @@ targets: build: test language: c++ headers: - - src/core/lib/avl/avl.h - src/core/lib/channel/channel_args.h - src/core/lib/event_engine/channel_args_endpoint_config.h - - src/core/lib/gprpp/atomic_utils.h - - src/core/lib/gprpp/down_cast.h - - src/core/lib/gprpp/dual_ref_counted.h - - src/core/lib/gprpp/orphanable.h - - src/core/lib/gprpp/ref_counted.h - - src/core/lib/gprpp/ref_counted_ptr.h - - src/core/lib/gprpp/ref_counted_string.h - - src/core/lib/gprpp/time.h - src/core/lib/surface/channel_stack_type.h + - src/core/util/atomic_utils.h + - src/core/util/avl.h + - src/core/util/down_cast.h + - src/core/util/dual_ref_counted.h + - src/core/util/orphanable.h + - src/core/util/ref_counted.h + - src/core/util/ref_counted_ptr.h + - src/core/util/ref_counted_string.h + - src/core/util/time.h src: - src/core/lib/channel/channel_args.cc - src/core/lib/event_engine/channel_args_endpoint_config.cc - - src/core/lib/gprpp/ref_counted_string.cc - - src/core/lib/gprpp/time.cc - src/core/lib/surface/channel_stack_type.cc + - src/core/util/ref_counted_string.cc + - src/core/util/time.cc - test/core/event_engine/endpoint_config_test.cc deps: - gtest @@ -9951,7 +9951,7 @@ targets: language: c++ headers: [] src: - - test/core/gprpp/examine_stack_test.cc + - test/core/util/examine_stack_test.cc deps: - gtest - grpc_test_util @@ -9988,18 +9988,6 @@ targets: - src/core/lib/debug/trace_impl.h - src/core/lib/experiments/config.h - src/core/lib/experiments/experiments.h - - src/core/lib/gprpp/atomic_utils.h - - src/core/lib/gprpp/bitset.h - - src/core/lib/gprpp/down_cast.h - - src/core/lib/gprpp/dump_args.h - - src/core/lib/gprpp/glob.h - - src/core/lib/gprpp/manual_constructor.h - - src/core/lib/gprpp/orphanable.h - - src/core/lib/gprpp/per_cpu.h - - src/core/lib/gprpp/ref_counted.h - - src/core/lib/gprpp/ref_counted_ptr.h - - src/core/lib/gprpp/status_helper.h - - src/core/lib/gprpp/time.h - src/core/lib/iomgr/closure.h - src/core/lib/iomgr/combiner.h - src/core/lib/iomgr/error.h @@ -10018,9 +10006,21 @@ targets: - src/core/lib/slice/slice_internal.h - src/core/lib/slice/slice_refcount.h - src/core/lib/slice/slice_string_helpers.h + - src/core/util/atomic_utils.h + - src/core/util/bitset.h + - src/core/util/down_cast.h + - src/core/util/dump_args.h + - src/core/util/glob.h - src/core/util/latent_see.h + - src/core/util/manual_constructor.h + - src/core/util/orphanable.h + - src/core/util/per_cpu.h + - src/core/util/ref_counted.h + - src/core/util/ref_counted_ptr.h - src/core/util/ring_buffer.h - src/core/util/spinlock.h + - src/core/util/status_helper.h + - src/core/util/time.h - third_party/upb/upb/generated_code_support.h src: - src/core/ext/upb-gen/google/protobuf/any.upb_minitable.c @@ -10029,11 +10029,6 @@ targets: - src/core/lib/debug/trace_flags.cc - src/core/lib/experiments/config.cc - src/core/lib/experiments/experiments.cc - - src/core/lib/gprpp/dump_args.cc - - src/core/lib/gprpp/glob.cc - - src/core/lib/gprpp/per_cpu.cc - - src/core/lib/gprpp/status_helper.cc - - src/core/lib/gprpp/time.cc - src/core/lib/iomgr/closure.cc - src/core/lib/iomgr/combiner.cc - src/core/lib/iomgr/error.cc @@ -10044,7 +10039,12 @@ targets: - src/core/lib/slice/percent_encoding.cc - src/core/lib/slice/slice.cc - src/core/lib/slice/slice_string_helpers.cc + - src/core/util/dump_args.cc + - src/core/util/glob.cc - src/core/util/latent_see.cc + - src/core/util/per_cpu.cc + - src/core/util/status_helper.cc + - src/core/util/time.cc - test/core/promise/exec_ctx_wakeup_scheduler_test.cc deps: - gtest @@ -10525,19 +10525,6 @@ targets: - src/core/lib/debug/trace_impl.h - src/core/lib/experiments/config.h - src/core/lib/experiments/experiments.h - - src/core/lib/gprpp/atomic_utils.h - - src/core/lib/gprpp/bitset.h - - src/core/lib/gprpp/cpp_impl_of.h - - src/core/lib/gprpp/down_cast.h - - src/core/lib/gprpp/dump_args.h - - src/core/lib/gprpp/glob.h - - src/core/lib/gprpp/manual_constructor.h - - src/core/lib/gprpp/orphanable.h - - src/core/lib/gprpp/per_cpu.h - - src/core/lib/gprpp/ref_counted.h - - src/core/lib/gprpp/ref_counted_ptr.h - - src/core/lib/gprpp/status_helper.h - - src/core/lib/gprpp/time.h - src/core/lib/iomgr/closure.h - src/core/lib/iomgr/combiner.h - src/core/lib/iomgr/error.h @@ -10570,9 +10557,22 @@ targets: - src/core/lib/slice/slice_string_helpers.h - src/core/lib/transport/bdp_estimator.h - src/core/lib/transport/http2_errors.h + - src/core/util/atomic_utils.h + - src/core/util/bitset.h + - src/core/util/cpp_impl_of.h + - src/core/util/down_cast.h + - src/core/util/dump_args.h + - src/core/util/glob.h - src/core/util/latent_see.h + - src/core/util/manual_constructor.h + - src/core/util/orphanable.h + - src/core/util/per_cpu.h + - src/core/util/ref_counted.h + - src/core/util/ref_counted_ptr.h - src/core/util/ring_buffer.h - src/core/util/spinlock.h + - src/core/util/status_helper.h + - src/core/util/time.h - third_party/upb/upb/generated_code_support.h src: - src/core/ext/transport/chttp2/transport/flow_control.cc @@ -10584,11 +10584,6 @@ targets: - src/core/lib/debug/trace_flags.cc - src/core/lib/experiments/config.cc - src/core/lib/experiments/experiments.cc - - src/core/lib/gprpp/dump_args.cc - - src/core/lib/gprpp/glob.cc - - src/core/lib/gprpp/per_cpu.cc - - src/core/lib/gprpp/status_helper.cc - - src/core/lib/gprpp/time.cc - src/core/lib/iomgr/closure.cc - src/core/lib/iomgr/combiner.cc - src/core/lib/iomgr/error.cc @@ -10606,7 +10601,12 @@ targets: - src/core/lib/slice/slice_buffer.cc - src/core/lib/slice/slice_string_helpers.cc - src/core/lib/transport/bdp_estimator.cc + - src/core/util/dump_args.cc + - src/core/util/glob.cc - src/core/util/latent_see.cc + - src/core/util/per_cpu.cc + - src/core/util/status_helper.cc + - src/core/util/time.cc - test/core/transport/chttp2/flow_control_test.cc deps: - gtest @@ -10635,19 +10635,6 @@ targets: - src/core/lib/debug/trace_impl.h - src/core/lib/experiments/config.h - src/core/lib/experiments/experiments.h - - src/core/lib/gprpp/atomic_utils.h - - src/core/lib/gprpp/bitset.h - - src/core/lib/gprpp/cpp_impl_of.h - - src/core/lib/gprpp/down_cast.h - - src/core/lib/gprpp/dump_args.h - - src/core/lib/gprpp/glob.h - - src/core/lib/gprpp/manual_constructor.h - - src/core/lib/gprpp/orphanable.h - - src/core/lib/gprpp/per_cpu.h - - src/core/lib/gprpp/ref_counted.h - - src/core/lib/gprpp/ref_counted_ptr.h - - src/core/lib/gprpp/status_helper.h - - src/core/lib/gprpp/time.h - src/core/lib/iomgr/closure.h - src/core/lib/iomgr/combiner.h - src/core/lib/iomgr/error.h @@ -10687,9 +10674,22 @@ targets: - src/core/lib/slice/slice_internal.h - src/core/lib/slice/slice_refcount.h - src/core/lib/slice/slice_string_helpers.h + - src/core/util/atomic_utils.h + - src/core/util/bitset.h + - src/core/util/cpp_impl_of.h + - src/core/util/down_cast.h + - src/core/util/dump_args.h + - src/core/util/glob.h - src/core/util/latent_see.h + - src/core/util/manual_constructor.h + - src/core/util/orphanable.h + - src/core/util/per_cpu.h + - src/core/util/ref_counted.h + - src/core/util/ref_counted_ptr.h - src/core/util/ring_buffer.h - src/core/util/spinlock.h + - src/core/util/status_helper.h + - src/core/util/time.h - test/core/promise/test_wakeup_schedulers.h - third_party/upb/upb/generated_code_support.h src: @@ -10699,11 +10699,6 @@ targets: - src/core/lib/debug/trace_flags.cc - src/core/lib/experiments/config.cc - src/core/lib/experiments/experiments.cc - - src/core/lib/gprpp/dump_args.cc - - src/core/lib/gprpp/glob.cc - - src/core/lib/gprpp/per_cpu.cc - - src/core/lib/gprpp/status_helper.cc - - src/core/lib/gprpp/time.cc - src/core/lib/iomgr/closure.cc - src/core/lib/iomgr/combiner.cc - src/core/lib/iomgr/error.cc @@ -10720,7 +10715,12 @@ targets: - src/core/lib/slice/percent_encoding.cc - src/core/lib/slice/slice.cc - src/core/lib/slice/slice_string_helpers.cc + - src/core/util/dump_args.cc + - src/core/util/glob.cc - src/core/util/latent_see.cc + - src/core/util/per_cpu.cc + - src/core/util/status_helper.cc + - src/core/util/time.cc - test/core/promise/for_each_test.cc deps: - gtest @@ -10740,7 +10740,7 @@ targets: language: c++ headers: [] src: - - test/core/gprpp/fork_test.cc + - test/core/util/fork_test.cc deps: - gtest - grpc_test_util @@ -10758,12 +10758,12 @@ targets: - src/core/lib/debug/trace_flags.h - src/core/lib/debug/trace_impl.h - src/core/lib/event_engine/forkable.h - - src/core/lib/gprpp/glob.h + - src/core/util/glob.h src: - src/core/lib/debug/trace.cc - src/core/lib/debug/trace_flags.cc - src/core/lib/event_engine/forkable.cc - - src/core/lib/gprpp/glob.cc + - src/core/util/glob.cc - test/core/event_engine/forkable_test.cc deps: - gtest @@ -10825,21 +10825,21 @@ targets: - src/core/lib/debug/trace.h - src/core/lib/debug/trace_flags.h - src/core/lib/debug/trace_impl.h - - src/core/lib/gprpp/glob.h - src/core/lib/slice/slice.h - src/core/lib/slice/slice_buffer.h - src/core/lib/slice/slice_internal.h - src/core/lib/slice/slice_refcount.h - src/core/lib/slice/slice_string_helpers.h - src/core/lib/transport/http2_errors.h + - src/core/util/glob.h src: - src/core/ext/transport/chttp2/transport/frame.cc - src/core/lib/debug/trace.cc - src/core/lib/debug/trace_flags.cc - - src/core/lib/gprpp/glob.cc - src/core/lib/slice/slice.cc - src/core/lib/slice/slice_buffer.cc - src/core/lib/slice/slice_string_helpers.cc + - src/core/util/glob.cc - test/core/transport/chttp2/frame_test.cc deps: - gtest @@ -10929,7 +10929,7 @@ targets: language: c++ headers: [] src: - - test/core/gprpp/glob_test.cc + - test/core/util/glob_test.cc deps: - gtest - grpc_test_util @@ -10958,6 +10958,17 @@ targets: deps: - gtest - grpc++_test_util +- name: gpr_time_test + gtest: true + build: test + language: c++ + headers: [] + src: + - test/core/util/gpr_time_test.cc + deps: + - gtest + - grpc_test_util + uses_polling: false - name: graceful_server_shutdown_test gtest: true build: test @@ -11814,7 +11825,7 @@ targets: language: c++ headers: [] src: - - test/core/gprpp/host_port_test.cc + - test/core/util/host_port_test.cc deps: - gtest - grpc_test_util @@ -12143,9 +12154,9 @@ targets: build: test language: c++ headers: - - src/core/lib/gprpp/if_list.h + - src/core/util/if_list.h src: - - test/core/gprpp/if_list_test.cc + - test/core/util/if_list_test.cc deps: - gtest uses_polling: false @@ -12271,14 +12282,6 @@ targets: - src/core/lib/debug/trace.h - src/core/lib/debug/trace_flags.h - src/core/lib/debug/trace_impl.h - - src/core/lib/gprpp/atomic_utils.h - - src/core/lib/gprpp/down_cast.h - - src/core/lib/gprpp/dump_args.h - - src/core/lib/gprpp/glob.h - - src/core/lib/gprpp/orphanable.h - - src/core/lib/gprpp/per_cpu.h - - src/core/lib/gprpp/ref_counted.h - - src/core/lib/gprpp/ref_counted_ptr.h - src/core/lib/promise/activity.h - src/core/lib/promise/context.h - src/core/lib/promise/detail/basic_seq.h @@ -12289,17 +12292,25 @@ targets: - src/core/lib/promise/inter_activity_pipe.h - src/core/lib/promise/poll.h - src/core/lib/promise/seq.h + - src/core/util/atomic_utils.h + - src/core/util/down_cast.h + - src/core/util/dump_args.h + - src/core/util/glob.h - src/core/util/latent_see.h + - src/core/util/orphanable.h + - src/core/util/per_cpu.h + - src/core/util/ref_counted.h + - src/core/util/ref_counted_ptr.h - src/core/util/ring_buffer.h - test/core/promise/test_wakeup_schedulers.h src: - src/core/lib/debug/trace.cc - src/core/lib/debug/trace_flags.cc - - src/core/lib/gprpp/dump_args.cc - - src/core/lib/gprpp/glob.cc - - src/core/lib/gprpp/per_cpu.cc - src/core/lib/promise/activity.cc + - src/core/util/dump_args.cc + - src/core/util/glob.cc - src/core/util/latent_see.cc + - src/core/util/per_cpu.cc - test/core/promise/inter_activity_pipe_test.cc deps: - gtest @@ -12336,19 +12347,6 @@ targets: - src/core/lib/debug/trace_impl.h - src/core/lib/experiments/config.h - src/core/lib/experiments/experiments.h - - src/core/lib/gprpp/atomic_utils.h - - src/core/lib/gprpp/bitset.h - - src/core/lib/gprpp/cpp_impl_of.h - - src/core/lib/gprpp/down_cast.h - - src/core/lib/gprpp/dump_args.h - - src/core/lib/gprpp/glob.h - - src/core/lib/gprpp/manual_constructor.h - - src/core/lib/gprpp/orphanable.h - - src/core/lib/gprpp/per_cpu.h - - src/core/lib/gprpp/ref_counted.h - - src/core/lib/gprpp/ref_counted_ptr.h - - src/core/lib/gprpp/status_helper.h - - src/core/lib/gprpp/time.h - src/core/lib/iomgr/closure.h - src/core/lib/iomgr/combiner.h - src/core/lib/iomgr/error.h @@ -12380,9 +12378,22 @@ targets: - src/core/lib/slice/slice_internal.h - src/core/lib/slice/slice_refcount.h - src/core/lib/slice/slice_string_helpers.h + - src/core/util/atomic_utils.h + - src/core/util/bitset.h + - src/core/util/cpp_impl_of.h + - src/core/util/down_cast.h + - src/core/util/dump_args.h + - src/core/util/glob.h - src/core/util/latent_see.h + - src/core/util/manual_constructor.h + - src/core/util/orphanable.h + - src/core/util/per_cpu.h + - src/core/util/ref_counted.h + - src/core/util/ref_counted_ptr.h - src/core/util/ring_buffer.h - src/core/util/spinlock.h + - src/core/util/status_helper.h + - src/core/util/time.h - test/core/promise/test_context.h - third_party/upb/upb/generated_code_support.h src: @@ -12392,11 +12403,6 @@ targets: - src/core/lib/debug/trace_flags.cc - src/core/lib/experiments/config.cc - src/core/lib/experiments/experiments.cc - - src/core/lib/gprpp/dump_args.cc - - src/core/lib/gprpp/glob.cc - - src/core/lib/gprpp/per_cpu.cc - - src/core/lib/gprpp/status_helper.cc - - src/core/lib/gprpp/time.cc - src/core/lib/iomgr/closure.cc - src/core/lib/iomgr/combiner.cc - src/core/lib/iomgr/error.cc @@ -12413,7 +12419,12 @@ targets: - src/core/lib/slice/percent_encoding.cc - src/core/lib/slice/slice.cc - src/core/lib/slice/slice_string_helpers.cc + - src/core/util/dump_args.cc + - src/core/util/glob.cc - src/core/util/latent_see.cc + - src/core/util/per_cpu.cc + - src/core/util/status_helper.cc + - src/core/util/time.cc - test/core/promise/interceptor_list_test.cc deps: - gtest @@ -12581,18 +12592,18 @@ targets: - src/core/lib/debug/trace.h - src/core/lib/debug/trace_flags.h - src/core/lib/debug/trace_impl.h - - src/core/lib/gprpp/bitset.h - - src/core/lib/gprpp/glob.h - src/core/lib/promise/detail/join_state.h - src/core/lib/promise/detail/promise_like.h - src/core/lib/promise/join.h - src/core/lib/promise/map.h - src/core/lib/promise/poll.h + - src/core/util/bitset.h + - src/core/util/glob.h - test/core/promise/poll_matcher.h src: - src/core/lib/debug/trace.cc - src/core/lib/debug/trace_flags.cc - - src/core/lib/gprpp/glob.cc + - src/core/util/glob.cc - test/core/promise/join_test.cc deps: - gtest @@ -12831,15 +12842,6 @@ targets: - src/core/lib/debug/trace.h - src/core/lib/debug/trace_flags.h - src/core/lib/debug/trace_impl.h - - src/core/lib/gprpp/atomic_utils.h - - src/core/lib/gprpp/bitset.h - - src/core/lib/gprpp/down_cast.h - - src/core/lib/gprpp/dump_args.h - - src/core/lib/gprpp/glob.h - - src/core/lib/gprpp/orphanable.h - - src/core/lib/gprpp/per_cpu.h - - src/core/lib/gprpp/ref_counted.h - - src/core/lib/gprpp/ref_counted_ptr.h - src/core/lib/promise/activity.h - src/core/lib/promise/context.h - src/core/lib/promise/detail/basic_seq.h @@ -12853,17 +12855,26 @@ targets: - src/core/lib/promise/map.h - src/core/lib/promise/poll.h - src/core/lib/promise/seq.h + - src/core/util/atomic_utils.h + - src/core/util/bitset.h + - src/core/util/down_cast.h + - src/core/util/dump_args.h + - src/core/util/glob.h - src/core/util/latent_see.h + - src/core/util/orphanable.h + - src/core/util/per_cpu.h + - src/core/util/ref_counted.h + - src/core/util/ref_counted_ptr.h - src/core/util/ring_buffer.h - test/core/promise/test_wakeup_schedulers.h src: - src/core/lib/debug/trace.cc - src/core/lib/debug/trace_flags.cc - - src/core/lib/gprpp/dump_args.cc - - src/core/lib/gprpp/glob.cc - - src/core/lib/gprpp/per_cpu.cc - src/core/lib/promise/activity.cc + - src/core/util/dump_args.cc + - src/core/util/glob.cc - src/core/util/latent_see.cc + - src/core/util/per_cpu.cc - test/core/promise/latch_test.cc deps: - gtest @@ -12954,7 +12965,7 @@ targets: language: c++ headers: [] src: - - test/core/gprpp/load_file_test.cc + - test/core/util/load_file_test.cc deps: - gtest - grpc_test_util @@ -12982,7 +12993,6 @@ targets: - src/core/lib/debug/trace.h - src/core/lib/debug/trace_flags.h - src/core/lib/debug/trace_impl.h - - src/core/lib/gprpp/glob.h - src/core/lib/promise/detail/basic_seq.h - src/core/lib/promise/detail/promise_factory.h - src/core/lib/promise/detail/promise_like.h @@ -12990,10 +13000,11 @@ targets: - src/core/lib/promise/loop.h - src/core/lib/promise/poll.h - src/core/lib/promise/seq.h + - src/core/util/glob.h src: - src/core/lib/debug/trace.cc - src/core/lib/debug/trace_flags.cc - - src/core/lib/gprpp/glob.cc + - src/core/util/glob.cc - test/core/promise/loop_test.cc deps: - gtest @@ -13031,19 +13042,6 @@ targets: - src/core/lib/debug/trace_impl.h - src/core/lib/experiments/config.h - src/core/lib/experiments/experiments.h - - src/core/lib/gprpp/atomic_utils.h - - src/core/lib/gprpp/bitset.h - - src/core/lib/gprpp/cpp_impl_of.h - - src/core/lib/gprpp/down_cast.h - - src/core/lib/gprpp/dump_args.h - - src/core/lib/gprpp/glob.h - - src/core/lib/gprpp/manual_constructor.h - - src/core/lib/gprpp/orphanable.h - - src/core/lib/gprpp/per_cpu.h - - src/core/lib/gprpp/ref_counted.h - - src/core/lib/gprpp/ref_counted_ptr.h - - src/core/lib/gprpp/status_helper.h - - src/core/lib/gprpp/time.h - src/core/lib/iomgr/closure.h - src/core/lib/iomgr/combiner.h - src/core/lib/iomgr/error.h @@ -13083,9 +13081,22 @@ targets: - src/core/lib/slice/slice_internal.h - src/core/lib/slice/slice_refcount.h - src/core/lib/slice/slice_string_helpers.h + - src/core/util/atomic_utils.h + - src/core/util/bitset.h + - src/core/util/cpp_impl_of.h + - src/core/util/down_cast.h + - src/core/util/dump_args.h + - src/core/util/glob.h - src/core/util/latent_see.h + - src/core/util/manual_constructor.h + - src/core/util/orphanable.h + - src/core/util/per_cpu.h + - src/core/util/ref_counted.h + - src/core/util/ref_counted_ptr.h - src/core/util/ring_buffer.h - src/core/util/spinlock.h + - src/core/util/status_helper.h + - src/core/util/time.h - test/core/promise/test_wakeup_schedulers.h - third_party/upb/upb/generated_code_support.h src: @@ -13095,11 +13106,6 @@ targets: - src/core/lib/debug/trace_flags.cc - src/core/lib/experiments/config.cc - src/core/lib/experiments/experiments.cc - - src/core/lib/gprpp/dump_args.cc - - src/core/lib/gprpp/glob.cc - - src/core/lib/gprpp/per_cpu.cc - - src/core/lib/gprpp/status_helper.cc - - src/core/lib/gprpp/time.cc - src/core/lib/iomgr/closure.cc - src/core/lib/iomgr/combiner.cc - src/core/lib/iomgr/error.cc @@ -13116,7 +13122,12 @@ targets: - src/core/lib/slice/percent_encoding.cc - src/core/lib/slice/slice.cc - src/core/lib/slice/slice_string_helpers.cc + - src/core/util/dump_args.cc + - src/core/util/glob.cc - src/core/util/latent_see.cc + - src/core/util/per_cpu.cc + - src/core/util/status_helper.cc + - src/core/util/time.cc - test/core/promise/map_pipe_test.cc deps: - gtest @@ -13135,10 +13146,10 @@ targets: build: test language: c++ headers: - - src/core/lib/gprpp/match.h - - src/core/lib/gprpp/overload.h + - src/core/util/match.h + - src/core/util/overload.h src: - - test/core/gprpp/match_test.cc + - test/core/util/match_test.cc deps: - gtest uses_polling: false @@ -13158,7 +13169,6 @@ targets: - test/core/test_util/slice_splitter.h - test/core/test_util/tracer_util.h src: - - test/core/matchers/matchers_test.cc - test/core/test_util/cmdline.cc - test/core/test_util/fuzzer_util.cc - test/core/test_util/grpc_profiler.cc @@ -13168,6 +13178,7 @@ targets: - test/core/test_util/resolve_localhost_ip46.cc - test/core/test_util/slice_splitter.cc - test/core/test_util/tracer_util.cc + - test/core/util/matchers_test.cc deps: - gtest - grpc_test_util @@ -13609,14 +13620,6 @@ targets: - src/core/lib/debug/trace.h - src/core/lib/debug/trace_flags.h - src/core/lib/debug/trace_impl.h - - src/core/lib/gprpp/atomic_utils.h - - src/core/lib/gprpp/down_cast.h - - src/core/lib/gprpp/dump_args.h - - src/core/lib/gprpp/glob.h - - src/core/lib/gprpp/orphanable.h - - src/core/lib/gprpp/per_cpu.h - - src/core/lib/gprpp/ref_counted.h - - src/core/lib/gprpp/ref_counted_ptr.h - src/core/lib/promise/activity.h - src/core/lib/promise/context.h - src/core/lib/promise/detail/promise_factory.h @@ -13626,17 +13629,25 @@ targets: - src/core/lib/promise/poll.h - src/core/lib/promise/promise.h - src/core/lib/promise/wait_set.h + - src/core/util/atomic_utils.h + - src/core/util/down_cast.h + - src/core/util/dump_args.h + - src/core/util/glob.h - src/core/util/latent_see.h + - src/core/util/orphanable.h + - src/core/util/per_cpu.h + - src/core/util/ref_counted.h + - src/core/util/ref_counted_ptr.h - src/core/util/ring_buffer.h - test/core/promise/poll_matcher.h src: - src/core/lib/debug/trace.cc - src/core/lib/debug/trace_flags.cc - - src/core/lib/gprpp/dump_args.cc - - src/core/lib/gprpp/glob.cc - - src/core/lib/gprpp/per_cpu.cc - src/core/lib/promise/activity.cc + - src/core/util/dump_args.cc + - src/core/util/glob.cc - src/core/util/latent_see.cc + - src/core/util/per_cpu.cc - test/core/promise/mpsc_test.cc deps: - gtest @@ -13653,7 +13664,7 @@ targets: language: c++ headers: [] src: - - test/core/gprpp/mpscq_test.cc + - test/core/util/mpscq_test.cc deps: - gtest - grpc_test_util @@ -13731,10 +13742,10 @@ targets: build: test language: c++ headers: - - src/core/lib/gprpp/construct_destruct.h - - src/core/lib/gprpp/no_destruct.h + - src/core/util/construct_destruct.h + - src/core/util/no_destruct.h src: - - test/core/gprpp/no_destruct_test.cc + - test/core/util/no_destruct_test.cc deps: - gtest uses_polling: false @@ -13897,9 +13908,9 @@ targets: build: test language: c++ headers: - - src/core/lib/gprpp/notification.h + - src/core/util/notification.h src: - - test/core/gprpp/notification_test.cc + - test/core/util/notification_test.cc deps: - gtest - gpr @@ -13922,15 +13933,6 @@ targets: - src/core/lib/debug/trace.h - src/core/lib/debug/trace_flags.h - src/core/lib/debug/trace_impl.h - - src/core/lib/gprpp/atomic_utils.h - - src/core/lib/gprpp/down_cast.h - - src/core/lib/gprpp/dump_args.h - - src/core/lib/gprpp/glob.h - - src/core/lib/gprpp/notification.h - - src/core/lib/gprpp/orphanable.h - - src/core/lib/gprpp/per_cpu.h - - src/core/lib/gprpp/ref_counted.h - - src/core/lib/gprpp/ref_counted_ptr.h - src/core/lib/promise/activity.h - src/core/lib/promise/context.h - src/core/lib/promise/detail/promise_factory.h @@ -13940,17 +13942,26 @@ targets: - src/core/lib/promise/map.h - src/core/lib/promise/observable.h - src/core/lib/promise/poll.h + - src/core/util/atomic_utils.h + - src/core/util/down_cast.h + - src/core/util/dump_args.h + - src/core/util/glob.h - src/core/util/latent_see.h + - src/core/util/notification.h + - src/core/util/orphanable.h + - src/core/util/per_cpu.h + - src/core/util/ref_counted.h + - src/core/util/ref_counted_ptr.h - src/core/util/ring_buffer.h - test/core/promise/poll_matcher.h src: - src/core/lib/debug/trace.cc - src/core/lib/debug/trace_flags.cc - - src/core/lib/gprpp/dump_args.cc - - src/core/lib/gprpp/glob.cc - - src/core/lib/gprpp/per_cpu.cc - src/core/lib/promise/activity.cc + - src/core/util/dump_args.cc + - src/core/util/glob.cc - src/core/util/latent_see.cc + - src/core/util/per_cpu.cc - test/core/promise/observable_test.cc deps: - gtest @@ -14004,7 +14015,7 @@ targets: language: c++ headers: [] src: - - test/core/gprpp/orphanable_test.cc + - test/core/util/orphanable_test.cc deps: - gtest - grpc_test_util @@ -14098,9 +14109,9 @@ targets: build: test language: c++ headers: - - src/core/lib/gprpp/overload.h + - src/core/util/overload.h src: - - test/core/gprpp/overload_test.cc + - test/core/util/overload_test.cc deps: - gtest uses_polling: false @@ -14277,12 +14288,6 @@ targets: - src/core/lib/debug/trace_impl.h - src/core/lib/experiments/config.h - src/core/lib/experiments/experiments.h - - src/core/lib/gprpp/bitset.h - - src/core/lib/gprpp/glob.h - - src/core/lib/gprpp/manual_constructor.h - - src/core/lib/gprpp/per_cpu.h - - src/core/lib/gprpp/status_helper.h - - src/core/lib/gprpp/time.h - src/core/lib/iomgr/closure.h - src/core/lib/iomgr/combiner.h - src/core/lib/iomgr/error.h @@ -14295,9 +14300,15 @@ targets: - src/core/lib/slice/slice_internal.h - src/core/lib/slice/slice_refcount.h - src/core/lib/slice/slice_string_helpers.h + - src/core/util/bitset.h + - src/core/util/glob.h - src/core/util/latent_see.h + - src/core/util/manual_constructor.h + - src/core/util/per_cpu.h - src/core/util/ring_buffer.h - src/core/util/spinlock.h + - src/core/util/status_helper.h + - src/core/util/time.h - third_party/upb/upb/generated_code_support.h src: - src/core/ext/upb-gen/google/protobuf/any.upb_minitable.c @@ -14306,10 +14317,6 @@ targets: - src/core/lib/debug/trace_flags.cc - src/core/lib/experiments/config.cc - src/core/lib/experiments/experiments.cc - - src/core/lib/gprpp/glob.cc - - src/core/lib/gprpp/per_cpu.cc - - src/core/lib/gprpp/status_helper.cc - - src/core/lib/gprpp/time.cc - src/core/lib/iomgr/closure.cc - src/core/lib/iomgr/combiner.cc - src/core/lib/iomgr/error.cc @@ -14320,7 +14327,11 @@ targets: - src/core/lib/slice/percent_encoding.cc - src/core/lib/slice/slice.cc - src/core/lib/slice/slice_string_helpers.cc + - src/core/util/glob.cc - src/core/util/latent_see.cc + - src/core/util/per_cpu.cc + - src/core/util/status_helper.cc + - src/core/util/time.cc - test/core/resource_quota/periodic_update_test.cc deps: - gtest @@ -14838,15 +14849,6 @@ targets: - src/core/lib/debug/trace.h - src/core/lib/debug/trace_flags.h - src/core/lib/debug/trace_impl.h - - src/core/lib/gprpp/atomic_utils.h - - src/core/lib/gprpp/bitset.h - - src/core/lib/gprpp/down_cast.h - - src/core/lib/gprpp/dump_args.h - - src/core/lib/gprpp/glob.h - - src/core/lib/gprpp/orphanable.h - - src/core/lib/gprpp/per_cpu.h - - src/core/lib/gprpp/ref_counted.h - - src/core/lib/gprpp/ref_counted_ptr.h - src/core/lib/promise/activity.h - src/core/lib/promise/context.h - src/core/lib/promise/detail/basic_seq.h @@ -14861,17 +14863,26 @@ targets: - src/core/lib/promise/promise.h - src/core/lib/promise/promise_mutex.h - src/core/lib/promise/seq.h + - src/core/util/atomic_utils.h + - src/core/util/bitset.h + - src/core/util/down_cast.h + - src/core/util/dump_args.h + - src/core/util/glob.h - src/core/util/latent_see.h + - src/core/util/orphanable.h + - src/core/util/per_cpu.h + - src/core/util/ref_counted.h + - src/core/util/ref_counted_ptr.h - src/core/util/ring_buffer.h - test/core/promise/test_wakeup_schedulers.h src: - src/core/lib/debug/trace.cc - src/core/lib/debug/trace_flags.cc - - src/core/lib/gprpp/dump_args.cc - - src/core/lib/gprpp/glob.cc - - src/core/lib/gprpp/per_cpu.cc - src/core/lib/promise/activity.cc + - src/core/util/dump_args.cc + - src/core/util/glob.cc - src/core/util/latent_see.cc + - src/core/util/per_cpu.cc - test/core/promise/promise_mutex_test.cc deps: - gtest @@ -15120,10 +15131,10 @@ targets: build: test language: c++ headers: - - src/core/lib/backoff/random_early_detection.h + - src/core/util/random_early_detection.h src: - - src/core/lib/backoff/random_early_detection.cc - - test/core/backoff/random_early_detection_test.cc + - src/core/util/random_early_detection.cc + - test/core/util/random_early_detection_test.cc deps: - gtest - absl/random:bit_gen_ref @@ -15194,7 +15205,7 @@ targets: language: c++ headers: [] src: - - test/core/gprpp/ref_counted_ptr_test.cc + - test/core/util/ref_counted_ptr_test.cc deps: - gtest - grpc_test_util @@ -15204,7 +15215,7 @@ targets: language: c++ headers: [] src: - - test/core/gprpp/ref_counted_test.cc + - test/core/util/ref_counted_test.cc deps: - gtest - grpc_test_util @@ -18011,17 +18022,17 @@ targets: - src/core/lib/debug/trace.h - src/core/lib/debug/trace_flags.h - src/core/lib/debug/trace_impl.h - - src/core/lib/gprpp/glob.h - src/core/lib/promise/detail/basic_seq.h - src/core/lib/promise/detail/promise_factory.h - src/core/lib/promise/detail/promise_like.h - src/core/lib/promise/detail/seq_state.h - src/core/lib/promise/poll.h - src/core/lib/promise/seq.h + - src/core/util/glob.h src: - src/core/lib/debug/trace.cc - src/core/lib/debug/trace_flags.cc - - src/core/lib/gprpp/glob.cc + - src/core/util/glob.cc - test/core/promise/seq_test.cc deps: - gtest @@ -18852,9 +18863,9 @@ targets: build: test language: c++ headers: - - src/core/lib/gprpp/single_set_ptr.h + - src/core/util/single_set_ptr.h src: - - test/core/gprpp/single_set_ptr_test.cc + - test/core/util/single_set_ptr_test.cc deps: - gtest - gpr @@ -18880,17 +18891,17 @@ targets: - src/core/lib/debug/trace.h - src/core/lib/debug/trace_flags.h - src/core/lib/debug/trace_impl.h - - src/core/lib/gprpp/glob.h - src/core/lib/slice/slice.h - src/core/lib/slice/slice_internal.h - src/core/lib/slice/slice_refcount.h - src/core/lib/slice/slice_string_helpers.h + - src/core/util/glob.h src: - src/core/lib/debug/trace.cc - src/core/lib/debug/trace_flags.cc - - src/core/lib/gprpp/glob.cc - src/core/lib/slice/slice.cc - src/core/lib/slice/slice_string_helpers.cc + - src/core/util/glob.cc - test/core/slice/slice_string_helpers_test.cc deps: - gtest @@ -18967,10 +18978,10 @@ targets: build: test language: c++ headers: - - src/core/lib/gprpp/sorted_pack.h - - src/core/lib/gprpp/type_list.h + - src/core/util/sorted_pack.h + - src/core/util/type_list.h src: - - test/core/gprpp/sorted_pack_test.cc + - test/core/util/sorted_pack_test.cc deps: - gtest uses_polling: false @@ -19038,7 +19049,7 @@ targets: language: c++ headers: [] src: - - test/core/gprpp/stat_test.cc + - test/core/util/stat_test.cc deps: - gtest - grpc_test_util @@ -19118,7 +19129,7 @@ targets: language: c++ headers: [] src: - - test/core/gprpp/status_helper_test.cc + - test/core/util/status_helper_test.cc deps: - gtest - grpc_test_util @@ -19355,11 +19366,11 @@ targets: build: test language: c++ headers: - - src/core/lib/gprpp/bitset.h - - src/core/lib/gprpp/table.h + - src/core/util/bitset.h + - src/core/util/table.h - src/core/util/useful.h src: - - test/core/gprpp/table_test.cc + - test/core/util/table_test.cc deps: - gtest - absl/log:check @@ -19580,14 +19591,14 @@ targets: headers: - src/core/lib/event_engine/posix_engine/timer.h - src/core/lib/event_engine/posix_engine/timer_heap.h - - src/core/lib/gprpp/bitset.h - - src/core/lib/gprpp/time.h - - src/core/lib/gprpp/time_averaged_stats.h + - src/core/util/bitset.h + - src/core/util/time.h + - src/core/util/time_averaged_stats.h src: - src/core/lib/event_engine/posix_engine/timer.cc - src/core/lib/event_engine/posix_engine/timer_heap.cc - - src/core/lib/gprpp/time.cc - - src/core/lib/gprpp/time_averaged_stats.cc + - src/core/util/time.cc + - src/core/util/time_averaged_stats.cc - test/core/event_engine/posix/timer_heap_test.cc deps: - gtest @@ -19601,13 +19612,13 @@ targets: headers: - src/core/lib/event_engine/posix_engine/timer.h - src/core/lib/event_engine/posix_engine/timer_heap.h - - src/core/lib/gprpp/time.h - - src/core/lib/gprpp/time_averaged_stats.h + - src/core/util/time.h + - src/core/util/time_averaged_stats.h src: - src/core/lib/event_engine/posix_engine/timer.cc - src/core/lib/event_engine/posix_engine/timer_heap.cc - - src/core/lib/gprpp/time.cc - - src/core/lib/gprpp/time_averaged_stats.cc + - src/core/util/time.cc + - src/core/util/time_averaged_stats.cc - test/core/event_engine/posix/timer_list_test.cc deps: - gtest @@ -19625,7 +19636,6 @@ targets: - src/core/lib/event_engine/extensions/can_track_errors.h - src/core/lib/event_engine/handle_containers.h - src/core/lib/event_engine/resolved_address_internal.h - - src/core/lib/gprpp/glob.h - src/core/lib/iomgr/port.h - src/core/lib/iomgr/resolved_address.h - src/core/lib/slice/slice.h @@ -19633,6 +19643,7 @@ targets: - src/core/lib/slice/slice_internal.h - src/core/lib/slice/slice_refcount.h - src/core/lib/slice/slice_string_helpers.h + - src/core/util/glob.h src: - src/core/lib/debug/trace.cc - src/core/lib/debug/trace_flags.cc @@ -19640,10 +19651,10 @@ targets: - src/core/lib/event_engine/resolved_address.cc - src/core/lib/event_engine/slice.cc - src/core/lib/event_engine/slice_buffer.cc - - src/core/lib/gprpp/glob.cc - src/core/lib/slice/slice.cc - src/core/lib/slice/slice_buffer.cc - src/core/lib/slice/slice_string_helpers.cc + - src/core/util/glob.cc - test/core/event_engine/slice_buffer_test.cc deps: - gtest @@ -19652,20 +19663,6 @@ targets: - absl/status:statusor - absl/utility:utility - gpr -- name: test_core_gprpp_time_test - gtest: true - build: test - language: c++ - headers: - - src/core/lib/gprpp/time.h - src: - - src/core/lib/gprpp/time.cc - - test/core/gprpp/time_test.cc - deps: - - gtest - - absl/status:statusor - - gpr - uses_polling: false - name: test_core_iomgr_timer_heap_test gtest: true build: test @@ -19834,12 +19831,15 @@ targets: gtest: true build: test language: c++ - headers: [] + headers: + - src/core/util/time.h src: + - src/core/util/time.cc - test/core/util/time_test.cc deps: - gtest - - grpc_test_util + - absl/status:statusor + - gpr uses_polling: false - name: test_cpp_client_credentials_test gtest: true @@ -19948,7 +19948,7 @@ targets: language: c++ headers: [] src: - - test/core/gprpp/thd_test.cc + - test/core/util/thd_test.cc deps: - gtest - grpc_test_util @@ -19980,11 +19980,11 @@ targets: build: test language: c++ headers: - - src/core/lib/gprpp/atomic_utils.h - - src/core/lib/gprpp/down_cast.h - - src/core/lib/gprpp/ref_counted.h - - src/core/lib/gprpp/ref_counted_ptr.h - src/core/lib/resource_quota/thread_quota.h + - src/core/util/atomic_utils.h + - src/core/util/down_cast.h + - src/core/util/ref_counted.h + - src/core/util/ref_counted_ptr.h src: - src/core/lib/resource_quota/thread_quota.cc - test/core/resource_quota/thread_quota_test.cc @@ -20061,7 +20061,7 @@ targets: language: c++ headers: [] src: - - test/core/gprpp/time_util_test.cc + - test/core/util/time_util_test.cc deps: - gtest - grpc_test_util @@ -20497,8 +20497,6 @@ targets: - src/core/lib/debug/trace.h - src/core/lib/debug/trace_flags.h - src/core/lib/debug/trace_impl.h - - src/core/lib/gprpp/bitset.h - - src/core/lib/gprpp/glob.h - src/core/lib/promise/detail/join_state.h - src/core/lib/promise/detail/promise_like.h - src/core/lib/promise/detail/status.h @@ -20506,10 +20504,12 @@ targets: - src/core/lib/promise/poll.h - src/core/lib/promise/status_flag.h - src/core/lib/promise/try_join.h + - src/core/util/bitset.h + - src/core/util/glob.h src: - src/core/lib/debug/trace.cc - src/core/lib/debug/trace_flags.cc - - src/core/lib/gprpp/glob.cc + - src/core/util/glob.cc - test/core/promise/try_join_test.cc deps: - gtest @@ -20538,7 +20538,6 @@ targets: - src/core/lib/debug/trace.h - src/core/lib/debug/trace_flags.h - src/core/lib/debug/trace_impl.h - - src/core/lib/gprpp/glob.h - src/core/lib/promise/detail/basic_seq.h - src/core/lib/promise/detail/promise_factory.h - src/core/lib/promise/detail/promise_like.h @@ -20547,10 +20546,11 @@ targets: - src/core/lib/promise/poll.h - src/core/lib/promise/status_flag.h - src/core/lib/promise/try_seq.h + - src/core/util/glob.h src: - src/core/lib/debug/trace.cc - src/core/lib/debug/trace_flags.cc - - src/core/lib/gprpp/glob.cc + - src/core/util/glob.cc - test/core/promise/try_seq_test.cc deps: - gtest @@ -20577,10 +20577,10 @@ targets: build: test language: c++ headers: - - src/core/lib/gprpp/unique_type_name.h + - src/core/util/unique_type_name.h - src/core/util/useful.h src: - - test/core/gprpp/unique_type_name_test.cc + - test/core/util/unique_type_name_test.cc deps: - gtest - absl/container:flat_hash_map @@ -20602,13 +20602,13 @@ targets: deps: - gtest - grpc_test_util -- name: uri_parser_test +- name: uri_test gtest: true build: test language: c++ headers: [] src: - - test/core/uri/uri_parser_test.cc + - test/core/util/uri_test.cc deps: - gtest - grpc_test_util_unsecure @@ -20631,7 +20631,7 @@ targets: language: c++ headers: [] src: - - test/core/gprpp/uuid_v4_test.cc + - test/core/util/uuid_v4_test.cc deps: - gtest - grpc_test_util @@ -20642,7 +20642,7 @@ targets: language: c++ headers: [] src: - - test/core/gprpp/validation_errors_test.cc + - test/core/util/validation_errors_test.cc deps: - gtest - grpc_test_util @@ -20665,15 +20665,6 @@ targets: - src/core/lib/debug/trace.h - src/core/lib/debug/trace_flags.h - src/core/lib/debug/trace_impl.h - - src/core/lib/gprpp/atomic_utils.h - - src/core/lib/gprpp/down_cast.h - - src/core/lib/gprpp/dump_args.h - - src/core/lib/gprpp/glob.h - - src/core/lib/gprpp/notification.h - - src/core/lib/gprpp/orphanable.h - - src/core/lib/gprpp/per_cpu.h - - src/core/lib/gprpp/ref_counted.h - - src/core/lib/gprpp/ref_counted_ptr.h - src/core/lib/promise/activity.h - src/core/lib/promise/context.h - src/core/lib/promise/detail/promise_factory.h @@ -20682,17 +20673,26 @@ targets: - src/core/lib/promise/map.h - src/core/lib/promise/poll.h - src/core/lib/promise/wait_for_callback.h + - src/core/util/atomic_utils.h + - src/core/util/down_cast.h + - src/core/util/dump_args.h + - src/core/util/glob.h - src/core/util/latent_see.h + - src/core/util/notification.h + - src/core/util/orphanable.h + - src/core/util/per_cpu.h + - src/core/util/ref_counted.h + - src/core/util/ref_counted_ptr.h - src/core/util/ring_buffer.h - test/core/promise/test_wakeup_schedulers.h src: - src/core/lib/debug/trace.cc - src/core/lib/debug/trace_flags.cc - - src/core/lib/gprpp/dump_args.cc - - src/core/lib/gprpp/glob.cc - - src/core/lib/gprpp/per_cpu.cc - src/core/lib/promise/activity.cc + - src/core/util/dump_args.cc + - src/core/util/glob.cc - src/core/util/latent_see.cc + - src/core/util/per_cpu.cc - test/core/promise/wait_for_callback_test.cc deps: - gtest @@ -21031,7 +21031,7 @@ targets: - test/core/event_engine/event_engine_test_utils.h src: - test/core/event_engine/event_engine_test_utils.cc - - test/core/gprpp/work_serializer_test.cc + - test/core/util/work_serializer_test.cc deps: - gtest - grpc_test_util @@ -21173,10 +21173,10 @@ targets: language: c++ headers: - src/core/ext/transport/chttp2/transport/write_size_policy.h - - src/core/lib/gprpp/time.h + - src/core/util/time.h src: - src/core/ext/transport/chttp2/transport/write_size_policy.cc - - src/core/lib/gprpp/time.cc + - src/core/util/time.cc - test/core/transport/chttp2/write_size_policy_test.cc deps: - gtest diff --git a/config.m4 b/config.m4 index 4f5d7504dc7..e8a2b6321f8 100644 --- a/config.m4 +++ b/config.m4 @@ -443,8 +443,6 @@ if test "$PHP_GRPC" != "no"; then src/core/handshaker/tcp_connect/tcp_connect_handshaker.cc \ src/core/lib/address_utils/parse_address.cc \ src/core/lib/address_utils/sockaddr_utils.cc \ - src/core/lib/backoff/backoff.cc \ - src/core/lib/backoff/random_early_detection.cc \ src/core/lib/channel/channel_args.cc \ src/core/lib/channel/channel_args_preconditioning.cc \ src/core/lib/channel/channel_stack.cc \ @@ -460,7 +458,6 @@ if test "$PHP_GRPC" != "no"; then src/core/lib/config/config_vars_non_generated.cc \ src/core/lib/config/core_configuration.cc \ src/core/lib/config/load_config.cc \ - src/core/lib/debug/event_log.cc \ src/core/lib/debug/trace.cc \ src/core/lib/debug/trace_flags.cc \ src/core/lib/event_engine/ares_resolver.cc \ @@ -512,34 +509,6 @@ if test "$PHP_GRPC" != "no"; then src/core/lib/event_engine/work_queue/basic_work_queue.cc \ src/core/lib/experiments/config.cc \ src/core/lib/experiments/experiments.cc \ - src/core/lib/gprpp/crash.cc \ - src/core/lib/gprpp/dump_args.cc \ - src/core/lib/gprpp/examine_stack.cc \ - src/core/lib/gprpp/fork.cc \ - src/core/lib/gprpp/glob.cc \ - src/core/lib/gprpp/host_port.cc \ - src/core/lib/gprpp/linux/env.cc \ - src/core/lib/gprpp/load_file.cc \ - src/core/lib/gprpp/mpscq.cc \ - src/core/lib/gprpp/per_cpu.cc \ - src/core/lib/gprpp/posix/directory_reader.cc \ - src/core/lib/gprpp/posix/env.cc \ - src/core/lib/gprpp/posix/stat.cc \ - src/core/lib/gprpp/posix/thd.cc \ - src/core/lib/gprpp/ref_counted_string.cc \ - src/core/lib/gprpp/status_helper.cc \ - src/core/lib/gprpp/strerror.cc \ - src/core/lib/gprpp/tchar.cc \ - src/core/lib/gprpp/time.cc \ - src/core/lib/gprpp/time_averaged_stats.cc \ - src/core/lib/gprpp/time_util.cc \ - src/core/lib/gprpp/uuid_v4.cc \ - src/core/lib/gprpp/validation_errors.cc \ - src/core/lib/gprpp/windows/directory_reader.cc \ - src/core/lib/gprpp/windows/env.cc \ - src/core/lib/gprpp/windows/stat.cc \ - src/core/lib/gprpp/windows/thd.cc \ - src/core/lib/gprpp/work_serializer.cc \ src/core/lib/iomgr/buffer_list.cc \ src/core/lib/iomgr/call_combiner.cc \ src/core/lib/iomgr/cfstream_handle.cc \ @@ -563,11 +532,6 @@ if test "$PHP_GRPC" != "no"; then src/core/lib/iomgr/executor.cc \ src/core/lib/iomgr/fork_posix.cc \ src/core/lib/iomgr/fork_windows.cc \ - src/core/lib/iomgr/gethostname_fallback.cc \ - src/core/lib/iomgr/gethostname_host_name_max.cc \ - src/core/lib/iomgr/gethostname_sysconf.cc \ - src/core/lib/iomgr/grpc_if_nametoindex_posix.cc \ - src/core/lib/iomgr/grpc_if_nametoindex_unsupported.cc \ src/core/lib/iomgr/internal_errqueue.cc \ src/core/lib/iomgr/iocp_windows.cc \ src/core/lib/iomgr/iomgr.cc \ @@ -616,7 +580,6 @@ if test "$PHP_GRPC" != "no"; then src/core/lib/iomgr/wakeup_fd_nospecial.cc \ src/core/lib/iomgr/wakeup_fd_pipe.cc \ src/core/lib/iomgr/wakeup_fd_posix.cc \ - src/core/lib/matchers/matchers.cc \ src/core/lib/promise/activity.cc \ src/core/lib/promise/party.cc \ src/core/lib/promise/sleep.cc \ @@ -736,7 +699,6 @@ if test "$PHP_GRPC" != "no"; then src/core/lib/transport/timeout_encoding.cc \ src/core/lib/transport/transport.cc \ src/core/lib/transport/transport_op_string.cc \ - src/core/lib/uri/uri_parser.cc \ src/core/load_balancing/address_filtering.cc \ src/core/load_balancing/backend_metric_parser.cc \ src/core/load_balancing/child_policy_handler.cc \ @@ -831,7 +793,21 @@ if test "$PHP_GRPC" != "no"; then src/core/tsi/transport_security_grpc.cc \ src/core/util/alloc.cc \ src/core/util/atm.cc \ + src/core/util/backoff.cc \ + src/core/util/crash.cc \ + src/core/util/dump_args.cc \ + src/core/util/event_log.cc \ + src/core/util/examine_stack.cc \ + src/core/util/fork.cc \ src/core/util/gcp_metadata_query.cc \ + src/core/util/gethostname_fallback.cc \ + src/core/util/gethostname_host_name_max.cc \ + src/core/util/gethostname_sysconf.cc \ + src/core/util/glob.cc \ + src/core/util/gpr_time.cc \ + src/core/util/grpc_if_nametoindex_posix.cc \ + src/core/util/grpc_if_nametoindex_unsupported.cc \ + src/core/util/host_port.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 \ @@ -843,24 +819,48 @@ if test "$PHP_GRPC" != "no"; then src/core/util/json/json_writer.cc \ src/core/util/latent_see.cc \ src/core/util/linux/cpu.cc \ + src/core/util/linux/env.cc \ + src/core/util/load_file.cc \ src/core/util/log.cc \ + src/core/util/matchers.cc \ + src/core/util/mpscq.cc \ src/core/util/msys/tmpfile.cc \ + src/core/util/per_cpu.cc \ src/core/util/posix/cpu.cc \ + src/core/util/posix/directory_reader.cc \ + src/core/util/posix/env.cc \ + src/core/util/posix/stat.cc \ src/core/util/posix/string.cc \ src/core/util/posix/sync.cc \ + src/core/util/posix/thd.cc \ src/core/util/posix/time.cc \ src/core/util/posix/tmpfile.cc \ + src/core/util/random_early_detection.cc \ + src/core/util/ref_counted_string.cc \ + src/core/util/status_helper.cc \ + src/core/util/strerror.cc \ src/core/util/string.cc \ src/core/util/sync.cc \ src/core/util/sync_abseil.cc \ + src/core/util/tchar.cc \ src/core/util/time.cc \ + src/core/util/time_averaged_stats.cc \ src/core/util/time_precise.cc \ + src/core/util/time_util.cc \ + src/core/util/uri.cc \ + src/core/util/uuid_v4.cc \ + src/core/util/validation_errors.cc \ src/core/util/windows/cpu.cc \ + src/core/util/windows/directory_reader.cc \ + src/core/util/windows/env.cc \ + src/core/util/windows/stat.cc \ src/core/util/windows/string.cc \ src/core/util/windows/string_util.cc \ src/core/util/windows/sync.cc \ + src/core/util/windows/thd.cc \ src/core/util/windows/time.cc \ src/core/util/windows/tmpfile.cc \ + src/core/util/work_serializer.cc \ src/core/xds/grpc/certificate_provider_store.cc \ src/core/xds/grpc/file_watcher_certificate_provider_factory.cc \ src/core/xds/grpc/xds_audit_logger_registry.cc \ @@ -1531,7 +1531,6 @@ if test "$PHP_GRPC" != "no"; then PHP_ADD_BUILD_DIR($ext_builddir/src/core/handshaker/security) PHP_ADD_BUILD_DIR($ext_builddir/src/core/handshaker/tcp_connect) PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/address_utils) - PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/backoff) PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/channel) PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/compression) PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/config) @@ -1544,13 +1543,8 @@ if test "$PHP_GRPC" != "no"; then PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/event_engine/windows) PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/event_engine/work_queue) PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/experiments) - PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/gprpp) - PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/gprpp/linux) - PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/gprpp/posix) - PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/gprpp/windows) PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/iomgr) PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/iomgr/event_engine_shims) - PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/matchers) PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/promise) PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/resource_quota) PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/security/authorization) @@ -1585,7 +1579,6 @@ if test "$PHP_GRPC" != "no"; then PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/slice) PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/surface) PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/transport) - PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/uri) PHP_ADD_BUILD_DIR($ext_builddir/src/core/load_balancing) PHP_ADD_BUILD_DIR($ext_builddir/src/core/load_balancing/grpclb) PHP_ADD_BUILD_DIR($ext_builddir/src/core/load_balancing/outlier_detection) diff --git a/config.w32 b/config.w32 index 08788eafbb5..7a5aa5f8b17 100644 --- a/config.w32 +++ b/config.w32 @@ -408,8 +408,6 @@ if (PHP_GRPC != "no") { "src\\core\\handshaker\\tcp_connect\\tcp_connect_handshaker.cc " + "src\\core\\lib\\address_utils\\parse_address.cc " + "src\\core\\lib\\address_utils\\sockaddr_utils.cc " + - "src\\core\\lib\\backoff\\backoff.cc " + - "src\\core\\lib\\backoff\\random_early_detection.cc " + "src\\core\\lib\\channel\\channel_args.cc " + "src\\core\\lib\\channel\\channel_args_preconditioning.cc " + "src\\core\\lib\\channel\\channel_stack.cc " + @@ -425,7 +423,6 @@ if (PHP_GRPC != "no") { "src\\core\\lib\\config\\config_vars_non_generated.cc " + "src\\core\\lib\\config\\core_configuration.cc " + "src\\core\\lib\\config\\load_config.cc " + - "src\\core\\lib\\debug\\event_log.cc " + "src\\core\\lib\\debug\\trace.cc " + "src\\core\\lib\\debug\\trace_flags.cc " + "src\\core\\lib\\event_engine\\ares_resolver.cc " + @@ -477,34 +474,6 @@ if (PHP_GRPC != "no") { "src\\core\\lib\\event_engine\\work_queue\\basic_work_queue.cc " + "src\\core\\lib\\experiments\\config.cc " + "src\\core\\lib\\experiments\\experiments.cc " + - "src\\core\\lib\\gprpp\\crash.cc " + - "src\\core\\lib\\gprpp\\dump_args.cc " + - "src\\core\\lib\\gprpp\\examine_stack.cc " + - "src\\core\\lib\\gprpp\\fork.cc " + - "src\\core\\lib\\gprpp\\glob.cc " + - "src\\core\\lib\\gprpp\\host_port.cc " + - "src\\core\\lib\\gprpp\\linux\\env.cc " + - "src\\core\\lib\\gprpp\\load_file.cc " + - "src\\core\\lib\\gprpp\\mpscq.cc " + - "src\\core\\lib\\gprpp\\per_cpu.cc " + - "src\\core\\lib\\gprpp\\posix\\directory_reader.cc " + - "src\\core\\lib\\gprpp\\posix\\env.cc " + - "src\\core\\lib\\gprpp\\posix\\stat.cc " + - "src\\core\\lib\\gprpp\\posix\\thd.cc " + - "src\\core\\lib\\gprpp\\ref_counted_string.cc " + - "src\\core\\lib\\gprpp\\status_helper.cc " + - "src\\core\\lib\\gprpp\\strerror.cc " + - "src\\core\\lib\\gprpp\\tchar.cc " + - "src\\core\\lib\\gprpp\\time.cc " + - "src\\core\\lib\\gprpp\\time_averaged_stats.cc " + - "src\\core\\lib\\gprpp\\time_util.cc " + - "src\\core\\lib\\gprpp\\uuid_v4.cc " + - "src\\core\\lib\\gprpp\\validation_errors.cc " + - "src\\core\\lib\\gprpp\\windows\\directory_reader.cc " + - "src\\core\\lib\\gprpp\\windows\\env.cc " + - "src\\core\\lib\\gprpp\\windows\\stat.cc " + - "src\\core\\lib\\gprpp\\windows\\thd.cc " + - "src\\core\\lib\\gprpp\\work_serializer.cc " + "src\\core\\lib\\iomgr\\buffer_list.cc " + "src\\core\\lib\\iomgr\\call_combiner.cc " + "src\\core\\lib\\iomgr\\cfstream_handle.cc " + @@ -528,11 +497,6 @@ if (PHP_GRPC != "no") { "src\\core\\lib\\iomgr\\executor.cc " + "src\\core\\lib\\iomgr\\fork_posix.cc " + "src\\core\\lib\\iomgr\\fork_windows.cc " + - "src\\core\\lib\\iomgr\\gethostname_fallback.cc " + - "src\\core\\lib\\iomgr\\gethostname_host_name_max.cc " + - "src\\core\\lib\\iomgr\\gethostname_sysconf.cc " + - "src\\core\\lib\\iomgr\\grpc_if_nametoindex_posix.cc " + - "src\\core\\lib\\iomgr\\grpc_if_nametoindex_unsupported.cc " + "src\\core\\lib\\iomgr\\internal_errqueue.cc " + "src\\core\\lib\\iomgr\\iocp_windows.cc " + "src\\core\\lib\\iomgr\\iomgr.cc " + @@ -581,7 +545,6 @@ if (PHP_GRPC != "no") { "src\\core\\lib\\iomgr\\wakeup_fd_nospecial.cc " + "src\\core\\lib\\iomgr\\wakeup_fd_pipe.cc " + "src\\core\\lib\\iomgr\\wakeup_fd_posix.cc " + - "src\\core\\lib\\matchers\\matchers.cc " + "src\\core\\lib\\promise\\activity.cc " + "src\\core\\lib\\promise\\party.cc " + "src\\core\\lib\\promise\\sleep.cc " + @@ -701,7 +664,6 @@ if (PHP_GRPC != "no") { "src\\core\\lib\\transport\\timeout_encoding.cc " + "src\\core\\lib\\transport\\transport.cc " + "src\\core\\lib\\transport\\transport_op_string.cc " + - "src\\core\\lib\\uri\\uri_parser.cc " + "src\\core\\load_balancing\\address_filtering.cc " + "src\\core\\load_balancing\\backend_metric_parser.cc " + "src\\core\\load_balancing\\child_policy_handler.cc " + @@ -796,7 +758,21 @@ if (PHP_GRPC != "no") { "src\\core\\tsi\\transport_security_grpc.cc " + "src\\core\\util\\alloc.cc " + "src\\core\\util\\atm.cc " + + "src\\core\\util\\backoff.cc " + + "src\\core\\util\\crash.cc " + + "src\\core\\util\\dump_args.cc " + + "src\\core\\util\\event_log.cc " + + "src\\core\\util\\examine_stack.cc " + + "src\\core\\util\\fork.cc " + "src\\core\\util\\gcp_metadata_query.cc " + + "src\\core\\util\\gethostname_fallback.cc " + + "src\\core\\util\\gethostname_host_name_max.cc " + + "src\\core\\util\\gethostname_sysconf.cc " + + "src\\core\\util\\glob.cc " + + "src\\core\\util\\gpr_time.cc " + + "src\\core\\util\\grpc_if_nametoindex_posix.cc " + + "src\\core\\util\\grpc_if_nametoindex_unsupported.cc " + + "src\\core\\util\\host_port.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 " + @@ -808,24 +784,48 @@ if (PHP_GRPC != "no") { "src\\core\\util\\json\\json_writer.cc " + "src\\core\\util\\latent_see.cc " + "src\\core\\util\\linux\\cpu.cc " + + "src\\core\\util\\linux\\env.cc " + + "src\\core\\util\\load_file.cc " + "src\\core\\util\\log.cc " + + "src\\core\\util\\matchers.cc " + + "src\\core\\util\\mpscq.cc " + "src\\core\\util\\msys\\tmpfile.cc " + + "src\\core\\util\\per_cpu.cc " + "src\\core\\util\\posix\\cpu.cc " + + "src\\core\\util\\posix\\directory_reader.cc " + + "src\\core\\util\\posix\\env.cc " + + "src\\core\\util\\posix\\stat.cc " + "src\\core\\util\\posix\\string.cc " + "src\\core\\util\\posix\\sync.cc " + + "src\\core\\util\\posix\\thd.cc " + "src\\core\\util\\posix\\time.cc " + "src\\core\\util\\posix\\tmpfile.cc " + + "src\\core\\util\\random_early_detection.cc " + + "src\\core\\util\\ref_counted_string.cc " + + "src\\core\\util\\status_helper.cc " + + "src\\core\\util\\strerror.cc " + "src\\core\\util\\string.cc " + "src\\core\\util\\sync.cc " + "src\\core\\util\\sync_abseil.cc " + + "src\\core\\util\\tchar.cc " + "src\\core\\util\\time.cc " + + "src\\core\\util\\time_averaged_stats.cc " + "src\\core\\util\\time_precise.cc " + + "src\\core\\util\\time_util.cc " + + "src\\core\\util\\uri.cc " + + "src\\core\\util\\uuid_v4.cc " + + "src\\core\\util\\validation_errors.cc " + "src\\core\\util\\windows\\cpu.cc " + + "src\\core\\util\\windows\\directory_reader.cc " + + "src\\core\\util\\windows\\env.cc " + + "src\\core\\util\\windows\\stat.cc " + "src\\core\\util\\windows\\string.cc " + "src\\core\\util\\windows\\string_util.cc " + "src\\core\\util\\windows\\sync.cc " + + "src\\core\\util\\windows\\thd.cc " + "src\\core\\util\\windows\\time.cc " + "src\\core\\util\\windows\\tmpfile.cc " + + "src\\core\\util\\work_serializer.cc " + "src\\core\\xds\\grpc\\certificate_provider_store.cc " + "src\\core\\xds\\grpc\\file_watcher_certificate_provider_factory.cc " + "src\\core\\xds\\grpc\\xds_audit_logger_registry.cc " + @@ -1670,7 +1670,6 @@ if (PHP_GRPC != "no") { FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\handshaker\\tcp_connect"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\address_utils"); - FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\backoff"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\channel"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\compression"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\config"); @@ -1683,13 +1682,8 @@ if (PHP_GRPC != "no") { FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\event_engine\\windows"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\event_engine\\work_queue"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\experiments"); - FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\gprpp"); - FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\gprpp\\linux"); - FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\gprpp\\posix"); - FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\gprpp\\windows"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\iomgr"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\iomgr\\event_engine_shims"); - FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\matchers"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\promise"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\resource_quota"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\security"); @@ -1725,7 +1719,6 @@ if (PHP_GRPC != "no") { FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\slice"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\surface"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\transport"); - FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\uri"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\load_balancing"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\load_balancing\\grpclb"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\load_balancing\\outlier_detection"); diff --git a/examples/cpp/csm/csm_greeter_server.cc b/examples/cpp/csm/csm_greeter_server.cc index 910e3f65749..7f66a5cc9a9 100644 --- a/examples/cpp/csm/csm_greeter_server.cc +++ b/examples/cpp/csm/csm_greeter_server.cc @@ -35,7 +35,7 @@ #include #include -#include "src/core/lib/iomgr/gethostname.h" +#include "src/core/util/gethostname.h" #ifdef BAZEL_BUILD #include "examples/protos/helloworld.grpc.pb.h" diff --git a/fuzztest/core/transport/chttp2/hpack_encoder_timeout_test.cc b/fuzztest/core/transport/chttp2/hpack_encoder_timeout_test.cc index 6ab0dfadb10..dab3d8f8431 100644 --- a/fuzztest/core/transport/chttp2/hpack_encoder_timeout_test.cc +++ b/fuzztest/core/transport/chttp2/hpack_encoder_timeout_test.cc @@ -27,7 +27,7 @@ #include "src/core/ext/transport/chttp2/transport/hpack_encoder.h" #include "src/core/ext/transport/chttp2/transport/hpack_parser.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "src/core/lib/slice/slice_buffer.h" #include "src/core/lib/transport/metadata_batch.h" diff --git a/gRPC-C++.podspec b/gRPC-C++.podspec index 350aedf9150..4f6a4bc1b1f 100644 --- a/gRPC-C++.podspec +++ b/gRPC-C++.podspec @@ -882,9 +882,6 @@ Pod::Spec.new do |s| 'src/core/handshaker/tcp_connect/tcp_connect_handshaker.h', 'src/core/lib/address_utils/parse_address.h', 'src/core/lib/address_utils/sockaddr_utils.h', - 'src/core/lib/avl/avl.h', - 'src/core/lib/backoff/backoff.h', - 'src/core/lib/backoff/random_early_detection.h', 'src/core/lib/channel/call_finalization.h', 'src/core/lib/channel/channel_args.h', 'src/core/lib/channel/channel_args_preconditioning.h', @@ -900,7 +897,6 @@ Pod::Spec.new do |s| 'src/core/lib/config/config_vars.h', 'src/core/lib/config/core_configuration.h', 'src/core/lib/config/load_config.h', - 'src/core/lib/debug/event_log.h', 'src/core/lib/debug/trace.h', 'src/core/lib/debug/trace_flags.h', 'src/core/lib/debug/trace_impl.h', @@ -970,55 +966,6 @@ Pod::Spec.new do |s| 'src/core/lib/event_engine/work_queue/work_queue.h', 'src/core/lib/experiments/config.h', 'src/core/lib/experiments/experiments.h', - 'src/core/lib/gprpp/atomic_utils.h', - 'src/core/lib/gprpp/bitset.h', - 'src/core/lib/gprpp/chunked_vector.h', - 'src/core/lib/gprpp/construct_destruct.h', - 'src/core/lib/gprpp/cpp_impl_of.h', - 'src/core/lib/gprpp/crash.h', - 'src/core/lib/gprpp/debug_location.h', - 'src/core/lib/gprpp/directory_reader.h', - 'src/core/lib/gprpp/down_cast.h', - 'src/core/lib/gprpp/dual_ref_counted.h', - 'src/core/lib/gprpp/dump_args.h', - 'src/core/lib/gprpp/env.h', - 'src/core/lib/gprpp/examine_stack.h', - 'src/core/lib/gprpp/fork.h', - 'src/core/lib/gprpp/glob.h', - 'src/core/lib/gprpp/host_port.h', - 'src/core/lib/gprpp/if_list.h', - 'src/core/lib/gprpp/load_file.h', - 'src/core/lib/gprpp/manual_constructor.h', - 'src/core/lib/gprpp/match.h', - 'src/core/lib/gprpp/memory.h', - 'src/core/lib/gprpp/mpscq.h', - 'src/core/lib/gprpp/no_destruct.h', - 'src/core/lib/gprpp/notification.h', - 'src/core/lib/gprpp/orphanable.h', - 'src/core/lib/gprpp/overload.h', - 'src/core/lib/gprpp/packed_table.h', - 'src/core/lib/gprpp/per_cpu.h', - 'src/core/lib/gprpp/ref_counted.h', - 'src/core/lib/gprpp/ref_counted_ptr.h', - 'src/core/lib/gprpp/ref_counted_string.h', - 'src/core/lib/gprpp/single_set_ptr.h', - 'src/core/lib/gprpp/sorted_pack.h', - 'src/core/lib/gprpp/stat.h', - 'src/core/lib/gprpp/status_helper.h', - 'src/core/lib/gprpp/strerror.h', - 'src/core/lib/gprpp/sync.h', - 'src/core/lib/gprpp/table.h', - 'src/core/lib/gprpp/tchar.h', - 'src/core/lib/gprpp/thd.h', - 'src/core/lib/gprpp/time.h', - 'src/core/lib/gprpp/time_averaged_stats.h', - 'src/core/lib/gprpp/time_util.h', - 'src/core/lib/gprpp/type_list.h', - 'src/core/lib/gprpp/unique_type_name.h', - 'src/core/lib/gprpp/uuid_v4.h', - 'src/core/lib/gprpp/validation_errors.h', - 'src/core/lib/gprpp/work_serializer.h', - 'src/core/lib/gprpp/xxhash_inline.h', 'src/core/lib/iomgr/block_annotate.h', 'src/core/lib/iomgr/buffer_list.h', 'src/core/lib/iomgr/call_combiner.h', @@ -1040,8 +987,6 @@ Pod::Spec.new do |s| 'src/core/lib/iomgr/event_engine_shims/tcp_client.h', 'src/core/lib/iomgr/exec_ctx.h', 'src/core/lib/iomgr/executor.h', - 'src/core/lib/iomgr/gethostname.h', - 'src/core/lib/iomgr/grpc_if_nametoindex.h', 'src/core/lib/iomgr/internal_errqueue.h', 'src/core/lib/iomgr/iocp_windows.h', 'src/core/lib/iomgr/iomgr.h', @@ -1084,7 +1029,6 @@ Pod::Spec.new do |s| 'src/core/lib/iomgr/vsock.h', 'src/core/lib/iomgr/wakeup_fd_pipe.h', 'src/core/lib/iomgr/wakeup_fd_posix.h', - 'src/core/lib/matchers/matchers.h', 'src/core/lib/promise/activity.h', 'src/core/lib/promise/all_ok.h', 'src/core/lib/promise/arena_promise.h', @@ -1226,7 +1170,6 @@ Pod::Spec.new do |s| 'src/core/lib/transport/timeout_encoding.h', 'src/core/lib/transport/transport.h', 'src/core/lib/transport/transport_fwd.h', - 'src/core/lib/uri/uri_parser.h', 'src/core/load_balancing/address_filtering.h', 'src/core/load_balancing/backend_metric_data.h', 'src/core/load_balancing/backend_metric_parser.h', @@ -1317,11 +1260,33 @@ Pod::Spec.new do |s| 'src/core/tsi/transport_security_grpc.h', 'src/core/tsi/transport_security_interface.h', 'src/core/util/alloc.h', + 'src/core/util/atomic_utils.h', + 'src/core/util/avl.h', + 'src/core/util/backoff.h', + 'src/core/util/bitset.h', + 'src/core/util/chunked_vector.h', + 'src/core/util/construct_destruct.h', + 'src/core/util/cpp_impl_of.h', + 'src/core/util/crash.h', + 'src/core/util/debug_location.h', + 'src/core/util/directory_reader.h', + 'src/core/util/down_cast.h', + 'src/core/util/dual_ref_counted.h', + 'src/core/util/dump_args.h', + 'src/core/util/env.h', + 'src/core/util/event_log.h', + 'src/core/util/examine_stack.h', + 'src/core/util/fork.h', 'src/core/util/gcp_metadata_query.h', + 'src/core/util/gethostname.h', + 'src/core/util/glob.h', + 'src/core/util/grpc_if_nametoindex.h', + 'src/core/util/host_port.h', 'src/core/util/http_client/format_request.h', 'src/core/util/http_client/httpcli.h', 'src/core/util/http_client/httpcli_ssl_credentials.h', 'src/core/util/http_client/parser.h', + 'src/core/util/if_list.h', 'src/core/util/json/json.h', 'src/core/util/json/json_args.h', 'src/core/util/json/json_channel_args.h', @@ -1330,15 +1295,50 @@ Pod::Spec.new do |s| 'src/core/util/json/json_util.h', 'src/core/util/json/json_writer.h', 'src/core/util/latent_see.h', + 'src/core/util/load_file.h', 'src/core/util/lru_cache.h', + 'src/core/util/manual_constructor.h', + 'src/core/util/match.h', + 'src/core/util/matchers.h', + 'src/core/util/memory.h', + 'src/core/util/mpscq.h', + 'src/core/util/no_destruct.h', + 'src/core/util/notification.h', + 'src/core/util/orphanable.h', + 'src/core/util/overload.h', + 'src/core/util/packed_table.h', + 'src/core/util/per_cpu.h', + 'src/core/util/random_early_detection.h', + 'src/core/util/ref_counted.h', + 'src/core/util/ref_counted_ptr.h', + 'src/core/util/ref_counted_string.h', 'src/core/util/ring_buffer.h', + 'src/core/util/single_set_ptr.h', + 'src/core/util/sorted_pack.h', 'src/core/util/spinlock.h', + 'src/core/util/stat.h', + 'src/core/util/status_helper.h', + 'src/core/util/strerror.h', 'src/core/util/string.h', + 'src/core/util/sync.h', + 'src/core/util/table.h', + 'src/core/util/tchar.h', + 'src/core/util/thd.h', + 'src/core/util/time.h', + 'src/core/util/time_averaged_stats.h', 'src/core/util/time_precise.h', + 'src/core/util/time_util.h', 'src/core/util/tmpfile.h', + 'src/core/util/type_list.h', 'src/core/util/unique_ptr_with_bitset.h', + 'src/core/util/unique_type_name.h', 'src/core/util/upb_utils.h', + 'src/core/util/uri.h', 'src/core/util/useful.h', + 'src/core/util/uuid_v4.h', + 'src/core/util/validation_errors.h', + 'src/core/util/work_serializer.h', + 'src/core/util/xxhash_inline.h', 'src/core/xds/grpc/certificate_provider_store.h', 'src/core/xds/grpc/file_watcher_certificate_provider_factory.h', 'src/core/xds/grpc/xds_audit_logger_registry.h', @@ -2179,9 +2179,6 @@ Pod::Spec.new do |s| 'src/core/handshaker/tcp_connect/tcp_connect_handshaker.h', 'src/core/lib/address_utils/parse_address.h', 'src/core/lib/address_utils/sockaddr_utils.h', - 'src/core/lib/avl/avl.h', - 'src/core/lib/backoff/backoff.h', - 'src/core/lib/backoff/random_early_detection.h', 'src/core/lib/channel/call_finalization.h', 'src/core/lib/channel/channel_args.h', 'src/core/lib/channel/channel_args_preconditioning.h', @@ -2197,7 +2194,6 @@ Pod::Spec.new do |s| 'src/core/lib/config/config_vars.h', 'src/core/lib/config/core_configuration.h', 'src/core/lib/config/load_config.h', - 'src/core/lib/debug/event_log.h', 'src/core/lib/debug/trace.h', 'src/core/lib/debug/trace_flags.h', 'src/core/lib/debug/trace_impl.h', @@ -2267,55 +2263,6 @@ Pod::Spec.new do |s| 'src/core/lib/event_engine/work_queue/work_queue.h', 'src/core/lib/experiments/config.h', 'src/core/lib/experiments/experiments.h', - 'src/core/lib/gprpp/atomic_utils.h', - 'src/core/lib/gprpp/bitset.h', - 'src/core/lib/gprpp/chunked_vector.h', - 'src/core/lib/gprpp/construct_destruct.h', - 'src/core/lib/gprpp/cpp_impl_of.h', - 'src/core/lib/gprpp/crash.h', - 'src/core/lib/gprpp/debug_location.h', - 'src/core/lib/gprpp/directory_reader.h', - 'src/core/lib/gprpp/down_cast.h', - 'src/core/lib/gprpp/dual_ref_counted.h', - 'src/core/lib/gprpp/dump_args.h', - 'src/core/lib/gprpp/env.h', - 'src/core/lib/gprpp/examine_stack.h', - 'src/core/lib/gprpp/fork.h', - 'src/core/lib/gprpp/glob.h', - 'src/core/lib/gprpp/host_port.h', - 'src/core/lib/gprpp/if_list.h', - 'src/core/lib/gprpp/load_file.h', - 'src/core/lib/gprpp/manual_constructor.h', - 'src/core/lib/gprpp/match.h', - 'src/core/lib/gprpp/memory.h', - 'src/core/lib/gprpp/mpscq.h', - 'src/core/lib/gprpp/no_destruct.h', - 'src/core/lib/gprpp/notification.h', - 'src/core/lib/gprpp/orphanable.h', - 'src/core/lib/gprpp/overload.h', - 'src/core/lib/gprpp/packed_table.h', - 'src/core/lib/gprpp/per_cpu.h', - 'src/core/lib/gprpp/ref_counted.h', - 'src/core/lib/gprpp/ref_counted_ptr.h', - 'src/core/lib/gprpp/ref_counted_string.h', - 'src/core/lib/gprpp/single_set_ptr.h', - 'src/core/lib/gprpp/sorted_pack.h', - 'src/core/lib/gprpp/stat.h', - 'src/core/lib/gprpp/status_helper.h', - 'src/core/lib/gprpp/strerror.h', - 'src/core/lib/gprpp/sync.h', - 'src/core/lib/gprpp/table.h', - 'src/core/lib/gprpp/tchar.h', - 'src/core/lib/gprpp/thd.h', - 'src/core/lib/gprpp/time.h', - 'src/core/lib/gprpp/time_averaged_stats.h', - 'src/core/lib/gprpp/time_util.h', - 'src/core/lib/gprpp/type_list.h', - 'src/core/lib/gprpp/unique_type_name.h', - 'src/core/lib/gprpp/uuid_v4.h', - 'src/core/lib/gprpp/validation_errors.h', - 'src/core/lib/gprpp/work_serializer.h', - 'src/core/lib/gprpp/xxhash_inline.h', 'src/core/lib/iomgr/block_annotate.h', 'src/core/lib/iomgr/buffer_list.h', 'src/core/lib/iomgr/call_combiner.h', @@ -2337,8 +2284,6 @@ Pod::Spec.new do |s| 'src/core/lib/iomgr/event_engine_shims/tcp_client.h', 'src/core/lib/iomgr/exec_ctx.h', 'src/core/lib/iomgr/executor.h', - 'src/core/lib/iomgr/gethostname.h', - 'src/core/lib/iomgr/grpc_if_nametoindex.h', 'src/core/lib/iomgr/internal_errqueue.h', 'src/core/lib/iomgr/iocp_windows.h', 'src/core/lib/iomgr/iomgr.h', @@ -2381,7 +2326,6 @@ Pod::Spec.new do |s| 'src/core/lib/iomgr/vsock.h', 'src/core/lib/iomgr/wakeup_fd_pipe.h', 'src/core/lib/iomgr/wakeup_fd_posix.h', - 'src/core/lib/matchers/matchers.h', 'src/core/lib/promise/activity.h', 'src/core/lib/promise/all_ok.h', 'src/core/lib/promise/arena_promise.h', @@ -2523,7 +2467,6 @@ Pod::Spec.new do |s| 'src/core/lib/transport/timeout_encoding.h', 'src/core/lib/transport/transport.h', 'src/core/lib/transport/transport_fwd.h', - 'src/core/lib/uri/uri_parser.h', 'src/core/load_balancing/address_filtering.h', 'src/core/load_balancing/backend_metric_data.h', 'src/core/load_balancing/backend_metric_parser.h', @@ -2614,11 +2557,33 @@ Pod::Spec.new do |s| 'src/core/tsi/transport_security_grpc.h', 'src/core/tsi/transport_security_interface.h', 'src/core/util/alloc.h', + 'src/core/util/atomic_utils.h', + 'src/core/util/avl.h', + 'src/core/util/backoff.h', + 'src/core/util/bitset.h', + 'src/core/util/chunked_vector.h', + 'src/core/util/construct_destruct.h', + 'src/core/util/cpp_impl_of.h', + 'src/core/util/crash.h', + 'src/core/util/debug_location.h', + 'src/core/util/directory_reader.h', + 'src/core/util/down_cast.h', + 'src/core/util/dual_ref_counted.h', + 'src/core/util/dump_args.h', + 'src/core/util/env.h', + 'src/core/util/event_log.h', + 'src/core/util/examine_stack.h', + 'src/core/util/fork.h', 'src/core/util/gcp_metadata_query.h', + 'src/core/util/gethostname.h', + 'src/core/util/glob.h', + 'src/core/util/grpc_if_nametoindex.h', + 'src/core/util/host_port.h', 'src/core/util/http_client/format_request.h', 'src/core/util/http_client/httpcli.h', 'src/core/util/http_client/httpcli_ssl_credentials.h', 'src/core/util/http_client/parser.h', + 'src/core/util/if_list.h', 'src/core/util/json/json.h', 'src/core/util/json/json_args.h', 'src/core/util/json/json_channel_args.h', @@ -2627,15 +2592,50 @@ Pod::Spec.new do |s| 'src/core/util/json/json_util.h', 'src/core/util/json/json_writer.h', 'src/core/util/latent_see.h', + 'src/core/util/load_file.h', 'src/core/util/lru_cache.h', + 'src/core/util/manual_constructor.h', + 'src/core/util/match.h', + 'src/core/util/matchers.h', + 'src/core/util/memory.h', + 'src/core/util/mpscq.h', + 'src/core/util/no_destruct.h', + 'src/core/util/notification.h', + 'src/core/util/orphanable.h', + 'src/core/util/overload.h', + 'src/core/util/packed_table.h', + 'src/core/util/per_cpu.h', + 'src/core/util/random_early_detection.h', + 'src/core/util/ref_counted.h', + 'src/core/util/ref_counted_ptr.h', + 'src/core/util/ref_counted_string.h', 'src/core/util/ring_buffer.h', + 'src/core/util/single_set_ptr.h', + 'src/core/util/sorted_pack.h', 'src/core/util/spinlock.h', + 'src/core/util/stat.h', + 'src/core/util/status_helper.h', + 'src/core/util/strerror.h', 'src/core/util/string.h', + 'src/core/util/sync.h', + 'src/core/util/table.h', + 'src/core/util/tchar.h', + 'src/core/util/thd.h', + 'src/core/util/time.h', + 'src/core/util/time_averaged_stats.h', 'src/core/util/time_precise.h', + 'src/core/util/time_util.h', 'src/core/util/tmpfile.h', + 'src/core/util/type_list.h', 'src/core/util/unique_ptr_with_bitset.h', + 'src/core/util/unique_type_name.h', 'src/core/util/upb_utils.h', + 'src/core/util/uri.h', 'src/core/util/useful.h', + 'src/core/util/uuid_v4.h', + 'src/core/util/validation_errors.h', + 'src/core/util/work_serializer.h', + 'src/core/util/xxhash_inline.h', 'src/core/xds/grpc/certificate_provider_store.h', 'src/core/xds/grpc/file_watcher_certificate_provider_factory.h', 'src/core/xds/grpc/xds_audit_logger_registry.h', diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec index cff65146c64..3ebf0103b56 100644 --- a/gRPC-Core.podspec +++ b/gRPC-Core.podspec @@ -1213,11 +1213,6 @@ Pod::Spec.new do |s| 'src/core/lib/address_utils/parse_address.h', 'src/core/lib/address_utils/sockaddr_utils.cc', 'src/core/lib/address_utils/sockaddr_utils.h', - 'src/core/lib/avl/avl.h', - 'src/core/lib/backoff/backoff.cc', - 'src/core/lib/backoff/backoff.h', - 'src/core/lib/backoff/random_early_detection.cc', - 'src/core/lib/backoff/random_early_detection.h', 'src/core/lib/channel/call_finalization.h', 'src/core/lib/channel/channel_args.cc', 'src/core/lib/channel/channel_args.h', @@ -1248,8 +1243,6 @@ Pod::Spec.new do |s| 'src/core/lib/config/core_configuration.h', 'src/core/lib/config/load_config.cc', 'src/core/lib/config/load_config.h', - 'src/core/lib/debug/event_log.cc', - 'src/core/lib/debug/event_log.h', 'src/core/lib/debug/trace.cc', 'src/core/lib/debug/trace.h', 'src/core/lib/debug/trace_flags.cc', @@ -1370,83 +1363,6 @@ Pod::Spec.new do |s| 'src/core/lib/experiments/config.h', 'src/core/lib/experiments/experiments.cc', 'src/core/lib/experiments/experiments.h', - 'src/core/lib/gprpp/atomic_utils.h', - 'src/core/lib/gprpp/bitset.h', - 'src/core/lib/gprpp/chunked_vector.h', - 'src/core/lib/gprpp/construct_destruct.h', - 'src/core/lib/gprpp/cpp_impl_of.h', - 'src/core/lib/gprpp/crash.cc', - 'src/core/lib/gprpp/crash.h', - 'src/core/lib/gprpp/debug_location.h', - 'src/core/lib/gprpp/directory_reader.h', - 'src/core/lib/gprpp/down_cast.h', - 'src/core/lib/gprpp/dual_ref_counted.h', - 'src/core/lib/gprpp/dump_args.cc', - 'src/core/lib/gprpp/dump_args.h', - 'src/core/lib/gprpp/env.h', - 'src/core/lib/gprpp/examine_stack.cc', - 'src/core/lib/gprpp/examine_stack.h', - 'src/core/lib/gprpp/fork.cc', - 'src/core/lib/gprpp/fork.h', - 'src/core/lib/gprpp/glob.cc', - 'src/core/lib/gprpp/glob.h', - 'src/core/lib/gprpp/host_port.cc', - 'src/core/lib/gprpp/host_port.h', - 'src/core/lib/gprpp/if_list.h', - 'src/core/lib/gprpp/linux/env.cc', - 'src/core/lib/gprpp/load_file.cc', - 'src/core/lib/gprpp/load_file.h', - 'src/core/lib/gprpp/manual_constructor.h', - 'src/core/lib/gprpp/match.h', - 'src/core/lib/gprpp/memory.h', - 'src/core/lib/gprpp/mpscq.cc', - 'src/core/lib/gprpp/mpscq.h', - 'src/core/lib/gprpp/no_destruct.h', - 'src/core/lib/gprpp/notification.h', - 'src/core/lib/gprpp/orphanable.h', - 'src/core/lib/gprpp/overload.h', - 'src/core/lib/gprpp/packed_table.h', - 'src/core/lib/gprpp/per_cpu.cc', - 'src/core/lib/gprpp/per_cpu.h', - 'src/core/lib/gprpp/posix/directory_reader.cc', - 'src/core/lib/gprpp/posix/env.cc', - 'src/core/lib/gprpp/posix/stat.cc', - 'src/core/lib/gprpp/posix/thd.cc', - 'src/core/lib/gprpp/ref_counted.h', - 'src/core/lib/gprpp/ref_counted_ptr.h', - 'src/core/lib/gprpp/ref_counted_string.cc', - 'src/core/lib/gprpp/ref_counted_string.h', - 'src/core/lib/gprpp/single_set_ptr.h', - 'src/core/lib/gprpp/sorted_pack.h', - 'src/core/lib/gprpp/stat.h', - 'src/core/lib/gprpp/status_helper.cc', - 'src/core/lib/gprpp/status_helper.h', - 'src/core/lib/gprpp/strerror.cc', - 'src/core/lib/gprpp/strerror.h', - 'src/core/lib/gprpp/sync.h', - 'src/core/lib/gprpp/table.h', - 'src/core/lib/gprpp/tchar.cc', - 'src/core/lib/gprpp/tchar.h', - 'src/core/lib/gprpp/thd.h', - 'src/core/lib/gprpp/time.cc', - 'src/core/lib/gprpp/time.h', - 'src/core/lib/gprpp/time_averaged_stats.cc', - 'src/core/lib/gprpp/time_averaged_stats.h', - 'src/core/lib/gprpp/time_util.cc', - 'src/core/lib/gprpp/time_util.h', - 'src/core/lib/gprpp/type_list.h', - 'src/core/lib/gprpp/unique_type_name.h', - 'src/core/lib/gprpp/uuid_v4.cc', - 'src/core/lib/gprpp/uuid_v4.h', - 'src/core/lib/gprpp/validation_errors.cc', - 'src/core/lib/gprpp/validation_errors.h', - 'src/core/lib/gprpp/windows/directory_reader.cc', - 'src/core/lib/gprpp/windows/env.cc', - 'src/core/lib/gprpp/windows/stat.cc', - 'src/core/lib/gprpp/windows/thd.cc', - 'src/core/lib/gprpp/work_serializer.cc', - 'src/core/lib/gprpp/work_serializer.h', - 'src/core/lib/gprpp/xxhash_inline.h', 'src/core/lib/iomgr/block_annotate.h', 'src/core/lib/iomgr/buffer_list.cc', 'src/core/lib/iomgr/buffer_list.h', @@ -1491,13 +1407,6 @@ Pod::Spec.new do |s| 'src/core/lib/iomgr/executor.h', 'src/core/lib/iomgr/fork_posix.cc', 'src/core/lib/iomgr/fork_windows.cc', - 'src/core/lib/iomgr/gethostname.h', - 'src/core/lib/iomgr/gethostname_fallback.cc', - 'src/core/lib/iomgr/gethostname_host_name_max.cc', - 'src/core/lib/iomgr/gethostname_sysconf.cc', - 'src/core/lib/iomgr/grpc_if_nametoindex.h', - 'src/core/lib/iomgr/grpc_if_nametoindex_posix.cc', - 'src/core/lib/iomgr/grpc_if_nametoindex_unsupported.cc', 'src/core/lib/iomgr/internal_errqueue.cc', 'src/core/lib/iomgr/internal_errqueue.h', 'src/core/lib/iomgr/iocp_windows.cc', @@ -1588,8 +1497,6 @@ Pod::Spec.new do |s| 'src/core/lib/iomgr/wakeup_fd_pipe.h', 'src/core/lib/iomgr/wakeup_fd_posix.cc', 'src/core/lib/iomgr/wakeup_fd_posix.h', - 'src/core/lib/matchers/matchers.cc', - 'src/core/lib/matchers/matchers.h', 'src/core/lib/promise/activity.cc', 'src/core/lib/promise/activity.h', 'src/core/lib/promise/all_ok.h', @@ -1850,8 +1757,6 @@ Pod::Spec.new do |s| 'src/core/lib/transport/transport.h', 'src/core/lib/transport/transport_fwd.h', 'src/core/lib/transport/transport_op_string.cc', - 'src/core/lib/uri/uri_parser.cc', - 'src/core/lib/uri/uri_parser.h', 'src/core/load_balancing/address_filtering.cc', 'src/core/load_balancing/address_filtering.h', 'src/core/load_balancing/backend_metric_data.h', @@ -2036,8 +1941,43 @@ Pod::Spec.new do |s| 'src/core/util/alloc.cc', 'src/core/util/alloc.h', 'src/core/util/atm.cc', + 'src/core/util/atomic_utils.h', + 'src/core/util/avl.h', + 'src/core/util/backoff.cc', + 'src/core/util/backoff.h', + 'src/core/util/bitset.h', + 'src/core/util/chunked_vector.h', + 'src/core/util/construct_destruct.h', + 'src/core/util/cpp_impl_of.h', + 'src/core/util/crash.cc', + 'src/core/util/crash.h', + 'src/core/util/debug_location.h', + 'src/core/util/directory_reader.h', + 'src/core/util/down_cast.h', + 'src/core/util/dual_ref_counted.h', + 'src/core/util/dump_args.cc', + 'src/core/util/dump_args.h', + 'src/core/util/env.h', + 'src/core/util/event_log.cc', + 'src/core/util/event_log.h', + 'src/core/util/examine_stack.cc', + 'src/core/util/examine_stack.h', + 'src/core/util/fork.cc', + 'src/core/util/fork.h', 'src/core/util/gcp_metadata_query.cc', 'src/core/util/gcp_metadata_query.h', + 'src/core/util/gethostname.h', + 'src/core/util/gethostname_fallback.cc', + 'src/core/util/gethostname_host_name_max.cc', + 'src/core/util/gethostname_sysconf.cc', + 'src/core/util/glob.cc', + 'src/core/util/glob.h', + 'src/core/util/gpr_time.cc', + 'src/core/util/grpc_if_nametoindex.h', + 'src/core/util/grpc_if_nametoindex_posix.cc', + 'src/core/util/grpc_if_nametoindex_unsupported.cc', + 'src/core/util/host_port.cc', + 'src/core/util/host_port.h', 'src/core/util/http_client/format_request.cc', 'src/core/util/http_client/format_request.h', 'src/core/util/http_client/httpcli.cc', @@ -2046,6 +1986,7 @@ Pod::Spec.new do |s| 'src/core/util/http_client/httpcli_ssl_credentials.h', 'src/core/util/http_client/parser.cc', 'src/core/util/http_client/parser.h', + 'src/core/util/if_list.h', 'src/core/util/iphone/cpu.cc', 'src/core/util/json/json.h', 'src/core/util/json/json_args.h', @@ -2061,33 +2002,92 @@ Pod::Spec.new do |s| 'src/core/util/latent_see.cc', 'src/core/util/latent_see.h', 'src/core/util/linux/cpu.cc', + 'src/core/util/linux/env.cc', + 'src/core/util/load_file.cc', + 'src/core/util/load_file.h', 'src/core/util/log.cc', 'src/core/util/lru_cache.h', + 'src/core/util/manual_constructor.h', + 'src/core/util/match.h', + 'src/core/util/matchers.cc', + 'src/core/util/matchers.h', + 'src/core/util/memory.h', + 'src/core/util/mpscq.cc', + 'src/core/util/mpscq.h', 'src/core/util/msys/tmpfile.cc', + 'src/core/util/no_destruct.h', + 'src/core/util/notification.h', + 'src/core/util/orphanable.h', + 'src/core/util/overload.h', + 'src/core/util/packed_table.h', + 'src/core/util/per_cpu.cc', + 'src/core/util/per_cpu.h', 'src/core/util/posix/cpu.cc', + 'src/core/util/posix/directory_reader.cc', + 'src/core/util/posix/env.cc', + 'src/core/util/posix/stat.cc', 'src/core/util/posix/string.cc', 'src/core/util/posix/sync.cc', + 'src/core/util/posix/thd.cc', 'src/core/util/posix/time.cc', 'src/core/util/posix/tmpfile.cc', + 'src/core/util/random_early_detection.cc', + 'src/core/util/random_early_detection.h', + 'src/core/util/ref_counted.h', + 'src/core/util/ref_counted_ptr.h', + 'src/core/util/ref_counted_string.cc', + 'src/core/util/ref_counted_string.h', 'src/core/util/ring_buffer.h', + 'src/core/util/single_set_ptr.h', + 'src/core/util/sorted_pack.h', 'src/core/util/spinlock.h', + 'src/core/util/stat.h', + 'src/core/util/status_helper.cc', + 'src/core/util/status_helper.h', + 'src/core/util/strerror.cc', + 'src/core/util/strerror.h', 'src/core/util/string.cc', 'src/core/util/string.h', 'src/core/util/sync.cc', + 'src/core/util/sync.h', 'src/core/util/sync_abseil.cc', + 'src/core/util/table.h', + 'src/core/util/tchar.cc', + 'src/core/util/tchar.h', + 'src/core/util/thd.h', 'src/core/util/time.cc', + 'src/core/util/time.h', + 'src/core/util/time_averaged_stats.cc', + 'src/core/util/time_averaged_stats.h', 'src/core/util/time_precise.cc', 'src/core/util/time_precise.h', + 'src/core/util/time_util.cc', + 'src/core/util/time_util.h', 'src/core/util/tmpfile.h', + 'src/core/util/type_list.h', 'src/core/util/unique_ptr_with_bitset.h', + 'src/core/util/unique_type_name.h', 'src/core/util/upb_utils.h', + 'src/core/util/uri.cc', + 'src/core/util/uri.h', 'src/core/util/useful.h', + 'src/core/util/uuid_v4.cc', + 'src/core/util/uuid_v4.h', + 'src/core/util/validation_errors.cc', + 'src/core/util/validation_errors.h', 'src/core/util/windows/cpu.cc', + 'src/core/util/windows/directory_reader.cc', + 'src/core/util/windows/env.cc', + 'src/core/util/windows/stat.cc', 'src/core/util/windows/string.cc', 'src/core/util/windows/string_util.cc', 'src/core/util/windows/sync.cc', + 'src/core/util/windows/thd.cc', 'src/core/util/windows/time.cc', 'src/core/util/windows/tmpfile.cc', + 'src/core/util/work_serializer.cc', + 'src/core/util/work_serializer.h', + 'src/core/util/xxhash_inline.h', 'src/core/xds/grpc/certificate_provider_store.cc', 'src/core/xds/grpc/certificate_provider_store.h', 'src/core/xds/grpc/file_watcher_certificate_provider_factory.cc', @@ -2963,9 +2963,6 @@ Pod::Spec.new do |s| 'src/core/handshaker/tcp_connect/tcp_connect_handshaker.h', 'src/core/lib/address_utils/parse_address.h', 'src/core/lib/address_utils/sockaddr_utils.h', - 'src/core/lib/avl/avl.h', - 'src/core/lib/backoff/backoff.h', - 'src/core/lib/backoff/random_early_detection.h', 'src/core/lib/channel/call_finalization.h', 'src/core/lib/channel/channel_args.h', 'src/core/lib/channel/channel_args_preconditioning.h', @@ -2981,7 +2978,6 @@ Pod::Spec.new do |s| 'src/core/lib/config/config_vars.h', 'src/core/lib/config/core_configuration.h', 'src/core/lib/config/load_config.h', - 'src/core/lib/debug/event_log.h', 'src/core/lib/debug/trace.h', 'src/core/lib/debug/trace_flags.h', 'src/core/lib/debug/trace_impl.h', @@ -3051,55 +3047,6 @@ Pod::Spec.new do |s| 'src/core/lib/event_engine/work_queue/work_queue.h', 'src/core/lib/experiments/config.h', 'src/core/lib/experiments/experiments.h', - 'src/core/lib/gprpp/atomic_utils.h', - 'src/core/lib/gprpp/bitset.h', - 'src/core/lib/gprpp/chunked_vector.h', - 'src/core/lib/gprpp/construct_destruct.h', - 'src/core/lib/gprpp/cpp_impl_of.h', - 'src/core/lib/gprpp/crash.h', - 'src/core/lib/gprpp/debug_location.h', - 'src/core/lib/gprpp/directory_reader.h', - 'src/core/lib/gprpp/down_cast.h', - 'src/core/lib/gprpp/dual_ref_counted.h', - 'src/core/lib/gprpp/dump_args.h', - 'src/core/lib/gprpp/env.h', - 'src/core/lib/gprpp/examine_stack.h', - 'src/core/lib/gprpp/fork.h', - 'src/core/lib/gprpp/glob.h', - 'src/core/lib/gprpp/host_port.h', - 'src/core/lib/gprpp/if_list.h', - 'src/core/lib/gprpp/load_file.h', - 'src/core/lib/gprpp/manual_constructor.h', - 'src/core/lib/gprpp/match.h', - 'src/core/lib/gprpp/memory.h', - 'src/core/lib/gprpp/mpscq.h', - 'src/core/lib/gprpp/no_destruct.h', - 'src/core/lib/gprpp/notification.h', - 'src/core/lib/gprpp/orphanable.h', - 'src/core/lib/gprpp/overload.h', - 'src/core/lib/gprpp/packed_table.h', - 'src/core/lib/gprpp/per_cpu.h', - 'src/core/lib/gprpp/ref_counted.h', - 'src/core/lib/gprpp/ref_counted_ptr.h', - 'src/core/lib/gprpp/ref_counted_string.h', - 'src/core/lib/gprpp/single_set_ptr.h', - 'src/core/lib/gprpp/sorted_pack.h', - 'src/core/lib/gprpp/stat.h', - 'src/core/lib/gprpp/status_helper.h', - 'src/core/lib/gprpp/strerror.h', - 'src/core/lib/gprpp/sync.h', - 'src/core/lib/gprpp/table.h', - 'src/core/lib/gprpp/tchar.h', - 'src/core/lib/gprpp/thd.h', - 'src/core/lib/gprpp/time.h', - 'src/core/lib/gprpp/time_averaged_stats.h', - 'src/core/lib/gprpp/time_util.h', - 'src/core/lib/gprpp/type_list.h', - 'src/core/lib/gprpp/unique_type_name.h', - 'src/core/lib/gprpp/uuid_v4.h', - 'src/core/lib/gprpp/validation_errors.h', - 'src/core/lib/gprpp/work_serializer.h', - 'src/core/lib/gprpp/xxhash_inline.h', 'src/core/lib/iomgr/block_annotate.h', 'src/core/lib/iomgr/buffer_list.h', 'src/core/lib/iomgr/call_combiner.h', @@ -3121,8 +3068,6 @@ Pod::Spec.new do |s| 'src/core/lib/iomgr/event_engine_shims/tcp_client.h', 'src/core/lib/iomgr/exec_ctx.h', 'src/core/lib/iomgr/executor.h', - 'src/core/lib/iomgr/gethostname.h', - 'src/core/lib/iomgr/grpc_if_nametoindex.h', 'src/core/lib/iomgr/internal_errqueue.h', 'src/core/lib/iomgr/iocp_windows.h', 'src/core/lib/iomgr/iomgr.h', @@ -3165,7 +3110,6 @@ Pod::Spec.new do |s| 'src/core/lib/iomgr/vsock.h', 'src/core/lib/iomgr/wakeup_fd_pipe.h', 'src/core/lib/iomgr/wakeup_fd_posix.h', - 'src/core/lib/matchers/matchers.h', 'src/core/lib/promise/activity.h', 'src/core/lib/promise/all_ok.h', 'src/core/lib/promise/arena_promise.h', @@ -3307,7 +3251,6 @@ Pod::Spec.new do |s| 'src/core/lib/transport/timeout_encoding.h', 'src/core/lib/transport/transport.h', 'src/core/lib/transport/transport_fwd.h', - 'src/core/lib/uri/uri_parser.h', 'src/core/load_balancing/address_filtering.h', 'src/core/load_balancing/backend_metric_data.h', 'src/core/load_balancing/backend_metric_parser.h', @@ -3398,11 +3341,33 @@ Pod::Spec.new do |s| 'src/core/tsi/transport_security_grpc.h', 'src/core/tsi/transport_security_interface.h', 'src/core/util/alloc.h', + 'src/core/util/atomic_utils.h', + 'src/core/util/avl.h', + 'src/core/util/backoff.h', + 'src/core/util/bitset.h', + 'src/core/util/chunked_vector.h', + 'src/core/util/construct_destruct.h', + 'src/core/util/cpp_impl_of.h', + 'src/core/util/crash.h', + 'src/core/util/debug_location.h', + 'src/core/util/directory_reader.h', + 'src/core/util/down_cast.h', + 'src/core/util/dual_ref_counted.h', + 'src/core/util/dump_args.h', + 'src/core/util/env.h', + 'src/core/util/event_log.h', + 'src/core/util/examine_stack.h', + 'src/core/util/fork.h', 'src/core/util/gcp_metadata_query.h', + 'src/core/util/gethostname.h', + 'src/core/util/glob.h', + 'src/core/util/grpc_if_nametoindex.h', + 'src/core/util/host_port.h', 'src/core/util/http_client/format_request.h', 'src/core/util/http_client/httpcli.h', 'src/core/util/http_client/httpcli_ssl_credentials.h', 'src/core/util/http_client/parser.h', + 'src/core/util/if_list.h', 'src/core/util/json/json.h', 'src/core/util/json/json_args.h', 'src/core/util/json/json_channel_args.h', @@ -3411,15 +3376,50 @@ Pod::Spec.new do |s| 'src/core/util/json/json_util.h', 'src/core/util/json/json_writer.h', 'src/core/util/latent_see.h', + 'src/core/util/load_file.h', 'src/core/util/lru_cache.h', + 'src/core/util/manual_constructor.h', + 'src/core/util/match.h', + 'src/core/util/matchers.h', + 'src/core/util/memory.h', + 'src/core/util/mpscq.h', + 'src/core/util/no_destruct.h', + 'src/core/util/notification.h', + 'src/core/util/orphanable.h', + 'src/core/util/overload.h', + 'src/core/util/packed_table.h', + 'src/core/util/per_cpu.h', + 'src/core/util/random_early_detection.h', + 'src/core/util/ref_counted.h', + 'src/core/util/ref_counted_ptr.h', + 'src/core/util/ref_counted_string.h', 'src/core/util/ring_buffer.h', + 'src/core/util/single_set_ptr.h', + 'src/core/util/sorted_pack.h', 'src/core/util/spinlock.h', + 'src/core/util/stat.h', + 'src/core/util/status_helper.h', + 'src/core/util/strerror.h', 'src/core/util/string.h', + 'src/core/util/sync.h', + 'src/core/util/table.h', + 'src/core/util/tchar.h', + 'src/core/util/thd.h', + 'src/core/util/time.h', + 'src/core/util/time_averaged_stats.h', 'src/core/util/time_precise.h', + 'src/core/util/time_util.h', 'src/core/util/tmpfile.h', + 'src/core/util/type_list.h', 'src/core/util/unique_ptr_with_bitset.h', + 'src/core/util/unique_type_name.h', 'src/core/util/upb_utils.h', + 'src/core/util/uri.h', 'src/core/util/useful.h', + 'src/core/util/uuid_v4.h', + 'src/core/util/validation_errors.h', + 'src/core/util/work_serializer.h', + 'src/core/util/xxhash_inline.h', 'src/core/xds/grpc/certificate_provider_store.h', 'src/core/xds/grpc/file_watcher_certificate_provider_factory.h', 'src/core/xds/grpc/xds_audit_logger_registry.h', diff --git a/grpc.gemspec b/grpc.gemspec index ba4316386ff..6784a5f4eed 100644 --- a/grpc.gemspec +++ b/grpc.gemspec @@ -1099,11 +1099,6 @@ Gem::Specification.new do |s| s.files += %w( src/core/lib/address_utils/parse_address.h ) s.files += %w( src/core/lib/address_utils/sockaddr_utils.cc ) s.files += %w( src/core/lib/address_utils/sockaddr_utils.h ) - s.files += %w( src/core/lib/avl/avl.h ) - s.files += %w( src/core/lib/backoff/backoff.cc ) - s.files += %w( src/core/lib/backoff/backoff.h ) - s.files += %w( src/core/lib/backoff/random_early_detection.cc ) - s.files += %w( src/core/lib/backoff/random_early_detection.h ) s.files += %w( src/core/lib/channel/call_finalization.h ) s.files += %w( src/core/lib/channel/channel_args.cc ) s.files += %w( src/core/lib/channel/channel_args.h ) @@ -1134,8 +1129,6 @@ Gem::Specification.new do |s| s.files += %w( src/core/lib/config/core_configuration.h ) s.files += %w( src/core/lib/config/load_config.cc ) s.files += %w( src/core/lib/config/load_config.h ) - s.files += %w( src/core/lib/debug/event_log.cc ) - s.files += %w( src/core/lib/debug/event_log.h ) s.files += %w( src/core/lib/debug/trace.cc ) s.files += %w( src/core/lib/debug/trace.h ) s.files += %w( src/core/lib/debug/trace_flags.cc ) @@ -1256,83 +1249,6 @@ Gem::Specification.new do |s| s.files += %w( src/core/lib/experiments/config.h ) s.files += %w( src/core/lib/experiments/experiments.cc ) s.files += %w( src/core/lib/experiments/experiments.h ) - s.files += %w( src/core/lib/gprpp/atomic_utils.h ) - s.files += %w( src/core/lib/gprpp/bitset.h ) - s.files += %w( src/core/lib/gprpp/chunked_vector.h ) - s.files += %w( src/core/lib/gprpp/construct_destruct.h ) - s.files += %w( src/core/lib/gprpp/cpp_impl_of.h ) - s.files += %w( src/core/lib/gprpp/crash.cc ) - s.files += %w( src/core/lib/gprpp/crash.h ) - s.files += %w( src/core/lib/gprpp/debug_location.h ) - s.files += %w( src/core/lib/gprpp/directory_reader.h ) - s.files += %w( src/core/lib/gprpp/down_cast.h ) - s.files += %w( src/core/lib/gprpp/dual_ref_counted.h ) - s.files += %w( src/core/lib/gprpp/dump_args.cc ) - s.files += %w( src/core/lib/gprpp/dump_args.h ) - s.files += %w( src/core/lib/gprpp/env.h ) - s.files += %w( src/core/lib/gprpp/examine_stack.cc ) - s.files += %w( src/core/lib/gprpp/examine_stack.h ) - s.files += %w( src/core/lib/gprpp/fork.cc ) - s.files += %w( src/core/lib/gprpp/fork.h ) - s.files += %w( src/core/lib/gprpp/glob.cc ) - s.files += %w( src/core/lib/gprpp/glob.h ) - s.files += %w( src/core/lib/gprpp/host_port.cc ) - s.files += %w( src/core/lib/gprpp/host_port.h ) - s.files += %w( src/core/lib/gprpp/if_list.h ) - s.files += %w( src/core/lib/gprpp/linux/env.cc ) - s.files += %w( src/core/lib/gprpp/load_file.cc ) - s.files += %w( src/core/lib/gprpp/load_file.h ) - s.files += %w( src/core/lib/gprpp/manual_constructor.h ) - s.files += %w( src/core/lib/gprpp/match.h ) - s.files += %w( src/core/lib/gprpp/memory.h ) - s.files += %w( src/core/lib/gprpp/mpscq.cc ) - s.files += %w( src/core/lib/gprpp/mpscq.h ) - s.files += %w( src/core/lib/gprpp/no_destruct.h ) - s.files += %w( src/core/lib/gprpp/notification.h ) - s.files += %w( src/core/lib/gprpp/orphanable.h ) - s.files += %w( src/core/lib/gprpp/overload.h ) - s.files += %w( src/core/lib/gprpp/packed_table.h ) - s.files += %w( src/core/lib/gprpp/per_cpu.cc ) - s.files += %w( src/core/lib/gprpp/per_cpu.h ) - s.files += %w( src/core/lib/gprpp/posix/directory_reader.cc ) - s.files += %w( src/core/lib/gprpp/posix/env.cc ) - s.files += %w( src/core/lib/gprpp/posix/stat.cc ) - s.files += %w( src/core/lib/gprpp/posix/thd.cc ) - s.files += %w( src/core/lib/gprpp/ref_counted.h ) - s.files += %w( src/core/lib/gprpp/ref_counted_ptr.h ) - s.files += %w( src/core/lib/gprpp/ref_counted_string.cc ) - s.files += %w( src/core/lib/gprpp/ref_counted_string.h ) - s.files += %w( src/core/lib/gprpp/single_set_ptr.h ) - s.files += %w( src/core/lib/gprpp/sorted_pack.h ) - s.files += %w( src/core/lib/gprpp/stat.h ) - s.files += %w( src/core/lib/gprpp/status_helper.cc ) - s.files += %w( src/core/lib/gprpp/status_helper.h ) - s.files += %w( src/core/lib/gprpp/strerror.cc ) - s.files += %w( src/core/lib/gprpp/strerror.h ) - s.files += %w( src/core/lib/gprpp/sync.h ) - s.files += %w( src/core/lib/gprpp/table.h ) - s.files += %w( src/core/lib/gprpp/tchar.cc ) - s.files += %w( src/core/lib/gprpp/tchar.h ) - s.files += %w( src/core/lib/gprpp/thd.h ) - s.files += %w( src/core/lib/gprpp/time.cc ) - s.files += %w( src/core/lib/gprpp/time.h ) - s.files += %w( src/core/lib/gprpp/time_averaged_stats.cc ) - s.files += %w( src/core/lib/gprpp/time_averaged_stats.h ) - s.files += %w( src/core/lib/gprpp/time_util.cc ) - s.files += %w( src/core/lib/gprpp/time_util.h ) - s.files += %w( src/core/lib/gprpp/type_list.h ) - s.files += %w( src/core/lib/gprpp/unique_type_name.h ) - s.files += %w( src/core/lib/gprpp/uuid_v4.cc ) - s.files += %w( src/core/lib/gprpp/uuid_v4.h ) - s.files += %w( src/core/lib/gprpp/validation_errors.cc ) - s.files += %w( src/core/lib/gprpp/validation_errors.h ) - s.files += %w( src/core/lib/gprpp/windows/directory_reader.cc ) - s.files += %w( src/core/lib/gprpp/windows/env.cc ) - s.files += %w( src/core/lib/gprpp/windows/stat.cc ) - s.files += %w( src/core/lib/gprpp/windows/thd.cc ) - s.files += %w( src/core/lib/gprpp/work_serializer.cc ) - s.files += %w( src/core/lib/gprpp/work_serializer.h ) - s.files += %w( src/core/lib/gprpp/xxhash_inline.h ) s.files += %w( src/core/lib/iomgr/block_annotate.h ) s.files += %w( src/core/lib/iomgr/buffer_list.cc ) s.files += %w( src/core/lib/iomgr/buffer_list.h ) @@ -1377,13 +1293,6 @@ Gem::Specification.new do |s| s.files += %w( src/core/lib/iomgr/executor.h ) s.files += %w( src/core/lib/iomgr/fork_posix.cc ) s.files += %w( src/core/lib/iomgr/fork_windows.cc ) - s.files += %w( src/core/lib/iomgr/gethostname.h ) - s.files += %w( src/core/lib/iomgr/gethostname_fallback.cc ) - s.files += %w( src/core/lib/iomgr/gethostname_host_name_max.cc ) - s.files += %w( src/core/lib/iomgr/gethostname_sysconf.cc ) - s.files += %w( src/core/lib/iomgr/grpc_if_nametoindex.h ) - s.files += %w( src/core/lib/iomgr/grpc_if_nametoindex_posix.cc ) - s.files += %w( src/core/lib/iomgr/grpc_if_nametoindex_unsupported.cc ) s.files += %w( src/core/lib/iomgr/internal_errqueue.cc ) s.files += %w( src/core/lib/iomgr/internal_errqueue.h ) s.files += %w( src/core/lib/iomgr/iocp_windows.cc ) @@ -1474,8 +1383,6 @@ Gem::Specification.new do |s| s.files += %w( src/core/lib/iomgr/wakeup_fd_pipe.h ) s.files += %w( src/core/lib/iomgr/wakeup_fd_posix.cc ) s.files += %w( src/core/lib/iomgr/wakeup_fd_posix.h ) - s.files += %w( src/core/lib/matchers/matchers.cc ) - s.files += %w( src/core/lib/matchers/matchers.h ) s.files += %w( src/core/lib/promise/activity.cc ) s.files += %w( src/core/lib/promise/activity.h ) s.files += %w( src/core/lib/promise/all_ok.h ) @@ -1736,8 +1643,6 @@ Gem::Specification.new do |s| s.files += %w( src/core/lib/transport/transport.h ) s.files += %w( src/core/lib/transport/transport_fwd.h ) s.files += %w( src/core/lib/transport/transport_op_string.cc ) - s.files += %w( src/core/lib/uri/uri_parser.cc ) - s.files += %w( src/core/lib/uri/uri_parser.h ) s.files += %w( src/core/load_balancing/address_filtering.cc ) s.files += %w( src/core/load_balancing/address_filtering.h ) s.files += %w( src/core/load_balancing/backend_metric_data.h ) @@ -1922,8 +1827,43 @@ Gem::Specification.new do |s| s.files += %w( src/core/util/alloc.cc ) s.files += %w( src/core/util/alloc.h ) s.files += %w( src/core/util/atm.cc ) + s.files += %w( src/core/util/atomic_utils.h ) + s.files += %w( src/core/util/avl.h ) + s.files += %w( src/core/util/backoff.cc ) + s.files += %w( src/core/util/backoff.h ) + s.files += %w( src/core/util/bitset.h ) + s.files += %w( src/core/util/chunked_vector.h ) + s.files += %w( src/core/util/construct_destruct.h ) + s.files += %w( src/core/util/cpp_impl_of.h ) + s.files += %w( src/core/util/crash.cc ) + s.files += %w( src/core/util/crash.h ) + s.files += %w( src/core/util/debug_location.h ) + s.files += %w( src/core/util/directory_reader.h ) + s.files += %w( src/core/util/down_cast.h ) + s.files += %w( src/core/util/dual_ref_counted.h ) + s.files += %w( src/core/util/dump_args.cc ) + s.files += %w( src/core/util/dump_args.h ) + s.files += %w( src/core/util/env.h ) + s.files += %w( src/core/util/event_log.cc ) + s.files += %w( src/core/util/event_log.h ) + s.files += %w( src/core/util/examine_stack.cc ) + s.files += %w( src/core/util/examine_stack.h ) + s.files += %w( src/core/util/fork.cc ) + s.files += %w( src/core/util/fork.h ) s.files += %w( src/core/util/gcp_metadata_query.cc ) s.files += %w( src/core/util/gcp_metadata_query.h ) + s.files += %w( src/core/util/gethostname.h ) + s.files += %w( src/core/util/gethostname_fallback.cc ) + s.files += %w( src/core/util/gethostname_host_name_max.cc ) + s.files += %w( src/core/util/gethostname_sysconf.cc ) + s.files += %w( src/core/util/glob.cc ) + s.files += %w( src/core/util/glob.h ) + s.files += %w( src/core/util/gpr_time.cc ) + s.files += %w( src/core/util/grpc_if_nametoindex.h ) + s.files += %w( src/core/util/grpc_if_nametoindex_posix.cc ) + s.files += %w( src/core/util/grpc_if_nametoindex_unsupported.cc ) + s.files += %w( src/core/util/host_port.cc ) + s.files += %w( src/core/util/host_port.h ) s.files += %w( src/core/util/http_client/format_request.cc ) s.files += %w( src/core/util/http_client/format_request.h ) s.files += %w( src/core/util/http_client/httpcli.cc ) @@ -1932,6 +1872,7 @@ Gem::Specification.new do |s| s.files += %w( src/core/util/http_client/httpcli_ssl_credentials.h ) s.files += %w( src/core/util/http_client/parser.cc ) s.files += %w( src/core/util/http_client/parser.h ) + s.files += %w( src/core/util/if_list.h ) s.files += %w( src/core/util/iphone/cpu.cc ) s.files += %w( src/core/util/json/json.h ) s.files += %w( src/core/util/json/json_args.h ) @@ -1947,33 +1888,92 @@ Gem::Specification.new do |s| s.files += %w( src/core/util/latent_see.cc ) s.files += %w( src/core/util/latent_see.h ) s.files += %w( src/core/util/linux/cpu.cc ) + s.files += %w( src/core/util/linux/env.cc ) + s.files += %w( src/core/util/load_file.cc ) + s.files += %w( src/core/util/load_file.h ) s.files += %w( src/core/util/log.cc ) s.files += %w( src/core/util/lru_cache.h ) + s.files += %w( src/core/util/manual_constructor.h ) + s.files += %w( src/core/util/match.h ) + s.files += %w( src/core/util/matchers.cc ) + s.files += %w( src/core/util/matchers.h ) + s.files += %w( src/core/util/memory.h ) + s.files += %w( src/core/util/mpscq.cc ) + s.files += %w( src/core/util/mpscq.h ) s.files += %w( src/core/util/msys/tmpfile.cc ) + s.files += %w( src/core/util/no_destruct.h ) + s.files += %w( src/core/util/notification.h ) + s.files += %w( src/core/util/orphanable.h ) + s.files += %w( src/core/util/overload.h ) + s.files += %w( src/core/util/packed_table.h ) + s.files += %w( src/core/util/per_cpu.cc ) + s.files += %w( src/core/util/per_cpu.h ) s.files += %w( src/core/util/posix/cpu.cc ) + s.files += %w( src/core/util/posix/directory_reader.cc ) + s.files += %w( src/core/util/posix/env.cc ) + s.files += %w( src/core/util/posix/stat.cc ) s.files += %w( src/core/util/posix/string.cc ) s.files += %w( src/core/util/posix/sync.cc ) + s.files += %w( src/core/util/posix/thd.cc ) s.files += %w( src/core/util/posix/time.cc ) s.files += %w( src/core/util/posix/tmpfile.cc ) + s.files += %w( src/core/util/random_early_detection.cc ) + s.files += %w( src/core/util/random_early_detection.h ) + s.files += %w( src/core/util/ref_counted.h ) + s.files += %w( src/core/util/ref_counted_ptr.h ) + s.files += %w( src/core/util/ref_counted_string.cc ) + s.files += %w( src/core/util/ref_counted_string.h ) s.files += %w( src/core/util/ring_buffer.h ) + s.files += %w( src/core/util/single_set_ptr.h ) + s.files += %w( src/core/util/sorted_pack.h ) s.files += %w( src/core/util/spinlock.h ) + s.files += %w( src/core/util/stat.h ) + s.files += %w( src/core/util/status_helper.cc ) + s.files += %w( src/core/util/status_helper.h ) + s.files += %w( src/core/util/strerror.cc ) + s.files += %w( src/core/util/strerror.h ) s.files += %w( src/core/util/string.cc ) s.files += %w( src/core/util/string.h ) s.files += %w( src/core/util/sync.cc ) + s.files += %w( src/core/util/sync.h ) s.files += %w( src/core/util/sync_abseil.cc ) + s.files += %w( src/core/util/table.h ) + s.files += %w( src/core/util/tchar.cc ) + s.files += %w( src/core/util/tchar.h ) + s.files += %w( src/core/util/thd.h ) s.files += %w( src/core/util/time.cc ) + s.files += %w( src/core/util/time.h ) + s.files += %w( src/core/util/time_averaged_stats.cc ) + s.files += %w( src/core/util/time_averaged_stats.h ) s.files += %w( src/core/util/time_precise.cc ) s.files += %w( src/core/util/time_precise.h ) + s.files += %w( src/core/util/time_util.cc ) + s.files += %w( src/core/util/time_util.h ) s.files += %w( src/core/util/tmpfile.h ) + s.files += %w( src/core/util/type_list.h ) s.files += %w( src/core/util/unique_ptr_with_bitset.h ) + s.files += %w( src/core/util/unique_type_name.h ) s.files += %w( src/core/util/upb_utils.h ) + s.files += %w( src/core/util/uri.cc ) + s.files += %w( src/core/util/uri.h ) s.files += %w( src/core/util/useful.h ) + s.files += %w( src/core/util/uuid_v4.cc ) + s.files += %w( src/core/util/uuid_v4.h ) + s.files += %w( src/core/util/validation_errors.cc ) + s.files += %w( src/core/util/validation_errors.h ) s.files += %w( src/core/util/windows/cpu.cc ) + s.files += %w( src/core/util/windows/directory_reader.cc ) + s.files += %w( src/core/util/windows/env.cc ) + s.files += %w( src/core/util/windows/stat.cc ) s.files += %w( src/core/util/windows/string.cc ) s.files += %w( src/core/util/windows/string_util.cc ) s.files += %w( src/core/util/windows/sync.cc ) + s.files += %w( src/core/util/windows/thd.cc ) s.files += %w( src/core/util/windows/time.cc ) s.files += %w( src/core/util/windows/tmpfile.cc ) + s.files += %w( src/core/util/work_serializer.cc ) + s.files += %w( src/core/util/work_serializer.h ) + s.files += %w( src/core/util/xxhash_inline.h ) s.files += %w( src/core/xds/grpc/certificate_provider_store.cc ) s.files += %w( src/core/xds/grpc/certificate_provider_store.h ) s.files += %w( src/core/xds/grpc/file_watcher_certificate_provider_factory.cc ) diff --git a/include/grpcpp/impl/sync.h b/include/grpcpp/impl/sync.h index a7ec965a009..c4aa00bc07d 100644 --- a/include/grpcpp/impl/sync.h +++ b/include/grpcpp/impl/sync.h @@ -36,9 +36,9 @@ // The core library is not accessible in C++ codegen headers, and vice versa. // Thus, we need to have duplicate headers with similar functionality. // Make sure any change to this file is also reflected in -// src/core/lib/gprpp/sync.h too. +// src/core/util/sync.h too. // -// Whenever possible, prefer "src/core/lib/gprpp/sync.h" over this file, +// Whenever possible, prefer "src/core/util/sync.h" over this file, // since in core we do not rely on g_core_codegen_interface and hence do not // pay the costs of virtual function calls. diff --git a/package.xml b/package.xml index d9b37b47eec..341c3a6d827 100644 --- a/package.xml +++ b/package.xml @@ -1081,11 +1081,6 @@ - - - - - @@ -1116,8 +1111,6 @@ - - @@ -1238,83 +1231,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1359,13 +1275,6 @@ - - - - - - - @@ -1456,8 +1365,6 @@ - - @@ -1718,8 +1625,6 @@ - - @@ -1904,8 +1809,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1914,6 +1854,7 @@ + @@ -1929,33 +1870,92 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/core/BUILD b/src/core/BUILD index b10dbc28550..8220654c837 100644 --- a/src/core/BUILD +++ b/src/core/BUILD @@ -51,10 +51,10 @@ grpc_cc_library( grpc_cc_library( name = "dump_args", srcs = [ - "lib/gprpp/dump_args.cc", + "util/dump_args.cc", ], hdrs = [ - "lib/gprpp/dump_args.h", + "util/dump_args.h", ], external_deps = [ "absl/functional:any_invocable", @@ -211,7 +211,7 @@ grpc_cc_library( grpc_cc_library( name = "atomic_utils", language = "c++", - public_hdrs = ["lib/gprpp/atomic_utils.h"], + public_hdrs = ["util/atomic_utils.h"], deps = ["//:gpr"], ) @@ -305,10 +305,10 @@ grpc_cc_library( grpc_cc_library( name = "examine_stack", srcs = [ - "lib/gprpp/examine_stack.cc", + "util/examine_stack.cc", ], hdrs = [ - "lib/gprpp/examine_stack.h", + "util/examine_stack.h", ], external_deps = ["absl/types:optional"], deps = ["//:gpr_platform"], @@ -340,7 +340,7 @@ grpc_cc_library( name = "gpr_manual_constructor", srcs = [], hdrs = [ - "lib/gprpp/manual_constructor.h", + "util/manual_constructor.h", ], language = "c++", deps = [ @@ -365,12 +365,12 @@ grpc_cc_library( grpc_cc_library( name = "env", srcs = [ - "lib/gprpp/linux/env.cc", - "lib/gprpp/posix/env.cc", - "lib/gprpp/windows/env.cc", + "util/linux/env.cc", + "util/posix/env.cc", + "util/windows/env.cc", ], hdrs = [ - "lib/gprpp/env.h", + "util/env.h", ], external_deps = ["absl/types:optional"], deps = [ @@ -382,11 +382,11 @@ grpc_cc_library( grpc_cc_library( name = "directory_reader", srcs = [ - "lib/gprpp/posix/directory_reader.cc", - "lib/gprpp/windows/directory_reader.cc", + "util/posix/directory_reader.cc", + "util/windows/directory_reader.cc", ], hdrs = [ - "lib/gprpp/directory_reader.h", + "util/directory_reader.h", ], external_deps = [ "absl/functional:function_ref", @@ -402,7 +402,7 @@ grpc_cc_library( grpc_cc_library( name = "chunked_vector", - hdrs = ["lib/gprpp/chunked_vector.h"], + hdrs = ["util/chunked_vector.h"], external_deps = [ "absl/log:check", ], @@ -416,17 +416,17 @@ grpc_cc_library( grpc_cc_library( name = "construct_destruct", language = "c++", - public_hdrs = ["lib/gprpp/construct_destruct.h"], + public_hdrs = ["util/construct_destruct.h"], deps = ["//:gpr_platform"], ) grpc_cc_library( name = "status_helper", srcs = [ - "lib/gprpp/status_helper.cc", + "util/status_helper.cc", ], hdrs = [ - "lib/gprpp/status_helper.h", + "util/status_helper.h", ], external_deps = [ "absl/log:check", @@ -451,7 +451,7 @@ grpc_cc_library( grpc_cc_library( name = "unique_type_name", - hdrs = ["lib/gprpp/unique_type_name.h"], + hdrs = ["util/unique_type_name.h"], external_deps = ["absl/strings"], language = "c++", deps = [ @@ -463,10 +463,10 @@ grpc_cc_library( grpc_cc_library( name = "validation_errors", srcs = [ - "lib/gprpp/validation_errors.cc", + "util/validation_errors.cc", ], hdrs = [ - "lib/gprpp/validation_errors.h", + "util/validation_errors.h", ], external_deps = [ "absl/log:log", @@ -480,7 +480,7 @@ grpc_cc_library( grpc_cc_library( name = "overload", language = "c++", - public_hdrs = ["lib/gprpp/overload.h"], + public_hdrs = ["util/overload.h"], deps = ["//:gpr_platform"], ) @@ -488,7 +488,7 @@ grpc_cc_library( name = "match", external_deps = ["absl/types:variant"], language = "c++", - public_hdrs = ["lib/gprpp/match.h"], + public_hdrs = ["util/match.h"], deps = [ "overload", "//:gpr_platform", @@ -502,7 +502,7 @@ grpc_cc_library( "absl/utility", ], language = "c++", - public_hdrs = ["lib/gprpp/table.h"], + public_hdrs = ["util/table.h"], deps = [ "bitset", "//:gpr_platform", @@ -511,7 +511,7 @@ grpc_cc_library( grpc_cc_library( name = "packed_table", - hdrs = ["lib/gprpp/packed_table.h"], + hdrs = ["util/packed_table.h"], language = "c++", deps = [ "sorted_pack", @@ -523,7 +523,7 @@ grpc_cc_library( grpc_cc_library( name = "bitset", language = "c++", - public_hdrs = ["lib/gprpp/bitset.h"], + public_hdrs = ["util/bitset.h"], deps = [ "useful", "//:gpr_platform", @@ -533,7 +533,7 @@ grpc_cc_library( grpc_cc_library( name = "no_destruct", language = "c++", - public_hdrs = ["lib/gprpp/no_destruct.h"], + public_hdrs = ["util/no_destruct.h"], deps = [ "construct_destruct", "//:gpr_platform", @@ -543,10 +543,10 @@ grpc_cc_library( grpc_cc_library( name = "tchar", srcs = [ - "lib/gprpp/tchar.cc", + "util/tchar.cc", ], hdrs = [ - "lib/gprpp/tchar.h", + "util/tchar.h", ], deps = ["//:gpr_platform"], ) @@ -1264,7 +1264,7 @@ grpc_cc_library( "absl/log:log", ], language = "c++", - public_hdrs = ["lib/gprpp/ref_counted.h"], + public_hdrs = ["util/ref_counted.h"], deps = [ "atomic_utils", "down_cast", @@ -1281,7 +1281,7 @@ grpc_cc_library( "absl/log:log", ], language = "c++", - public_hdrs = ["lib/gprpp/dual_ref_counted.h"], + public_hdrs = ["util/dual_ref_counted.h"], deps = [ "down_cast", "ref_counted", @@ -1295,10 +1295,10 @@ grpc_cc_library( grpc_cc_library( name = "ref_counted_string", srcs = [ - "lib/gprpp/ref_counted_string.cc", + "util/ref_counted_string.cc", ], hdrs = [ - "lib/gprpp/ref_counted_string.h", + "util/ref_counted_string.h", ], external_deps = ["absl/strings"], language = "c++", @@ -1311,10 +1311,10 @@ grpc_cc_library( grpc_cc_library( name = "uuid_v4", - srcs = ["lib/gprpp/uuid_v4.cc"], + srcs = ["util/uuid_v4.cc"], external_deps = ["absl/strings:str_format"], language = "c++", - public_hdrs = ["lib/gprpp/uuid_v4.h"], + public_hdrs = ["util/uuid_v4.h"], deps = ["//:gpr"], ) @@ -1387,7 +1387,7 @@ grpc_cc_library( "//:iomgr", "//:parse_address", "//:ref_counted_ptr", - "//:uri_parser", + "//:uri", ], ) @@ -1727,10 +1727,10 @@ grpc_cc_library( grpc_cc_library( name = "time", srcs = [ - "lib/gprpp/time.cc", + "util/time.cc", ], hdrs = [ - "lib/gprpp/time.h", + "util/time.h", ], external_deps = [ "absl/log:check", @@ -1787,7 +1787,7 @@ grpc_cc_library( grpc_cc_library( name = "avl", hdrs = [ - "lib/avl/avl.h", + "util/avl.h", ], deps = [ "ref_counted", @@ -1799,9 +1799,9 @@ grpc_cc_library( grpc_cc_library( name = "time_averaged_stats", - srcs = ["lib/gprpp/time_averaged_stats.cc"], + srcs = ["util/time_averaged_stats.cc"], hdrs = [ - "lib/gprpp/time_averaged_stats.h", + "util/time_averaged_stats.h", ], deps = ["//:gpr"], ) @@ -2707,7 +2707,7 @@ grpc_cc_library( "//:gpr", "//:gpr_platform", "//:parse_address", - "//:uri_parser", + "//:uri", ], ) @@ -3041,10 +3041,10 @@ grpc_cc_library( grpc_cc_library( name = "per_cpu", srcs = [ - "lib/gprpp/per_cpu.cc", + "util/per_cpu.cc", ], hdrs = [ - "lib/gprpp/per_cpu.h", + "util/per_cpu.h", ], deps = [ "useful", @@ -3055,10 +3055,10 @@ grpc_cc_library( grpc_cc_library( name = "event_log", srcs = [ - "lib/debug/event_log.cc", + "util/event_log.cc", ], hdrs = [ - "lib/debug/event_log.h", + "util/event_log.h", ], external_deps = [ "absl/base:core_headers", @@ -3075,10 +3075,10 @@ grpc_cc_library( grpc_cc_library( name = "load_file", srcs = [ - "lib/gprpp/load_file.cc", + "util/load_file.cc", ], hdrs = [ - "lib/gprpp/load_file.h", + "util/load_file.h", ], external_deps = [ "absl/cleanup", @@ -3160,7 +3160,7 @@ grpc_cc_library( grpc_cc_library( name = "single_set_ptr", hdrs = [ - "lib/gprpp/single_set_ptr.h", + "util/single_set_ptr.h", ], external_deps = [ "absl/log:check", @@ -3218,7 +3218,7 @@ grpc_cc_library( grpc_cc_library( name = "notification", hdrs = [ - "lib/gprpp/notification.h", + "util/notification.h", ], external_deps = ["absl/time"], deps = ["//:gpr"], @@ -3722,7 +3722,7 @@ grpc_cc_library( "//:iomgr", "//:parse_address", "//:sockaddr_utils", - "//:uri_parser", + "//:uri", ], ) @@ -3786,7 +3786,7 @@ grpc_cc_library( grpc_cc_library( name = "sorted_pack", hdrs = [ - "lib/gprpp/sorted_pack.h", + "util/sorted_pack.h", ], language = "c++", deps = [ @@ -3798,7 +3798,7 @@ grpc_cc_library( grpc_cc_library( name = "type_list", hdrs = [ - "lib/gprpp/type_list.h", + "util/type_list.h", ], language = "c++", ) @@ -3806,7 +3806,7 @@ grpc_cc_library( grpc_cc_library( name = "if_list", hdrs = [ - "lib/gprpp/if_list.h", + "util/if_list.h", ], language = "c++", deps = ["//:gpr_platform"], @@ -3916,7 +3916,7 @@ grpc_cc_library( "//:parse_address", "//:promise", "//:ref_counted_ptr", - "//:uri_parser", + "//:uri", ], ) @@ -4102,7 +4102,7 @@ grpc_cc_library( "//:ref_counted_ptr", "//:sockaddr_utils", "//:tsi_base", - "//:uri_parser", + "//:uri", ], ) @@ -4205,17 +4205,17 @@ grpc_cc_library( "//:iomgr", "//:orphanable", "//:ref_counted_ptr", - "//:uri_parser", + "//:uri", ], ) grpc_cc_library( name = "strerror", srcs = [ - "lib/gprpp/strerror.cc", + "util/strerror.cc", ], hdrs = [ - "lib/gprpp/strerror.h", + "util/strerror.h", ], external_deps = ["absl/strings:str_format"], deps = ["//:gpr_platform"], @@ -4399,7 +4399,7 @@ grpc_cc_library( "//:orphanable", "//:promise", "//:ref_counted_ptr", - "//:uri_parser", + "//:uri", ], ) @@ -4454,7 +4454,7 @@ grpc_cc_library( "//:orphanable", "//:promise", "//:ref_counted_ptr", - "//:uri_parser", + "//:uri", ], ) @@ -4511,7 +4511,7 @@ grpc_cc_library( "//:iomgr", "//:orphanable", "//:ref_counted_ptr", - "//:uri_parser", + "//:uri", ], ) @@ -4567,10 +4567,10 @@ grpc_cc_library( grpc_cc_library( name = "grpc_matchers", srcs = [ - "lib/matchers/matchers.cc", + "util/matchers.cc", ], hdrs = [ - "lib/matchers/matchers.h", + "util/matchers.h", ], external_deps = [ "absl/status", @@ -5134,10 +5134,10 @@ grpc_cc_library( grpc_cc_library( name = "random_early_detection", srcs = [ - "lib/backoff/random_early_detection.cc", + "util/random_early_detection.cc", ], hdrs = [ - "lib/backoff/random_early_detection.h", + "util/random_early_detection.h", ], external_deps = [ "absl/random:bit_gen_ref", @@ -5845,7 +5845,7 @@ grpc_cc_library( "//:ref_counted_ptr", "//:sockaddr_utils", "//:tsi_ssl_credentials", - "//:uri_parser", + "//:uri", "//:work_serializer", "//:xds_client", ], @@ -5931,7 +5931,7 @@ grpc_cc_library( "//:ref_counted_ptr", "//:server", "//:sockaddr_utils", - "//:uri_parser", + "//:uri", "//:xds_client", ], ) @@ -6329,7 +6329,7 @@ grpc_cc_library( grpc_cc_library( name = "down_cast", - hdrs = ["lib/gprpp/down_cast.h"], + hdrs = ["util/down_cast.h"], external_deps = [ "absl/base:config", "absl/log:check", @@ -6339,8 +6339,8 @@ grpc_cc_library( grpc_cc_library( name = "glob", - srcs = ["lib/gprpp/glob.cc"], - hdrs = ["lib/gprpp/glob.h"], + srcs = ["util/glob.cc"], + hdrs = ["util/glob.h"], external_deps = ["absl/strings"], ) @@ -6402,7 +6402,7 @@ grpc_cc_library( grpc_cc_library( name = "xxhash_inline", - hdrs = ["lib/gprpp/xxhash_inline.h"], + hdrs = ["util/xxhash_inline.h"], external_deps = ["xxhash"], language = "c++", deps = ["//:gpr_platform"], @@ -6839,7 +6839,7 @@ grpc_cc_library( "//:grpc_security_base", "//:parse_address", "//:promise", - "//:uri_parser", + "//:uri", ], alwayslink = 1, ) @@ -6915,7 +6915,7 @@ grpc_cc_library( "//:grpc_trace", "//:orphanable", "//:ref_counted_ptr", - "//:uri_parser", + "//:uri", "//:work_serializer", ], ) @@ -6988,7 +6988,7 @@ grpc_cc_library( "//:iomgr", "//:orphanable", "//:ref_counted_ptr", - "//:uri_parser", + "//:uri", ], ) @@ -7051,7 +7051,7 @@ grpc_cc_library( "//:iomgr", "//:orphanable", "//:ref_counted_ptr", - "//:uri_parser", + "//:uri", ], ) @@ -7076,7 +7076,7 @@ grpc_cc_library( "//:grpc_resolver", "//:orphanable", "//:parse_address", - "//:uri_parser", + "//:uri", ], ) @@ -7103,7 +7103,7 @@ grpc_cc_library( "//:gpr", "//:grpc_resolver", "//:orphanable", - "//:uri_parser", + "//:uri", ], ) @@ -7238,7 +7238,7 @@ grpc_cc_library( "//:grpc_trace", "//:orphanable", "//:ref_counted_ptr", - "//:uri_parser", + "//:uri", "//:work_serializer", "//:xds_client", ], @@ -7275,7 +7275,7 @@ grpc_cc_library( "//:iomgr", "//:orphanable", "//:ref_counted_ptr", - "//:uri_parser", + "//:uri", "//:work_serializer", "//:xds_client", ], @@ -7598,7 +7598,7 @@ grpc_cc_library( "//:ref_counted_ptr", "//:server", "//:sockaddr_utils", - "//:uri_parser", + "//:uri", ], ) @@ -7763,7 +7763,7 @@ grpc_cc_library( "//:iomgr", "//:orphanable", "//:ref_counted_ptr", - "//:uri_parser", + "//:uri", ], ) @@ -7829,7 +7829,7 @@ grpc_cc_library( "//:grpc_client_channel", "//:grpc_public_hdrs", "//:grpc_resolver", - "//:uri_parser", + "//:uri", ], ) diff --git a/src/core/channelz/channel_trace.cc b/src/core/channelz/channel_trace.cc index 6e6884cd703..ee1de5e87c5 100644 --- a/src/core/channelz/channel_trace.cc +++ b/src/core/channelz/channel_trace.cc @@ -28,10 +28,10 @@ #include #include "src/core/channelz/channelz.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/util/string.h" +#include "src/core/util/time.h" namespace grpc_core { namespace channelz { diff --git a/src/core/channelz/channel_trace.h b/src/core/channelz/channel_trace.h index c6c245c5cf5..82ac733e4c7 100644 --- a/src/core/channelz/channel_trace.h +++ b/src/core/channelz/channel_trace.h @@ -28,9 +28,9 @@ #include #include -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/sync.h" #include "src/core/util/json/json.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" namespace grpc_core { namespace channelz { diff --git a/src/core/channelz/channelz.cc b/src/core/channelz/channelz.cc index 9487b9161ef..ef27e51ffbf 100644 --- a/src/core/channelz/channelz.cc +++ b/src/core/channelz/channelz.cc @@ -38,9 +38,9 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/iomgr/resolved_address.h" #include "src/core/lib/transport/connectivity_state.h" -#include "src/core/lib/uri/uri_parser.h" #include "src/core/util/json/json_writer.h" #include "src/core/util/string.h" +#include "src/core/util/uri.h" #include "src/core/util/useful.h" namespace grpc_core { diff --git a/src/core/channelz/channelz.h b/src/core/channelz/channelz.h index e441edc81a6..6938ec99437 100644 --- a/src/core/channelz/channelz.h +++ b/src/core/channelz/channelz.h @@ -38,11 +38,11 @@ #include #include "src/core/channelz/channel_trace.h" -#include "src/core/lib/gprpp/per_cpu.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" #include "src/core/util/json/json.h" +#include "src/core/util/per_cpu.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" #include "src/core/util/time_precise.h" #include "src/core/util/useful.h" diff --git a/src/core/channelz/channelz_registry.cc b/src/core/channelz/channelz_registry.cc index 63f6e557c7f..4393675c831 100644 --- a/src/core/channelz/channelz_registry.cc +++ b/src/core/channelz/channelz_registry.cc @@ -33,10 +33,10 @@ #include #include "src/core/channelz/channelz.h" -#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_writer.h" +#include "src/core/util/sync.h" namespace grpc_core { namespace channelz { diff --git a/src/core/channelz/channelz_registry.h b/src/core/channelz/channelz_registry.h index 39525597b4f..f849ac1ac84 100644 --- a/src/core/channelz/channelz_registry.h +++ b/src/core/channelz/channelz_registry.h @@ -28,8 +28,8 @@ #include #include "src/core/channelz/channelz.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" namespace grpc_core { namespace channelz { diff --git a/src/core/client_channel/backup_poller.cc b/src/core/client_channel/backup_poller.cc index 61056c47675..37914688a7e 100644 --- a/src/core/client_channel/backup_poller.cc +++ b/src/core/client_channel/backup_poller.cc @@ -29,14 +29,14 @@ #include #include "src/core/lib/config/config_vars.h" -#include "src/core/lib/gprpp/memory.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/iomgr.h" #include "src/core/lib/iomgr/pollset.h" #include "src/core/lib/iomgr/pollset_set.h" #include "src/core/lib/iomgr/timer.h" +#include "src/core/util/memory.h" +#include "src/core/util/time.h" #define DEFAULT_POLL_INTERVAL_MS 5000 diff --git a/src/core/client_channel/client_channel.cc b/src/core/client_channel/client_channel.cc index d2f3dd5858a..bf87078b474 100644 --- a/src/core/client_channel/client_channel.cc +++ b/src/core/client_channel/client_channel.cc @@ -63,10 +63,6 @@ #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" -#include "src/core/lib/gprpp/work_serializer.h" #include "src/core/lib/iomgr/resolved_address.h" #include "src/core/lib/promise/context.h" #include "src/core/lib/promise/exec_ctx_wakeup_scheduler.h" @@ -94,8 +90,12 @@ #include "src/core/resolver/resolver_registry.h" #include "src/core/service_config/service_config_impl.h" #include "src/core/telemetry/metrics.h" +#include "src/core/util/crash.h" +#include "src/core/util/debug_location.h" #include "src/core/util/json/json.h" +#include "src/core/util/sync.h" #include "src/core/util/useful.h" +#include "src/core/util/work_serializer.h" namespace grpc_core { diff --git a/src/core/client_channel/client_channel.h b/src/core/client_channel/client_channel.h index 7a73a2259d0..f268f6bfcb7 100644 --- a/src/core/client_channel/client_channel.h +++ b/src/core/client_channel/client_channel.h @@ -27,13 +27,13 @@ #include "src/core/client_channel/config_selector.h" #include "src/core/client_channel/subchannel.h" #include "src/core/ext/filters/channel_idle/idle_filter_state.h" -#include "src/core/lib/gprpp/single_set_ptr.h" #include "src/core/lib/promise/observable.h" #include "src/core/lib/surface/channel.h" #include "src/core/lib/transport/metadata.h" #include "src/core/load_balancing/lb_policy.h" #include "src/core/resolver/resolver.h" #include "src/core/service_config/service_config.h" +#include "src/core/util/single_set_ptr.h" namespace grpc_core { diff --git a/src/core/client_channel/client_channel_factory.h b/src/core/client_channel/client_channel_factory.h index e72f9923dd1..fee6cd9f628 100644 --- a/src/core/client_channel/client_channel_factory.h +++ b/src/core/client_channel/client_channel_factory.h @@ -23,8 +23,8 @@ #include "src/core/client_channel/subchannel.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/iomgr/resolved_address.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_core { diff --git a/src/core/client_channel/client_channel_filter.cc b/src/core/client_channel/client_channel_filter.cc index 6252be05b8e..8bedc588914 100644 --- a/src/core/client_channel/client_channel_filter.cc +++ b/src/core/client_channel/client_channel_filter.cc @@ -70,13 +70,6 @@ #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.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/gprpp/manual_constructor.h" -#include "src/core/lib/gprpp/status_helper.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/unique_type_name.h" -#include "src/core/lib/gprpp/work_serializer.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/polling_entity.h" #include "src/core/lib/iomgr/pollset_set.h" @@ -104,8 +97,15 @@ #include "src/core/resolver/resolver_registry.h" #include "src/core/service_config/service_config_call_data.h" #include "src/core/service_config/service_config_impl.h" +#include "src/core/util/crash.h" +#include "src/core/util/debug_location.h" #include "src/core/util/json/json.h" +#include "src/core/util/manual_constructor.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/sync.h" +#include "src/core/util/unique_type_name.h" #include "src/core/util/useful.h" +#include "src/core/util/work_serializer.h" // // Client channel filter @@ -1621,7 +1621,7 @@ void ClientChannelFilter::UpdateStateAndPickerLocked( namespace { -// TODO(roth): Remove this in favor of the gprpp Match() function once +// TODO(roth): Remove this in favor of src/core/util/match.h once // we can do that without breaking lock annotations. template T HandlePickResult( diff --git a/src/core/client_channel/client_channel_filter.h b/src/core/client_channel/client_channel_filter.h index 7ecf787ca74..2741006a38a 100644 --- a/src/core/client_channel/client_channel_filter.h +++ b/src/core/client_channel/client_channel_filter.h @@ -46,12 +46,6 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_stack.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" -#include "src/core/lib/gprpp/time.h" -#include "src/core/lib/gprpp/work_serializer.h" #include "src/core/lib/iomgr/call_combiner.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" @@ -67,7 +61,13 @@ #include "src/core/resolver/resolver.h" #include "src/core/service_config/service_config.h" #include "src/core/telemetry/call_tracer.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.h" #include "src/core/util/time_precise.h" +#include "src/core/util/work_serializer.h" // // Client channel filter diff --git a/src/core/client_channel/client_channel_internal.h b/src/core/client_channel/client_channel_internal.h index b9acdd883ec..1806bf057c9 100644 --- a/src/core/client_channel/client_channel_internal.h +++ b/src/core/client_channel/client_channel_internal.h @@ -24,13 +24,13 @@ #include "absl/functional/any_invocable.h" #include "absl/log/check.h" -#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" #include "src/core/load_balancing/lb_policy.h" #include "src/core/service_config/service_config_call_data.h" #include "src/core/telemetry/call_tracer.h" +#include "src/core/util/down_cast.h" +#include "src/core/util/unique_type_name.h" // // This file contains internal interfaces used to allow various plugins diff --git a/src/core/client_channel/client_channel_service_config.h b/src/core/client_channel/client_channel_service_config.h index 60340e2685f..e985b8e92e0 100644 --- a/src/core/client_channel/client_channel_service_config.h +++ b/src/core/client_channel/client_channel_service_config.h @@ -29,14 +29,14 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/time.h" -#include "src/core/lib/gprpp/validation_errors.h" #include "src/core/load_balancing/lb_policy.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" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" +#include "src/core/util/validation_errors.h" namespace grpc_core { namespace internal { diff --git a/src/core/client_channel/config_selector.h b/src/core/client_channel/config_selector.h index 1fb1ddab78a..76572369fe4 100644 --- a/src/core/client_channel/config_selector.h +++ b/src/core/client_channel/config_selector.h @@ -32,14 +32,14 @@ #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/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/unique_type_name.h" #include "src/core/util/useful.h" // Channel arg key for ConfigSelector. diff --git a/src/core/client_channel/connector.h b/src/core/client_channel/connector.h index 5c218dd7d41..927b1024318 100644 --- a/src/core/client_channel/connector.h +++ b/src/core/client_channel/connector.h @@ -21,14 +21,14 @@ #include "src/core/channelz/channelz.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/iomgr_fwd.h" #include "src/core/lib/iomgr/resolved_address.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" namespace grpc_core { diff --git a/src/core/client_channel/direct_channel.cc b/src/core/client_channel/direct_channel.cc index 7a87774dc20..6ccde807dcc 100644 --- a/src/core/client_channel/direct_channel.cc +++ b/src/core/client_channel/direct_channel.cc @@ -16,10 +16,10 @@ #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" +#include "src/core/util/orphanable.h" namespace grpc_core { diff --git a/src/core/client_channel/dynamic_filters.cc b/src/core/client_channel/dynamic_filters.cc index f6658343e0a..45e7d4ffcbc 100644 --- a/src/core/client_channel/dynamic_filters.cc +++ b/src/core/client_channel/dynamic_filters.cc @@ -31,10 +31,10 @@ #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/channel/channel_stack_builder_impl.h" #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/status_helper.h" #include "src/core/lib/surface/channel_stack_type.h" #include "src/core/lib/surface/lame_client.h" #include "src/core/util/alloc.h" +#include "src/core/util/status_helper.h" // Conversion between call and call stack. #define CALL_TO_CALL_STACK(call) \ diff --git a/src/core/client_channel/dynamic_filters.h b/src/core/client_channel/dynamic_filters.h index bbde6e6c806..142217d72d3 100644 --- a/src/core/client_channel/dynamic_filters.h +++ b/src/core/client_channel/dynamic_filters.h @@ -27,16 +27,16 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_stack.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/call_combiner.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/polling_entity.h" #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" #include "src/core/util/time_precise.h" namespace grpc_core { diff --git a/src/core/client_channel/global_subchannel_pool.h b/src/core/client_channel/global_subchannel_pool.h index bad648a595d..76ef31af385 100644 --- a/src/core/client_channel/global_subchannel_pool.h +++ b/src/core/client_channel/global_subchannel_pool.h @@ -26,8 +26,8 @@ #include "absl/base/thread_annotations.h" #include "src/core/client_channel/subchannel_pool_interface.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" namespace grpc_core { diff --git a/src/core/client_channel/load_balanced_call_destination.cc b/src/core/client_channel/load_balanced_call_destination.cc index a54a249616a..5d7c0b3c66c 100644 --- a/src/core/client_channel/load_balanced_call_destination.cc +++ b/src/core/client_channel/load_balanced_call_destination.cc @@ -53,7 +53,7 @@ class LbCallState : public ClientChannelLbCallState { } }; -// TODO(roth): Remove this in favor of the gprpp Match() function once +// TODO(roth): Remove this in favor of src/core/util/match.h function once // we can do that without breaking lock annotations. template T HandlePickResult( diff --git a/src/core/client_channel/local_subchannel_pool.h b/src/core/client_channel/local_subchannel_pool.h index 5e4cce51b28..a6e1933bbe0 100644 --- a/src/core/client_channel/local_subchannel_pool.h +++ b/src/core/client_channel/local_subchannel_pool.h @@ -24,7 +24,7 @@ #include #include "src/core/client_channel/subchannel_pool_interface.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_core { diff --git a/src/core/client_channel/retry_filter.cc b/src/core/client_channel/retry_filter.cc index 754a543d7eb..73de1a4ebe1 100644 --- a/src/core/client_channel/retry_filter.cc +++ b/src/core/client_channel/retry_filter.cc @@ -33,11 +33,11 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/iomgr/error.h" -#include "src/core/lib/uri/uri_parser.h" #include "src/core/service_config/service_config.h" #include "src/core/service_config/service_config_call_data.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/uri.h" // // Retry filter diff --git a/src/core/client_channel/retry_filter.h b/src/core/client_channel/retry_filter.h index 8e30d1e7b66..402fa047691 100644 --- a/src/core/client_channel/retry_filter.h +++ b/src/core/client_channel/retry_filter.h @@ -37,9 +37,9 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_stack.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/ref_counted_ptr.h" #include "src/core/util/useful.h" namespace grpc_core { diff --git a/src/core/client_channel/retry_filter_legacy_call_data.cc b/src/core/client_channel/retry_filter_legacy_call_data.cc index 4bb4bf3f9a3..dda37fd4c62 100644 --- a/src/core/client_channel/retry_filter_legacy_call_data.cc +++ b/src/core/client_channel/retry_filter_legacy_call_data.cc @@ -29,17 +29,9 @@ #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" -#include "src/core/lib/backoff/backoff.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/channel/status_util.h" #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/construct_destruct.h" -#include "src/core/lib/gprpp/debug_location.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/status_helper.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/call_combiner.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" @@ -51,6 +43,14 @@ #include "src/core/lib/transport/error_utils.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/backoff.h" +#include "src/core/util/construct_destruct.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/time.h" #include "src/core/util/useful.h" namespace grpc_core { diff --git a/src/core/client_channel/retry_filter_legacy_call_data.h b/src/core/client_channel/retry_filter_legacy_call_data.h index dd308b72366..a4336072f1b 100644 --- a/src/core/client_channel/retry_filter_legacy_call_data.h +++ b/src/core/client_channel/retry_filter_legacy_call_data.h @@ -34,14 +34,8 @@ #include "src/core/client_channel/retry_filter.h" #include "src/core/client_channel/retry_service_config.h" #include "src/core/client_channel/retry_throttle.h" -#include "src/core/lib/backoff/backoff.h" #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_stack.h" -#include "src/core/lib/gprpp/debug_location.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/time.h" #include "src/core/lib/iomgr/call_combiner.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" @@ -50,6 +44,12 @@ #include "src/core/lib/slice/slice_buffer.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/backoff.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" namespace grpc_core { diff --git a/src/core/client_channel/retry_service_config.h b/src/core/client_channel/retry_service_config.h index 6e4bbc29753..237e3b93bcc 100644 --- a/src/core/client_channel/retry_service_config.h +++ b/src/core/client_channel/retry_service_config.h @@ -30,12 +30,12 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/status_util.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/time.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" +#include "src/core/util/time.h" +#include "src/core/util/validation_errors.h" namespace grpc_core { namespace internal { diff --git a/src/core/client_channel/retry_throttle.h b/src/core/client_channel/retry_throttle.h index ec1899b0967..3cb32604277 100644 --- a/src/core/client_channel/retry_throttle.h +++ b/src/core/client_channel/retry_throttle.h @@ -30,9 +30,9 @@ #include -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" namespace grpc_core { namespace internal { diff --git a/src/core/client_channel/subchannel.cc b/src/core/client_channel/subchannel.cc index 298c7d78516..26f76b77709 100644 --- a/src/core/client_channel/subchannel.cc +++ b/src/core/client_channel/subchannel.cc @@ -44,19 +44,12 @@ #include "src/core/client_channel/subchannel_pool_interface.h" #include "src/core/handshaker/proxy_mapper_registry.h" #include "src/core/lib/address_utils/sockaddr_utils.h" -#include "src/core/lib/backoff/backoff.h" #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" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/experiments/experiments.h" -#include "src/core/lib/gprpp/debug_location.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/status_helper.h" -#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/pollset_set.h" #include "src/core/lib/promise/cancel_callback.h" @@ -72,6 +65,13 @@ #include "src/core/telemetry/stats.h" #include "src/core/telemetry/stats_data.h" #include "src/core/util/alloc.h" +#include "src/core/util/backoff.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/sync.h" #include "src/core/util/useful.h" // Backoff parameters. diff --git a/src/core/client_channel/subchannel.h b/src/core/client_channel/subchannel.h index 502df2b4844..06a414363b1 100644 --- a/src/core/client_channel/subchannel.h +++ b/src/core/client_channel/subchannel.h @@ -34,18 +34,8 @@ #include "src/core/client_channel/connector.h" #include "src/core/client_channel/subchannel_pool_interface.h" #include "src/core/lib/address_utils/sockaddr_utils.h" -#include "src/core/lib/backoff/backoff.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_fwd.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/dual_ref_counted.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" -#include "src/core/lib/gprpp/time.h" -#include "src/core/lib/gprpp/unique_type_name.h" -#include "src/core/lib/gprpp/work_serializer.h" #include "src/core/lib/iomgr/call_combiner.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" @@ -58,7 +48,17 @@ #include "src/core/lib/transport/connectivity_state.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/backoff.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/dual_ref_counted.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.h" #include "src/core/util/time_precise.h" +#include "src/core/util/unique_type_name.h" +#include "src/core/util/work_serializer.h" namespace grpc_core { diff --git a/src/core/client_channel/subchannel_interface_internal.h b/src/core/client_channel/subchannel_interface_internal.h index fc5b9faaed5..9d93984b598 100644 --- a/src/core/client_channel/subchannel_interface_internal.h +++ b/src/core/client_channel/subchannel_interface_internal.h @@ -20,8 +20,8 @@ #include #include "src/core/client_channel/subchannel.h" -#include "src/core/lib/gprpp/unique_type_name.h" #include "src/core/load_balancing/subchannel_interface.h" +#include "src/core/util/unique_type_name.h" namespace grpc_core { diff --git a/src/core/client_channel/subchannel_pool_interface.h b/src/core/client_channel/subchannel_pool_interface.h index 6a073ed9cb5..d7cab8f1e99 100644 --- a/src/core/client_channel/subchannel_pool_interface.h +++ b/src/core/client_channel/subchannel_pool_interface.h @@ -27,9 +27,9 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/iomgr/resolved_address.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" #include "src/core/util/useful.h" namespace grpc_core { diff --git a/src/core/client_channel/subchannel_stream_client.cc b/src/core/client_channel/subchannel_stream_client.cc index afdafe398e9..a01165e3d11 100644 --- a/src/core/client_channel/subchannel_stream_client.cc +++ b/src/core/client_channel/subchannel_stream_client.cc @@ -29,13 +29,13 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/status_helper.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/resource_quota/resource_quota.h" #include "src/core/lib/transport/error_utils.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.h" #include "src/core/util/time_precise.h" #define SUBCHANNEL_STREAM_INITIAL_CONNECT_BACKOFF_SECONDS 1 diff --git a/src/core/client_channel/subchannel_stream_client.h b/src/core/client_channel/subchannel_stream_client.h index 3945c1c9eba..f50314e0ace 100644 --- a/src/core/client_channel/subchannel_stream_client.h +++ b/src/core/client_channel/subchannel_stream_client.h @@ -33,10 +33,6 @@ #include #include "src/core/client_channel/subchannel.h" -#include "src/core/lib/backoff/backoff.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/call_combiner.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" @@ -48,6 +44,10 @@ #include "src/core/lib/slice/slice_buffer.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/backoff.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" namespace grpc_core { diff --git a/src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc b/src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc index 6b0582afc0c..bc4e834a10d 100644 --- a/src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc +++ b/src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc @@ -35,12 +35,6 @@ #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/experiments/experiments.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/no_destruct.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/per_cpu.h" -#include "src/core/lib/gprpp/status_helper.h" -#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" @@ -54,6 +48,12 @@ #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" +#include "src/core/util/debug_location.h" +#include "src/core/util/no_destruct.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/per_cpu.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/sync.h" namespace grpc_core { diff --git a/src/core/ext/filters/channel_idle/legacy_channel_idle_filter.h b/src/core/ext/filters/channel_idle/legacy_channel_idle_filter.h index 74bf3a2f09b..b4b61f10bb3 100644 --- a/src/core/ext/filters/channel_idle/legacy_channel_idle_filter.h +++ b/src/core/ext/filters/channel_idle/legacy_channel_idle_filter.h @@ -29,14 +29,14 @@ #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/channel/promise_based_filter.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/single_set_ptr.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/promise/activity.h" #include "src/core/lib/promise/arena_promise.h" #include "src/core/lib/transport/connectivity_state.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/single_set_ptr.h" +#include "src/core/util/time.h" namespace grpc_core { diff --git a/src/core/ext/filters/fault_injection/fault_injection_filter.cc b/src/core/ext/filters/fault_injection/fault_injection_filter.cc index 6576c6df96d..e52ca7906ee 100644 --- a/src/core/ext/filters/fault_injection/fault_injection_filter.cc +++ b/src/core/ext/filters/fault_injection/fault_injection_filter.cc @@ -43,13 +43,13 @@ #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/gprpp/time.h" #include "src/core/lib/promise/context.h" #include "src/core/lib/promise/sleep.h" #include "src/core/lib/promise/try_seq.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" #include "src/core/service_config/service_config_call_data.h" +#include "src/core/util/time.h" namespace grpc_core { diff --git a/src/core/ext/filters/fault_injection/fault_injection_filter.h b/src/core/ext/filters/fault_injection/fault_injection_filter.h index 7bcd2227060..40b839c1033 100644 --- a/src/core/ext/filters/fault_injection/fault_injection_filter.h +++ b/src/core/ext/filters/fault_injection/fault_injection_filter.h @@ -30,9 +30,9 @@ #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/sync.h" #include "src/core/lib/promise/arena_promise.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/sync.h" namespace grpc_core { diff --git a/src/core/ext/filters/fault_injection/fault_injection_service_config_parser.h b/src/core/ext/filters/fault_injection/fault_injection_service_config_parser.h index bef8185fe27..0016c552c8e 100644 --- a/src/core/ext/filters/fault_injection/fault_injection_service_config_parser.h +++ b/src/core/ext/filters/fault_injection/fault_injection_service_config_parser.h @@ -33,12 +33,12 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/time.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" +#include "src/core/util/time.h" +#include "src/core/util/validation_errors.h" // Channel arg key for enabling parsing fault injection via method config. #define GRPC_ARG_PARSE_FAULT_INJECTION_METHOD_CONFIG \ diff --git a/src/core/ext/filters/gcp_authentication/gcp_authentication_filter.h b/src/core/ext/filters/gcp_authentication/gcp_authentication_filter.h index 927e2de05ef..18109c70c1b 100644 --- a/src/core/ext/filters/gcp_authentication/gcp_authentication_filter.h +++ b/src/core/ext/filters/gcp_authentication/gcp_authentication_filter.h @@ -28,12 +28,12 @@ #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" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" namespace grpc_core { diff --git a/src/core/ext/filters/gcp_authentication/gcp_authentication_service_config_parser.h b/src/core/ext/filters/gcp_authentication/gcp_authentication_service_config_parser.h index 97df008e968..2c64a694485 100644 --- a/src/core/ext/filters/gcp_authentication/gcp_authentication_service_config_parser.h +++ b/src/core/ext/filters/gcp_authentication/gcp_authentication_service_config_parser.h @@ -28,11 +28,11 @@ #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" +#include "src/core/util/validation_errors.h" // Channel arg key for enabling parsing fault injection via method config. #define GRPC_ARG_PARSE_GCP_AUTHENTICATION_METHOD_CONFIG \ diff --git a/src/core/ext/filters/load_reporting/server_load_reporting_filter.cc b/src/core/ext/filters/load_reporting/server_load_reporting_filter.cc index 2023fb436d6..928a50867e3 100644 --- a/src/core/ext/filters/load_reporting/server_load_reporting_filter.cc +++ b/src/core/ext/filters/load_reporting/server_load_reporting_filter.cc @@ -61,7 +61,7 @@ #include "src/core/lib/slice/slice.h" #include "src/core/lib/surface/channel_stack_type.h" #include "src/core/lib/transport/metadata_batch.h" -#include "src/core/lib/uri/uri_parser.h" +#include "src/core/util/uri.h" #include "src/cpp/server/load_reporter/constants.h" // IWYU pragma: no_include "opencensus/stats/recording.h" diff --git a/src/core/ext/filters/logging/logging_filter.cc b/src/core/ext/filters/logging/logging_filter.cc index 67d1b274691..1963f823665 100644 --- a/src/core/ext/filters/logging/logging_filter.cc +++ b/src/core/ext/filters/logging/logging_filter.cc @@ -53,8 +53,6 @@ #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/host_port.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/promise/arena_promise.h" #include "src/core/lib/promise/cancel_callback.h" #include "src/core/lib/promise/context.h" @@ -66,9 +64,11 @@ #include "src/core/lib/surface/channel_stack_type.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" -#include "src/core/lib/uri/uri_parser.h" #include "src/core/resolver/resolver_registry.h" #include "src/core/telemetry/call_tracer.h" +#include "src/core/util/host_port.h" +#include "src/core/util/time.h" +#include "src/core/util/uri.h" namespace grpc_core { diff --git a/src/core/ext/filters/logging/logging_sink.h b/src/core/ext/filters/logging/logging_sink.h index b013cd9072e..71720799e4d 100644 --- a/src/core/ext/filters/logging/logging_sink.h +++ b/src/core/ext/filters/logging/logging_sink.h @@ -30,7 +30,7 @@ #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" namespace grpc_core { diff --git a/src/core/ext/filters/message_size/message_size_filter.h b/src/core/ext/filters/message_size/message_size_filter.h index 3ed3b2b735b..2bc36cfde31 100644 --- a/src/core/ext/filters/message_size/message_size_filter.h +++ b/src/core/ext/filters/message_size/message_size_filter.h @@ -32,13 +32,13 @@ #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/promise_based_filter.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/validation_errors.h" #include "src/core/lib/promise/arena_promise.h" #include "src/core/lib/transport/transport.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" +#include "src/core/util/validation_errors.h" namespace grpc_core { diff --git a/src/core/ext/filters/rbac/rbac_service_config_parser.cc b/src/core/ext/filters/rbac/rbac_service_config_parser.cc index 000440f5274..56195fe4625 100644 --- a/src/core/ext/filters/rbac/rbac_service_config_parser.cc +++ b/src/core/ext/filters/rbac/rbac_service_config_parser.cc @@ -31,10 +31,10 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/matchers/matchers.h" #include "src/core/lib/security/authorization/audit_logging.h" #include "src/core/util/json/json_args.h" #include "src/core/util/json/json_object_loader.h" +#include "src/core/util/matchers.h" namespace grpc_core { diff --git a/src/core/ext/filters/rbac/rbac_service_config_parser.h b/src/core/ext/filters/rbac/rbac_service_config_parser.h index 728a92e1bf0..f9a4c29c34e 100644 --- a/src/core/ext/filters/rbac/rbac_service_config_parser.h +++ b/src/core/ext/filters/rbac/rbac_service_config_parser.h @@ -30,11 +30,11 @@ #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/lib/security/authorization/grpc_authorization_engine.h" #include "src/core/lib/security/authorization/rbac_policy.h" #include "src/core/service_config/service_config_parser.h" #include "src/core/util/json/json.h" +#include "src/core/util/validation_errors.h" namespace grpc_core { diff --git a/src/core/ext/filters/stateful_session/stateful_session_filter.cc b/src/core/ext/filters/stateful_session/stateful_session_filter.cc index cf83e5db1ff..953a32a511b 100644 --- a/src/core/ext/filters/stateful_session/stateful_session_filter.cc +++ b/src/core/ext/filters/stateful_session/stateful_session_filter.cc @@ -41,8 +41,6 @@ #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/promise/context.h" #include "src/core/lib/promise/map.h" #include "src/core/lib/promise/pipe.h" @@ -52,6 +50,8 @@ #include "src/core/lib/transport/transport.h" #include "src/core/resolver/xds/xds_resolver_attributes.h" #include "src/core/service_config/service_config_call_data.h" +#include "src/core/util/crash.h" +#include "src/core/util/time.h" namespace grpc_core { diff --git a/src/core/ext/filters/stateful_session/stateful_session_filter.h b/src/core/ext/filters/stateful_session/stateful_session_filter.h index 3bffbaa8547..b7bde679c17 100644 --- a/src/core/ext/filters/stateful_session/stateful_session_filter.h +++ b/src/core/ext/filters/stateful_session/stateful_session_filter.h @@ -30,11 +30,11 @@ #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_string.h" -#include "src/core/lib/gprpp/unique_type_name.h" #include "src/core/lib/promise/arena_promise.h" #include "src/core/lib/transport/transport.h" #include "src/core/service_config/service_config_call_data.h" +#include "src/core/util/ref_counted_string.h" +#include "src/core/util/unique_type_name.h" namespace grpc_core { diff --git a/src/core/ext/filters/stateful_session/stateful_session_service_config_parser.h b/src/core/ext/filters/stateful_session/stateful_session_service_config_parser.h index ccb6245b28f..edf6f55a79d 100644 --- a/src/core/ext/filters/stateful_session/stateful_session_service_config_parser.h +++ b/src/core/ext/filters/stateful_session/stateful_session_service_config_parser.h @@ -30,12 +30,12 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/time.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" +#include "src/core/util/time.h" +#include "src/core/util/validation_errors.h" // Channel arg key for enabling parsing fault injection via method config. #define GRPC_ARG_PARSE_STATEFUL_SESSION_METHOD_CONFIG \ diff --git a/src/core/ext/transport/binder/client/channel_create.cc b/src/core/ext/transport/binder/client/channel_create.cc index f5dd12c9991..6ccf25f5b9b 100644 --- a/src/core/ext/transport/binder/client/channel_create.cc +++ b/src/core/ext/transport/binder/client/channel_create.cc @@ -29,7 +29,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #ifdef GPR_SUPPORT_BINDER_TRANSPORT diff --git a/src/core/ext/transport/binder/client/connection_id_generator.h b/src/core/ext/transport/binder/client/connection_id_generator.h index d756ec1ced3..fbe945cfb74 100644 --- a/src/core/ext/transport/binder/client/connection_id_generator.h +++ b/src/core/ext/transport/binder/client/connection_id_generator.h @@ -21,7 +21,7 @@ #include -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/sync.h" namespace grpc_binder { diff --git a/src/core/ext/transport/binder/client/endpoint_binder_pool.h b/src/core/ext/transport/binder/client/endpoint_binder_pool.h index f3452009b67..4f9ac233219 100644 --- a/src/core/ext/transport/binder/client/endpoint_binder_pool.h +++ b/src/core/ext/transport/binder/client/endpoint_binder_pool.h @@ -23,7 +23,7 @@ #include #include "src/core/ext/transport/binder/wire_format/binder.h" -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/sync.h" namespace grpc_binder { diff --git a/src/core/ext/transport/binder/client/jni_utils.cc b/src/core/ext/transport/binder/client/jni_utils.cc index 04190d01a3c..8fc4f629c3c 100644 --- a/src/core/ext/transport/binder/client/jni_utils.cc +++ b/src/core/ext/transport/binder/client/jni_utils.cc @@ -21,7 +21,7 @@ #ifndef GRPC_NO_BINDER -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #if defined(ANDROID) || defined(__ANDROID__) diff --git a/src/core/ext/transport/binder/client/security_policy_setting.h b/src/core/ext/transport/binder/client/security_policy_setting.h index 212603744b9..46fb000246a 100644 --- a/src/core/ext/transport/binder/client/security_policy_setting.h +++ b/src/core/ext/transport/binder/client/security_policy_setting.h @@ -21,7 +21,7 @@ #include #include -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/sync.h" namespace grpc_binder { diff --git a/src/core/ext/transport/binder/security_policy/binder_security_policy.cc b/src/core/ext/transport/binder/security_policy/binder_security_policy.cc index 07304767336..4fe4ee4d159 100644 --- a/src/core/ext/transport/binder/security_policy/binder_security_policy.cc +++ b/src/core/ext/transport/binder/security_policy/binder_security_policy.cc @@ -27,7 +27,7 @@ #include "absl/log/log.h" #include "src/core/ext/transport/binder/client/jni_utils.h" -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #endif diff --git a/src/core/ext/transport/binder/transport/binder_transport.cc b/src/core/ext/transport/binder/transport/binder_transport.cc index 5014ff85ccc..06ed2da8798 100644 --- a/src/core/ext/transport/binder/transport/binder_transport.cc +++ b/src/core/ext/transport/binder/transport/binder_transport.cc @@ -36,12 +36,12 @@ #include "src/core/ext/transport/binder/wire_format/wire_reader_impl.h" #include "src/core/ext/transport/binder/wire_format/wire_writer.h" #include "src/core/lib/event_engine/default_event_engine.h" -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/transport/error_utils.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/crash.h" #ifndef NDEBUG static void grpc_binder_stream_ref(grpc_binder_stream* s, const char* reason) { diff --git a/src/core/ext/transport/binder/transport/binder_transport.h b/src/core/ext/transport/binder/transport/binder_transport.h index 1d7b43a7d11..108926f25df 100644 --- a/src/core/ext/transport/binder/transport/binder_transport.h +++ b/src/core/ext/transport/binder/transport/binder_transport.h @@ -32,9 +32,9 @@ #include "src/core/ext/transport/binder/wire_format/binder.h" #include "src/core/ext/transport/binder/wire_format/wire_reader.h" #include "src/core/ext/transport/binder/wire_format/wire_writer.h" -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/iomgr/combiner.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/crash.h" struct grpc_binder_stream; diff --git a/src/core/ext/transport/binder/utils/ndk_binder.cc b/src/core/ext/transport/binder/utils/ndk_binder.cc index 79227a44c67..95b52789803 100644 --- a/src/core/ext/transport/binder/utils/ndk_binder.cc +++ b/src/core/ext/transport/binder/utils/ndk_binder.cc @@ -25,8 +25,8 @@ #include "absl/log/check.h" #include "absl/log/log.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/crash.h" +#include "src/core/util/sync.h" namespace { void* GetNdkBinderHandle() { diff --git a/src/core/ext/transport/binder/utils/transport_stream_receiver_impl.cc b/src/core/ext/transport/binder/utils/transport_stream_receiver_impl.cc index 9546109aa61..5a3cc10cb27 100644 --- a/src/core/ext/transport/binder/utils/transport_stream_receiver_impl.cc +++ b/src/core/ext/transport/binder/utils/transport_stream_receiver_impl.cc @@ -25,7 +25,7 @@ #include "absl/log/check.h" #include "absl/log/log.h" -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" namespace grpc_binder { diff --git a/src/core/ext/transport/binder/utils/transport_stream_receiver_impl.h b/src/core/ext/transport/binder/utils/transport_stream_receiver_impl.h index 6fe22df4692..a671a5e8233 100644 --- a/src/core/ext/transport/binder/utils/transport_stream_receiver_impl.h +++ b/src/core/ext/transport/binder/utils/transport_stream_receiver_impl.h @@ -25,7 +25,7 @@ #include #include "src/core/ext/transport/binder/utils/transport_stream_receiver.h" -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/sync.h" namespace grpc_binder { diff --git a/src/core/ext/transport/binder/wire_format/binder.h b/src/core/ext/transport/binder/wire_format/binder.h index ce79c1332e8..7936fbb65ce 100644 --- a/src/core/ext/transport/binder/wire_format/binder.h +++ b/src/core/ext/transport/binder/wire_format/binder.h @@ -26,7 +26,7 @@ #include #include "src/core/ext/transport/binder/wire_format/binder_constants.h" -#include "src/core/lib/gprpp/orphanable.h" +#include "src/core/util/orphanable.h" namespace grpc_binder { diff --git a/src/core/ext/transport/binder/wire_format/binder_android.cc b/src/core/ext/transport/binder/wire_format/binder_android.cc index 5e33262cd66..e2a55df6b01 100644 --- a/src/core/ext/transport/binder/wire_format/binder_android.cc +++ b/src/core/ext/transport/binder/wire_format/binder_android.cc @@ -26,8 +26,8 @@ #include "absl/strings/str_cat.h" #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" +#include "src/core/util/crash.h" +#include "src/core/util/sync.h" namespace grpc_binder { namespace { diff --git a/src/core/ext/transport/binder/wire_format/transaction.h b/src/core/ext/transport/binder/wire_format/transaction.h index 971b3bdb9ac..eda30d093a5 100644 --- a/src/core/ext/transport/binder/wire_format/transaction.h +++ b/src/core/ext/transport/binder/wire_format/transaction.h @@ -24,7 +24,7 @@ #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" namespace grpc_binder { diff --git a/src/core/ext/transport/binder/wire_format/wire_reader.h b/src/core/ext/transport/binder/wire_format/wire_reader.h index 2a4092d29d9..570f99ac683 100644 --- a/src/core/ext/transport/binder/wire_format/wire_reader.h +++ b/src/core/ext/transport/binder/wire_format/wire_reader.h @@ -22,7 +22,7 @@ #include "src/core/ext/transport/binder/wire_format/binder.h" #include "src/core/ext/transport/binder/wire_format/wire_writer.h" -#include "src/core/lib/gprpp/orphanable.h" +#include "src/core/util/orphanable.h" namespace grpc_binder { diff --git a/src/core/ext/transport/binder/wire_format/wire_reader_impl.cc b/src/core/ext/transport/binder/wire_format/wire_reader_impl.cc index bb01c892319..d877b9cd9c1 100644 --- a/src/core/ext/transport/binder/wire_format/wire_reader_impl.cc +++ b/src/core/ext/transport/binder/wire_format/wire_reader_impl.cc @@ -33,8 +33,8 @@ #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" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/status_helper.h" +#include "src/core/util/crash.h" +#include "src/core/util/status_helper.h" namespace grpc_binder { namespace { diff --git a/src/core/ext/transport/binder/wire_format/wire_reader_impl.h b/src/core/ext/transport/binder/wire_format/wire_reader_impl.h index 48e80f718f6..a08cb6f4985 100644 --- a/src/core/ext/transport/binder/wire_format/wire_reader_impl.h +++ b/src/core/ext/transport/binder/wire_format/wire_reader_impl.h @@ -29,7 +29,7 @@ #include "src/core/ext/transport/binder/wire_format/binder.h" #include "src/core/ext/transport/binder/wire_format/wire_reader.h" #include "src/core/ext/transport/binder/wire_format/wire_writer.h" -#include "src/core/lib/gprpp/notification.h" +#include "src/core/util/notification.h" namespace grpc_binder { diff --git a/src/core/ext/transport/binder/wire_format/wire_writer.cc b/src/core/ext/transport/binder/wire_format/wire_writer.cc index 1b954e1d26a..1cefd1bd5f2 100644 --- a/src/core/ext/transport/binder/wire_format/wire_writer.cc +++ b/src/core/ext/transport/binder/wire_format/wire_writer.cc @@ -26,7 +26,7 @@ #include "absl/types/variant.h" #include "src/core/lib/event_engine/default_event_engine.h" -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #define RETURN_IF_ERROR(expr) \ do { \ diff --git a/src/core/ext/transport/binder/wire_format/wire_writer.h b/src/core/ext/transport/binder/wire_format/wire_writer.h index bb52c7385cc..81041c68c02 100644 --- a/src/core/ext/transport/binder/wire_format/wire_writer.h +++ b/src/core/ext/transport/binder/wire_format/wire_writer.h @@ -25,8 +25,8 @@ #include "src/core/ext/transport/binder/wire_format/binder.h" #include "src/core/ext/transport/binder/wire_format/transaction.h" -#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/iomgr/combiner.h" +#include "src/core/util/sync.h" namespace grpc_binder { diff --git a/src/core/ext/transport/chaotic_good/client/chaotic_good_connector.cc b/src/core/ext/transport/chaotic_good/client/chaotic_good_connector.cc index be3dfa83f53..d8743703a04 100644 --- a/src/core/ext/transport/chaotic_good/client/chaotic_good_connector.cc +++ b/src/core/ext/transport/chaotic_good/client/chaotic_good_connector.cc @@ -41,10 +41,6 @@ #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" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/no_destruct.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/event_engine_shims/endpoint.h" @@ -65,6 +61,10 @@ #include "src/core/lib/surface/channel_create.h" #include "src/core/lib/transport/error_utils.h" #include "src/core/lib/transport/promise_endpoint.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/no_destruct.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" namespace grpc_core { namespace chaotic_good { diff --git a/src/core/ext/transport/chaotic_good/client/chaotic_good_connector.h b/src/core/ext/transport/chaotic_good/client/chaotic_good_connector.h index 5078d384369..59ef8fd4376 100644 --- a/src/core/ext/transport/chaotic_good/client/chaotic_good_connector.h +++ b/src/core/ext/transport/chaotic_good/client/chaotic_good_connector.h @@ -31,9 +31,6 @@ #include "src/core/handshaker/handshaker.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/event_engine/channel_args_endpoint_config.h" -#include "src/core/lib/gprpp/notification.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" @@ -45,6 +42,9 @@ #include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/lib/resource_quota/resource_quota.h" #include "src/core/lib/transport/promise_endpoint.h" +#include "src/core/util/notification.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" namespace grpc_core { namespace chaotic_good { diff --git a/src/core/ext/transport/chaotic_good/client_transport.cc b/src/core/ext/transport/chaotic_good/client_transport.cc index 2c2c208f31d..17aff601d45 100644 --- a/src/core/ext/transport/chaotic_good/client_transport.cc +++ b/src/core/ext/transport/chaotic_good/client_transport.cc @@ -36,8 +36,6 @@ #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/gprpp/match.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" #include "src/core/lib/promise/all_ok.h" @@ -53,6 +51,8 @@ #include "src/core/lib/slice/slice_buffer.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/transport/promise_endpoint.h" +#include "src/core/util/match.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_core { namespace chaotic_good { diff --git a/src/core/ext/transport/chaotic_good/client_transport.h b/src/core/ext/transport/chaotic_good/client_transport.h index 47dacc23bc7..8f2941947d3 100644 --- a/src/core/ext/transport/chaotic_good/client_transport.h +++ b/src/core/ext/transport/chaotic_good/client_transport.h @@ -43,7 +43,6 @@ #include "src/core/ext/transport/chaotic_good/frame_header.h" #include "src/core/ext/transport/chttp2/transport/hpack_encoder.h" #include "src/core/ext/transport/chttp2/transport/hpack_parser.h" -#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/promise/activity.h" #include "src/core/lib/promise/context.h" #include "src/core/lib/promise/for_each.h" @@ -61,6 +60,7 @@ #include "src/core/lib/transport/metadata_batch.h" // IWYU pragma: keep #include "src/core/lib/transport/promise_endpoint.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/sync.h" namespace grpc_core { namespace chaotic_good { diff --git a/src/core/ext/transport/chaotic_good/frame.cc b/src/core/ext/transport/chaotic_good/frame.cc index 243d8ef4ca2..dccdf7f0dc5 100644 --- a/src/core/ext/transport/chaotic_good/frame.cc +++ b/src/core/ext/transport/chaotic_good/frame.cc @@ -28,13 +28,13 @@ #include #include "src/core/ext/transport/chaotic_good/frame_header.h" -#include "src/core/lib/gprpp/bitset.h" -#include "src/core/lib/gprpp/no_destruct.h" -#include "src/core/lib/gprpp/status_helper.h" #include "src/core/lib/promise/context.h" #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/util/bitset.h" +#include "src/core/util/no_destruct.h" +#include "src/core/util/status_helper.h" namespace grpc_core { namespace chaotic_good { diff --git a/src/core/ext/transport/chaotic_good/frame.h b/src/core/ext/transport/chaotic_good/frame.h index 548280858bf..a328c3c80ce 100644 --- a/src/core/ext/transport/chaotic_good/frame.h +++ b/src/core/ext/transport/chaotic_good/frame.h @@ -28,11 +28,11 @@ #include "src/core/ext/transport/chaotic_good/frame_header.h" #include "src/core/ext/transport/chttp2/transport/hpack_encoder.h" #include "src/core/ext/transport/chttp2/transport/hpack_parser.h" -#include "src/core/lib/gprpp/match.h" #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/slice/slice_buffer.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/match.h" namespace grpc_core { namespace chaotic_good { diff --git a/src/core/ext/transport/chaotic_good/frame_header.h b/src/core/ext/transport/chaotic_good/frame_header.h index 760c9c0d07d..91a83eed4a8 100644 --- a/src/core/ext/transport/chaotic_good/frame_header.h +++ b/src/core/ext/transport/chaotic_good/frame_header.h @@ -23,7 +23,7 @@ #include -#include "src/core/lib/gprpp/bitset.h" +#include "src/core/util/bitset.h" namespace grpc_core { namespace chaotic_good { diff --git a/src/core/ext/transport/chaotic_good/server/chaotic_good_server.cc b/src/core/ext/transport/chaotic_good/server/chaotic_good_server.cc index ac044244bd2..f5c8dc2d685 100644 --- a/src/core/ext/transport/chaotic_good/server/chaotic_good_server.cc +++ b/src/core/ext/transport/chaotic_good/server/chaotic_good_server.cc @@ -44,11 +44,6 @@ #include "src/core/lib/event_engine/query_extensions.h" #include "src/core/lib/event_engine/resolved_address_internal.h" #include "src/core/lib/event_engine/tcp_socket_utils.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/status_helper.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/event_engine_shims/endpoint.h" #include "src/core/lib/promise/activity.h" @@ -68,6 +63,11 @@ #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/promise_endpoint.h" #include "src/core/server/server.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.h" namespace grpc_core { namespace chaotic_good { diff --git a/src/core/ext/transport/chaotic_good/server/chaotic_good_server.h b/src/core/ext/transport/chaotic_good/server/chaotic_good_server.h index d5ec23b5de3..167da14458d 100644 --- a/src/core/ext/transport/chaotic_good/server/chaotic_good_server.h +++ b/src/core/ext/transport/chaotic_good/server/chaotic_good_server.h @@ -34,8 +34,6 @@ #include "src/core/ext/transport/chttp2/transport/hpack_parser.h" #include "src/core/handshaker/handshaker.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/iomgr_fwd.h" @@ -46,6 +44,8 @@ #include "src/core/lib/slice/slice.h" #include "src/core/lib/transport/promise_endpoint.h" #include "src/core/server/server.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.h" namespace grpc_core { namespace chaotic_good { diff --git a/src/core/ext/transport/chaotic_good/server_transport.cc b/src/core/ext/transport/chaotic_good/server_transport.cc index 0261223e823..4110af2fbcc 100644 --- a/src/core/ext/transport/chaotic_good/server_transport.cc +++ b/src/core/ext/transport/chaotic_good/server_transport.cc @@ -35,7 +35,6 @@ #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" #include "src/core/lib/promise/event_engine_wakeup_scheduler.h" @@ -48,6 +47,7 @@ #include "src/core/lib/slice/slice.h" #include "src/core/lib/slice/slice_buffer.h" #include "src/core/lib/transport/promise_endpoint.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_core { namespace chaotic_good { diff --git a/src/core/ext/transport/chaotic_good/server_transport.h b/src/core/ext/transport/chaotic_good/server_transport.h index 246b25f7313..23909768b68 100644 --- a/src/core/ext/transport/chaotic_good/server_transport.h +++ b/src/core/ext/transport/chaotic_good/server_transport.h @@ -50,8 +50,6 @@ #include "src/core/ext/transport/chttp2/transport/hpack_encoder.h" #include "src/core/ext/transport/chttp2/transport/hpack_parser.h" #include "src/core/lib/event_engine/default_event_engine.h" // IWYU pragma: keep -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/promise/activity.h" #include "src/core/lib/promise/context.h" #include "src/core/lib/promise/if.h" @@ -73,6 +71,8 @@ #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/promise_endpoint.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" namespace grpc_core { namespace chaotic_good { diff --git a/src/core/ext/transport/chaotic_good/settings_metadata.cc b/src/core/ext/transport/chaotic_good/settings_metadata.cc index a6e5cc02993..3d952be719a 100644 --- a/src/core/ext/transport/chaotic_good/settings_metadata.cc +++ b/src/core/ext/transport/chaotic_good/settings_metadata.cc @@ -18,7 +18,7 @@ #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" namespace grpc_core { namespace chaotic_good { diff --git a/src/core/ext/transport/chttp2/client/chttp2_connector.cc b/src/core/ext/transport/chttp2/client/chttp2_connector.cc index 48204fd2c6c..2f6e070ae6a 100644 --- a/src/core/ext/transport/chttp2/client/chttp2_connector.cc +++ b/src/core/ext/transport/chttp2/client/chttp2_connector.cc @@ -54,11 +54,6 @@ #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/debug_location.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/status_helper.h" -#include "src/core/lib/gprpp/time.h" -#include "src/core/lib/gprpp/unique_type_name.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/resolved_address.h" @@ -71,6 +66,11 @@ #include "src/core/lib/transport/error_utils.h" #include "src/core/lib/transport/transport.h" #include "src/core/resolver/resolver_registry.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/time.h" +#include "src/core/util/unique_type_name.h" #ifdef GPR_SUPPORT_CHANNELS_FROM_FD diff --git a/src/core/ext/transport/chttp2/client/chttp2_connector.h b/src/core/ext/transport/chttp2/client/chttp2_connector.h index 0cb08474ca6..4c7eaa614da 100644 --- a/src/core/ext/transport/chttp2/client/chttp2_connector.h +++ b/src/core/ext/transport/chttp2/client/chttp2_connector.h @@ -27,11 +27,11 @@ #include "src/core/client_channel/connector.h" #include "src/core/handshaker/handshaker.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/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" namespace grpc_core { diff --git a/src/core/ext/transport/chttp2/server/chttp2_server.cc b/src/core/ext/transport/chttp2/server/chttp2_server.cc index ac507e79b00..212493f95f7 100644 --- a/src/core/ext/transport/chttp2/server/chttp2_server.cc +++ b/src/core/ext/transport/chttp2/server/chttp2_server.cc @@ -61,13 +61,6 @@ #include "src/core/lib/event_engine/channel_args_endpoint_config.h" #include "src/core/lib/event_engine/extensions/supports_fd.h" #include "src/core/lib/event_engine/query_extensions.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/status_helper.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/time.h" -#include "src/core/lib/gprpp/unique_type_name.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/event_engine_shims/endpoint.h" @@ -86,8 +79,15 @@ #include "src/core/lib/security/security_connector/security_connector.h" #include "src/core/lib/transport/error_utils.h" #include "src/core/lib/transport/transport.h" -#include "src/core/lib/uri/uri_parser.h" #include "src/core/server/server.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.h" +#include "src/core/util/unique_type_name.h" +#include "src/core/util/uri.h" #ifdef GPR_SUPPORT_CHANNELS_FROM_FD #include "src/core/lib/iomgr/ev_posix.h" diff --git a/src/core/ext/transport/chttp2/transport/chttp2_transport.cc b/src/core/ext/transport/chttp2/transport/chttp2_transport.cc index d3c5d994c1d..f25e8b2c672 100644 --- a/src/core/ext/transport/chttp2/transport/chttp2_transport.cc +++ b/src/core/ext/transport/chttp2/transport/chttp2_transport.cc @@ -75,12 +75,6 @@ #include "src/core/lib/event_engine/extensions/tcp_trace.h" #include "src/core/lib/event_engine/query_extensions.h" #include "src/core/lib/experiments/experiments.h" -#include "src/core/lib/gprpp/bitset.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/ref_counted.h" -#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" @@ -108,8 +102,14 @@ #include "src/core/telemetry/stats.h" #include "src/core/telemetry/stats_data.h" #include "src/core/telemetry/tcp_tracer.h" +#include "src/core/util/bitset.h" +#include "src/core/util/crash.h" +#include "src/core/util/debug_location.h" #include "src/core/util/http_client/parser.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/status_helper.h" #include "src/core/util/string.h" +#include "src/core/util/time.h" #include "src/core/util/useful.h" #define DEFAULT_CONNECTION_WINDOW_TARGET (1024 * 1024) diff --git a/src/core/ext/transport/chttp2/transport/chttp2_transport.h b/src/core/ext/transport/chttp2/transport/chttp2_transport.h index d2b93298038..c832da4ed9e 100644 --- a/src/core/ext/transport/chttp2/transport/chttp2_transport.h +++ b/src/core/ext/transport/chttp2/transport/chttp2_transport.h @@ -31,14 +31,14 @@ #include "src/core/ext/transport/chttp2/transport/flow_control.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/buffer_list.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/transport/transport.h" #include "src/core/telemetry/call_tracer.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" /// Creates a CHTTP2 Transport. This takes ownership of a \a resource_user ref /// from the caller; if the caller still needs the resource_user after creating diff --git a/src/core/ext/transport/chttp2/transport/flow_control.h b/src/core/ext/transport/chttp2/transport/flow_control.h index b15e8603c22..d3f1202a217 100644 --- a/src/core/ext/transport/chttp2/transport/flow_control.h +++ b/src/core/ext/transport/chttp2/transport/flow_control.h @@ -36,9 +36,9 @@ #include "src/core/ext/transport/chttp2/transport/http2_settings.h" #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/lib/transport/bdp_estimator.h" +#include "src/core/util/time.h" namespace grpc { namespace testing { diff --git a/src/core/ext/transport/chttp2/transport/frame.cc b/src/core/ext/transport/chttp2/transport/frame.cc index 92788903f15..65bb1660248 100644 --- a/src/core/ext/transport/chttp2/transport/frame.cc +++ b/src/core/ext/transport/chttp2/transport/frame.cc @@ -25,7 +25,7 @@ #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" namespace grpc_core { diff --git a/src/core/ext/transport/chttp2/transport/frame_data.cc b/src/core/ext/transport/chttp2/transport/frame_data.cc index 77739c30883..b20f1630add 100644 --- a/src/core/ext/transport/chttp2/transport/frame_data.cc +++ b/src/core/ext/transport/chttp2/transport/frame_data.cc @@ -29,10 +29,10 @@ #include "src/core/ext/transport/chttp2/transport/internal.h" #include "src/core/lib/experiments/experiments.h" -#include "src/core/lib/gprpp/status_helper.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/slice/slice_buffer.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/status_helper.h" absl::Status grpc_chttp2_data_parser_begin_frame(uint8_t flags, uint32_t stream_id, diff --git a/src/core/ext/transport/chttp2/transport/frame_rst_stream.cc b/src/core/ext/transport/chttp2/transport/frame_rst_stream.cc index 93e33a14a0f..14d91329eae 100644 --- a/src/core/ext/transport/chttp2/transport/frame_rst_stream.cc +++ b/src/core/ext/transport/chttp2/transport/frame_rst_stream.cc @@ -35,9 +35,9 @@ #include "src/core/ext/transport/chttp2/transport/ping_callbacks.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/experiments/experiments.h" -#include "src/core/lib/gprpp/status_helper.h" #include "src/core/lib/transport/http2_errors.h" #include "src/core/lib/transport/metadata_batch.h" +#include "src/core/util/status_helper.h" grpc_slice grpc_chttp2_rst_stream_create( uint32_t id, uint32_t code, grpc_core::CallTracerInterface* call_tracer) { diff --git a/src/core/ext/transport/chttp2/transport/frame_settings.cc b/src/core/ext/transport/chttp2/transport/frame_settings.cc index e0a12218cab..817097a57b2 100644 --- a/src/core/ext/transport/chttp2/transport/frame_settings.cc +++ b/src/core/ext/transport/chttp2/transport/frame_settings.cc @@ -36,9 +36,9 @@ #include "src/core/ext/transport/chttp2/transport/internal.h" #include "src/core/ext/transport/chttp2/transport/legacy_frame.h" #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/debug_location.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/slice/slice.h" +#include "src/core/util/debug_location.h" #include "src/core/util/useful.h" static uint8_t* fill_header(uint8_t* out, uint32_t length, uint8_t flags) { diff --git a/src/core/ext/transport/chttp2/transport/frame_settings.h b/src/core/ext/transport/chttp2/transport/frame_settings.h index ba653c6a11c..011862f5888 100644 --- a/src/core/ext/transport/chttp2/transport/frame_settings.h +++ b/src/core/ext/transport/chttp2/transport/frame_settings.h @@ -27,8 +27,8 @@ #include "src/core/ext/transport/chttp2/transport/http2_settings.h" #include "src/core/ext/transport/chttp2/transport/legacy_frame.h" -#include "src/core/lib/gprpp/manual_constructor.h" #include "src/core/lib/iomgr/error.h" +#include "src/core/util/manual_constructor.h" typedef enum { GRPC_CHTTP2_SPS_ID0, diff --git a/src/core/ext/transport/chttp2/transport/hpack_encoder.cc b/src/core/ext/transport/chttp2/transport/hpack_encoder.cc index 9fa6aa79645..5c573a0beb6 100644 --- a/src/core/ext/transport/chttp2/transport/hpack_encoder.cc +++ b/src/core/ext/transport/chttp2/transport/hpack_encoder.cc @@ -34,9 +34,9 @@ #include "src/core/ext/transport/chttp2/transport/legacy_frame.h" #include "src/core/ext/transport/chttp2/transport/varint.h" #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/surface/validate_metadata.h" #include "src/core/lib/transport/timeout_encoding.h" +#include "src/core/util/crash.h" namespace grpc_core { diff --git a/src/core/ext/transport/chttp2/transport/hpack_encoder.h b/src/core/ext/transport/chttp2/transport/hpack_encoder.h index cfbf2426ec9..1dab0871ff2 100644 --- a/src/core/ext/transport/chttp2/transport/hpack_encoder.h +++ b/src/core/ext/transport/chttp2/transport/hpack_encoder.h @@ -35,7 +35,6 @@ #include "src/core/ext/transport/chttp2/transport/hpack_constants.h" #include "src/core/ext/transport/chttp2/transport/hpack_encoder_table.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/slice/slice_buffer.h" #include "src/core/lib/transport/metadata_batch.h" @@ -43,6 +42,7 @@ #include "src/core/lib/transport/timeout_encoding.h" #include "src/core/lib/transport/transport.h" #include "src/core/telemetry/call_tracer.h" +#include "src/core/util/time.h" namespace grpc_core { diff --git a/src/core/ext/transport/chttp2/transport/hpack_parse_result.cc b/src/core/ext/transport/chttp2/transport/hpack_parse_result.cc index c8a93a6a0ee..aa4b69623ad 100644 --- a/src/core/ext/transport/chttp2/transport/hpack_parse_result.cc +++ b/src/core/ext/transport/chttp2/transport/hpack_parse_result.cc @@ -22,9 +22,9 @@ #include #include "src/core/ext/transport/chttp2/transport/hpack_constants.h" -#include "src/core/lib/gprpp/status_helper.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/slice/slice.h" +#include "src/core/util/status_helper.h" namespace grpc_core { diff --git a/src/core/ext/transport/chttp2/transport/hpack_parse_result.h b/src/core/ext/transport/chttp2/transport/hpack_parse_result.h index b810264a367..628b3327f5b 100644 --- a/src/core/ext/transport/chttp2/transport/hpack_parse_result.h +++ b/src/core/ext/transport/chttp2/transport/hpack_parse_result.h @@ -29,11 +29,11 @@ #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/surface/validate_metadata.h" #include "src/core/lib/transport/metadata_batch.h" +#include "src/core/util/crash.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_core { diff --git a/src/core/ext/transport/chttp2/transport/hpack_parser.cc b/src/core/ext/transport/chttp2/transport/hpack_parser.cc index 04c64dd5df9..fb2e9b301a9 100644 --- a/src/core/ext/transport/chttp2/transport/hpack_parser.cc +++ b/src/core/ext/transport/chttp2/transport/hpack_parser.cc @@ -45,7 +45,6 @@ #include "src/core/ext/transport/chttp2/transport/hpack_parse_result.h" #include "src/core/ext/transport/chttp2/transport/hpack_parser_table.h" #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/match.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/slice/slice_refcount.h" #include "src/core/lib/surface/validate_metadata.h" @@ -54,6 +53,7 @@ #include "src/core/telemetry/call_tracer.h" #include "src/core/telemetry/stats.h" #include "src/core/telemetry/stats_data.h" +#include "src/core/util/match.h" // IWYU pragma: no_include diff --git a/src/core/ext/transport/chttp2/transport/hpack_parser.h b/src/core/ext/transport/chttp2/transport/hpack_parser.h index 9df4487f31a..af2c1a9c7f0 100644 --- a/src/core/ext/transport/chttp2/transport/hpack_parser.h +++ b/src/core/ext/transport/chttp2/transport/hpack_parser.h @@ -39,12 +39,12 @@ #include "src/core/ext/transport/chttp2/transport/hpack_parse_result.h" #include "src/core/ext/transport/chttp2/transport/hpack_parser_table.h" #include "src/core/ext/transport/chttp2/transport/legacy_frame.h" -#include "src/core/lib/backoff/random_early_detection.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/slice/slice_refcount.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/telemetry/call_tracer.h" +#include "src/core/util/random_early_detection.h" // IWYU pragma: no_include diff --git a/src/core/ext/transport/chttp2/transport/hpack_parser_table.h b/src/core/ext/transport/chttp2/transport/hpack_parser_table.h index 06e0aeb7f42..2d790bb2e21 100644 --- a/src/core/ext/transport/chttp2/transport/hpack_parser_table.h +++ b/src/core/ext/transport/chttp2/transport/hpack_parser_table.h @@ -33,9 +33,9 @@ #include "src/core/ext/transport/chttp2/transport/hpack_constants.h" #include "src/core/ext/transport/chttp2/transport/hpack_parse_result.h" -#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/no_destruct.h" #include "src/core/util/unique_ptr_with_bitset.h" namespace grpc_core { diff --git a/src/core/ext/transport/chttp2/transport/internal.h b/src/core/ext/transport/chttp2/transport/internal.h index 64f398807ba..80e214ca1f2 100644 --- a/src/core/ext/transport/chttp2/transport/internal.h +++ b/src/core/ext/transport/chttp2/transport/internal.h @@ -58,11 +58,6 @@ #include "src/core/ext/transport/chttp2/transport/write_size_policy.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/bitset.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/combiner.h" #include "src/core/lib/iomgr/endpoint.h" @@ -78,6 +73,11 @@ #include "src/core/lib/transport/transport.h" #include "src/core/telemetry/call_tracer.h" #include "src/core/telemetry/tcp_tracer.h" +#include "src/core/util/bitset.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" // Flag that this closure barrier may be covering a write in a pollset, and so // we should not complete this closure until we can prove that the write got diff --git a/src/core/ext/transport/chttp2/transport/parsing.cc b/src/core/ext/transport/chttp2/transport/parsing.cc index d8c1680c3b2..cd102ff85df 100644 --- a/src/core/ext/transport/chttp2/transport/parsing.cc +++ b/src/core/ext/transport/chttp2/transport/parsing.cc @@ -56,11 +56,8 @@ #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/ping_rate_policy.h" -#include "src/core/lib/backoff/random_early_detection.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/experiments/experiments.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/status_helper.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/combiner.h" #include "src/core/lib/iomgr/endpoint.h" @@ -72,6 +69,9 @@ #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" #include "src/core/telemetry/call_tracer.h" +#include "src/core/util/random_early_detection.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/status_helper.h" using grpc_core::HPackParser; diff --git a/src/core/ext/transport/chttp2/transport/ping_abuse_policy.h b/src/core/ext/transport/chttp2/transport/ping_abuse_policy.h index 3d834a8665e..bff04089822 100644 --- a/src/core/ext/transport/chttp2/transport/ping_abuse_policy.h +++ b/src/core/ext/transport/chttp2/transport/ping_abuse_policy.h @@ -20,7 +20,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" namespace grpc_core { diff --git a/src/core/ext/transport/chttp2/transport/ping_callbacks.h b/src/core/ext/transport/chttp2/transport/ping_callbacks.h index 6bbe07e0c8f..1e558eda836 100644 --- a/src/core/ext/transport/chttp2/transport/ping_callbacks.h +++ b/src/core/ext/transport/chttp2/transport/ping_callbacks.h @@ -31,7 +31,7 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" namespace grpc_core { diff --git a/src/core/ext/transport/chttp2/transport/ping_rate_policy.cc b/src/core/ext/transport/chttp2/transport/ping_rate_policy.cc index 143b08a67c7..6f329735306 100644 --- a/src/core/ext/transport/chttp2/transport/ping_rate_policy.cc +++ b/src/core/ext/transport/chttp2/transport/ping_rate_policy.cc @@ -24,7 +24,7 @@ #include #include "src/core/lib/experiments/experiments.h" -#include "src/core/lib/gprpp/match.h" +#include "src/core/util/match.h" // How many pings do we allow to be inflight at any given time? // In older versions of gRPC this was implicitly 1. diff --git a/src/core/ext/transport/chttp2/transport/ping_rate_policy.h b/src/core/ext/transport/chttp2/transport/ping_rate_policy.h index 6dab7a361bc..df16b3813bc 100644 --- a/src/core/ext/transport/chttp2/transport/ping_rate_policy.h +++ b/src/core/ext/transport/chttp2/transport/ping_rate_policy.h @@ -25,7 +25,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" namespace grpc_core { diff --git a/src/core/ext/transport/chttp2/transport/stream_lists.cc b/src/core/ext/transport/chttp2/transport/stream_lists.cc index f2ac00e957a..f4ee3e58eb8 100644 --- a/src/core/ext/transport/chttp2/transport/stream_lists.cc +++ b/src/core/ext/transport/chttp2/transport/stream_lists.cc @@ -24,7 +24,7 @@ #include "src/core/ext/transport/chttp2/transport/internal.h" #include "src/core/ext/transport/chttp2/transport/legacy_frame.h" #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/bitset.h" +#include "src/core/util/bitset.h" static const char* stream_list_id_string(grpc_chttp2_stream_list_id id) { switch (id) { diff --git a/src/core/ext/transport/chttp2/transport/write_size_policy.h b/src/core/ext/transport/chttp2/transport/write_size_policy.h index a1eae8fec9e..fdeeda0763a 100644 --- a/src/core/ext/transport/chttp2/transport/write_size_policy.h +++ b/src/core/ext/transport/chttp2/transport/write_size_policy.h @@ -20,7 +20,7 @@ #include -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" namespace grpc_core { diff --git a/src/core/ext/transport/chttp2/transport/writing.cc b/src/core/ext/transport/chttp2/transport/writing.cc index 29c3b67e82a..13797c1f1b5 100644 --- a/src/core/ext/transport/chttp2/transport/writing.cc +++ b/src/core/ext/transport/chttp2/transport/writing.cc @@ -54,10 +54,6 @@ #include "src/core/ext/transport/chttp2/transport/write_size_policy.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/experiments/experiments.h" -#include "src/core/lib/gprpp/match.h" -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.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/exec_ctx.h" @@ -70,9 +66,13 @@ #include "src/core/telemetry/call_tracer.h" #include "src/core/telemetry/stats.h" #include "src/core/telemetry/stats_data.h" +#include "src/core/util/match.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" #include "src/core/util/useful.h" -// IWYU pragma: no_include "src/core/lib/gprpp/orphanable.h" +// IWYU pragma: no_include "src/core/util/orphanable.h" static void add_to_write_list(grpc_chttp2_write_cb** list, grpc_chttp2_write_cb* cb) { diff --git a/src/core/ext/transport/cronet/client/secure/cronet_channel_create.cc b/src/core/ext/transport/cronet/client/secure/cronet_channel_create.cc index d78069c312c..a7c59b26d94 100644 --- a/src/core/ext/transport/cronet/client/secure/cronet_channel_create.cc +++ b/src/core/ext/transport/cronet/client/secure/cronet_channel_create.cc @@ -28,12 +28,12 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_args_preconditioning.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/iomgr/exec_ctx.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" #include "src/core/lib/transport/transport.h" +#include "src/core/util/ref_counted_ptr.h" GRPCAPI grpc_channel* grpc_cronet_secure_channel_create( void* engine, const char* target, const grpc_channel_args* args, diff --git a/src/core/ext/transport/cronet/transport/cronet_transport.cc b/src/core/ext/transport/cronet/transport/cronet_transport.cc index 26b09382285..4d47895f9bb 100644 --- a/src/core/ext/transport/cronet/transport/cronet_transport.cc +++ b/src/core/ext/transport/cronet/transport/cronet_transport.cc @@ -47,9 +47,6 @@ #include "src/core/ext/transport/chttp2/transport/bin_encoder.h" #include "src/core/ext/transport/cronet/transport/cronet_status.h" #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/status_helper.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/error.h" @@ -61,6 +58,9 @@ #include "src/core/lib/surface/validate_metadata.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/crash.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/status_helper.h" // IWYU pragma: no_include diff --git a/src/core/ext/transport/inproc/inproc_transport.cc b/src/core/ext/transport/inproc/inproc_transport.cc index a967b4c0d9b..a656d8b7fde 100644 --- a/src/core/ext/transport/inproc/inproc_transport.cc +++ b/src/core/ext/transport/inproc/inproc_transport.cc @@ -28,8 +28,6 @@ #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" @@ -37,6 +35,8 @@ #include "src/core/lib/transport/metadata.h" #include "src/core/lib/transport/transport.h" #include "src/core/server/server.h" +#include "src/core/util/crash.h" +#include "src/core/util/debug_location.h" namespace grpc_core { diff --git a/src/core/ext/transport/inproc/legacy_inproc_transport.cc b/src/core/ext/transport/inproc/legacy_inproc_transport.cc index ae2441db5d4..b93fc97a160 100644 --- a/src/core/ext/transport/inproc/legacy_inproc_transport.cc +++ b/src/core/ext/transport/inproc/legacy_inproc_transport.cc @@ -47,10 +47,6 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_args_preconditioning.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/status_helper.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/error.h" @@ -66,6 +62,10 @@ #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" #include "src/core/server/server.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/time.h" namespace { struct inproc_stream; diff --git a/src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc b/src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc index 153eddbeecc..151f4e8c9d4 100644 --- a/src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc +++ b/src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc @@ -28,11 +28,11 @@ #include "src/core/handshaker/handshaker_factory.h" #include "src/core/handshaker/handshaker_registry.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/exec_ctx.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_core { diff --git a/src/core/handshaker/handshaker.cc b/src/core/handshaker/handshaker.cc index 3949dccbe59..b476e550f75 100644 --- a/src/core/handshaker/handshaker.cc +++ b/src/core/handshaker/handshaker.cc @@ -38,13 +38,12 @@ #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" +#include "src/core/util/debug_location.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/time.h" using ::grpc_event_engine::experimental::EventEngine; diff --git a/src/core/handshaker/handshaker.h b/src/core/handshaker/handshaker.h index 04beed4a966..12ea2b4b8bf 100644 --- a/src/core/handshaker/handshaker.h +++ b/src/core/handshaker/handshaker.h @@ -31,16 +31,16 @@ #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" -#include "src/core/lib/gprpp/time.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/tcp_server.h" #include "src/core/lib/slice/slice_buffer.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.h" namespace grpc_core { diff --git a/src/core/handshaker/http_connect/http_connect_handshaker.cc b/src/core/handshaker/http_connect/http_connect_handshaker.cc index 2954860fe5e..3ec778ed4b1 100644 --- a/src/core/handshaker/http_connect/http_connect_handshaker.cc +++ b/src/core/handshaker/http_connect/http_connect_handshaker.cc @@ -42,9 +42,6 @@ #include "src/core/handshaker/handshaker_registry.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/debug_location.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" @@ -55,7 +52,9 @@ #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/ref_counted_ptr.h" #include "src/core/util/string.h" +#include "src/core/util/sync.h" namespace grpc_core { diff --git a/src/core/handshaker/http_connect/http_proxy_mapper.cc b/src/core/handshaker/http_connect/http_proxy_mapper.cc index 93c8e2fe8eb..f22e6d67423 100644 --- a/src/core/handshaker/http_connect/http_proxy_mapper.cc +++ b/src/core/handshaker/http_connect/http_proxy_mapper.cc @@ -47,12 +47,12 @@ #include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/env.h" -#include "src/core/lib/gprpp/host_port.h" -#include "src/core/lib/gprpp/memory.h" #include "src/core/lib/iomgr/resolve_address.h" -#include "src/core/lib/uri/uri_parser.h" +#include "src/core/util/env.h" +#include "src/core/util/host_port.h" +#include "src/core/util/memory.h" #include "src/core/util/string.h" +#include "src/core/util/uri.h" namespace grpc_core { namespace { diff --git a/src/core/handshaker/security/secure_endpoint.cc b/src/core/handshaker/security/secure_endpoint.cc index cf720f19d21..c57b56b4d26 100644 --- a/src/core/handshaker/security/secure_endpoint.cc +++ b/src/core/handshaker/security/secure_endpoint.cc @@ -42,10 +42,6 @@ #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" @@ -58,7 +54,11 @@ #include "src/core/lib/slice/slice_string_helpers.h" #include "src/core/tsi/transport_security_grpc.h" #include "src/core/tsi/transport_security_interface.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" #include "src/core/util/string.h" +#include "src/core/util/sync.h" #define STAGING_BUFFER_SIZE 8192 diff --git a/src/core/handshaker/security/secure_endpoint.h b/src/core/handshaker/security/secure_endpoint.h index 43add1a816b..0d81fec090b 100644 --- a/src/core/handshaker/security/secure_endpoint.h +++ b/src/core/handshaker/security/secure_endpoint.h @@ -26,8 +26,8 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/orphanable.h" #include "src/core/lib/iomgr/endpoint.h" +#include "src/core/util/orphanable.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 diff --git a/src/core/handshaker/security/security_handshaker.cc b/src/core/handshaker/security/security_handshaker.cc index e54735e53a6..65fec6243a7 100644 --- a/src/core/handshaker/security/security_handshaker.cc +++ b/src/core/handshaker/security/security_handshaker.cc @@ -50,10 +50,6 @@ #include "src/core/handshaker/security/secure_endpoint.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/unique_type_name.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/error.h" @@ -66,6 +62,10 @@ #include "src/core/telemetry/stats.h" #include "src/core/telemetry/stats_data.h" #include "src/core/tsi/transport_security_grpc.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" +#include "src/core/util/unique_type_name.h" #define GRPC_INITIAL_HANDSHAKE_BUFFER_SIZE 256 diff --git a/src/core/handshaker/security/security_handshaker.h b/src/core/handshaker/security/security_handshaker.h index 9aa3bcfabc0..3e6096d6c47 100644 --- a/src/core/handshaker/security/security_handshaker.h +++ b/src/core/handshaker/security/security_handshaker.h @@ -27,9 +27,9 @@ #include "src/core/handshaker/handshaker.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/security/security_connector/security_connector.h" #include "src/core/tsi/transport_security_interface.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_core { diff --git a/src/core/handshaker/tcp_connect/tcp_connect_handshaker.cc b/src/core/handshaker/tcp_connect/tcp_connect_handshaker.cc index 77ae19ef7db..a02ccfa8cc3 100644 --- a/src/core/handshaker/tcp_connect/tcp_connect_handshaker.cc +++ b/src/core/handshaker/tcp_connect/tcp_connect_handshaker.cc @@ -40,9 +40,6 @@ #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/gprpp/debug_location.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" @@ -53,7 +50,10 @@ #include "src/core/lib/iomgr/resolved_address.h" #include "src/core/lib/iomgr/tcp_client.h" #include "src/core/lib/iomgr/tcp_server.h" -#include "src/core/lib/uri/uri_parser.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" +#include "src/core/util/uri.h" namespace grpc_core { diff --git a/src/core/lib/address_utils/parse_address.cc b/src/core/lib/address_utils/parse_address.cc index ee94d002d5f..ce75321ce31 100644 --- a/src/core/lib/address_utils/parse_address.cc +++ b/src/core/lib/address_utils/parse_address.cc @@ -47,11 +47,11 @@ #include "absl/strings/str_cat.h" #include "absl/strings/strip.h" -#include "src/core/lib/gprpp/host_port.h" -#include "src/core/lib/gprpp/status_helper.h" -#include "src/core/lib/iomgr/grpc_if_nametoindex.h" #include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/iomgr/socket_utils.h" +#include "src/core/util/grpc_if_nametoindex.h" +#include "src/core/util/host_port.h" +#include "src/core/util/status_helper.h" #include "src/core/util/string.h" // IWYU pragma: no_include diff --git a/src/core/lib/address_utils/parse_address.h b/src/core/lib/address_utils/parse_address.h index b3093f1fd88..c11789885ab 100644 --- a/src/core/lib/address_utils/parse_address.h +++ b/src/core/lib/address_utils/parse_address.h @@ -28,7 +28,7 @@ #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/resolved_address.h" -#include "src/core/lib/uri/uri_parser.h" +#include "src/core/util/uri.h" /// Populate \a resolved_addr from \a uri, whose path is expected to contain a /// unix socket path. Returns true upon success. diff --git a/src/core/lib/address_utils/sockaddr_utils.cc b/src/core/lib/address_utils/sockaddr_utils.cc index a12eb907899..41564ba5242 100644 --- a/src/core/lib/address_utils/sockaddr_utils.cc +++ b/src/core/lib/address_utils/sockaddr_utils.cc @@ -37,12 +37,12 @@ #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/host_port.h" #include "src/core/lib/iomgr/port.h" #include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/iomgr/socket_utils.h" -#include "src/core/lib/uri/uri_parser.h" +#include "src/core/util/crash.h" +#include "src/core/util/host_port.h" +#include "src/core/util/uri.h" #ifdef GRPC_HAVE_UNIX_SOCKET #ifdef GPR_WINDOWS diff --git a/src/core/lib/channel/channel_args.h b/src/core/lib/channel/channel_args.h index 301c0c287c5..9274c453988 100644 --- a/src/core/lib/channel/channel_args.h +++ b/src/core/lib/channel/channel_args.h @@ -37,14 +37,14 @@ #include #include -#include "src/core/lib/avl/avl.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/dual_ref_counted.h" -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/ref_counted_string.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/surface/channel_stack_type.h" +#include "src/core/util/avl.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/dual_ref_counted.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/ref_counted_string.h" +#include "src/core/util/time.h" #include "src/core/util/useful.h" // TODO(hork): When we're ready to allow setting via a channel arg from the diff --git a/src/core/lib/channel/channel_stack.h b/src/core/lib/channel/channel_stack.h index 451cba6be90..8ed7b4eafe1 100644 --- a/src/core/lib/channel/channel_stack.h +++ b/src/core/lib/channel/channel_stack.h @@ -59,10 +59,6 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/debug/trace.h" -#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" @@ -72,7 +68,11 @@ #include "src/core/lib/transport/call_final_info.h" #include "src/core/lib/transport/transport.h" #include "src/core/telemetry/metrics.h" +#include "src/core/util/manual_constructor.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" #include "src/core/util/time_precise.h" +#include "src/core/util/unique_type_name.h" struct grpc_channel_element_args { grpc_channel_stack* channel_stack; diff --git a/src/core/lib/channel/channel_stack_builder.h b/src/core/lib/channel/channel_stack_builder.h index 82a0592bc4f..6b3155fcbdb 100644 --- a/src/core/lib/channel/channel_stack_builder.h +++ b/src/core/lib/channel/channel_stack_builder.h @@ -25,8 +25,8 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_fwd.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/surface/channel_stack_type.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_core { diff --git a/src/core/lib/channel/channel_stack_builder_impl.cc b/src/core/lib/channel/channel_stack_builder_impl.cc index a5d93d81edc..953a60a9232 100644 --- a/src/core/lib/channel/channel_stack_builder_impl.cc +++ b/src/core/lib/channel/channel_stack_builder_impl.cc @@ -38,8 +38,6 @@ #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/no_destruct.h" -#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/promise/activity.h" @@ -49,6 +47,8 @@ #include "src/core/lib/transport/error_utils.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/no_destruct.h" +#include "src/core/util/sync.h" namespace grpc_core { diff --git a/src/core/lib/channel/channel_stack_builder_impl.h b/src/core/lib/channel/channel_stack_builder_impl.h index a76e322b71b..3bce0f5db3f 100644 --- a/src/core/lib/channel/channel_stack_builder_impl.h +++ b/src/core/lib/channel/channel_stack_builder_impl.h @@ -21,7 +21,7 @@ #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_stack_builder.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_core { diff --git a/src/core/lib/channel/connected_channel.cc b/src/core/lib/channel/connected_channel.cc index 9977ecdabfe..f65f5f74f29 100644 --- a/src/core/lib/channel/connected_channel.cc +++ b/src/core/lib/channel/connected_channel.cc @@ -43,10 +43,6 @@ #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/experiments/experiments.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/time.h" #include "src/core/lib/iomgr/call_combiner.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" @@ -76,6 +72,10 @@ #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" #include "src/core/util/alloc.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" typedef struct connected_channel_channel_data { grpc_core::Transport* transport; diff --git a/src/core/lib/channel/promise_based_filter.cc b/src/core/lib/channel/promise_based_filter.cc index 5f0879dda27..bf5dadfc804 100644 --- a/src/core/lib/channel/promise_based_filter.cc +++ b/src/core/lib/channel/promise_based_filter.cc @@ -34,12 +34,12 @@ #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/manual_constructor.h" -#include "src/core/lib/gprpp/status_helper.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/promise/seq.h" #include "src/core/lib/slice/slice.h" +#include "src/core/util/crash.h" +#include "src/core/util/manual_constructor.h" +#include "src/core/util/status_helper.h" namespace grpc_core { namespace promise_filter_detail { diff --git a/src/core/lib/channel/promise_based_filter.h b/src/core/lib/channel/promise_based_filter.h index 3c9c64dbaa8..0ac59932e0f 100644 --- a/src/core/lib/channel/promise_based_filter.h +++ b/src/core/lib/channel/promise_based_filter.h @@ -48,9 +48,6 @@ #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/event_engine/event_engine_context.h" // IWYU pragma: keep -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/match.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/call_combiner.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" @@ -72,6 +69,9 @@ #include "src/core/lib/transport/error_utils.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/match.h" +#include "src/core/util/time.h" namespace grpc_core { diff --git a/src/core/lib/compression/compression_internal.cc b/src/core/lib/compression/compression_internal.cc index c643b1cd817..3bb8a7f2882 100644 --- a/src/core/lib/compression/compression_internal.cc +++ b/src/core/lib/compression/compression_internal.cc @@ -33,9 +33,9 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/ref_counted_string.h" +#include "src/core/util/crash.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/ref_counted_string.h" namespace grpc_core { diff --git a/src/core/lib/compression/compression_internal.h b/src/core/lib/compression/compression_internal.h index 80434e6f59b..45a24faa998 100644 --- a/src/core/lib/compression/compression_internal.h +++ b/src/core/lib/compression/compression_internal.h @@ -30,8 +30,8 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/bitset.h" #include "src/core/lib/slice/slice.h" +#include "src/core/util/bitset.h" namespace grpc_core { diff --git a/src/core/lib/config/load_config.cc b/src/core/lib/config/load_config.cc index 1e9c3170a74..3d52fc4db03 100644 --- a/src/core/lib/config/load_config.cc +++ b/src/core/lib/config/load_config.cc @@ -24,7 +24,7 @@ #include -#include "src/core/lib/gprpp/env.h" +#include "src/core/util/env.h" namespace grpc_core { diff --git a/src/core/lib/debug/trace.cc b/src/core/lib/debug/trace.cc index 642976a0e6b..920c5d491c9 100644 --- a/src/core/lib/debug/trace.cc +++ b/src/core/lib/debug/trace.cc @@ -33,7 +33,7 @@ #include #include "src/core/lib/config/config_vars.h" -#include "src/core/lib/gprpp/glob.h" +#include "src/core/util/glob.h" int grpc_tracer_set_enabled(const char* name, int enabled); diff --git a/src/core/lib/debug/trace_flags.cc b/src/core/lib/debug/trace_flags.cc index 85b5f6f9ee2..03bfe06312c 100644 --- a/src/core/lib/debug/trace_flags.cc +++ b/src/core/lib/debug/trace_flags.cc @@ -19,7 +19,7 @@ #include "absl/container/flat_hash_map.h" #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/no_destruct.h" +#include "src/core/util/no_destruct.h" namespace grpc_core { diff --git a/src/core/lib/event_engine/ares_resolver.cc b/src/core/lib/event_engine/ares_resolver.cc index 3fca4efad49..f1faf409241 100644 --- a/src/core/lib/event_engine/ares_resolver.cc +++ b/src/core/lib/event_engine/ares_resolver.cc @@ -68,12 +68,12 @@ #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" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/host_port.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/iomgr/resolved_address.h" #include "src/core/lib/iomgr/sockaddr.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/host_port.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" #ifdef GRPC_POSIX_SOCKET_ARES_EV_DRIVER #include "src/core/lib/event_engine/posix_engine/tcp_socket_utils.h" #endif diff --git a/src/core/lib/event_engine/ares_resolver.h b/src/core/lib/event_engine/ares_resolver.h index c36cf49f767..331e533b35f 100644 --- a/src/core/lib/event_engine/ares_resolver.h +++ b/src/core/lib/event_engine/ares_resolver.h @@ -40,8 +40,8 @@ #include "src/core/lib/event_engine/grpc_polled_fd.h" #include "src/core/lib/event_engine/ref_counted_dns_resolver_interface.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/sync.h" namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/event_engine/cf_engine/cf_engine.cc b/src/core/lib/event_engine/cf_engine/cf_engine.cc index ffd936cd510..cc80e9977b6 100644 --- a/src/core/lib/event_engine/cf_engine/cf_engine.cc +++ b/src/core/lib/event_engine/cf_engine/cf_engine.cc @@ -32,7 +32,7 @@ #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/utils.h" -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/event_engine/cf_engine/cf_engine.h b/src/core/lib/event_engine/cf_engine/cf_engine.h index adba2e84e62..6529e649117 100644 --- a/src/core/lib/event_engine/cf_engine/cf_engine.h +++ b/src/core/lib/event_engine/cf_engine/cf_engine.h @@ -26,8 +26,8 @@ #include "src/core/lib/event_engine/posix_engine/lockfree_event.h" #include "src/core/lib/event_engine/posix_engine/posix_engine_closure.h" #include "src/core/lib/event_engine/posix_engine/timer_manager.h" -#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/surface/init_internally.h" +#include "src/core/util/sync.h" namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/event_engine/cf_engine/cfstream_endpoint.cc b/src/core/lib/event_engine/cf_engine/cfstream_endpoint.cc index 4721437860b..7a5f15b4208 100644 --- a/src/core/lib/event_engine/cf_engine/cfstream_endpoint.cc +++ b/src/core/lib/event_engine/cf_engine/cfstream_endpoint.cc @@ -23,7 +23,7 @@ #include "absl/strings/str_format.h" #include "src/core/lib/event_engine/cf_engine/cfstream_endpoint.h" -#include "src/core/lib/gprpp/strerror.h" +#include "src/core/util/strerror.h" namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/event_engine/cf_engine/cfstream_endpoint.h b/src/core/lib/event_engine/cf_engine/cfstream_endpoint.h index a8bb3dae273..8623dc888f0 100644 --- a/src/core/lib/event_engine/cf_engine/cfstream_endpoint.h +++ b/src/core/lib/event_engine/cf_engine/cfstream_endpoint.h @@ -30,9 +30,9 @@ #include "src/core/lib/event_engine/cf_engine/cftype_unique_ref.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/gprpp/host_port.h" -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" +#include "src/core/util/host_port.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/event_engine/cf_engine/dns_service_resolver.cc b/src/core/lib/event_engine/cf_engine/dns_service_resolver.cc index adf52ecc2f3..a4fd9758ae5 100644 --- a/src/core/lib/event_engine/cf_engine/dns_service_resolver.cc +++ b/src/core/lib/event_engine/cf_engine/dns_service_resolver.cc @@ -26,7 +26,7 @@ #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/gprpp/host_port.h" +#include "src/core/util/host_port.h" namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/event_engine/cf_engine/dns_service_resolver.h b/src/core/lib/event_engine/cf_engine/dns_service_resolver.h index cff4f9cc266..e9c464029b3 100644 --- a/src/core/lib/event_engine/cf_engine/dns_service_resolver.h +++ b/src/core/lib/event_engine/cf_engine/dns_service_resolver.h @@ -28,8 +28,8 @@ #include #include "src/core/lib/event_engine/cf_engine/cf_engine.h" -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/event_engine/default_event_engine.cc b/src/core/lib/event_engine/default_event_engine.cc index 45520f581ed..24282e7921b 100644 --- a/src/core/lib/event_engine/default_event_engine.cc +++ b/src/core/lib/event_engine/default_event_engine.cc @@ -26,9 +26,9 @@ #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/gprpp/debug_location.h" -#include "src/core/lib/gprpp/no_destruct.h" -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/no_destruct.h" +#include "src/core/util/sync.h" #ifdef GRPC_MAXIMIZE_THREADYNESS #include "src/core/lib/event_engine/thready_event_engine/thready_event_engine.h" // IWYU pragma: keep diff --git a/src/core/lib/event_engine/default_event_engine.h b/src/core/lib/event_engine/default_event_engine.h index d1944fa56f0..2f7c982ab4c 100644 --- a/src/core/lib/event_engine/default_event_engine.h +++ b/src/core/lib/event_engine/default_event_engine.h @@ -21,7 +21,7 @@ #include #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/debug_location.h" +#include "src/core/util/debug_location.h" namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/event_engine/grpc_polled_fd.h b/src/core/lib/event_engine/grpc_polled_fd.h index ea9c6eda138..d1e6dc3b20c 100644 --- a/src/core/lib/event_engine/grpc_polled_fd.h +++ b/src/core/lib/event_engine/grpc_polled_fd.h @@ -27,7 +27,7 @@ #include "absl/functional/any_invocable.h" #include "absl/status/status.h" -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/sync.h" namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/event_engine/posix_engine/ev_epoll1_linux.cc b/src/core/lib/event_engine/posix_engine/ev_epoll1_linux.cc index 402822e27ed..f59c6616bd9 100644 --- a/src/core/lib/event_engine/posix_engine/ev_epoll1_linux.cc +++ b/src/core/lib/event_engine/posix_engine/ev_epoll1_linux.cc @@ -31,8 +31,8 @@ #include "src/core/lib/event_engine/poller.h" #include "src/core/lib/event_engine/time_util.h" -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/iomgr/port.h" +#include "src/core/util/crash.h" // This polling engine is only relevant on linux kernels supporting epoll // epoll_create() or epoll_create1() @@ -48,10 +48,10 @@ #include "src/core/lib/event_engine/posix_engine/posix_engine_closure.h" #include "src/core/lib/event_engine/posix_engine/wakeup_fd_posix.h" #include "src/core/lib/event_engine/posix_engine/wakeup_fd_posix_default.h" -#include "src/core/lib/gprpp/fork.h" -#include "src/core/lib/gprpp/status_helper.h" -#include "src/core/lib/gprpp/strerror.h" -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/fork.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/strerror.h" +#include "src/core/util/sync.h" #define MAX_EPOLL_EVENTS_HANDLED_PER_ITERATION 1 diff --git a/src/core/lib/event_engine/posix_engine/ev_epoll1_linux.h b/src/core/lib/event_engine/posix_engine/ev_epoll1_linux.h index ed6b480bdeb..42c61446659 100644 --- a/src/core/lib/event_engine/posix_engine/ev_epoll1_linux.h +++ b/src/core/lib/event_engine/posix_engine/ev_epoll1_linux.h @@ -30,8 +30,8 @@ #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/wakeup_fd_posix.h" -#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/iomgr/port.h" +#include "src/core/util/sync.h" #ifdef GRPC_LINUX_EPOLL #include diff --git a/src/core/lib/event_engine/posix_engine/ev_poll_posix.cc b/src/core/lib/event_engine/posix_engine/ev_poll_posix.cc index e573be30642..c62c9e1a8e2 100644 --- a/src/core/lib/event_engine/posix_engine/ev_poll_posix.cc +++ b/src/core/lib/event_engine/posix_engine/ev_poll_posix.cc @@ -37,8 +37,8 @@ #include "src/core/lib/event_engine/poller.h" #include "src/core/lib/event_engine/posix_engine/event_poller.h" #include "src/core/lib/event_engine/posix_engine/posix_engine_closure.h" -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/iomgr/port.h" +#include "src/core/util/crash.h" #ifdef GRPC_POSIX_SOCKET_EV_POLL @@ -54,11 +54,11 @@ #include "src/core/lib/event_engine/posix_engine/wakeup_fd_posix.h" #include "src/core/lib/event_engine/posix_engine/wakeup_fd_posix_default.h" #include "src/core/lib/event_engine/time_util.h" -#include "src/core/lib/gprpp/fork.h" -#include "src/core/lib/gprpp/status_helper.h" -#include "src/core/lib/gprpp/strerror.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/fork.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/strerror.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.h" static const intptr_t kClosureNotReady = 0; static const intptr_t kClosureReady = 1; @@ -852,7 +852,7 @@ std::shared_ptr MakePollPoller(Scheduler* scheduler, #else // GRPC_POSIX_SOCKET_EV_POLL -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/event_engine/posix_engine/ev_poll_posix.h b/src/core/lib/event_engine/posix_engine/ev_poll_posix.h index d10044e8e42..d3e139eb0c8 100644 --- a/src/core/lib/event_engine/posix_engine/ev_poll_posix.h +++ b/src/core/lib/event_engine/posix_engine/ev_poll_posix.h @@ -28,7 +28,7 @@ #include "src/core/lib/event_engine/poller.h" #include "src/core/lib/event_engine/posix_engine/event_poller.h" #include "src/core/lib/event_engine/posix_engine/wakeup_fd_posix.h" -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/sync.h" namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/event_engine/posix_engine/event_poller_posix_default.cc b/src/core/lib/event_engine/posix_engine/event_poller_posix_default.cc index 7cad58fe92e..7f11bbb05a0 100644 --- a/src/core/lib/event_engine/posix_engine/event_poller_posix_default.cc +++ b/src/core/lib/event_engine/posix_engine/event_poller_posix_default.cc @@ -25,8 +25,8 @@ #include "src/core/lib/event_engine/posix_engine/ev_epoll1_linux.h" #include "src/core/lib/event_engine/posix_engine/ev_poll_posix.h" #include "src/core/lib/event_engine/posix_engine/event_poller.h" -#include "src/core/lib/gprpp/no_destruct.h" #include "src/core/lib/iomgr/port.h" +#include "src/core/util/no_destruct.h" namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/event_engine/posix_engine/grpc_polled_fd_posix.h b/src/core/lib/event_engine/posix_engine/grpc_polled_fd_posix.h index d1d17f8c809..7c9f8a5f742 100644 --- a/src/core/lib/event_engine/posix_engine/grpc_polled_fd_posix.h +++ b/src/core/lib/event_engine/posix_engine/grpc_polled_fd_posix.h @@ -20,8 +20,8 @@ #include #include -#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/iomgr/port.h" +#include "src/core/util/sync.h" #if GRPC_ARES == 1 && defined(GRPC_POSIX_SOCKET_ARES_EV_DRIVER) diff --git a/src/core/lib/event_engine/posix_engine/internal_errqueue.cc b/src/core/lib/event_engine/posix_engine/internal_errqueue.cc index 2c1cc84e778..dd4d3711f9d 100644 --- a/src/core/lib/event_engine/posix_engine/internal_errqueue.cc +++ b/src/core/lib/event_engine/posix_engine/internal_errqueue.cc @@ -30,7 +30,7 @@ #include -#include "src/core/lib/gprpp/strerror.h" +#include "src/core/util/strerror.h" namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/event_engine/posix_engine/lockfree_event.cc b/src/core/lib/event_engine/posix_engine/lockfree_event.cc index dc7900646a0..e0cb157b922 100644 --- a/src/core/lib/event_engine/posix_engine/lockfree_event.cc +++ b/src/core/lib/event_engine/posix_engine/lockfree_event.cc @@ -24,8 +24,8 @@ #include "src/core/lib/event_engine/posix_engine/event_poller.h" #include "src/core/lib/event_engine/posix_engine/posix_engine_closure.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/status_helper.h" +#include "src/core/util/crash.h" +#include "src/core/util/status_helper.h" // 'state' holds the to call when the fd is readable or writable respectively. // It can contain one of the following values: diff --git a/src/core/lib/event_engine/posix_engine/native_posix_dns_resolver.cc b/src/core/lib/event_engine/posix_engine/native_posix_dns_resolver.cc index 8cde00153a1..7d4c7a0ac7b 100644 --- a/src/core/lib/event_engine/posix_engine/native_posix_dns_resolver.cc +++ b/src/core/lib/event_engine/posix_engine/native_posix_dns_resolver.cc @@ -34,7 +34,7 @@ #include "absl/strings/str_format.h" #include "src/core/lib/event_engine/posix_engine/native_posix_dns_resolver.h" -#include "src/core/lib/gprpp/host_port.h" +#include "src/core/util/host_port.h" #include "src/core/util/useful.h" namespace grpc_event_engine { diff --git a/src/core/lib/event_engine/posix_engine/posix_endpoint.cc b/src/core/lib/event_engine/posix_engine/posix_endpoint.cc index c5708db02c5..c603f940359 100644 --- a/src/core/lib/event_engine/posix_engine/posix_endpoint.cc +++ b/src/core/lib/event_engine/posix_engine/posix_endpoint.cc @@ -45,16 +45,16 @@ #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/experiments/experiments.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/load_file.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/status_helper.h" -#include "src/core/lib/gprpp/strerror.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/resource_quota/resource_quota.h" #include "src/core/lib/slice/slice.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/load_file.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/strerror.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.h" #ifdef GRPC_POSIX_SOCKET_TCP #ifdef GRPC_LINUX_ERRQUEUE diff --git a/src/core/lib/event_engine/posix_engine/posix_endpoint.h b/src/core/lib/event_engine/posix_engine/posix_endpoint.h index 80964556b0c..81ec03c7f0f 100644 --- a/src/core/lib/event_engine/posix_engine/posix_endpoint.h +++ b/src/core/lib/event_engine/posix_engine/posix_endpoint.h @@ -45,11 +45,11 @@ #include "src/core/lib/event_engine/posix_engine/posix_engine_closure.h" #include "src/core/lib/event_engine/posix_engine/tcp_socket_utils.h" #include "src/core/lib/event_engine/posix_engine/traced_buffer_list.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/iomgr/port.h" #include "src/core/lib/resource_quota/memory_quota.h" +#include "src/core/util/crash.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/sync.h" #ifdef GRPC_POSIX_SOCKET_TCP diff --git a/src/core/lib/event_engine/posix_engine/posix_engine.cc b/src/core/lib/event_engine/posix_engine/posix_engine.cc index 7dfc2535623..d0683677795 100644 --- a/src/core/lib/event_engine/posix_engine/posix_engine.cc +++ b/src/core/lib/event_engine/posix_engine/posix_engine.cc @@ -49,9 +49,9 @@ #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/utils.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/no_destruct.h" -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/crash.h" +#include "src/core/util/no_destruct.h" +#include "src/core/util/sync.h" #include "src/core/util/useful.h" #ifdef GRPC_POSIX_SOCKET_TCP diff --git a/src/core/lib/event_engine/posix_engine/posix_engine.h b/src/core/lib/event_engine/posix_engine/posix_engine.h index ea426c379c9..f2483d11653 100644 --- a/src/core/lib/event_engine/posix_engine/posix_engine.h +++ b/src/core/lib/event_engine/posix_engine/posix_engine.h @@ -39,10 +39,10 @@ #include "src/core/lib/event_engine/posix_engine/timer_manager.h" #include "src/core/lib/event_engine/ref_counted_dns_resolver_interface.h" #include "src/core/lib/event_engine/thread_pool/thread_pool.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/iomgr/port.h" #include "src/core/lib/surface/init_internally.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/sync.h" #ifdef GRPC_POSIX_SOCKET_TCP #include "src/core/lib/event_engine/posix_engine/posix_engine_closure.h" diff --git a/src/core/lib/event_engine/posix_engine/posix_engine_listener.cc b/src/core/lib/event_engine/posix_engine/posix_engine_listener.cc index fcc98fe4c8f..d8b40ab2f71 100644 --- a/src/core/lib/event_engine/posix_engine/posix_engine_listener.cc +++ b/src/core/lib/event_engine/posix_engine/posix_engine_listener.cc @@ -46,10 +46,10 @@ #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/gprpp/status_helper.h" -#include "src/core/lib/gprpp/strerror.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/socket_mutator.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/strerror.h" +#include "src/core/util/time.h" namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/event_engine/posix_engine/posix_engine_listener.h b/src/core/lib/event_engine/posix_engine/posix_engine_listener.h index 73a921a35e4..40c43de8c12 100644 --- a/src/core/lib/event_engine/posix_engine/posix_engine_listener.h +++ b/src/core/lib/event_engine/posix_engine/posix_engine_listener.h @@ -34,8 +34,8 @@ #include #include "src/core/lib/event_engine/posix.h" -#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/iomgr/port.h" +#include "src/core/util/sync.h" #ifdef GRPC_POSIX_SOCKET_TCP #include "src/core/lib/event_engine/posix_engine/event_poller.h" @@ -239,7 +239,7 @@ class PosixEngineListener : public PosixListenerWithFdSupport { #else // GRPC_POSIX_SOCKET_TCP -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" class PosixEngineListener : public PosixListenerWithFdSupport { public: diff --git a/src/core/lib/event_engine/posix_engine/posix_engine_listener_utils.cc b/src/core/lib/event_engine/posix_engine/posix_engine_listener_utils.cc index 7aa624fc3cb..b3532e2d860 100644 --- a/src/core/lib/event_engine/posix_engine/posix_engine_listener_utils.cc +++ b/src/core/lib/event_engine/posix_engine/posix_engine_listener_utils.cc @@ -33,10 +33,10 @@ #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/gprpp/crash.h" // IWYU pragma: keep -#include "src/core/lib/gprpp/status_helper.h" #include "src/core/lib/iomgr/port.h" #include "src/core/lib/iomgr/socket_mutator.h" +#include "src/core/util/crash.h" // IWYU pragma: keep +#include "src/core/util/status_helper.h" #define MIN_SAFE_ACCEPT_QUEUE_SIZE 100 diff --git a/src/core/lib/event_engine/posix_engine/tcp_socket_utils.cc b/src/core/lib/event_engine/posix_engine/tcp_socket_utils.cc index ae193ff2beb..fad1a7f6730 100644 --- a/src/core/lib/event_engine/posix_engine/tcp_socket_utils.cc +++ b/src/core/lib/event_engine/posix_engine/tcp_socket_utils.cc @@ -27,9 +27,9 @@ #include #include -#include "src/core/lib/gprpp/crash.h" // IWYU pragma: keep -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/port.h" +#include "src/core/util/crash.h" // IWYU pragma: keep +#include "src/core/util/time.h" #include "src/core/util/useful.h" #ifdef GRPC_POSIX_SOCKET_UTILS_COMMON @@ -53,8 +53,8 @@ #include "absl/status/status.h" #include "src/core/lib/event_engine/tcp_socket_utils.h" -#include "src/core/lib/gprpp/status_helper.h" -#include "src/core/lib/gprpp/strerror.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/strerror.h" #ifdef GRPC_HAVE_UNIX_SOCKET #ifdef GPR_WINDOWS diff --git a/src/core/lib/event_engine/posix_engine/tcp_socket_utils.h b/src/core/lib/event_engine/posix_engine/tcp_socket_utils.h index 412fafcad32..07bd3308d1d 100644 --- a/src/core/lib/event_engine/posix_engine/tcp_socket_utils.h +++ b/src/core/lib/event_engine/posix_engine/tcp_socket_utils.h @@ -29,10 +29,10 @@ #include #include -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/iomgr/port.h" #include "src/core/lib/iomgr/socket_mutator.h" #include "src/core/lib/resource_quota/resource_quota.h" +#include "src/core/util/ref_counted_ptr.h" #ifdef GRPC_POSIX_SOCKET_UTILS_COMMON #include diff --git a/src/core/lib/event_engine/posix_engine/timer.cc b/src/core/lib/event_engine/posix_engine/timer.cc index 6f152ce494a..8e77e251bcc 100644 --- a/src/core/lib/event_engine/posix_engine/timer.cc +++ b/src/core/lib/event_engine/posix_engine/timer.cc @@ -27,7 +27,7 @@ #include #include "src/core/lib/event_engine/posix_engine/timer_heap.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "src/core/util/useful.h" namespace grpc_event_engine { diff --git a/src/core/lib/event_engine/posix_engine/timer.h b/src/core/lib/event_engine/posix_engine/timer.h index 30e4bb2eb6c..54f753b91cf 100644 --- a/src/core/lib/event_engine/posix_engine/timer.h +++ b/src/core/lib/event_engine/posix_engine/timer.h @@ -33,9 +33,9 @@ #include #include "src/core/lib/event_engine/posix_engine/timer_heap.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/time.h" -#include "src/core/lib/gprpp/time_averaged_stats.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.h" +#include "src/core/util/time_averaged_stats.h" namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/event_engine/posix_engine/timer_manager.h b/src/core/lib/event_engine/posix_engine/timer_manager.h index 6b034358ef7..3650a06dfce 100644 --- a/src/core/lib/event_engine/posix_engine/timer_manager.h +++ b/src/core/lib/event_engine/posix_engine/timer_manager.h @@ -33,9 +33,9 @@ #include "src/core/lib/event_engine/forkable.h" #include "src/core/lib/event_engine/posix_engine/timer.h" #include "src/core/lib/event_engine/thread_pool/thread_pool.h" -#include "src/core/lib/gprpp/notification.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/notification.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.h" namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/event_engine/posix_engine/traced_buffer_list.cc b/src/core/lib/event_engine/posix_engine/traced_buffer_list.cc index d4cdfac8b7f..d908ca76943 100644 --- a/src/core/lib/event_engine/posix_engine/traced_buffer_list.cc +++ b/src/core/lib/event_engine/posix_engine/traced_buffer_list.cc @@ -27,8 +27,8 @@ #include #include -#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/iomgr/port.h" +#include "src/core/util/sync.h" #ifdef GRPC_LINUX_ERRQUEUE #include // IWYU pragma: keep @@ -317,7 +317,7 @@ void TcpSetWriteTimestampsCallback( #else // GRPC_LINUX_ERRQUEUE -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/event_engine/posix_engine/traced_buffer_list.h b/src/core/lib/event_engine/posix_engine/traced_buffer_list.h index f65dba6b009..1df29a14243 100644 --- a/src/core/lib/event_engine/posix_engine/traced_buffer_list.h +++ b/src/core/lib/event_engine/posix_engine/traced_buffer_list.h @@ -25,8 +25,8 @@ #include #include "src/core/lib/event_engine/posix_engine/internal_errqueue.h" -#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/iomgr/port.h" +#include "src/core/util/sync.h" namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/event_engine/posix_engine/wakeup_fd_eventfd.cc b/src/core/lib/event_engine/posix_engine/wakeup_fd_eventfd.cc index c05fd8d4d50..d6efbd26671 100644 --- a/src/core/lib/event_engine/posix_engine/wakeup_fd_eventfd.cc +++ b/src/core/lib/event_engine/posix_engine/wakeup_fd_eventfd.cc @@ -18,8 +18,8 @@ #include -#include "src/core/lib/gprpp/crash.h" // IWYU pragma: keep #include "src/core/lib/iomgr/port.h" +#include "src/core/util/crash.h" // IWYU pragma: keep #ifdef GRPC_LINUX_EVENTFD @@ -31,7 +31,7 @@ #endif #include "src/core/lib/event_engine/posix_engine/wakeup_fd_eventfd.h" -#include "src/core/lib/gprpp/strerror.h" +#include "src/core/util/strerror.h" namespace grpc_event_engine { namespace experimental { @@ -103,7 +103,7 @@ EventFdWakeupFd::CreateEventFdWakeupFd() { #else // GRPC_LINUX_EVENTFD -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" absl::Status EventFdWakeupFd::Init() { grpc_core::Crash("unimplemented"); } diff --git a/src/core/lib/event_engine/posix_engine/wakeup_fd_pipe.cc b/src/core/lib/event_engine/posix_engine/wakeup_fd_pipe.cc index 75c887b0754..9f2a0959df3 100644 --- a/src/core/lib/event_engine/posix_engine/wakeup_fd_pipe.cc +++ b/src/core/lib/event_engine/posix_engine/wakeup_fd_pipe.cc @@ -19,8 +19,8 @@ #include -#include "src/core/lib/gprpp/crash.h" // IWYU pragma: keep #include "src/core/lib/iomgr/port.h" +#include "src/core/util/crash.h" // IWYU pragma: keep #ifdef GRPC_POSIX_WAKEUP_FD #include @@ -31,7 +31,7 @@ #endif #include "src/core/lib/event_engine/posix_engine/wakeup_fd_pipe.h" -#include "src/core/lib/gprpp/strerror.h" +#include "src/core/util/strerror.h" namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/event_engine/ref_counted_dns_resolver_interface.h b/src/core/lib/event_engine/ref_counted_dns_resolver_interface.h index 52d4168f06d..107ba10f75b 100644 --- a/src/core/lib/event_engine/ref_counted_dns_resolver_interface.h +++ b/src/core/lib/event_engine/ref_counted_dns_resolver_interface.h @@ -22,7 +22,7 @@ #include #include -#include "src/core/lib/gprpp/orphanable.h" +#include "src/core/util/orphanable.h" namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/event_engine/tcp_socket_utils.cc b/src/core/lib/event_engine/tcp_socket_utils.cc index 2037eff91ea..1353249817d 100644 --- a/src/core/lib/event_engine/tcp_socket_utils.cc +++ b/src/core/lib/event_engine/tcp_socket_utils.cc @@ -59,10 +59,10 @@ #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" -#include "src/core/lib/gprpp/host_port.h" -#include "src/core/lib/gprpp/status_helper.h" #include "src/core/lib/iomgr/resolved_address.h" -#include "src/core/lib/uri/uri_parser.h" +#include "src/core/util/host_port.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/uri.h" namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/event_engine/thread_pool/thread_count.cc b/src/core/lib/event_engine/thread_pool/thread_count.cc index 6fc6a43c213..faeffe1f896 100644 --- a/src/core/lib/event_engine/thread_pool/thread_count.cc +++ b/src/core/lib/event_engine/thread_pool/thread_count.cc @@ -25,7 +25,7 @@ #include -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/event_engine/thread_pool/thread_count.h b/src/core/lib/event_engine/thread_pool/thread_count.h index a3842275e7e..7bca370e9e1 100644 --- a/src/core/lib/event_engine/thread_pool/thread_count.h +++ b/src/core/lib/event_engine/thread_pool/thread_count.h @@ -26,8 +26,8 @@ #include #include -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.h" #include "src/core/util/useful.h" namespace grpc_event_engine { diff --git a/src/core/lib/event_engine/thread_pool/thread_pool_factory.cc b/src/core/lib/event_engine/thread_pool/thread_pool_factory.cc index cab291bc1b4..bea6d8d526c 100644 --- a/src/core/lib/event_engine/thread_pool/thread_pool_factory.cc +++ b/src/core/lib/event_engine/thread_pool/thread_pool_factory.cc @@ -20,7 +20,7 @@ #include "src/core/lib/event_engine/forkable.h" #include "src/core/lib/event_engine/thread_pool/thread_pool.h" #include "src/core/lib/event_engine/thread_pool/work_stealing_thread_pool.h" -#include "src/core/lib/gprpp/no_destruct.h" +#include "src/core/util/no_destruct.h" namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/event_engine/thread_pool/work_stealing_thread_pool.cc b/src/core/lib/event_engine/thread_pool/work_stealing_thread_pool.cc index dcb0aabaf7e..852cf0f3915 100644 --- a/src/core/lib/event_engine/thread_pool/work_stealing_thread_pool.cc +++ b/src/core/lib/event_engine/thread_pool/work_stealing_thread_pool.cc @@ -35,17 +35,17 @@ #include #include -#include "src/core/lib/backoff/backoff.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/work_queue/basic_work_queue.h" #include "src/core/lib/event_engine/work_queue/work_queue.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/env.h" -#include "src/core/lib/gprpp/examine_stack.h" -#include "src/core/lib/gprpp/thd.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/backoff.h" +#include "src/core/util/crash.h" +#include "src/core/util/env.h" +#include "src/core/util/examine_stack.h" +#include "src/core/util/thd.h" +#include "src/core/util/time.h" #ifdef GPR_POSIX_SYNC #include diff --git a/src/core/lib/event_engine/thread_pool/work_stealing_thread_pool.h b/src/core/lib/event_engine/thread_pool/work_stealing_thread_pool.h index 7543db92900..69beaa7cddd 100644 --- a/src/core/lib/event_engine/thread_pool/work_stealing_thread_pool.h +++ b/src/core/lib/event_engine/thread_pool/work_stealing_thread_pool.h @@ -32,14 +32,14 @@ #include #include -#include "src/core/lib/backoff/backoff.h" #include "src/core/lib/event_engine/thread_pool/thread_count.h" #include "src/core/lib/event_engine/thread_pool/thread_pool.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/notification.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/backoff.h" +#include "src/core/util/notification.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.h" namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/event_engine/thready_event_engine/thready_event_engine.cc b/src/core/lib/event_engine/thready_event_engine/thready_event_engine.cc index 3be7a0e0b32..5475f2e45a0 100644 --- a/src/core/lib/event_engine/thready_event_engine/thready_event_engine.cc +++ b/src/core/lib/event_engine/thready_event_engine/thready_event_engine.cc @@ -21,9 +21,9 @@ #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/thd.h" +#include "src/core/util/crash.h" +#include "src/core/util/sync.h" +#include "src/core/util/thd.h" namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/event_engine/utils.cc b/src/core/lib/event_engine/utils.cc index 5fe19aa3698..d0d1b436c5d 100644 --- a/src/core/lib/event_engine/utils.cc +++ b/src/core/lib/event_engine/utils.cc @@ -22,7 +22,7 @@ #include #include -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/event_engine/utils.h b/src/core/lib/event_engine/utils.h index ab6d4fa1c96..5edfcd890f0 100644 --- a/src/core/lib/event_engine/utils.h +++ b/src/core/lib/event_engine/utils.h @@ -21,7 +21,7 @@ #include #include -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc b/src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc index b9542b0bb6b..3723b3463ed 100644 --- a/src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc +++ b/src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc @@ -34,10 +34,10 @@ #include "src/core/lib/event_engine/grpc_polled_fd.h" #include "src/core/lib/event_engine/windows/grpc_polled_fd_windows.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" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/slice/slice.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/sync.h" // TODO(apolcyn): remove this hack after fixing upstream. // Our grpc/c-ares code on Windows uses the ares_set_socket_functions API, diff --git a/src/core/lib/event_engine/windows/grpc_polled_fd_windows.h b/src/core/lib/event_engine/windows/grpc_polled_fd_windows.h index eda3330cb91..e16c8e80e9e 100644 --- a/src/core/lib/event_engine/windows/grpc_polled_fd_windows.h +++ b/src/core/lib/event_engine/windows/grpc_polled_fd_windows.h @@ -34,7 +34,7 @@ #include "src/core/lib/event_engine/grpc_polled_fd.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/sync.h" +#include "src/core/util/sync.h" struct iovec; diff --git a/src/core/lib/event_engine/windows/iocp.cc b/src/core/lib/event_engine/windows/iocp.cc index b81ec3dc500..74d875ba2ab 100644 --- a/src/core/lib/event_engine/windows/iocp.cc +++ b/src/core/lib/event_engine/windows/iocp.cc @@ -27,8 +27,8 @@ #include "src/core/lib/event_engine/time_util.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" #include "src/core/lib/iomgr/error.h" +#include "src/core/util/crash.h" namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/event_engine/windows/native_windows_dns_resolver.cc b/src/core/lib/event_engine/windows/native_windows_dns_resolver.cc index a23ba405ab9..d8114497b11 100644 --- a/src/core/lib/event_engine/windows/native_windows_dns_resolver.cc +++ b/src/core/lib/event_engine/windows/native_windows_dns_resolver.cc @@ -26,9 +26,9 @@ #include #include "src/core/lib/event_engine/windows/native_windows_dns_resolver.h" -#include "src/core/lib/gprpp/host_port.h" -#include "src/core/lib/gprpp/status_helper.h" #include "src/core/lib/iomgr/error.h" +#include "src/core/util/host_port.h" +#include "src/core/util/status_helper.h" namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/event_engine/windows/win_socket.cc b/src/core/lib/event_engine/windows/win_socket.cc index 8c18b09ae42..79fc2bec4fe 100644 --- a/src/core/lib/event_engine/windows/win_socket.cc +++ b/src/core/lib/event_engine/windows/win_socket.cc @@ -23,9 +23,9 @@ #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/windows/win_socket.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/iomgr/error.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/sync.h" #if defined(__MSYS__) && defined(GPR_ARCH_64) // Nasty workaround for nasty bug when using the 64 bits msys compiler diff --git a/src/core/lib/event_engine/windows/win_socket.h b/src/core/lib/event_engine/windows/win_socket.h index be453d26e6d..4256179c070 100644 --- a/src/core/lib/event_engine/windows/win_socket.h +++ b/src/core/lib/event_engine/windows/win_socket.h @@ -24,8 +24,8 @@ #include #include "src/core/lib/event_engine/thread_pool/thread_pool.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/sync.h" namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/event_engine/windows/windows_endpoint.cc b/src/core/lib/event_engine/windows/windows_endpoint.cc index d3bda779dd3..ec4118c7fd2 100644 --- a/src/core/lib/event_engine/windows/windows_endpoint.cc +++ b/src/core/lib/event_engine/windows/windows_endpoint.cc @@ -28,9 +28,9 @@ #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/windows/windows_endpoint.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/status_helper.h" #include "src/core/lib/iomgr/error.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/status_helper.h" namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/event_engine/windows/windows_engine.cc b/src/core/lib/event_engine/windows/windows_engine.cc index c691859bdfb..31e2eb03569 100644 --- a/src/core/lib/event_engine/windows/windows_engine.cc +++ b/src/core/lib/event_engine/windows/windows_engine.cc @@ -43,11 +43,11 @@ #include "src/core/lib/event_engine/windows/windows_endpoint.h" #include "src/core/lib/event_engine/windows/windows_engine.h" #include "src/core/lib/event_engine/windows/windows_listener.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/dump_args.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/error.h" +#include "src/core/util/crash.h" +#include "src/core/util/dump_args.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.h" namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/event_engine/windows/windows_engine.h b/src/core/lib/event_engine/windows/windows_engine.h index 2047ab6cd84..98ca81e1a52 100644 --- a/src/core/lib/event_engine/windows/windows_engine.h +++ b/src/core/lib/event_engine/windows/windows_engine.h @@ -37,9 +37,9 @@ #include "src/core/lib/event_engine/thread_pool/thread_pool.h" #include "src/core/lib/event_engine/windows/iocp.h" #include "src/core/lib/event_engine/windows/windows_endpoint.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/surface/init_internally.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.h" namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/event_engine/windows/windows_listener.cc b/src/core/lib/event_engine/windows/windows_listener.cc index c04346fb9be..2bba1a6e818 100644 --- a/src/core/lib/event_engine/windows/windows_listener.cc +++ b/src/core/lib/event_engine/windows/windows_listener.cc @@ -25,10 +25,10 @@ #include "src/core/lib/event_engine/windows/win_socket.h" #include "src/core/lib/event_engine/windows/windows_endpoint.h" #include "src/core/lib/event_engine/windows/windows_listener.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/port.h" +#include "src/core/util/crash.h" +#include "src/core/util/sync.h" namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/event_engine/windows/windows_listener.h b/src/core/lib/event_engine/windows/windows_listener.h index 2773f3afbf3..8e0a5bd0f95 100644 --- a/src/core/lib/event_engine/windows/windows_listener.h +++ b/src/core/lib/event_engine/windows/windows_listener.h @@ -29,8 +29,8 @@ #include "src/core/lib/event_engine/common_closures.h" #include "src/core/lib/event_engine/thread_pool/thread_pool.h" #include "src/core/lib/event_engine/windows/iocp.h" -#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/iomgr/port.h" +#include "src/core/util/sync.h" #ifdef GRPC_HAVE_UNIX_SOCKET // clang-format off diff --git a/src/core/lib/event_engine/work_queue/basic_work_queue.cc b/src/core/lib/event_engine/work_queue/basic_work_queue.cc index a9170e69bd3..40bfcf7cd5d 100644 --- a/src/core/lib/event_engine/work_queue/basic_work_queue.cc +++ b/src/core/lib/event_engine/work_queue/basic_work_queue.cc @@ -18,7 +18,7 @@ #include #include "src/core/lib/event_engine/common_closures.h" -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/sync.h" namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/event_engine/work_queue/basic_work_queue.h b/src/core/lib/event_engine/work_queue/basic_work_queue.h index 2aa843c638a..93ac366831e 100644 --- a/src/core/lib/event_engine/work_queue/basic_work_queue.h +++ b/src/core/lib/event_engine/work_queue/basic_work_queue.h @@ -24,7 +24,7 @@ #include #include "src/core/lib/event_engine/work_queue/work_queue.h" -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/sync.h" namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/experiments/config.cc b/src/core/lib/experiments/config.cc index 52483218793..3abe6870f81 100644 --- a/src/core/lib/experiments/config.cc +++ b/src/core/lib/experiments/config.cc @@ -34,8 +34,8 @@ #include "src/core/lib/config/config_vars.h" #include "src/core/lib/experiments/experiments.h" -#include "src/core/lib/gprpp/crash.h" // IWYU pragma: keep -#include "src/core/lib/gprpp/no_destruct.h" +#include "src/core/util/crash.h" // IWYU pragma: keep +#include "src/core/util/no_destruct.h" #ifndef GRPC_EXPERIMENTS_ARE_FINAL namespace grpc_core { diff --git a/src/core/lib/gprpp/.clang-format b/src/core/lib/gprpp/.clang-format deleted file mode 100644 index 5f150ef6edb..00000000000 --- a/src/core/lib/gprpp/.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/src/core/lib/gprpp/README.md b/src/core/lib/gprpp/README.md deleted file mode 100644 index f5b87481c0b..00000000000 --- a/src/core/lib/gprpp/README.md +++ /dev/null @@ -1,8 +0,0 @@ -# GPR++ - Google Portable Runtime for C++ - -The files in this directory contain various utility code for C++ code. -None of this code is gRPC-specific; anything here may also be useful -for other open source projects written in C++. - -Note that this is one of the few places in src/core where we allow -the use of portability macros. diff --git a/src/core/lib/gprpp/time.cc b/src/core/lib/gprpp/time.cc deleted file mode 100644 index db657a0880b..00000000000 --- a/src/core/lib/gprpp/time.cc +++ /dev/null @@ -1,241 +0,0 @@ -// Copyright 2021 gRPC authors. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#include "src/core/lib/gprpp/time.h" - -#include -#include -#include -#include -#include - -#include "absl/log/check.h" -#include "absl/log/log.h" -#include "absl/strings/str_format.h" - -#include -#include - -#include "src/core/lib/gprpp/no_destruct.h" - -// IWYU pragma: no_include - -namespace grpc_core { - -namespace { - -std::atomic g_process_epoch_seconds; -std::atomic g_process_epoch_cycles; - -class GprNowTimeSource final : public Timestamp::Source { - public: - Timestamp Now() override { - return Timestamp::FromTimespecRoundDown(gpr_now(GPR_CLOCK_MONOTONIC)); - } -}; - -GPR_ATTRIBUTE_NOINLINE std::pair InitTime() { - gpr_cycle_counter cycles_start = 0; - gpr_cycle_counter cycles_end = 0; - int64_t process_epoch_seconds = 0; - - // Check the current time... if we end up with zero, try again after 100ms. - // If it doesn't advance after sleeping for 2100ms, crash the process. - for (int i = 0; i < 21; i++) { - cycles_start = gpr_get_cycle_counter(); - gpr_timespec now = gpr_now(GPR_CLOCK_MONOTONIC); - cycles_end = gpr_get_cycle_counter(); - process_epoch_seconds = now.tv_sec; - if (process_epoch_seconds > 1) { - break; - } - LOG(INFO) << "gpr_now(GPR_CLOCK_MONOTONIC) returns a very small number: " - "sleeping for 100ms"; - gpr_sleep_until(gpr_time_add(now, gpr_time_from_millis(100, GPR_TIMESPAN))); - } - - // Check time has increased past 1 second. - CHECK_GT(process_epoch_seconds, 1); - // Fake the epoch to always return >=1 second from our monotonic clock (to - // avoid bugs elsewhere) - process_epoch_seconds -= 1; - int64_t expected = 0; - gpr_cycle_counter process_epoch_cycles = (cycles_start + cycles_end) / 2; - CHECK_NE(process_epoch_cycles, 0); - if (!g_process_epoch_seconds.compare_exchange_strong( - expected, process_epoch_seconds, std::memory_order_relaxed, - std::memory_order_relaxed)) { - process_epoch_seconds = expected; - do { - process_epoch_cycles = - g_process_epoch_cycles.load(std::memory_order_relaxed); - } while (process_epoch_cycles == 0); - } else { - g_process_epoch_cycles.store(process_epoch_cycles, - std::memory_order_relaxed); - } - return std::make_pair(process_epoch_seconds, process_epoch_cycles); -} - -gpr_timespec StartTime() { - int64_t sec = g_process_epoch_seconds.load(std::memory_order_relaxed); - if (GPR_UNLIKELY(sec == 0)) sec = InitTime().first; - return {sec, 0, GPR_CLOCK_MONOTONIC}; -} - -gpr_cycle_counter StartCycleCounter() { - gpr_cycle_counter cycles = - g_process_epoch_cycles.load(std::memory_order_relaxed); - if (GPR_UNLIKELY(cycles == 0)) cycles = InitTime().second; - return cycles; -} - -gpr_timespec MillisecondsAsTimespec(int64_t millis, gpr_clock_type clock_type) { - // special-case infinities as Timestamp can be 32bit on some - // platforms while gpr_time_from_millis always takes an int64_t. - if (millis == std::numeric_limits::max()) { - return gpr_inf_future(clock_type); - } - if (millis == std::numeric_limits::min()) { - return gpr_inf_past(clock_type); - } - - if (clock_type == GPR_TIMESPAN) { - return gpr_time_from_millis(millis, GPR_TIMESPAN); - } - return gpr_time_add(gpr_convert_clock_type(StartTime(), clock_type), - gpr_time_from_millis(millis, GPR_TIMESPAN)); -} - -int64_t TimespanToMillisRoundUp(gpr_timespec ts) { - CHECK(ts.clock_type == GPR_TIMESPAN); - double x = GPR_MS_PER_SEC * static_cast(ts.tv_sec) + - static_cast(ts.tv_nsec) / GPR_NS_PER_MS + - static_cast(GPR_NS_PER_SEC - 1) / - static_cast(GPR_NS_PER_SEC); - if (x <= static_cast(std::numeric_limits::min())) { - return std::numeric_limits::min(); - } - if (x >= static_cast(std::numeric_limits::max())) { - return std::numeric_limits::max(); - } - return static_cast(x); -} - -int64_t TimespanToMillisRoundDown(gpr_timespec ts) { - CHECK(ts.clock_type == GPR_TIMESPAN); - double x = GPR_MS_PER_SEC * static_cast(ts.tv_sec) + - static_cast(ts.tv_nsec) / GPR_NS_PER_MS; - if (x <= static_cast(std::numeric_limits::min())) { - return std::numeric_limits::min(); - } - if (x >= static_cast(std::numeric_limits::max())) { - return std::numeric_limits::max(); - } - return static_cast(x); -} - -} // namespace - -thread_local Timestamp::Source* Timestamp::thread_local_time_source_{ - NoDestructSingleton::Get()}; - -Timestamp ScopedTimeCache::Now() { - if (!cached_time_.has_value()) { - previous()->InvalidateCache(); - cached_time_ = previous()->Now(); - } - return cached_time_.value(); -} - -Timestamp Timestamp::FromTimespecRoundUp(gpr_timespec ts) { - return FromMillisecondsAfterProcessEpoch(TimespanToMillisRoundUp(gpr_time_sub( - gpr_convert_clock_type(ts, GPR_CLOCK_MONOTONIC), StartTime()))); -} - -Timestamp Timestamp::FromTimespecRoundDown(gpr_timespec ts) { - return FromMillisecondsAfterProcessEpoch( - TimespanToMillisRoundDown(gpr_time_sub( - gpr_convert_clock_type(ts, GPR_CLOCK_MONOTONIC), StartTime()))); -} - -Timestamp Timestamp::FromCycleCounterRoundUp(gpr_cycle_counter c) { - return Timestamp::FromMillisecondsAfterProcessEpoch( - TimespanToMillisRoundUp(gpr_cycle_counter_sub(c, StartCycleCounter()))); -} - -Timestamp Timestamp::FromCycleCounterRoundDown(gpr_cycle_counter c) { - return Timestamp::FromMillisecondsAfterProcessEpoch( - TimespanToMillisRoundDown(gpr_cycle_counter_sub(c, StartCycleCounter()))); -} - -gpr_timespec Timestamp::as_timespec(gpr_clock_type clock_type) const { - return MillisecondsAsTimespec(millis_, clock_type); -} - -std::string Timestamp::ToString() const { - if (millis_ == std::numeric_limits::max()) { - return "@∞"; - } - if (millis_ == std::numeric_limits::min()) { - return "@-∞"; - } - return "@" + std::to_string(millis_) + "ms"; -} - -gpr_timespec Duration::as_timespec() const { - return MillisecondsAsTimespec(millis_, GPR_TIMESPAN); -} - -Duration Duration::FromTimespec(gpr_timespec t) { - return Duration::Milliseconds(TimespanToMillisRoundUp(t)); -} - -std::string Duration::ToString() const { - if (millis_ == std::numeric_limits::max()) { - return "∞"; - } - if (millis_ == std::numeric_limits::min()) { - return "-∞"; - } - return std::to_string(millis_) + "ms"; -} - -std::string Duration::ToJsonString() const { - gpr_timespec ts = as_timespec(); - return absl::StrFormat("%d.%09ds", ts.tv_sec, ts.tv_nsec); -} - -Duration::operator grpc_event_engine::experimental::EventEngine::Duration() - const { - return std::chrono::milliseconds( - Clamp(millis_, std::numeric_limits::min() / GPR_NS_PER_MS, - std::numeric_limits::max() / GPR_NS_PER_MS)); -} - -void TestOnlySetProcessEpoch(gpr_timespec epoch) { - g_process_epoch_seconds.store( - gpr_convert_clock_type(epoch, GPR_CLOCK_MONOTONIC).tv_sec); - g_process_epoch_cycles.store(gpr_get_cycle_counter()); -} - -std::ostream& operator<<(std::ostream& out, Timestamp timestamp) { - return out << timestamp.ToString(); -} - -std::ostream& operator<<(std::ostream& out, Duration duration) { - return out << duration.ToString(); -} - -} // namespace grpc_core diff --git a/src/core/lib/iomgr/buffer_list.cc b/src/core/lib/iomgr/buffer_list.cc index dd59b4e7d49..91bfc45a021 100644 --- a/src/core/lib/iomgr/buffer_list.cc +++ b/src/core/lib/iomgr/buffer_list.cc @@ -23,9 +23,9 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/iomgr/port.h" +#include "src/core/util/crash.h" +#include "src/core/util/sync.h" #ifdef GRPC_LINUX_ERRQUEUE #include diff --git a/src/core/lib/iomgr/buffer_list.h b/src/core/lib/iomgr/buffer_list.h index 9e57c818e17..6805c53c08d 100644 --- a/src/core/lib/iomgr/buffer_list.h +++ b/src/core/lib/iomgr/buffer_list.h @@ -24,10 +24,10 @@ #include #include -#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/internal_errqueue.h" #include "src/core/lib/iomgr/port.h" +#include "src/core/util/sync.h" namespace grpc_core { diff --git a/src/core/lib/iomgr/call_combiner.cc b/src/core/lib/iomgr/call_combiner.cc index 26bb7b881db..e20cc0a0986 100644 --- a/src/core/lib/iomgr/call_combiner.cc +++ b/src/core/lib/iomgr/call_combiner.cc @@ -25,9 +25,9 @@ #include -#include "src/core/lib/gprpp/crash.h" #include "src/core/telemetry/stats.h" #include "src/core/telemetry/stats_data.h" +#include "src/core/util/crash.h" namespace grpc_core { diff --git a/src/core/lib/iomgr/call_combiner.h b/src/core/lib/iomgr/call_combiner.h index 87ad024880f..23488f51cfc 100644 --- a/src/core/lib/iomgr/call_combiner.h +++ b/src/core/lib/iomgr/call_combiner.h @@ -27,12 +27,12 @@ #include #include -#include "src/core/lib/gprpp/mpscq.h" -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/dynamic_annotations.h" #include "src/core/lib/iomgr/exec_ctx.h" +#include "src/core/util/mpscq.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" // A simple, lock-free mechanism for serializing activity related to a // single call. This is similar to a combiner but is more lightweight. diff --git a/src/core/lib/iomgr/cfstream_handle.cc b/src/core/lib/iomgr/cfstream_handle.cc index 55604791a7b..e70393f6abd 100644 --- a/src/core/lib/iomgr/cfstream_handle.cc +++ b/src/core/lib/iomgr/cfstream_handle.cc @@ -18,8 +18,8 @@ #include -#include "src/core/lib/gprpp/memory.h" #include "src/core/lib/iomgr/port.h" +#include "src/core/util/memory.h" #ifdef GRPC_CFSTREAM #import diff --git a/src/core/lib/iomgr/cfstream_handle.h b/src/core/lib/iomgr/cfstream_handle.h index 7dd156de2e0..d373eadfd37 100644 --- a/src/core/lib/iomgr/cfstream_handle.h +++ b/src/core/lib/iomgr/cfstream_handle.h @@ -29,9 +29,9 @@ #ifdef GRPC_CFSTREAM #import -#include "src/core/lib/gprpp/memory.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/lockfree_event.h" +#include "src/core/util/memory.h" class GrpcLibraryInitHolder { public: diff --git a/src/core/lib/iomgr/closure.h b/src/core/lib/iomgr/closure.h index 9f8a22493d3..cb08c23e7c7 100644 --- a/src/core/lib/iomgr/closure.h +++ b/src/core/lib/iomgr/closure.h @@ -28,11 +28,11 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/manual_constructor.h" -#include "src/core/lib/gprpp/mpscq.h" #include "src/core/lib/iomgr/error.h" +#include "src/core/util/crash.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/manual_constructor.h" +#include "src/core/util/mpscq.h" struct grpc_closure; typedef struct grpc_closure grpc_closure; diff --git a/src/core/lib/iomgr/combiner.cc b/src/core/lib/iomgr/combiner.cc index 56db07f5627..31f7b204af9 100644 --- a/src/core/lib/iomgr/combiner.cc +++ b/src/core/lib/iomgr/combiner.cc @@ -29,10 +29,10 @@ #include #include "src/core/lib/experiments/experiments.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/mpscq.h" #include "src/core/lib/iomgr/executor.h" #include "src/core/lib/iomgr/iomgr_internal.h" +#include "src/core/util/crash.h" +#include "src/core/util/mpscq.h" #define STATE_UNORPHANED 1 #define STATE_ELEM_COUNT_LOW_BIT 2 diff --git a/src/core/lib/iomgr/endpoint_pair_posix.cc b/src/core/lib/iomgr/endpoint_pair_posix.cc index 4043f9a8120..85fb3849f29 100644 --- a/src/core/lib/iomgr/endpoint_pair_posix.cc +++ b/src/core/lib/iomgr/endpoint_pair_posix.cc @@ -36,12 +36,12 @@ #include #include "src/core/lib/event_engine/channel_args_endpoint_config.h" -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/iomgr/endpoint_pair.h" #include "src/core/lib/iomgr/socket_utils_posix.h" #include "src/core/lib/iomgr/tcp_posix.h" #include "src/core/lib/iomgr/unix_sockets_posix.h" #include "src/core/lib/resource_quota/api.h" +#include "src/core/util/crash.h" #include "src/core/util/string.h" static void create_sockets(int sv[2]) { diff --git a/src/core/lib/iomgr/endpoint_pair_windows.cc b/src/core/lib/iomgr/endpoint_pair_windows.cc index 2fd37b4127e..f8a746624e6 100644 --- a/src/core/lib/iomgr/endpoint_pair_windows.cc +++ b/src/core/lib/iomgr/endpoint_pair_windows.cc @@ -29,11 +29,11 @@ #include "absl/log/log.h" #include "src/core/lib/address_utils/sockaddr_utils.h" -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/iomgr/endpoint_pair.h" #include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/iomgr/socket_windows.h" #include "src/core/lib/iomgr/tcp_windows.h" +#include "src/core/util/crash.h" static void create_sockets(SOCKET sv[2]) { SOCKET svr_sock = INVALID_SOCKET; diff --git a/src/core/lib/iomgr/error.cc b/src/core/lib/iomgr/error.cc index d1303834559..d637ab6d20c 100644 --- a/src/core/lib/iomgr/error.cc +++ b/src/core/lib/iomgr/error.cc @@ -30,15 +30,15 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #ifdef GPR_WINDOWS #include #endif #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/strerror.h" #include "src/core/lib/slice/slice_internal.h" +#include "src/core/util/strerror.h" #include "src/core/util/useful.h" absl::Status grpc_status_create(absl::StatusCode code, absl::string_view msg, diff --git a/src/core/lib/iomgr/error.h b/src/core/lib/iomgr/error.h index b31173121f2..e1fb98107c1 100644 --- a/src/core/lib/iomgr/error.h +++ b/src/core/lib/iomgr/error.h @@ -31,10 +31,10 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/status_helper.h" #include "src/core/lib/slice/slice_internal.h" +#include "src/core/util/crash.h" #include "src/core/util/spinlock.h" +#include "src/core/util/status_helper.h" /// Opaque representation of an error. diff --git a/src/core/lib/iomgr/ev_apple.cc b/src/core/lib/iomgr/ev_apple.cc index 88f07921f3a..73ded9294d7 100644 --- a/src/core/lib/iomgr/ev_apple.cc +++ b/src/core/lib/iomgr/ev_apple.cc @@ -35,9 +35,9 @@ #include "absl/time/time.h" -#include "src/core/lib/gprpp/thd.h" -#include "src/core/lib/gprpp/time_util.h" #include "src/core/lib/iomgr/ev_apple.h" +#include "src/core/util/thd.h" +#include "src/core/util/time_util.h" #define GRPC_POLLSET_KICK_BROADCAST ((grpc_pollset_worker*)1) diff --git a/src/core/lib/iomgr/ev_epoll1_linux.cc b/src/core/lib/iomgr/ev_epoll1_linux.cc index c2c60e9663a..ff347ac69d6 100644 --- a/src/core/lib/iomgr/ev_epoll1_linux.cc +++ b/src/core/lib/iomgr/ev_epoll1_linux.cc @@ -18,8 +18,8 @@ #include -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/iomgr/port.h" +#include "src/core/util/crash.h" // This polling engine is only relevant on linux kernels supporting epoll // epoll_create() or epoll_create1() @@ -47,8 +47,6 @@ #include #include -#include "src/core/lib/gprpp/manual_constructor.h" -#include "src/core/lib/gprpp/strerror.h" #include "src/core/lib/iomgr/block_annotate.h" #include "src/core/lib/iomgr/ev_epoll1_linux.h" #include "src/core/lib/iomgr/ev_posix.h" @@ -57,6 +55,8 @@ #include "src/core/lib/iomgr/wakeup_fd_posix.h" #include "src/core/telemetry/stats.h" #include "src/core/telemetry/stats_data.h" +#include "src/core/util/manual_constructor.h" +#include "src/core/util/strerror.h" #include "src/core/util/string.h" #include "src/core/util/useful.h" diff --git a/src/core/lib/iomgr/ev_poll_posix.cc b/src/core/lib/iomgr/ev_poll_posix.cc index a95adea7c85..9e955d8c094 100644 --- a/src/core/lib/iomgr/ev_poll_posix.cc +++ b/src/core/lib/iomgr/ev_poll_posix.cc @@ -40,14 +40,14 @@ #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/thd.h" #include "src/core/lib/iomgr/block_annotate.h" #include "src/core/lib/iomgr/ev_poll_posix.h" #include "src/core/lib/iomgr/iomgr_internal.h" #include "src/core/lib/iomgr/wakeup_fd_posix.h" #include "src/core/telemetry/stats.h" #include "src/core/telemetry/stats_data.h" +#include "src/core/util/crash.h" +#include "src/core/util/thd.h" #include "src/core/util/useful.h" #define GRPC_POLLSET_KICK_BROADCAST ((grpc_pollset_worker*)1) diff --git a/src/core/lib/iomgr/ev_posix.cc b/src/core/lib/iomgr/ev_posix.cc index 70ee372c4fd..e195c940d87 100644 --- a/src/core/lib/iomgr/ev_posix.cc +++ b/src/core/lib/iomgr/ev_posix.cc @@ -34,11 +34,11 @@ #include "src/core/lib/config/config_vars.h" #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/iomgr/ev_epoll1_linux.h" #include "src/core/lib/iomgr/ev_poll_posix.h" #include "src/core/lib/iomgr/ev_posix.h" #include "src/core/lib/iomgr/internal_errqueue.h" +#include "src/core/util/crash.h" #include "src/core/util/useful.h" /// Default poll() function - a pointer so that it can be overridden by some diff --git a/src/core/lib/iomgr/event_engine_shims/endpoint.cc b/src/core/lib/iomgr/event_engine_shims/endpoint.cc index 08fcbc61997..28b1ef42bf1 100644 --- a/src/core/lib/iomgr/event_engine_shims/endpoint.cc +++ b/src/core/lib/iomgr/event_engine_shims/endpoint.cc @@ -36,9 +36,6 @@ #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/tcp_socket_utils.h" -#include "src/core/lib/gprpp/construct_destruct.h" -#include "src/core/lib/gprpp/debug_location.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" @@ -47,7 +44,10 @@ #include "src/core/lib/iomgr/port.h" #include "src/core/lib/slice/slice_string_helpers.h" #include "src/core/lib/transport/error_utils.h" +#include "src/core/util/construct_destruct.h" +#include "src/core/util/debug_location.h" #include "src/core/util/string.h" +#include "src/core/util/sync.h" namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/iomgr/exec_ctx.cc b/src/core/lib/iomgr/exec_ctx.cc index 804ae6f6494..6bb16390008 100644 --- a/src/core/lib/iomgr/exec_ctx.cc +++ b/src/core/lib/iomgr/exec_ctx.cc @@ -25,9 +25,9 @@ #include #include -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/iomgr/combiner.h" #include "src/core/lib/iomgr/error.h" +#include "src/core/util/crash.h" static void exec_ctx_run(grpc_closure* closure) { #ifndef NDEBUG diff --git a/src/core/lib/iomgr/exec_ctx.h b/src/core/lib/iomgr/exec_ctx.h index bcdb1a743d7..0bda1d9af88 100644 --- a/src/core/lib/iomgr/exec_ctx.h +++ b/src/core/lib/iomgr/exec_ctx.h @@ -36,12 +36,11 @@ #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/debug_location.h" +#include "src/core/util/fork.h" #include "src/core/util/latent_see.h" +#include "src/core/util/time.h" #include "src/core/util/time_precise.h" #if !defined(_WIN32) || !defined(_DLL) diff --git a/src/core/lib/iomgr/executor.cc b/src/core/lib/iomgr/executor.cc index 02f21cf796b..9c427b6fd12 100644 --- a/src/core/lib/iomgr/executor.cc +++ b/src/core/lib/iomgr/executor.cc @@ -30,10 +30,10 @@ #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" #include "src/core/lib/iomgr/iomgr_internal.h" +#include "src/core/util/crash.h" +#include "src/core/util/memory.h" #include "src/core/util/useful.h" #define MAX_DEPTH 2 diff --git a/src/core/lib/iomgr/executor.h b/src/core/lib/iomgr/executor.h index e20f2f0242e..b029fd503d3 100644 --- a/src/core/lib/iomgr/executor.h +++ b/src/core/lib/iomgr/executor.h @@ -21,9 +21,9 @@ #include -#include "src/core/lib/gprpp/thd.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/util/spinlock.h" +#include "src/core/util/thd.h" namespace grpc_core { diff --git a/src/core/lib/iomgr/fork_posix.cc b/src/core/lib/iomgr/fork_posix.cc index 91f94755fb7..37059aaa815 100644 --- a/src/core/lib/iomgr/fork_posix.cc +++ b/src/core/lib/iomgr/fork_posix.cc @@ -33,14 +33,14 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/fork.h" -#include "src/core/lib/gprpp/thd.h" #include "src/core/lib/iomgr/ev_posix.h" #include "src/core/lib/iomgr/executor.h" #include "src/core/lib/iomgr/timer_manager.h" #include "src/core/lib/iomgr/wakeup_fd_posix.h" #include "src/core/lib/surface/init_internally.h" +#include "src/core/util/crash.h" +#include "src/core/util/fork.h" +#include "src/core/util/thd.h" // // NOTE: FORKING IS NOT GENERALLY SUPPORTED, THIS IS ONLY INTENDED TO WORK diff --git a/src/core/lib/iomgr/internal_errqueue.cc b/src/core/lib/iomgr/internal_errqueue.cc index dbf001b4cc6..65199cd8e35 100644 --- a/src/core/lib/iomgr/internal_errqueue.cc +++ b/src/core/lib/iomgr/internal_errqueue.cc @@ -27,7 +27,7 @@ #include #include -#include "src/core/lib/gprpp/strerror.h" +#include "src/core/util/strerror.h" namespace grpc_core { diff --git a/src/core/lib/iomgr/iocp_windows.cc b/src/core/lib/iomgr/iocp_windows.cc index bc931a4f44b..51eae975fbc 100644 --- a/src/core/lib/iomgr/iocp_windows.cc +++ b/src/core/lib/iomgr/iocp_windows.cc @@ -32,14 +32,14 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/thd.h" #include "src/core/lib/iomgr/iocp_windows.h" #include "src/core/lib/iomgr/iomgr_internal.h" #include "src/core/lib/iomgr/socket_windows.h" #include "src/core/lib/iomgr/timer.h" #include "src/core/telemetry/stats.h" #include "src/core/telemetry/stats_data.h" +#include "src/core/util/crash.h" +#include "src/core/util/thd.h" static ULONG g_iocp_kick_token; static OVERLAPPED g_iocp_custom_overlap; diff --git a/src/core/lib/iomgr/iomgr.cc b/src/core/lib/iomgr/iomgr.cc index 1687880a0f7..a4fce10be34 100644 --- a/src/core/lib/iomgr/iomgr.cc +++ b/src/core/lib/iomgr/iomgr.cc @@ -30,8 +30,6 @@ #include #include "src/core/lib/config/config_vars.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/thd.h" #include "src/core/lib/iomgr/buffer_list.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/executor.h" @@ -39,7 +37,9 @@ #include "src/core/lib/iomgr/iomgr_internal.h" #include "src/core/lib/iomgr/timer.h" #include "src/core/lib/iomgr/timer_manager.h" +#include "src/core/util/crash.h" #include "src/core/util/string.h" +#include "src/core/util/thd.h" #include "src/core/util/useful.h" static gpr_mu g_mu; diff --git a/src/core/lib/iomgr/iomgr_windows.cc b/src/core/lib/iomgr/iomgr_windows.cc index ae35534186f..fe1d24a3492 100644 --- a/src/core/lib/iomgr/iomgr_windows.cc +++ b/src/core/lib/iomgr/iomgr_windows.cc @@ -25,7 +25,6 @@ #include "absl/log/check.h" #include "src/core/lib/experiments/experiments.h" -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/iomgr/iocp_windows.h" #include "src/core/lib/iomgr/iomgr.h" #include "src/core/lib/iomgr/pollset_windows.h" @@ -36,6 +35,7 @@ #include "src/core/lib/iomgr/tcp_client.h" #include "src/core/lib/iomgr/tcp_server.h" #include "src/core/lib/iomgr/timer.h" +#include "src/core/util/crash.h" extern grpc_tcp_server_vtable grpc_windows_tcp_server_vtable; extern grpc_tcp_server_vtable grpc_windows_event_engine_tcp_server_vtable; diff --git a/src/core/lib/iomgr/lockfree_event.cc b/src/core/lib/iomgr/lockfree_event.cc index 51e46ab9764..53700d13749 100644 --- a/src/core/lib/iomgr/lockfree_event.cc +++ b/src/core/lib/iomgr/lockfree_event.cc @@ -24,8 +24,8 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/iomgr/exec_ctx.h" +#include "src/core/util/crash.h" // 'state' holds the to call when the fd is readable or writable respectively. // It can contain one of the following values: diff --git a/src/core/lib/iomgr/polling_entity.cc b/src/core/lib/iomgr/polling_entity.cc index 2a3e9c77060..918af4a7f65 100644 --- a/src/core/lib/iomgr/polling_entity.cc +++ b/src/core/lib/iomgr/polling_entity.cc @@ -24,7 +24,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" grpc_polling_entity grpc_polling_entity_create_from_pollset_set( grpc_pollset_set* pollset_set) { diff --git a/src/core/lib/iomgr/pollset_windows.cc b/src/core/lib/iomgr/pollset_windows.cc index 32925c61a93..28931294f3c 100644 --- a/src/core/lib/iomgr/pollset_windows.cc +++ b/src/core/lib/iomgr/pollset_windows.cc @@ -22,12 +22,12 @@ #ifdef GRPC_WINSOCK_SOCKET -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/thd.h" #include "src/core/lib/iomgr/iocp_windows.h" #include "src/core/lib/iomgr/iomgr_internal.h" #include "src/core/lib/iomgr/pollset.h" #include "src/core/lib/iomgr/pollset_windows.h" +#include "src/core/util/crash.h" +#include "src/core/util/thd.h" #define GRPC_POLLSET_KICK_BROADCAST ((grpc_pollset_worker*)1) diff --git a/src/core/lib/iomgr/resolve_address.cc b/src/core/lib/iomgr/resolve_address.cc index db7b891bcc7..a6130701fec 100644 --- a/src/core/lib/iomgr/resolve_address.cc +++ b/src/core/lib/iomgr/resolve_address.cc @@ -23,8 +23,8 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/no_destruct.h" +#include "src/core/util/crash.h" +#include "src/core/util/no_destruct.h" namespace grpc_core { const char* kDefaultSecurePort = "https"; diff --git a/src/core/lib/iomgr/resolve_address.h b/src/core/lib/iomgr/resolve_address.h index c63118c053f..c8c94b00c0b 100644 --- a/src/core/lib/iomgr/resolve_address.h +++ b/src/core/lib/iomgr/resolve_address.h @@ -28,11 +28,11 @@ #include #include "src/core/lib/event_engine/handle_containers.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/pollset_set.h" #include "src/core/lib/iomgr/port.h" #include "src/core/lib/iomgr/resolved_address.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/time.h" #define GRPC_MAX_SOCKADDR_SIZE 128 diff --git a/src/core/lib/iomgr/resolve_address_posix.cc b/src/core/lib/iomgr/resolve_address_posix.cc index 8a161fcc6c4..0dd2e449575 100644 --- a/src/core/lib/iomgr/resolve_address_posix.cc +++ b/src/core/lib/iomgr/resolve_address_posix.cc @@ -29,9 +29,6 @@ #include #include "src/core/lib/event_engine/default_event_engine.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/host_port.h" -#include "src/core/lib/gprpp/thd.h" #include "src/core/lib/iomgr/block_annotate.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/executor.h" @@ -41,7 +38,10 @@ #include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/iomgr/unix_sockets_posix.h" #include "src/core/lib/transport/error_utils.h" +#include "src/core/util/crash.h" +#include "src/core/util/host_port.h" #include "src/core/util/string.h" +#include "src/core/util/thd.h" #include "src/core/util/useful.h" namespace grpc_core { diff --git a/src/core/lib/iomgr/resolve_address_windows.cc b/src/core/lib/iomgr/resolve_address_windows.cc index 6db705774a6..9db5b689954 100644 --- a/src/core/lib/iomgr/resolve_address_windows.cc +++ b/src/core/lib/iomgr/resolve_address_windows.cc @@ -34,9 +34,6 @@ #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/event_engine/default_event_engine.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/host_port.h" -#include "src/core/lib/gprpp/thd.h" #include "src/core/lib/iomgr/block_annotate.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/executor.h" @@ -45,7 +42,10 @@ #include "src/core/lib/iomgr/resolve_address_windows.h" #include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/transport/error_utils.h" +#include "src/core/util/crash.h" +#include "src/core/util/host_port.h" #include "src/core/util/string.h" +#include "src/core/util/thd.h" namespace grpc_core { namespace { diff --git a/src/core/lib/iomgr/sockaddr_utils_posix.cc b/src/core/lib/iomgr/sockaddr_utils_posix.cc index 62d5bcac84d..8fc4d5a186e 100644 --- a/src/core/lib/iomgr/sockaddr_utils_posix.cc +++ b/src/core/lib/iomgr/sockaddr_utils_posix.cc @@ -42,8 +42,8 @@ #include #include -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/iomgr/sockaddr.h" +#include "src/core/util/crash.h" uint16_t grpc_htons(uint16_t hostshort) { return htons(hostshort); } diff --git a/src/core/lib/iomgr/socket_mutator.cc b/src/core/lib/iomgr/socket_mutator.cc index f77661969ce..d2afe272f12 100644 --- a/src/core/lib/iomgr/socket_mutator.cc +++ b/src/core/lib/iomgr/socket_mutator.cc @@ -23,7 +23,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "src/core/util/useful.h" void grpc_socket_mutator_init(grpc_socket_mutator* mutator, diff --git a/src/core/lib/iomgr/socket_utils_common_posix.cc b/src/core/lib/iomgr/socket_utils_common_posix.cc index 19c6ccab152..49b1c349795 100644 --- a/src/core/lib/iomgr/socket_utils_common_posix.cc +++ b/src/core/lib/iomgr/socket_utils_common_posix.cc @@ -52,9 +52,9 @@ #include #include "src/core/lib/address_utils/sockaddr_utils.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/strerror.h" #include "src/core/lib/iomgr/sockaddr.h" +#include "src/core/util/crash.h" +#include "src/core/util/strerror.h" #include "src/core/util/string.h" // set a socket to use zerocopy diff --git a/src/core/lib/iomgr/socket_utils_linux.cc b/src/core/lib/iomgr/socket_utils_linux.cc index d699a1d5fe5..27e0b53fb86 100644 --- a/src/core/lib/iomgr/socket_utils_linux.cc +++ b/src/core/lib/iomgr/socket_utils_linux.cc @@ -25,9 +25,9 @@ #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" +#include "src/core/util/crash.h" int grpc_accept4(int sockfd, grpc_resolved_address* resolved_addr, int nonblock, int cloexec) { diff --git a/src/core/lib/iomgr/socket_utils_posix.cc b/src/core/lib/iomgr/socket_utils_posix.cc index 88b5d9a6bcf..ebd2d586069 100644 --- a/src/core/lib/iomgr/socket_utils_posix.cc +++ b/src/core/lib/iomgr/socket_utils_posix.cc @@ -29,16 +29,16 @@ #include -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/iomgr/socket_utils_posix.h" +#include "src/core/util/crash.h" #endif #ifdef GRPC_POSIX_SOCKET_TCP #include "src/core/lib/event_engine/channel_args_endpoint_config.h" -#include "src/core/lib/gprpp/strerror.h" #include "src/core/lib/iomgr/socket_utils_posix.h" +#include "src/core/util/strerror.h" using ::grpc_event_engine::experimental::EndpointConfig; diff --git a/src/core/lib/iomgr/socket_utils_windows.cc b/src/core/lib/iomgr/socket_utils_windows.cc index 195a838598b..eb7e91f76a7 100644 --- a/src/core/lib/iomgr/socket_utils_windows.cc +++ b/src/core/lib/iomgr/socket_utils_windows.cc @@ -22,9 +22,9 @@ #ifdef GRPC_WINDOWS_SOCKETUTILS -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/iomgr/socket_utils.h" +#include "src/core/util/crash.h" uint16_t grpc_htons(uint16_t hostshort) { return htons(hostshort); } diff --git a/src/core/lib/iomgr/socket_windows.cc b/src/core/lib/iomgr/socket_windows.cc index e7a8b1e5fdd..6ace1af6bc4 100644 --- a/src/core/lib/iomgr/socket_windows.cc +++ b/src/core/lib/iomgr/socket_windows.cc @@ -34,13 +34,13 @@ #include #include -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/iomgr/iocp_windows.h" #include "src/core/lib/iomgr/iomgr_internal.h" #include "src/core/lib/iomgr/pollset.h" #include "src/core/lib/iomgr/pollset_windows.h" #include "src/core/lib/iomgr/sockaddr_windows.h" #include "src/core/lib/iomgr/socket_windows.h" +#include "src/core/util/crash.h" static DWORD s_wsa_socket_flags; diff --git a/src/core/lib/iomgr/tcp_client_cfstream.cc b/src/core/lib/iomgr/tcp_client_cfstream.cc index f3228ad20ca..c091737b96c 100644 --- a/src/core/lib/iomgr/tcp_client_cfstream.cc +++ b/src/core/lib/iomgr/tcp_client_cfstream.cc @@ -35,8 +35,6 @@ #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/event_engine/shim.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/host_port.h" #include "src/core/lib/iomgr/cfstream_handle.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint_cfstream.h" @@ -45,6 +43,8 @@ #include "src/core/lib/iomgr/event_engine_shims/tcp_client.h" #include "src/core/lib/iomgr/tcp_client.h" #include "src/core/lib/iomgr/timer.h" +#include "src/core/util/crash.h" +#include "src/core/util/host_port.h" struct CFStreamConnect { gpr_mu mu; diff --git a/src/core/lib/iomgr/tcp_client_posix.cc b/src/core/lib/iomgr/tcp_client_posix.cc index b0d983df9b6..a66807cf111 100644 --- a/src/core/lib/iomgr/tcp_client_posix.cc +++ b/src/core/lib/iomgr/tcp_client_posix.cc @@ -39,7 +39,6 @@ #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/event_engine/resolved_address_internal.h" #include "src/core/lib/event_engine/shim.h" -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/iomgr/ev_posix.h" #include "src/core/lib/iomgr/event_engine_shims/tcp_client.h" #include "src/core/lib/iomgr/executor.h" @@ -53,6 +52,7 @@ #include "src/core/lib/iomgr/unix_sockets_posix.h" #include "src/core/lib/iomgr/vsock.h" #include "src/core/lib/slice/slice_internal.h" +#include "src/core/util/crash.h" #include "src/core/util/string.h" using ::grpc_event_engine::experimental::EndpointConfig; diff --git a/src/core/lib/iomgr/tcp_client_windows.cc b/src/core/lib/iomgr/tcp_client_windows.cc index 4086d45a577..c19e81d8131 100644 --- a/src/core/lib/iomgr/tcp_client_windows.cc +++ b/src/core/lib/iomgr/tcp_client_windows.cc @@ -33,7 +33,6 @@ #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/event_engine/shim.h" -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/iomgr/event_engine_shims/tcp_client.h" #include "src/core/lib/iomgr/iocp_windows.h" #include "src/core/lib/iomgr/sockaddr.h" @@ -44,6 +43,7 @@ #include "src/core/lib/iomgr/timer.h" #include "src/core/lib/resource_quota/api.h" #include "src/core/lib/slice/slice_internal.h" +#include "src/core/util/crash.h" using ::grpc_event_engine::experimental::EndpointConfig; diff --git a/src/core/lib/iomgr/tcp_posix.cc b/src/core/lib/iomgr/tcp_posix.cc index 37e409d1235..a53d983db33 100644 --- a/src/core/lib/iomgr/tcp_posix.cc +++ b/src/core/lib/iomgr/tcp_posix.cc @@ -55,13 +55,8 @@ #include #include "src/core/lib/address_utils/sockaddr_utils.h" -#include "src/core/lib/debug/event_log.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/experiments/experiments.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/strerror.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/buffer_list.h" #include "src/core/lib/iomgr/ev_posix.h" #include "src/core/lib/iomgr/event_engine_shims/endpoint.h" @@ -74,7 +69,12 @@ #include "src/core/lib/slice/slice_string_helpers.h" #include "src/core/telemetry/stats.h" #include "src/core/telemetry/stats_data.h" +#include "src/core/util/crash.h" +#include "src/core/util/event_log.h" +#include "src/core/util/strerror.h" #include "src/core/util/string.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.h" #include "src/core/util/useful.h" #ifndef SOL_TCP diff --git a/src/core/lib/iomgr/tcp_server_posix.cc b/src/core/lib/iomgr/tcp_server_posix.cc index a45a0c8e32f..fdd3d96c63e 100644 --- a/src/core/lib/iomgr/tcp_server_posix.cc +++ b/src/core/lib/iomgr/tcp_server_posix.cc @@ -62,7 +62,6 @@ #include "src/core/lib/event_engine/query_extensions.h" #include "src/core/lib/event_engine/resolved_address_internal.h" #include "src/core/lib/event_engine/shim.h" -#include "src/core/lib/gprpp/strerror.h" #include "src/core/lib/iomgr/event_engine_shims/closure.h" #include "src/core/lib/iomgr/event_engine_shims/endpoint.h" #include "src/core/lib/iomgr/exec_ctx.h" @@ -76,6 +75,7 @@ #include "src/core/lib/iomgr/unix_sockets_posix.h" #include "src/core/lib/iomgr/vsock.h" #include "src/core/lib/transport/error_utils.h" +#include "src/core/util/strerror.h" static std::atomic num_dropped_connections{0}; static constexpr grpc_core::Duration kRetryAcceptWaitTime{ diff --git a/src/core/lib/iomgr/tcp_server_utils_posix_common.cc b/src/core/lib/iomgr/tcp_server_utils_posix_common.cc index ab2e73fb999..7ec14525002 100644 --- a/src/core/lib/iomgr/tcp_server_utils_posix_common.cc +++ b/src/core/lib/iomgr/tcp_server_utils_posix_common.cc @@ -39,12 +39,12 @@ #include #include "src/core/lib/address_utils/sockaddr_utils.h" -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/iomgr/tcp_server_utils_posix.h" #include "src/core/lib/iomgr/unix_sockets_posix.h" #include "src/core/lib/iomgr/vsock.h" +#include "src/core/util/crash.h" #define MIN_SAFE_ACCEPT_QUEUE_SIZE 100 diff --git a/src/core/lib/iomgr/tcp_server_utils_posix_ifaddrs.cc b/src/core/lib/iomgr/tcp_server_utils_posix_ifaddrs.cc index ff80141ef8d..89c69d8beb2 100644 --- a/src/core/lib/iomgr/tcp_server_utils_posix_ifaddrs.cc +++ b/src/core/lib/iomgr/tcp_server_utils_posix_ifaddrs.cc @@ -37,10 +37,10 @@ #include #include "src/core/lib/address_utils/sockaddr_utils.h" -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/iomgr/tcp_server_utils_posix.h" +#include "src/core/util/crash.h" // Return the listener in s with address addr or NULL. static grpc_tcp_listener* find_listener_with_addr(grpc_tcp_server* s, diff --git a/src/core/lib/iomgr/tcp_server_windows.cc b/src/core/lib/iomgr/tcp_server_windows.cc index 1e0bb260c46..ed32fcb25b0 100644 --- a/src/core/lib/iomgr/tcp_server_windows.cc +++ b/src/core/lib/iomgr/tcp_server_windows.cc @@ -46,7 +46,6 @@ #include "src/core/lib/event_engine/tcp_socket_utils.h" #include "src/core/lib/event_engine/windows/windows_engine.h" #include "src/core/lib/event_engine/windows/windows_listener.h" -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/event_engine_shims/closure.h" #include "src/core/lib/iomgr/event_engine_shims/endpoint.h" @@ -60,6 +59,7 @@ #include "src/core/lib/resource_quota/api.h" #include "src/core/lib/resource_quota/resource_quota.h" #include "src/core/lib/slice/slice_internal.h" +#include "src/core/util/crash.h" #define MIN_SAFE_ACCEPT_QUEUE_SIZE 100 diff --git a/src/core/lib/iomgr/tcp_windows.cc b/src/core/lib/iomgr/tcp_windows.cc index b94ffcfe912..9574531c57d 100644 --- a/src/core/lib/iomgr/tcp_windows.cc +++ b/src/core/lib/iomgr/tcp_windows.cc @@ -32,7 +32,6 @@ #include #include "src/core/lib/address_utils/sockaddr_utils.h" -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/iomgr/iocp_windows.h" #include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/iomgr/sockaddr_windows.h" @@ -42,6 +41,7 @@ #include "src/core/lib/iomgr/timer.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/slice/slice_string_helpers.h" +#include "src/core/util/crash.h" #include "src/core/util/string.h" #include "src/core/util/useful.h" diff --git a/src/core/lib/iomgr/timer_generic.cc b/src/core/lib/iomgr/timer_generic.cc index 7b1c9d205c2..4d940942c47 100644 --- a/src/core/lib/iomgr/timer_generic.cc +++ b/src/core/lib/iomgr/timer_generic.cc @@ -31,15 +31,15 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/manual_constructor.h" -#include "src/core/lib/gprpp/time.h" -#include "src/core/lib/gprpp/time_averaged_stats.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/port.h" #include "src/core/lib/iomgr/timer.h" #include "src/core/lib/iomgr/timer_heap.h" +#include "src/core/util/crash.h" +#include "src/core/util/manual_constructor.h" #include "src/core/util/spinlock.h" +#include "src/core/util/time.h" +#include "src/core/util/time_averaged_stats.h" #include "src/core/util/useful.h" #define INVALID_HEAP_INDEX 0xffffffffu diff --git a/src/core/lib/iomgr/timer_manager.cc b/src/core/lib/iomgr/timer_manager.cc index 312ed68a025..5d2015ef50c 100644 --- a/src/core/lib/iomgr/timer_manager.cc +++ b/src/core/lib/iomgr/timer_manager.cc @@ -27,9 +27,9 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/thd.h" #include "src/core/lib/iomgr/timer.h" +#include "src/core/util/crash.h" +#include "src/core/util/thd.h" struct completed_thread { grpc_core::Thread thd; diff --git a/src/core/lib/iomgr/unix_sockets_posix.cc b/src/core/lib/iomgr/unix_sockets_posix.cc index 904cb10faa2..01a18602ff6 100644 --- a/src/core/lib/iomgr/unix_sockets_posix.cc +++ b/src/core/lib/iomgr/unix_sockets_posix.cc @@ -39,10 +39,10 @@ #include #include "src/core/lib/address_utils/parse_address.h" -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/iomgr/unix_sockets_posix.h" #include "src/core/lib/transport/error_utils.h" +#include "src/core/util/crash.h" #include "src/core/util/useful.h" void grpc_create_socketpair_if_unix(int sv[2]) { diff --git a/src/core/lib/iomgr/unix_sockets_posix_noop.cc b/src/core/lib/iomgr/unix_sockets_posix_noop.cc index 1f9038e9537..ca5086d9f70 100644 --- a/src/core/lib/iomgr/unix_sockets_posix_noop.cc +++ b/src/core/lib/iomgr/unix_sockets_posix_noop.cc @@ -26,8 +26,6 @@ #include "absl/log/check.h" -#include "src/core/lib/gprpp/crash.h" - void grpc_create_socketpair_if_unix(int /* sv */[2]) { // TODO: Either implement this for the non-Unix socket case or make // sure that it is never called in any such case. Until then, leave an diff --git a/src/core/lib/iomgr/vsock.cc b/src/core/lib/iomgr/vsock.cc index c6dc71a8430..45a769998bf 100644 --- a/src/core/lib/iomgr/vsock.cc +++ b/src/core/lib/iomgr/vsock.cc @@ -30,9 +30,9 @@ #include #include "src/core/lib/address_utils/parse_address.h" -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/transport/error_utils.h" +#include "src/core/util/crash.h" #include "src/core/util/useful.h" absl::StatusOr> grpc_resolve_vsock_address( diff --git a/src/core/lib/iomgr/wakeup_fd_eventfd.cc b/src/core/lib/iomgr/wakeup_fd_eventfd.cc index fcdb63b2e5b..cf2ee410c02 100644 --- a/src/core/lib/iomgr/wakeup_fd_eventfd.cc +++ b/src/core/lib/iomgr/wakeup_fd_eventfd.cc @@ -26,9 +26,9 @@ #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" +#include "src/core/util/crash.h" +#include "src/core/util/strerror.h" static grpc_error_handle eventfd_create(grpc_wakeup_fd* fd_info) { fd_info->read_fd = eventfd(0, EFD_NONBLOCK | EFD_CLOEXEC); diff --git a/src/core/lib/iomgr/wakeup_fd_pipe.cc b/src/core/lib/iomgr/wakeup_fd_pipe.cc index 65bcc8589f7..e2640d263c9 100644 --- a/src/core/lib/iomgr/wakeup_fd_pipe.cc +++ b/src/core/lib/iomgr/wakeup_fd_pipe.cc @@ -28,11 +28,11 @@ #include "absl/log/log.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/strerror.h" #include "src/core/lib/iomgr/socket_utils_posix.h" #include "src/core/lib/iomgr/wakeup_fd_pipe.h" #include "src/core/lib/iomgr/wakeup_fd_posix.h" +#include "src/core/util/crash.h" +#include "src/core/util/strerror.h" static grpc_error_handle pipe_init(grpc_wakeup_fd* fd_info) { int pipefd[2]; diff --git a/src/core/lib/promise/activity.cc b/src/core/lib/promise/activity.cc index 614e343bc8f..7f495ddb1b3 100644 --- a/src/core/lib/promise/activity.cc +++ b/src/core/lib/promise/activity.cc @@ -25,7 +25,7 @@ #include -#include "src/core/lib/gprpp/atomic_utils.h" +#include "src/core/util/atomic_utils.h" namespace grpc_core { diff --git a/src/core/lib/promise/activity.h b/src/core/lib/promise/activity.h index 59d504fd6d1..b84fc473b62 100644 --- a/src/core/lib/promise/activity.h +++ b/src/core/lib/promise/activity.h @@ -32,16 +32,16 @@ #include #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" #include "src/core/lib/promise/context.h" #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/construct_destruct.h" +#include "src/core/util/dump_args.h" #include "src/core/util/latent_see.h" +#include "src/core/util/no_destruct.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/sync.h" namespace grpc_core { diff --git a/src/core/lib/promise/arena_promise.h b/src/core/lib/promise/arena_promise.h index 287d1c650f3..7f4bb0de563 100644 --- a/src/core/lib/promise/arena_promise.h +++ b/src/core/lib/promise/arena_promise.h @@ -26,10 +26,10 @@ #include -#include "src/core/lib/gprpp/construct_destruct.h" #include "src/core/lib/promise/context.h" #include "src/core/lib/promise/poll.h" #include "src/core/lib/resource_quota/arena.h" +#include "src/core/util/construct_destruct.h" namespace grpc_core { diff --git a/src/core/lib/promise/context.h b/src/core/lib/promise/context.h index 61520707d29..c720dfe35b1 100644 --- a/src/core/lib/promise/context.h +++ b/src/core/lib/promise/context.h @@ -22,7 +22,7 @@ #include -#include "src/core/lib/gprpp/down_cast.h" +#include "src/core/util/down_cast.h" namespace grpc_core { diff --git a/src/core/lib/promise/detail/basic_seq.h b/src/core/lib/promise/detail/basic_seq.h index 5f4199e5df3..d48dcd61505 100644 --- a/src/core/lib/promise/detail/basic_seq.h +++ b/src/core/lib/promise/detail/basic_seq.h @@ -17,8 +17,8 @@ #include -#include "src/core/lib/gprpp/construct_destruct.h" #include "src/core/lib/promise/poll.h" +#include "src/core/util/construct_destruct.h" namespace grpc_core { namespace promise_detail { diff --git a/src/core/lib/promise/detail/join_state.h b/src/core/lib/promise/detail/join_state.h index 403ec38b067..032f6b304f0 100644 --- a/src/core/lib/promise/detail/join_state.h +++ b/src/core/lib/promise/detail/join_state.h @@ -27,10 +27,10 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/bitset.h" -#include "src/core/lib/gprpp/construct_destruct.h" #include "src/core/lib/promise/detail/promise_like.h" #include "src/core/lib/promise/poll.h" +#include "src/core/util/bitset.h" +#include "src/core/util/construct_destruct.h" namespace grpc_core { namespace promise_detail { diff --git a/src/core/lib/promise/detail/seq_state.h b/src/core/lib/promise/detail/seq_state.h index 245b8ac26f6..47810f19141 100644 --- a/src/core/lib/promise/detail/seq_state.h +++ b/src/core/lib/promise/detail/seq_state.h @@ -29,11 +29,11 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/construct_destruct.h" -#include "src/core/lib/gprpp/debug_location.h" #include "src/core/lib/promise/detail/promise_factory.h" #include "src/core/lib/promise/detail/promise_like.h" #include "src/core/lib/promise/poll.h" +#include "src/core/util/construct_destruct.h" +#include "src/core/util/debug_location.h" // A sequence under some traits for some set of callables P, Fs. // P should be a promise-like object that yields a value. diff --git a/src/core/lib/promise/exec_ctx_wakeup_scheduler.h b/src/core/lib/promise/exec_ctx_wakeup_scheduler.h index 865381f76b0..cc36e1ff747 100644 --- a/src/core/lib/promise/exec_ctx_wakeup_scheduler.h +++ b/src/core/lib/promise/exec_ctx_wakeup_scheduler.h @@ -19,10 +19,10 @@ #include -#include "src/core/lib/gprpp/debug_location.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" +#include "src/core/util/debug_location.h" namespace grpc_core { diff --git a/src/core/lib/promise/for_each.h b/src/core/lib/promise/for_each.h index 60eb19b713a..5fcaf0094a0 100644 --- a/src/core/lib/promise/for_each.h +++ b/src/core/lib/promise/for_each.h @@ -28,12 +28,12 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/construct_destruct.h" #include "src/core/lib/promise/activity.h" #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/lib/promise/status_flag.h" +#include "src/core/util/construct_destruct.h" namespace grpc_core { diff --git a/src/core/lib/promise/if.h b/src/core/lib/promise/if.h index ed50744b40f..d75aec9a5ff 100644 --- a/src/core/lib/promise/if.h +++ b/src/core/lib/promise/if.h @@ -23,10 +23,10 @@ #include -#include "src/core/lib/gprpp/construct_destruct.h" #include "src/core/lib/promise/detail/promise_factory.h" #include "src/core/lib/promise/detail/promise_like.h" #include "src/core/lib/promise/poll.h" +#include "src/core/util/construct_destruct.h" namespace grpc_core { diff --git a/src/core/lib/promise/inter_activity_latch.h b/src/core/lib/promise/inter_activity_latch.h index 38ef2a0aa4e..c5e89626505 100644 --- a/src/core/lib/promise/inter_activity_latch.h +++ b/src/core/lib/promise/inter_activity_latch.h @@ -26,10 +26,10 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/promise/activity.h" #include "src/core/lib/promise/poll.h" #include "src/core/lib/promise/wait_set.h" +#include "src/core/util/sync.h" namespace grpc_core { diff --git a/src/core/lib/promise/inter_activity_pipe.h b/src/core/lib/promise/inter_activity_pipe.h index e03901b76ce..f6a2144dadb 100644 --- a/src/core/lib/promise/inter_activity_pipe.h +++ b/src/core/lib/promise/inter_activity_pipe.h @@ -25,11 +25,11 @@ #include -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/promise/activity.h" #include "src/core/lib/promise/poll.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" namespace grpc_core { diff --git a/src/core/lib/promise/interceptor_list.h b/src/core/lib/promise/interceptor_list.h index dc9b63d3f8c..d75e6452892 100644 --- a/src/core/lib/promise/interceptor_list.h +++ b/src/core/lib/promise/interceptor_list.h @@ -30,12 +30,12 @@ #include -#include "src/core/lib/gprpp/construct_destruct.h" -#include "src/core/lib/gprpp/debug_location.h" #include "src/core/lib/promise/context.h" #include "src/core/lib/promise/detail/promise_factory.h" #include "src/core/lib/promise/poll.h" #include "src/core/lib/resource_quota/arena.h" +#include "src/core/util/construct_destruct.h" +#include "src/core/util/debug_location.h" namespace grpc_core { diff --git a/src/core/lib/promise/loop.h b/src/core/lib/promise/loop.h index acfabce2e7f..a7e4195cdea 100644 --- a/src/core/lib/promise/loop.h +++ b/src/core/lib/promise/loop.h @@ -23,9 +23,9 @@ #include -#include "src/core/lib/gprpp/construct_destruct.h" #include "src/core/lib/promise/detail/promise_factory.h" #include "src/core/lib/promise/poll.h" +#include "src/core/util/construct_destruct.h" namespace grpc_core { diff --git a/src/core/lib/promise/mpsc.h b/src/core/lib/promise/mpsc.h index 4df3e61a512..02c8d2f97a4 100644 --- a/src/core/lib/promise/mpsc.h +++ b/src/core/lib/promise/mpsc.h @@ -28,12 +28,12 @@ #include -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/promise/activity.h" #include "src/core/lib/promise/poll.h" #include "src/core/lib/promise/wait_set.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" // Multi producer single consumer inter-activity comms. diff --git a/src/core/lib/promise/observable.h b/src/core/lib/promise/observable.h index 9337feace3f..0f500d66317 100644 --- a/src/core/lib/promise/observable.h +++ b/src/core/lib/promise/observable.h @@ -21,9 +21,9 @@ #include -#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/promise/activity.h" #include "src/core/lib/promise/poll.h" +#include "src/core/util/sync.h" namespace grpc_core { diff --git a/src/core/lib/promise/party.cc b/src/core/lib/promise/party.cc index aaa273d16a2..cfc34ebedee 100644 --- a/src/core/lib/promise/party.cc +++ b/src/core/lib/promise/party.cc @@ -25,14 +25,14 @@ #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" +#include "src/core/util/sync.h" #ifdef GRPC_MAXIMIZE_THREADYNESS -#include "src/core/lib/gprpp/thd.h" // IWYU pragma: keep #include "src/core/lib/iomgr/exec_ctx.h" // IWYU pragma: keep +#include "src/core/util/thd.h" // IWYU pragma: keep #endif namespace grpc_core { diff --git a/src/core/lib/promise/party.h b/src/core/lib/promise/party.h index d9a2e2ccb57..a38467a924b 100644 --- a/src/core/lib/promise/party.h +++ b/src/core/lib/promise/party.h @@ -32,16 +32,16 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/construct_destruct.h" -#include "src/core/lib/gprpp/crash.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" #include "src/core/lib/promise/activity.h" #include "src/core/lib/promise/context.h" #include "src/core/lib/promise/detail/promise_factory.h" #include "src/core/lib/promise/poll.h" #include "src/core/lib/resource_quota/arena.h" +#include "src/core/util/construct_destruct.h" +#include "src/core/util/crash.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" #include "src/core/util/useful.h" namespace grpc_core { diff --git a/src/core/lib/promise/pipe.h b/src/core/lib/promise/pipe.h index 59ec003f47d..f3dac4532af 100644 --- a/src/core/lib/promise/pipe.h +++ b/src/core/lib/promise/pipe.h @@ -30,8 +30,6 @@ #include -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/promise/activity.h" #include "src/core/lib/promise/context.h" #include "src/core/lib/promise/if.h" @@ -40,6 +38,8 @@ #include "src/core/lib/promise/poll.h" #include "src/core/lib/promise/seq.h" #include "src/core/lib/resource_quota/arena.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_core { diff --git a/src/core/lib/promise/poll.h b/src/core/lib/promise/poll.h index 36570a56fbc..9b895cea032 100644 --- a/src/core/lib/promise/poll.h +++ b/src/core/lib/promise/poll.h @@ -24,7 +24,7 @@ #include -#include "src/core/lib/gprpp/construct_destruct.h" +#include "src/core/util/construct_destruct.h" namespace grpc_core { diff --git a/src/core/lib/promise/seq.h b/src/core/lib/promise/seq.h index d25a8caefbc..40051ae4939 100644 --- a/src/core/lib/promise/seq.h +++ b/src/core/lib/promise/seq.h @@ -21,11 +21,11 @@ #include -#include "src/core/lib/gprpp/debug_location.h" #include "src/core/lib/promise/detail/basic_seq.h" #include "src/core/lib/promise/detail/promise_like.h" #include "src/core/lib/promise/detail/seq_state.h" #include "src/core/lib/promise/poll.h" +#include "src/core/util/debug_location.h" namespace grpc_core { diff --git a/src/core/lib/promise/sleep.cc b/src/core/lib/promise/sleep.cc index 1b793367149..d31e2a82595 100644 --- a/src/core/lib/promise/sleep.cc +++ b/src/core/lib/promise/sleep.cc @@ -20,11 +20,11 @@ #include #include "src/core/lib/event_engine/event_engine_context.h" // IWYU pragma: keep -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/promise/activity.h" #include "src/core/lib/promise/context.h" #include "src/core/lib/promise/poll.h" +#include "src/core/util/time.h" namespace grpc_core { diff --git a/src/core/lib/promise/sleep.h b/src/core/lib/promise/sleep.h index b595b7100e3..0ae4232d7b7 100644 --- a/src/core/lib/promise/sleep.h +++ b/src/core/lib/promise/sleep.h @@ -23,9 +23,9 @@ #include #include -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/promise/activity.h" #include "src/core/lib/promise/poll.h" +#include "src/core/util/time.h" namespace grpc_core { diff --git a/src/core/lib/promise/wait_for_callback.h b/src/core/lib/promise/wait_for_callback.h index 519253bbb24..6aabfe57970 100644 --- a/src/core/lib/promise/wait_for_callback.h +++ b/src/core/lib/promise/wait_for_callback.h @@ -22,9 +22,9 @@ #include -#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/promise/activity.h" #include "src/core/lib/promise/poll.h" +#include "src/core/util/sync.h" namespace grpc_core { diff --git a/src/core/lib/resource_quota/api.cc b/src/core/lib/resource_quota/api.cc index 7e2f9594e65..113685e08f4 100644 --- a/src/core/lib/resource_quota/api.cc +++ b/src/core/lib/resource_quota/api.cc @@ -28,11 +28,11 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/lib/resource_quota/resource_quota.h" #include "src/core/lib/resource_quota/thread_quota.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_core { diff --git a/src/core/lib/resource_quota/arena.h b/src/core/lib/resource_quota/arena.h index c80528fa39f..fd962df93a8 100644 --- a/src/core/lib/resource_quota/arena.h +++ b/src/core/lib/resource_quota/arena.h @@ -35,10 +35,10 @@ #include #include -#include "src/core/lib/gprpp/construct_destruct.h" #include "src/core/lib/promise/context.h" #include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/util/alloc.h" +#include "src/core/util/construct_destruct.h" namespace grpc_core { diff --git a/src/core/lib/resource_quota/connection_quota.h b/src/core/lib/resource_quota/connection_quota.h index fcaddc1b58a..ac0aa6cdb29 100644 --- a/src/core/lib/resource_quota/connection_quota.h +++ b/src/core/lib/resource_quota/connection_quota.h @@ -22,10 +22,10 @@ #include -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/resource_quota/memory_quota.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" namespace grpc_core { diff --git a/src/core/lib/resource_quota/memory_quota.cc b/src/core/lib/resource_quota/memory_quota.cc index 29b3a581a92..ee785e62adf 100644 --- a/src/core/lib/resource_quota/memory_quota.cc +++ b/src/core/lib/resource_quota/memory_quota.cc @@ -35,13 +35,13 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/mpscq.h" #include "src/core/lib/promise/exec_ctx_wakeup_scheduler.h" #include "src/core/lib/promise/loop.h" #include "src/core/lib/promise/map.h" #include "src/core/lib/promise/race.h" #include "src/core/lib/promise/seq.h" #include "src/core/lib/slice/slice_refcount.h" +#include "src/core/util/mpscq.h" #include "src/core/util/useful.h" namespace grpc_core { diff --git a/src/core/lib/resource_quota/memory_quota.h b/src/core/lib/resource_quota/memory_quota.h index f1281cc5bac..39c7d83a48a 100644 --- a/src/core/lib/resource_quota/memory_quota.h +++ b/src/core/lib/resource_quota/memory_quota.h @@ -39,13 +39,13 @@ #include "src/core/lib/debug/trace.h" #include "src/core/lib/experiments/experiments.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/gprpp/time.h" #include "src/core/lib/promise/activity.h" #include "src/core/lib/promise/poll.h" #include "src/core/lib/resource_quota/periodic_update.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.h" #include "src/core/util/useful.h" namespace grpc_core { diff --git a/src/core/lib/resource_quota/periodic_update.h b/src/core/lib/resource_quota/periodic_update.h index 4104c94a78b..7a91510ef77 100644 --- a/src/core/lib/resource_quota/periodic_update.h +++ b/src/core/lib/resource_quota/periodic_update.h @@ -23,7 +23,7 @@ #include -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" namespace grpc_core { diff --git a/src/core/lib/resource_quota/resource_quota.h b/src/core/lib/resource_quota/resource_quota.h index e17448f14eb..0704a162eef 100644 --- a/src/core/lib/resource_quota/resource_quota.h +++ b/src/core/lib/resource_quota/resource_quota.h @@ -24,11 +24,11 @@ #include #include -#include "src/core/lib/gprpp/cpp_impl_of.h" -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/lib/resource_quota/thread_quota.h" +#include "src/core/util/cpp_impl_of.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" #include "src/core/util/useful.h" namespace grpc_core { diff --git a/src/core/lib/resource_quota/thread_quota.h b/src/core/lib/resource_quota/thread_quota.h index d66ee574c02..965436f20df 100644 --- a/src/core/lib/resource_quota/thread_quota.h +++ b/src/core/lib/resource_quota/thread_quota.h @@ -22,9 +22,9 @@ #include -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" namespace grpc_core { diff --git a/src/core/lib/security/authorization/audit_logging.cc b/src/core/lib/security/authorization/audit_logging.cc index d5c8f95705e..2f8ac055c1c 100644 --- a/src/core/lib/security/authorization/audit_logging.cc +++ b/src/core/lib/security/authorization/audit_logging.cc @@ -32,8 +32,8 @@ #include #include -#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/security/authorization/stdout_logger.h" +#include "src/core/util/sync.h" namespace grpc_core { namespace experimental { diff --git a/src/core/lib/security/authorization/audit_logging.h b/src/core/lib/security/authorization/audit_logging.h index 694810599cf..1f97120cd60 100644 --- a/src/core/lib/security/authorization/audit_logging.h +++ b/src/core/lib/security/authorization/audit_logging.h @@ -30,7 +30,7 @@ #include #include -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/sync.h" namespace grpc_core { namespace experimental { diff --git a/src/core/lib/security/authorization/authorization_engine.h b/src/core/lib/security/authorization/authorization_engine.h index 37486cef420..4dca42bea85 100644 --- a/src/core/lib/security/authorization/authorization_engine.h +++ b/src/core/lib/security/authorization/authorization_engine.h @@ -19,8 +19,8 @@ #include -#include "src/core/lib/gprpp/ref_counted.h" #include "src/core/lib/security/authorization/evaluate_args.h" +#include "src/core/util/ref_counted.h" namespace grpc_core { diff --git a/src/core/lib/security/authorization/authorization_policy_provider.h b/src/core/lib/security/authorization/authorization_policy_provider.h index a4dbc5e8a08..6dfdc8fb875 100644 --- a/src/core/lib/security/authorization/authorization_policy_provider.h +++ b/src/core/lib/security/authorization/authorization_policy_provider.h @@ -21,9 +21,9 @@ #include #include -#include "src/core/lib/gprpp/dual_ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/security/authorization/authorization_engine.h" +#include "src/core/util/dual_ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" #include "src/core/util/useful.h" struct grpc_authorization_policy_provider diff --git a/src/core/lib/security/authorization/authorization_policy_provider_vtable.cc b/src/core/lib/security/authorization/authorization_policy_provider_vtable.cc index 8c8236e2367..315c655b0bc 100644 --- a/src/core/lib/security/authorization/authorization_policy_provider_vtable.cc +++ b/src/core/lib/security/authorization/authorization_policy_provider_vtable.cc @@ -16,8 +16,8 @@ #include #include -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/security/authorization/authorization_policy_provider.h" +#include "src/core/util/ref_counted_ptr.h" #include "src/core/util/useful.h" namespace { diff --git a/src/core/lib/security/authorization/evaluate_args.cc b/src/core/lib/security/authorization/evaluate_args.cc index 9a420347c09..0a4e23d1923 100644 --- a/src/core/lib/security/authorization/evaluate_args.cc +++ b/src/core/lib/security/authorization/evaluate_args.cc @@ -27,10 +27,10 @@ #include "src/core/handshaker/endpoint_info/endpoint_info_handshaker.h" #include "src/core/lib/address_utils/parse_address.h" -#include "src/core/lib/gprpp/host_port.h" #include "src/core/lib/security/credentials/tls/tls_utils.h" #include "src/core/lib/slice/slice.h" -#include "src/core/lib/uri/uri_parser.h" +#include "src/core/util/host_port.h" +#include "src/core/util/uri.h" namespace grpc_core { diff --git a/src/core/lib/security/authorization/grpc_authorization_policy_provider.cc b/src/core/lib/security/authorization/grpc_authorization_policy_provider.cc index 4380e09086a..171fd61b3f1 100644 --- a/src/core/lib/security/authorization/grpc_authorization_policy_provider.cc +++ b/src/core/lib/security/authorization/grpc_authorization_policy_provider.cc @@ -30,14 +30,14 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/load_file.h" -#include "src/core/lib/gprpp/status_helper.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/security/authorization/grpc_authorization_engine.h" #include "src/core/lib/security/authorization/rbac_policy.h" #include "src/core/lib/security/authorization/rbac_translator.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/slice/slice_internal.h" +#include "src/core/util/load_file.h" +#include "src/core/util/status_helper.h" namespace grpc_core { diff --git a/src/core/lib/security/authorization/grpc_authorization_policy_provider.h b/src/core/lib/security/authorization/grpc_authorization_policy_provider.h index b61db3131b1..f7e6aff40d7 100644 --- a/src/core/lib/security/authorization/grpc_authorization_policy_provider.h +++ b/src/core/lib/security/authorization/grpc_authorization_policy_provider.h @@ -28,12 +28,12 @@ #include #include -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/thd.h" #include "src/core/lib/security/authorization/authorization_engine.h" #include "src/core/lib/security/authorization/authorization_policy_provider.h" #include "src/core/lib/security/authorization/rbac_translator.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" +#include "src/core/util/thd.h" namespace grpc_core { diff --git a/src/core/lib/security/authorization/grpc_server_authz_filter.h b/src/core/lib/security/authorization/grpc_server_authz_filter.h index cfd9c3bbd26..733142cfca3 100644 --- a/src/core/lib/security/authorization/grpc_server_authz_filter.h +++ b/src/core/lib/security/authorization/grpc_server_authz_filter.h @@ -23,12 +23,12 @@ #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/promise/arena_promise.h" #include "src/core/lib/security/authorization/authorization_policy_provider.h" #include "src/core/lib/security/authorization/evaluate_args.h" #include "src/core/lib/security/context/security_context.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_core { diff --git a/src/core/lib/security/authorization/matchers.h b/src/core/lib/security/authorization/matchers.h index 354d7c0cb3e..eaadd07b4e7 100644 --- a/src/core/lib/security/authorization/matchers.h +++ b/src/core/lib/security/authorization/matchers.h @@ -26,9 +26,9 @@ #include #include "src/core/lib/iomgr/resolved_address.h" -#include "src/core/lib/matchers/matchers.h" #include "src/core/lib/security/authorization/evaluate_args.h" #include "src/core/lib/security/authorization/rbac_policy.h" +#include "src/core/util/matchers.h" namespace grpc_core { diff --git a/src/core/lib/security/authorization/rbac_policy.h b/src/core/lib/security/authorization/rbac_policy.h index b3a2c6db6aa..03b4e283cde 100644 --- a/src/core/lib/security/authorization/rbac_policy.h +++ b/src/core/lib/security/authorization/rbac_policy.h @@ -27,7 +27,7 @@ #include #include -#include "src/core/lib/matchers/matchers.h" +#include "src/core/util/matchers.h" namespace grpc_core { diff --git a/src/core/lib/security/authorization/rbac_translator.cc b/src/core/lib/security/authorization/rbac_translator.cc index d427ce8ea07..342f9248371 100644 --- a/src/core/lib/security/authorization/rbac_translator.cc +++ b/src/core/lib/security/authorization/rbac_translator.cc @@ -36,10 +36,10 @@ #include #include -#include "src/core/lib/matchers/matchers.h" #include "src/core/lib/security/authorization/audit_logging.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_reader.h" +#include "src/core/util/matchers.h" #include "src/core/util/useful.h" namespace grpc_core { diff --git a/src/core/lib/security/certificate_provider/certificate_provider_factory.h b/src/core/lib/security/certificate_provider/certificate_provider_factory.h index 719561a1eec..9da32e9233f 100644 --- a/src/core/lib/security/certificate_provider/certificate_provider_factory.h +++ b/src/core/lib/security/certificate_provider/certificate_provider_factory.h @@ -27,11 +27,11 @@ #include #include -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/validation_errors.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_args.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/validation_errors.h" namespace grpc_core { diff --git a/src/core/lib/security/context/security_context.cc b/src/core/lib/security/context/security_context.cc index feade8cd9dd..67a219d9038 100644 --- a/src/core/lib/security/context/security_context.cc +++ b/src/core/lib/security/context/security_context.cc @@ -33,11 +33,11 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/surface/call.h" +#include "src/core/util/ref_counted_ptr.h" // --- grpc_call --- diff --git a/src/core/lib/security/context/security_context.h b/src/core/lib/security/context/security_context.h index 7240ba955bd..cc3b21620a5 100644 --- a/src/core/lib/security/context/security_context.h +++ b/src/core/lib/security/context/security_context.h @@ -33,11 +33,11 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/security/credentials/credentials.h" // IWYU pragma: keep +#include "src/core/util/debug_location.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" #include "src/core/util/useful.h" // --- grpc_auth_context --- diff --git a/src/core/lib/security/credentials/alts/alts_credentials.h b/src/core/lib/security/credentials/alts/alts_credentials.h index e49ef34be4e..3aa072789ff 100644 --- a/src/core/lib/security/credentials/alts/alts_credentials.h +++ b/src/core/lib/security/credentials/alts/alts_credentials.h @@ -25,10 +25,10 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/unique_type_name.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/security_connector/security_connector.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/unique_type_name.h" #include "src/core/util/useful.h" // Main struct for grpc ALTS channel credential. diff --git a/src/core/lib/security/credentials/alts/check_gcp_environment_no_op.cc b/src/core/lib/security/credentials/alts/check_gcp_environment_no_op.cc index d9078a4c81a..4de3a24eae6 100644 --- a/src/core/lib/security/credentials/alts/check_gcp_environment_no_op.cc +++ b/src/core/lib/security/credentials/alts/check_gcp_environment_no_op.cc @@ -22,8 +22,8 @@ #include "absl/log/log.h" -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/security/credentials/alts/check_gcp_environment.h" +#include "src/core/util/crash.h" bool grpc_alts_is_running_on_gcp() { VLOG(2) << "ALTS: Platforms other than Linux and Windows are not supported"; diff --git a/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc b/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc index 85639e51840..df6a6240974 100644 --- a/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc +++ b/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc @@ -28,8 +28,8 @@ #include #include -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/security/credentials/alts/check_gcp_environment.h" +#include "src/core/util/crash.h" namespace grpc_core { namespace internal { diff --git a/src/core/lib/security/credentials/call_creds_util.cc b/src/core/lib/security/credentials/call_creds_util.cc index 037d60196c9..71c3da6dfa3 100644 --- a/src/core/lib/security/credentials/call_creds_util.cc +++ b/src/core/lib/security/credentials/call_creds_util.cc @@ -25,10 +25,10 @@ #include #include -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/security/context/security_context.h" #include "src/core/lib/security/security_connector/security_connector.h" #include "src/core/lib/transport/metadata_batch.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_core { diff --git a/src/core/lib/security/credentials/channel_creds_registry.h b/src/core/lib/security/credentials/channel_creds_registry.h index 8fa2462f2ba..17771ff8d9e 100644 --- a/src/core/lib/security/credentials/channel_creds_registry.h +++ b/src/core/lib/security/credentials/channel_creds_registry.h @@ -26,11 +26,11 @@ #include -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/validation_errors.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_args.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/validation_errors.h" struct grpc_channel_credentials; diff --git a/src/core/lib/security/credentials/channel_creds_registry_init.cc b/src/core/lib/security/credentials/channel_creds_registry_init.cc index 832daba1284..de2f7d143b9 100644 --- a/src/core/lib/security/credentials/channel_creds_registry_init.cc +++ b/src/core/lib/security/credentials/channel_creds_registry_init.cc @@ -31,9 +31,6 @@ #include #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/time.h" -#include "src/core/lib/gprpp/validation_errors.h" #include "src/core/lib/security/credentials/channel_creds_registry.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/credentials/fake/fake_credentials.h" @@ -44,6 +41,9 @@ #include "src/core/util/json/json.h" #include "src/core/util/json/json_args.h" #include "src/core/util/json/json_object_loader.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" +#include "src/core/util/validation_errors.h" namespace grpc_core { diff --git a/src/core/lib/security/credentials/composite/composite_credentials.cc b/src/core/lib/security/credentials/composite/composite_credentials.cc index db5d3079cbc..d5d8c76baf4 100644 --- a/src/core/lib/security/credentials/composite/composite_credentials.cc +++ b/src/core/lib/security/credentials/composite/composite_credentials.cc @@ -29,9 +29,9 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/promise/try_seq.h" #include "src/core/lib/transport/metadata_batch.h" +#include "src/core/util/ref_counted_ptr.h" // // grpc_composite_channel_credentials diff --git a/src/core/lib/security/credentials/composite/composite_credentials.h b/src/core/lib/security/credentials/composite/composite_credentials.h index 6bd13f0dea8..64b05de2cf1 100644 --- a/src/core/lib/security/credentials/composite/composite_credentials.h +++ b/src/core/lib/security/credentials/composite/composite_credentials.h @@ -33,12 +33,12 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/unique_type_name.h" #include "src/core/lib/promise/arena_promise.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/security_connector/security_connector.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/unique_type_name.h" #include "src/core/util/useful.h" // -- Composite channel credentials. -- diff --git a/src/core/lib/security/credentials/credentials.cc b/src/core/lib/security/credentials/credentials.cc index 6cdb1399ce5..6f43677d8f0 100644 --- a/src/core/lib/security/credentials/credentials.cc +++ b/src/core/lib/security/credentials/credentials.cc @@ -28,7 +28,6 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/util/useful.h" diff --git a/src/core/lib/security/credentials/credentials.h b/src/core/lib/security/credentials/credentials.h index 3066cbfeb33..57f0eaaa62b 100644 --- a/src/core/lib/security/credentials/credentials.h +++ b/src/core/lib/security/credentials/credentials.h @@ -35,14 +35,14 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/crash.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/promise/arena_promise.h" #include "src/core/lib/security/security_connector/security_connector.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/crash.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/unique_type_name.h" // --- Constants. --- diff --git a/src/core/lib/security/credentials/external/aws_external_account_credentials.cc b/src/core/lib/security/credentials/external/aws_external_account_credentials.cc index c2e06861019..23061f1679a 100644 --- a/src/core/lib/security/credentials/external/aws_external_account_credentials.cc +++ b/src/core/lib/security/credentials/external/aws_external_account_credentials.cc @@ -37,14 +37,14 @@ #include #include -#include "src/core/lib/gprpp/env.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/security/credentials/credentials.h" -#include "src/core/lib/uri/uri_parser.h" +#include "src/core/util/env.h" #include "src/core/util/http_client/httpcli_ssl_credentials.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_reader.h" #include "src/core/util/json/json_writer.h" +#include "src/core/util/uri.h" namespace grpc_core { diff --git a/src/core/lib/security/credentials/external/aws_external_account_credentials.h b/src/core/lib/security/credentials/external/aws_external_account_credentials.h index 588001e480b..466094cbe23 100644 --- a/src/core/lib/security/credentials/external/aws_external_account_credentials.h +++ b/src/core/lib/security/credentials/external/aws_external_account_credentials.h @@ -26,13 +26,13 @@ #include -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/security/credentials/external/aws_request_signer.h" #include "src/core/lib/security/credentials/external/external_account_credentials.h" #include "src/core/util/http_client/httpcli.h" #include "src/core/util/http_client/parser.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_core { diff --git a/src/core/lib/security/credentials/external/aws_request_signer.h b/src/core/lib/security/credentials/external/aws_request_signer.h index 239abe090e6..59a5390f795 100644 --- a/src/core/lib/security/credentials/external/aws_request_signer.h +++ b/src/core/lib/security/credentials/external/aws_request_signer.h @@ -23,7 +23,7 @@ #include #include "src/core/lib/iomgr/error.h" -#include "src/core/lib/uri/uri_parser.h" +#include "src/core/util/uri.h" namespace grpc_core { diff --git a/src/core/lib/security/credentials/external/external_account_credentials.cc b/src/core/lib/security/credentials/external/external_account_credentials.cc index c83351e67e2..7c4955bc09d 100644 --- a/src/core/lib/security/credentials/external/external_account_credentials.cc +++ b/src/core/lib/security/credentials/external/external_account_credentials.cc @@ -45,17 +45,17 @@ #include #include -#include "src/core/lib/gprpp/status_helper.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/credentials/external/aws_external_account_credentials.h" #include "src/core/lib/security/credentials/external/file_external_account_credentials.h" #include "src/core/lib/security/credentials/external/url_external_account_credentials.h" #include "src/core/lib/security/util/json_util.h" -#include "src/core/lib/uri/uri_parser.h" #include "src/core/util/http_client/httpcli_ssl_credentials.h" #include "src/core/util/http_client/parser.h" #include "src/core/util/json/json_reader.h" #include "src/core/util/json/json_writer.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/uri.h" #define EXTERNAL_ACCOUNT_CREDENTIALS_GRANT_TYPE \ "urn:ietf:params:oauth:grant-type:token-exchange" diff --git a/src/core/lib/security/credentials/external/external_account_credentials.h b/src/core/lib/security/credentials/external/external_account_credentials.h index 5dfbb24a36e..3323d21bbf0 100644 --- a/src/core/lib/security/credentials/external/external_account_credentials.h +++ b/src/core/lib/security/credentials/external/external_account_credentials.h @@ -29,9 +29,6 @@ #include #include -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/polling_entity.h" @@ -40,6 +37,9 @@ #include "src/core/util/http_client/httpcli.h" #include "src/core/util/http_client/parser.h" #include "src/core/util/json/json.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" namespace grpc_core { diff --git a/src/core/lib/security/credentials/external/file_external_account_credentials.cc b/src/core/lib/security/credentials/external/file_external_account_credentials.cc index 086af8c79c7..c38adc83dc6 100644 --- a/src/core/lib/security/credentials/external/file_external_account_credentials.cc +++ b/src/core/lib/security/credentials/external/file_external_account_credentials.cc @@ -26,11 +26,11 @@ #include #include -#include "src/core/lib/gprpp/load_file.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_reader.h" +#include "src/core/util/load_file.h" namespace grpc_core { diff --git a/src/core/lib/security/credentials/external/file_external_account_credentials.h b/src/core/lib/security/credentials/external/file_external_account_credentials.h index 8ed7b146537..7d4721a0bf4 100644 --- a/src/core/lib/security/credentials/external/file_external_account_credentials.h +++ b/src/core/lib/security/credentials/external/file_external_account_credentials.h @@ -25,9 +25,9 @@ #include -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/security/credentials/external/external_account_credentials.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_core { diff --git a/src/core/lib/security/credentials/external/url_external_account_credentials.h b/src/core/lib/security/credentials/external/url_external_account_credentials.h index 65dcae9176e..bf44736edf6 100644 --- a/src/core/lib/security/credentials/external/url_external_account_credentials.h +++ b/src/core/lib/security/credentials/external/url_external_account_credentials.h @@ -26,12 +26,12 @@ #include -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/security/credentials/external/external_account_credentials.h" -#include "src/core/lib/uri/uri_parser.h" #include "src/core/util/http_client/httpcli.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/uri.h" namespace grpc_core { diff --git a/src/core/lib/security/credentials/fake/fake_credentials.cc b/src/core/lib/security/credentials/fake/fake_credentials.cc index 2eb12fa1039..1e0f6f33eb4 100644 --- a/src/core/lib/security/credentials/fake/fake_credentials.cc +++ b/src/core/lib/security/credentials/fake/fake_credentials.cc @@ -28,11 +28,11 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/promise/promise.h" #include "src/core/lib/security/security_connector/fake/fake_security_connector.h" #include "src/core/lib/security/security_connector/security_connector.h" #include "src/core/lib/transport/metadata_batch.h" +#include "src/core/util/ref_counted_ptr.h" // -- Fake transport security credentials. -- diff --git a/src/core/lib/security/credentials/fake/fake_credentials.h b/src/core/lib/security/credentials/fake/fake_credentials.h index d4b00d6eb40..fe4fb414593 100644 --- a/src/core/lib/security/credentials/fake/fake_credentials.h +++ b/src/core/lib/security/credentials/fake/fake_credentials.h @@ -30,13 +30,13 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/unique_type_name.h" #include "src/core/lib/promise/arena_promise.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/security_connector/security_connector.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/unique_type_name.h" #include "src/core/util/useful.h" #define GRPC_ARG_FAKE_SECURITY_EXPECTED_TARGETS \ diff --git a/src/core/lib/security/credentials/gcp_service_account_identity/gcp_service_account_identity_credentials.cc b/src/core/lib/security/credentials/gcp_service_account_identity/gcp_service_account_identity_credentials.cc index 11aa4e158d7..8b3c8c8701d 100644 --- a/src/core/lib/security/credentials/gcp_service_account_identity/gcp_service_account_identity_credentials.cc +++ b/src/core/lib/security/credentials/gcp_service_account_identity/gcp_service_account_identity_credentials.cc @@ -26,16 +26,16 @@ #include -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/status_helper.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/transport/metadata.h" #include "src/core/lib/transport/status_conversion.h" -#include "src/core/lib/uri/uri_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" #include "src/core/util/json/json_reader.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/uri.h" namespace grpc_core { diff --git a/src/core/lib/security/credentials/gcp_service_account_identity/gcp_service_account_identity_credentials.h b/src/core/lib/security/credentials/gcp_service_account_identity/gcp_service_account_identity_credentials.h index 231e9bbccc6..2e75547c402 100644 --- a/src/core/lib/security/credentials/gcp_service_account_identity/gcp_service_account_identity_credentials.h +++ b/src/core/lib/security/credentials/gcp_service_account_identity/gcp_service_account_identity_credentials.h @@ -23,10 +23,6 @@ #include #include -#include "src/core/lib/gprpp/orphanable.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/closure.h" #include "src/core/lib/iomgr/polling_entity.h" #include "src/core/lib/security/credentials/credentials.h" @@ -35,6 +31,10 @@ #include "src/core/lib/transport/metadata.h" #include "src/core/util/http_client/httpcli.h" #include "src/core/util/http_client/parser.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" +#include "src/core/util/unique_type_name.h" namespace grpc_core { diff --git a/src/core/lib/security/credentials/google_default/credentials_generic.cc b/src/core/lib/security/credentials/google_default/credentials_generic.cc index cf748049b98..f09e5681c88 100644 --- a/src/core/lib/security/credentials/google_default/credentials_generic.cc +++ b/src/core/lib/security/credentials/google_default/credentials_generic.cc @@ -24,9 +24,9 @@ #include -#include "src/core/lib/gprpp/env.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/credentials/google_default/google_default_credentials.h" +#include "src/core/util/env.h" std::string grpc_get_well_known_google_credentials_file_path_impl(void) { auto base = grpc_core::GetEnv(GRPC_GOOGLE_CREDENTIALS_PATH_ENV_VAR); diff --git a/src/core/lib/security/credentials/google_default/google_default_credentials.cc b/src/core/lib/security/credentials/google_default/google_default_credentials.cc index d649eb5512b..ba9aeca2942 100644 --- a/src/core/lib/security/credentials/google_default/google_default_credentials.cc +++ b/src/core/lib/security/credentials/google_default/google_default_credentials.cc @@ -42,13 +42,6 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/env.h" -#include "src/core/lib/gprpp/load_file.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/status_helper.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" @@ -64,13 +57,20 @@ #include "src/core/lib/slice/slice.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/transport/error_utils.h" -#include "src/core/lib/uri/uri_parser.h" #include "src/core/load_balancing/grpclb/grpclb.h" #include "src/core/load_balancing/xds/xds_channel_args.h" +#include "src/core/util/env.h" #include "src/core/util/http_client/httpcli.h" #include "src/core/util/http_client/parser.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_reader.h" +#include "src/core/util/load_file.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.h" +#include "src/core/util/uri.h" using grpc_core::Json; diff --git a/src/core/lib/security/credentials/google_default/google_default_credentials.h b/src/core/lib/security/credentials/google_default/google_default_credentials.h index 8611cbdc254..58f9ae40cdc 100644 --- a/src/core/lib/security/credentials/google_default/google_default_credentials.h +++ b/src/core/lib/security/credentials/google_default/google_default_credentials.h @@ -26,10 +26,10 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/unique_type_name.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/security_connector/security_connector.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/unique_type_name.h" #include "src/core/util/useful.h" #define GRPC_GOOGLE_CLOUD_SDK_CONFIG_DIRECTORY "gcloud" diff --git a/src/core/lib/security/credentials/iam/iam_credentials.cc b/src/core/lib/security/credentials/iam/iam_credentials.cc index 876851555da..8d855978676 100644 --- a/src/core/lib/security/credentials/iam/iam_credentials.cc +++ b/src/core/lib/security/credentials/iam/iam_credentials.cc @@ -30,10 +30,10 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/promise/promise.h" #include "src/core/lib/transport/metadata_batch.h" +#include "src/core/util/ref_counted_ptr.h" grpc_core::ArenaPromise> grpc_google_iam_credentials::GetRequestMetadata( diff --git a/src/core/lib/security/credentials/iam/iam_credentials.h b/src/core/lib/security/credentials/iam/iam_credentials.h index 8fa67a9048d..aa8426048f1 100644 --- a/src/core/lib/security/credentials/iam/iam_credentials.h +++ b/src/core/lib/security/credentials/iam/iam_credentials.h @@ -28,11 +28,11 @@ #include #include -#include "src/core/lib/gprpp/unique_type_name.h" #include "src/core/lib/promise/arena_promise.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/unique_type_name.h" #include "src/core/util/useful.h" class grpc_google_iam_credentials : public grpc_call_credentials { diff --git a/src/core/lib/security/credentials/insecure/insecure_credentials.h b/src/core/lib/security/credentials/insecure/insecure_credentials.h index e9bf9327e72..9e89970f219 100644 --- a/src/core/lib/security/credentials/insecure/insecure_credentials.h +++ b/src/core/lib/security/credentials/insecure/insecure_credentials.h @@ -25,10 +25,10 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/unique_type_name.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/security_connector/security_connector.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/unique_type_name.h" namespace grpc_core { diff --git a/src/core/lib/security/credentials/jwt/jwt_credentials.cc b/src/core/lib/security/credentials/jwt/jwt_credentials.cc index 33636819c4f..ab3cb4af773 100644 --- a/src/core/lib/security/credentials/jwt/jwt_credentials.cc +++ b/src/core/lib/security/credentials/jwt/jwt_credentials.cc @@ -37,15 +37,15 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/promise/promise.h" #include "src/core/lib/security/credentials/call_creds_util.h" #include "src/core/lib/transport/metadata_batch.h" -#include "src/core/lib/uri/uri_parser.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_reader.h" #include "src/core/util/json/json_writer.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/uri.h" using grpc_core::Json; diff --git a/src/core/lib/security/credentials/jwt/jwt_credentials.h b/src/core/lib/security/credentials/jwt/jwt_credentials.h index 751ff187fc6..26dfa169ad4 100644 --- a/src/core/lib/security/credentials/jwt/jwt_credentials.h +++ b/src/core/lib/security/credentials/jwt/jwt_credentials.h @@ -35,13 +35,13 @@ #include #include -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/unique_type_name.h" #include "src/core/lib/promise/arena_promise.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/credentials/jwt/json_token.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/unique_type_name.h" #include "src/core/util/useful.h" class grpc_service_account_jwt_access_credentials diff --git a/src/core/lib/security/credentials/jwt/jwt_verifier.cc b/src/core/lib/security/credentials/jwt/jwt_verifier.cc index 14da6885097..5f45ece8056 100644 --- a/src/core/lib/security/credentials/jwt/jwt_verifier.cc +++ b/src/core/lib/security/credentials/jwt/jwt_verifier.cc @@ -54,9 +54,6 @@ #include #include -#include "src/core/lib/gprpp/manual_constructor.h" -#include "src/core/lib/gprpp/memory.h" -#include "src/core/lib/gprpp/orphanable.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" @@ -65,13 +62,16 @@ #include "src/core/lib/security/credentials/credentials.h" // IWYU pragma: keep #include "src/core/lib/slice/slice.h" #include "src/core/lib/slice/slice_internal.h" -#include "src/core/lib/uri/uri_parser.h" #include "src/core/tsi/ssl_types.h" #include "src/core/util/http_client/httpcli.h" #include "src/core/util/http_client/httpcli_ssl_credentials.h" #include "src/core/util/http_client/parser.h" #include "src/core/util/json/json_reader.h" +#include "src/core/util/manual_constructor.h" +#include "src/core/util/memory.h" +#include "src/core/util/orphanable.h" #include "src/core/util/string.h" +#include "src/core/util/uri.h" using grpc_core::Json; diff --git a/src/core/lib/security/credentials/jwt/jwt_verifier.h b/src/core/lib/security/credentials/jwt/jwt_verifier.h index 922da79d4c9..9ff8ca53831 100644 --- a/src/core/lib/security/credentials/jwt/jwt_verifier.h +++ b/src/core/lib/security/credentials/jwt/jwt_verifier.h @@ -24,9 +24,9 @@ #include #include -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/iomgr_fwd.h" #include "src/core/util/json/json.h" +#include "src/core/util/time.h" // --- Constants. --- diff --git a/src/core/lib/security/credentials/local/local_credentials.h b/src/core/lib/security/credentials/local/local_credentials.h index 9665db5d082..e0a5d37f8c9 100644 --- a/src/core/lib/security/credentials/local/local_credentials.h +++ b/src/core/lib/security/credentials/local/local_credentials.h @@ -26,10 +26,10 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/unique_type_name.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/security_connector/security_connector.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/unique_type_name.h" #include "src/core/util/useful.h" // Main class for grpc local channel credential. diff --git a/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc b/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc index 4e366d0bb69..216c038cbf2 100644 --- a/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc +++ b/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc @@ -46,10 +46,6 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/load_file.h" -#include "src/core/lib/gprpp/memory.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/status_helper.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/pollset_set.h" #include "src/core/lib/promise/context.h" @@ -58,10 +54,14 @@ #include "src/core/lib/security/util/json_util.h" #include "src/core/lib/transport/error_utils.h" #include "src/core/lib/transport/metadata_batch.h" -#include "src/core/lib/uri/uri_parser.h" #include "src/core/util/http_client/httpcli_ssl_credentials.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_reader.h" +#include "src/core/util/load_file.h" +#include "src/core/util/memory.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/uri.h" using grpc_core::Json; diff --git a/src/core/lib/security/credentials/oauth2/oauth2_credentials.h b/src/core/lib/security/credentials/oauth2/oauth2_credentials.h index ea9315ba012..bb91c8a524f 100644 --- a/src/core/lib/security/credentials/oauth2/oauth2_credentials.h +++ b/src/core/lib/security/credentials/oauth2/oauth2_credentials.h @@ -33,11 +33,6 @@ #include #include -#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/time.h" -#include "src/core/lib/gprpp/unique_type_name.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/polling_entity.h" @@ -47,10 +42,15 @@ #include "src/core/lib/security/credentials/token_fetcher/token_fetcher_credentials.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/transport/transport.h" -#include "src/core/lib/uri/uri_parser.h" #include "src/core/util/http_client/httpcli.h" #include "src/core/util/http_client/parser.h" #include "src/core/util/json/json.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" +#include "src/core/util/unique_type_name.h" +#include "src/core/util/uri.h" #include "src/core/util/useful.h" // Constants. diff --git a/src/core/lib/security/credentials/plugin/plugin_credentials.h b/src/core/lib/security/credentials/plugin/plugin_credentials.h index 9cffc05b3dc..113955240c1 100644 --- a/src/core/lib/security/credentials/plugin/plugin_credentials.h +++ b/src/core/lib/security/credentials/plugin/plugin_credentials.h @@ -36,9 +36,6 @@ #include #include "src/core/lib/debug/trace.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/promise/activity.h" #include "src/core/lib/promise/arena_promise.h" #include "src/core/lib/promise/poll.h" @@ -46,6 +43,9 @@ #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/unique_type_name.h" #include "src/core/util/useful.h" // This type is forward declared as a C struct and we cannot define it as a diff --git a/src/core/lib/security/credentials/ssl/ssl_credentials.h b/src/core/lib/security/credentials/ssl/ssl_credentials.h index 32c450de90f..ab4c9a12767 100644 --- a/src/core/lib/security/credentials/ssl/ssl_credentials.h +++ b/src/core/lib/security/credentials/ssl/ssl_credentials.h @@ -29,12 +29,12 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/unique_type_name.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/security_connector/security_connector.h" #include "src/core/lib/security/security_connector/ssl/ssl_security_connector.h" #include "src/core/tsi/ssl_transport_security.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/unique_type_name.h" #include "src/core/util/useful.h" class grpc_ssl_credentials : public grpc_channel_credentials { diff --git a/src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.h b/src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.h index 5a0de70f093..f34e664d581 100644 --- a/src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.h +++ b/src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.h @@ -30,10 +30,10 @@ #include -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/security/security_connector/ssl_utils.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/sync.h" struct grpc_tls_identity_pairs { grpc_core::PemKeyCertPairList pem_key_cert_pairs; diff --git a/src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.cc b/src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.cc index 82a56f43ebc..30bc3e462c7 100644 --- a/src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.cc +++ b/src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.cc @@ -33,13 +33,13 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/load_file.h" -#include "src/core/lib/gprpp/stat.h" -#include "src/core/lib/gprpp/status_helper.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/slice/slice_internal.h" +#include "src/core/util/load_file.h" +#include "src/core/util/stat.h" +#include "src/core/util/status_helper.h" namespace grpc_core { diff --git a/src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h b/src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h index c3703cd56f9..73b9cd70864 100644 --- a/src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h +++ b/src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h @@ -32,13 +32,13 @@ #include #include -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/thd.h" -#include "src/core/lib/gprpp/unique_type_name.h" #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.h" #include "src/core/lib/security/security_connector/ssl_utils.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" +#include "src/core/util/thd.h" +#include "src/core/util/unique_type_name.h" #include "src/core/util/useful.h" // Interface for a grpc_tls_certificate_provider that handles the process to diff --git a/src/core/lib/security/credentials/tls/grpc_tls_certificate_verifier.cc b/src/core/lib/security/credentials/tls/grpc_tls_certificate_verifier.cc index f4c2c75bb44..1be015dcba7 100644 --- a/src/core/lib/security/credentials/tls/grpc_tls_certificate_verifier.cc +++ b/src/core/lib/security/credentials/tls/grpc_tls_certificate_verifier.cc @@ -29,9 +29,9 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/host_port.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/security/credentials/tls/tls_utils.h" +#include "src/core/util/host_port.h" namespace grpc_core { diff --git a/src/core/lib/security/credentials/tls/grpc_tls_certificate_verifier.h b/src/core/lib/security/credentials/tls/grpc_tls_certificate_verifier.h index 0c5c2e7f5ae..5e021948d2f 100644 --- a/src/core/lib/security/credentials/tls/grpc_tls_certificate_verifier.h +++ b/src/core/lib/security/credentials/tls/grpc_tls_certificate_verifier.h @@ -29,9 +29,9 @@ #include #include -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/unique_type_name.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/sync.h" +#include "src/core/util/unique_type_name.h" #include "src/core/util/useful.h" // An abstraction of the verifier that all verifier subclasses should extend. diff --git a/src/core/lib/security/credentials/tls/grpc_tls_credentials_options.cc b/src/core/lib/security/credentials/tls/grpc_tls_credentials_options.cc index 82a6dd55620..3176dc10caa 100644 --- a/src/core/lib/security/credentials/tls/grpc_tls_credentials_options.cc +++ b/src/core/lib/security/credentials/tls/grpc_tls_credentials_options.cc @@ -27,9 +27,9 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/debug_location.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/tsi/ssl_transport_security.h" +#include "src/core/util/debug_location.h" /// -- Wrapper APIs declared in grpc_security.h -- * diff --git a/src/core/lib/security/credentials/tls/grpc_tls_credentials_options.h b/src/core/lib/security/credentials/tls/grpc_tls_credentials_options.h index b29468239a1..f40773739a1 100644 --- a/src/core/lib/security/credentials/tls/grpc_tls_credentials_options.h +++ b/src/core/lib/security/credentials/tls/grpc_tls_credentials_options.h @@ -28,7 +28,7 @@ #include #include -#include "src/core/lib/gprpp/ref_counted.h" +#include "src/core/util/ref_counted.h" #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.h" #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h" #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_verifier.h" diff --git a/src/core/lib/security/credentials/tls/grpc_tls_crl_provider.cc b/src/core/lib/security/credentials/tls/grpc_tls_crl_provider.cc index 4db21c2885c..ce1fc4dd1d0 100644 --- a/src/core/lib/security/credentials/tls/grpc_tls_crl_provider.cc +++ b/src/core/lib/security/credentials/tls/grpc_tls_crl_provider.cc @@ -43,10 +43,10 @@ #include "absl/types/span.h" #include "src/core/lib/event_engine/default_event_engine.h" -#include "src/core/lib/gprpp/directory_reader.h" -#include "src/core/lib/gprpp/load_file.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/slice/slice.h" +#include "src/core/util/directory_reader.h" +#include "src/core/util/load_file.h" namespace grpc_core { namespace experimental { diff --git a/src/core/lib/security/credentials/tls/grpc_tls_crl_provider.h b/src/core/lib/security/credentials/tls/grpc_tls_crl_provider.h index 77ffc439384..b9188740c5e 100644 --- a/src/core/lib/security/credentials/tls/grpc_tls_crl_provider.h +++ b/src/core/lib/security/credentials/tls/grpc_tls_crl_provider.h @@ -39,9 +39,9 @@ #include #include -#include "src/core/lib/gprpp/directory_reader.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/directory_reader.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.h" namespace grpc_core { namespace experimental { diff --git a/src/core/lib/security/credentials/tls/tls_credentials.h b/src/core/lib/security/credentials/tls/tls_credentials.h index c72dcd61da8..fd78967d8f5 100644 --- a/src/core/lib/security/credentials/tls/tls_credentials.h +++ b/src/core/lib/security/credentials/tls/tls_credentials.h @@ -25,10 +25,10 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/unique_type_name.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/security_connector/security_connector.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/unique_type_name.h" class TlsCredentials final : public grpc_channel_credentials { public: diff --git a/src/core/lib/security/credentials/token_fetcher/token_fetcher_credentials.h b/src/core/lib/security/credentials/token_fetcher/token_fetcher_credentials.h index c73d469234b..6283c044be8 100644 --- a/src/core/lib/security/credentials/token_fetcher/token_fetcher_credentials.h +++ b/src/core/lib/security/credentials/token_fetcher/token_fetcher_credentials.h @@ -28,17 +28,17 @@ #include -#include "src/core/lib/backoff/backoff.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" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/polling_entity.h" #include "src/core/lib/promise/arena_promise.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/transport/metadata.h" +#include "src/core/util/backoff.h" #include "src/core/util/http_client/httpcli.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.h" #include "src/core/util/useful.h" namespace grpc_core { diff --git a/src/core/lib/security/credentials/xds/xds_credentials.h b/src/core/lib/security/credentials/xds/xds_credentials.h index dc363ac52b2..554d7a57f26 100644 --- a/src/core/lib/security/credentials/xds/xds_credentials.h +++ b/src/core/lib/security/credentials/xds/xds_credentials.h @@ -34,12 +34,12 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/unique_type_name.h" -#include "src/core/lib/matchers/matchers.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_verifier.h" #include "src/core/lib/security/security_connector/security_connector.h" +#include "src/core/util/matchers.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/unique_type_name.h" #include "src/core/xds/grpc/xds_certificate_provider.h" namespace grpc_core { diff --git a/src/core/lib/security/security_connector/alts/alts_security_connector.cc b/src/core/lib/security/security_connector/alts/alts_security_connector.cc index 370f21555d0..f30cecdd01a 100644 --- a/src/core/lib/security/security_connector/alts/alts_security_connector.cc +++ b/src/core/lib/security/security_connector/alts/alts_security_connector.cc @@ -40,8 +40,6 @@ #include "src/core/handshaker/handshaker.h" #include "src/core/handshaker/security/security_handshaker.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/error.h" @@ -56,6 +54,8 @@ #include "src/core/lib/transport/transport.h" #include "src/core/tsi/alts/handshaker/alts_tsi_handshaker.h" #include "src/core/tsi/transport_security.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/ref_counted_ptr.h" void grpc_alts_set_rpc_protocol_versions( grpc_gcp_rpc_protocol_versions* rpc_versions) { diff --git a/src/core/lib/security/security_connector/alts/alts_security_connector.h b/src/core/lib/security/security_connector/alts/alts_security_connector.h index 1f0c13a3618..5fe144a5e7d 100644 --- a/src/core/lib/security/security_connector/alts/alts_security_connector.h +++ b/src/core/lib/security/security_connector/alts/alts_security_connector.h @@ -23,10 +23,10 @@ #include #include -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/security/security_connector/security_connector.h" #include "src/core/tsi/alts/handshaker/transport_security_common_api.h" #include "src/core/tsi/transport_security_interface.h" +#include "src/core/util/ref_counted_ptr.h" #define GRPC_ALTS_TRANSPORT_SECURITY_TYPE "alts" diff --git a/src/core/lib/security/security_connector/fake/fake_security_connector.cc b/src/core/lib/security/security_connector/fake/fake_security_connector.cc index b83eda46ee1..20425dc2c91 100644 --- a/src/core/lib/security/security_connector/fake/fake_security_connector.cc +++ b/src/core/lib/security/security_connector/fake/fake_security_connector.cc @@ -41,10 +41,6 @@ #include "src/core/handshaker/handshaker.h" #include "src/core/handshaker/security/security_handshaker.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/host_port.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/error.h" @@ -58,6 +54,10 @@ #include "src/core/load_balancing/grpclb/grpclb.h" #include "src/core/tsi/fake_transport_security.h" #include "src/core/tsi/transport_security_interface.h" +#include "src/core/util/crash.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/host_port.h" +#include "src/core/util/ref_counted_ptr.h" #include "src/core/util/string.h" #include "src/core/util/useful.h" diff --git a/src/core/lib/security/security_connector/fake/fake_security_connector.h b/src/core/lib/security/security_connector/fake/fake_security_connector.h index 1edc40c0b95..3801af09fbc 100644 --- a/src/core/lib/security/security_connector/fake/fake_security_connector.h +++ b/src/core/lib/security/security_connector/fake/fake_security_connector.h @@ -24,8 +24,8 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/security/security_connector/security_connector.h" +#include "src/core/util/ref_counted_ptr.h" // Creates a fake connector that emulates real channel security. grpc_core::RefCountedPtr diff --git a/src/core/lib/security/security_connector/insecure/insecure_security_connector.cc b/src/core/lib/security/security_connector/insecure/insecure_security_connector.cc index 08e897bebc3..79ea0cd337c 100644 --- a/src/core/lib/security/security_connector/insecure/insecure_security_connector.cc +++ b/src/core/lib/security/security_connector/insecure/insecure_security_connector.cc @@ -27,12 +27,12 @@ #include "src/core/handshaker/security/security_handshaker.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/promise/promise.h" #include "src/core/lib/security/context/security_context.h" #include "src/core/tsi/local_transport_security.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_core { diff --git a/src/core/lib/security/security_connector/insecure/insecure_security_connector.h b/src/core/lib/security/security_connector/insecure/insecure_security_connector.h index 151264f35ae..9fc962b92ca 100644 --- a/src/core/lib/security/security_connector/insecure/insecure_security_connector.h +++ b/src/core/lib/security/security_connector/insecure/insecure_security_connector.h @@ -31,7 +31,6 @@ #include "src/core/handshaker/handshaker.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/error.h" @@ -40,6 +39,7 @@ #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/security_connector/security_connector.h" #include "src/core/tsi/transport_security_interface.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_core { diff --git a/src/core/lib/security/security_connector/load_system_roots_supported.cc b/src/core/lib/security/security_connector/load_system_roots_supported.cc index 26d49e67cad..52b657185a6 100644 --- a/src/core/lib/security/security_connector/load_system_roots_supported.cc +++ b/src/core/lib/security/security_connector/load_system_roots_supported.cc @@ -37,10 +37,10 @@ #include #include "src/core/lib/config/config_vars.h" -#include "src/core/lib/gprpp/load_file.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/security/security_connector/load_system_roots.h" #include "src/core/lib/security/security_connector/load_system_roots_supported.h" +#include "src/core/util/load_file.h" #include "src/core/util/useful.h" namespace grpc_core { diff --git a/src/core/lib/security/security_connector/local/local_security_connector.cc b/src/core/lib/security/security_connector/local/local_security_connector.cc index b78ddbe4830..c118f330923 100644 --- a/src/core/lib/security/security_connector/local/local_security_connector.cc +++ b/src/core/lib/security/security_connector/local/local_security_connector.cc @@ -43,8 +43,6 @@ #include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/error.h" @@ -59,10 +57,12 @@ #include "src/core/lib/security/context/security_context.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/credentials/local/local_credentials.h" -#include "src/core/lib/uri/uri_parser.h" #include "src/core/tsi/local_transport_security.h" #include "src/core/tsi/transport_security.h" #include "src/core/tsi/transport_security_interface.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/uri.h" #define GRPC_UDS_URI_PATTERN "unix:" #define GRPC_ABSTRACT_UDS_URI_PATTERN "unix-abstract:" diff --git a/src/core/lib/security/security_connector/local/local_security_connector.h b/src/core/lib/security/security_connector/local/local_security_connector.h index 09020552f1c..3475d8f033a 100644 --- a/src/core/lib/security/security_connector/local/local_security_connector.h +++ b/src/core/lib/security/security_connector/local/local_security_connector.h @@ -24,8 +24,8 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/security/security_connector/security_connector.h" +#include "src/core/util/ref_counted_ptr.h" /// /// This method creates a local channel security connector. diff --git a/src/core/lib/security/security_connector/security_connector.cc b/src/core/lib/security/security_connector/security_connector.cc index d40b90cc3bf..d3c9906f8b6 100644 --- a/src/core/lib/security/security_connector/security_connector.cc +++ b/src/core/lib/security/security_connector/security_connector.cc @@ -28,8 +28,8 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/debug_location.h" #include "src/core/lib/security/credentials/credentials.h" +#include "src/core/util/debug_location.h" #include "src/core/util/useful.h" grpc_channel_security_connector::grpc_channel_security_connector( diff --git a/src/core/lib/security/security_connector/security_connector.h b/src/core/lib/security/security_connector/security_connector.h index 1a8e7a67b76..2e44b14fe00 100644 --- a/src/core/lib/security/security_connector/security_connector.h +++ b/src/core/lib/security/security_connector/security_connector.h @@ -32,15 +32,15 @@ #include "src/core/handshaker/handshaker.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/debug/trace.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/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/iomgr_fwd.h" #include "src/core/lib/promise/arena_promise.h" #include "src/core/tsi/transport_security_interface.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/unique_type_name.h" // --- URL schemes. --- diff --git a/src/core/lib/security/security_connector/ssl/ssl_security_connector.cc b/src/core/lib/security/security_connector/ssl/ssl_security_connector.cc index b8fd066dab4..0ec65282f0c 100644 --- a/src/core/lib/security/security_connector/ssl/ssl_security_connector.cc +++ b/src/core/lib/security/security_connector/ssl/ssl_security_connector.cc @@ -37,10 +37,6 @@ #include "src/core/handshaker/handshaker.h" #include "src/core/handshaker/security/security_handshaker.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/host_port.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" @@ -55,6 +51,10 @@ #include "src/core/tsi/ssl_transport_security.h" #include "src/core/tsi/transport_security.h" #include "src/core/tsi/transport_security_interface.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/host_port.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" namespace { grpc_error_handle ssl_check_peer( diff --git a/src/core/lib/security/security_connector/ssl/ssl_security_connector.h b/src/core/lib/security/security_connector/ssl/ssl_security_connector.h index 3ce665d587e..5362e7503bc 100644 --- a/src/core/lib/security/security_connector/ssl/ssl_security_connector.h +++ b/src/core/lib/security/security_connector/ssl/ssl_security_connector.h @@ -26,9 +26,9 @@ #include #include -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/security/security_connector/security_connector.h" #include "src/core/tsi/ssl_transport_security.h" +#include "src/core/util/ref_counted_ptr.h" struct grpc_ssl_config { tsi_ssl_pem_key_cert_pair* pem_key_cert_pair; diff --git a/src/core/lib/security/security_connector/ssl_utils.cc b/src/core/lib/security/security_connector/ssl_utils.cc index a251ccdf86c..e3078062a89 100644 --- a/src/core/lib/security/security_connector/ssl_utils.cc +++ b/src/core/lib/security/security_connector/ssl_utils.cc @@ -43,13 +43,13 @@ #include "src/core/ext/transport/chttp2/alpn/alpn.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/config_vars.h" -#include "src/core/lib/gprpp/host_port.h" -#include "src/core/lib/gprpp/load_file.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/security/context/security_context.h" #include "src/core/lib/security/security_connector/load_system_roots.h" #include "src/core/tsi/ssl_transport_security.h" #include "src/core/tsi/transport_security.h" +#include "src/core/util/host_port.h" +#include "src/core/util/load_file.h" +#include "src/core/util/ref_counted_ptr.h" #include "src/core/util/useful.h" // -- Constants. -- diff --git a/src/core/lib/security/security_connector/ssl_utils.h b/src/core/lib/security/security_connector/ssl_utils.h index dd37f0e9b98..f60b679c763 100644 --- a/src/core/lib/security/security_connector/ssl_utils.h +++ b/src/core/lib/security/security_connector/ssl_utils.h @@ -35,12 +35,12 @@ #include #include -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/security/security_connector/security_connector.h" #include "src/core/tsi/ssl/key_logging/ssl_key_logging.h" #include "src/core/tsi/ssl_transport_security.h" #include "src/core/tsi/transport_security_interface.h" +#include "src/core/util/ref_counted_ptr.h" // --- Util --- diff --git a/src/core/lib/security/security_connector/tls/tls_security_connector.cc b/src/core/lib/security/security_connector/tls/tls_security_connector.cc index 3707955d4bf..b6c492fe458 100644 --- a/src/core/lib/security/security_connector/tls/tls_security_connector.cc +++ b/src/core/lib/security/security_connector/tls/tls_security_connector.cc @@ -38,9 +38,6 @@ #include "src/core/handshaker/security/security_handshaker.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/host_port.h" -#include "src/core/lib/gprpp/status_helper.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/promise/promise.h" #include "src/core/lib/security/context/security_context.h" @@ -49,6 +46,9 @@ #include "src/core/lib/security/credentials/tls/grpc_tls_credentials_options.h" #include "src/core/lib/security/security_connector/ssl_utils.h" #include "src/core/tsi/ssl_transport_security.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/host_port.h" +#include "src/core/util/status_helper.h" namespace grpc_core { diff --git a/src/core/lib/security/security_connector/tls/tls_security_connector.h b/src/core/lib/security/security_connector/tls/tls_security_connector.h index 0053a9d46d3..3c4e90436dc 100644 --- a/src/core/lib/security/security_connector/tls/tls_security_connector.h +++ b/src/core/lib/security/security_connector/tls/tls_security_connector.h @@ -34,8 +34,6 @@ #include "src/core/handshaker/handshaker.h" #include "src/core/lib/channel/channel_args.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" @@ -47,6 +45,8 @@ #include "src/core/tsi/ssl/key_logging/ssl_key_logging.h" #include "src/core/tsi/ssl_transport_security.h" #include "src/core/tsi/transport_security_interface.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" using TlsSessionKeyLogger = tsi::TlsSessionKeyLoggerCache::TlsSessionKeyLogger; diff --git a/src/core/lib/security/transport/auth_filters.h b/src/core/lib/security/transport/auth_filters.h index c3421f98876..71834db4403 100644 --- a/src/core/lib/security/transport/auth_filters.h +++ b/src/core/lib/security/transport/auth_filters.h @@ -30,11 +30,11 @@ #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/channel/promise_based_filter.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/promise/arena_promise.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/security_connector/security_connector.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_core { diff --git a/src/core/lib/security/transport/client_auth_filter.cc b/src/core/lib/security/transport/client_auth_filter.cc index dcbeeccf149..a5740afcfa2 100644 --- a/src/core/lib/security/transport/client_auth_filter.cc +++ b/src/core/lib/security/transport/client_auth_filter.cc @@ -38,8 +38,6 @@ #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/channel/promise_based_filter.h" #include "src/core/lib/channel/status_util.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/promise/arena_promise.h" #include "src/core/lib/promise/context.h" #include "src/core/lib/promise/promise.h" @@ -52,6 +50,8 @@ #include "src/core/lib/security/transport/auth_filters.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/ref_counted_ptr.h" #define MAX_CREDENTIALS_METADATA_COUNT 4 diff --git a/src/core/lib/security/transport/server_auth_filter.cc b/src/core/lib/security/transport/server_auth_filter.cc index 5b332aa9875..45e47aaa214 100644 --- a/src/core/lib/security/transport/server_auth_filter.cc +++ b/src/core/lib/security/transport/server_auth_filter.cc @@ -40,9 +40,6 @@ #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/channel/promise_based_filter.h" #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/status_helper.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/promise/activity.h" @@ -58,6 +55,9 @@ #include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/status_helper.h" namespace grpc_core { diff --git a/src/core/lib/slice/percent_encoding.cc b/src/core/lib/slice/percent_encoding.cc index 0d73ea3c06a..8b51c4d9059 100644 --- a/src/core/lib/slice/percent_encoding.cc +++ b/src/core/lib/slice/percent_encoding.cc @@ -27,7 +27,7 @@ #include -#include "src/core/lib/gprpp/bitset.h" +#include "src/core/util/bitset.h" namespace grpc_core { diff --git a/src/core/lib/slice/slice.cc b/src/core/lib/slice/slice.cc index c0143684dfb..a7ff2198d03 100644 --- a/src/core/lib/slice/slice.cc +++ b/src/core/lib/slice/slice.cc @@ -28,9 +28,9 @@ #include #include -#include "src/core/lib/gprpp/memory.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/slice/slice_refcount.h" +#include "src/core/util/memory.h" char* grpc_slice_to_c_string(grpc_slice slice) { char* out = static_cast(gpr_malloc(GRPC_SLICE_LENGTH(slice) + 1)); diff --git a/src/core/lib/slice/slice.h b/src/core/lib/slice/slice.h index 88f9d76bcbc..5b70fa4ee52 100644 --- a/src/core/lib/slice/slice.h +++ b/src/core/lib/slice/slice.h @@ -29,9 +29,9 @@ #include #include -#include "src/core/lib/gprpp/debug_location.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/slice/slice_refcount.h" +#include "src/core/util/debug_location.h" #include "src/core/util/string.h" // Herein lies grpc_core::Slice and its team of thin wrappers around grpc_slice. diff --git a/src/core/lib/slice/slice_internal.h b/src/core/lib/slice/slice_internal.h index e0fe8bd7e99..093a77ecfb0 100644 --- a/src/core/lib/slice/slice_internal.h +++ b/src/core/lib/slice/slice_internal.h @@ -31,7 +31,7 @@ #include #include -#include "src/core/lib/gprpp/memory.h" +#include "src/core/util/memory.h" // Returns a pointer to the first slice in the slice buffer without giving // ownership to or a reference count on that slice. diff --git a/src/core/lib/slice/slice_refcount.h b/src/core/lib/slice/slice_refcount.h index 71a6e85abe5..c27bb07a8e7 100644 --- a/src/core/lib/slice/slice_refcount.h +++ b/src/core/lib/slice/slice_refcount.h @@ -23,7 +23,7 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/debug_location.h" +#include "src/core/util/debug_location.h" // grpc_slice_refcount : A reference count for grpc_slice. struct grpc_slice_refcount { diff --git a/src/core/lib/surface/call.cc b/src/core/lib/surface/call.cc index f8ee18a9f0c..29c4277d284 100644 --- a/src/core/lib/surface/call.cc +++ b/src/core/lib/surface/call.cc @@ -64,15 +64,6 @@ #include "src/core/lib/compression/compression_internal.h" #include "src/core/lib/event_engine/event_engine_context.h" #include "src/core/lib/experiments/experiments.h" -#include "src/core/lib/gprpp/bitset.h" -#include "src/core/lib/gprpp/cpp_impl_of.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/match.h" -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/status_helper.h" -#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/iomgr/call_combiner.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/polling_entity.h" @@ -105,6 +96,15 @@ #include "src/core/telemetry/stats.h" #include "src/core/telemetry/stats_data.h" #include "src/core/util/alloc.h" +#include "src/core/util/bitset.h" +#include "src/core/util/cpp_impl_of.h" +#include "src/core/util/crash.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/match.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/sync.h" #include "src/core/util/time_precise.h" #include "src/core/util/useful.h" diff --git a/src/core/lib/surface/call.h b/src/core/lib/surface/call.h index 99ab4af5c23..8c225b7379d 100644 --- a/src/core/lib/surface/call.h +++ b/src/core/lib/surface/call.h @@ -36,8 +36,6 @@ #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/iomgr_fwd.h" @@ -48,6 +46,8 @@ #include "src/core/lib/surface/channel.h" #include "src/core/lib/transport/transport.h" #include "src/core/server/server_interface.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" #include "src/core/util/time_precise.h" typedef void (*grpc_ioreq_completion_func)(grpc_call* call, int success, diff --git a/src/core/lib/surface/call_utils.cc b/src/core/lib/surface/call_utils.cc index f5c5f32b84e..18a78fb284e 100644 --- a/src/core/lib/surface/call_utils.cc +++ b/src/core/lib/surface/call_utils.cc @@ -49,9 +49,6 @@ #include #include "src/core/lib/channel/status_util.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/match.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/promise/activity.h" #include "src/core/lib/promise/context.h" @@ -63,6 +60,9 @@ #include "src/core/lib/surface/validate_metadata.h" #include "src/core/lib/transport/metadata.h" #include "src/core/lib/transport/metadata_batch.h" +#include "src/core/util/crash.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/match.h" namespace grpc_core { diff --git a/src/core/lib/surface/call_utils.h b/src/core/lib/surface/call_utils.h index 3d5039ab4cf..de9c928fa74 100644 --- a/src/core/lib/surface/call_utils.h +++ b/src/core/lib/surface/call_utils.h @@ -46,7 +46,6 @@ #include #include -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/promise/activity.h" #include "src/core/lib/promise/cancel_callback.h" #include "src/core/lib/promise/map.h" @@ -57,6 +56,7 @@ #include "src/core/lib/transport/message.h" #include "src/core/lib/transport/metadata.h" #include "src/core/lib/transport/metadata_batch.h" +#include "src/core/util/crash.h" namespace grpc_core { diff --git a/src/core/lib/surface/channel.h b/src/core/lib/surface/channel.h index 7976fd00858..fa8ac5468c8 100644 --- a/src/core/lib/surface/channel.h +++ b/src/core/lib/surface/channel.h @@ -33,11 +33,6 @@ #include "src/core/channelz/channelz.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/cpp_impl_of.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" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/iomgr_fwd.h" #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/resource_quota/resource_quota.h" @@ -46,6 +41,11 @@ #include "src/core/lib/transport/call_arena_allocator.h" #include "src/core/lib/transport/call_destination.h" #include "src/core/lib/transport/connectivity_state.h" +#include "src/core/util/cpp_impl_of.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.h" // Forward declaration to avoid dependency loop. struct grpc_channel_stack; diff --git a/src/core/lib/surface/channel_init.cc b/src/core/lib/surface/channel_init.cc index eb0744f760e..cebe053e34d 100644 --- a/src/core/lib/surface/channel_init.cc +++ b/src/core/lib/surface/channel_init.cc @@ -37,10 +37,10 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/unique_type_name.h" #include "src/core/lib/surface/channel_stack_type.h" +#include "src/core/util/crash.h" +#include "src/core/util/sync.h" +#include "src/core/util/unique_type_name.h" namespace grpc_core { diff --git a/src/core/lib/surface/channel_init.h b/src/core/lib/surface/channel_init.h index 435d3cff305..628620228c5 100644 --- a/src/core/lib/surface/channel_init.h +++ b/src/core/lib/surface/channel_init.h @@ -35,11 +35,11 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_stack_builder.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/unique_type_name.h" #include "src/core/lib/surface/channel_stack_type.h" #include "src/core/lib/transport/call_filters.h" #include "src/core/lib/transport/interception_chain.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/unique_type_name.h" /// This module provides a way for plugins (and the grpc core library itself) /// to register mutators for channel stacks. diff --git a/src/core/lib/surface/client_call.cc b/src/core/lib/surface/client_call.cc index db329e66ffa..05670b2e1bc 100644 --- a/src/core/lib/surface/client_call.cc +++ b/src/core/lib/surface/client_call.cc @@ -45,10 +45,6 @@ #include #include "src/core/lib/event_engine/event_engine_context.h" -#include "src/core/lib/gprpp/bitset.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/promise/all_ok.h" #include "src/core/lib/promise/status_flag.h" #include "src/core/lib/promise/try_seq.h" @@ -58,7 +54,11 @@ #include "src/core/lib/transport/metadata.h" #include "src/core/telemetry/stats.h" #include "src/core/telemetry/stats_data.h" +#include "src/core/util/bitset.h" +#include "src/core/util/crash.h" #include "src/core/util/latent_see.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_core { diff --git a/src/core/lib/surface/client_call.h b/src/core/lib/surface/client_call.h index 484be4d13d1..014eafed11d 100644 --- a/src/core/lib/surface/client_call.h +++ b/src/core/lib/surface/client_call.h @@ -42,15 +42,15 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/single_set_ptr.h" #include "src/core/lib/promise/status_flag.h" #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/surface/call.h" #include "src/core/lib/surface/call_utils.h" #include "src/core/lib/transport/metadata.h" +#include "src/core/util/crash.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/single_set_ptr.h" namespace grpc_core { diff --git a/src/core/lib/surface/completion_queue.cc b/src/core/lib/surface/completion_queue.cc index 35e2f295990..9d958defc98 100644 --- a/src/core/lib/surface/completion_queue.cc +++ b/src/core/lib/surface/completion_queue.cc @@ -41,11 +41,6 @@ #include #include "src/core/lib/event_engine/default_event_engine.h" -#include "src/core/lib/gprpp/atomic_utils.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/status_helper.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/executor.h" @@ -54,7 +49,12 @@ #include "src/core/lib/surface/event_string.h" #include "src/core/telemetry/stats.h" #include "src/core/telemetry/stats_data.h" +#include "src/core/util/atomic_utils.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/ref_counted.h" #include "src/core/util/spinlock.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/time.h" #ifdef GPR_WINDOWS #include "src/core/lib/experiments/experiments.h" diff --git a/src/core/lib/surface/completion_queue.h b/src/core/lib/surface/completion_queue.h index 0abf4dc6c47..33dcb5ed5c1 100644 --- a/src/core/lib/surface/completion_queue.h +++ b/src/core/lib/surface/completion_queue.h @@ -26,10 +26,10 @@ #include #include -#include "src/core/lib/gprpp/manual_constructor.h" -#include "src/core/lib/gprpp/mpscq.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/iomgr_fwd.h" +#include "src/core/util/manual_constructor.h" +#include "src/core/util/mpscq.h" typedef struct grpc_cq_completion { grpc_core::ManualConstructor< diff --git a/src/core/lib/surface/filter_stack_call.cc b/src/core/lib/surface/filter_stack_call.cc index a3a6e3d7b60..707d99a59fa 100644 --- a/src/core/lib/surface/filter_stack_call.cc +++ b/src/core/lib/surface/filter_stack_call.cc @@ -48,11 +48,6 @@ #include "src/core/lib/channel/channel_stack.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/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/status_helper.h" #include "src/core/lib/iomgr/call_combiner.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/polling_entity.h" @@ -71,6 +66,11 @@ #include "src/core/telemetry/stats.h" #include "src/core/telemetry/stats_data.h" #include "src/core/util/alloc.h" +#include "src/core/util/crash.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/status_helper.h" #include "src/core/util/time_precise.h" namespace grpc_core { diff --git a/src/core/lib/surface/filter_stack_call.h b/src/core/lib/surface/filter_stack_call.h index aa5d739d7ad..b4c304773c9 100644 --- a/src/core/lib/surface/filter_stack_call.h +++ b/src/core/lib/surface/filter_stack_call.h @@ -45,8 +45,6 @@ #include #include "src/core/lib/channel/channel_stack.h" -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/iomgr/call_combiner.h" #include "src/core/lib/iomgr/polling_entity.h" #include "src/core/lib/promise/context.h" @@ -60,6 +58,8 @@ #include "src/core/server/server_interface.h" #include "src/core/telemetry/call_tracer.h" #include "src/core/util/alloc.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_core { diff --git a/src/core/lib/surface/init.cc b/src/core/lib/surface/init.cc index 0adcbb39995..637941ccbd3 100644 --- a/src/core/lib/surface/init.cc +++ b/src/core/lib/surface/init.cc @@ -35,9 +35,6 @@ #include "src/core/lib/event_engine/posix_engine/timer_manager.h" #include "src/core/lib/experiments/config.h" #include "src/core/lib/experiments/experiments.h" -#include "src/core/lib/gprpp/fork.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/thd.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/iomgr.h" #include "src/core/lib/iomgr/timer_manager.h" @@ -47,6 +44,9 @@ #include "src/core/lib/security/transport/auth_filters.h" #include "src/core/lib/surface/channel_stack_type.h" #include "src/core/lib/surface/init_internally.h" +#include "src/core/util/fork.h" +#include "src/core/util/sync.h" +#include "src/core/util/thd.h" // Remnants of the old plugin system void grpc_resolver_dns_ares_init(void); diff --git a/src/core/lib/surface/lame_client.cc b/src/core/lib/surface/lame_client.cc index 3ac1321b6c7..8acfd80986d 100644 --- a/src/core/lib/surface/lame_client.cc +++ b/src/core/lib/surface/lame_client.cc @@ -35,9 +35,6 @@ #include "src/core/lib/channel/promise_based_filter.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/promise/pipe.h" #include "src/core/lib/promise/promise.h" @@ -46,10 +43,13 @@ #include "src/core/lib/transport/connectivity_state.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" #include "src/core/util/useful.h" // Avoid some IWYU confusion: -// IWYU pragma: no_include "src/core/lib/gprpp/orphanable.h" +// IWYU pragma: no_include "src/core/util/orphanable.h" namespace grpc_core { diff --git a/src/core/lib/surface/lame_client.h b/src/core/lib/surface/lame_client.h index c5ff64d2a4d..970c7630c48 100644 --- a/src/core/lib/surface/lame_client.h +++ b/src/core/lib/surface/lame_client.h @@ -31,11 +31,11 @@ #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/sync.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/promise/arena_promise.h" #include "src/core/lib/transport/connectivity_state.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/sync.h" #define GRPC_ARG_LAME_FILTER_ERROR "grpc.lame_filter_error" diff --git a/src/core/lib/surface/legacy_channel.cc b/src/core/lib/surface/legacy_channel.cc index f68a653d843..ba306525f2c 100644 --- a/src/core/lib/surface/legacy_channel.cc +++ b/src/core/lib/surface/legacy_channel.cc @@ -38,11 +38,6 @@ #include "src/core/lib/channel/channel_stack_builder_impl.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/event_engine/channel_args_endpoint_config.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/dual_ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" @@ -58,6 +53,11 @@ #include "src/core/telemetry/metrics.h" #include "src/core/telemetry/stats.h" #include "src/core/telemetry/stats_data.h" +#include "src/core/util/crash.h" +#include "src/core/util/dual_ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.h" namespace grpc_core { diff --git a/src/core/lib/surface/legacy_channel.h b/src/core/lib/surface/legacy_channel.h index ed5938437a5..7ca47a6bb22 100644 --- a/src/core/lib/surface/legacy_channel.h +++ b/src/core/lib/surface/legacy_channel.h @@ -32,8 +32,6 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_stack.h" // IWYU pragma: keep -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/iomgr_fwd.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/surface/channel.h" @@ -41,6 +39,8 @@ #include "src/core/lib/transport/call_arena_allocator.h" #include "src/core/lib/transport/transport.h" #include "src/core/telemetry/stats.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" namespace grpc_core { diff --git a/src/core/lib/surface/server_call.cc b/src/core/lib/surface/server_call.cc index 0ac9064bedb..32aadc25da9 100644 --- a/src/core/lib/surface/server_call.cc +++ b/src/core/lib/surface/server_call.cc @@ -40,7 +40,6 @@ #include #include -#include "src/core/lib/gprpp/bitset.h" #include "src/core/lib/promise/all_ok.h" #include "src/core/lib/promise/map.h" #include "src/core/lib/promise/poll.h" @@ -52,6 +51,7 @@ #include "src/core/lib/transport/metadata.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/server/server_interface.h" +#include "src/core/util/bitset.h" namespace grpc_core { diff --git a/src/core/lib/surface/server_call.h b/src/core/lib/surface/server_call.h index 351ef21a35b..b8e4299731b 100644 --- a/src/core/lib/surface/server_call.h +++ b/src/core/lib/surface/server_call.h @@ -45,9 +45,6 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/promise/poll.h" #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/surface/call.h" @@ -57,6 +54,9 @@ #include "src/core/server/server_interface.h" #include "src/core/telemetry/stats.h" #include "src/core/telemetry/stats_data.h" +#include "src/core/util/crash.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_core { diff --git a/src/core/lib/surface/validate_metadata.cc b/src/core/lib/surface/validate_metadata.cc index e3d4f5f9b04..3a68a673c04 100644 --- a/src/core/lib/surface/validate_metadata.cc +++ b/src/core/lib/surface/validate_metadata.cc @@ -24,9 +24,9 @@ #include #include -#include "src/core/lib/gprpp/bitset.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/slice/slice_internal.h" +#include "src/core/util/bitset.h" namespace grpc_core { diff --git a/src/core/lib/transport/bdp_estimator.h b/src/core/lib/transport/bdp_estimator.h index e9fb28cceef..487b04eb35d 100644 --- a/src/core/lib/transport/bdp_estimator.h +++ b/src/core/lib/transport/bdp_estimator.h @@ -31,7 +31,7 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" namespace grpc_core { diff --git a/src/core/lib/transport/call_arena_allocator.h b/src/core/lib/transport/call_arena_allocator.h index 4f63e0ae3ea..d52bdf4ecf7 100644 --- a/src/core/lib/transport/call_arena_allocator.h +++ b/src/core/lib/transport/call_arena_allocator.h @@ -22,9 +22,9 @@ #include -#include "src/core/lib/gprpp/ref_counted.h" #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/resource_quota/memory_quota.h" +#include "src/core/util/ref_counted.h" namespace grpc_core { diff --git a/src/core/lib/transport/call_destination.h b/src/core/lib/transport/call_destination.h index 04d402569c9..5caf299d387 100644 --- a/src/core/lib/transport/call_destination.h +++ b/src/core/lib/transport/call_destination.h @@ -17,8 +17,8 @@ #include -#include "src/core/lib/gprpp/orphanable.h" #include "src/core/lib/transport/call_spine.h" +#include "src/core/util/orphanable.h" namespace grpc_core { diff --git a/src/core/lib/transport/call_filters.cc b/src/core/lib/transport/call_filters.cc index 0e378a86d04..f15579db603 100644 --- a/src/core/lib/transport/call_filters.cc +++ b/src/core/lib/transport/call_filters.cc @@ -19,8 +19,8 @@ #include -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/transport/metadata.h" +#include "src/core/util/crash.h" namespace grpc_core { diff --git a/src/core/lib/transport/call_filters.h b/src/core/lib/transport/call_filters.h index 7f2b0b2f3a6..fb64eb95eca 100644 --- a/src/core/lib/transport/call_filters.h +++ b/src/core/lib/transport/call_filters.h @@ -25,9 +25,6 @@ #include -#include "src/core/lib/gprpp/dump_args.h" -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/promise/if.h" #include "src/core/lib/promise/latch.h" #include "src/core/lib/promise/map.h" @@ -39,6 +36,9 @@ #include "src/core/lib/transport/call_state.h" #include "src/core/lib/transport/message.h" #include "src/core/lib/transport/metadata.h" +#include "src/core/util/dump_args.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" // CallFilters tracks a list of filters that are attached to a call. // At a high level, a filter (for the purposes of this module) is a class diff --git a/src/core/lib/transport/call_spine.h b/src/core/lib/transport/call_spine.h index b1051049a43..6e8e20146be 100644 --- a/src/core/lib/transport/call_spine.h +++ b/src/core/lib/transport/call_spine.h @@ -19,7 +19,6 @@ #include -#include "src/core/lib/gprpp/dual_ref_counted.h" #include "src/core/lib/promise/detail/status.h" #include "src/core/lib/promise/if.h" #include "src/core/lib/promise/latch.h" @@ -33,6 +32,7 @@ #include "src/core/lib/transport/call_filters.h" #include "src/core/lib/transport/message.h" #include "src/core/lib/transport/metadata.h" +#include "src/core/util/dual_ref_counted.h" namespace grpc_core { diff --git a/src/core/lib/transport/call_state.h b/src/core/lib/transport/call_state.h index 67facf8c007..d741c541f2f 100644 --- a/src/core/lib/transport/call_state.h +++ b/src/core/lib/transport/call_state.h @@ -20,10 +20,10 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/promise/activity.h" #include "src/core/lib/promise/poll.h" #include "src/core/lib/promise/status_flag.h" +#include "src/core/util/crash.h" namespace grpc_core { diff --git a/src/core/lib/transport/connectivity_state.cc b/src/core/lib/transport/connectivity_state.cc index 503ff1f7ea1..9239f34f2be 100644 --- a/src/core/lib/transport/connectivity_state.cc +++ b/src/core/lib/transport/connectivity_state.cc @@ -22,11 +22,11 @@ #include -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_core { diff --git a/src/core/lib/transport/connectivity_state.h b/src/core/lib/transport/connectivity_state.h index b72933ba868..a986c66e9f5 100644 --- a/src/core/lib/transport/connectivity_state.h +++ b/src/core/lib/transport/connectivity_state.h @@ -30,8 +30,8 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/work_serializer.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/work_serializer.h" namespace grpc_core { diff --git a/src/core/lib/transport/error_utils.cc b/src/core/lib/transport/error_utils.cc index 2b3b776a27a..4a59efe3deb 100644 --- a/src/core/lib/transport/error_utils.cc +++ b/src/core/lib/transport/error_utils.cc @@ -25,8 +25,8 @@ #include #include -#include "src/core/lib/gprpp/status_helper.h" #include "src/core/lib/transport/status_conversion.h" +#include "src/core/util/status_helper.h" static grpc_error_handle recursively_find_error_with_field( grpc_error_handle error, grpc_core::StatusIntProperty which) { diff --git a/src/core/lib/transport/error_utils.h b/src/core/lib/transport/error_utils.h index f10bfad63b6..9510081d004 100644 --- a/src/core/lib/transport/error_utils.h +++ b/src/core/lib/transport/error_utils.h @@ -26,9 +26,9 @@ #include #include -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/transport/http2_errors.h" +#include "src/core/util/time.h" /// A utility function to get the status code and message to be returned /// to the application. If not set in the top-level message, looks diff --git a/src/core/lib/transport/interception_chain.cc b/src/core/lib/transport/interception_chain.cc index d042f5d1f6c..317c6cfa93a 100644 --- a/src/core/lib/transport/interception_chain.cc +++ b/src/core/lib/transport/interception_chain.cc @@ -18,11 +18,11 @@ #include -#include "src/core/lib/gprpp/match.h" #include "src/core/lib/transport/call_destination.h" #include "src/core/lib/transport/call_filters.h" #include "src/core/lib/transport/call_spine.h" #include "src/core/lib/transport/metadata.h" +#include "src/core/util/match.h" namespace grpc_core { diff --git a/src/core/lib/transport/interception_chain.h b/src/core/lib/transport/interception_chain.h index d3942c6fcfc..82608e3a005 100644 --- a/src/core/lib/transport/interception_chain.h +++ b/src/core/lib/transport/interception_chain.h @@ -20,11 +20,11 @@ #include -#include "src/core/lib/gprpp/ref_counted.h" #include "src/core/lib/transport/call_destination.h" #include "src/core/lib/transport/call_filters.h" #include "src/core/lib/transport/call_spine.h" #include "src/core/lib/transport/metadata.h" +#include "src/core/util/ref_counted.h" namespace grpc_core { diff --git a/src/core/lib/transport/metadata_batch.h b/src/core/lib/transport/metadata_batch.h index 6ede60d480c..4a2ca21bd27 100644 --- a/src/core/lib/transport/metadata_batch.h +++ b/src/core/lib/transport/metadata_batch.h @@ -40,17 +40,17 @@ #include "src/core/lib/compression/compression_internal.h" #include "src/core/lib/experiments/experiments.h" -#include "src/core/lib/gprpp/chunked_vector.h" -#include "src/core/lib/gprpp/if_list.h" -#include "src/core/lib/gprpp/packed_table.h" -#include "src/core/lib/gprpp/time.h" -#include "src/core/lib/gprpp/type_list.h" #include "src/core/lib/promise/poll.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/transport/custom_metadata.h" #include "src/core/lib/transport/metadata_compression_traits.h" #include "src/core/lib/transport/parsed_metadata.h" #include "src/core/lib/transport/simple_slice_based_metadata.h" +#include "src/core/util/chunked_vector.h" +#include "src/core/util/if_list.h" +#include "src/core/util/packed_table.h" +#include "src/core/util/time.h" +#include "src/core/util/type_list.h" namespace grpc_core { diff --git a/src/core/lib/transport/parsed_metadata.h b/src/core/lib/transport/parsed_metadata.h index 26e3264bb4c..1ea9c9a2e4a 100644 --- a/src/core/lib/transport/parsed_metadata.h +++ b/src/core/lib/transport/parsed_metadata.h @@ -32,8 +32,8 @@ #include #include -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/slice/slice.h" +#include "src/core/util/time.h" namespace grpc_core { diff --git a/src/core/lib/transport/promise_endpoint.cc b/src/core/lib/transport/promise_endpoint.cc index 355cf44333f..90b2e0ce5b8 100644 --- a/src/core/lib/transport/promise_endpoint.cc +++ b/src/core/lib/transport/promise_endpoint.cc @@ -28,8 +28,8 @@ #include #include -#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/slice/slice_buffer.h" +#include "src/core/util/sync.h" namespace grpc_core { diff --git a/src/core/lib/transport/promise_endpoint.h b/src/core/lib/transport/promise_endpoint.h index 4d810fbc75f..077a1a01f70 100644 --- a/src/core/lib/transport/promise_endpoint.h +++ b/src/core/lib/transport/promise_endpoint.h @@ -38,7 +38,6 @@ #include "src/core/lib/event_engine/extensions/chaotic_good_extension.h" #include "src/core/lib/event_engine/query_extensions.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/lib/promise/cancel_callback.h" @@ -47,6 +46,7 @@ #include "src/core/lib/promise/poll.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/slice/slice_buffer.h" +#include "src/core/util/sync.h" namespace grpc_core { diff --git a/src/core/lib/transport/status_conversion.h b/src/core/lib/transport/status_conversion.h index 6691a84d729..713321d4ea4 100644 --- a/src/core/lib/transport/status_conversion.h +++ b/src/core/lib/transport/status_conversion.h @@ -22,8 +22,8 @@ #include #include -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/transport/http2_errors.h" +#include "src/core/util/time.h" // Conversion of grpc status codes to http2 error codes (for RST_STREAM) grpc_http2_error_code grpc_status_to_http2_error(grpc_status_code status); diff --git a/src/core/lib/transport/timeout_encoding.h b/src/core/lib/transport/timeout_encoding.h index 58346c98c6d..9957640a95b 100644 --- a/src/core/lib/transport/timeout_encoding.h +++ b/src/core/lib/transport/timeout_encoding.h @@ -25,8 +25,8 @@ #include -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/slice/slice.h" +#include "src/core/util/time.h" namespace grpc_core { diff --git a/src/core/lib/transport/transport.cc b/src/core/lib/transport/transport.cc index d5c285aadd7..58d0869cf7e 100644 --- a/src/core/lib/transport/transport.cc +++ b/src/core/lib/transport/transport.cc @@ -32,13 +32,13 @@ #include #include "src/core/lib/event_engine/default_event_engine.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/promise/for_each.h" #include "src/core/lib/promise/promise.h" #include "src/core/lib/promise/try_seq.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/transport/error_utils.h" +#include "src/core/util/time.h" void grpc_stream_destroy(grpc_stream_refcount* refcount) { if ((grpc_core::ExecCtx::Get()->flags() & diff --git a/src/core/lib/transport/transport.h b/src/core/lib/transport/transport.h index 4c16314558c..9c34fb1efce 100644 --- a/src/core/lib/transport/transport.h +++ b/src/core/lib/transport/transport.h @@ -40,8 +40,6 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted.h" #include "src/core/lib/iomgr/call_combiner.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint.h" @@ -62,6 +60,8 @@ #include "src/core/lib/transport/metadata.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport_fwd.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted.h" // Minimum and maximum protocol accepted versions. #define GRPC_PROTOCOL_VERSION_MAX_MAJOR 2 diff --git a/src/core/lib/transport/transport_op_string.cc b/src/core/lib/transport/transport_op_string.cc index 40ea5bc2d8a..7141161ed08 100644 --- a/src/core/lib/transport/transport_op_string.cc +++ b/src/core/lib/transport/transport_op_string.cc @@ -25,12 +25,12 @@ #include #include "src/core/lib/channel/channel_fwd.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/status_helper.h" #include "src/core/lib/slice/slice_buffer.h" #include "src/core/lib/transport/connectivity_state.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/status_helper.h" // These routines are here to facilitate debugging - they produce string // representations of various transport data structures diff --git a/src/core/load_balancing/address_filtering.cc b/src/core/load_balancing/address_filtering.cc index 4077eda12ab..fe9834b170d 100644 --- a/src/core/load_balancing/address_filtering.cc +++ b/src/core/load_balancing/address_filtering.cc @@ -25,8 +25,8 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/iomgr/resolved_address.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_core { diff --git a/src/core/load_balancing/address_filtering.h b/src/core/load_balancing/address_filtering.h index 0c03092694e..7b7fda9ac74 100644 --- a/src/core/load_balancing/address_filtering.h +++ b/src/core/load_balancing/address_filtering.h @@ -27,9 +27,9 @@ #include -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_string.h" #include "src/core/resolver/endpoint_addresses.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_string.h" // The resolver returns a flat list of addresses. When a hierarchy of // LB policies is in use, each leaf of the hierarchy will need a diff --git a/src/core/load_balancing/child_policy_handler.cc b/src/core/load_balancing/child_policy_handler.cc index 869fb281a39..4ec9127b555 100644 --- a/src/core/load_balancing/child_policy_handler.cc +++ b/src/core/load_balancing/child_policy_handler.cc @@ -30,13 +30,13 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/debug_location.h" #include "src/core/lib/iomgr/pollset_set.h" #include "src/core/lib/iomgr/resolved_address.h" #include "src/core/lib/transport/connectivity_state.h" #include "src/core/load_balancing/delegating_helper.h" #include "src/core/load_balancing/lb_policy_registry.h" #include "src/core/load_balancing/subchannel_interface.h" +#include "src/core/util/debug_location.h" namespace grpc_core { diff --git a/src/core/load_balancing/child_policy_handler.h b/src/core/load_balancing/child_policy_handler.h index 9a964f020cd..79b056a4070 100644 --- a/src/core/load_balancing/child_policy_handler.h +++ b/src/core/load_balancing/child_policy_handler.h @@ -25,9 +25,9 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/load_balancing/lb_policy.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_core { diff --git a/src/core/load_balancing/delegating_helper.h b/src/core/load_balancing/delegating_helper.h index fea9d48e0d7..0852319d8a9 100644 --- a/src/core/load_balancing/delegating_helper.h +++ b/src/core/load_balancing/delegating_helper.h @@ -28,12 +28,12 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/iomgr/resolved_address.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/load_balancing/lb_policy.h" #include "src/core/load_balancing/subchannel_interface.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_core { diff --git a/src/core/load_balancing/endpoint_list.cc b/src/core/load_balancing/endpoint_list.cc index 87ef758ab07..7507aadc5b5 100644 --- a/src/core/load_balancing/endpoint_list.cc +++ b/src/core/load_balancing/endpoint_list.cc @@ -34,16 +34,16 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.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/iomgr/pollset_set.h" #include "src/core/load_balancing/delegating_helper.h" #include "src/core/load_balancing/lb_policy.h" #include "src/core/load_balancing/lb_policy_registry.h" #include "src/core/load_balancing/pick_first/pick_first.h" #include "src/core/resolver/endpoint_addresses.h" +#include "src/core/util/debug_location.h" #include "src/core/util/json/json.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_core { diff --git a/src/core/load_balancing/endpoint_list.h b/src/core/load_balancing/endpoint_list.h index f6d1851624e..eff8663d7e8 100644 --- a/src/core/load_balancing/endpoint_list.h +++ b/src/core/load_balancing/endpoint_list.h @@ -31,14 +31,14 @@ #include #include "src/core/lib/channel/channel_args.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/work_serializer.h" #include "src/core/lib/iomgr/resolved_address.h" #include "src/core/load_balancing/lb_policy.h" #include "src/core/load_balancing/subchannel_interface.h" #include "src/core/resolver/endpoint_addresses.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/work_serializer.h" namespace grpc_core { diff --git a/src/core/load_balancing/grpclb/client_load_reporting_filter.cc b/src/core/load_balancing/grpclb/client_load_reporting_filter.cc index bb86bdc1048..40de9f0c2bc 100644 --- a/src/core/load_balancing/grpclb/client_load_reporting_filter.cc +++ b/src/core/load_balancing/grpclb/client_load_reporting_filter.cc @@ -28,7 +28,6 @@ #include #include "src/core/lib/channel/channel_stack.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/promise/context.h" #include "src/core/lib/promise/map.h" #include "src/core/lib/promise/pipe.h" @@ -36,6 +35,7 @@ #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" #include "src/core/load_balancing/grpclb/grpclb_client_stats.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_core { diff --git a/src/core/load_balancing/grpclb/grpclb.cc b/src/core/load_balancing/grpclb/grpclb.cc index e71ba9913a0..d6e82fbb134 100644 --- a/src/core/load_balancing/grpclb/grpclb.cc +++ b/src/core/load_balancing/grpclb/grpclb.cc @@ -97,20 +97,10 @@ #include "src/core/channelz/channelz.h" #include "src/core/client_channel/client_channel_filter.h" #include "src/core/lib/address_utils/sockaddr_utils.h" -#include "src/core/lib/backoff/backoff.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.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/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/status_helper.h" -#include "src/core/lib/gprpp/time.h" -#include "src/core/lib/gprpp/validation_errors.h" -#include "src/core/lib/gprpp/work_serializer.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" @@ -139,11 +129,21 @@ #include "src/core/resolver/endpoint_addresses.h" #include "src/core/resolver/fake/fake_resolver.h" #include "src/core/resolver/resolver.h" +#include "src/core/util/backoff.h" +#include "src/core/util/crash.h" +#include "src/core/util/debug_location.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" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/status_helper.h" #include "src/core/util/string.h" +#include "src/core/util/time.h" #include "src/core/util/useful.h" +#include "src/core/util/validation_errors.h" +#include "src/core/util/work_serializer.h" #define GRPC_GRPCLB_INITIAL_CONNECT_BACKOFF_SECONDS 1 #define GRPC_GRPCLB_RECONNECT_BACKOFF_MULTIPLIER 1.6 diff --git a/src/core/load_balancing/grpclb/grpclb_client_stats.cc b/src/core/load_balancing/grpclb/grpclb_client_stats.cc index b21e56c908c..6ed75719e9c 100644 --- a/src/core/load_balancing/grpclb/grpclb_client_stats.cc +++ b/src/core/load_balancing/grpclb/grpclb_client_stats.cc @@ -24,7 +24,7 @@ #include #include -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/sync.h" namespace grpc_core { diff --git a/src/core/load_balancing/grpclb/grpclb_client_stats.h b/src/core/load_balancing/grpclb/grpclb_client_stats.h index 557d00429a9..d03462038f6 100644 --- a/src/core/load_balancing/grpclb/grpclb_client_stats.h +++ b/src/core/load_balancing/grpclb/grpclb_client_stats.h @@ -30,9 +30,9 @@ #include #include -#include "src/core/lib/gprpp/memory.h" -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/memory.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/sync.h" namespace grpc_core { diff --git a/src/core/load_balancing/grpclb/load_balancer_api.cc b/src/core/load_balancing/grpclb/load_balancer_api.cc index cdfa14c88ca..8cda3230ed5 100644 --- a/src/core/load_balancing/grpclb/load_balancer_api.cc +++ b/src/core/load_balancing/grpclb/load_balancer_api.cc @@ -30,7 +30,7 @@ #include #include -#include "src/core/lib/gprpp/memory.h" +#include "src/core/util/memory.h" #include "src/proto/grpc/lb/v1/load_balancer.upb.h" namespace grpc_core { diff --git a/src/core/load_balancing/grpclb/load_balancer_api.h b/src/core/load_balancing/grpclb/load_balancer_api.h index e948810e492..ebfdd0c84d6 100644 --- a/src/core/load_balancing/grpclb/load_balancer_api.h +++ b/src/core/load_balancing/grpclb/load_balancer_api.h @@ -28,8 +28,8 @@ #include #include -#include "src/core/lib/gprpp/time.h" #include "src/core/load_balancing/grpclb/grpclb_client_stats.h" +#include "src/core/util/time.h" #define GRPC_GRPCLB_SERVICE_NAME_MAX_LENGTH 128 #define GRPC_GRPCLB_SERVER_IP_ADDRESS_MAX_SIZE 16 diff --git a/src/core/load_balancing/health_check_client.cc b/src/core/load_balancing/health_check_client.cc index 3dd0cefb202..523c1bd342a 100644 --- a/src/core/load_balancing/health_check_client.cc +++ b/src/core/load_balancing/health_check_client.cc @@ -47,11 +47,6 @@ #include "src/core/lib/address_utils/sockaddr_utils.h" #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/orphanable.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/work_serializer.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" @@ -61,6 +56,11 @@ #include "src/core/lib/transport/connectivity_state.h" #include "src/core/load_balancing/health_check_client_internal.h" #include "src/core/load_balancing/subchannel_interface.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" +#include "src/core/util/work_serializer.h" #include "src/proto/grpc/health/v1/health.upb.h" namespace grpc_core { diff --git a/src/core/load_balancing/health_check_client.h b/src/core/load_balancing/health_check_client.h index 03f42cd1e91..9fe4c1cdf17 100644 --- a/src/core/load_balancing/health_check_client.h +++ b/src/core/load_balancing/health_check_client.h @@ -22,8 +22,8 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/work_serializer.h" #include "src/core/load_balancing/subchannel_interface.h" +#include "src/core/util/work_serializer.h" namespace grpc_core { diff --git a/src/core/load_balancing/health_check_client_internal.h b/src/core/load_balancing/health_check_client_internal.h index 0fc86ac2858..cded2e1df8c 100644 --- a/src/core/load_balancing/health_check_client_internal.h +++ b/src/core/load_balancing/health_check_client_internal.h @@ -34,14 +34,14 @@ #include "src/core/client_channel/subchannel.h" #include "src/core/client_channel/subchannel_interface_internal.h" #include "src/core/client_channel/subchannel_stream_client.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/gprpp/unique_type_name.h" -#include "src/core/lib/gprpp/work_serializer.h" #include "src/core/lib/iomgr/iomgr_fwd.h" #include "src/core/lib/iomgr/pollset_set.h" #include "src/core/load_balancing/subchannel_interface.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" +#include "src/core/util/unique_type_name.h" +#include "src/core/util/work_serializer.h" namespace grpc_core { diff --git a/src/core/load_balancing/lb_policy.h b/src/core/load_balancing/lb_policy.h index 37027c54bdf..bbfd775b028 100644 --- a/src/core/load_balancing/lb_policy.h +++ b/src/core/load_balancing/lb_policy.h @@ -40,19 +40,19 @@ #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/dual_ref_counted.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" -#include "src/core/lib/gprpp/work_serializer.h" #include "src/core/lib/iomgr/iomgr_fwd.h" #include "src/core/lib/iomgr/resolved_address.h" #include "src/core/load_balancing/backend_metric_data.h" #include "src/core/load_balancing/subchannel_interface.h" #include "src/core/resolver/endpoint_addresses.h" #include "src/core/telemetry/metrics.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/dual_ref_counted.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" +#include "src/core/util/work_serializer.h" namespace grpc_core { diff --git a/src/core/load_balancing/lb_policy_factory.h b/src/core/load_balancing/lb_policy_factory.h index 697a5321667..d05d356b71d 100644 --- a/src/core/load_balancing/lb_policy_factory.h +++ b/src/core/load_balancing/lb_policy_factory.h @@ -22,10 +22,10 @@ #include -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/load_balancing/lb_policy.h" #include "src/core/util/json/json.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_core { diff --git a/src/core/load_balancing/lb_policy_registry.h b/src/core/load_balancing/lb_policy_registry.h index 44d1e487522..e0587f4856a 100644 --- a/src/core/load_balancing/lb_policy_registry.h +++ b/src/core/load_balancing/lb_policy_registry.h @@ -25,11 +25,11 @@ #include -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/load_balancing/lb_policy.h" #include "src/core/load_balancing/lb_policy_factory.h" #include "src/core/util/json/json.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_core { diff --git a/src/core/load_balancing/oob_backend_metric.cc b/src/core/load_balancing/oob_backend_metric.cc index 1073e743400..87e9528379e 100644 --- a/src/core/load_balancing/oob_backend_metric.cc +++ b/src/core/load_balancing/oob_backend_metric.cc @@ -42,12 +42,6 @@ #include "src/core/client_channel/subchannel.h" #include "src/core/client_channel/subchannel_stream_client.h" #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/memory.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/gprpp/time.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" @@ -56,6 +50,12 @@ #include "src/core/lib/slice/slice.h" #include "src/core/load_balancing/backend_metric_parser.h" #include "src/core/load_balancing/oob_backend_metric_internal.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/memory.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.h" namespace grpc_core { diff --git a/src/core/load_balancing/oob_backend_metric.h b/src/core/load_balancing/oob_backend_metric.h index 26ac8b1b12d..1c594d8e93c 100644 --- a/src/core/load_balancing/oob_backend_metric.h +++ b/src/core/load_balancing/oob_backend_metric.h @@ -21,9 +21,9 @@ #include -#include "src/core/lib/gprpp/time.h" #include "src/core/load_balancing/backend_metric_data.h" #include "src/core/load_balancing/subchannel_interface.h" +#include "src/core/util/time.h" namespace grpc_core { diff --git a/src/core/load_balancing/oob_backend_metric_internal.h b/src/core/load_balancing/oob_backend_metric_internal.h index 30f9ac158da..f39e852b01f 100644 --- a/src/core/load_balancing/oob_backend_metric_internal.h +++ b/src/core/load_balancing/oob_backend_metric_internal.h @@ -30,13 +30,13 @@ #include "src/core/client_channel/subchannel.h" #include "src/core/client_channel/subchannel_interface_internal.h" #include "src/core/client_channel/subchannel_stream_client.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/gprpp/time.h" -#include "src/core/lib/gprpp/unique_type_name.h" #include "src/core/load_balancing/backend_metric_data.h" #include "src/core/load_balancing/oob_backend_metric.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.h" +#include "src/core/util/unique_type_name.h" namespace grpc_core { diff --git a/src/core/load_balancing/outlier_detection/outlier_detection.cc b/src/core/load_balancing/outlier_detection/outlier_detection.cc index bc5a2a01aa8..aef81b7363d 100644 --- a/src/core/load_balancing/outlier_detection/outlier_detection.cc +++ b/src/core/load_balancing/outlier_detection/outlier_detection.cc @@ -50,14 +50,6 @@ #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/experiments/experiments.h" -#include "src/core/lib/gprpp/debug_location.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" -#include "src/core/lib/gprpp/unique_type_name.h" -#include "src/core/lib/gprpp/validation_errors.h" -#include "src/core/lib/gprpp/work_serializer.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/iomgr_fwd.h" #include "src/core/lib/iomgr/pollset_set.h" @@ -71,7 +63,15 @@ #include "src/core/load_balancing/lb_policy_registry.h" #include "src/core/load_balancing/subchannel_interface.h" #include "src/core/resolver/endpoint_addresses.h" +#include "src/core/util/debug_location.h" #include "src/core/util/json/json.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" +#include "src/core/util/unique_type_name.h" +#include "src/core/util/validation_errors.h" +#include "src/core/util/work_serializer.h" namespace grpc_core { diff --git a/src/core/load_balancing/outlier_detection/outlier_detection.h b/src/core/load_balancing/outlier_detection/outlier_detection.h index ba5767914ec..d862941e1fa 100644 --- a/src/core/load_balancing/outlier_detection/outlier_detection.h +++ b/src/core/load_balancing/outlier_detection/outlier_detection.h @@ -23,11 +23,11 @@ #include -#include "src/core/lib/gprpp/time.h" -#include "src/core/lib/gprpp/validation_errors.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" +#include "src/core/util/time.h" +#include "src/core/util/validation_errors.h" namespace grpc_core { diff --git a/src/core/load_balancing/pick_first/pick_first.cc b/src/core/load_balancing/pick_first/pick_first.cc index 430b150d312..c977a032c5d 100644 --- a/src/core/load_balancing/pick_first/pick_first.cc +++ b/src/core/load_balancing/pick_first/pick_first.cc @@ -46,12 +46,6 @@ #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.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/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/time.h" -#include "src/core/lib/gprpp/work_serializer.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/iomgr_fwd.h" #include "src/core/lib/iomgr/resolved_address.h" @@ -62,10 +56,16 @@ #include "src/core/load_balancing/subchannel_interface.h" #include "src/core/resolver/endpoint_addresses.h" #include "src/core/telemetry/metrics.h" +#include "src/core/util/crash.h" +#include "src/core/util/debug_location.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" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" #include "src/core/util/useful.h" +#include "src/core/util/work_serializer.h" namespace grpc_core { diff --git a/src/core/load_balancing/priority/priority.cc b/src/core/load_balancing/priority/priority.cc index 07f9a529ddb..a747c2ce17f 100644 --- a/src/core/load_balancing/priority/priority.cc +++ b/src/core/load_balancing/priority/priority.cc @@ -42,13 +42,6 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" #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/ref_counted_string.h" -#include "src/core/lib/gprpp/time.h" -#include "src/core/lib/gprpp/validation_errors.h" -#include "src/core/lib/gprpp/work_serializer.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/pollset_set.h" #include "src/core/lib/transport/connectivity_state.h" @@ -59,9 +52,16 @@ #include "src/core/load_balancing/lb_policy_factory.h" #include "src/core/load_balancing/lb_policy_registry.h" #include "src/core/resolver/endpoint_addresses.h" +#include "src/core/util/debug_location.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" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/ref_counted_string.h" +#include "src/core/util/time.h" +#include "src/core/util/validation_errors.h" +#include "src/core/util/work_serializer.h" namespace grpc_core { diff --git a/src/core/load_balancing/ring_hash/ring_hash.cc b/src/core/load_balancing/ring_hash/ring_hash.cc index da108603a04..5ca33543983 100644 --- a/src/core/load_balancing/ring_hash/ring_hash.cc +++ b/src/core/load_balancing/ring_hash/ring_hash.cc @@ -47,14 +47,6 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/debug_location.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/unique_type_name.h" -#include "src/core/lib/gprpp/work_serializer.h" -#include "src/core/lib/gprpp/xxhash_inline.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" @@ -67,7 +59,15 @@ #include "src/core/load_balancing/lb_policy_registry.h" #include "src/core/load_balancing/pick_first/pick_first.h" #include "src/core/resolver/endpoint_addresses.h" +#include "src/core/util/crash.h" +#include "src/core/util/debug_location.h" #include "src/core/util/json/json.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/unique_type_name.h" +#include "src/core/util/work_serializer.h" +#include "src/core/util/xxhash_inline.h" namespace grpc_core { diff --git a/src/core/load_balancing/ring_hash/ring_hash.h b/src/core/load_balancing/ring_hash/ring_hash.h index c5f6205e170..da7e83b215a 100644 --- a/src/core/load_balancing/ring_hash/ring_hash.h +++ b/src/core/load_balancing/ring_hash/ring_hash.h @@ -21,12 +21,12 @@ #include -#include "src/core/lib/gprpp/unique_type_name.h" -#include "src/core/lib/gprpp/validation_errors.h" #include "src/core/service_config/service_config_call_data.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" +#include "src/core/util/unique_type_name.h" +#include "src/core/util/validation_errors.h" namespace grpc_core { diff --git a/src/core/load_balancing/rls/rls.cc b/src/core/load_balancing/rls/rls.cc index b425a326a8e..a02da17484c 100644 --- a/src/core/load_balancing/rls/rls.cc +++ b/src/core/load_balancing/rls/rls.cc @@ -68,21 +68,9 @@ #include "src/core/channelz/channelz.h" #include "src/core/client_channel/client_channel_filter.h" -#include "src/core/lib/backoff/backoff.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/dual_ref_counted.h" -#include "src/core/lib/gprpp/match.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/status_helper.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/time.h" -#include "src/core/lib/gprpp/uuid_v4.h" -#include "src/core/lib/gprpp/validation_errors.h" -#include "src/core/lib/gprpp/work_serializer.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" @@ -103,11 +91,23 @@ #include "src/core/resolver/resolver_registry.h" #include "src/core/service_config/service_config_impl.h" #include "src/core/telemetry/metrics.h" +#include "src/core/util/backoff.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/dual_ref_counted.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" #include "src/core/util/json/json_writer.h" +#include "src/core/util/match.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.h" #include "src/core/util/upb_utils.h" +#include "src/core/util/uuid_v4.h" +#include "src/core/util/validation_errors.h" +#include "src/core/util/work_serializer.h" #include "src/proto/grpc/lookup/v1/rls.upb.h" using ::grpc_event_engine::experimental::EventEngine; diff --git a/src/core/load_balancing/round_robin/round_robin.cc b/src/core/load_balancing/round_robin/round_robin.cc index 193c5a55821..1d9d5b2e2d9 100644 --- a/src/core/load_balancing/round_robin/round_robin.cc +++ b/src/core/load_balancing/round_robin/round_robin.cc @@ -40,16 +40,16 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" #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/work_serializer.h" #include "src/core/lib/transport/connectivity_state.h" #include "src/core/load_balancing/endpoint_list.h" #include "src/core/load_balancing/lb_policy.h" #include "src/core/load_balancing/lb_policy_factory.h" #include "src/core/resolver/endpoint_addresses.h" +#include "src/core/util/debug_location.h" #include "src/core/util/json/json.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/work_serializer.h" namespace grpc_core { diff --git a/src/core/load_balancing/subchannel_interface.h b/src/core/load_balancing/subchannel_interface.h index 9d49f30ac26..b2d78fad05f 100644 --- a/src/core/load_balancing/subchannel_interface.h +++ b/src/core/load_balancing/subchannel_interface.h @@ -26,9 +26,9 @@ #include #include -#include "src/core/lib/gprpp/dual_ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/iomgr/iomgr_fwd.h" +#include "src/core/util/dual_ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_core { diff --git a/src/core/load_balancing/weighted_round_robin/weighted_round_robin.cc b/src/core/load_balancing/weighted_round_robin/weighted_round_robin.cc index 144f1b00888..d1276d417d3 100644 --- a/src/core/load_balancing/weighted_round_robin/weighted_round_robin.cc +++ b/src/core/load_balancing/weighted_round_robin/weighted_round_robin.cc @@ -48,14 +48,6 @@ #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/experiments/experiments.h" -#include "src/core/lib/gprpp/debug_location.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" -#include "src/core/lib/gprpp/time.h" -#include "src/core/lib/gprpp/validation_errors.h" -#include "src/core/lib/gprpp/work_serializer.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/resolved_address.h" #include "src/core/lib/transport/connectivity_state.h" @@ -71,9 +63,17 @@ #include "src/core/telemetry/metrics.h" #include "src/core/telemetry/stats.h" #include "src/core/telemetry/stats_data.h" +#include "src/core/util/debug_location.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" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.h" +#include "src/core/util/validation_errors.h" +#include "src/core/util/work_serializer.h" namespace grpc_core { diff --git a/src/core/load_balancing/weighted_target/weighted_target.cc b/src/core/load_balancing/weighted_target/weighted_target.cc index 9724720fc65..8f5075a3409 100644 --- a/src/core/load_balancing/weighted_target/weighted_target.cc +++ b/src/core/load_balancing/weighted_target/weighted_target.cc @@ -45,13 +45,6 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" #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/gprpp/time.h" -#include "src/core/lib/gprpp/validation_errors.h" -#include "src/core/lib/gprpp/work_serializer.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/pollset_set.h" #include "src/core/lib/transport/connectivity_state.h" @@ -62,9 +55,16 @@ #include "src/core/load_balancing/lb_policy_factory.h" #include "src/core/load_balancing/lb_policy_registry.h" #include "src/core/resolver/endpoint_addresses.h" +#include "src/core/util/debug_location.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" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.h" +#include "src/core/util/validation_errors.h" +#include "src/core/util/work_serializer.h" // IWYU pragma: no_include diff --git a/src/core/load_balancing/xds/cds.cc b/src/core/load_balancing/xds/cds.cc index 03ee2a00a18..98072442af5 100644 --- a/src/core/load_balancing/xds/cds.cc +++ b/src/core/load_balancing/xds/cds.cc @@ -40,14 +40,6 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/env.h" -#include "src/core/lib/gprpp/match.h" -#include "src/core/lib/gprpp/orphanable.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/gprpp/work_serializer.h" #include "src/core/lib/iomgr/pollset_set.h" #include "src/core/load_balancing/address_filtering.h" #include "src/core/load_balancing/delegating_helper.h" @@ -57,10 +49,18 @@ #include "src/core/load_balancing/outlier_detection/outlier_detection.h" #include "src/core/load_balancing/xds/xds_channel_args.h" #include "src/core/resolver/xds/xds_dependency_manager.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/env.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" #include "src/core/util/json/json_writer.h" +#include "src/core/util/match.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" +#include "src/core/util/unique_type_name.h" +#include "src/core/util/work_serializer.h" #include "src/core/xds/grpc/xds_cluster.h" #include "src/core/xds/grpc/xds_common_types.h" #include "src/core/xds/grpc/xds_health_status.h" diff --git a/src/core/load_balancing/xds/xds_cluster_impl.cc b/src/core/load_balancing/xds/xds_cluster_impl.cc index e66330a21da..66aed1e65d3 100644 --- a/src/core/load_balancing/xds/xds_cluster_impl.cc +++ b/src/core/load_balancing/xds/xds_cluster_impl.cc @@ -41,14 +41,6 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/match.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/ref_counted_string.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/validation_errors.h" #include "src/core/lib/iomgr/pollset_set.h" #include "src/core/lib/iomgr/resolved_address.h" #include "src/core/lib/security/credentials/xds/xds_credentials.h" @@ -65,9 +57,17 @@ #include "src/core/resolver/xds/xds_config.h" #include "src/core/resolver/xds/xds_resolver_attributes.h" #include "src/core/telemetry/call_tracer.h" +#include "src/core/util/debug_location.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" +#include "src/core/util/match.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/ref_counted_string.h" +#include "src/core/util/sync.h" +#include "src/core/util/validation_errors.h" #include "src/core/xds/grpc/xds_bootstrap_grpc.h" #include "src/core/xds/grpc/xds_client_grpc.h" #include "src/core/xds/grpc/xds_endpoint.h" diff --git a/src/core/load_balancing/xds/xds_cluster_manager.cc b/src/core/load_balancing/xds/xds_cluster_manager.cc index 5d3dfd9e8bc..4e72ca1170c 100644 --- a/src/core/load_balancing/xds/xds_cluster_manager.cc +++ b/src/core/load_balancing/xds/xds_cluster_manager.cc @@ -41,12 +41,6 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" #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/time.h" -#include "src/core/lib/gprpp/validation_errors.h" -#include "src/core/lib/gprpp/work_serializer.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/pollset_set.h" #include "src/core/lib/transport/connectivity_state.h" @@ -57,9 +51,15 @@ #include "src/core/load_balancing/lb_policy_registry.h" #include "src/core/resolver/endpoint_addresses.h" #include "src/core/resolver/xds/xds_resolver_attributes.h" +#include "src/core/util/debug_location.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" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" +#include "src/core/util/validation_errors.h" +#include "src/core/util/work_serializer.h" namespace grpc_core { diff --git a/src/core/load_balancing/xds/xds_override_host.cc b/src/core/load_balancing/xds/xds_override_host.cc index 62a1632f2ca..1c64eeb0a13 100644 --- a/src/core/load_balancing/xds/xds_override_host.cc +++ b/src/core/load_balancing/xds/xds_override_host.cc @@ -55,14 +55,6 @@ #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/experiments/experiments.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/match.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/ref_counted_string.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/validation_errors.h" -#include "src/core/lib/gprpp/work_serializer.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" @@ -78,9 +70,17 @@ #include "src/core/load_balancing/subchannel_interface.h" #include "src/core/resolver/endpoint_addresses.h" #include "src/core/resolver/xds/xds_config.h" +#include "src/core/util/debug_location.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" +#include "src/core/util/match.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/ref_counted_string.h" +#include "src/core/util/sync.h" +#include "src/core/util/validation_errors.h" +#include "src/core/util/work_serializer.h" #include "src/core/xds/grpc/xds_health_status.h" namespace grpc_core { diff --git a/src/core/load_balancing/xds/xds_override_host.h b/src/core/load_balancing/xds/xds_override_host.h index 226b55dee01..387a5036491 100644 --- a/src/core/load_balancing/xds/xds_override_host.h +++ b/src/core/load_balancing/xds/xds_override_host.h @@ -21,12 +21,12 @@ #include -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/validation_errors.h" #include "src/core/load_balancing/lb_policy.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" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/validation_errors.h" namespace grpc_core { diff --git a/src/core/load_balancing/xds/xds_wrr_locality.cc b/src/core/load_balancing/xds/xds_wrr_locality.cc index 7435032ceeb..ce3f3079e22 100644 --- a/src/core/load_balancing/xds/xds_wrr_locality.cc +++ b/src/core/load_balancing/xds/xds_wrr_locality.cc @@ -34,11 +34,6 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" #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/ref_counted_string.h" -#include "src/core/lib/gprpp/validation_errors.h" #include "src/core/lib/iomgr/pollset_set.h" #include "src/core/load_balancing/delegating_helper.h" #include "src/core/load_balancing/lb_policy.h" @@ -46,10 +41,15 @@ #include "src/core/load_balancing/lb_policy_registry.h" #include "src/core/load_balancing/xds/xds_channel_args.h" #include "src/core/resolver/endpoint_addresses.h" +#include "src/core/util/debug_location.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" #include "src/core/util/json/json_writer.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/ref_counted_string.h" +#include "src/core/util/validation_errors.h" #include "src/core/xds/xds_client/xds_client_stats.h" namespace grpc_core { diff --git a/src/core/resolver/binder/binder_resolver.cc b/src/core/resolver/binder/binder_resolver.cc index f8da4cfd5ed..30f7e46cc19 100644 --- a/src/core/resolver/binder/binder_resolver.cc +++ b/src/core/resolver/binder/binder_resolver.cc @@ -18,8 +18,8 @@ #include -#include "src/core/lib/gprpp/status_helper.h" #include "src/core/lib/iomgr/port.h" // IWYU pragma: keep +#include "src/core/util/status_helper.h" #ifdef GRPC_HAVE_UNIX_SOCKET @@ -45,13 +45,13 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/orphanable.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/resolved_address.h" -#include "src/core/lib/uri/uri_parser.h" #include "src/core/resolver/endpoint_addresses.h" #include "src/core/resolver/resolver.h" #include "src/core/resolver/resolver_factory.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/uri.h" namespace grpc_core { namespace { diff --git a/src/core/resolver/dns/c_ares/dns_resolver_ares.cc b/src/core/resolver/dns/c_ares/dns_resolver_ares.cc index dbd8fc34a3e..564fa165d8d 100644 --- a/src/core/resolver/dns/c_ares/dns_resolver_ares.cc +++ b/src/core/resolver/dns/c_ares/dns_resolver_ares.cc @@ -38,22 +38,22 @@ #include "src/core/lib/config/core_configuration.h" #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/status_helper.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/iomgr_fwd.h" #include "src/core/lib/iomgr/pollset_set.h" #include "src/core/lib/iomgr/resolved_address.h" -#include "src/core/lib/uri/uri_parser.h" #include "src/core/resolver/dns/event_engine/service_config_helper.h" #include "src/core/resolver/resolver.h" #include "src/core/resolver/resolver_factory.h" #include "src/core/service_config/service_config.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.h" +#include "src/core/util/uri.h" #if GRPC_ARES == 1 @@ -61,7 +61,6 @@ #include "absl/strings/str_cat.h" -#include "src/core/lib/backoff/backoff.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/config_vars.h" #include "src/core/lib/iomgr/resolve_address.h" @@ -71,6 +70,7 @@ #include "src/core/resolver/endpoint_addresses.h" #include "src/core/resolver/polling_resolver.h" #include "src/core/service_config/service_config_impl.h" +#include "src/core/util/backoff.h" #define GRPC_DNS_INITIAL_CONNECT_BACKOFF_SECONDS 1 #define GRPC_DNS_RECONNECT_BACKOFF_MULTIPLIER 1.6 diff --git a/src/core/resolver/dns/c_ares/grpc_ares_ev_driver.h b/src/core/resolver/dns/c_ares/grpc_ares_ev_driver.h index 652921cb668..5a75c6c7431 100644 --- a/src/core/resolver/dns/c_ares/grpc_ares_ev_driver.h +++ b/src/core/resolver/dns/c_ares/grpc_ares_ev_driver.h @@ -27,11 +27,11 @@ #include -#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/iomgr_fwd.h" #include "src/core/resolver/dns/c_ares/grpc_ares_wrapper.h" +#include "src/core/util/sync.h" namespace grpc_core { diff --git a/src/core/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc b/src/core/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc index ce54f647f15..634ab525e84 100644 --- a/src/core/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc +++ b/src/core/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc @@ -39,7 +39,6 @@ #include "absl/log/check.h" #include "absl/strings/str_cat.h" -#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/ev_posix.h" @@ -47,6 +46,7 @@ #include "src/core/lib/iomgr/socket_utils_posix.h" #include "src/core/resolver/dns/c_ares/grpc_ares_ev_driver.h" #include "src/core/resolver/dns/c_ares/grpc_ares_wrapper.h" +#include "src/core/util/sync.h" namespace grpc_core { diff --git a/src/core/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc b/src/core/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc index 9b9a79b3206..d7757fb9fc4 100644 --- a/src/core/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc +++ b/src/core/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc @@ -38,8 +38,6 @@ #include #include "src/core/lib/address_utils/sockaddr_utils.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/memory.h" #include "src/core/lib/iomgr/iocp_windows.h" #include "src/core/lib/iomgr/sockaddr_windows.h" #include "src/core/lib/iomgr/socket_windows.h" @@ -48,6 +46,8 @@ #include "src/core/lib/slice/slice_internal.h" #include "src/core/resolver/dns/c_ares/grpc_ares_ev_driver.h" #include "src/core/resolver/dns/c_ares/grpc_ares_wrapper.h" +#include "src/core/util/crash.h" +#include "src/core/util/memory.h" #include "src/core/util/string.h" // TODO(apolcyn): remove this hack after fixing upstream. diff --git a/src/core/resolver/dns/c_ares/grpc_ares_wrapper.cc b/src/core/resolver/dns/c_ares/grpc_ares_wrapper.cc index be2116994bb..e0efc6075b6 100644 --- a/src/core/resolver/dns/c_ares/grpc_ares_wrapper.cc +++ b/src/core/resolver/dns/c_ares/grpc_ares_wrapper.cc @@ -24,8 +24,8 @@ #include #include -#include "src/core/lib/gprpp/status_helper.h" #include "src/core/lib/iomgr/sockaddr.h" +#include "src/core/util/status_helper.h" // IWYU pragma: no_include // IWYU pragma: no_include @@ -60,9 +60,6 @@ #include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/host_port.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/nameser.h" // IWYU pragma: keep @@ -70,7 +67,10 @@ #include "src/core/lib/iomgr/timer.h" #include "src/core/resolver/dns/c_ares/grpc_ares_ev_driver.h" #include "src/core/resolver/dns/c_ares/grpc_ares_wrapper.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/host_port.h" #include "src/core/util/string.h" +#include "src/core/util/time.h" using grpc_core::EndpointAddresses; using grpc_core::EndpointAddressesList; diff --git a/src/core/resolver/dns/c_ares/grpc_ares_wrapper.h b/src/core/resolver/dns/c_ares/grpc_ares_wrapper.h index bd4fbe2720f..5ed2f9cc51e 100644 --- a/src/core/resolver/dns/c_ares/grpc_ares_wrapper.h +++ b/src/core/resolver/dns/c_ares/grpc_ares_wrapper.h @@ -31,11 +31,11 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/iomgr_fwd.h" #include "src/core/resolver/endpoint_addresses.h" +#include "src/core/util/sync.h" #define GRPC_DNS_ARES_DEFAULT_QUERY_TIMEOUT_MS 120000 diff --git a/src/core/resolver/dns/dns_resolver_plugin.cc b/src/core/resolver/dns/dns_resolver_plugin.cc index 0a3c78488ed..7e9870543b2 100644 --- a/src/core/resolver/dns/dns_resolver_plugin.cc +++ b/src/core/resolver/dns/dns_resolver_plugin.cc @@ -22,11 +22,11 @@ #include "src/core/lib/config/config_vars.h" #include "src/core/lib/experiments/experiments.h" -#include "src/core/lib/gprpp/crash.h" #include "src/core/resolver/dns/c_ares/dns_resolver_ares.h" #include "src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.h" #include "src/core/resolver/dns/native/dns_resolver.h" #include "src/core/resolver/resolver_factory.h" +#include "src/core/util/crash.h" namespace grpc_core { diff --git a/src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.cc b/src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.cc index 3efb937523d..c65b1d506fb 100644 --- a/src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.cc +++ b/src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.cc @@ -38,15 +38,9 @@ #include #include -#include "src/core/lib/backoff/backoff.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/event_engine/resolved_address_internal.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/time.h" -#include "src/core/lib/gprpp/validation_errors.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/resolve_address.h" #include "src/core/load_balancing/grpclb/grpclb_balancer_addresses.h" @@ -57,6 +51,12 @@ #include "src/core/resolver/resolver_factory.h" #include "src/core/service_config/service_config.h" #include "src/core/service_config/service_config_impl.h" +#include "src/core/util/backoff.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.h" +#include "src/core/util/validation_errors.h" // IWYU pragma: no_include diff --git a/src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.h b/src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.h index 65a21e4a02f..555e91fedef 100644 --- a/src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.h +++ b/src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.h @@ -17,10 +17,10 @@ #include -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/uri/uri_parser.h" #include "src/core/resolver/resolver.h" #include "src/core/resolver/resolver_factory.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/uri.h" namespace grpc_core { diff --git a/src/core/resolver/dns/event_engine/service_config_helper.cc b/src/core/resolver/dns/event_engine/service_config_helper.cc index 92cea5ec517..ba0b910e327 100644 --- a/src/core/resolver/dns/event_engine/service_config_helper.cc +++ b/src/core/resolver/dns/event_engine/service_config_helper.cc @@ -23,13 +23,13 @@ #include -#include "src/core/lib/gprpp/status_helper.h" -#include "src/core/lib/iomgr/gethostname.h" +#include "src/core/util/gethostname.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" #include "src/core/util/json/json_reader.h" #include "src/core/util/json/json_writer.h" +#include "src/core/util/status_helper.h" namespace grpc_core { diff --git a/src/core/resolver/dns/native/dns_resolver.cc b/src/core/resolver/dns/native/dns_resolver.cc index 1a3ca55f9b0..8ee4b549f65 100644 --- a/src/core/resolver/dns/native/dns_resolver.cc +++ b/src/core/resolver/dns/native/dns_resolver.cc @@ -31,21 +31,21 @@ #include #include -#include "src/core/lib/backoff/backoff.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" #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/time.h" #include "src/core/lib/iomgr/resolve_address.h" #include "src/core/lib/iomgr/resolved_address.h" -#include "src/core/lib/uri/uri_parser.h" #include "src/core/resolver/endpoint_addresses.h" #include "src/core/resolver/polling_resolver.h" #include "src/core/resolver/resolver.h" #include "src/core/resolver/resolver_factory.h" +#include "src/core/util/backoff.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" +#include "src/core/util/uri.h" #define GRPC_DNS_INITIAL_CONNECT_BACKOFF_SECONDS 1 #define GRPC_DNS_RECONNECT_BACKOFF_MULTIPLIER 1.6 diff --git a/src/core/resolver/fake/fake_resolver.cc b/src/core/resolver/fake/fake_resolver.cc index b1659f84bf4..b2bbaf26193 100644 --- a/src/core/resolver/fake/fake_resolver.cc +++ b/src/core/resolver/fake/fake_resolver.cc @@ -30,12 +30,12 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/work_serializer.h" -#include "src/core/lib/uri/uri_parser.h" #include "src/core/resolver/resolver_factory.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/uri.h" #include "src/core/util/useful.h" +#include "src/core/util/work_serializer.h" namespace grpc_core { diff --git a/src/core/resolver/fake/fake_resolver.h b/src/core/resolver/fake/fake_resolver.h index 75dc3ab0ca4..5126c741577 100644 --- a/src/core/resolver/fake/fake_resolver.h +++ b/src/core/resolver/fake/fake_resolver.h @@ -27,11 +27,11 @@ #include #include -#include "src/core/lib/gprpp/notification.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" #include "src/core/resolver/resolver.h" +#include "src/core/util/notification.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" #include "src/core/util/useful.h" #define GRPC_ARG_FAKE_RESOLVER_RESPONSE_GENERATOR \ diff --git a/src/core/resolver/google_c2p/google_c2p_resolver.cc b/src/core/resolver/google_c2p/google_c2p_resolver.cc index 79252738417..42e309f900c 100644 --- a/src/core/resolver/google_c2p/google_c2p_resolver.cc +++ b/src/core/resolver/google_c2p/google_c2p_resolver.cc @@ -34,22 +34,22 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/env.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/time.h" -#include "src/core/lib/gprpp/work_serializer.h" #include "src/core/lib/iomgr/polling_entity.h" #include "src/core/lib/resource_quota/resource_quota.h" #include "src/core/lib/security/credentials/alts/check_gcp_environment.h" -#include "src/core/lib/uri/uri_parser.h" #include "src/core/resolver/resolver.h" #include "src/core/resolver/resolver_factory.h" #include "src/core/resolver/resolver_registry.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/env.h" #include "src/core/util/gcp_metadata_query.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_writer.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" +#include "src/core/util/uri.h" +#include "src/core/util/work_serializer.h" #include "src/core/xds/grpc/xds_client_grpc.h" #include "src/core/xds/xds_client/xds_bootstrap.h" diff --git a/src/core/resolver/polling_resolver.cc b/src/core/resolver/polling_resolver.cc index ec1af270599..27806f1e5a9 100644 --- a/src/core/resolver/polling_resolver.cc +++ b/src/core/resolver/polling_resolver.cc @@ -32,15 +32,15 @@ #include -#include "src/core/lib/backoff/backoff.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/work_serializer.h" #include "src/core/lib/iomgr/exec_ctx.h" -#include "src/core/lib/uri/uri_parser.h" #include "src/core/resolver/endpoint_addresses.h" #include "src/core/service_config/service_config.h" +#include "src/core/util/backoff.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/uri.h" +#include "src/core/util/work_serializer.h" namespace grpc_core { diff --git a/src/core/resolver/polling_resolver.h b/src/core/resolver/polling_resolver.h index 53b0270ec07..fe405c3f1d4 100644 --- a/src/core/resolver/polling_resolver.h +++ b/src/core/resolver/polling_resolver.h @@ -26,15 +26,15 @@ #include #include -#include "src/core/lib/backoff/backoff.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/time.h" -#include "src/core/lib/gprpp/work_serializer.h" #include "src/core/lib/iomgr/iomgr_fwd.h" #include "src/core/resolver/resolver.h" #include "src/core/resolver/resolver_factory.h" +#include "src/core/util/backoff.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/time.h" +#include "src/core/util/work_serializer.h" namespace grpc_core { diff --git a/src/core/resolver/resolver.h b/src/core/resolver/resolver.h index 6b6e92c6660..389096c3d8f 100644 --- a/src/core/resolver/resolver.h +++ b/src/core/resolver/resolver.h @@ -27,11 +27,11 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/resolver/endpoint_addresses.h" #include "src/core/resolver/server_address.h" // IWYU pragma: keep #include "src/core/service_config/service_config.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_core { diff --git a/src/core/resolver/resolver_factory.h b/src/core/resolver/resolver_factory.h index e4cc5347386..831b67c5cfc 100644 --- a/src/core/resolver/resolver_factory.h +++ b/src/core/resolver/resolver_factory.h @@ -26,10 +26,10 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/orphanable.h" #include "src/core/lib/iomgr/iomgr_fwd.h" -#include "src/core/lib/uri/uri_parser.h" #include "src/core/resolver/resolver.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/uri.h" namespace grpc_core { diff --git a/src/core/resolver/resolver_registry.h b/src/core/resolver/resolver_registry.h index cb8512d7e53..5e1d87fbf6b 100644 --- a/src/core/resolver/resolver_registry.h +++ b/src/core/resolver/resolver_registry.h @@ -27,11 +27,11 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/orphanable.h" #include "src/core/lib/iomgr/iomgr_fwd.h" -#include "src/core/lib/uri/uri_parser.h" #include "src/core/resolver/resolver.h" #include "src/core/resolver/resolver_factory.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/uri.h" namespace grpc_core { diff --git a/src/core/resolver/sockaddr/sockaddr_resolver.cc b/src/core/resolver/sockaddr/sockaddr_resolver.cc index 26e3fa2eed4..1cd1ac310cf 100644 --- a/src/core/resolver/sockaddr/sockaddr_resolver.cc +++ b/src/core/resolver/sockaddr/sockaddr_resolver.cc @@ -29,13 +29,13 @@ #include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/orphanable.h" #include "src/core/lib/iomgr/port.h" #include "src/core/lib/iomgr/resolved_address.h" -#include "src/core/lib/uri/uri_parser.h" #include "src/core/resolver/endpoint_addresses.h" #include "src/core/resolver/resolver.h" #include "src/core/resolver/resolver_factory.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/uri.h" namespace grpc_core { diff --git a/src/core/resolver/xds/xds_config.cc b/src/core/resolver/xds/xds_config.cc index 1fcb2aa81c7..70158b1c365 100644 --- a/src/core/resolver/xds/xds_config.cc +++ b/src/core/resolver/xds/xds_config.cc @@ -24,7 +24,7 @@ #include "absl/strings/str_cat.h" #include "absl/strings/str_join.h" -#include "src/core/lib/gprpp/match.h" +#include "src/core/util/match.h" namespace grpc_core { diff --git a/src/core/resolver/xds/xds_config.h b/src/core/resolver/xds/xds_config.h index 9c328a20578..784db2fc487 100644 --- a/src/core/resolver/xds/xds_config.h +++ b/src/core/resolver/xds/xds_config.h @@ -27,7 +27,7 @@ #include "absl/strings/string_view.h" #include "absl/types/variant.h" -#include "src/core/lib/gprpp/ref_counted.h" +#include "src/core/util/ref_counted.h" #include "src/core/xds/grpc/xds_cluster.h" #include "src/core/xds/grpc/xds_endpoint.h" #include "src/core/xds/grpc/xds_listener.h" diff --git a/src/core/resolver/xds/xds_dependency_manager.cc b/src/core/resolver/xds/xds_dependency_manager.cc index 293586f40f5..3ed9fa1da92 100644 --- a/src/core/resolver/xds/xds_dependency_manager.cc +++ b/src/core/resolver/xds/xds_dependency_manager.cc @@ -22,12 +22,10 @@ #include "absl/log/log.h" #include "absl/strings/str_join.h" -#include - #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/match.h" #include "src/core/load_balancing/xds/xds_channel_args.h" #include "src/core/resolver/fake/fake_resolver.h" +#include "src/core/util/match.h" #include "src/core/xds/grpc/xds_cluster_parser.h" #include "src/core/xds/grpc/xds_endpoint_parser.h" #include "src/core/xds/grpc/xds_listener_parser.h" diff --git a/src/core/resolver/xds/xds_dependency_manager.h b/src/core/resolver/xds/xds_dependency_manager.h index b2b62ddf222..dcb1738b4f1 100644 --- a/src/core/resolver/xds/xds_dependency_manager.h +++ b/src/core/resolver/xds/xds_dependency_manager.h @@ -21,9 +21,9 @@ #include "absl/container/flat_hash_set.h" #include "absl/strings/string_view.h" -#include "src/core/lib/gprpp/ref_counted.h" #include "src/core/resolver/resolver.h" #include "src/core/resolver/xds/xds_config.h" +#include "src/core/util/ref_counted.h" #include "src/core/xds/grpc/xds_client_grpc.h" #include "src/core/xds/grpc/xds_cluster.h" #include "src/core/xds/grpc/xds_endpoint.h" diff --git a/src/core/resolver/xds/xds_resolver.cc b/src/core/resolver/xds/xds_resolver.cc index 9013474cca7..833468a7b29 100644 --- a/src/core/resolver/xds/xds_resolver.cc +++ b/src/core/resolver/xds/xds_resolver.cc @@ -58,15 +58,6 @@ #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/experiments/experiments.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/dual_ref_counted.h" -#include "src/core/lib/gprpp/match.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/time.h" -#include "src/core/lib/gprpp/work_serializer.h" -#include "src/core/lib/gprpp/xxhash_inline.h" #include "src/core/lib/iomgr/iomgr_fwd.h" #include "src/core/lib/iomgr/pollset_set.h" #include "src/core/lib/promise/arena_promise.h" @@ -75,7 +66,6 @@ #include "src/core/lib/slice/slice.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" -#include "src/core/lib/uri/uri_parser.h" #include "src/core/load_balancing/ring_hash/ring_hash.h" #include "src/core/resolver/endpoint_addresses.h" #include "src/core/resolver/resolver.h" @@ -84,6 +74,16 @@ #include "src/core/resolver/xds/xds_resolver_attributes.h" #include "src/core/service_config/service_config.h" #include "src/core/service_config/service_config_impl.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/dual_ref_counted.h" +#include "src/core/util/match.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" +#include "src/core/util/uri.h" +#include "src/core/util/work_serializer.h" +#include "src/core/util/xxhash_inline.h" #include "src/core/xds/grpc/xds_bootstrap_grpc.h" #include "src/core/xds/grpc/xds_client_grpc.h" #include "src/core/xds/grpc/xds_http_filter.h" diff --git a/src/core/resolver/xds/xds_resolver_attributes.h b/src/core/resolver/xds/xds_resolver_attributes.h index 385505a732d..63f2684f2a1 100644 --- a/src/core/resolver/xds/xds_resolver_attributes.h +++ b/src/core/resolver/xds/xds_resolver_attributes.h @@ -21,8 +21,8 @@ #include -#include "src/core/lib/gprpp/unique_type_name.h" #include "src/core/service_config/service_config_call_data.h" +#include "src/core/util/unique_type_name.h" #include "src/core/xds/grpc/xds_route_config.h" namespace grpc_core { diff --git a/src/core/server/server.cc b/src/core/server/server.cc index c957fac6ae2..573cd66b224 100644 --- a/src/core/server/server.cc +++ b/src/core/server/server.cc @@ -52,11 +52,6 @@ #include "src/core/lib/channel/channel_args_preconditioning.h" #include "src/core/lib/config/core_configuration.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/gprpp/mpscq.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/status_helper.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/pollset_set.h" #include "src/core/lib/promise/activity.h" @@ -82,6 +77,11 @@ #include "src/core/lib/transport/error_utils.h" #include "src/core/lib/transport/interception_chain.h" #include "src/core/telemetry/stats.h" +#include "src/core/util/crash.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/mpscq.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/status_helper.h" #include "src/core/util/useful.h" namespace grpc_core { diff --git a/src/core/server/server.h b/src/core/server/server.h index 974fbea5814..4bd2273eac3 100644 --- a/src/core/server/server.h +++ b/src/core/server/server.h @@ -46,17 +46,10 @@ #include #include "src/core/channelz/channelz.h" -#include "src/core/lib/backoff/random_early_detection.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/cpp_impl_of.h" -#include "src/core/lib/gprpp/dual_ref_counted.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/gprpp/time.h" #include "src/core/lib/iomgr/call_combiner.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint.h" @@ -70,6 +63,13 @@ #include "src/core/lib/transport/transport.h" #include "src/core/server/server_interface.h" #include "src/core/telemetry/call_tracer.h" +#include "src/core/util/cpp_impl_of.h" +#include "src/core/util/dual_ref_counted.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/random_early_detection.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.h" #define GRPC_ARG_SERVER_MAX_PENDING_REQUESTS "grpc.server.max_pending_requests" #define GRPC_ARG_SERVER_MAX_PENDING_REQUESTS_HARD_LIMIT \ diff --git a/src/core/server/server_config_selector.h b/src/core/server/server_config_selector.h index c6274f49f35..4d766419809 100644 --- a/src/core/server/server_config_selector.h +++ b/src/core/server/server_config_selector.h @@ -24,12 +24,12 @@ #include -#include "src/core/lib/gprpp/dual_ref_counted.h" -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/service_config/service_config.h" #include "src/core/service_config/service_config_parser.h" +#include "src/core/util/dual_ref_counted.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" #include "src/core/util/useful.h" namespace grpc_core { diff --git a/src/core/server/server_config_selector_filter.cc b/src/core/server/server_config_selector_filter.cc index 3773eeb3b78..b17ea44930a 100644 --- a/src/core/server/server_config_selector_filter.cc +++ b/src/core/server/server_config_selector_filter.cc @@ -29,9 +29,6 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/promise_based_filter.h" #include "src/core/lib/event_engine/event_engine_context.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/status_helper.h" -#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/promise/arena_promise.h" #include "src/core/lib/promise/context.h" #include "src/core/lib/promise/promise.h" @@ -41,6 +38,9 @@ #include "src/core/server/server_config_selector.h" #include "src/core/service_config/service_config.h" #include "src/core/service_config/service_config_call_data.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/sync.h" namespace grpc_core { diff --git a/src/core/server/xds_channel_stack_modifier.h b/src/core/server/xds_channel_stack_modifier.h index 4cea9e165e7..78810478d99 100644 --- a/src/core/server/xds_channel_stack_modifier.h +++ b/src/core/server/xds_channel_stack_modifier.h @@ -29,8 +29,8 @@ #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_stack_builder.h" -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" #include "src/core/util/useful.h" namespace grpc_core { diff --git a/src/core/server/xds_server_config_fetcher.cc b/src/core/server/xds_server_config_fetcher.cc index 433f399680a..f8b523a293e 100644 --- a/src/core/server/xds_server_config_fetcher.cc +++ b/src/core/server/xds_server_config_fetcher.cc @@ -54,12 +54,6 @@ #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/host_port.h" -#include "src/core/lib/gprpp/match.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/unique_type_name.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/iomgr_fwd.h" @@ -71,13 +65,19 @@ #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h" #include "src/core/lib/security/credentials/xds/xds_credentials.h" #include "src/core/lib/transport/metadata_batch.h" -#include "src/core/lib/uri/uri_parser.h" #include "src/core/server/server.h" #include "src/core/server/server_config_selector.h" #include "src/core/server/server_config_selector_filter.h" #include "src/core/server/xds_channel_stack_modifier.h" #include "src/core/service_config/service_config.h" #include "src/core/service_config/service_config_impl.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/host_port.h" +#include "src/core/util/match.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" +#include "src/core/util/unique_type_name.h" +#include "src/core/util/uri.h" #include "src/core/xds/grpc/certificate_provider_store.h" #include "src/core/xds/grpc/xds_bootstrap_grpc.h" #include "src/core/xds/grpc/xds_certificate_provider.h" diff --git a/src/core/service_config/service_config.h b/src/core/service_config/service_config.h index ba5fa8262ae..f9c43c35011 100644 --- a/src/core/service_config/service_config.h +++ b/src/core/service_config/service_config.h @@ -24,8 +24,8 @@ #include #include -#include "src/core/lib/gprpp/ref_counted.h" #include "src/core/service_config/service_config_parser.h" +#include "src/core/util/ref_counted.h" #include "src/core/util/useful.h" // The main purpose of the code here is to parse the service config in diff --git a/src/core/service_config/service_config_call_data.h b/src/core/service_config/service_config_call_data.h index 6d11caedab0..7c6bbcd2e39 100644 --- a/src/core/service_config/service_config_call_data.h +++ b/src/core/service_config/service_config_call_data.h @@ -24,13 +24,13 @@ #include -#include "src/core/lib/gprpp/chunked_vector.h" -#include "src/core/lib/gprpp/down_cast.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/service_config/service_config.h" #include "src/core/service_config/service_config_parser.h" +#include "src/core/util/chunked_vector.h" +#include "src/core/util/down_cast.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/unique_type_name.h" namespace grpc_core { diff --git a/src/core/service_config/service_config_channel_arg_filter.cc b/src/core/service_config/service_config_channel_arg_filter.cc index 063ecbd987a..54b1ae0d411 100644 --- a/src/core/service_config/service_config_channel_arg_filter.cc +++ b/src/core/service_config/service_config_channel_arg_filter.cc @@ -36,7 +36,6 @@ #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/channel/promise_based_filter.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/promise/arena_promise.h" #include "src/core/lib/promise/context.h" #include "src/core/lib/resource_quota/arena.h" @@ -47,6 +46,7 @@ #include "src/core/service_config/service_config_call_data.h" #include "src/core/service_config/service_config_impl.h" #include "src/core/service_config/service_config_parser.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_core { diff --git a/src/core/service_config/service_config_impl.cc b/src/core/service_config/service_config_impl.cc index 034e635690b..a52442e09ec 100644 --- a/src/core/service_config/service_config_impl.cc +++ b/src/core/service_config/service_config_impl.cc @@ -29,8 +29,6 @@ #include #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/memory.h" -#include "src/core/lib/gprpp/validation_errors.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/service_config/service_config_parser.h" @@ -39,6 +37,8 @@ #include "src/core/util/json/json_object_loader.h" #include "src/core/util/json/json_reader.h" #include "src/core/util/json/json_writer.h" +#include "src/core/util/memory.h" +#include "src/core/util/validation_errors.h" namespace grpc_core { diff --git a/src/core/service_config/service_config_impl.h b/src/core/service_config/service_config_impl.h index a36a803abf3..ca1d3d17dfb 100644 --- a/src/core/service_config/service_config_impl.h +++ b/src/core/service_config/service_config_impl.h @@ -32,12 +32,12 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/validation_errors.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/service_config/service_config.h" #include "src/core/service_config/service_config_parser.h" #include "src/core/util/json/json.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/validation_errors.h" // The main purpose of the code here is to parse the service config in // JSON form, which will look like this: diff --git a/src/core/service_config/service_config_parser.h b/src/core/service_config/service_config_parser.h index 9b7983a7680..caac10a4bc8 100644 --- a/src/core/service_config/service_config_parser.h +++ b/src/core/service_config/service_config_parser.h @@ -29,8 +29,8 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/validation_errors.h" #include "src/core/util/json/json.h" +#include "src/core/util/validation_errors.h" namespace grpc_core { diff --git a/src/core/telemetry/call_tracer.h b/src/core/telemetry/call_tracer.h index d822768d7e6..ab9185e2373 100644 --- a/src/core/telemetry/call_tracer.h +++ b/src/core/telemetry/call_tracer.h @@ -30,7 +30,6 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/ref_counted_string.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/promise/context.h" #include "src/core/lib/resource_quota/arena.h" @@ -38,6 +37,7 @@ #include "src/core/lib/transport/call_final_info.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/telemetry/tcp_tracer.h" +#include "src/core/util/ref_counted_string.h" namespace grpc_core { diff --git a/src/core/telemetry/metrics.cc b/src/core/telemetry/metrics.cc index adf5393942f..45e2ab64bfc 100644 --- a/src/core/telemetry/metrics.cc +++ b/src/core/telemetry/metrics.cc @@ -21,7 +21,7 @@ #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" namespace grpc_core { diff --git a/src/core/telemetry/metrics.h b/src/core/telemetry/metrics.h index 2f60ff541dc..b61e30d1fef 100644 --- a/src/core/telemetry/metrics.h +++ b/src/core/telemetry/metrics.h @@ -29,11 +29,11 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/no_destruct.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/slice/slice.h" #include "src/core/telemetry/call_tracer.h" +#include "src/core/util/no_destruct.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.h" namespace grpc_core { diff --git a/src/core/telemetry/stats.h b/src/core/telemetry/stats.h index b1026abbb28..8d783dea5d7 100644 --- a/src/core/telemetry/stats.h +++ b/src/core/telemetry/stats.h @@ -29,9 +29,9 @@ #include -#include "src/core/lib/gprpp/no_destruct.h" #include "src/core/telemetry/histogram_view.h" #include "src/core/telemetry/stats_data.h" +#include "src/core/util/no_destruct.h" namespace grpc_core { diff --git a/src/core/telemetry/stats_data.h b/src/core/telemetry/stats_data.h index 89f360e2686..d0e7e5fd267 100644 --- a/src/core/telemetry/stats_data.h +++ b/src/core/telemetry/stats_data.h @@ -26,8 +26,8 @@ #include -#include "src/core/lib/gprpp/per_cpu.h" #include "src/core/telemetry/histogram_view.h" +#include "src/core/util/per_cpu.h" namespace grpc_core { class HistogramCollector_100000_20; diff --git a/src/core/tsi/alts/frame_protector/alts_frame_protector.cc b/src/core/tsi/alts/frame_protector/alts_frame_protector.cc index 09415c413d6..ee88688e4bb 100644 --- a/src/core/tsi/alts/frame_protector/alts_frame_protector.cc +++ b/src/core/tsi/alts/frame_protector/alts_frame_protector.cc @@ -30,11 +30,11 @@ #include #include -#include "src/core/lib/gprpp/memory.h" #include "src/core/tsi/alts/crypt/gsec.h" #include "src/core/tsi/alts/frame_protector/alts_crypter.h" #include "src/core/tsi/alts/frame_protector/frame_handler.h" #include "src/core/tsi/transport_security.h" +#include "src/core/util/memory.h" constexpr size_t kMinFrameLength = 1024; constexpr size_t kDefaultFrameLength = 16 * 1024; diff --git a/src/core/tsi/alts/frame_protector/frame_handler.cc b/src/core/tsi/alts/frame_protector/frame_handler.cc index be0d227759b..a4e86f97998 100644 --- a/src/core/tsi/alts/frame_protector/frame_handler.cc +++ b/src/core/tsi/alts/frame_protector/frame_handler.cc @@ -29,8 +29,8 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/memory.h" +#include "src/core/util/crash.h" +#include "src/core/util/memory.h" // Use little endian to interpret a string of bytes as uint32_t. static uint32_t load_32_le(const unsigned char* buffer) { diff --git a/src/core/tsi/alts/handshaker/alts_handshaker_client.cc b/src/core/tsi/alts/handshaker/alts_handshaker_client.cc index 5f402f8c8eb..f5513e574d4 100644 --- a/src/core/tsi/alts/handshaker/alts_handshaker_client.cc +++ b/src/core/tsi/alts/handshaker/alts_handshaker_client.cc @@ -29,15 +29,15 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/env.h" -#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/surface/call.h" #include "src/core/lib/surface/channel.h" #include "src/core/tsi/alts/handshaker/alts_shared_resource.h" #include "src/core/tsi/alts/handshaker/alts_tsi_handshaker_private.h" #include "src/core/tsi/alts/handshaker/alts_tsi_utils.h" +#include "src/core/util/crash.h" +#include "src/core/util/env.h" +#include "src/core/util/sync.h" #define TSI_ALTS_INITIAL_BUFFER_SIZE 256 diff --git a/src/core/tsi/alts/handshaker/alts_shared_resource.cc b/src/core/tsi/alts/handshaker/alts_shared_resource.cc index 8407ee7cac3..06d4e5e1936 100644 --- a/src/core/tsi/alts/handshaker/alts_shared_resource.cc +++ b/src/core/tsi/alts/handshaker/alts_shared_resource.cc @@ -23,8 +23,8 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/crash.h" #include "src/core/tsi/alts/handshaker/alts_handshaker_client.h" +#include "src/core/util/crash.h" static alts_shared_resource_dedicated g_alts_resource_dedicated; diff --git a/src/core/tsi/alts/handshaker/alts_shared_resource.h b/src/core/tsi/alts/handshaker/alts_shared_resource.h index 43265edfbfd..11d6b606578 100644 --- a/src/core/tsi/alts/handshaker/alts_shared_resource.h +++ b/src/core/tsi/alts/handshaker/alts_shared_resource.h @@ -23,9 +23,9 @@ #include #include -#include "src/core/lib/gprpp/thd.h" #include "src/core/lib/iomgr/pollset_set.h" #include "src/core/lib/surface/completion_queue.h" +#include "src/core/util/thd.h" /// /// Main struct containing ALTS shared resources used when diff --git a/src/core/tsi/alts/handshaker/alts_tsi_handshaker.cc b/src/core/tsi/alts/handshaker/alts_tsi_handshaker.cc index 16d86e27856..79b497bda7e 100644 --- a/src/core/tsi/alts/handshaker/alts_tsi_handshaker.cc +++ b/src/core/tsi/alts/handshaker/alts_tsi_handshaker.cc @@ -34,8 +34,6 @@ #include #include -#include "src/core/lib/gprpp/memory.h" -#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/surface/channel.h" @@ -43,6 +41,8 @@ #include "src/core/tsi/alts/handshaker/alts_handshaker_client.h" #include "src/core/tsi/alts/handshaker/alts_shared_resource.h" #include "src/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector.h" +#include "src/core/util/memory.h" +#include "src/core/util/sync.h" // Main struct for ALTS TSI handshaker. struct alts_tsi_handshaker { diff --git a/src/core/tsi/alts/handshaker/transport_security_common_api.h b/src/core/tsi/alts/handshaker/transport_security_common_api.h index 81819c09e76..b59142aa68a 100644 --- a/src/core/tsi/alts/handshaker/transport_security_common_api.h +++ b/src/core/tsi/alts/handshaker/transport_security_common_api.h @@ -24,7 +24,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "src/proto/grpc/gcp/transport_security_common.upb.h" // C struct coresponding to protobuf message RpcProtocolVersions.Version diff --git a/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_integrity_only_record_protocol.cc b/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_integrity_only_record_protocol.cc index c520f942683..89c5dcfaa6f 100644 --- a/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_integrity_only_record_protocol.cc +++ b/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_integrity_only_record_protocol.cc @@ -26,11 +26,11 @@ #include #include -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol_common.h" #include "src/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol.h" +#include "src/core/util/crash.h" // Main struct for alts_grpc_integrity_only_record_protocol. typedef struct alts_grpc_integrity_only_record_protocol { diff --git a/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_privacy_integrity_record_protocol.cc b/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_privacy_integrity_record_protocol.cc index c919522e4a1..2a568cd446e 100644 --- a/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_privacy_integrity_record_protocol.cc +++ b/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_privacy_integrity_record_protocol.cc @@ -23,11 +23,11 @@ #include #include -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol_common.h" #include "src/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol.h" +#include "src/core/util/crash.h" // Privacy-integrity alts_grpc_record_protocol object uses the same struct // defined in alts_grpc_record_protocol_common.h. diff --git a/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol_common.cc b/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol_common.cc index d8d7106bb71..d4e77898e35 100644 --- a/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol_common.cc +++ b/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol_common.cc @@ -26,9 +26,9 @@ #include #include -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/slice/slice_internal.h" +#include "src/core/util/crash.h" #include "src/core/util/useful.h" const size_t kInitialIovecBufferSize = 8; diff --git a/src/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol.cc b/src/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol.cc index 2ae8bb534da..908ed2934fd 100644 --- a/src/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol.cc +++ b/src/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol.cc @@ -24,8 +24,8 @@ #include #include -#include "src/core/lib/gprpp/crash.h" #include "src/core/tsi/alts/frame_protector/alts_counter.h" +#include "src/core/util/crash.h" struct alts_iovec_record_protocol { alts_counter* ctr; diff --git a/src/core/tsi/fake_transport_security.cc b/src/core/tsi/fake_transport_security.cc index 83af8b25c69..e01dce2c687 100644 --- a/src/core/tsi/fake_transport_security.cc +++ b/src/core/tsi/fake_transport_security.cc @@ -27,12 +27,11 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/dump_args.h" -#include "src/core/lib/gprpp/memory.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/tsi/transport_security_grpc.h" #include "src/core/tsi/transport_security_interface.h" +#include "src/core/util/crash.h" +#include "src/core/util/memory.h" // --- Constants. --- #define TSI_FAKE_FRAME_HEADER_SIZE 4 diff --git a/src/core/tsi/local_transport_security.cc b/src/core/tsi/local_transport_security.cc index 30a2ef7f670..bb25a25db41 100644 --- a/src/core/tsi/local_transport_security.cc +++ b/src/core/tsi/local_transport_security.cc @@ -28,9 +28,9 @@ #include #include -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/tsi/transport_security_grpc.h" +#include "src/core/util/crash.h" namespace { diff --git a/src/core/tsi/ssl/key_logging/ssl_key_logging.cc b/src/core/tsi/ssl/key_logging/ssl_key_logging.cc index 4782dafb443..510a55bfc27 100644 --- a/src/core/tsi/ssl/key_logging/ssl_key_logging.cc +++ b/src/core/tsi/ssl/key_logging/ssl_key_logging.cc @@ -21,10 +21,10 @@ #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/slice/slice_internal.h" +#include "src/core/util/crash.h" +#include "src/core/util/sync.h" using TlsSessionKeyLogger = tsi::TlsSessionKeyLoggerCache::TlsSessionKeyLogger; diff --git a/src/core/tsi/ssl/key_logging/ssl_key_logging.h b/src/core/tsi/ssl/key_logging/ssl_key_logging.h index ec420acc228..c3752c1e7b0 100644 --- a/src/core/tsi/ssl/key_logging/ssl_key_logging.h +++ b/src/core/tsi/ssl/key_logging/ssl_key_logging.h @@ -27,9 +27,9 @@ #include #include -#include "src/core/lib/gprpp/memory.h" -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/memory.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/sync.h" namespace tsi { diff --git a/src/core/tsi/ssl/session_cache/ssl_session.h b/src/core/tsi/ssl/session_cache/ssl_session.h index d56451ec7fb..f990f3dfd52 100644 --- a/src/core/tsi/ssl/session_cache/ssl_session.h +++ b/src/core/tsi/ssl/session_cache/ssl_session.h @@ -26,7 +26,7 @@ #include #include -#include "src/core/lib/gprpp/ref_counted.h" +#include "src/core/util/ref_counted.h" // The main purpose of code here is to provide means to cache SSL sessions // in a way that they can be shared between connections. diff --git a/src/core/tsi/ssl/session_cache/ssl_session_cache.cc b/src/core/tsi/ssl/session_cache/ssl_session_cache.cc index d6c5d556b9c..7c27f36e2ab 100644 --- a/src/core/tsi/ssl/session_cache/ssl_session_cache.cc +++ b/src/core/tsi/ssl/session_cache/ssl_session_cache.cc @@ -24,10 +24,10 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/tsi/ssl/session_cache/ssl_session.h" +#include "src/core/util/crash.h" +#include "src/core/util/sync.h" namespace tsi { diff --git a/src/core/tsi/ssl/session_cache/ssl_session_cache.h b/src/core/tsi/ssl/session_cache/ssl_session_cache.h index 881a69cf006..024262c9c90 100644 --- a/src/core/tsi/ssl/session_cache/ssl_session_cache.h +++ b/src/core/tsi/ssl/session_cache/ssl_session_cache.h @@ -28,11 +28,11 @@ #include #include -#include "src/core/lib/gprpp/cpp_impl_of.h" -#include "src/core/lib/gprpp/memory.h" -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/sync.h" #include "src/core/tsi/ssl/session_cache/ssl_session.h" +#include "src/core/util/cpp_impl_of.h" +#include "src/core/util/memory.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/sync.h" /// Cache for SSL sessions for sessions resumption. /// diff --git a/src/core/tsi/ssl/session_cache/ssl_session_openssl.cc b/src/core/tsi/ssl/session_cache/ssl_session_openssl.cc index ad427950e1d..ad78488415b 100644 --- a/src/core/tsi/ssl/session_cache/ssl_session_openssl.cc +++ b/src/core/tsi/ssl/session_cache/ssl_session_openssl.cc @@ -19,8 +19,8 @@ #include -#include "src/core/lib/gprpp/crash.h" #include "src/core/tsi/ssl/session_cache/ssl_session.h" +#include "src/core/util/crash.h" #ifndef OPENSSL_IS_BORINGSSL diff --git a/src/core/tsi/ssl_transport_security.cc b/src/core/tsi/ssl_transport_security.cc index 3149eb283fe..8012dc8459c 100644 --- a/src/core/tsi/ssl_transport_security.cc +++ b/src/core/tsi/ssl_transport_security.cc @@ -60,13 +60,13 @@ #include #include -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/security/credentials/tls/grpc_tls_crl_provider.h" #include "src/core/tsi/ssl/key_logging/ssl_key_logging.h" #include "src/core/tsi/ssl/session_cache/ssl_session_cache.h" #include "src/core/tsi/ssl_transport_security_utils.h" #include "src/core/tsi/ssl_types.h" #include "src/core/tsi/transport_security.h" +#include "src/core/util/crash.h" #include "src/core/util/useful.h" // --- Constants. --- diff --git a/src/core/util/README.md b/src/core/util/README.md index 21fb0c796db..b07a40223f7 100644 --- a/src/core/util/README.md +++ b/src/core/util/README.md @@ -1,8 +1,11 @@ -# GPR - Google Portable Runtime for C +# Utility Code -The files in this directory contain basic utility code and platform -abstractions for C code. None of this code is gRPC-specific; anything -here may also be useful for other open source projects written in C. +The files in this directory contain various utility libraries and platform +abstractions for C++ code. None of this code is gRPC-specific; anything +here may also be useful for other open source projects written in C++. +In principle, any library here could be replaced with an external +dependency that provides the same functionality if such an external +library should become available. Note that this is one of the few places in src/core where we allow the use of portability macros. diff --git a/src/core/util/alloc.cc b/src/core/util/alloc.cc index 6afba483d4c..b89d49ff102 100644 --- a/src/core/util/alloc.cc +++ b/src/core/util/alloc.cc @@ -25,7 +25,7 @@ #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" void* gpr_malloc(size_t size) { void* p; diff --git a/src/core/lib/gprpp/atomic_utils.h b/src/core/util/atomic_utils.h similarity index 90% rename from src/core/lib/gprpp/atomic_utils.h rename to src/core/util/atomic_utils.h index 3ecc18305b6..bdf647159aa 100644 --- a/src/core/lib/gprpp/atomic_utils.h +++ b/src/core/util/atomic_utils.h @@ -16,13 +16,13 @@ // // -#ifndef GRPC_SRC_CORE_LIB_GPRPP_ATOMIC_UTILS_H -#define GRPC_SRC_CORE_LIB_GPRPP_ATOMIC_UTILS_H - -#include +#ifndef GRPC_SRC_CORE_UTIL_ATOMIC_UTILS_H +#define GRPC_SRC_CORE_UTIL_ATOMIC_UTILS_H #include +#include + namespace grpc_core { // Atomically increment a counter only if the counter value is not zero. @@ -44,4 +44,4 @@ inline bool IncrementIfNonzero(std::atomic* p) { } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_GPRPP_ATOMIC_UTILS_H +#endif // GRPC_SRC_CORE_UTIL_ATOMIC_UTILS_H diff --git a/src/core/lib/avl/avl.h b/src/core/util/avl.h similarity index 97% rename from src/core/lib/avl/avl.h rename to src/core/util/avl.h index 928db42ac93..23a510e949f 100644 --- a/src/core/lib/avl/avl.h +++ b/src/core/util/avl.h @@ -12,8 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef GRPC_SRC_CORE_LIB_AVL_AVL_H -#define GRPC_SRC_CORE_LIB_AVL_AVL_H +#ifndef GRPC_SRC_CORE_UTIL_AVL_H +#define GRPC_SRC_CORE_UTIL_AVL_H + +#include #include @@ -21,10 +23,8 @@ #include #include -#include - -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" #include "src/core/util/useful.h" namespace grpc_core { @@ -322,4 +322,4 @@ class AVL { } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_AVL_AVL_H +#endif // GRPC_SRC_CORE_UTIL_AVL_H diff --git a/src/core/lib/backoff/backoff.cc b/src/core/util/backoff.cc similarity index 94% rename from src/core/lib/backoff/backoff.cc rename to src/core/util/backoff.cc index b4a520d13d1..edae00cf3c8 100644 --- a/src/core/lib/backoff/backoff.cc +++ b/src/core/util/backoff.cc @@ -16,7 +16,9 @@ // // -#include "src/core/lib/backoff/backoff.h" +#include + +#include "src/core/util/backoff.h" #include diff --git a/src/core/lib/backoff/backoff.h b/src/core/util/backoff.h similarity index 93% rename from src/core/lib/backoff/backoff.h rename to src/core/util/backoff.h index 75e87d3d445..34860793647 100644 --- a/src/core/lib/backoff/backoff.h +++ b/src/core/util/backoff.h @@ -16,12 +16,12 @@ // // -#ifndef GRPC_SRC_CORE_LIB_BACKOFF_BACKOFF_H -#define GRPC_SRC_CORE_LIB_BACKOFF_BACKOFF_H +#ifndef GRPC_SRC_CORE_UTIL_BACKOFF_H +#define GRPC_SRC_CORE_UTIL_BACKOFF_H #include "absl/random/random.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" namespace grpc_core { @@ -84,4 +84,4 @@ class BackOff { }; } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_BACKOFF_BACKOFF_H +#endif // GRPC_SRC_CORE_UTIL_BACKOFF_H diff --git a/src/core/lib/gprpp/bitset.h b/src/core/util/bitset.h similarity index 98% rename from src/core/lib/gprpp/bitset.h rename to src/core/util/bitset.h index c224bd257d5..eec06814586 100644 --- a/src/core/lib/gprpp/bitset.h +++ b/src/core/util/bitset.h @@ -12,16 +12,16 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef GRPC_SRC_CORE_LIB_GPRPP_BITSET_H -#define GRPC_SRC_CORE_LIB_GPRPP_BITSET_H +#ifndef GRPC_SRC_CORE_UTIL_BITSET_H +#define GRPC_SRC_CORE_UTIL_BITSET_H + +#include #include #include #include -#include - #include "src/core/util/useful.h" namespace grpc_core { @@ -222,4 +222,4 @@ class BitSet<0> { } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_GPRPP_BITSET_H +#endif // GRPC_SRC_CORE_UTIL_BITSET_H diff --git a/src/core/lib/gprpp/chunked_vector.h b/src/core/util/chunked_vector.h similarity index 97% rename from src/core/lib/gprpp/chunked_vector.h rename to src/core/util/chunked_vector.h index a90f455d46c..b85c7e2e7ae 100644 --- a/src/core/lib/gprpp/chunked_vector.h +++ b/src/core/util/chunked_vector.h @@ -12,8 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef GRPC_SRC_CORE_LIB_GPRPP_CHUNKED_VECTOR_H -#define GRPC_SRC_CORE_LIB_GPRPP_CHUNKED_VECTOR_H +#ifndef GRPC_SRC_CORE_UTIL_CHUNKED_VECTOR_H +#define GRPC_SRC_CORE_UTIL_CHUNKED_VECTOR_H + +#include #include #include @@ -21,10 +23,8 @@ #include "absl/log/check.h" -#include - -#include "src/core/lib/gprpp/manual_constructor.h" #include "src/core/lib/resource_quota/arena.h" +#include "src/core/util/manual_constructor.h" namespace grpc_core { @@ -254,4 +254,4 @@ class ChunkedVector { } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_GPRPP_CHUNKED_VECTOR_H +#endif // GRPC_SRC_CORE_UTIL_CHUNKED_VECTOR_H diff --git a/src/core/lib/gprpp/construct_destruct.h b/src/core/util/construct_destruct.h similarity index 87% rename from src/core/lib/gprpp/construct_destruct.h rename to src/core/util/construct_destruct.h index 62e4df4bc59..fba1284a886 100644 --- a/src/core/lib/gprpp/construct_destruct.h +++ b/src/core/util/construct_destruct.h @@ -12,14 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef GRPC_SRC_CORE_LIB_GPRPP_CONSTRUCT_DESTRUCT_H -#define GRPC_SRC_CORE_LIB_GPRPP_CONSTRUCT_DESTRUCT_H +#ifndef GRPC_SRC_CORE_UTIL_CONSTRUCT_DESTRUCT_H +#define GRPC_SRC_CORE_UTIL_CONSTRUCT_DESTRUCT_H + +#include #include #include -#include - namespace grpc_core { // Call the destructor of p without having to name the type of p. @@ -37,4 +37,4 @@ GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION void Construct(T* p, Args&&... args) { } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_GPRPP_CONSTRUCT_DESTRUCT_H +#endif // GRPC_SRC_CORE_UTIL_CONSTRUCT_DESTRUCT_H diff --git a/src/core/lib/gprpp/cpp_impl_of.h b/src/core/util/cpp_impl_of.h similarity index 90% rename from src/core/lib/gprpp/cpp_impl_of.h rename to src/core/util/cpp_impl_of.h index 292da05ee7a..d4936ceafe0 100644 --- a/src/core/lib/gprpp/cpp_impl_of.h +++ b/src/core/util/cpp_impl_of.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef GRPC_SRC_CORE_LIB_GPRPP_CPP_IMPL_OF_H -#define GRPC_SRC_CORE_LIB_GPRPP_CPP_IMPL_OF_H +#ifndef GRPC_SRC_CORE_UTIL_CPP_IMPL_OF_H +#define GRPC_SRC_CORE_UTIL_CPP_IMPL_OF_H namespace grpc_core { @@ -46,4 +46,4 @@ class CppImplOf { } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_GPRPP_CPP_IMPL_OF_H +#endif // GRPC_SRC_CORE_UTIL_CPP_IMPL_OF_H diff --git a/src/core/lib/gprpp/crash.cc b/src/core/util/crash.cc similarity index 96% rename from src/core/lib/gprpp/crash.cc rename to src/core/util/crash.cc index 35128d73a11..9ab5a9852ba 100644 --- a/src/core/lib/gprpp/crash.cc +++ b/src/core/util/crash.cc @@ -12,7 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/core/lib/gprpp/crash.h" +#include + +#include "src/core/util/crash.h" #include #include @@ -22,8 +24,6 @@ #include "absl/log/log.h" #include "absl/strings/str_cat.h" -#include - namespace grpc_core { void Crash(absl::string_view message, SourceLocation location) { diff --git a/src/core/lib/gprpp/crash.h b/src/core/util/crash.h similarity index 86% rename from src/core/lib/gprpp/crash.h rename to src/core/util/crash.h index 274f1296ca9..9d0b19a5d0a 100644 --- a/src/core/lib/gprpp/crash.h +++ b/src/core/util/crash.h @@ -12,14 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef GRPC_SRC_CORE_LIB_GPRPP_CRASH_H -#define GRPC_SRC_CORE_LIB_GPRPP_CRASH_H - -#include "absl/strings/string_view.h" +#ifndef GRPC_SRC_CORE_UTIL_CRASH_H +#define GRPC_SRC_CORE_UTIL_CRASH_H #include -#include "src/core/lib/gprpp/debug_location.h" +#include "absl/strings/string_view.h" + +#include "src/core/util/debug_location.h" namespace grpc_core { @@ -34,4 +34,4 @@ namespace grpc_core { } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_GPRPP_CRASH_H +#endif // GRPC_SRC_CORE_UTIL_CRASH_H diff --git a/src/core/lib/gprpp/debug_location.h b/src/core/util/debug_location.h similarity index 94% rename from src/core/lib/gprpp/debug_location.h rename to src/core/util/debug_location.h index 89a948da7f6..ff52fb49a0c 100644 --- a/src/core/lib/gprpp/debug_location.h +++ b/src/core/util/debug_location.h @@ -16,15 +16,15 @@ // // -#ifndef GRPC_SRC_CORE_LIB_GPRPP_DEBUG_LOCATION_H -#define GRPC_SRC_CORE_LIB_GPRPP_DEBUG_LOCATION_H +#ifndef GRPC_SRC_CORE_UTIL_DEBUG_LOCATION_H +#define GRPC_SRC_CORE_UTIL_DEBUG_LOCATION_H + +#include #include #include "absl/strings/str_cat.h" -#include - #if defined(__has_builtin) #if __has_builtin(__builtin_FILE) #define GRPC_DEFAULT_FILE __builtin_FILE() @@ -103,4 +103,4 @@ struct ValueWithDebugLocation { } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_GPRPP_DEBUG_LOCATION_H +#endif // GRPC_SRC_CORE_UTIL_DEBUG_LOCATION_H diff --git a/src/core/lib/gprpp/directory_reader.h b/src/core/util/directory_reader.h similarity index 89% rename from src/core/lib/gprpp/directory_reader.h rename to src/core/util/directory_reader.h index 73dac02d41c..9b3be1a8838 100644 --- a/src/core/lib/gprpp/directory_reader.h +++ b/src/core/util/directory_reader.h @@ -16,8 +16,10 @@ // // -#ifndef GRPC_SRC_CORE_LIB_GPRPP_DIRECTORY_READER_H -#define GRPC_SRC_CORE_LIB_GPRPP_DIRECTORY_READER_H +#ifndef GRPC_SRC_CORE_UTIL_DIRECTORY_READER_H +#define GRPC_SRC_CORE_UTIL_DIRECTORY_READER_H + +#include #include @@ -25,8 +27,6 @@ #include "absl/status/status.h" #include "absl/strings/string_view.h" -#include - namespace grpc_core { class DirectoryReader { @@ -45,4 +45,4 @@ std::unique_ptr MakeDirectoryReader( } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_GPRPP_DIRECTORY_READER_H \ No newline at end of file +#endif // GRPC_SRC_CORE_UTIL_DIRECTORY_READER_H \ No newline at end of file diff --git a/src/core/lib/gprpp/down_cast.h b/src/core/util/down_cast.h similarity index 91% rename from src/core/lib/gprpp/down_cast.h rename to src/core/util/down_cast.h index e7c05bf4b78..3a7bc3a14fc 100644 --- a/src/core/lib/gprpp/down_cast.h +++ b/src/core/util/down_cast.h @@ -12,16 +12,16 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef GRPC_SRC_CORE_LIB_GPRPP_DOWN_CAST_H -#define GRPC_SRC_CORE_LIB_GPRPP_DOWN_CAST_H +#ifndef GRPC_SRC_CORE_UTIL_DOWN_CAST_H +#define GRPC_SRC_CORE_UTIL_DOWN_CAST_H + +#include #include #include "absl/base/config.h" #include "absl/log/check.h" -#include - namespace grpc_core { template @@ -45,4 +45,4 @@ GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION To DownCast(From& f) { } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_GPRPP_DOWN_CAST_H +#endif // GRPC_SRC_CORE_UTIL_DOWN_CAST_H diff --git a/src/core/lib/gprpp/dual_ref_counted.h b/src/core/util/dual_ref_counted.h similarity index 97% rename from src/core/lib/gprpp/dual_ref_counted.h rename to src/core/util/dual_ref_counted.h index 2d5ed351889..6f3e3c43af6 100644 --- a/src/core/lib/gprpp/dual_ref_counted.h +++ b/src/core/util/dual_ref_counted.h @@ -14,8 +14,10 @@ // limitations under the License. // -#ifndef GRPC_SRC_CORE_LIB_GPRPP_DUAL_REF_COUNTED_H -#define GRPC_SRC_CORE_LIB_GPRPP_DUAL_REF_COUNTED_H +#ifndef GRPC_SRC_CORE_UTIL_DUAL_REF_COUNTED_H +#define GRPC_SRC_CORE_UTIL_DUAL_REF_COUNTED_H + +#include #include #include @@ -23,13 +25,11 @@ #include "absl/log/check.h" #include "absl/log/log.h" -#include - -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/down_cast.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/util/debug_location.h" +#include "src/core/util/down_cast.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_core { @@ -374,4 +374,4 @@ class DualRefCounted : public Impl { } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_GPRPP_DUAL_REF_COUNTED_H +#endif // GRPC_SRC_CORE_UTIL_DUAL_REF_COUNTED_H diff --git a/src/core/lib/gprpp/dump_args.cc b/src/core/util/dump_args.cc similarity index 97% rename from src/core/lib/gprpp/dump_args.cc rename to src/core/util/dump_args.cc index 1e2972f6dd7..bd82483bfcd 100644 --- a/src/core/lib/gprpp/dump_args.cc +++ b/src/core/util/dump_args.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/core/lib/gprpp/dump_args.h" +#include "src/core/util/dump_args.h" #include "absl/log/check.h" #include "absl/strings/ascii.h" diff --git a/src/core/lib/gprpp/dump_args.h b/src/core/util/dump_args.h similarity index 95% rename from src/core/lib/gprpp/dump_args.h rename to src/core/util/dump_args.h index 1e89fa48c65..02519075c36 100644 --- a/src/core/lib/gprpp/dump_args.h +++ b/src/core/util/dump_args.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef GRPC_SRC_CORE_LIB_GPRPP_DUMP_ARGS_H -#define GRPC_SRC_CORE_LIB_GPRPP_DUMP_ARGS_H +#ifndef GRPC_SRC_CORE_UTIL_DUMP_ARGS_H +#define GRPC_SRC_CORE_UTIL_DUMP_ARGS_H #include #include @@ -114,4 +114,4 @@ class DumpArgs { #define GRPC_DUMP_ARGS(...) \ grpc_core::dump_args_detail::DumpArgs(#__VA_ARGS__, __VA_ARGS__) -#endif // GRPC_SRC_CORE_LIB_GPRPP_DUMP_ARGS_H \ No newline at end of file +#endif // GRPC_SRC_CORE_UTIL_DUMP_ARGS_H diff --git a/src/core/lib/gprpp/env.h b/src/core/util/env.h similarity index 92% rename from src/core/lib/gprpp/env.h rename to src/core/util/env.h index 381cb461275..558941deb09 100644 --- a/src/core/lib/gprpp/env.h +++ b/src/core/util/env.h @@ -16,15 +16,15 @@ // // -#ifndef GRPC_SRC_CORE_LIB_GPRPP_ENV_H -#define GRPC_SRC_CORE_LIB_GPRPP_ENV_H +#ifndef GRPC_SRC_CORE_UTIL_ENV_H +#define GRPC_SRC_CORE_UTIL_ENV_H + +#include #include #include "absl/types/optional.h" -#include - namespace grpc_core { // Gets the environment variable value with the specified name. */ @@ -50,4 +50,4 @@ void SetOrUnsetEnv(const char* name, const absl::optional& value) { } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_GPRPP_ENV_H +#endif // GRPC_SRC_CORE_UTIL_ENV_H diff --git a/src/core/lib/debug/event_log.cc b/src/core/util/event_log.cc similarity index 98% rename from src/core/lib/debug/event_log.cc rename to src/core/util/event_log.cc index 48dbb5809a8..6bb1427f89e 100644 --- a/src/core/lib/debug/event_log.cc +++ b/src/core/util/event_log.cc @@ -12,7 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/core/lib/debug/event_log.h" +#include + +#include "src/core/util/event_log.h" #include #include @@ -21,8 +23,6 @@ #include "absl/strings/str_cat.h" #include "absl/strings/str_join.h" -#include - namespace grpc_core { std::atomic EventLog::g_instance_{nullptr}; diff --git a/src/core/lib/debug/event_log.h b/src/core/util/event_log.h similarity index 91% rename from src/core/lib/debug/event_log.h rename to src/core/util/event_log.h index dd8aa07aa3d..f77967d57f2 100644 --- a/src/core/lib/debug/event_log.h +++ b/src/core/util/event_log.h @@ -12,8 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef GRPC_SRC_CORE_LIB_DEBUG_EVENT_LOG_H -#define GRPC_SRC_CORE_LIB_DEBUG_EVENT_LOG_H +#ifndef GRPC_SRC_CORE_UTIL_EVENT_LOG_H +#define GRPC_SRC_CORE_UTIL_EVENT_LOG_H + +#include #include @@ -25,10 +27,8 @@ #include "absl/strings/string_view.h" #include "absl/types/span.h" -#include - -#include "src/core/lib/gprpp/per_cpu.h" -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/per_cpu.h" +#include "src/core/util/sync.h" #include "src/core/util/time_precise.h" namespace grpc_core { @@ -78,4 +78,4 @@ class EventLog { } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_DEBUG_EVENT_LOG_H +#endif // GRPC_SRC_CORE_UTIL_EVENT_LOG_H diff --git a/src/core/lib/gprpp/examine_stack.cc b/src/core/util/examine_stack.cc similarity index 96% rename from src/core/lib/gprpp/examine_stack.cc rename to src/core/util/examine_stack.cc index a6bc5423192..96799b2a30c 100644 --- a/src/core/lib/gprpp/examine_stack.cc +++ b/src/core/util/examine_stack.cc @@ -16,10 +16,10 @@ // // -#include "src/core/lib/gprpp/examine_stack.h" - #include +#include "src/core/util/examine_stack.h" + namespace grpc_core { gpr_current_stack_trace_func g_current_stack_trace_provider = nullptr; diff --git a/src/core/lib/gprpp/examine_stack.h b/src/core/util/examine_stack.h similarity index 89% rename from src/core/lib/gprpp/examine_stack.h rename to src/core/util/examine_stack.h index c844924f456..b5abb9f15ef 100644 --- a/src/core/lib/gprpp/examine_stack.h +++ b/src/core/util/examine_stack.h @@ -16,15 +16,15 @@ // // -#ifndef GRPC_SRC_CORE_LIB_GPRPP_EXAMINE_STACK_H -#define GRPC_SRC_CORE_LIB_GPRPP_EXAMINE_STACK_H +#ifndef GRPC_SRC_CORE_UTIL_EXAMINE_STACK_H +#define GRPC_SRC_CORE_UTIL_EXAMINE_STACK_H + +#include #include #include "absl/types/optional.h" -#include - namespace grpc_core { typedef std::string (*gpr_current_stack_trace_func)(); @@ -42,4 +42,4 @@ absl::optional GetCurrentStackTrace(); } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_GPRPP_EXAMINE_STACK_H +#endif // GRPC_SRC_CORE_UTIL_EXAMINE_STACK_H diff --git a/src/core/lib/gprpp/fork.cc b/src/core/util/fork.cc similarity index 98% rename from src/core/lib/gprpp/fork.cc rename to src/core/util/fork.cc index 909b828f173..35b211b42ff 100644 --- a/src/core/lib/gprpp/fork.cc +++ b/src/core/util/fork.cc @@ -16,18 +16,19 @@ // // -#include "src/core/lib/gprpp/fork.h" +#include + +#include "src/core/util/fork.h" #include #include -#include #include #include #include "src/core/lib/config/config_vars.h" #include "src/core/lib/event_engine/thread_local.h" -#include "src/core/lib/gprpp/no_destruct.h" +#include "src/core/util/no_destruct.h" // // NOTE: FORKING IS NOT GENERALLY SUPPORTED, THIS IS ONLY INTENDED TO WORK diff --git a/src/core/lib/gprpp/fork.h b/src/core/util/fork.h similarity index 95% rename from src/core/lib/gprpp/fork.h rename to src/core/util/fork.h index 376f625e1e7..047d35a4b0c 100644 --- a/src/core/lib/gprpp/fork.h +++ b/src/core/util/fork.h @@ -16,14 +16,14 @@ // // -#ifndef GRPC_SRC_CORE_LIB_GPRPP_FORK_H -#define GRPC_SRC_CORE_LIB_GPRPP_FORK_H +#ifndef GRPC_SRC_CORE_UTIL_FORK_H +#define GRPC_SRC_CORE_UTIL_FORK_H + +#include #include #include -#include - // // NOTE: FORKING IS NOT GENERALLY SUPPORTED, THIS IS ONLY INTENDED TO WORK // AROUND VERY SPECIFIC USE CASES. @@ -95,4 +95,4 @@ class GPR_DLL Fork { } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_GPRPP_FORK_H +#endif // GRPC_SRC_CORE_UTIL_FORK_H diff --git a/src/core/util/gcp_metadata_query.cc b/src/core/util/gcp_metadata_query.cc index 351f6e7a578..3543e46fa0e 100644 --- a/src/core/util/gcp_metadata_query.cc +++ b/src/core/util/gcp_metadata_query.cc @@ -37,11 +37,11 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/status_helper.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/security/credentials/credentials.h" -#include "src/core/lib/uri/uri_parser.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/time.h" +#include "src/core/util/uri.h" namespace grpc_core { diff --git a/src/core/util/gcp_metadata_query.h b/src/core/util/gcp_metadata_query.h index fda085d1f9c..b2abde5cd4a 100644 --- a/src/core/util/gcp_metadata_query.h +++ b/src/core/util/gcp_metadata_query.h @@ -24,13 +24,13 @@ #include "absl/functional/any_invocable.h" #include "absl/status/statusor.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/polling_entity.h" #include "src/core/util/http_client/httpcli.h" #include "src/core/util/http_client/parser.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/time.h" namespace grpc_core { diff --git a/src/core/lib/iomgr/gethostname.h b/src/core/util/gethostname.h similarity index 83% rename from src/core/lib/iomgr/gethostname.h rename to src/core/util/gethostname.h index 5ab2bd63009..ea3fa36fa43 100644 --- a/src/core/lib/iomgr/gethostname.h +++ b/src/core/util/gethostname.h @@ -16,11 +16,11 @@ // // -#ifndef GRPC_SRC_CORE_LIB_IOMGR_GETHOSTNAME_H -#define GRPC_SRC_CORE_LIB_IOMGR_GETHOSTNAME_H +#ifndef GRPC_SRC_CORE_UTIL_GETHOSTNAME_H +#define GRPC_SRC_CORE_UTIL_GETHOSTNAME_H // Returns the hostname of the local machine. // Caller takes ownership of result. char* grpc_gethostname(); -#endif // GRPC_SRC_CORE_LIB_IOMGR_GETHOSTNAME_H +#endif // GRPC_SRC_CORE_UTIL_GETHOSTNAME_H diff --git a/src/core/lib/iomgr/gethostname_fallback.cc b/src/core/util/gethostname_fallback.cc similarity index 94% rename from src/core/lib/iomgr/gethostname_fallback.cc rename to src/core/util/gethostname_fallback.cc index 3c3282ab9f8..6a5ec05d777 100644 --- a/src/core/lib/iomgr/gethostname_fallback.cc +++ b/src/core/util/gethostname_fallback.cc @@ -18,8 +18,8 @@ #include -#include "src/core/lib/iomgr/gethostname.h" #include "src/core/lib/iomgr/port.h" +#include "src/core/util/gethostname.h" #ifdef GRPC_GETHOSTNAME_FALLBACK diff --git a/src/core/lib/iomgr/gethostname_host_name_max.cc b/src/core/util/gethostname_host_name_max.cc similarity index 95% rename from src/core/lib/iomgr/gethostname_host_name_max.cc rename to src/core/util/gethostname_host_name_max.cc index 98e933018f9..def6984395d 100644 --- a/src/core/lib/iomgr/gethostname_host_name_max.cc +++ b/src/core/util/gethostname_host_name_max.cc @@ -18,8 +18,8 @@ #include -#include "src/core/lib/iomgr/gethostname.h" #include "src/core/lib/iomgr/port.h" +#include "src/core/util/gethostname.h" #ifdef GRPC_POSIX_HOST_NAME_MAX diff --git a/src/core/lib/iomgr/gethostname_sysconf.cc b/src/core/util/gethostname_sysconf.cc similarity index 95% rename from src/core/lib/iomgr/gethostname_sysconf.cc rename to src/core/util/gethostname_sysconf.cc index 24769a51f92..414a02118a0 100644 --- a/src/core/lib/iomgr/gethostname_sysconf.cc +++ b/src/core/util/gethostname_sysconf.cc @@ -18,8 +18,8 @@ #include -#include "src/core/lib/iomgr/gethostname.h" #include "src/core/lib/iomgr/port.h" +#include "src/core/util/gethostname.h" #ifdef GRPC_POSIX_SYSCONF diff --git a/src/core/lib/gprpp/glob.cc b/src/core/util/glob.cc similarity index 100% rename from src/core/lib/gprpp/glob.cc rename to src/core/util/glob.cc diff --git a/src/core/lib/gprpp/glob.h b/src/core/util/glob.h similarity index 88% rename from src/core/lib/gprpp/glob.h rename to src/core/util/glob.h index dafcb9bf729..6c522450b65 100644 --- a/src/core/lib/gprpp/glob.h +++ b/src/core/util/glob.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef GRPC_SRC_CORE_LIB_GPRPP_GLOB_H -#define GRPC_SRC_CORE_LIB_GPRPP_GLOB_H +#ifndef GRPC_SRC_CORE_UTIL_GLOB_H +#define GRPC_SRC_CORE_UTIL_GLOB_H #include "absl/strings/string_view.h" @@ -26,4 +26,4 @@ bool GlobMatch(absl::string_view name, absl::string_view pattern); } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_GPRPP_GLOB_H +#endif // GRPC_SRC_CORE_UTIL_GLOB_H diff --git a/src/core/util/gpr_time.cc b/src/core/util/gpr_time.cc new file mode 100644 index 00000000000..ae2bd82f5bc --- /dev/null +++ b/src/core/util/gpr_time.cc @@ -0,0 +1,271 @@ +// +// +// 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. +// +// + +// Generic implementation of time calls. + +#include + +#include +#include +#include + +#include "absl/log/check.h" + +#include +#include + +#include "src/core/util/crash.h" + +int gpr_time_cmp(gpr_timespec a, gpr_timespec b) { + int cmp = (a.tv_sec > b.tv_sec) - (a.tv_sec < b.tv_sec); + CHECK(a.clock_type == b.clock_type); + if (cmp == 0 && a.tv_sec != INT64_MAX && a.tv_sec != INT64_MIN) { + cmp = (a.tv_nsec > b.tv_nsec) - (a.tv_nsec < b.tv_nsec); + } + return cmp; +} + +gpr_timespec gpr_time_min(gpr_timespec a, gpr_timespec b) { + return gpr_time_cmp(a, b) < 0 ? a : b; +} + +gpr_timespec gpr_time_max(gpr_timespec a, gpr_timespec b) { + return gpr_time_cmp(a, b) > 0 ? a : b; +} + +gpr_timespec gpr_time_0(gpr_clock_type type) { + gpr_timespec out; + out.tv_sec = 0; + out.tv_nsec = 0; + out.clock_type = type; + return out; +} + +gpr_timespec gpr_inf_future(gpr_clock_type type) { + gpr_timespec out; + out.tv_sec = INT64_MAX; + out.tv_nsec = 0; + out.clock_type = type; + return out; +} + +gpr_timespec gpr_inf_past(gpr_clock_type type) { + gpr_timespec out; + out.tv_sec = INT64_MIN; + out.tv_nsec = 0; + out.clock_type = type; + return out; +} + +static gpr_timespec to_seconds_from_sub_second_time(int64_t time_in_units, + int64_t units_per_sec, + gpr_clock_type type) { + gpr_timespec out; + if (time_in_units == INT64_MAX) { + out = gpr_inf_future(type); + } else if (time_in_units == INT64_MIN) { + out = gpr_inf_past(type); + } else { + DCHECK_EQ(GPR_NS_PER_SEC % units_per_sec, 0); + + out.tv_sec = time_in_units / units_per_sec; + out.tv_nsec = + static_cast((time_in_units - (out.tv_sec * units_per_sec)) * + (GPR_NS_PER_SEC / units_per_sec)); + /// `out.tv_nsec` should always be positive. + if (out.tv_nsec < 0) { + out.tv_nsec += GPR_NS_PER_SEC; + out.tv_sec--; + } + + out.clock_type = type; + } + return out; +} + +static gpr_timespec to_seconds_from_above_second_time(int64_t time_in_units, + int64_t secs_per_unit, + gpr_clock_type type) { + gpr_timespec out; + if (time_in_units >= INT64_MAX / secs_per_unit) { + out = gpr_inf_future(type); + } else if (time_in_units <= INT64_MIN / secs_per_unit) { + out = gpr_inf_past(type); + } else { + out.tv_sec = time_in_units * secs_per_unit; + out.tv_nsec = 0; + out.clock_type = type; + } + return out; +} + +gpr_timespec gpr_time_from_nanos(int64_t ns, gpr_clock_type clock_type) { + return to_seconds_from_sub_second_time(ns, GPR_NS_PER_SEC, clock_type); +} + +gpr_timespec gpr_time_from_micros(int64_t us, gpr_clock_type clock_type) { + return to_seconds_from_sub_second_time(us, GPR_US_PER_SEC, clock_type); +} + +gpr_timespec gpr_time_from_millis(int64_t ms, gpr_clock_type clock_type) { + return to_seconds_from_sub_second_time(ms, GPR_MS_PER_SEC, clock_type); +} + +gpr_timespec gpr_time_from_seconds(int64_t s, gpr_clock_type clock_type) { + return to_seconds_from_sub_second_time(s, 1, clock_type); +} + +gpr_timespec gpr_time_from_minutes(int64_t m, gpr_clock_type clock_type) { + return to_seconds_from_above_second_time(m, 60, clock_type); +} + +gpr_timespec gpr_time_from_hours(int64_t h, gpr_clock_type clock_type) { + return to_seconds_from_above_second_time(h, 3600, clock_type); +} + +gpr_timespec gpr_time_add(gpr_timespec a, gpr_timespec b) { + gpr_timespec sum; + int64_t inc = 0; + CHECK(b.clock_type == GPR_TIMESPAN); + // tv_nsec in a timespan is always +ve. -ve timespan is represented as (-ve + // tv_sec, +ve tv_nsec). For example, timespan = -2.5 seconds is represented + // as {-3, 5e8, GPR_TIMESPAN} + CHECK_GE(b.tv_nsec, 0); + sum.clock_type = a.clock_type; + sum.tv_nsec = a.tv_nsec + b.tv_nsec; + if (sum.tv_nsec >= GPR_NS_PER_SEC) { + sum.tv_nsec -= GPR_NS_PER_SEC; + inc++; + } + if (a.tv_sec == INT64_MAX || a.tv_sec == INT64_MIN) { + sum = a; + } else if (b.tv_sec == INT64_MAX || + (b.tv_sec >= 0 && a.tv_sec >= INT64_MAX - b.tv_sec)) { + sum = gpr_inf_future(sum.clock_type); + } else if (b.tv_sec == INT64_MIN || + (b.tv_sec <= 0 && a.tv_sec <= INT64_MIN - b.tv_sec)) { + sum = gpr_inf_past(sum.clock_type); + } else { + sum.tv_sec = a.tv_sec + b.tv_sec; + if (inc != 0 && sum.tv_sec == INT64_MAX - 1) { + sum = gpr_inf_future(sum.clock_type); + } else { + sum.tv_sec += inc; + } + } + return sum; +} + +gpr_timespec gpr_time_sub(gpr_timespec a, gpr_timespec b) { + gpr_timespec diff; + int64_t dec = 0; + if (b.clock_type == GPR_TIMESPAN) { + diff.clock_type = a.clock_type; + // tv_nsec in a timespan is always +ve. -ve timespan is represented as (-ve + // tv_sec, +ve tv_nsec). For example, timespan = -2.5 seconds is represented + // as {-3, 5e8, GPR_TIMESPAN} + CHECK_GE(b.tv_nsec, 0); + } else { + CHECK(a.clock_type == b.clock_type); + diff.clock_type = GPR_TIMESPAN; + } + diff.tv_nsec = a.tv_nsec - b.tv_nsec; + if (diff.tv_nsec < 0) { + diff.tv_nsec += GPR_NS_PER_SEC; + dec++; + } + if (a.tv_sec == INT64_MAX || a.tv_sec == INT64_MIN) { + diff.tv_sec = a.tv_sec; + diff.tv_nsec = a.tv_nsec; + } else if (b.tv_sec == INT64_MIN || + (b.tv_sec <= 0 && a.tv_sec >= INT64_MAX + b.tv_sec)) { + diff = gpr_inf_future(GPR_CLOCK_REALTIME); + } else if (b.tv_sec == INT64_MAX || + (b.tv_sec >= 0 && a.tv_sec <= INT64_MIN + b.tv_sec)) { + diff = gpr_inf_past(GPR_CLOCK_REALTIME); + } else { + diff.tv_sec = a.tv_sec - b.tv_sec; + if (dec != 0 && diff.tv_sec == INT64_MIN + 1) { + diff = gpr_inf_past(GPR_CLOCK_REALTIME); + } else { + diff.tv_sec -= dec; + } + } + return diff; +} + +int gpr_time_similar(gpr_timespec a, gpr_timespec b, gpr_timespec threshold) { + int cmp_ab; + + CHECK(a.clock_type == b.clock_type); + CHECK(threshold.clock_type == GPR_TIMESPAN); + + cmp_ab = gpr_time_cmp(a, b); + if (cmp_ab == 0) return 1; + if (cmp_ab < 0) { + return gpr_time_cmp(gpr_time_sub(b, a), threshold) <= 0; + } else { + return gpr_time_cmp(gpr_time_sub(a, b), threshold) <= 0; + } +} + +int32_t gpr_time_to_millis(gpr_timespec t) { + if (t.tv_sec >= 2147483) { + if (t.tv_sec == 2147483 && t.tv_nsec < 648 * GPR_NS_PER_MS) { + return 2147483 * GPR_MS_PER_SEC + t.tv_nsec / GPR_NS_PER_MS; + } + return 2147483647; + } else if (t.tv_sec <= -2147483) { + // TODO(ctiller): correct handling here (it's so far in the past do we + // care?) + return -2147483647; + } else { + return static_cast(t.tv_sec * GPR_MS_PER_SEC + + t.tv_nsec / GPR_NS_PER_MS); + } +} + +double gpr_timespec_to_micros(gpr_timespec t) { + return static_cast(t.tv_sec) * GPR_US_PER_SEC + t.tv_nsec * 1e-3; +} + +gpr_timespec gpr_convert_clock_type(gpr_timespec t, gpr_clock_type clock_type) { + if (t.clock_type == clock_type) { + return t; + } + + if (t.tv_sec == INT64_MAX || t.tv_sec == INT64_MIN) { + t.clock_type = clock_type; + return t; + } + + if (clock_type == GPR_TIMESPAN) { + return gpr_time_sub(t, gpr_now(t.clock_type)); + } + + if (t.clock_type == GPR_TIMESPAN) { + return gpr_time_add(gpr_now(clock_type), t); + } + + // If the given input hits this code, the same result is not guaranteed for + // the same input because it relies on `gpr_now` to calculate the difference + // between two different clocks. Please be careful when you want to use this + // function in unit tests. (e.g. https://github.com/grpc/grpc/pull/22655) + return gpr_time_add(gpr_now(clock_type), + gpr_time_sub(t, gpr_now(t.clock_type))); +} diff --git a/src/core/lib/iomgr/grpc_if_nametoindex.h b/src/core/util/grpc_if_nametoindex.h similarity index 83% rename from src/core/lib/iomgr/grpc_if_nametoindex.h rename to src/core/util/grpc_if_nametoindex.h index 9fa91a2b22f..ad1f3fcc224 100644 --- a/src/core/lib/iomgr/grpc_if_nametoindex.h +++ b/src/core/util/grpc_if_nametoindex.h @@ -16,15 +16,15 @@ // // -#ifndef GRPC_SRC_CORE_LIB_IOMGR_GRPC_IF_NAMETOINDEX_H -#define GRPC_SRC_CORE_LIB_IOMGR_GRPC_IF_NAMETOINDEX_H - -#include +#ifndef GRPC_SRC_CORE_UTIL_GRPC_IF_NAMETOINDEX_H +#define GRPC_SRC_CORE_UTIL_GRPC_IF_NAMETOINDEX_H #include +#include + // Returns the interface index corresponding to the interface "name" provided. // Returns non-zero upon success, and zero upon failure. uint32_t grpc_if_nametoindex(char* name); -#endif // GRPC_SRC_CORE_LIB_IOMGR_GRPC_IF_NAMETOINDEX_H +#endif // GRPC_SRC_CORE_UTIL_GRPC_IF_NAMETOINDEX_H diff --git a/src/core/lib/iomgr/grpc_if_nametoindex_posix.cc b/src/core/util/grpc_if_nametoindex_posix.cc similarity index 92% rename from src/core/lib/iomgr/grpc_if_nametoindex_posix.cc rename to src/core/util/grpc_if_nametoindex_posix.cc index 52b57d43f81..1ec5f15cc99 100644 --- a/src/core/lib/iomgr/grpc_if_nametoindex_posix.cc +++ b/src/core/util/grpc_if_nametoindex_posix.cc @@ -27,8 +27,8 @@ #include "absl/log/log.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/iomgr/grpc_if_nametoindex.h" +#include "src/core/util/crash.h" +#include "src/core/util/grpc_if_nametoindex.h" uint32_t grpc_if_nametoindex(char* name) { uint32_t out = if_nametoindex(name); diff --git a/src/core/lib/iomgr/grpc_if_nametoindex_unsupported.cc b/src/core/util/grpc_if_nametoindex_unsupported.cc similarity index 92% rename from src/core/lib/iomgr/grpc_if_nametoindex_unsupported.cc rename to src/core/util/grpc_if_nametoindex_unsupported.cc index 9d2092ae138..767f41b67f6 100644 --- a/src/core/lib/iomgr/grpc_if_nametoindex_unsupported.cc +++ b/src/core/util/grpc_if_nametoindex_unsupported.cc @@ -24,8 +24,8 @@ #include "absl/log/log.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/iomgr/grpc_if_nametoindex.h" +#include "src/core/util/crash.h" +#include "src/core/util/grpc_if_nametoindex.h" uint32_t grpc_if_nametoindex(char* name) { VLOG(2) << "Not attempting to convert interface name " << name diff --git a/src/core/lib/gprpp/host_port.cc b/src/core/util/host_port.cc similarity index 98% rename from src/core/lib/gprpp/host_port.cc rename to src/core/util/host_port.cc index fec43151109..dad028d0b4a 100644 --- a/src/core/lib/gprpp/host_port.cc +++ b/src/core/util/host_port.cc @@ -16,7 +16,9 @@ // // -#include "src/core/lib/gprpp/host_port.h" +#include + +#include "src/core/util/host_port.h" #include @@ -24,8 +26,6 @@ #include "absl/strings/str_format.h" #include "absl/strings/string_view.h" -#include - namespace grpc_core { std::string JoinHostPort(absl::string_view host, int port) { diff --git a/src/core/lib/gprpp/host_port.h b/src/core/util/host_port.h similarity index 93% rename from src/core/lib/gprpp/host_port.h rename to src/core/util/host_port.h index 547129505c8..2d7d2c9e43a 100644 --- a/src/core/lib/gprpp/host_port.h +++ b/src/core/util/host_port.h @@ -16,15 +16,15 @@ // // -#ifndef GRPC_SRC_CORE_LIB_GPRPP_HOST_PORT_H -#define GRPC_SRC_CORE_LIB_GPRPP_HOST_PORT_H +#ifndef GRPC_SRC_CORE_UTIL_HOST_PORT_H +#define GRPC_SRC_CORE_UTIL_HOST_PORT_H + +#include #include #include "absl/strings/string_view.h" -#include - namespace grpc_core { // Given a host and port, creates a newly-allocated string of the form @@ -54,4 +54,4 @@ bool SplitHostPort(absl::string_view name, std::string* host, } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_GPRPP_HOST_PORT_H +#endif // GRPC_SRC_CORE_UTIL_HOST_PORT_H diff --git a/src/core/util/http_client/httpcli.cc b/src/core/util/http_client/httpcli.cc index e28f9b8b758..c7b52e2de54 100644 --- a/src/core/util/http_client/httpcli.cc +++ b/src/core/util/http_client/httpcli.cc @@ -41,7 +41,6 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_args_preconditioning.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/status_helper.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/iomgr_internal.h" #include "src/core/lib/iomgr/pollset_set.h" @@ -53,6 +52,7 @@ #include "src/core/lib/transport/error_utils.h" #include "src/core/util/http_client/format_request.h" #include "src/core/util/http_client/parser.h" +#include "src/core/util/status_helper.h" namespace grpc_core { diff --git a/src/core/util/http_client/httpcli.h b/src/core/util/http_client/httpcli.h index c5939da61fa..b041d190e07 100644 --- a/src/core/util/http_client/httpcli.h +++ b/src/core/util/http_client/httpcli.h @@ -37,11 +37,6 @@ #include #include "src/core/handshaker/handshaker.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/gprpp/time.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/error.h" @@ -52,8 +47,13 @@ #include "src/core/lib/iomgr/resolve_address.h" #include "src/core/lib/iomgr/resolved_address.h" #include "src/core/lib/resource_quota/resource_quota.h" -#include "src/core/lib/uri/uri_parser.h" +#include "src/core/util/debug_location.h" #include "src/core/util/http_client/parser.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.h" +#include "src/core/util/uri.h" // User agent this library reports #define GRPC_HTTPCLI_USER_AGENT "grpc-httpcli/0.0" diff --git a/src/core/util/http_client/httpcli_security_connector.cc b/src/core/util/http_client/httpcli_security_connector.cc index c183f95a07e..45156af53d1 100644 --- a/src/core/util/http_client/httpcli_security_connector.cc +++ b/src/core/util/http_client/httpcli_security_connector.cc @@ -38,9 +38,6 @@ #include "src/core/handshaker/handshaker.h" #include "src/core/handshaker/security/security_handshaker.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/unique_type_name.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/error.h" @@ -53,6 +50,9 @@ #include "src/core/lib/security/security_connector/ssl_utils.h" #include "src/core/tsi/ssl_transport_security.h" #include "src/core/tsi/transport_security_interface.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/unique_type_name.h" namespace grpc_core { diff --git a/src/core/util/http_client/httpcli_ssl_credentials.h b/src/core/util/http_client/httpcli_ssl_credentials.h index 45364c64a46..e06668f65b5 100644 --- a/src/core/util/http_client/httpcli_ssl_credentials.h +++ b/src/core/util/http_client/httpcli_ssl_credentials.h @@ -21,7 +21,7 @@ #include -#include "src/core/lib/gprpp/ref_counted_ptr.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_core { diff --git a/src/core/lib/gprpp/if_list.h b/src/core/util/if_list.h similarity index 99% rename from src/core/lib/gprpp/if_list.h rename to src/core/util/if_list.h index a06847423fd..054d128507f 100644 --- a/src/core/lib/gprpp/if_list.h +++ b/src/core/util/if_list.h @@ -16,8 +16,8 @@ // Automatically generated by tools/codegen/core/gen_if_list.py // -#ifndef GRPC_SRC_CORE_LIB_GPRPP_IF_LIST_H -#define GRPC_SRC_CORE_LIB_GPRPP_IF_LIST_H +#ifndef GRPC_SRC_CORE_UTIL_IF_LIST_H +#define GRPC_SRC_CORE_UTIL_IF_LIST_H #include @@ -4527,4 +4527,4 @@ auto IfList( } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_GPRPP_IF_LIST_H +#endif // GRPC_SRC_CORE_UTIL_IF_LIST_H diff --git a/src/core/util/json/json_object_loader.h b/src/core/util/json/json_object_loader.h index 03bce3efefd..1c1e8c565e1 100644 --- a/src/core/util/json/json_object_loader.h +++ b/src/core/util/json/json_object_loader.h @@ -32,12 +32,12 @@ #include "absl/strings/string_view.h" #include "absl/types/optional.h" -#include "src/core/lib/gprpp/no_destruct.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/time.h" -#include "src/core/lib/gprpp/validation_errors.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_args.h" +#include "src/core/util/no_destruct.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" +#include "src/core/util/validation_errors.h" // Provides a means to load JSON objects into C++ objects, with the aim of // minimizing object code size. diff --git a/src/core/util/json/json_reader.cc b/src/core/util/json/json_reader.cc index 20a1a04a75c..bda35becad4 100644 --- a/src/core/util/json/json_reader.cc +++ b/src/core/util/json/json_reader.cc @@ -37,8 +37,8 @@ #include -#include "src/core/lib/gprpp/match.h" #include "src/core/util/json/json.h" +#include "src/core/util/match.h" #define GRPC_JSON_MAX_DEPTH 255 #define GRPC_JSON_MAX_ERRORS 16 diff --git a/src/core/util/json/json_util.cc b/src/core/util/json/json_util.cc index 8faa7cd8f25..88fdbb6755c 100644 --- a/src/core/util/json/json_util.cc +++ b/src/core/util/json/json_util.cc @@ -20,10 +20,10 @@ #include "src/core/util/json/json_util.h" -#include "src/core/lib/gprpp/no_destruct.h" -#include "src/core/lib/gprpp/validation_errors.h" #include "src/core/util/json/json_args.h" #include "src/core/util/json/json_object_loader.h" +#include "src/core/util/no_destruct.h" +#include "src/core/util/validation_errors.h" namespace grpc_core { diff --git a/src/core/util/json/json_util.h b/src/core/util/json/json_util.h index da45b74b3c3..a8abf9efb88 100644 --- a/src/core/util/json/json_util.h +++ b/src/core/util/json/json_util.h @@ -32,9 +32,9 @@ #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/error.h" #include "src/core/util/json/json.h" +#include "src/core/util/time.h" namespace grpc_core { diff --git a/src/core/util/latent_see.cc b/src/core/util/latent_see.cc index 6bb250b445f..508e853055a 100644 --- a/src/core/util/latent_see.cc +++ b/src/core/util/latent_see.cc @@ -25,8 +25,8 @@ #include "absl/strings/string_view.h" #include "absl/types/optional.h" -#include "src/core/lib/gprpp/sync.h" #include "src/core/util/ring_buffer.h" +#include "src/core/util/sync.h" namespace grpc_core { namespace latent_see { diff --git a/src/core/util/latent_see.h b/src/core/util/latent_see.h index 4d4f1584b06..34a247abd0a 100644 --- a/src/core/util/latent_see.h +++ b/src/core/util/latent_see.h @@ -35,9 +35,9 @@ #include "absl/log/log.h" #include "absl/strings/string_view.h" -#include "src/core/lib/gprpp/per_cpu.h" -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/per_cpu.h" #include "src/core/util/ring_buffer.h" +#include "src/core/util/sync.h" #define TAGGED_POINTER_SIZE_BITS 48 diff --git a/src/core/util/linux/cpu.cc b/src/core/util/linux/cpu.cc index aa232a6ac5d..61f1d5d58ff 100644 --- a/src/core/util/linux/cpu.cc +++ b/src/core/util/linux/cpu.cc @@ -34,8 +34,8 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/strerror.h" +#include "src/core/util/crash.h" +#include "src/core/util/strerror.h" static int ncpus = 0; diff --git a/src/core/lib/gprpp/linux/env.cc b/src/core/util/linux/env.cc similarity index 97% rename from src/core/lib/gprpp/linux/env.cc rename to src/core/util/linux/env.cc index 4f4b097841b..ff1635f7a62 100644 --- a/src/core/lib/gprpp/linux/env.cc +++ b/src/core/util/linux/env.cc @@ -21,18 +21,18 @@ #define _GNU_SOURCE #endif +#include + #include #include "absl/types/optional.h" -#include - #ifdef GPR_LINUX_ENV #include #include -#include "src/core/lib/gprpp/env.h" +#include "src/core/util/env.h" namespace grpc_core { diff --git a/src/core/lib/gprpp/load_file.cc b/src/core/util/load_file.cc similarity index 98% rename from src/core/lib/gprpp/load_file.cc rename to src/core/util/load_file.cc index dd15004570a..91ec375ba65 100644 --- a/src/core/lib/gprpp/load_file.cc +++ b/src/core/util/load_file.cc @@ -12,7 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/core/lib/gprpp/load_file.h" +#include + +#include "src/core/util/load_file.h" #include #include @@ -24,7 +26,6 @@ #include #include -#include namespace grpc_core { diff --git a/src/core/lib/gprpp/load_file.h b/src/core/util/load_file.h similarity index 88% rename from src/core/lib/gprpp/load_file.h rename to src/core/util/load_file.h index 761d8d1fbd6..5d3f7aa784f 100644 --- a/src/core/lib/gprpp/load_file.h +++ b/src/core/util/load_file.h @@ -12,15 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef GRPC_SRC_CORE_LIB_GPRPP_LOAD_FILE_H -#define GRPC_SRC_CORE_LIB_GPRPP_LOAD_FILE_H +#ifndef GRPC_SRC_CORE_UTIL_LOAD_FILE_H +#define GRPC_SRC_CORE_UTIL_LOAD_FILE_H + +#include #include #include "absl/status/statusor.h" -#include - #include "src/core/lib/slice/slice.h" namespace grpc_core { @@ -31,4 +31,4 @@ absl::StatusOr LoadFile(const std::string& filename, bool add_null_terminator); } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_GPRPP_LOAD_FILE_H +#endif // GRPC_SRC_CORE_UTIL_LOAD_FILE_H diff --git a/src/core/util/log.cc b/src/core/util/log.cc index e2feca75993..cc353fcbd64 100644 --- a/src/core/util/log.cc +++ b/src/core/util/log.cc @@ -33,7 +33,7 @@ #include #include "src/core/lib/config/config_vars.h" -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "src/core/util/string.h" void gpr_unreachable_code(const char* reason, const char* file, int line) { diff --git a/src/core/lib/gprpp/manual_constructor.h b/src/core/util/manual_constructor.h similarity index 95% rename from src/core/lib/gprpp/manual_constructor.h rename to src/core/util/manual_constructor.h index 02892970295..38d4695753f 100644 --- a/src/core/lib/gprpp/manual_constructor.h +++ b/src/core/util/manual_constructor.h @@ -16,18 +16,18 @@ // // -#ifndef GRPC_SRC_CORE_LIB_GPRPP_MANUAL_CONSTRUCTOR_H -#define GRPC_SRC_CORE_LIB_GPRPP_MANUAL_CONSTRUCTOR_H +#ifndef GRPC_SRC_CORE_UTIL_MANUAL_CONSTRUCTOR_H +#define GRPC_SRC_CORE_UTIL_MANUAL_CONSTRUCTOR_H // manually construct a region of memory with some type +#include + #include #include -#include - -#include "src/core/lib/gprpp/construct_destruct.h" +#include "src/core/util/construct_destruct.h" namespace grpc_core { @@ -143,4 +143,4 @@ class ManualConstructor { } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_GPRPP_MANUAL_CONSTRUCTOR_H +#endif // GRPC_SRC_CORE_UTIL_MANUAL_CONSTRUCTOR_H diff --git a/src/core/lib/gprpp/match.h b/src/core/util/match.h similarity index 93% rename from src/core/lib/gprpp/match.h rename to src/core/util/match.h index 9fa388fd2c0..69b91f2fc9b 100644 --- a/src/core/lib/gprpp/match.h +++ b/src/core/util/match.h @@ -12,16 +12,16 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef GRPC_SRC_CORE_LIB_GPRPP_MATCH_H -#define GRPC_SRC_CORE_LIB_GPRPP_MATCH_H +#ifndef GRPC_SRC_CORE_UTIL_MATCH_H +#define GRPC_SRC_CORE_UTIL_MATCH_H + +#include #include #include "absl/types/variant.h" -#include - -#include "src/core/lib/gprpp/overload.h" +#include "src/core/util/overload.h" namespace grpc_core { @@ -72,4 +72,4 @@ auto MatchMutable(absl::variant* value, Fs... fs) } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_GPRPP_MATCH_H +#endif // GRPC_SRC_CORE_UTIL_MATCH_H diff --git a/src/core/lib/matchers/matchers.cc b/src/core/util/matchers.cc similarity index 99% rename from src/core/lib/matchers/matchers.cc rename to src/core/util/matchers.cc index 38bea23b2b5..a0a8b786bec 100644 --- a/src/core/lib/matchers/matchers.cc +++ b/src/core/util/matchers.cc @@ -12,7 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/core/lib/matchers/matchers.h" +#include + +#include "src/core/util/matchers.h" #include @@ -23,8 +25,6 @@ #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" -#include - namespace grpc_core { // diff --git a/src/core/lib/matchers/matchers.h b/src/core/util/matchers.h similarity index 97% rename from src/core/lib/matchers/matchers.h rename to src/core/util/matchers.h index b2055778ff7..69992106b45 100644 --- a/src/core/lib/matchers/matchers.h +++ b/src/core/util/matchers.h @@ -12,8 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef GRPC_SRC_CORE_LIB_MATCHERS_MATCHERS_H -#define GRPC_SRC_CORE_LIB_MATCHERS_MATCHERS_H +#ifndef GRPC_SRC_CORE_UTIL_MATCHERS_H +#define GRPC_SRC_CORE_UTIL_MATCHERS_H + +#include #include @@ -25,8 +27,6 @@ #include "absl/types/optional.h" #include "re2/re2.h" -#include - namespace grpc_core { class StringMatcher { @@ -160,4 +160,4 @@ class HeaderMatcher { } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_MATCHERS_MATCHERS_H +#endif // GRPC_SRC_CORE_UTIL_MATCHERS_H diff --git a/src/core/lib/gprpp/memory.h b/src/core/util/memory.h similarity index 91% rename from src/core/lib/gprpp/memory.h rename to src/core/util/memory.h index 932862d708c..eae0aaa4b83 100644 --- a/src/core/lib/gprpp/memory.h +++ b/src/core/util/memory.h @@ -16,14 +16,15 @@ // // -#ifndef GRPC_SRC_CORE_LIB_GPRPP_MEMORY_H -#define GRPC_SRC_CORE_LIB_GPRPP_MEMORY_H +#ifndef GRPC_SRC_CORE_UTIL_MEMORY_H +#define GRPC_SRC_CORE_UTIL_MEMORY_H + +#include #include #include #include -#include namespace grpc_core { @@ -49,4 +50,4 @@ T* Zalloc() { } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_GPRPP_MEMORY_H +#endif // GRPC_SRC_CORE_UTIL_MEMORY_H diff --git a/src/core/lib/gprpp/mpscq.cc b/src/core/util/mpscq.cc similarity index 98% rename from src/core/lib/gprpp/mpscq.cc rename to src/core/util/mpscq.cc index d57ff40f7d8..45258346443 100644 --- a/src/core/lib/gprpp/mpscq.cc +++ b/src/core/util/mpscq.cc @@ -16,10 +16,10 @@ // // -#include "src/core/lib/gprpp/mpscq.h" - #include +#include "src/core/util/mpscq.h" + namespace grpc_core { // diff --git a/src/core/lib/gprpp/mpscq.h b/src/core/util/mpscq.h similarity index 94% rename from src/core/lib/gprpp/mpscq.h rename to src/core/util/mpscq.h index f6306d46822..b4d48f78c3d 100644 --- a/src/core/lib/gprpp/mpscq.h +++ b/src/core/util/mpscq.h @@ -16,16 +16,16 @@ // // -#ifndef GRPC_SRC_CORE_LIB_GPRPP_MPSCQ_H -#define GRPC_SRC_CORE_LIB_GPRPP_MPSCQ_H +#ifndef GRPC_SRC_CORE_UTIL_MPSCQ_H +#define GRPC_SRC_CORE_UTIL_MPSCQ_H + +#include #include #include "absl/log/check.h" -#include - -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/sync.h" namespace grpc_core { @@ -96,4 +96,4 @@ class LockedMultiProducerSingleConsumerQueue { } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_GPRPP_MPSCQ_H +#endif // GRPC_SRC_CORE_UTIL_MPSCQ_H diff --git a/src/core/util/msys/tmpfile.cc b/src/core/util/msys/tmpfile.cc index dc1cdf7bc34..69eb209b149 100644 --- a/src/core/util/msys/tmpfile.cc +++ b/src/core/util/msys/tmpfile.cc @@ -28,7 +28,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "src/core/util/string_windows.h" #include "src/core/util/tmpfile.h" diff --git a/src/core/lib/gprpp/no_destruct.h b/src/core/util/no_destruct.h similarity index 93% rename from src/core/lib/gprpp/no_destruct.h rename to src/core/util/no_destruct.h index 1f8a82c1753..4ba0161161f 100644 --- a/src/core/lib/gprpp/no_destruct.h +++ b/src/core/util/no_destruct.h @@ -12,15 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef GRPC_SRC_CORE_LIB_GPRPP_NO_DESTRUCT_H -#define GRPC_SRC_CORE_LIB_GPRPP_NO_DESTRUCT_H +#ifndef GRPC_SRC_CORE_UTIL_NO_DESTRUCT_H +#define GRPC_SRC_CORE_UTIL_NO_DESTRUCT_H + +#include #include #include -#include - -#include "src/core/lib/gprpp/construct_destruct.h" +#include "src/core/util/construct_destruct.h" namespace grpc_core { @@ -92,4 +92,4 @@ NoDestruct NoDestructSingleton::value_; } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_GPRPP_NO_DESTRUCT_H +#endif // GRPC_SRC_CORE_UTIL_NO_DESTRUCT_H diff --git a/src/core/lib/gprpp/notification.h b/src/core/util/notification.h similarity index 89% rename from src/core/lib/gprpp/notification.h rename to src/core/util/notification.h index 4be78279023..45acff0fda7 100644 --- a/src/core/lib/gprpp/notification.h +++ b/src/core/util/notification.h @@ -12,15 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef GRPC_SRC_CORE_LIB_GPRPP_NOTIFICATION_H -#define GRPC_SRC_CORE_LIB_GPRPP_NOTIFICATION_H +#ifndef GRPC_SRC_CORE_UTIL_NOTIFICATION_H +#define GRPC_SRC_CORE_UTIL_NOTIFICATION_H + +#include #include "absl/time/clock.h" #include "absl/time/time.h" -#include - -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/sync.h" namespace grpc_core { @@ -64,4 +64,4 @@ class Notification { } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_GPRPP_NOTIFICATION_H +#endif // GRPC_SRC_CORE_UTIL_NOTIFICATION_H diff --git a/src/core/lib/gprpp/orphanable.h b/src/core/util/orphanable.h similarity index 93% rename from src/core/lib/gprpp/orphanable.h rename to src/core/util/orphanable.h index 924a41fd5fe..82ad20c52e5 100644 --- a/src/core/lib/gprpp/orphanable.h +++ b/src/core/util/orphanable.h @@ -16,19 +16,19 @@ // // -#ifndef GRPC_SRC_CORE_LIB_GPRPP_ORPHANABLE_H -#define GRPC_SRC_CORE_LIB_GPRPP_ORPHANABLE_H +#ifndef GRPC_SRC_CORE_UTIL_ORPHANABLE_H +#define GRPC_SRC_CORE_UTIL_ORPHANABLE_H + +#include #include #include #include -#include - -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/down_cast.h" -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/down_cast.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_core { @@ -150,4 +150,4 @@ class InternallyRefCounted : public Orphanable { } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_GPRPP_ORPHANABLE_H +#endif // GRPC_SRC_CORE_UTIL_ORPHANABLE_H diff --git a/src/core/lib/gprpp/overload.h b/src/core/util/overload.h similarity index 93% rename from src/core/lib/gprpp/overload.h rename to src/core/util/overload.h index 2a3bd546e86..373a34c1210 100644 --- a/src/core/lib/gprpp/overload.h +++ b/src/core/util/overload.h @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef GRPC_SRC_CORE_LIB_GPRPP_OVERLOAD_H -#define GRPC_SRC_CORE_LIB_GPRPP_OVERLOAD_H - -#include +#ifndef GRPC_SRC_CORE_UTIL_OVERLOAD_H +#define GRPC_SRC_CORE_UTIL_OVERLOAD_H #include +#include + namespace grpc_core { template @@ -56,4 +56,4 @@ OverloadType Overload(Cases... cases) { } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_GPRPP_OVERLOAD_H +#endif // GRPC_SRC_CORE_UTIL_OVERLOAD_H diff --git a/src/core/lib/gprpp/packed_table.h b/src/core/util/packed_table.h similarity index 83% rename from src/core/lib/gprpp/packed_table.h rename to src/core/util/packed_table.h index a1f7b09f0cf..2a7946174d4 100644 --- a/src/core/lib/gprpp/packed_table.h +++ b/src/core/util/packed_table.h @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef GRPC_SRC_CORE_LIB_GPRPP_PACKED_TABLE_H -#define GRPC_SRC_CORE_LIB_GPRPP_PACKED_TABLE_H +#ifndef GRPC_SRC_CORE_UTIL_PACKED_TABLE_H +#define GRPC_SRC_CORE_UTIL_PACKED_TABLE_H #include -#include "src/core/lib/gprpp/sorted_pack.h" -#include "src/core/lib/gprpp/table.h" +#include "src/core/util/sorted_pack.h" +#include "src/core/util/table.h" namespace grpc_core { @@ -37,4 +37,4 @@ using PackedTable = } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_GPRPP_PACKED_TABLE_H +#endif // GRPC_SRC_CORE_UTIL_PACKED_TABLE_H diff --git a/src/core/lib/gprpp/per_cpu.cc b/src/core/util/per_cpu.cc similarity index 96% rename from src/core/lib/gprpp/per_cpu.cc rename to src/core/util/per_cpu.cc index 4cd06fd6513..8412f399173 100644 --- a/src/core/lib/gprpp/per_cpu.cc +++ b/src/core/util/per_cpu.cc @@ -12,10 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/core/lib/gprpp/per_cpu.h" +#include + +#include "src/core/util/per_cpu.h" #include -#include #include "src/core/util/useful.h" diff --git a/src/core/lib/gprpp/per_cpu.h b/src/core/util/per_cpu.h similarity index 95% rename from src/core/lib/gprpp/per_cpu.h rename to src/core/util/per_cpu.h index a4e30092df6..492ea2832b4 100644 --- a/src/core/lib/gprpp/per_cpu.h +++ b/src/core/util/per_cpu.h @@ -12,8 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef GRPC_SRC_CORE_LIB_GPRPP_PER_CPU_H -#define GRPC_SRC_CORE_LIB_GPRPP_PER_CPU_H +#ifndef GRPC_SRC_CORE_UTIL_PER_CPU_H +#define GRPC_SRC_CORE_UTIL_PER_CPU_H + +#include #include @@ -23,7 +25,6 @@ #include #include -#include // Sharded collections of objects // This used to be per-cpu, now it's much less so - but still a way to limit @@ -100,4 +101,4 @@ class PerCpu { } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_GPRPP_PER_CPU_H +#endif // GRPC_SRC_CORE_UTIL_PER_CPU_H diff --git a/src/core/util/posix/cpu.cc b/src/core/util/posix/cpu.cc index 3aabc9adfe5..93e6cce0614 100644 --- a/src/core/util/posix/cpu.cc +++ b/src/core/util/posix/cpu.cc @@ -30,7 +30,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "src/core/util/useful.h" static long ncpus = 0; diff --git a/src/core/lib/gprpp/posix/directory_reader.cc b/src/core/util/posix/directory_reader.cc similarity index 97% rename from src/core/lib/gprpp/posix/directory_reader.cc rename to src/core/util/posix/directory_reader.cc index eff9823a213..d889c7b6c44 100644 --- a/src/core/lib/gprpp/posix/directory_reader.cc +++ b/src/core/util/posix/directory_reader.cc @@ -16,14 +16,14 @@ // // +#include + #include #include "absl/functional/function_ref.h" #include "absl/status/status.h" #include "absl/strings/string_view.h" -#include - #if defined(GPR_LINUX) || defined(GPR_ANDROID) || defined(GPR_FREEBSD) || \ defined(GPR_APPLE) @@ -31,7 +31,7 @@ #include -#include "src/core/lib/gprpp/directory_reader.h" +#include "src/core/util/directory_reader.h" namespace grpc_core { diff --git a/src/core/lib/gprpp/posix/env.cc b/src/core/util/posix/env.cc similarity index 96% rename from src/core/lib/gprpp/posix/env.cc rename to src/core/util/posix/env.cc index 4121e24c072..8ace63d0ea2 100644 --- a/src/core/lib/gprpp/posix/env.cc +++ b/src/core/util/posix/env.cc @@ -22,7 +22,7 @@ #include -#include "src/core/lib/gprpp/env.h" +#include "src/core/util/env.h" namespace grpc_core { diff --git a/src/core/lib/gprpp/posix/stat.cc b/src/core/util/posix/stat.cc similarity index 94% rename from src/core/lib/gprpp/posix/stat.cc rename to src/core/util/posix/stat.cc index e0d2e617506..e4c870f8dbd 100644 --- a/src/core/lib/gprpp/posix/stat.cc +++ b/src/core/util/posix/stat.cc @@ -14,10 +14,10 @@ // limitations under the License. // -#include - #include +#include + // IWYU pragma: no_include #include "absl/status/status.h" @@ -30,8 +30,8 @@ #include "absl/log/check.h" #include "absl/log/log.h" -#include "src/core/lib/gprpp/stat.h" -#include "src/core/lib/gprpp/strerror.h" +#include "src/core/util/stat.h" +#include "src/core/util/strerror.h" namespace grpc_core { diff --git a/src/core/util/posix/sync.cc b/src/core/util/posix/sync.cc index 1ccaa281996..255eec517a3 100644 --- a/src/core/util/posix/sync.cc +++ b/src/core/util/posix/sync.cc @@ -30,7 +30,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" void gpr_mu_init(gpr_mu* mu) { #ifdef GRPC_ASAN_ENABLED diff --git a/src/core/lib/gprpp/posix/thd.cc b/src/core/util/posix/thd.cc similarity index 97% rename from src/core/lib/gprpp/posix/thd.cc rename to src/core/util/posix/thd.cc index b481fa7c565..6987e3ff2cd 100644 --- a/src/core/lib/gprpp/posix/thd.cc +++ b/src/core/util/posix/thd.cc @@ -18,13 +18,13 @@ // Posix implementation for gpr threads. +#include + #include #include #include -#include - #ifdef GPR_POSIX_SYNC #include @@ -39,10 +39,10 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/fork.h" -#include "src/core/lib/gprpp/strerror.h" -#include "src/core/lib/gprpp/thd.h" +#include "src/core/util/crash.h" +#include "src/core/util/fork.h" +#include "src/core/util/strerror.h" +#include "src/core/util/thd.h" #include "src/core/util/useful.h" namespace grpc_core { diff --git a/src/core/util/posix/time.cc b/src/core/util/posix/time.cc index 5fea711d59f..a425a4721c6 100644 --- a/src/core/util/posix/time.cc +++ b/src/core/util/posix/time.cc @@ -33,7 +33,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" static struct timespec timespec_from_gpr(gpr_timespec gts) { struct timespec rv; @@ -77,8 +77,8 @@ static gpr_timespec now_impl(gpr_clock_type clock_type) { } else { clock_gettime(clockid_for_gpr_clock[clock_type], &now); if (clock_type == GPR_CLOCK_MONOTONIC) { - // Add 5 seconds arbitrarily: avoids weird conditions in gprpp/time.cc - // when there's a small number of seconds returned. + // Add 5 seconds arbitrarily: avoids weird conditions in + // src/core/util/time.cc when there's a small number of seconds returned. now.tv_sec += 5; } return gpr_from_timespec(now, clock_type); diff --git a/src/core/util/posix/tmpfile.cc b/src/core/util/posix/tmpfile.cc index fd1524654a5..51b900a3527 100644 --- a/src/core/util/posix/tmpfile.cc +++ b/src/core/util/posix/tmpfile.cc @@ -31,8 +31,8 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/strerror.h" +#include "src/core/util/crash.h" +#include "src/core/util/strerror.h" #include "src/core/util/string.h" #include "src/core/util/tmpfile.h" diff --git a/src/core/lib/backoff/random_early_detection.cc b/src/core/util/random_early_detection.cc similarity index 94% rename from src/core/lib/backoff/random_early_detection.cc rename to src/core/util/random_early_detection.cc index c25e3792cdb..882a7d530e9 100644 --- a/src/core/lib/backoff/random_early_detection.cc +++ b/src/core/util/random_early_detection.cc @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/core/lib/backoff/random_early_detection.h" +#include -#include "absl/random/distributions.h" +#include "src/core/util/random_early_detection.h" -#include +#include "absl/random/distributions.h" namespace grpc_core { diff --git a/src/core/lib/backoff/random_early_detection.h b/src/core/util/random_early_detection.h similarity index 91% rename from src/core/lib/backoff/random_early_detection.h rename to src/core/util/random_early_detection.h index 400a0d3d57f..fb2ea8f51a4 100644 --- a/src/core/lib/backoff/random_early_detection.h +++ b/src/core/util/random_early_detection.h @@ -12,8 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef GRPC_SRC_CORE_LIB_BACKOFF_RANDOM_EARLY_DETECTION_H -#define GRPC_SRC_CORE_LIB_BACKOFF_RANDOM_EARLY_DETECTION_H +#ifndef GRPC_SRC_CORE_UTIL_RANDOM_EARLY_DETECTION_H +#define GRPC_SRC_CORE_UTIL_RANDOM_EARLY_DETECTION_H + +#include #include @@ -21,8 +23,6 @@ #include "absl/random/bit_gen_ref.h" -#include - namespace grpc_core { // Implements the random early detection algorithm - allows items to be rejected @@ -59,4 +59,4 @@ class RandomEarlyDetection { } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_BACKOFF_RANDOM_EARLY_DETECTION_H +#endif // GRPC_SRC_CORE_UTIL_RANDOM_EARLY_DETECTION_H diff --git a/src/core/lib/gprpp/ref_counted.h b/src/core/util/ref_counted.h similarity index 97% rename from src/core/lib/gprpp/ref_counted.h rename to src/core/util/ref_counted.h index e8b6347f4b9..e32472d1c80 100644 --- a/src/core/lib/gprpp/ref_counted.h +++ b/src/core/util/ref_counted.h @@ -16,8 +16,10 @@ // // -#ifndef GRPC_SRC_CORE_LIB_GPRPP_REF_COUNTED_H -#define GRPC_SRC_CORE_LIB_GPRPP_REF_COUNTED_H +#ifndef GRPC_SRC_CORE_UTIL_REF_COUNTED_H +#define GRPC_SRC_CORE_UTIL_REF_COUNTED_H + +#include #include #include @@ -26,12 +28,10 @@ #include "absl/log/check.h" #include "absl/log/log.h" -#include - -#include "src/core/lib/gprpp/atomic_utils.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/down_cast.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" +#include "src/core/util/atomic_utils.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/down_cast.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_core { @@ -400,4 +400,4 @@ class RefCounted : public Impl { } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_GPRPP_REF_COUNTED_H +#endif // GRPC_SRC_CORE_UTIL_REF_COUNTED_H diff --git a/src/core/lib/gprpp/ref_counted_ptr.h b/src/core/util/ref_counted_ptr.h similarity index 98% rename from src/core/lib/gprpp/ref_counted_ptr.h rename to src/core/util/ref_counted_ptr.h index c3506bc8697..28829bc0d20 100644 --- a/src/core/lib/gprpp/ref_counted_ptr.h +++ b/src/core/util/ref_counted_ptr.h @@ -16,8 +16,10 @@ // // -#ifndef GRPC_SRC_CORE_LIB_GPRPP_REF_COUNTED_PTR_H -#define GRPC_SRC_CORE_LIB_GPRPP_REF_COUNTED_PTR_H +#ifndef GRPC_SRC_CORE_UTIL_REF_COUNTED_PTR_H +#define GRPC_SRC_CORE_UTIL_REF_COUNTED_PTR_H + +#include #include @@ -27,10 +29,8 @@ #include "absl/hash/hash.h" -#include - -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/down_cast.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/down_cast.h" namespace grpc_core { @@ -442,4 +442,4 @@ struct RefCountedPtrEq { } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_GPRPP_REF_COUNTED_PTR_H +#endif // GRPC_SRC_CORE_UTIL_REF_COUNTED_PTR_H diff --git a/src/core/lib/gprpp/ref_counted_string.cc b/src/core/util/ref_counted_string.cc similarity index 96% rename from src/core/lib/gprpp/ref_counted_string.cc rename to src/core/util/ref_counted_string.cc index 1a0a9ff0318..2b3f6f66b36 100644 --- a/src/core/lib/gprpp/ref_counted_string.cc +++ b/src/core/util/ref_counted_string.cc @@ -14,14 +14,15 @@ // limitations under the License. // -#include "src/core/lib/gprpp/ref_counted_string.h" +#include + +#include "src/core/util/ref_counted_string.h" #include #include #include -#include namespace grpc_core { diff --git a/src/core/lib/gprpp/ref_counted_string.h b/src/core/util/ref_counted_string.h similarity index 94% rename from src/core/lib/gprpp/ref_counted_string.h rename to src/core/util/ref_counted_string.h index 64f96bd9638..ed3e93089ae 100644 --- a/src/core/lib/gprpp/ref_counted_string.h +++ b/src/core/util/ref_counted_string.h @@ -14,8 +14,10 @@ // limitations under the License. // -#ifndef GRPC_SRC_CORE_LIB_GPRPP_REF_COUNTED_STRING_H -#define GRPC_SRC_CORE_LIB_GPRPP_REF_COUNTED_STRING_H +#ifndef GRPC_SRC_CORE_UTIL_REF_COUNTED_STRING_H +#define GRPC_SRC_CORE_UTIL_REF_COUNTED_STRING_H + +#include #include @@ -23,10 +25,8 @@ #include "absl/strings/string_view.h" -#include - -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_core { @@ -158,4 +158,4 @@ struct RefCountedStringValueLessThan { } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_GPRPP_REF_COUNTED_STRING_H +#endif // GRPC_SRC_CORE_UTIL_REF_COUNTED_STRING_H diff --git a/src/core/lib/gprpp/single_set_ptr.h b/src/core/util/single_set_ptr.h similarity index 94% rename from src/core/lib/gprpp/single_set_ptr.h rename to src/core/util/single_set_ptr.h index 016967b5f49..9508e53eb6d 100644 --- a/src/core/lib/gprpp/single_set_ptr.h +++ b/src/core/util/single_set_ptr.h @@ -12,16 +12,16 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef GRPC_SRC_CORE_LIB_GPRPP_SINGLE_SET_PTR_H -#define GRPC_SRC_CORE_LIB_GPRPP_SINGLE_SET_PTR_H +#ifndef GRPC_SRC_CORE_UTIL_SINGLE_SET_PTR_H +#define GRPC_SRC_CORE_UTIL_SINGLE_SET_PTR_H + +#include #include #include #include "absl/log/check.h" -#include - namespace grpc_core { template > @@ -86,4 +86,4 @@ class SingleSetPtr { } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_GPRPP_SINGLE_SET_PTR_H +#endif // GRPC_SRC_CORE_UTIL_SINGLE_SET_PTR_H diff --git a/src/core/lib/gprpp/sorted_pack.h b/src/core/util/sorted_pack.h similarity index 94% rename from src/core/lib/gprpp/sorted_pack.h rename to src/core/util/sorted_pack.h index 47e3f9c525d..bb0d2415a15 100644 --- a/src/core/lib/gprpp/sorted_pack.h +++ b/src/core/util/sorted_pack.h @@ -12,14 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef GRPC_SRC_CORE_LIB_GPRPP_SORTED_PACK_H -#define GRPC_SRC_CORE_LIB_GPRPP_SORTED_PACK_H - -#include +#ifndef GRPC_SRC_CORE_UTIL_SORTED_PACK_H +#define GRPC_SRC_CORE_UTIL_SORTED_PACK_H #include -#include "src/core/lib/gprpp/type_list.h" +#include + +#include "src/core/util/type_list.h" namespace grpc_core { @@ -86,4 +86,4 @@ struct WithSortedPack { } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_GPRPP_SORTED_PACK_H +#endif // GRPC_SRC_CORE_UTIL_SORTED_PACK_H diff --git a/src/core/lib/gprpp/stat.h b/src/core/util/stat.h similarity index 89% rename from src/core/lib/gprpp/stat.h rename to src/core/util/stat.h index 2bee50c9029..e947c0a5de9 100644 --- a/src/core/lib/gprpp/stat.h +++ b/src/core/util/stat.h @@ -14,15 +14,15 @@ // limitations under the License. // -#ifndef GRPC_SRC_CORE_LIB_GPRPP_STAT_H -#define GRPC_SRC_CORE_LIB_GPRPP_STAT_H +#ifndef GRPC_SRC_CORE_UTIL_STAT_H +#define GRPC_SRC_CORE_UTIL_STAT_H + +#include #include #include "absl/status/status.h" -#include - namespace grpc_core { // Gets the last-modified timestamp of a file or a directory. @@ -33,4 +33,4 @@ absl::Status GetFileModificationTime(const char* filename, time_t* timestamp); } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_GPRPP_STAT_H +#endif // GRPC_SRC_CORE_UTIL_STAT_H diff --git a/src/core/lib/gprpp/status_helper.cc b/src/core/util/status_helper.cc similarity index 99% rename from src/core/lib/gprpp/status_helper.cc rename to src/core/util/status_helper.cc index b3563592b55..339500e2b0c 100644 --- a/src/core/lib/gprpp/status_helper.cc +++ b/src/core/util/status_helper.cc @@ -16,7 +16,9 @@ // // -#include "src/core/lib/gprpp/status_helper.h" +#include + +#include "src/core/util/status_helper.h" #include @@ -35,8 +37,6 @@ #include "upb/base/string_view.h" #include "upb/mem/arena.hpp" -#include - #include "src/core/lib/slice/percent_encoding.h" #include "src/core/lib/slice/slice.h" diff --git a/src/core/lib/gprpp/status_helper.h b/src/core/util/status_helper.h similarity index 96% rename from src/core/lib/gprpp/status_helper.h rename to src/core/util/status_helper.h index 3f561d21b9b..e2e089ce25e 100644 --- a/src/core/lib/gprpp/status_helper.h +++ b/src/core/util/status_helper.h @@ -16,8 +16,10 @@ // // -#ifndef GRPC_SRC_CORE_LIB_GPRPP_STATUS_HELPER_H -#define GRPC_SRC_CORE_LIB_GPRPP_STATUS_HELPER_H +#ifndef GRPC_SRC_CORE_UTIL_STATUS_HELPER_H +#define GRPC_SRC_CORE_UTIL_STATUS_HELPER_H + +#include #include @@ -29,9 +31,7 @@ #include "absl/time/time.h" #include "absl/types/optional.h" -#include - -#include "src/core/lib/gprpp/debug_location.h" +#include "src/core/util/debug_location.h" extern "C" { struct google_rpc_Status; @@ -159,4 +159,4 @@ absl::Status StatusMoveFromHeapPtr(uintptr_t ptr); } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_GPRPP_STATUS_HELPER_H +#endif // GRPC_SRC_CORE_UTIL_STATUS_HELPER_H diff --git a/src/core/lib/gprpp/strerror.cc b/src/core/util/strerror.cc similarity index 96% rename from src/core/lib/gprpp/strerror.cc rename to src/core/util/strerror.cc index 298efa1eed3..868acee2c06 100644 --- a/src/core/lib/gprpp/strerror.cc +++ b/src/core/util/strerror.cc @@ -12,14 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/core/lib/gprpp/strerror.h" +#include + +#include "src/core/util/strerror.h" #include #include "absl/strings/str_format.h" -#include - namespace grpc_core { #ifdef GPR_WINDOWS diff --git a/src/core/lib/gprpp/strerror.h b/src/core/util/strerror.h similarity index 85% rename from src/core/lib/gprpp/strerror.h rename to src/core/util/strerror.h index fce645f6c1f..24f285b6d76 100644 --- a/src/core/lib/gprpp/strerror.h +++ b/src/core/util/strerror.h @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef GRPC_SRC_CORE_LIB_GPRPP_STRERROR_H -#define GRPC_SRC_CORE_LIB_GPRPP_STRERROR_H - -#include +#ifndef GRPC_SRC_CORE_UTIL_STRERROR_H +#define GRPC_SRC_CORE_UTIL_STRERROR_H #include +#include + namespace grpc_core { // Returns a string describing the posix error code. @@ -26,4 +26,4 @@ std::string StrError(int err); } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_GPRPP_STRERROR_H +#endif // GRPC_SRC_CORE_UTIL_STRERROR_H diff --git a/src/core/util/string.cc b/src/core/util/string.cc index 56cc040809d..3048a432a63 100644 --- a/src/core/util/string.cc +++ b/src/core/util/string.cc @@ -34,7 +34,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "src/core/util/useful.h" char* gpr_strdup(const char* src) { diff --git a/src/core/util/subprocess_posix.cc b/src/core/util/subprocess_posix.cc index 961c68de8ad..b421d50549c 100644 --- a/src/core/util/subprocess_posix.cc +++ b/src/core/util/subprocess_posix.cc @@ -34,8 +34,8 @@ #include -#include "src/core/lib/gprpp/memory.h" -#include "src/core/lib/gprpp/strerror.h" +#include "src/core/util/memory.h" +#include "src/core/util/strerror.h" #include "src/core/util/subprocess.h" struct gpr_subprocess { diff --git a/src/core/util/subprocess_windows.cc b/src/core/util/subprocess_windows.cc index 2824cb61071..c8760ec3ee7 100644 --- a/src/core/util/subprocess_windows.cc +++ b/src/core/util/subprocess_windows.cc @@ -30,10 +30,10 @@ #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/tchar.h" +#include "src/core/util/crash.h" #include "src/core/util/string.h" #include "src/core/util/subprocess.h" +#include "src/core/util/tchar.h" struct gpr_subprocess { PROCESS_INFORMATION pi; diff --git a/src/core/lib/gprpp/sync.h b/src/core/util/sync.h similarity index 97% rename from src/core/lib/gprpp/sync.h rename to src/core/util/sync.h index 3b80a7bc91e..c85d9e2ad77 100644 --- a/src/core/lib/gprpp/sync.h +++ b/src/core/util/sync.h @@ -16,18 +16,19 @@ // // -#ifndef GRPC_SRC_CORE_LIB_GPRPP_SYNC_H -#define GRPC_SRC_CORE_LIB_GPRPP_SYNC_H +#ifndef GRPC_SRC_CORE_UTIL_SYNC_H +#define GRPC_SRC_CORE_UTIL_SYNC_H + +#include #include "absl/base/thread_annotations.h" #include "absl/log/check.h" #include "absl/synchronization/mutex.h" -#include #include #ifndef GPR_ABSEIL_SYNC -#include "src/core/lib/gprpp/time_util.h" +#include "src/core/util/time_util.h" #endif // The core library is not accessible in C++ codegen headers, and vice versa. @@ -196,4 +197,4 @@ class ABSL_SCOPED_LOCKABLE LockableAndReleasableMutexLock { } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_GPRPP_SYNC_H +#endif // GRPC_SRC_CORE_UTIL_SYNC_H diff --git a/src/core/util/sync_abseil.cc b/src/core/util/sync_abseil.cc index 1d826f6565c..9e837022532 100644 --- a/src/core/util/sync_abseil.cc +++ b/src/core/util/sync_abseil.cc @@ -32,8 +32,8 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/time_util.h" +#include "src/core/util/crash.h" +#include "src/core/util/time_util.h" void gpr_mu_init(gpr_mu* mu) { static_assert(sizeof(gpr_mu) == sizeof(absl::Mutex), diff --git a/src/core/lib/gprpp/table.h b/src/core/util/table.h similarity index 99% rename from src/core/lib/gprpp/table.h rename to src/core/util/table.h index 7085bae0357..bd35c4963a8 100644 --- a/src/core/lib/gprpp/table.h +++ b/src/core/util/table.h @@ -12,8 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef GRPC_SRC_CORE_LIB_GPRPP_TABLE_H -#define GRPC_SRC_CORE_LIB_GPRPP_TABLE_H +#ifndef GRPC_SRC_CORE_UTIL_TABLE_H +#define GRPC_SRC_CORE_UTIL_TABLE_H + +#include #include @@ -25,9 +27,7 @@ #include "absl/meta/type_traits.h" #include "absl/utility/utility.h" -#include - -#include "src/core/lib/gprpp/bitset.h" +#include "src/core/util/bitset.h" namespace grpc_core { @@ -485,4 +485,4 @@ class Table { } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_GPRPP_TABLE_H +#endif // GRPC_SRC_CORE_UTIL_TABLE_H diff --git a/src/core/lib/gprpp/tchar.cc b/src/core/util/tchar.cc similarity index 97% rename from src/core/lib/gprpp/tchar.cc rename to src/core/util/tchar.cc index 20bd7acc233..f558b4cbc1d 100644 --- a/src/core/lib/gprpp/tchar.cc +++ b/src/core/util/tchar.cc @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/core/lib/gprpp/tchar.h" - #include +#include "src/core/util/tchar.h" + #ifdef GPR_WINDOWS namespace grpc_core { diff --git a/src/core/lib/gprpp/tchar.h b/src/core/util/tchar.h similarity index 87% rename from src/core/lib/gprpp/tchar.h rename to src/core/util/tchar.h index d1e1acbc1bd..53350b0af8b 100644 --- a/src/core/lib/gprpp/tchar.h +++ b/src/core/util/tchar.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef GRPC_SRC_CORE_LIB_GPRPP_TCHAR_H -#define GRPC_SRC_CORE_LIB_GPRPP_TCHAR_H +#ifndef GRPC_SRC_CORE_UTIL_TCHAR_H +#define GRPC_SRC_CORE_UTIL_TCHAR_H #include @@ -30,4 +30,4 @@ std::string TcharToChar(TcharString input); } // namespace grpc_core #endif -#endif // GRPC_SRC_CORE_LIB_GPRPP_TCHAR_H +#endif // GRPC_SRC_CORE_UTIL_TCHAR_H diff --git a/src/core/lib/gprpp/thd.h b/src/core/util/thd.h similarity index 98% rename from src/core/lib/gprpp/thd.h rename to src/core/util/thd.h index 6662610cd68..ec0ae599f7f 100644 --- a/src/core/lib/gprpp/thd.h +++ b/src/core/util/thd.h @@ -16,11 +16,13 @@ // // -#ifndef GRPC_SRC_CORE_LIB_GPRPP_THD_H -#define GRPC_SRC_CORE_LIB_GPRPP_THD_H +#ifndef GRPC_SRC_CORE_UTIL_THD_H +#define GRPC_SRC_CORE_UTIL_THD_H /// Internal thread interface. +#include + #include #include @@ -29,7 +31,6 @@ #include "absl/functional/any_invocable.h" #include "absl/log/check.h" -#include #include namespace grpc_core { @@ -191,4 +192,4 @@ class Thread { } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_GPRPP_THD_H +#endif // GRPC_SRC_CORE_UTIL_THD_H diff --git a/src/core/util/time.cc b/src/core/util/time.cc index d71cee90ca9..c5f899bc473 100644 --- a/src/core/util/time.cc +++ b/src/core/util/time.cc @@ -1,6 +1,4 @@ -// -// -// Copyright 2015 gRPC authors. +// Copyright 2021 gRPC authors. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -13,258 +11,232 @@ // 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. -// -// - -// Generic implementation of time calls. #include -#include -#include -#include +#include "src/core/util/time.h" + +#include +#include +#include +#include +#include #include "absl/log/check.h" +#include "absl/log/log.h" +#include "absl/strings/str_format.h" #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/no_destruct.h" -int gpr_time_cmp(gpr_timespec a, gpr_timespec b) { - int cmp = (a.tv_sec > b.tv_sec) - (a.tv_sec < b.tv_sec); - CHECK(a.clock_type == b.clock_type); - if (cmp == 0 && a.tv_sec != INT64_MAX && a.tv_sec != INT64_MIN) { - cmp = (a.tv_nsec > b.tv_nsec) - (a.tv_nsec < b.tv_nsec); - } - return cmp; -} +// IWYU pragma: no_include -gpr_timespec gpr_time_min(gpr_timespec a, gpr_timespec b) { - return gpr_time_cmp(a, b) < 0 ? a : b; -} +namespace grpc_core { -gpr_timespec gpr_time_max(gpr_timespec a, gpr_timespec b) { - return gpr_time_cmp(a, b) > 0 ? a : b; -} +namespace { + +std::atomic g_process_epoch_seconds; +std::atomic g_process_epoch_cycles; -gpr_timespec gpr_time_0(gpr_clock_type type) { - gpr_timespec out; - out.tv_sec = 0; - out.tv_nsec = 0; - out.clock_type = type; - return out; +class GprNowTimeSource final : public Timestamp::Source { + public: + Timestamp Now() override { + return Timestamp::FromTimespecRoundDown(gpr_now(GPR_CLOCK_MONOTONIC)); + } +}; + +GPR_ATTRIBUTE_NOINLINE std::pair InitTime() { + gpr_cycle_counter cycles_start = 0; + gpr_cycle_counter cycles_end = 0; + int64_t process_epoch_seconds = 0; + + // Check the current time... if we end up with zero, try again after 100ms. + // If it doesn't advance after sleeping for 2100ms, crash the process. + for (int i = 0; i < 21; i++) { + cycles_start = gpr_get_cycle_counter(); + gpr_timespec now = gpr_now(GPR_CLOCK_MONOTONIC); + cycles_end = gpr_get_cycle_counter(); + process_epoch_seconds = now.tv_sec; + if (process_epoch_seconds > 1) { + break; + } + LOG(INFO) << "gpr_now(GPR_CLOCK_MONOTONIC) returns a very small number: " + "sleeping for 100ms"; + gpr_sleep_until(gpr_time_add(now, gpr_time_from_millis(100, GPR_TIMESPAN))); + } + + // Check time has increased past 1 second. + CHECK_GT(process_epoch_seconds, 1); + // Fake the epoch to always return >=1 second from our monotonic clock (to + // avoid bugs elsewhere) + process_epoch_seconds -= 1; + int64_t expected = 0; + gpr_cycle_counter process_epoch_cycles = (cycles_start + cycles_end) / 2; + CHECK_NE(process_epoch_cycles, 0); + if (!g_process_epoch_seconds.compare_exchange_strong( + expected, process_epoch_seconds, std::memory_order_relaxed, + std::memory_order_relaxed)) { + process_epoch_seconds = expected; + do { + process_epoch_cycles = + g_process_epoch_cycles.load(std::memory_order_relaxed); + } while (process_epoch_cycles == 0); + } else { + g_process_epoch_cycles.store(process_epoch_cycles, + std::memory_order_relaxed); + } + return std::make_pair(process_epoch_seconds, process_epoch_cycles); } -gpr_timespec gpr_inf_future(gpr_clock_type type) { - gpr_timespec out; - out.tv_sec = INT64_MAX; - out.tv_nsec = 0; - out.clock_type = type; - return out; +gpr_timespec StartTime() { + int64_t sec = g_process_epoch_seconds.load(std::memory_order_relaxed); + if (GPR_UNLIKELY(sec == 0)) sec = InitTime().first; + return {sec, 0, GPR_CLOCK_MONOTONIC}; } -gpr_timespec gpr_inf_past(gpr_clock_type type) { - gpr_timespec out; - out.tv_sec = INT64_MIN; - out.tv_nsec = 0; - out.clock_type = type; - return out; +gpr_cycle_counter StartCycleCounter() { + gpr_cycle_counter cycles = + g_process_epoch_cycles.load(std::memory_order_relaxed); + if (GPR_UNLIKELY(cycles == 0)) cycles = InitTime().second; + return cycles; } -static gpr_timespec to_seconds_from_sub_second_time(int64_t time_in_units, - int64_t units_per_sec, - gpr_clock_type type) { - gpr_timespec out; - if (time_in_units == INT64_MAX) { - out = gpr_inf_future(type); - } else if (time_in_units == INT64_MIN) { - out = gpr_inf_past(type); - } else { - DCHECK_EQ(GPR_NS_PER_SEC % units_per_sec, 0); - - out.tv_sec = time_in_units / units_per_sec; - out.tv_nsec = - static_cast((time_in_units - (out.tv_sec * units_per_sec)) * - (GPR_NS_PER_SEC / units_per_sec)); - /// `out.tv_nsec` should always be positive. - if (out.tv_nsec < 0) { - out.tv_nsec += GPR_NS_PER_SEC; - out.tv_sec--; - } +gpr_timespec MillisecondsAsTimespec(int64_t millis, gpr_clock_type clock_type) { + // special-case infinities as Timestamp can be 32bit on some + // platforms while gpr_time_from_millis always takes an int64_t. + if (millis == std::numeric_limits::max()) { + return gpr_inf_future(clock_type); + } + if (millis == std::numeric_limits::min()) { + return gpr_inf_past(clock_type); + } - out.clock_type = type; + if (clock_type == GPR_TIMESPAN) { + return gpr_time_from_millis(millis, GPR_TIMESPAN); + } + return gpr_time_add(gpr_convert_clock_type(StartTime(), clock_type), + gpr_time_from_millis(millis, GPR_TIMESPAN)); +} + +int64_t TimespanToMillisRoundUp(gpr_timespec ts) { + CHECK(ts.clock_type == GPR_TIMESPAN); + double x = GPR_MS_PER_SEC * static_cast(ts.tv_sec) + + static_cast(ts.tv_nsec) / GPR_NS_PER_MS + + static_cast(GPR_NS_PER_SEC - 1) / + static_cast(GPR_NS_PER_SEC); + if (x <= static_cast(std::numeric_limits::min())) { + return std::numeric_limits::min(); + } + if (x >= static_cast(std::numeric_limits::max())) { + return std::numeric_limits::max(); } - return out; + return static_cast(x); } -static gpr_timespec to_seconds_from_above_second_time(int64_t time_in_units, - int64_t secs_per_unit, - gpr_clock_type type) { - gpr_timespec out; - if (time_in_units >= INT64_MAX / secs_per_unit) { - out = gpr_inf_future(type); - } else if (time_in_units <= INT64_MIN / secs_per_unit) { - out = gpr_inf_past(type); - } else { - out.tv_sec = time_in_units * secs_per_unit; - out.tv_nsec = 0; - out.clock_type = type; +int64_t TimespanToMillisRoundDown(gpr_timespec ts) { + CHECK(ts.clock_type == GPR_TIMESPAN); + double x = GPR_MS_PER_SEC * static_cast(ts.tv_sec) + + static_cast(ts.tv_nsec) / GPR_NS_PER_MS; + if (x <= static_cast(std::numeric_limits::min())) { + return std::numeric_limits::min(); + } + if (x >= static_cast(std::numeric_limits::max())) { + return std::numeric_limits::max(); } - return out; + return static_cast(x); } -gpr_timespec gpr_time_from_nanos(int64_t ns, gpr_clock_type clock_type) { - return to_seconds_from_sub_second_time(ns, GPR_NS_PER_SEC, clock_type); -} +} // namespace -gpr_timespec gpr_time_from_micros(int64_t us, gpr_clock_type clock_type) { - return to_seconds_from_sub_second_time(us, GPR_US_PER_SEC, clock_type); +thread_local Timestamp::Source* Timestamp::thread_local_time_source_{ + NoDestructSingleton::Get()}; + +Timestamp ScopedTimeCache::Now() { + if (!cached_time_.has_value()) { + previous()->InvalidateCache(); + cached_time_ = previous()->Now(); + } + return cached_time_.value(); } -gpr_timespec gpr_time_from_millis(int64_t ms, gpr_clock_type clock_type) { - return to_seconds_from_sub_second_time(ms, GPR_MS_PER_SEC, clock_type); +Timestamp Timestamp::FromTimespecRoundUp(gpr_timespec ts) { + return FromMillisecondsAfterProcessEpoch(TimespanToMillisRoundUp(gpr_time_sub( + gpr_convert_clock_type(ts, GPR_CLOCK_MONOTONIC), StartTime()))); } -gpr_timespec gpr_time_from_seconds(int64_t s, gpr_clock_type clock_type) { - return to_seconds_from_sub_second_time(s, 1, clock_type); +Timestamp Timestamp::FromTimespecRoundDown(gpr_timespec ts) { + return FromMillisecondsAfterProcessEpoch( + TimespanToMillisRoundDown(gpr_time_sub( + gpr_convert_clock_type(ts, GPR_CLOCK_MONOTONIC), StartTime()))); } -gpr_timespec gpr_time_from_minutes(int64_t m, gpr_clock_type clock_type) { - return to_seconds_from_above_second_time(m, 60, clock_type); +Timestamp Timestamp::FromCycleCounterRoundUp(gpr_cycle_counter c) { + return Timestamp::FromMillisecondsAfterProcessEpoch( + TimespanToMillisRoundUp(gpr_cycle_counter_sub(c, StartCycleCounter()))); } -gpr_timespec gpr_time_from_hours(int64_t h, gpr_clock_type clock_type) { - return to_seconds_from_above_second_time(h, 3600, clock_type); +Timestamp Timestamp::FromCycleCounterRoundDown(gpr_cycle_counter c) { + return Timestamp::FromMillisecondsAfterProcessEpoch( + TimespanToMillisRoundDown(gpr_cycle_counter_sub(c, StartCycleCounter()))); } -gpr_timespec gpr_time_add(gpr_timespec a, gpr_timespec b) { - gpr_timespec sum; - int64_t inc = 0; - CHECK(b.clock_type == GPR_TIMESPAN); - // tv_nsec in a timespan is always +ve. -ve timespan is represented as (-ve - // tv_sec, +ve tv_nsec). For example, timespan = -2.5 seconds is represented - // as {-3, 5e8, GPR_TIMESPAN} - CHECK_GE(b.tv_nsec, 0); - sum.clock_type = a.clock_type; - sum.tv_nsec = a.tv_nsec + b.tv_nsec; - if (sum.tv_nsec >= GPR_NS_PER_SEC) { - sum.tv_nsec -= GPR_NS_PER_SEC; - inc++; - } - if (a.tv_sec == INT64_MAX || a.tv_sec == INT64_MIN) { - sum = a; - } else if (b.tv_sec == INT64_MAX || - (b.tv_sec >= 0 && a.tv_sec >= INT64_MAX - b.tv_sec)) { - sum = gpr_inf_future(sum.clock_type); - } else if (b.tv_sec == INT64_MIN || - (b.tv_sec <= 0 && a.tv_sec <= INT64_MIN - b.tv_sec)) { - sum = gpr_inf_past(sum.clock_type); - } else { - sum.tv_sec = a.tv_sec + b.tv_sec; - if (inc != 0 && sum.tv_sec == INT64_MAX - 1) { - sum = gpr_inf_future(sum.clock_type); - } else { - sum.tv_sec += inc; - } - } - return sum; +gpr_timespec Timestamp::as_timespec(gpr_clock_type clock_type) const { + return MillisecondsAsTimespec(millis_, clock_type); } -gpr_timespec gpr_time_sub(gpr_timespec a, gpr_timespec b) { - gpr_timespec diff; - int64_t dec = 0; - if (b.clock_type == GPR_TIMESPAN) { - diff.clock_type = a.clock_type; - // tv_nsec in a timespan is always +ve. -ve timespan is represented as (-ve - // tv_sec, +ve tv_nsec). For example, timespan = -2.5 seconds is represented - // as {-3, 5e8, GPR_TIMESPAN} - CHECK_GE(b.tv_nsec, 0); - } else { - CHECK(a.clock_type == b.clock_type); - diff.clock_type = GPR_TIMESPAN; +std::string Timestamp::ToString() const { + if (millis_ == std::numeric_limits::max()) { + return "@∞"; } - diff.tv_nsec = a.tv_nsec - b.tv_nsec; - if (diff.tv_nsec < 0) { - diff.tv_nsec += GPR_NS_PER_SEC; - dec++; + if (millis_ == std::numeric_limits::min()) { + return "@-∞"; } - if (a.tv_sec == INT64_MAX || a.tv_sec == INT64_MIN) { - diff.tv_sec = a.tv_sec; - diff.tv_nsec = a.tv_nsec; - } else if (b.tv_sec == INT64_MIN || - (b.tv_sec <= 0 && a.tv_sec >= INT64_MAX + b.tv_sec)) { - diff = gpr_inf_future(GPR_CLOCK_REALTIME); - } else if (b.tv_sec == INT64_MAX || - (b.tv_sec >= 0 && a.tv_sec <= INT64_MIN + b.tv_sec)) { - diff = gpr_inf_past(GPR_CLOCK_REALTIME); - } else { - diff.tv_sec = a.tv_sec - b.tv_sec; - if (dec != 0 && diff.tv_sec == INT64_MIN + 1) { - diff = gpr_inf_past(GPR_CLOCK_REALTIME); - } else { - diff.tv_sec -= dec; - } - } - return diff; + return "@" + std::to_string(millis_) + "ms"; } -int gpr_time_similar(gpr_timespec a, gpr_timespec b, gpr_timespec threshold) { - int cmp_ab; - - CHECK(a.clock_type == b.clock_type); - CHECK(threshold.clock_type == GPR_TIMESPAN); +gpr_timespec Duration::as_timespec() const { + return MillisecondsAsTimespec(millis_, GPR_TIMESPAN); +} - cmp_ab = gpr_time_cmp(a, b); - if (cmp_ab == 0) return 1; - if (cmp_ab < 0) { - return gpr_time_cmp(gpr_time_sub(b, a), threshold) <= 0; - } else { - return gpr_time_cmp(gpr_time_sub(a, b), threshold) <= 0; - } +Duration Duration::FromTimespec(gpr_timespec t) { + return Duration::Milliseconds(TimespanToMillisRoundUp(t)); } -int32_t gpr_time_to_millis(gpr_timespec t) { - if (t.tv_sec >= 2147483) { - if (t.tv_sec == 2147483 && t.tv_nsec < 648 * GPR_NS_PER_MS) { - return 2147483 * GPR_MS_PER_SEC + t.tv_nsec / GPR_NS_PER_MS; - } - return 2147483647; - } else if (t.tv_sec <= -2147483) { - // TODO(ctiller): correct handling here (it's so far in the past do we - // care?) - return -2147483647; - } else { - return static_cast(t.tv_sec * GPR_MS_PER_SEC + - t.tv_nsec / GPR_NS_PER_MS); +std::string Duration::ToString() const { + if (millis_ == std::numeric_limits::max()) { + return "∞"; } + if (millis_ == std::numeric_limits::min()) { + return "-∞"; + } + return std::to_string(millis_) + "ms"; } -double gpr_timespec_to_micros(gpr_timespec t) { - return static_cast(t.tv_sec) * GPR_US_PER_SEC + t.tv_nsec * 1e-3; +std::string Duration::ToJsonString() const { + gpr_timespec ts = as_timespec(); + return absl::StrFormat("%d.%09ds", ts.tv_sec, ts.tv_nsec); } -gpr_timespec gpr_convert_clock_type(gpr_timespec t, gpr_clock_type clock_type) { - if (t.clock_type == clock_type) { - return t; - } - - if (t.tv_sec == INT64_MAX || t.tv_sec == INT64_MIN) { - t.clock_type = clock_type; - return t; - } +Duration::operator grpc_event_engine::experimental::EventEngine::Duration() + const { + return std::chrono::milliseconds( + Clamp(millis_, std::numeric_limits::min() / GPR_NS_PER_MS, + std::numeric_limits::max() / GPR_NS_PER_MS)); +} - if (clock_type == GPR_TIMESPAN) { - return gpr_time_sub(t, gpr_now(t.clock_type)); - } +void TestOnlySetProcessEpoch(gpr_timespec epoch) { + g_process_epoch_seconds.store( + gpr_convert_clock_type(epoch, GPR_CLOCK_MONOTONIC).tv_sec); + g_process_epoch_cycles.store(gpr_get_cycle_counter()); +} - if (t.clock_type == GPR_TIMESPAN) { - return gpr_time_add(gpr_now(clock_type), t); - } +std::ostream& operator<<(std::ostream& out, Timestamp timestamp) { + return out << timestamp.ToString(); +} - // If the given input hits this code, the same result is not guaranteed for - // the same input because it relies on `gpr_now` to calculate the difference - // between two different clocks. Please be careful when you want to use this - // function in unit tests. (e.g. https://github.com/grpc/grpc/pull/22655) - return gpr_time_add(gpr_now(clock_type), - gpr_time_sub(t, gpr_now(t.clock_type))); +std::ostream& operator<<(std::ostream& out, Duration duration) { + return out << duration.ToString(); } + +} // namespace grpc_core diff --git a/src/core/lib/gprpp/time.h b/src/core/util/time.h similarity index 99% rename from src/core/lib/gprpp/time.h rename to src/core/util/time.h index 8f1c65cfa34..cf242eba1cb 100644 --- a/src/core/lib/gprpp/time.h +++ b/src/core/util/time.h @@ -12,8 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef GRPC_SRC_CORE_LIB_GPRPP_TIME_H -#define GRPC_SRC_CORE_LIB_GPRPP_TIME_H +#ifndef GRPC_SRC_CORE_UTIL_TIME_H +#define GRPC_SRC_CORE_UTIL_TIME_H + +#include #include @@ -24,7 +26,6 @@ #include "absl/types/optional.h" #include -#include #include #include "src/core/util/time_precise.h" @@ -384,4 +385,4 @@ void TestOnlySetProcessEpoch(gpr_timespec epoch); } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_GPRPP_TIME_H +#endif // GRPC_SRC_CORE_UTIL_TIME_H diff --git a/src/core/lib/gprpp/time_averaged_stats.cc b/src/core/util/time_averaged_stats.cc similarity index 97% rename from src/core/lib/gprpp/time_averaged_stats.cc rename to src/core/util/time_averaged_stats.cc index 55f65397b79..dc6db49a011 100644 --- a/src/core/lib/gprpp/time_averaged_stats.cc +++ b/src/core/util/time_averaged_stats.cc @@ -16,10 +16,10 @@ // // -#include "src/core/lib/gprpp/time_averaged_stats.h" - #include +#include "src/core/util/time_averaged_stats.h" + namespace grpc_core { TimeAveragedStats::TimeAveragedStats(double init_avg, double regress_weight, diff --git a/src/core/lib/gprpp/time_averaged_stats.h b/src/core/util/time_averaged_stats.h similarity index 95% rename from src/core/lib/gprpp/time_averaged_stats.h rename to src/core/util/time_averaged_stats.h index cdd10a24afa..8f0c2c44989 100644 --- a/src/core/lib/gprpp/time_averaged_stats.h +++ b/src/core/util/time_averaged_stats.h @@ -16,8 +16,8 @@ // // -#ifndef GRPC_SRC_CORE_LIB_GPRPP_TIME_AVERAGED_STATS_H -#define GRPC_SRC_CORE_LIB_GPRPP_TIME_AVERAGED_STATS_H +#ifndef GRPC_SRC_CORE_UTIL_TIME_AVERAGED_STATS_H +#define GRPC_SRC_CORE_UTIL_TIME_AVERAGED_STATS_H namespace grpc_core { @@ -76,4 +76,4 @@ class TimeAveragedStats { } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_GPRPP_TIME_AVERAGED_STATS_H +#endif // GRPC_SRC_CORE_UTIL_TIME_AVERAGED_STATS_H diff --git a/src/core/util/time_precise.cc b/src/core/util/time_precise.cc index 8e5de7b5334..5274789c70e 100644 --- a/src/core/util/time_precise.cc +++ b/src/core/util/time_precise.cc @@ -29,7 +29,7 @@ #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "src/core/util/time_precise.h" #ifndef GPR_CYCLE_COUNTER_CUSTOM diff --git a/src/core/lib/gprpp/time_util.cc b/src/core/util/time_util.cc similarity index 98% rename from src/core/lib/gprpp/time_util.cc rename to src/core/util/time_util.cc index 94ca4e08d88..4730e79184a 100644 --- a/src/core/lib/gprpp/time_util.cc +++ b/src/core/util/time_util.cc @@ -14,14 +14,15 @@ // limitations under the License. // -#include "src/core/lib/gprpp/time_util.h" +#include + +#include "src/core/util/time_util.h" #include #include #include "absl/log/check.h" -#include #include namespace grpc_core { diff --git a/src/core/lib/gprpp/time_util.h b/src/core/util/time_util.h similarity index 89% rename from src/core/lib/gprpp/time_util.h rename to src/core/util/time_util.h index 665eeafb649..61ad6d11a5b 100644 --- a/src/core/lib/gprpp/time_util.h +++ b/src/core/util/time_util.h @@ -14,12 +14,13 @@ // limitations under the License. // -#ifndef GRPC_SRC_CORE_LIB_GPRPP_TIME_UTIL_H -#define GRPC_SRC_CORE_LIB_GPRPP_TIME_UTIL_H +#ifndef GRPC_SRC_CORE_UTIL_TIME_UTIL_H +#define GRPC_SRC_CORE_UTIL_TIME_UTIL_H + +#include #include "absl/time/time.h" -#include #include namespace grpc_core { @@ -38,4 +39,4 @@ absl::Time ToAbslTime(gpr_timespec ts); } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_GPRPP_TIME_UTIL_H +#endif // GRPC_SRC_CORE_UTIL_TIME_UTIL_H diff --git a/src/core/lib/gprpp/type_list.h b/src/core/util/type_list.h similarity index 86% rename from src/core/lib/gprpp/type_list.h rename to src/core/util/type_list.h index 958a733ba70..c0a9161c087 100644 --- a/src/core/lib/gprpp/type_list.h +++ b/src/core/util/type_list.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef GRPC_SRC_CORE_LIB_GPRPP_TYPE_LIST_H -#define GRPC_SRC_CORE_LIB_GPRPP_TYPE_LIST_H +#ifndef GRPC_SRC_CORE_UTIL_TYPE_LIST_H +#define GRPC_SRC_CORE_UTIL_TYPE_LIST_H namespace grpc_core { @@ -29,4 +29,4 @@ struct Typelist { } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_GPRPP_TYPE_LIST_H +#endif // GRPC_SRC_CORE_UTIL_TYPE_LIST_H diff --git a/src/core/lib/gprpp/unique_type_name.h b/src/core/util/unique_type_name.h similarity index 95% rename from src/core/lib/gprpp/unique_type_name.h rename to src/core/util/unique_type_name.h index 4fc7c75ed4b..29e63d8404f 100644 --- a/src/core/lib/gprpp/unique_type_name.h +++ b/src/core/util/unique_type_name.h @@ -14,15 +14,15 @@ // limitations under the License. // -#ifndef GRPC_SRC_CORE_LIB_GPRPP_UNIQUE_TYPE_NAME_H -#define GRPC_SRC_CORE_LIB_GPRPP_UNIQUE_TYPE_NAME_H +#ifndef GRPC_SRC_CORE_UTIL_UNIQUE_TYPE_NAME_H +#define GRPC_SRC_CORE_UTIL_UNIQUE_TYPE_NAME_H + +#include #include #include "absl/strings/string_view.h" -#include - #include "src/core/util/useful.h" // Provides a type name that is unique by instance rather than by @@ -121,4 +121,4 @@ UniqueTypeName UniqueTypeNameFor() { return factory.Create(); \ }()) -#endif // GRPC_SRC_CORE_LIB_GPRPP_UNIQUE_TYPE_NAME_H +#endif // GRPC_SRC_CORE_UTIL_UNIQUE_TYPE_NAME_H diff --git a/src/core/lib/uri/uri_parser.cc b/src/core/util/uri.cc similarity index 99% rename from src/core/lib/uri/uri_parser.cc rename to src/core/util/uri.cc index 95d92663194..82fb29d46e1 100644 --- a/src/core/lib/uri/uri_parser.cc +++ b/src/core/util/uri.cc @@ -14,7 +14,9 @@ // limitations under the License. // -#include "src/core/lib/uri/uri_parser.h" +#include + +#include "src/core/util/uri.h" #include #include @@ -36,8 +38,6 @@ #include "absl/strings/str_split.h" #include "absl/strings/strip.h" -#include - namespace grpc_core { namespace { diff --git a/src/core/lib/uri/uri_parser.h b/src/core/util/uri.h similarity index 96% rename from src/core/lib/uri/uri_parser.h rename to src/core/util/uri.h index 2768bae179f..14e9274eaa8 100644 --- a/src/core/lib/uri/uri_parser.h +++ b/src/core/util/uri.h @@ -14,8 +14,10 @@ // limitations under the License. // -#ifndef GRPC_SRC_CORE_LIB_URI_URI_PARSER_H -#define GRPC_SRC_CORE_LIB_URI_URI_PARSER_H +#ifndef GRPC_SRC_CORE_UTIL_URI_H +#define GRPC_SRC_CORE_UTIL_URI_H + +#include #include #include @@ -24,8 +26,6 @@ #include "absl/status/statusor.h" #include "absl/strings/string_view.h" -#include - namespace grpc_core { class URI { @@ -98,4 +98,4 @@ class URI { }; } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_URI_URI_PARSER_H +#endif // GRPC_SRC_CORE_UTIL_URI_H diff --git a/src/core/lib/gprpp/uuid_v4.cc b/src/core/util/uuid_v4.cc similarity index 96% rename from src/core/lib/gprpp/uuid_v4.cc rename to src/core/util/uuid_v4.cc index 23297a34c05..b0847a8d33e 100644 --- a/src/core/lib/gprpp/uuid_v4.cc +++ b/src/core/util/uuid_v4.cc @@ -16,11 +16,11 @@ // // -#include "src/core/lib/gprpp/uuid_v4.h" +#include -#include "absl/strings/str_format.h" +#include "src/core/util/uuid_v4.h" -#include +#include "absl/strings/str_format.h" namespace grpc_core { diff --git a/src/core/lib/gprpp/uuid_v4.h b/src/core/util/uuid_v4.h similarity index 87% rename from src/core/lib/gprpp/uuid_v4.h rename to src/core/util/uuid_v4.h index 32264005b75..e7bf52c6409 100644 --- a/src/core/lib/gprpp/uuid_v4.h +++ b/src/core/util/uuid_v4.h @@ -16,15 +16,15 @@ // // -#ifndef GRPC_SRC_CORE_LIB_GPRPP_UUID_V4_H -#define GRPC_SRC_CORE_LIB_GPRPP_UUID_V4_H +#ifndef GRPC_SRC_CORE_UTIL_UUID_V4_H +#define GRPC_SRC_CORE_UTIL_UUID_V4_H + +#include #include #include -#include - namespace grpc_core { // Generates string in the UUIDv4 form. \a hi and \a lo are expected to be @@ -33,4 +33,4 @@ std::string GenerateUUIDv4(uint64_t hi, uint64_t lo); } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_GPRPP_UUID_V4_H +#endif // GRPC_SRC_CORE_UTIL_UUID_V4_H diff --git a/src/core/lib/gprpp/validation_errors.cc b/src/core/util/validation_errors.cc similarity index 97% rename from src/core/lib/gprpp/validation_errors.cc rename to src/core/util/validation_errors.cc index 84d8d75a2fb..047ea420161 100644 --- a/src/core/lib/gprpp/validation_errors.cc +++ b/src/core/util/validation_errors.cc @@ -12,7 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/core/lib/gprpp/validation_errors.h" +#include + +#include "src/core/util/validation_errors.h" #include @@ -24,8 +26,6 @@ #include "absl/strings/str_join.h" #include "absl/strings/strip.h" -#include - namespace grpc_core { void ValidationErrors::PushField(absl::string_view ext) { diff --git a/src/core/lib/gprpp/validation_errors.h b/src/core/util/validation_errors.h similarity index 96% rename from src/core/lib/gprpp/validation_errors.h rename to src/core/util/validation_errors.h index 34a299b2ca8..5c075c12cce 100644 --- a/src/core/lib/gprpp/validation_errors.h +++ b/src/core/util/validation_errors.h @@ -12,8 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef GRPC_SRC_CORE_LIB_GPRPP_VALIDATION_ERRORS_H -#define GRPC_SRC_CORE_LIB_GPRPP_VALIDATION_ERRORS_H +#ifndef GRPC_SRC_CORE_UTIL_VALIDATION_ERRORS_H +#define GRPC_SRC_CORE_UTIL_VALIDATION_ERRORS_H + +#include #include @@ -25,8 +27,6 @@ #include "absl/status/status.h" #include "absl/strings/string_view.h" -#include - namespace grpc_core { // Tracks errors that occur during validation of a data structure (e.g., @@ -142,4 +142,4 @@ class ValidationErrors { } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_GPRPP_VALIDATION_ERRORS_H +#endif // GRPC_SRC_CORE_UTIL_VALIDATION_ERRORS_H diff --git a/src/core/util/windows/cpu.cc b/src/core/util/windows/cpu.cc index a8ba5952f88..fcc1bd260dc 100644 --- a/src/core/util/windows/cpu.cc +++ b/src/core/util/windows/cpu.cc @@ -21,7 +21,7 @@ #ifdef GPR_WINDOWS #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" unsigned gpr_cpu_num_cores(void) { SYSTEM_INFO si; diff --git a/src/core/lib/gprpp/windows/directory_reader.cc b/src/core/util/windows/directory_reader.cc similarity index 97% rename from src/core/lib/gprpp/windows/directory_reader.cc rename to src/core/util/windows/directory_reader.cc index 2deedb8ca5a..02c7916798c 100644 --- a/src/core/lib/gprpp/windows/directory_reader.cc +++ b/src/core/util/windows/directory_reader.cc @@ -30,7 +30,8 @@ #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" -#include "src/core/lib/gprpp/directory_reader.h" +#include "src/core/util/directory_reader.h" + namespace grpc_core { namespace { diff --git a/src/core/lib/gprpp/windows/env.cc b/src/core/util/windows/env.cc similarity index 95% rename from src/core/lib/gprpp/windows/env.cc rename to src/core/util/windows/env.cc index 4390d202e01..4bbccb2cd34 100644 --- a/src/core/lib/gprpp/windows/env.cc +++ b/src/core/util/windows/env.cc @@ -24,8 +24,8 @@ #include -#include "src/core/lib/gprpp/env.h" -#include "src/core/lib/gprpp/tchar.h" +#include "src/core/util/env.h" +#include "src/core/util/tchar.h" namespace grpc_core { diff --git a/src/core/lib/gprpp/windows/stat.cc b/src/core/util/windows/stat.cc similarity index 92% rename from src/core/lib/gprpp/windows/stat.cc rename to src/core/util/windows/stat.cc index aa1017a1d4a..8a08d087a5e 100644 --- a/src/core/lib/gprpp/windows/stat.cc +++ b/src/core/util/windows/stat.cc @@ -25,9 +25,9 @@ #include "absl/log/check.h" #include "absl/log/log.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/stat.h" -#include "src/core/lib/gprpp/strerror.h" +#include "src/core/util/crash.h" +#include "src/core/util/stat.h" +#include "src/core/util/strerror.h" namespace grpc_core { diff --git a/src/core/util/windows/string_util.cc b/src/core/util/windows/string_util.cc index c39152e6037..105ce0636c9 100644 --- a/src/core/util/windows/string_util.cc +++ b/src/core/util/windows/string_util.cc @@ -36,8 +36,8 @@ #include #include -#include "src/core/lib/gprpp/tchar.h" #include "src/core/util/string.h" +#include "src/core/util/tchar.h" char* gpr_format_message(int messageid) { LPTSTR tmessage; diff --git a/src/core/util/windows/sync.cc b/src/core/util/windows/sync.cc index 0f7fd78868d..84c06503e2f 100644 --- a/src/core/util/windows/sync.cc +++ b/src/core/util/windows/sync.cc @@ -28,7 +28,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" void gpr_mu_init(gpr_mu* mu) { InitializeCriticalSection(&mu->cs); diff --git a/src/core/lib/gprpp/windows/thd.cc b/src/core/util/windows/thd.cc similarity index 97% rename from src/core/lib/gprpp/windows/thd.cc rename to src/core/util/windows/thd.cc index 1e754e916b9..0423e21baa2 100644 --- a/src/core/lib/gprpp/windows/thd.cc +++ b/src/core/util/windows/thd.cc @@ -31,9 +31,9 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/memory.h" -#include "src/core/lib/gprpp/thd.h" +#include "src/core/util/crash.h" +#include "src/core/util/memory.h" +#include "src/core/util/thd.h" namespace { class ThreadInternalsWindows; diff --git a/src/core/util/windows/time.cc b/src/core/util/windows/time.cc index 21cfed52a13..62151a2b6a5 100644 --- a/src/core/util/windows/time.cc +++ b/src/core/util/windows/time.cc @@ -30,7 +30,7 @@ #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "src/core/util/time_precise.h" static LARGE_INTEGER g_start_time = []() { diff --git a/src/core/util/windows/tmpfile.cc b/src/core/util/windows/tmpfile.cc index 23d647a2b8e..44119406582 100644 --- a/src/core/util/windows/tmpfile.cc +++ b/src/core/util/windows/tmpfile.cc @@ -28,8 +28,8 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/tchar.h" +#include "src/core/util/crash.h" +#include "src/core/util/tchar.h" #include "src/core/util/tmpfile.h" FILE* gpr_tmpfile(const char* prefix, char** tmp_filename_out) { diff --git a/src/core/lib/gprpp/work_serializer.cc b/src/core/util/work_serializer.cc similarity index 98% rename from src/core/lib/gprpp/work_serializer.cc rename to src/core/util/work_serializer.cc index 16ed3fd6e68..35c509f5828 100644 --- a/src/core/lib/gprpp/work_serializer.cc +++ b/src/core/util/work_serializer.cc @@ -14,7 +14,9 @@ // limitations under the License. // -#include "src/core/lib/gprpp/work_serializer.h" +#include + +#include "src/core/util/work_serializer.h" #include @@ -31,18 +33,17 @@ #include "absl/log/log.h" #include -#include #include "src/core/lib/debug/trace.h" #include "src/core/lib/experiments/experiments.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/mpscq.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/sync.h" #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/debug_location.h" #include "src/core/util/latent_see.h" +#include "src/core/util/mpscq.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/sync.h" namespace grpc_core { diff --git a/src/core/lib/gprpp/work_serializer.h b/src/core/util/work_serializer.h similarity index 94% rename from src/core/lib/gprpp/work_serializer.h rename to src/core/util/work_serializer.h index 677c97ad380..780fa4fb05e 100644 --- a/src/core/lib/gprpp/work_serializer.h +++ b/src/core/util/work_serializer.h @@ -14,8 +14,10 @@ // limitations under the License. // -#ifndef GRPC_SRC_CORE_LIB_GPRPP_WORK_SERIALIZER_H -#define GRPC_SRC_CORE_LIB_GPRPP_WORK_SERIALIZER_H +#ifndef GRPC_SRC_CORE_UTIL_WORK_SERIALIZER_H +#define GRPC_SRC_CORE_UTIL_WORK_SERIALIZER_H + +#include #include #include @@ -23,10 +25,9 @@ #include "absl/base/thread_annotations.h" #include -#include -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/orphanable.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/orphanable.h" namespace grpc_core { @@ -103,4 +104,4 @@ class ABSL_LOCKABLE WorkSerializer { } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_GPRPP_WORK_SERIALIZER_H +#endif // GRPC_SRC_CORE_UTIL_WORK_SERIALIZER_H diff --git a/src/core/lib/gprpp/xxhash_inline.h b/src/core/util/xxhash_inline.h similarity index 86% rename from src/core/lib/gprpp/xxhash_inline.h rename to src/core/util/xxhash_inline.h index 6b12c711216..ea5565ac3b6 100644 --- a/src/core/lib/gprpp/xxhash_inline.h +++ b/src/core/util/xxhash_inline.h @@ -14,8 +14,8 @@ // limitations under the License. // -#ifndef GRPC_SRC_CORE_LIB_GPRPP_XXHASH_INLINE_H -#define GRPC_SRC_CORE_LIB_GPRPP_XXHASH_INLINE_H +#ifndef GRPC_SRC_CORE_UTIL_XXHASH_INLINE_H +#define GRPC_SRC_CORE_UTIL_XXHASH_INLINE_H #include @@ -26,4 +26,4 @@ #define XXH_INLINE_ALL #include "xxhash.h" -#endif // GRPC_SRC_CORE_LIB_GPRPP_XXHASH_INLINE_H +#endif // GRPC_SRC_CORE_UTIL_XXHASH_INLINE_H diff --git a/src/core/xds/grpc/certificate_provider_store.h b/src/core/xds/grpc/certificate_provider_store.h index f2a3b944c94..239d5ca74af 100644 --- a/src/core/xds/grpc/certificate_provider_store.h +++ b/src/core/xds/grpc/certificate_provider_store.h @@ -29,18 +29,18 @@ #include #include -#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/gprpp/unique_type_name.h" -#include "src/core/lib/gprpp/validation_errors.h" #include "src/core/lib/security/certificate_provider/certificate_provider_factory.h" #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.h" #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.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" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" +#include "src/core/util/unique_type_name.h" #include "src/core/util/useful.h" +#include "src/core/util/validation_errors.h" namespace grpc_core { diff --git a/src/core/xds/grpc/file_watcher_certificate_provider_factory.h b/src/core/xds/grpc/file_watcher_certificate_provider_factory.h index 0306dbe4370..493e993648c 100644 --- a/src/core/xds/grpc/file_watcher_certificate_provider_factory.h +++ b/src/core/xds/grpc/file_watcher_certificate_provider_factory.h @@ -26,13 +26,13 @@ #include #include -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/time.h" -#include "src/core/lib/gprpp/validation_errors.h" #include "src/core/lib/security/certificate_provider/certificate_provider_factory.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" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" +#include "src/core/util/validation_errors.h" namespace grpc_core { diff --git a/src/core/xds/grpc/xds_audit_logger_registry.cc b/src/core/xds/grpc/xds_audit_logger_registry.cc index 7ec3a98edf1..ef041a4c933 100644 --- a/src/core/xds/grpc/xds_audit_logger_registry.cc +++ b/src/core/xds/grpc/xds_audit_logger_registry.cc @@ -28,9 +28,9 @@ #include -#include "src/core/lib/gprpp/match.h" -#include "src/core/lib/gprpp/validation_errors.h" #include "src/core/lib/security/authorization/audit_logging.h" +#include "src/core/util/match.h" +#include "src/core/util/validation_errors.h" #include "src/core/xds/grpc/xds_common_types.h" #include "src/core/xds/grpc/xds_common_types_parser.h" diff --git a/src/core/xds/grpc/xds_audit_logger_registry.h b/src/core/xds/grpc/xds_audit_logger_registry.h index 5e8ec0a2e5e..92f7aadd302 100644 --- a/src/core/xds/grpc/xds_audit_logger_registry.h +++ b/src/core/xds/grpc/xds_audit_logger_registry.h @@ -25,8 +25,8 @@ #include -#include "src/core/lib/gprpp/validation_errors.h" #include "src/core/util/json/json.h" +#include "src/core/util/validation_errors.h" #include "src/core/xds/xds_client/xds_resource_type.h" namespace grpc_core { diff --git a/src/core/xds/grpc/xds_bootstrap_grpc.cc b/src/core/xds/grpc/xds_bootstrap_grpc.cc index 87b3541ced6..34fbd8f1331 100644 --- a/src/core/xds/grpc/xds_bootstrap_grpc.cc +++ b/src/core/xds/grpc/xds_bootstrap_grpc.cc @@ -34,11 +34,12 @@ #include #include -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_object_loader.h" #include "src/core/util/json/json_reader.h" #include "src/core/util/json/json_writer.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/string.h" namespace grpc_core { diff --git a/src/core/xds/grpc/xds_bootstrap_grpc.h b/src/core/xds/grpc/xds_bootstrap_grpc.h index 24c47e2eccb..ba13d2bddf3 100644 --- a/src/core/xds/grpc/xds_bootstrap_grpc.h +++ b/src/core/xds/grpc/xds_bootstrap_grpc.h @@ -28,10 +28,11 @@ #include -#include "src/core/lib/gprpp/validation_errors.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" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/validation_errors.h" #include "src/core/xds/grpc/certificate_provider_store.h" #include "src/core/xds/grpc/xds_audit_logger_registry.h" #include "src/core/xds/grpc/xds_cluster_specifier_plugin.h" diff --git a/src/core/xds/grpc/xds_certificate_provider.h b/src/core/xds/grpc/xds_certificate_provider.h index 6c64de04571..52b535af2db 100644 --- a/src/core/xds/grpc/xds_certificate_provider.h +++ b/src/core/xds/grpc/xds_certificate_provider.h @@ -31,12 +31,12 @@ #include #include -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/unique_type_name.h" -#include "src/core/lib/matchers/matchers.h" #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.h" #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h" +#include "src/core/util/matchers.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" +#include "src/core/util/unique_type_name.h" #include "src/core/util/useful.h" namespace grpc_core { diff --git a/src/core/xds/grpc/xds_client_grpc.cc b/src/core/xds/grpc/xds_client_grpc.cc index e3092c16f42..81425bb5d21 100644 --- a/src/core/xds/grpc/xds_client_grpc.cc +++ b/src/core/xds/grpc/xds_client_grpc.cc @@ -43,19 +43,19 @@ #include "src/core/lib/debug/trace.h" #include "src/core/lib/event_engine/channel_args_endpoint_config.h" #include "src/core/lib/event_engine/default_event_engine.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/env.h" -#include "src/core/lib/gprpp/load_file.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/gprpp/time.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/transport/error_utils.h" #include "src/core/telemetry/metrics.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/env.h" +#include "src/core/util/load_file.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.h" #include "src/core/util/upb_utils.h" #include "src/core/xds/grpc/xds_bootstrap_grpc.h" #include "src/core/xds/grpc/xds_transport_grpc.h" diff --git a/src/core/xds/grpc/xds_client_grpc.h b/src/core/xds/grpc/xds_client_grpc.h index babfbf4bc37..3093bcab198 100644 --- a/src/core/xds/grpc/xds_client_grpc.h +++ b/src/core/xds/grpc/xds_client_grpc.h @@ -26,11 +26,11 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/iomgr/iomgr_fwd.h" #include "src/core/resolver/endpoint_addresses.h" #include "src/core/telemetry/metrics.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" #include "src/core/util/useful.h" #include "src/core/xds/grpc/certificate_provider_store.h" #include "src/core/xds/grpc/xds_bootstrap_grpc.h" diff --git a/src/core/xds/grpc/xds_cluster.cc b/src/core/xds/grpc/xds_cluster.cc index 1f0c6b05cbf..1de3379682e 100644 --- a/src/core/xds/grpc/xds_cluster.cc +++ b/src/core/xds/grpc/xds_cluster.cc @@ -19,9 +19,9 @@ #include "absl/strings/str_cat.h" #include "absl/strings/str_join.h" -#include "src/core/lib/gprpp/match.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/util/json/json_writer.h" +#include "src/core/util/match.h" +#include "src/core/util/time.h" #include "src/core/xds/grpc/xds_common_types.h" namespace grpc_core { diff --git a/src/core/xds/grpc/xds_cluster_parser.cc b/src/core/xds/grpc/xds_cluster_parser.cc index bcf07881f4c..53a88d6ef9a 100644 --- a/src/core/xds/grpc/xds_cluster_parser.cc +++ b/src/core/xds/grpc/xds_cluster_parser.cc @@ -49,11 +49,11 @@ #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/host_port.h" -#include "src/core/lib/gprpp/time.h" -#include "src/core/lib/gprpp/validation_errors.h" #include "src/core/load_balancing/lb_policy_registry.h" +#include "src/core/util/host_port.h" +#include "src/core/util/time.h" #include "src/core/util/upb_utils.h" +#include "src/core/util/validation_errors.h" #include "src/core/xds/grpc/xds_bootstrap_grpc.h" #include "src/core/xds/grpc/xds_common_types.h" #include "src/core/xds/grpc/xds_common_types_parser.h" diff --git a/src/core/xds/grpc/xds_cluster_specifier_plugin.h b/src/core/xds/grpc/xds_cluster_specifier_plugin.h index 8aa245fa125..4735ab749bc 100644 --- a/src/core/xds/grpc/xds_cluster_specifier_plugin.h +++ b/src/core/xds/grpc/xds_cluster_specifier_plugin.h @@ -27,8 +27,8 @@ #include -#include "src/core/lib/gprpp/validation_errors.h" #include "src/core/util/json/json.h" +#include "src/core/util/validation_errors.h" #include "src/core/xds/grpc/xds_common_types.h" namespace grpc_core { diff --git a/src/core/xds/grpc/xds_common_types.cc b/src/core/xds/grpc/xds_common_types.cc index bb169304c68..f1a84590602 100644 --- a/src/core/xds/grpc/xds_common_types.cc +++ b/src/core/xds/grpc/xds_common_types.cc @@ -20,7 +20,7 @@ #include "absl/strings/str_format.h" #include "absl/strings/str_join.h" -#include "src/core/lib/gprpp/match.h" +#include "src/core/util/match.h" namespace grpc_core { diff --git a/src/core/xds/grpc/xds_common_types.h b/src/core/xds/grpc/xds_common_types.h index 2b0c746a5d1..5bd838f1b77 100644 --- a/src/core/xds/grpc/xds_common_types.h +++ b/src/core/xds/grpc/xds_common_types.h @@ -23,9 +23,9 @@ #include "absl/strings/string_view.h" #include "absl/types/variant.h" -#include "src/core/lib/gprpp/validation_errors.h" -#include "src/core/lib/matchers/matchers.h" #include "src/core/util/json/json.h" +#include "src/core/util/matchers.h" +#include "src/core/util/validation_errors.h" namespace grpc_core { diff --git a/src/core/xds/grpc/xds_common_types_parser.cc b/src/core/xds/grpc/xds_common_types_parser.cc index 8b617a6143d..8470b87d6b1 100644 --- a/src/core/xds/grpc/xds_common_types_parser.cc +++ b/src/core/xds/grpc/xds_common_types_parser.cc @@ -44,7 +44,7 @@ #include #include -#include "src/core/lib/gprpp/env.h" +#include "src/core/util/env.h" #include "src/core/util/json/json_reader.h" #include "src/core/util/upb_utils.h" #include "src/core/xds/grpc/xds_bootstrap_grpc.h" diff --git a/src/core/xds/grpc/xds_common_types_parser.h b/src/core/xds/grpc/xds_common_types_parser.h index 4d145394166..0db17b5f847 100644 --- a/src/core/xds/grpc/xds_common_types_parser.h +++ b/src/core/xds/grpc/xds_common_types_parser.h @@ -24,8 +24,8 @@ #include "google/protobuf/struct.upb.h" #include "google/protobuf/wrappers.upb.h" -#include "src/core/lib/gprpp/time.h" -#include "src/core/lib/gprpp/validation_errors.h" +#include "src/core/util/time.h" +#include "src/core/util/validation_errors.h" #include "src/core/xds/grpc/xds_common_types.h" #include "src/core/xds/xds_client/xds_resource_type.h" diff --git a/src/core/xds/grpc/xds_endpoint.h b/src/core/xds/grpc/xds_endpoint.h index e0bbc7c3934..191a3b73b42 100644 --- a/src/core/xds/grpc/xds_endpoint.h +++ b/src/core/xds/grpc/xds_endpoint.h @@ -25,10 +25,10 @@ #include "absl/base/thread_annotations.h" #include "absl/random/random.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" #include "src/core/resolver/endpoint_addresses.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" #include "src/core/xds/xds_client/xds_client_stats.h" #include "src/core/xds/xds_client/xds_resource_type.h" #include "src/core/xds/xds_client/xds_resource_type_impl.h" diff --git a/src/core/xds/grpc/xds_endpoint_parser.cc b/src/core/xds/grpc/xds_endpoint_parser.cc index 011a739c4a1..bc11c1651e4 100644 --- a/src/core/xds/grpc/xds_endpoint_parser.cc +++ b/src/core/xds/grpc/xds_endpoint_parser.cc @@ -47,11 +47,11 @@ #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/env.h" -#include "src/core/lib/gprpp/validation_errors.h" #include "src/core/lib/iomgr/resolved_address.h" +#include "src/core/util/env.h" #include "src/core/util/string.h" #include "src/core/util/upb_utils.h" +#include "src/core/util/validation_errors.h" #include "src/core/xds/grpc/xds_common_types_parser.h" #include "src/core/xds/grpc/xds_health_status.h" #include "src/core/xds/xds_client/xds_resource_type.h" diff --git a/src/core/xds/grpc/xds_http_fault_filter.cc b/src/core/xds/grpc/xds_http_fault_filter.cc index 6bc74df8203..bf078f9d0d0 100644 --- a/src/core/xds/grpc/xds_http_fault_filter.cc +++ b/src/core/xds/grpc/xds_http_fault_filter.cc @@ -39,11 +39,11 @@ #include "src/core/ext/filters/fault_injection/fault_injection_service_config_parser.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/status_util.h" -#include "src/core/lib/gprpp/time.h" -#include "src/core/lib/gprpp/validation_errors.h" #include "src/core/lib/transport/status_conversion.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_writer.h" +#include "src/core/util/time.h" +#include "src/core/util/validation_errors.h" #include "src/core/xds/grpc/xds_common_types.h" #include "src/core/xds/grpc/xds_common_types_parser.h" #include "src/core/xds/grpc/xds_http_filter.h" diff --git a/src/core/xds/grpc/xds_http_fault_filter.h b/src/core/xds/grpc/xds_http_fault_filter.h index c269ff17f05..d36b7761e17 100644 --- a/src/core/xds/grpc/xds_http_fault_filter.h +++ b/src/core/xds/grpc/xds_http_fault_filter.h @@ -26,7 +26,7 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_fwd.h" -#include "src/core/lib/gprpp/validation_errors.h" +#include "src/core/util/validation_errors.h" #include "src/core/xds/grpc/xds_common_types.h" #include "src/core/xds/grpc/xds_http_filter.h" #include "src/core/xds/xds_client/xds_resource_type.h" diff --git a/src/core/xds/grpc/xds_http_filter.h b/src/core/xds/grpc/xds_http_filter.h index 8a9c54c6ef8..888b5db75b0 100644 --- a/src/core/xds/grpc/xds_http_filter.h +++ b/src/core/xds/grpc/xds_http_filter.h @@ -27,10 +27,10 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_fwd.h" -#include "src/core/lib/gprpp/validation_errors.h" #include "src/core/lib/transport/interception_chain.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_writer.h" +#include "src/core/util/validation_errors.h" #include "src/core/xds/grpc/xds_common_types.h" #include "src/core/xds/xds_client/xds_resource_type.h" diff --git a/src/core/xds/grpc/xds_http_filter_registry.h b/src/core/xds/grpc/xds_http_filter_registry.h index 37950d01f15..79547d35d86 100644 --- a/src/core/xds/grpc/xds_http_filter_registry.h +++ b/src/core/xds/grpc/xds_http_filter_registry.h @@ -30,8 +30,8 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_fwd.h" -#include "src/core/lib/gprpp/validation_errors.h" #include "src/core/lib/transport/interception_chain.h" +#include "src/core/util/validation_errors.h" #include "src/core/xds/grpc/xds_common_types.h" #include "src/core/xds/grpc/xds_http_filter.h" #include "src/core/xds/xds_client/xds_resource_type.h" diff --git a/src/core/xds/grpc/xds_http_gcp_authn_filter.cc b/src/core/xds/grpc/xds_http_gcp_authn_filter.cc index 3378284c9c2..72e964fe74a 100644 --- a/src/core/xds/grpc/xds_http_gcp_authn_filter.cc +++ b/src/core/xds/grpc/xds_http_gcp_authn_filter.cc @@ -30,9 +30,9 @@ #include "src/core/ext/filters/gcp_authentication/gcp_authentication_filter.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/gprpp/validation_errors.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_writer.h" +#include "src/core/util/validation_errors.h" #include "src/core/xds/grpc/xds_common_types.h" #include "src/core/xds/grpc/xds_common_types_parser.h" #include "src/core/xds/grpc/xds_http_filter.h" diff --git a/src/core/xds/grpc/xds_http_gcp_authn_filter.h b/src/core/xds/grpc/xds_http_gcp_authn_filter.h index 662e2c456a7..5a015e2ad81 100644 --- a/src/core/xds/grpc/xds_http_gcp_authn_filter.h +++ b/src/core/xds/grpc/xds_http_gcp_authn_filter.h @@ -24,7 +24,7 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_fwd.h" -#include "src/core/lib/gprpp/validation_errors.h" +#include "src/core/util/validation_errors.h" #include "src/core/xds/grpc/xds_common_types.h" #include "src/core/xds/grpc/xds_http_filter.h" #include "src/core/xds/xds_client/xds_resource_type.h" diff --git a/src/core/xds/grpc/xds_http_rbac_filter.cc b/src/core/xds/grpc/xds_http_rbac_filter.cc index 4508ae41b9b..381a2c31fdb 100644 --- a/src/core/xds/grpc/xds_http_rbac_filter.cc +++ b/src/core/xds/grpc/xds_http_rbac_filter.cc @@ -46,7 +46,7 @@ #include "src/core/ext/filters/rbac/rbac_filter.h" #include "src/core/ext/filters/rbac/rbac_service_config_parser.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/env.h" +#include "src/core/util/env.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_writer.h" #include "src/core/util/string.h" diff --git a/src/core/xds/grpc/xds_http_rbac_filter.h b/src/core/xds/grpc/xds_http_rbac_filter.h index c7550575b72..47a0f01c33c 100644 --- a/src/core/xds/grpc/xds_http_rbac_filter.h +++ b/src/core/xds/grpc/xds_http_rbac_filter.h @@ -26,7 +26,7 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_fwd.h" -#include "src/core/lib/gprpp/validation_errors.h" +#include "src/core/util/validation_errors.h" #include "src/core/xds/grpc/xds_common_types.h" #include "src/core/xds/grpc/xds_http_filter.h" #include "src/core/xds/xds_client/xds_resource_type.h" diff --git a/src/core/xds/grpc/xds_http_stateful_session_filter.cc b/src/core/xds/grpc/xds_http_stateful_session_filter.cc index 8216d51ad06..a1442a1f392 100644 --- a/src/core/xds/grpc/xds_http_stateful_session_filter.cc +++ b/src/core/xds/grpc/xds_http_stateful_session_filter.cc @@ -35,11 +35,11 @@ #include "src/core/ext/filters/stateful_session/stateful_session_filter.h" #include "src/core/ext/filters/stateful_session/stateful_session_service_config_parser.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/time.h" -#include "src/core/lib/gprpp/validation_errors.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_writer.h" +#include "src/core/util/time.h" #include "src/core/util/upb_utils.h" +#include "src/core/util/validation_errors.h" #include "src/core/xds/grpc/xds_common_types.h" #include "src/core/xds/grpc/xds_common_types_parser.h" #include "src/core/xds/grpc/xds_http_filter.h" diff --git a/src/core/xds/grpc/xds_http_stateful_session_filter.h b/src/core/xds/grpc/xds_http_stateful_session_filter.h index 28df742b6c2..8327a7759f0 100644 --- a/src/core/xds/grpc/xds_http_stateful_session_filter.h +++ b/src/core/xds/grpc/xds_http_stateful_session_filter.h @@ -26,7 +26,7 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_fwd.h" -#include "src/core/lib/gprpp/validation_errors.h" +#include "src/core/util/validation_errors.h" #include "src/core/xds/grpc/xds_common_types.h" #include "src/core/xds/grpc/xds_http_filter.h" #include "src/core/xds/xds_client/xds_resource_type.h" diff --git a/src/core/xds/grpc/xds_lb_policy_registry.cc b/src/core/xds/grpc/xds_lb_policy_registry.cc index 67b98058272..f126855eb2b 100644 --- a/src/core/xds/grpc/xds_lb_policy_registry.cc +++ b/src/core/xds/grpc/xds_lb_policy_registry.cc @@ -36,9 +36,9 @@ #include #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/time.h" -#include "src/core/lib/gprpp/validation_errors.h" #include "src/core/load_balancing/lb_policy_registry.h" +#include "src/core/util/time.h" +#include "src/core/util/validation_errors.h" #include "src/core/xds/grpc/xds_common_types.h" #include "src/core/xds/grpc/xds_common_types_parser.h" diff --git a/src/core/xds/grpc/xds_lb_policy_registry.h b/src/core/xds/grpc/xds_lb_policy_registry.h index f184b20a3d9..2396cb8a88d 100644 --- a/src/core/xds/grpc/xds_lb_policy_registry.h +++ b/src/core/xds/grpc/xds_lb_policy_registry.h @@ -25,8 +25,8 @@ #include -#include "src/core/lib/gprpp/validation_errors.h" #include "src/core/util/json/json.h" +#include "src/core/util/validation_errors.h" #include "src/core/xds/xds_client/xds_resource_type.h" namespace grpc_core { diff --git a/src/core/xds/grpc/xds_listener.cc b/src/core/xds/grpc/xds_listener.cc index 46b971d7692..c67483c41a6 100644 --- a/src/core/xds/grpc/xds_listener.cc +++ b/src/core/xds/grpc/xds_listener.cc @@ -21,7 +21,7 @@ #include "absl/strings/str_join.h" #include "src/core/lib/address_utils/sockaddr_utils.h" -#include "src/core/lib/gprpp/match.h" +#include "src/core/util/match.h" namespace grpc_core { diff --git a/src/core/xds/grpc/xds_listener.h b/src/core/xds/grpc/xds_listener.h index f6d49bf3f31..29b51923283 100644 --- a/src/core/xds/grpc/xds_listener.h +++ b/src/core/xds/grpc/xds_listener.h @@ -30,8 +30,8 @@ #include "absl/types/optional.h" #include "absl/types/variant.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/resolved_address.h" +#include "src/core/util/time.h" #include "src/core/xds/grpc/xds_common_types.h" #include "src/core/xds/grpc/xds_http_filter.h" #include "src/core/xds/grpc/xds_route_config.h" diff --git a/src/core/xds/grpc/xds_listener_parser.cc b/src/core/xds/grpc/xds_listener_parser.cc index e16efa43fae..3449b5875da 100644 --- a/src/core/xds/grpc/xds_listener_parser.cc +++ b/src/core/xds/grpc/xds_listener_parser.cc @@ -50,12 +50,11 @@ #include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/host_port.h" -#include "src/core/lib/gprpp/match.h" -#include "src/core/lib/gprpp/validation_errors.h" #include "src/core/lib/iomgr/sockaddr.h" -#include "src/core/lib/matchers/matchers.h" +#include "src/core/util/host_port.h" +#include "src/core/util/match.h" #include "src/core/util/upb_utils.h" +#include "src/core/util/validation_errors.h" #include "src/core/xds/grpc/xds_common_types.h" #include "src/core/xds/grpc/xds_common_types_parser.h" #include "src/core/xds/grpc/xds_route_config_parser.h" diff --git a/src/core/xds/grpc/xds_metadata.h b/src/core/xds/grpc/xds_metadata.h index 4e784d90d25..94857712136 100644 --- a/src/core/xds/grpc/xds_metadata.h +++ b/src/core/xds/grpc/xds_metadata.h @@ -25,10 +25,10 @@ #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" -#include "src/core/lib/gprpp/down_cast.h" -#include "src/core/lib/gprpp/validation_errors.h" +#include "src/core/util/down_cast.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_writer.h" +#include "src/core/util/validation_errors.h" namespace grpc_core { diff --git a/src/core/xds/grpc/xds_metadata_parser.cc b/src/core/xds/grpc/xds_metadata_parser.cc index 90f11a79cae..cb355371c47 100644 --- a/src/core/xds/grpc/xds_metadata_parser.cc +++ b/src/core/xds/grpc/xds_metadata_parser.cc @@ -26,10 +26,10 @@ #include "upb/base/string_view.h" #include "upb/text/encode.h" -#include "src/core/lib/gprpp/env.h" -#include "src/core/lib/gprpp/validation_errors.h" +#include "src/core/util/env.h" #include "src/core/util/string.h" #include "src/core/util/upb_utils.h" +#include "src/core/util/validation_errors.h" #include "src/core/xds/grpc/xds_common_types.h" #include "src/core/xds/grpc/xds_common_types_parser.h" diff --git a/src/core/xds/grpc/xds_metadata_parser.h b/src/core/xds/grpc/xds_metadata_parser.h index f3d0a522ab1..a3cca589308 100644 --- a/src/core/xds/grpc/xds_metadata_parser.h +++ b/src/core/xds/grpc/xds_metadata_parser.h @@ -19,7 +19,7 @@ #include "envoy/config/core/v3/base.upb.h" -#include "src/core/lib/gprpp/validation_errors.h" +#include "src/core/util/validation_errors.h" #include "src/core/xds/grpc/xds_metadata.h" #include "src/core/xds/xds_client/xds_resource_type.h" diff --git a/src/core/xds/grpc/xds_route_config.cc b/src/core/xds/grpc/xds_route_config.cc index 3c6bbe7f8a5..82d670207ee 100644 --- a/src/core/xds/grpc/xds_route_config.cc +++ b/src/core/xds/grpc/xds_route_config.cc @@ -27,8 +27,8 @@ #include "absl/types/variant.h" #include "re2/re2.h" -#include "src/core/lib/gprpp/match.h" -#include "src/core/lib/matchers/matchers.h" +#include "src/core/util/match.h" +#include "src/core/util/matchers.h" namespace grpc_core { diff --git a/src/core/xds/grpc/xds_route_config.h b/src/core/xds/grpc/xds_route_config.h index c0d57b78517..b6af799af1c 100644 --- a/src/core/xds/grpc/xds_route_config.h +++ b/src/core/xds/grpc/xds_route_config.h @@ -30,8 +30,8 @@ #include "re2/re2.h" #include "src/core/lib/channel/status_util.h" -#include "src/core/lib/gprpp/time.h" -#include "src/core/lib/matchers/matchers.h" +#include "src/core/util/matchers.h" +#include "src/core/util/time.h" #include "src/core/xds/grpc/xds_http_filter.h" #include "src/core/xds/xds_client/xds_resource_type.h" #include "src/core/xds/xds_client/xds_resource_type_impl.h" diff --git a/src/core/xds/grpc/xds_route_config_parser.cc b/src/core/xds/grpc/xds_route_config_parser.cc index d23f162456a..55ffc7ced1a 100644 --- a/src/core/xds/grpc/xds_route_config_parser.cc +++ b/src/core/xds/grpc/xds_route_config_parser.cc @@ -61,15 +61,15 @@ #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/gprpp/env.h" -#include "src/core/lib/gprpp/match.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/time.h" -#include "src/core/lib/matchers/matchers.h" #include "src/core/load_balancing/lb_policy_registry.h" +#include "src/core/util/env.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_writer.h" +#include "src/core/util/match.h" +#include "src/core/util/matchers.h" +#include "src/core/util/ref_counted_ptr.h" #include "src/core/util/string.h" +#include "src/core/util/time.h" #include "src/core/util/upb_utils.h" #include "src/core/xds/grpc/xds_cluster_specifier_plugin.h" #include "src/core/xds/grpc/xds_common_types.h" diff --git a/src/core/xds/grpc/xds_route_config_parser.h b/src/core/xds/grpc/xds_route_config_parser.h index 2523f8caa7a..644c55e7198 100644 --- a/src/core/xds/grpc/xds_route_config_parser.h +++ b/src/core/xds/grpc/xds_route_config_parser.h @@ -36,9 +36,8 @@ #include #include "src/core/lib/channel/status_util.h" -#include "src/core/lib/gprpp/time.h" -#include "src/core/lib/gprpp/validation_errors.h" -#include "src/core/lib/matchers/matchers.h" +#include "src/core/util/time.h" +#include "src/core/util/validation_errors.h" #include "src/core/xds/grpc/xds_bootstrap_grpc.h" #include "src/core/xds/grpc/xds_cluster_specifier_plugin.h" #include "src/core/xds/grpc/xds_http_filter.h" diff --git a/src/core/xds/grpc/xds_routing.cc b/src/core/xds/grpc/xds_routing.cc index 2a3a29088d8..2d8668326be 100644 --- a/src/core/xds/grpc/xds_routing.cc +++ b/src/core/xds/grpc/xds_routing.cc @@ -34,7 +34,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/matchers/matchers.h" +#include "src/core/util/matchers.h" #include "src/core/xds/grpc/xds_http_filter.h" namespace grpc_core { diff --git a/src/core/xds/grpc/xds_server_grpc.h b/src/core/xds/grpc/xds_server_grpc.h index 261cbbb45e7..9efc7fe8bd7 100644 --- a/src/core/xds/grpc/xds_server_grpc.h +++ b/src/core/xds/grpc/xds_server_grpc.h @@ -20,12 +20,12 @@ #include #include -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/validation_errors.h" #include "src/core/lib/security/credentials/channel_creds_registry.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" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/validation_errors.h" #include "src/core/xds/xds_client/xds_bootstrap.h" namespace grpc_core { diff --git a/src/core/xds/grpc/xds_transport_grpc.cc b/src/core/xds/grpc/xds_transport_grpc.cc index 6af60f0516d..435a07083ba 100644 --- a/src/core/xds/grpc/xds_transport_grpc.cc +++ b/src/core/xds/grpc/xds_transport_grpc.cc @@ -42,10 +42,6 @@ #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/event_engine/default_event_engine.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/time.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/pollset_set.h" @@ -58,6 +54,10 @@ #include "src/core/lib/surface/init_internally.h" #include "src/core/lib/surface/lame_client.h" #include "src/core/lib/transport/connectivity_state.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" #include "src/core/xds/grpc/xds_bootstrap_grpc.h" #include "src/core/xds/xds_client/xds_bootstrap.h" diff --git a/src/core/xds/grpc/xds_transport_grpc.h b/src/core/xds/grpc/xds_transport_grpc.h index fc951f07594..90ff36aa41c 100644 --- a/src/core/xds/grpc/xds_transport_grpc.h +++ b/src/core/xds/grpc/xds_transport_grpc.h @@ -29,12 +29,12 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/iomgr_fwd.h" #include "src/core/lib/surface/channel.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" #include "src/core/xds/xds_client/xds_bootstrap.h" #include "src/core/xds/xds_client/xds_transport.h" diff --git a/src/core/xds/xds_client/xds_api.h b/src/core/xds/xds_client/xds_api.h index 990d9ed7718..7011174f716 100644 --- a/src/core/xds/xds_client/xds_api.h +++ b/src/core/xds/xds_client/xds_api.h @@ -35,8 +35,8 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" #include "src/core/xds/xds_client/xds_bootstrap.h" #include "src/core/xds/xds_client/xds_client_stats.h" diff --git a/src/core/xds/xds_client/xds_bootstrap.cc b/src/core/xds/xds_client/xds_bootstrap.cc index 65b70778ef3..b6f5edfc9e2 100644 --- a/src/core/xds/xds_client/xds_bootstrap.cc +++ b/src/core/xds/xds_client/xds_bootstrap.cc @@ -20,7 +20,7 @@ #include -#include "src/core/lib/gprpp/env.h" +#include "src/core/util/env.h" #include "src/core/util/string.h" namespace grpc_core { diff --git a/src/core/xds/xds_client/xds_client.cc b/src/core/xds/xds_client/xds_client.cc index 181bfbd3bba..5eb81d55af7 100644 --- a/src/core/xds/xds_client/xds_client.cc +++ b/src/core/xds/xds_client/xds_client.cc @@ -46,14 +46,14 @@ #include #include -#include "src/core/lib/backoff/backoff.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/exec_ctx.h" -#include "src/core/lib/uri/uri_parser.h" +#include "src/core/util/backoff.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" #include "src/core/util/upb_utils.h" +#include "src/core/util/uri.h" #include "src/core/xds/xds_client/xds_api.h" #include "src/core/xds/xds_client/xds_bootstrap.h" #include "src/core/xds/xds_client/xds_client_stats.h" diff --git a/src/core/xds/xds_client/xds_client.h b/src/core/xds/xds_client/xds_client.h index 0535984afc2..d8afa1858bf 100644 --- a/src/core/xds/xds_client/xds_client.h +++ b/src/core/xds/xds_client/xds_client.h @@ -34,14 +34,14 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/dual_ref_counted.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" -#include "src/core/lib/gprpp/time.h" -#include "src/core/lib/gprpp/work_serializer.h" -#include "src/core/lib/uri/uri_parser.h" +#include "src/core/util/dual_ref_counted.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.h" +#include "src/core/util/uri.h" +#include "src/core/util/work_serializer.h" #include "src/core/xds/xds_client/xds_api.h" #include "src/core/xds/xds_client/xds_bootstrap.h" #include "src/core/xds/xds_client/xds_client_stats.h" diff --git a/src/core/xds/xds_client/xds_client_stats.cc b/src/core/xds/xds_client/xds_client_stats.cc index 3219b224a9e..12538303a53 100644 --- a/src/core/xds/xds_client/xds_client_stats.cc +++ b/src/core/xds/xds_client/xds_client_stats.cc @@ -23,7 +23,7 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/debug_location.h" +#include "src/core/util/debug_location.h" #include "src/core/xds/xds_client/xds_client.h" namespace grpc_core { diff --git a/src/core/xds/xds_client/xds_client_stats.h b/src/core/xds/xds_client/xds_client_stats.h index 291a9e25718..de9f924120d 100644 --- a/src/core/xds/xds_client/xds_client_stats.h +++ b/src/core/xds/xds_client/xds_client_stats.h @@ -31,12 +31,12 @@ #include -#include "src/core/lib/gprpp/per_cpu.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" #include "src/core/resolver/endpoint_addresses.h" #include "src/core/telemetry/call_tracer.h" +#include "src/core/util/per_cpu.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" #include "src/core/util/useful.h" #include "src/core/xds/xds_client/xds_bootstrap.h" diff --git a/src/core/xds/xds_client/xds_resource_type_impl.h b/src/core/xds/xds_client/xds_resource_type_impl.h index dd47ccb0b09..a927f796b5e 100644 --- a/src/core/xds/xds_client/xds_resource_type_impl.h +++ b/src/core/xds/xds_client/xds_resource_type_impl.h @@ -23,7 +23,7 @@ #include -#include "src/core/lib/gprpp/ref_counted_ptr.h" +#include "src/core/util/ref_counted_ptr.h" #include "src/core/xds/xds_client/xds_client.h" #include "src/core/xds/xds_client/xds_resource_type.h" diff --git a/src/core/xds/xds_client/xds_transport.h b/src/core/xds/xds_client/xds_transport.h index 43b19d63035..0bff4a86dbc 100644 --- a/src/core/xds/xds_client/xds_transport.h +++ b/src/core/xds/xds_client/xds_transport.h @@ -26,7 +26,7 @@ #include -#include "src/core/lib/gprpp/orphanable.h" +#include "src/core/util/orphanable.h" #include "src/core/xds/xds_client/xds_bootstrap.h" namespace grpc_core { diff --git a/src/cpp/client/client_context.cc b/src/cpp/client/client_context.cc index 78c0bd16002..ac480c87153 100644 --- a/src/cpp/client/client_context.cc +++ b/src/cpp/client/client_context.cc @@ -41,7 +41,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" namespace grpc { diff --git a/src/cpp/client/client_interceptor.cc b/src/cpp/client/client_interceptor.cc index dfa30d6fe41..9c1a3f27b7a 100644 --- a/src/cpp/client/client_interceptor.cc +++ b/src/cpp/client/client_interceptor.cc @@ -18,7 +18,7 @@ #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" namespace grpc { diff --git a/src/cpp/client/client_stats_interceptor.cc b/src/cpp/client/client_stats_interceptor.cc index 84c017ddbcf..ea2828fc9db 100644 --- a/src/cpp/client/client_stats_interceptor.cc +++ b/src/cpp/client/client_stats_interceptor.cc @@ -18,7 +18,7 @@ #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" namespace grpc { namespace internal { diff --git a/src/cpp/client/secure_credentials.cc b/src/cpp/client/secure_credentials.cc index b41f307daba..5c1804fbc66 100644 --- a/src/cpp/client/secure_credentials.cc +++ b/src/cpp/client/secure_credentials.cc @@ -47,11 +47,11 @@ #include #include "src/core/lib/event_engine/default_event_engine.h" -#include "src/core/lib/gprpp/env.h" -#include "src/core/lib/gprpp/load_file.h" #include "src/core/lib/security/util/json_util.h" +#include "src/core/util/env.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_reader.h" +#include "src/core/util/load_file.h" #include "src/cpp/common/secure_auth_context.h" #include "src/cpp/server/thread_pool_interface.h" diff --git a/src/cpp/common/alarm.cc b/src/cpp/common/alarm.cc index 041584eb489..770b07085e3 100644 --- a/src/cpp/common/alarm.cc +++ b/src/cpp/common/alarm.cc @@ -33,10 +33,10 @@ #include #include "src/core/lib/event_engine/default_event_engine.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/surface/completion_queue.h" +#include "src/core/util/time.h" namespace grpc { diff --git a/src/cpp/common/completion_queue_cc.cc b/src/cpp/common/completion_queue_cc.cc index b2c3463c053..88396bfbbc6 100644 --- a/src/cpp/common/completion_queue_cc.cc +++ b/src/cpp/common/completion_queue_cc.cc @@ -29,8 +29,8 @@ #include #include -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/thd.h" +#include "src/core/util/sync.h" +#include "src/core/util/thd.h" #include "src/core/util/useful.h" namespace grpc { diff --git a/src/cpp/common/secure_auth_context.h b/src/cpp/common/secure_auth_context.h index dabe8ed9c81..8da3e971c22 100644 --- a/src/cpp/common/secure_auth_context.h +++ b/src/cpp/common/secure_auth_context.h @@ -26,8 +26,8 @@ #include #include -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/security/context/security_context.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc { diff --git a/src/cpp/common/secure_create_auth_context.cc b/src/cpp/common/secure_create_auth_context.cc index 4658321520f..8492655b4aa 100644 --- a/src/cpp/common/secure_create_auth_context.cc +++ b/src/cpp/common/secure_create_auth_context.cc @@ -21,8 +21,8 @@ #include #include -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/security/context/security_context.h" +#include "src/core/util/ref_counted_ptr.h" #include "src/cpp/common/secure_auth_context.h" namespace grpc { diff --git a/src/cpp/common/validate_service_config.cc b/src/cpp/common/validate_service_config.cc index bdd92f60e1a..f8f662d87b3 100644 --- a/src/cpp/common/validate_service_config.cc +++ b/src/cpp/common/validate_service_config.cc @@ -25,9 +25,9 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/service_config/service_config.h" #include "src/core/service_config/service_config_impl.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc { namespace experimental { diff --git a/src/cpp/ext/csm/BUILD b/src/cpp/ext/csm/BUILD index 6ee6bef1d4a..cfa4dd822cb 100644 --- a/src/cpp/ext/csm/BUILD +++ b/src/cpp/ext/csm/BUILD @@ -62,7 +62,7 @@ grpc_cc_library( "//:gpr_platform", "//:grpc_base", "//:protobuf_struct_upb", - "//:uri_parser", + "//:uri", "//src/core:channel_args", "//src/core:env", "//src/core:error", diff --git a/src/cpp/ext/csm/csm_observability.cc b/src/cpp/ext/csm/csm_observability.cc index c924db3fbdc..a5f61794660 100644 --- a/src/cpp/ext/csm/csm_observability.cc +++ b/src/cpp/ext/csm/csm_observability.cc @@ -35,7 +35,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/uri/uri_parser.h" +#include "src/core/util/uri.h" #include "src/core/xds/grpc/xds_enabled_server.h" #include "src/cpp/ext/csm/metadata_exchange.h" #include "src/cpp/ext/otel/otel_plugin.h" diff --git a/src/cpp/ext/csm/metadata_exchange.cc b/src/cpp/ext/csm/metadata_exchange.cc index 21abe5029eb..bd922460fb9 100644 --- a/src/cpp/ext/csm/metadata_exchange.cc +++ b/src/cpp/ext/csm/metadata_exchange.cc @@ -39,14 +39,14 @@ #include #include -#include "src/core/lib/gprpp/env.h" -#include "src/core/lib/gprpp/load_file.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/telemetry/call_tracer.h" +#include "src/core/util/env.h" #include "src/core/util/json/json_args.h" #include "src/core/util/json/json_object_loader.h" #include "src/core/util/json/json_reader.h" +#include "src/core/util/load_file.h" #include "src/cpp/ext/otel/key_value_iterable.h" namespace grpc { diff --git a/src/cpp/ext/filters/census/client_filter.cc b/src/cpp/ext/filters/census/client_filter.cc index cf0aac4c0d2..001c1fa8d18 100644 --- a/src/cpp/ext/filters/census/client_filter.cc +++ b/src/cpp/ext/filters/census/client_filter.cc @@ -53,7 +53,6 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/experiments/experiments.h" -#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/promise/context.h" #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/slice/slice.h" @@ -62,6 +61,7 @@ #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" #include "src/core/telemetry/tcp_tracer.h" +#include "src/core/util/sync.h" #include "src/cpp/ext/filters/census/context.h" #include "src/cpp/ext/filters/census/grpc_plugin.h" #include "src/cpp/ext/filters/census/measures.h" diff --git a/src/cpp/ext/filters/census/open_census_call_tracer.h b/src/cpp/ext/filters/census/open_census_call_tracer.h index 15575be5bb0..2b98d4cb861 100644 --- a/src/cpp/ext/filters/census/open_census_call_tracer.h +++ b/src/cpp/ext/filters/census/open_census_call_tracer.h @@ -38,7 +38,6 @@ #include #include -#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/slice/slice.h" @@ -47,6 +46,7 @@ #include "src/core/lib/transport/transport.h" #include "src/core/telemetry/call_tracer.h" #include "src/core/telemetry/tcp_tracer.h" +#include "src/core/util/sync.h" // TODO(yashykt): This might not be the right place for this channel arg, but we // don't have a better place for this right now. diff --git a/src/cpp/ext/gcp/environment_autodetect.cc b/src/cpp/ext/gcp/environment_autodetect.cc index 90e958c55b2..77f74608ee3 100644 --- a/src/cpp/ext/gcp/environment_autodetect.cc +++ b/src/cpp/ext/gcp/environment_autodetect.cc @@ -35,12 +35,6 @@ #include "src/core/lib/debug/trace.h" #include "src/core/lib/event_engine/default_event_engine.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/env.h" -#include "src/core/lib/gprpp/load_file.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/status_helper.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" @@ -48,7 +42,13 @@ #include "src/core/lib/iomgr/polling_entity.h" #include "src/core/lib/iomgr/pollset.h" #include "src/core/lib/slice/slice.h" +#include "src/core/util/crash.h" +#include "src/core/util/env.h" #include "src/core/util/gcp_metadata_query.h" +#include "src/core/util/load_file.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/time.h" namespace grpc { namespace internal { diff --git a/src/cpp/ext/gcp/environment_autodetect.h b/src/cpp/ext/gcp/environment_autodetect.h index fb15ea1d06d..b45eb9ed2c1 100644 --- a/src/cpp/ext/gcp/environment_autodetect.h +++ b/src/cpp/ext/gcp/environment_autodetect.h @@ -29,7 +29,7 @@ #include #include -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/sync.h" namespace grpc { diff --git a/src/cpp/ext/gcp/observability.cc b/src/cpp/ext/gcp/observability.cc index 2c683e20cc8..ef508c89dd9 100644 --- a/src/cpp/ext/gcp/observability.cc +++ b/src/cpp/ext/gcp/observability.cc @@ -47,8 +47,8 @@ #include #include "src/core/ext/filters/logging/logging_filter.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/notification.h" +#include "src/core/util/crash.h" +#include "src/core/util/notification.h" #include "src/cpp/client/client_stats_interceptor.h" #include "src/cpp/ext/filters/census/client_filter.h" #include "src/cpp/ext/filters/census/grpc_plugin.h" diff --git a/src/cpp/ext/gcp/observability_config.cc b/src/cpp/ext/gcp/observability_config.cc index 977ced0671f..f6ffcf94d6a 100644 --- a/src/cpp/ext/gcp/observability_config.cc +++ b/src/cpp/ext/gcp/observability_config.cc @@ -32,15 +32,15 @@ #include #include -#include "src/core/lib/gprpp/env.h" -#include "src/core/lib/gprpp/load_file.h" -#include "src/core/lib/gprpp/status_helper.h" -#include "src/core/lib/gprpp/validation_errors.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/transport/error_utils.h" +#include "src/core/util/env.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_reader.h" +#include "src/core/util/load_file.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/validation_errors.h" namespace grpc { namespace internal { diff --git a/src/cpp/ext/gcp/observability_config.h b/src/cpp/ext/gcp/observability_config.h index 8854f860c95..5fb18f3fae6 100644 --- a/src/cpp/ext/gcp/observability_config.h +++ b/src/cpp/ext/gcp/observability_config.h @@ -29,10 +29,10 @@ #include -#include "src/core/lib/gprpp/validation_errors.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" +#include "src/core/util/validation_errors.h" namespace grpc { namespace internal { diff --git a/src/cpp/ext/gcp/observability_logging_sink.cc b/src/cpp/ext/gcp/observability_logging_sink.cc index 27cbdb78c7d..0a370d87606 100644 --- a/src/cpp/ext/gcp/observability_logging_sink.cc +++ b/src/cpp/ext/gcp/observability_logging_sink.cc @@ -43,10 +43,10 @@ #include #include "src/core/lib/event_engine/default_event_engine.h" -#include "src/core/lib/gprpp/env.h" -#include "src/core/lib/gprpp/time.h" -#include "src/core/lib/gprpp/uuid_v4.h" +#include "src/core/util/env.h" #include "src/core/util/json/json.h" +#include "src/core/util/time.h" +#include "src/core/util/uuid_v4.h" #include "src/cpp/ext/filters/census/open_census_call_tracer.h" // IWYU pragma: no_include "google/protobuf/struct.pb.h" diff --git a/src/cpp/ext/gcp/observability_logging_sink.h b/src/cpp/ext/gcp/observability_logging_sink.h index eea8d6196a7..f4703721f3d 100644 --- a/src/cpp/ext/gcp/observability_logging_sink.h +++ b/src/cpp/ext/gcp/observability_logging_sink.h @@ -35,7 +35,7 @@ #include #include "src/core/ext/filters/logging/logging_sink.h" -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/sync.h" #include "src/cpp/ext/gcp/environment_autodetect.h" #include "src/cpp/ext/gcp/observability_config.h" diff --git a/src/cpp/ext/otel/otel_client_call_tracer.cc b/src/cpp/ext/otel/otel_client_call_tracer.cc index 8e75cb82bba..88750fca3e3 100644 --- a/src/cpp/ext/otel/otel_client_call_tracer.cc +++ b/src/cpp/ext/otel/otel_client_call_tracer.cc @@ -47,13 +47,13 @@ #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/channel/status_util.h" #include "src/core/lib/experiments/experiments.h" -#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/promise/context.h" #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/transport/metadata_batch.h" #include "src/core/telemetry/tcp_tracer.h" +#include "src/core/util/sync.h" #include "src/cpp/ext/otel/key_value_iterable.h" #include "src/cpp/ext/otel/otel_plugin.h" diff --git a/src/cpp/ext/otel/otel_client_call_tracer.h b/src/cpp/ext/otel/otel_client_call_tracer.h index ed435311b20..c94219f2152 100644 --- a/src/cpp/ext/otel/otel_client_call_tracer.h +++ b/src/cpp/ext/otel/otel_client_call_tracer.h @@ -32,7 +32,6 @@ #include #include -#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/slice/slice.h" @@ -41,6 +40,7 @@ #include "src/core/lib/transport/transport.h" #include "src/core/telemetry/call_tracer.h" #include "src/core/telemetry/tcp_tracer.h" +#include "src/core/util/sync.h" #include "src/cpp/ext/otel/otel_plugin.h" namespace grpc { diff --git a/src/cpp/ext/otel/otel_plugin.cc b/src/cpp/ext/otel/otel_plugin.cc index 44c653d58b8..c904df2e40a 100644 --- a/src/cpp/ext/otel/otel_plugin.cc +++ b/src/cpp/ext/otel/otel_plugin.cc @@ -37,9 +37,9 @@ #include "src/core/client_channel/client_channel_filter.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/match.h" #include "src/core/lib/surface/channel_stack_type.h" #include "src/core/telemetry/call_tracer.h" +#include "src/core/util/match.h" #include "src/cpp/ext/otel/key_value_iterable.h" #include "src/cpp/ext/otel/otel_client_call_tracer.h" #include "src/cpp/ext/otel/otel_server_call_tracer.h" diff --git a/src/cpp/server/external_connection_acceptor_impl.h b/src/cpp/server/external_connection_acceptor_impl.h index 1d32263e604..3e23eb8a0c0 100644 --- a/src/cpp/server/external_connection_acceptor_impl.h +++ b/src/cpp/server/external_connection_acceptor_impl.h @@ -26,8 +26,8 @@ #include #include -#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/iomgr/tcp_server.h" +#include "src/core/util/sync.h" namespace grpc { namespace internal { diff --git a/src/cpp/server/health/default_health_check_service.h b/src/cpp/server/health/default_health_check_service.h index dc1b18979a4..042b057b08f 100644 --- a/src/cpp/server/health/default_health_check_service.h +++ b/src/cpp/server/health/default_health_check_service.h @@ -35,8 +35,8 @@ #include #include -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc { diff --git a/src/cpp/server/load_reporter/get_cpu_stats_unsupported.cc b/src/cpp/server/load_reporter/get_cpu_stats_unsupported.cc index 2744c66b25e..debc4a556b6 100644 --- a/src/cpp/server/load_reporter/get_cpu_stats_unsupported.cc +++ b/src/cpp/server/load_reporter/get_cpu_stats_unsupported.cc @@ -22,7 +22,7 @@ #include "absl/log/log.h" -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "src/cpp/server/load_reporter/get_cpu_stats.h" namespace grpc { diff --git a/src/cpp/server/load_reporter/load_reporter.h b/src/cpp/server/load_reporter/load_reporter.h index 7268d4e3f0d..4b08ca05bfc 100644 --- a/src/cpp/server/load_reporter/load_reporter.h +++ b/src/cpp/server/load_reporter/load_reporter.h @@ -38,7 +38,7 @@ #include -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/sync.h" #include "src/cpp/server/load_reporter/load_data_store.h" #include "src/proto/grpc/lb/v1/load_reporter.grpc.pb.h" diff --git a/src/cpp/server/load_reporter/load_reporter_async_service_impl.h b/src/cpp/server/load_reporter/load_reporter_async_service_impl.h index d7cbad32455..80210b4af7d 100644 --- a/src/cpp/server/load_reporter/load_reporter_async_service_impl.h +++ b/src/cpp/server/load_reporter/load_reporter_async_service_impl.h @@ -35,8 +35,8 @@ #include #include -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/thd.h" +#include "src/core/util/sync.h" +#include "src/core/util/thd.h" #include "src/cpp/server/load_reporter/load_reporter.h" #include "src/proto/grpc/lb/v1/load_reporter.grpc.pb.h" diff --git a/src/cpp/server/orca/orca_service.cc b/src/cpp/server/orca/orca_service.cc index 9cc09c9909e..45829844e8f 100644 --- a/src/cpp/server/orca/orca_service.cc +++ b/src/cpp/server/orca/orca_service.cc @@ -45,12 +45,12 @@ #include #include "src/core/lib/event_engine/default_event_engine.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/load_balancing/backend_metric_data.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" #include "src/cpp/server/backend_metric_recorder.h" namespace grpc { diff --git a/src/cpp/server/server_cc.cc b/src/cpp/server/server_cc.cc index d229e279a61..8996e78b4d8 100644 --- a/src/cpp/server/server_cc.cc +++ b/src/cpp/server/server_cc.cc @@ -69,12 +69,12 @@ #include #include "src/core/ext/transport/inproc/inproc_transport.h" -#include "src/core/lib/gprpp/manual_constructor.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/iomgr.h" #include "src/core/lib/resource_quota/api.h" #include "src/core/lib/surface/completion_queue.h" #include "src/core/server/server.h" +#include "src/core/util/manual_constructor.h" #include "src/cpp/client/create_channel_internal.h" #include "src/cpp/server/external_connection_acceptor_impl.h" #include "src/cpp/server/health/default_health_check_service.h" diff --git a/src/cpp/server/server_context.cc b/src/cpp/server/server_context.cc index 648fee9d5da..ed1080aeaf6 100644 --- a/src/cpp/server/server_context.cc +++ b/src/cpp/server/server_context.cc @@ -56,11 +56,11 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/surface/call.h" +#include "src/core/util/crash.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/sync.h" #include "src/cpp/server/backend_metric_recorder.h" namespace grpc { diff --git a/src/cpp/server/server_credentials.cc b/src/cpp/server/server_credentials.cc index a3323b9b273..efb432107de 100644 --- a/src/cpp/server/server_credentials.cc +++ b/src/cpp/server/server_credentials.cc @@ -14,7 +14,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" namespace grpc { diff --git a/src/cpp/thread_manager/thread_manager.cc b/src/cpp/thread_manager/thread_manager.cc index 1fd3ee20bc8..3128e1c6f41 100644 --- a/src/cpp/thread_manager/thread_manager.cc +++ b/src/cpp/thread_manager/thread_manager.cc @@ -24,10 +24,10 @@ #include "absl/log/log.h" #include "absl/strings/str_format.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/thd.h" #include "src/core/lib/resource_quota/resource_quota.h" +#include "src/core/util/crash.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/thd.h" namespace grpc { diff --git a/src/cpp/thread_manager/thread_manager.h b/src/cpp/thread_manager/thread_manager.h index c15eaa2be86..2c201bc6098 100644 --- a/src/cpp/thread_manager/thread_manager.h +++ b/src/cpp/thread_manager/thread_manager.h @@ -21,10 +21,10 @@ #include -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/thd.h" #include "src/core/lib/resource_quota/api.h" #include "src/core/lib/resource_quota/thread_quota.h" +#include "src/core/util/sync.h" +#include "src/core/util/thd.h" namespace grpc { diff --git a/src/objective-c/tests/CronetTests/CronetUnitTests.mm b/src/objective-c/tests/CronetTests/CronetUnitTests.mm index ba913160525..91dd206ec54 100644 --- a/src/objective-c/tests/CronetTests/CronetUnitTests.mm +++ b/src/objective-c/tests/CronetTests/CronetUnitTests.mm @@ -31,8 +31,8 @@ #import #import "src/core/lib/channel/channel_args.h" -#import "src/core/lib/gprpp/env.h" -#import "src/core/lib/gprpp/host_port.h" +#import "src/core/util/env.h" +#import "src/core/util/host_port.h" #import "src/core/util/string.h" #import "src/core/util/tmpfile.h" #import "test/core/end2end/data/ssl_test_data.h" diff --git a/src/python/grpcio/grpc_core_dependencies.py b/src/python/grpcio/grpc_core_dependencies.py index 84a9cc37deb..3af16866c12 100644 --- a/src/python/grpcio/grpc_core_dependencies.py +++ b/src/python/grpcio/grpc_core_dependencies.py @@ -417,8 +417,6 @@ CORE_SOURCE_FILES = [ 'src/core/handshaker/tcp_connect/tcp_connect_handshaker.cc', 'src/core/lib/address_utils/parse_address.cc', 'src/core/lib/address_utils/sockaddr_utils.cc', - 'src/core/lib/backoff/backoff.cc', - 'src/core/lib/backoff/random_early_detection.cc', 'src/core/lib/channel/channel_args.cc', 'src/core/lib/channel/channel_args_preconditioning.cc', 'src/core/lib/channel/channel_stack.cc', @@ -434,7 +432,6 @@ CORE_SOURCE_FILES = [ 'src/core/lib/config/config_vars_non_generated.cc', 'src/core/lib/config/core_configuration.cc', 'src/core/lib/config/load_config.cc', - 'src/core/lib/debug/event_log.cc', 'src/core/lib/debug/trace.cc', 'src/core/lib/debug/trace_flags.cc', 'src/core/lib/event_engine/ares_resolver.cc', @@ -486,34 +483,6 @@ CORE_SOURCE_FILES = [ 'src/core/lib/event_engine/work_queue/basic_work_queue.cc', 'src/core/lib/experiments/config.cc', 'src/core/lib/experiments/experiments.cc', - 'src/core/lib/gprpp/crash.cc', - 'src/core/lib/gprpp/dump_args.cc', - 'src/core/lib/gprpp/examine_stack.cc', - 'src/core/lib/gprpp/fork.cc', - 'src/core/lib/gprpp/glob.cc', - 'src/core/lib/gprpp/host_port.cc', - 'src/core/lib/gprpp/linux/env.cc', - 'src/core/lib/gprpp/load_file.cc', - 'src/core/lib/gprpp/mpscq.cc', - 'src/core/lib/gprpp/per_cpu.cc', - 'src/core/lib/gprpp/posix/directory_reader.cc', - 'src/core/lib/gprpp/posix/env.cc', - 'src/core/lib/gprpp/posix/stat.cc', - 'src/core/lib/gprpp/posix/thd.cc', - 'src/core/lib/gprpp/ref_counted_string.cc', - 'src/core/lib/gprpp/status_helper.cc', - 'src/core/lib/gprpp/strerror.cc', - 'src/core/lib/gprpp/tchar.cc', - 'src/core/lib/gprpp/time.cc', - 'src/core/lib/gprpp/time_averaged_stats.cc', - 'src/core/lib/gprpp/time_util.cc', - 'src/core/lib/gprpp/uuid_v4.cc', - 'src/core/lib/gprpp/validation_errors.cc', - 'src/core/lib/gprpp/windows/directory_reader.cc', - 'src/core/lib/gprpp/windows/env.cc', - 'src/core/lib/gprpp/windows/stat.cc', - 'src/core/lib/gprpp/windows/thd.cc', - 'src/core/lib/gprpp/work_serializer.cc', 'src/core/lib/iomgr/buffer_list.cc', 'src/core/lib/iomgr/call_combiner.cc', 'src/core/lib/iomgr/cfstream_handle.cc', @@ -537,11 +506,6 @@ CORE_SOURCE_FILES = [ 'src/core/lib/iomgr/executor.cc', 'src/core/lib/iomgr/fork_posix.cc', 'src/core/lib/iomgr/fork_windows.cc', - 'src/core/lib/iomgr/gethostname_fallback.cc', - 'src/core/lib/iomgr/gethostname_host_name_max.cc', - 'src/core/lib/iomgr/gethostname_sysconf.cc', - 'src/core/lib/iomgr/grpc_if_nametoindex_posix.cc', - 'src/core/lib/iomgr/grpc_if_nametoindex_unsupported.cc', 'src/core/lib/iomgr/internal_errqueue.cc', 'src/core/lib/iomgr/iocp_windows.cc', 'src/core/lib/iomgr/iomgr.cc', @@ -590,7 +554,6 @@ CORE_SOURCE_FILES = [ 'src/core/lib/iomgr/wakeup_fd_nospecial.cc', 'src/core/lib/iomgr/wakeup_fd_pipe.cc', 'src/core/lib/iomgr/wakeup_fd_posix.cc', - 'src/core/lib/matchers/matchers.cc', 'src/core/lib/promise/activity.cc', 'src/core/lib/promise/party.cc', 'src/core/lib/promise/sleep.cc', @@ -710,7 +673,6 @@ CORE_SOURCE_FILES = [ 'src/core/lib/transport/timeout_encoding.cc', 'src/core/lib/transport/transport.cc', 'src/core/lib/transport/transport_op_string.cc', - 'src/core/lib/uri/uri_parser.cc', 'src/core/load_balancing/address_filtering.cc', 'src/core/load_balancing/backend_metric_parser.cc', 'src/core/load_balancing/child_policy_handler.cc', @@ -805,7 +767,21 @@ CORE_SOURCE_FILES = [ 'src/core/tsi/transport_security_grpc.cc', 'src/core/util/alloc.cc', 'src/core/util/atm.cc', + 'src/core/util/backoff.cc', + 'src/core/util/crash.cc', + 'src/core/util/dump_args.cc', + 'src/core/util/event_log.cc', + 'src/core/util/examine_stack.cc', + 'src/core/util/fork.cc', 'src/core/util/gcp_metadata_query.cc', + 'src/core/util/gethostname_fallback.cc', + 'src/core/util/gethostname_host_name_max.cc', + 'src/core/util/gethostname_sysconf.cc', + 'src/core/util/glob.cc', + 'src/core/util/gpr_time.cc', + 'src/core/util/grpc_if_nametoindex_posix.cc', + 'src/core/util/grpc_if_nametoindex_unsupported.cc', + 'src/core/util/host_port.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', @@ -817,24 +793,48 @@ CORE_SOURCE_FILES = [ 'src/core/util/json/json_writer.cc', 'src/core/util/latent_see.cc', 'src/core/util/linux/cpu.cc', + 'src/core/util/linux/env.cc', + 'src/core/util/load_file.cc', 'src/core/util/log.cc', + 'src/core/util/matchers.cc', + 'src/core/util/mpscq.cc', 'src/core/util/msys/tmpfile.cc', + 'src/core/util/per_cpu.cc', 'src/core/util/posix/cpu.cc', + 'src/core/util/posix/directory_reader.cc', + 'src/core/util/posix/env.cc', + 'src/core/util/posix/stat.cc', 'src/core/util/posix/string.cc', 'src/core/util/posix/sync.cc', + 'src/core/util/posix/thd.cc', 'src/core/util/posix/time.cc', 'src/core/util/posix/tmpfile.cc', + 'src/core/util/random_early_detection.cc', + 'src/core/util/ref_counted_string.cc', + 'src/core/util/status_helper.cc', + 'src/core/util/strerror.cc', 'src/core/util/string.cc', 'src/core/util/sync.cc', 'src/core/util/sync_abseil.cc', + 'src/core/util/tchar.cc', 'src/core/util/time.cc', + 'src/core/util/time_averaged_stats.cc', 'src/core/util/time_precise.cc', + 'src/core/util/time_util.cc', + 'src/core/util/uri.cc', + 'src/core/util/uuid_v4.cc', + 'src/core/util/validation_errors.cc', 'src/core/util/windows/cpu.cc', + 'src/core/util/windows/directory_reader.cc', + 'src/core/util/windows/env.cc', + 'src/core/util/windows/stat.cc', 'src/core/util/windows/string.cc', 'src/core/util/windows/string_util.cc', 'src/core/util/windows/sync.cc', + 'src/core/util/windows/thd.cc', 'src/core/util/windows/time.cc', 'src/core/util/windows/tmpfile.cc', + 'src/core/util/work_serializer.cc', 'src/core/xds/grpc/certificate_provider_store.cc', 'src/core/xds/grpc/file_watcher_certificate_provider_factory.cc', 'src/core/xds/grpc/xds_audit_logger_registry.cc', diff --git a/src/python/grpcio_observability/observability_lib_deps.py b/src/python/grpcio_observability/observability_lib_deps.py index 290c367b440..471b6603806 100644 --- a/src/python/grpcio_observability/observability_lib_deps.py +++ b/src/python/grpcio_observability/observability_lib_deps.py @@ -23,45 +23,45 @@ CC_FILES=[ 'grpc_root/src/core/lib/event_engine/thread_local.cc', 'grpc_root/src/core/lib/experiments/config.cc', 'grpc_root/src/core/lib/experiments/experiments.cc', - 'grpc_root/src/core/lib/gprpp/crash.cc', - 'grpc_root/src/core/lib/gprpp/examine_stack.cc', - 'grpc_root/src/core/lib/gprpp/fork.cc', - 'grpc_root/src/core/lib/gprpp/glob.cc', - 'grpc_root/src/core/lib/gprpp/host_port.cc', - 'grpc_root/src/core/lib/gprpp/linux/env.cc', - 'grpc_root/src/core/lib/gprpp/mpscq.cc', - 'grpc_root/src/core/lib/gprpp/posix/env.cc', - 'grpc_root/src/core/lib/gprpp/posix/stat.cc', - 'grpc_root/src/core/lib/gprpp/posix/thd.cc', - 'grpc_root/src/core/lib/gprpp/ref_counted_string.cc', - 'grpc_root/src/core/lib/gprpp/strerror.cc', - 'grpc_root/src/core/lib/gprpp/tchar.cc', - 'grpc_root/src/core/lib/gprpp/time_util.cc', - 'grpc_root/src/core/lib/gprpp/windows/env.cc', - 'grpc_root/src/core/lib/gprpp/windows/stat.cc', - 'grpc_root/src/core/lib/gprpp/windows/thd.cc', 'grpc_root/src/core/lib/slice/slice.cc', 'grpc_root/src/core/lib/slice/slice_string_helpers.cc', 'grpc_root/src/core/util/alloc.cc', 'grpc_root/src/core/util/atm.cc', + 'grpc_root/src/core/util/crash.cc', + 'grpc_root/src/core/util/examine_stack.cc', + 'grpc_root/src/core/util/fork.cc', + 'grpc_root/src/core/util/glob.cc', + 'grpc_root/src/core/util/gpr_time.cc', + 'grpc_root/src/core/util/host_port.cc', 'grpc_root/src/core/util/iphone/cpu.cc', 'grpc_root/src/core/util/linux/cpu.cc', + 'grpc_root/src/core/util/linux/env.cc', 'grpc_root/src/core/util/log.cc', + 'grpc_root/src/core/util/mpscq.cc', 'grpc_root/src/core/util/msys/tmpfile.cc', 'grpc_root/src/core/util/posix/cpu.cc', + 'grpc_root/src/core/util/posix/env.cc', + 'grpc_root/src/core/util/posix/stat.cc', 'grpc_root/src/core/util/posix/string.cc', 'grpc_root/src/core/util/posix/sync.cc', + 'grpc_root/src/core/util/posix/thd.cc', 'grpc_root/src/core/util/posix/time.cc', 'grpc_root/src/core/util/posix/tmpfile.cc', + 'grpc_root/src/core/util/ref_counted_string.cc', + 'grpc_root/src/core/util/strerror.cc', 'grpc_root/src/core/util/string.cc', 'grpc_root/src/core/util/sync.cc', 'grpc_root/src/core/util/sync_abseil.cc', - 'grpc_root/src/core/util/time.cc', + 'grpc_root/src/core/util/tchar.cc', 'grpc_root/src/core/util/time_precise.cc', + 'grpc_root/src/core/util/time_util.cc', 'grpc_root/src/core/util/windows/cpu.cc', + 'grpc_root/src/core/util/windows/env.cc', + 'grpc_root/src/core/util/windows/stat.cc', 'grpc_root/src/core/util/windows/string.cc', 'grpc_root/src/core/util/windows/string_util.cc', 'grpc_root/src/core/util/windows/sync.cc', + 'grpc_root/src/core/util/windows/thd.cc', 'grpc_root/src/core/util/windows/time.cc', 'grpc_root/src/core/util/windows/tmpfile.cc', 'third_party/abseil-cpp/absl/base/internal/cycleclock.cc', diff --git a/test/core/address_utils/parse_address_with_named_scope_id_test.cc b/test/core/address_utils/parse_address_with_named_scope_id_test.cc index 19b21f35027..c8e85ad1e26 100644 --- a/test/core/address_utils/parse_address_with_named_scope_id_test.cc +++ b/test/core/address_utils/parse_address_with_named_scope_id_test.cc @@ -37,12 +37,12 @@ #include #include "src/core/lib/address_utils/parse_address.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/host_port.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/resolved_address.h" #include "src/core/lib/iomgr/sockaddr.h" -#include "src/core/lib/uri/uri_parser.h" +#include "src/core/util/crash.h" +#include "src/core/util/host_port.h" +#include "src/core/util/uri.h" #include "test/core/test_util/test_config.h" static void test_grpc_parse_ipv6_parity_with_getaddrinfo( diff --git a/test/core/address_utils/sockaddr_utils_fuzzer_test.cc b/test/core/address_utils/sockaddr_utils_fuzzer_test.cc index 593d99dd0e3..8c63854a203 100644 --- a/test/core/address_utils/sockaddr_utils_fuzzer_test.cc +++ b/test/core/address_utils/sockaddr_utils_fuzzer_test.cc @@ -25,7 +25,7 @@ #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/iomgr/resolve_address.h" #include "src/core/lib/iomgr/resolved_address.h" -#include "src/core/lib/uri/uri_parser.h" +#include "src/core/util/uri.h" bool squelch = true; diff --git a/test/core/avl/BUILD b/test/core/avl/BUILD deleted file mode 100644 index 6ccf0c29b65..00000000000 --- a/test/core/avl/BUILD +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 2018 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_test", "grpc_package") -load("//test/core/test_util:grpc_fuzzer.bzl", "grpc_proto_fuzzer") - -licenses(["notice"]) - -grpc_package(name = "test/core/avl") - -grpc_cc_test( - name = "avl_test", - srcs = ["avl_test.cc"], - external_deps = ["gtest"], - language = "C++", - uses_event_engine = False, - uses_polling = False, - deps = [ - "//src/core:avl", - ], -) - -grpc_proto_fuzzer( - name = "avl_fuzzer", - srcs = ["avl_fuzzer.cc"], - corpus = "avl_fuzzer_corpus", - language = "C++", - proto = "avl_fuzzer.proto", - tags = ["no_windows"], - uses_event_engine = False, - uses_polling = False, - deps = [ - "//src/core:avl", - "//test/core/test_util:grpc_test_util", - ], -) diff --git a/test/core/backoff/BUILD b/test/core/backoff/BUILD deleted file mode 100644 index 8ce13b5f6e5..00000000000 --- a/test/core/backoff/BUILD +++ /dev/null @@ -1,52 +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. - -load("//bazel:grpc_build_system.bzl", "grpc_cc_test") - -licenses(["notice"]) - -package( - features = [ - "-layering_check", - "-parse_headers", - ], -) - -grpc_cc_test( - name = "backoff_test", - srcs = ["backoff_test.cc"], - external_deps = ["gtest"], - language = "C++", - uses_event_engine = False, - uses_polling = False, - deps = [ - "//:backoff", - "//:grpc", - "//src/core:time", - "//test/core/test_util:grpc_test_util", - ], -) - -grpc_cc_test( - name = "random_early_detection_test", - srcs = ["random_early_detection_test.cc"], - external_deps = [ - "absl/random", - "gtest", - ], - language = "C++", - uses_event_engine = False, - uses_polling = False, - deps = ["//src/core:random_early_detection"], -) diff --git a/test/core/bad_client/bad_client.cc b/test/core/bad_client/bad_client.cc index 012dd6abddb..f338e2dc0a4 100644 --- a/test/core/bad_client/bad_client.cc +++ b/test/core/bad_client/bad_client.cc @@ -35,7 +35,6 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_args_preconditioning.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/thd.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/endpoint_pair.h" @@ -45,6 +44,7 @@ #include "src/core/lib/transport/transport.h" #include "src/core/server/server.h" #include "src/core/util/string.h" +#include "src/core/util/thd.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/bad_client/tests/duplicate_header.cc b/test/core/bad_client/tests/duplicate_header.cc index c4ed690c5b2..b31c9663218 100644 --- a/test/core/bad_client/tests/duplicate_header.cc +++ b/test/core/bad_client/tests/duplicate_header.cc @@ -24,7 +24,7 @@ #include #include -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "test/core/bad_client/bad_client.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/bad_connection/close_fd_test.cc b/test/core/bad_connection/close_fd_test.cc index a2afa61fd89..41bd7021a0f 100644 --- a/test/core/bad_connection/close_fd_test.cc +++ b/test/core/bad_connection/close_fd_test.cc @@ -36,8 +36,6 @@ #include "src/core/channelz/channelz.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" @@ -45,6 +43,8 @@ #include "src/core/lib/surface/channel_create.h" #include "src/core/lib/surface/channel_stack_type.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" // This test won't work except with posix sockets enabled #ifdef GRPC_POSIX_SOCKET_TCP @@ -57,11 +57,11 @@ #include #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/iomgr/endpoint_pair.h" #include "src/core/lib/surface/channel.h" #include "src/core/lib/surface/completion_queue.h" #include "src/core/server/server.h" +#include "src/core/util/crash.h" #include "test/core/test_util/test_config.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/bad_ssl/bad_ssl_test.cc b/test/core/bad_ssl/bad_ssl_test.cc index c548e188706..51fad155944 100644 --- a/test/core/bad_ssl/bad_ssl_test.cc +++ b/test/core/bad_ssl/bad_ssl_test.cc @@ -34,8 +34,8 @@ #include #include -#include "src/core/lib/gprpp/env.h" -#include "src/core/lib/gprpp/host_port.h" +#include "src/core/util/env.h" +#include "src/core/util/host_port.h" #include "src/core/util/subprocess.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/test_util/port.h" diff --git a/test/core/call/client_call_test.cc b/test/core/call/client_call_test.cc index 4a4ccfff0e8..ef9ba6cd1a4 100644 --- a/test/core/call/client_call_test.cc +++ b/test/core/call/client_call_test.cc @@ -19,9 +19,9 @@ #include #include -#include "src/core/lib/gprpp/debug_location.h" #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/transport/metadata.h" +#include "src/core/util/debug_location.h" #include "test/core/call/batch_builder.h" #include "test/core/call/yodel/yodel_test.h" diff --git a/test/core/call/yodel/fuzzer_main.cc b/test/core/call/yodel/fuzzer_main.cc index ce9075485f9..0f14c28eb51 100644 --- a/test/core/call/yodel/fuzzer_main.cc +++ b/test/core/call/yodel/fuzzer_main.cc @@ -23,7 +23,7 @@ #include "src/core/lib/config/config_vars.h" #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/experiments/config.h" -#include "src/core/lib/gprpp/env.h" +#include "src/core/util/env.h" #include "src/libfuzzer/libfuzzer_macro.h" #include "test/core/call/yodel/fuzzer.pb.h" #include "test/core/call/yodel/yodel_test.h" diff --git a/test/core/call/yodel/yodel_test.h b/test/core/call/yodel/yodel_test.h index add0950e76f..7ccb97e7d6a 100644 --- a/test/core/call/yodel/yodel_test.h +++ b/test/core/call/yodel/yodel_test.h @@ -24,13 +24,13 @@ #include #include "src/core/lib/event_engine/event_engine_context.h" -#include "src/core/lib/gprpp/debug_location.h" #include "src/core/lib/promise/cancel_callback.h" #include "src/core/lib/promise/detail/promise_factory.h" #include "src/core/lib/promise/promise.h" #include "src/core/lib/transport/call_arena_allocator.h" #include "src/core/lib/transport/call_spine.h" #include "src/core/lib/transport/metadata.h" +#include "src/core/util/debug_location.h" #include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/channel/call_finalization_test.cc b/test/core/channel/call_finalization_test.cc index 2539d753ac3..9e7ba84794d 100644 --- a/test/core/channel/call_finalization_test.cc +++ b/test/core/channel/call_finalization_test.cc @@ -22,9 +22,9 @@ #include -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/lib/resource_quota/resource_quota.h" +#include "src/core/util/ref_counted_ptr.h" #include "test/core/promise/test_context.h" namespace grpc_core { diff --git a/test/core/channel/channel_args_test.cc b/test/core/channel/channel_args_test.cc index 09f65577f0e..bb19b352e21 100644 --- a/test/core/channel/channel_args_test.cc +++ b/test/core/channel/channel_args_test.cc @@ -30,10 +30,10 @@ #include #include -#include "src/core/lib/gprpp/notification.h" -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/iomgr/exec_ctx.h" +#include "src/core/util/notification.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" #include "src/core/util/useful.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/channel/channel_stack_test.cc b/test/core/channel/channel_stack_test.cc index 10d4ee8e5fb..1c722beb282 100644 --- a/test/core/channel/channel_stack_test.cc +++ b/test/core/channel/channel_stack_test.cc @@ -27,8 +27,8 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_args_preconditioning.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/status_helper.h" #include "src/core/lib/iomgr/exec_ctx.h" +#include "src/core/util/status_helper.h" #include "test/core/test_util/test_config.h" static grpc_error_handle channel_init_func(grpc_channel_element* elem, diff --git a/test/core/channel/server_call_tracer_factory_test.cc b/test/core/channel/server_call_tracer_factory_test.cc index fd4b2bac8d9..821087f9d93 100644 --- a/test/core/channel/server_call_tracer_factory_test.cc +++ b/test/core/channel/server_call_tracer_factory_test.cc @@ -17,9 +17,9 @@ #include "gtest/gtest.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/resource_quota/arena.h" #include "src/core/telemetry/call_tracer.h" +#include "src/core/util/crash.h" namespace grpc_core { namespace { diff --git a/test/core/channelz/channelz_test.cc b/test/core/channelz/channelz_test.cc index 06d11c08b73..a43950eefbb 100644 --- a/test/core/channelz/channelz_test.cc +++ b/test/core/channelz/channelz_test.cc @@ -42,12 +42,12 @@ #include "src/core/channelz/channelz_registry.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/event_engine/default_event_engine.h" -#include "src/core/lib/gprpp/notification.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/surface/channel.h" #include "src/core/server/server.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_reader.h" +#include "src/core/util/notification.h" #include "src/core/util/useful.h" #include "test/core/event_engine/event_engine_test_utils.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/client_channel/client_channel_service_config_test.cc b/test/core/client_channel/client_channel_service_config_test.cc index e0c108fdb8d..28ffddf7f31 100644 --- a/test/core/client_channel/client_channel_service_config_test.cc +++ b/test/core/client_channel/client_channel_service_config_test.cc @@ -25,10 +25,10 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/service_config/service_config.h" #include "src/core/service_config/service_config_impl.h" #include "src/core/service_config/service_config_parser.h" +#include "src/core/util/time.h" #include "test/core/test_util/test_config.h" namespace grpc_core { diff --git a/test/core/client_channel/retry_service_config_test.cc b/test/core/client_channel/retry_service_config_test.cc index 410f064c9ec..5578e18ed11 100644 --- a/test/core/client_channel/retry_service_config_test.cc +++ b/test/core/client_channel/retry_service_config_test.cc @@ -27,11 +27,11 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/service_config/service_config.h" #include "src/core/service_config/service_config_impl.h" #include "src/core/service_config/service_config_parser.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" #include "test/core/test_util/test_config.h" namespace grpc_core { diff --git a/test/core/config/load_config_test.cc b/test/core/config/load_config_test.cc index 7e136c0f7d7..7d9ac207163 100644 --- a/test/core/config/load_config_test.cc +++ b/test/core/config/load_config_test.cc @@ -17,7 +17,7 @@ #include "absl/flags/flag.h" #include "gtest/gtest.h" -#include "src/core/lib/gprpp/env.h" +#include "src/core/util/env.h" ABSL_FLAG(std::vector, comma_separated_strings, {}, ""); diff --git a/test/core/end2end/bad_server_response_test.cc b/test/core/end2end/bad_server_response_test.cc index db615d1b098..f76151aa9d3 100644 --- a/test/core/end2end/bad_server_response_test.cc +++ b/test/core/end2end/bad_server_response_test.cc @@ -40,10 +40,6 @@ #include #include "src/core/lib/event_engine/shim.h" -#include "src/core/lib/gprpp/host_port.h" -#include "src/core/lib/gprpp/notification.h" -#include "src/core/lib/gprpp/status_helper.h" -#include "src/core/lib/gprpp/thd.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/error.h" @@ -51,7 +47,11 @@ #include "src/core/lib/iomgr/iomgr_fwd.h" #include "src/core/lib/iomgr/tcp_server.h" #include "src/core/lib/slice/slice_string_helpers.h" +#include "src/core/util/host_port.h" +#include "src/core/util/notification.h" +#include "src/core/util/status_helper.h" #include "src/core/util/string.h" +#include "src/core/util/thd.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/test_util/port.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/end2end/connection_refused_test.cc b/test/core/end2end/connection_refused_test.cc index f753cf7a86e..436b2fb5730 100644 --- a/test/core/end2end/connection_refused_test.cc +++ b/test/core/end2end/connection_refused_test.cc @@ -33,8 +33,8 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/host_port.h" #include "src/core/lib/iomgr/exec_ctx.h" +#include "src/core/util/host_port.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/test_util/port.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/end2end/cq_verifier.cc b/test/core/end2end/cq_verifier.cc index cb9e62f8f6a..d1a322bc989 100644 --- a/test/core/end2end/cq_verifier.cc +++ b/test/core/end2end/cq_verifier.cc @@ -45,10 +45,9 @@ #include #include "src/core/lib/compression/message_compress.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/match.h" #include "src/core/lib/surface/event_string.h" +#include "src/core/util/crash.h" +#include "src/core/util/match.h" #include "test/core/test_util/build.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/end2end/cq_verifier.h b/test/core/end2end/cq_verifier.h index ea2280e9051..d86d3248958 100644 --- a/test/core/end2end/cq_verifier.h +++ b/test/core/end2end/cq_verifier.h @@ -34,8 +34,8 @@ #include #include -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/time.h" namespace grpc_core { diff --git a/test/core/end2end/dualstack_socket_test.cc b/test/core/end2end/dualstack_socket_test.cc index 33ab2091c1b..44fc736e5ca 100644 --- a/test/core/end2end/dualstack_socket_test.cc +++ b/test/core/end2end/dualstack_socket_test.cc @@ -50,11 +50,11 @@ #include #include "src/core/lib/address_utils/sockaddr_utils.h" -#include "src/core/lib/gprpp/host_port.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/resolve_address.h" #include "src/core/lib/iomgr/socket_utils_posix.h" #include "src/core/lib/transport/error_utils.h" +#include "src/core/util/host_port.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/test_util/port.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/end2end/end2end_test_fuzzer.cc b/test/core/end2end/end2end_test_fuzzer.cc index 98cad6424b5..e74627117a2 100644 --- a/test/core/end2end/end2end_test_fuzzer.cc +++ b/test/core/end2end/end2end_test_fuzzer.cc @@ -33,10 +33,10 @@ #include "src/core/lib/config/config_vars.h" #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/experiments/config.h" -#include "src/core/lib/gprpp/env.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/executor.h" #include "src/core/lib/iomgr/timer_manager.h" +#include "src/core/util/env.h" #include "test/core/end2end/end2end_tests.h" #include "test/core/end2end/fixtures/h2_tls_common.h" #include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h" diff --git a/test/core/end2end/end2end_test_suites.cc b/test/core/end2end/end2end_test_suites.cc index 72c06d9d2c2..70553f9782f 100644 --- a/test/core/end2end/end2end_test_suites.cc +++ b/test/core/end2end/end2end_test_suites.cc @@ -49,14 +49,14 @@ #include "src/core/ext/transport/chaotic_good/server/chaotic_good_server.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/env.h" -#include "src/core/lib/gprpp/host_port.h" -#include "src/core/lib/gprpp/no_destruct.h" -#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/port.h" #include "src/core/lib/security/credentials/fake/fake_credentials.h" +#include "src/core/util/env.h" +#include "src/core/util/host_port.h" +#include "src/core/util/no_destruct.h" +#include "src/core/util/sync.h" #include "test/core/end2end/end2end_tests.h" #include "test/core/end2end/fixtures/h2_oauth2_common.h" #include "test/core/end2end/fixtures/h2_ssl_cred_reload_fixture.h" diff --git a/test/core/end2end/end2end_tests.cc b/test/core/end2end/end2end_tests.cc index 9443758ee5c..856b700711c 100644 --- a/test/core/end2end/end2end_tests.cc +++ b/test/core/end2end/end2end_tests.cc @@ -33,7 +33,7 @@ #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/event_engine/default_event_engine.h" -#include "src/core/lib/gprpp/no_destruct.h" +#include "src/core/util/no_destruct.h" #include "test/core/end2end/cq_verifier.h" namespace grpc_core { diff --git a/test/core/end2end/end2end_tests.h b/test/core/end2end/end2end_tests.h index a08321b6f69..12ddb76abbe 100644 --- a/test/core/end2end/end2end_tests.h +++ b/test/core/end2end/end2end_tests.h @@ -50,13 +50,13 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/config_vars.h" -#include "src/core/lib/gprpp/bitset.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/surface/call_test_only.h" #include "src/core/lib/surface/channel.h" +#include "src/core/util/bitset.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/time.h" #include "test/core/call/batch_builder.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/event_engine/event_engine_test_utils.h" diff --git a/test/core/end2end/fixtures/http_proxy_fixture.cc b/test/core/end2end/fixtures/http_proxy_fixture.cc index 957fb7101f0..88b65d3de94 100644 --- a/test/core/end2end/fixtures/http_proxy_fixture.cc +++ b/test/core/end2end/fixtures/http_proxy_fixture.cc @@ -46,11 +46,6 @@ #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/default_event_engine.h" -#include "src/core/lib/gprpp/host_port.h" -#include "src/core/lib/gprpp/memory.h" -#include "src/core/lib/gprpp/status_helper.h" -#include "src/core/lib/gprpp/thd.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/combiner.h" #include "src/core/lib/iomgr/endpoint.h" @@ -64,7 +59,12 @@ #include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/iomgr/tcp_client.h" #include "src/core/lib/iomgr/tcp_server.h" +#include "src/core/util/host_port.h" #include "src/core/util/http_client/parser.h" +#include "src/core/util/memory.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/thd.h" +#include "src/core/util/time.h" #include "test/core/test_util/port.h" struct grpc_end2end_http_proxy { diff --git a/test/core/end2end/fixtures/proxy.cc b/test/core/end2end/fixtures/proxy.cc index fd8a0f59763..1d78ebcd2b7 100644 --- a/test/core/end2end/fixtures/proxy.cc +++ b/test/core/end2end/fixtures/proxy.cc @@ -37,10 +37,10 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/host_port.h" -#include "src/core/lib/gprpp/thd.h" #include "src/core/lib/surface/call.h" +#include "src/core/util/crash.h" +#include "src/core/util/host_port.h" +#include "src/core/util/thd.h" #include "test/core/test_util/port.h" struct grpc_end2end_proxy { diff --git a/test/core/end2end/fixtures/secure_fixture.h b/test/core/end2end/fixtures/secure_fixture.h index fc9ef450c98..4586994981b 100644 --- a/test/core/end2end/fixtures/secure_fixture.h +++ b/test/core/end2end/fixtures/secure_fixture.h @@ -26,7 +26,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/host_port.h" +#include "src/core/util/host_port.h" #include "test/core/end2end/end2end_tests.h" #include "test/core/test_util/port.h" diff --git a/test/core/end2end/fixtures/sockpair_fixture.h b/test/core/end2end/fixtures/sockpair_fixture.h index 8731ab05acf..cedc002695f 100644 --- a/test/core/end2end/fixtures/sockpair_fixture.h +++ b/test/core/end2end/fixtures/sockpair_fixture.h @@ -32,7 +32,6 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_args_preconditioning.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/endpoint_pair.h" #include "src/core/lib/iomgr/error.h" @@ -43,6 +42,7 @@ #include "src/core/lib/surface/completion_queue.h" #include "src/core/lib/transport/transport.h" #include "src/core/server/server.h" +#include "src/core/util/ref_counted_ptr.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/end2end/fuzzers/api_fuzzer.cc b/test/core/end2end/fuzzers/api_fuzzer.cc index b92fdb5655c..c4e960a7d9a 100644 --- a/test/core/end2end/fuzzers/api_fuzzer.cc +++ b/test/core/end2end/fuzzers/api_fuzzer.cc @@ -49,10 +49,6 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/experiments/config.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/env.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/iomgr_fwd.h" @@ -60,6 +56,10 @@ #include "src/core/lib/iomgr/resolved_address.h" #include "src/core/resolver/dns/c_ares/grpc_ares_wrapper.h" #include "src/core/resolver/endpoint_addresses.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/env.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" #include "src/libfuzzer/libfuzzer_macro.h" #include "test/core/end2end/data/ssl_test_data.h" #include "test/core/end2end/fuzzers/api_fuzzer.pb.h" diff --git a/test/core/end2end/fuzzers/client_fuzzer.cc b/test/core/end2end/fuzzers/client_fuzzer.cc index 3d9d1778d8f..9278eb8d0e5 100644 --- a/test/core/end2end/fuzzers/client_fuzzer.cc +++ b/test/core/end2end/fuzzers/client_fuzzer.cc @@ -27,15 +27,15 @@ #include "src/core/lib/channel/channel_args_preconditioning.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/experiments/config.h" -#include "src/core/lib/gprpp/env.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/exec_ctx.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" #include "src/core/lib/transport/transport.h" +#include "src/core/util/env.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" #include "src/libfuzzer/libfuzzer_macro.h" #include "test/core/end2end/fuzzers/api_fuzzer.pb.h" #include "test/core/end2end/fuzzers/fuzzer_input.pb.h" diff --git a/test/core/end2end/fuzzers/connector_fuzzer.cc b/test/core/end2end/fuzzers/connector_fuzzer.cc index d1d93789f47..319e822cd03 100644 --- a/test/core/end2end/fuzzers/connector_fuzzer.cc +++ b/test/core/end2end/fuzzers/connector_fuzzer.cc @@ -18,9 +18,9 @@ #include "src/core/lib/event_engine/channel_args_endpoint_config.h" #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/event_engine/tcp_socket_utils.h" -#include "src/core/lib/gprpp/env.h" #include "src/core/lib/iomgr/executor.h" #include "src/core/lib/iomgr/timer_manager.h" +#include "src/core/util/env.h" #include "test/core/end2end/fuzzers/fuzzer_input.pb.h" #include "test/core/end2end/fuzzers/network_input.h" #include "test/core/test_util/fuzz_config_vars.h" diff --git a/test/core/end2end/fuzzers/fuzzing_common.cc b/test/core/end2end/fuzzers/fuzzing_common.cc index 2597694bf3b..820af4ab182 100644 --- a/test/core/end2end/fuzzers/fuzzing_common.cc +++ b/test/core/end2end/fuzzers/fuzzing_common.cc @@ -38,13 +38,13 @@ #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/experiments/config.h" -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/executor.h" #include "src/core/lib/iomgr/timer_manager.h" #include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/surface/channel.h" +#include "src/core/util/crash.h" #include "test/core/end2end/fuzzers/api_fuzzer.pb.h" namespace grpc_core { diff --git a/test/core/end2end/fuzzers/fuzzing_common.h b/test/core/end2end/fuzzers/fuzzing_common.h index 95c48fd4f7e..b365c698e2d 100644 --- a/test/core/end2end/fuzzers/fuzzing_common.h +++ b/test/core/end2end/fuzzers/fuzzing_common.h @@ -33,9 +33,9 @@ #include -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/resource_quota/resource_quota.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" #include "test/core/end2end/fuzzers/api_fuzzer.pb.h" #include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h" #include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.pb.h" diff --git a/test/core/end2end/fuzzers/network_input.h b/test/core/end2end/fuzzers/network_input.h index afb6490d81d..c036e88f1b9 100644 --- a/test/core/end2end/fuzzers/network_input.h +++ b/test/core/end2end/fuzzers/network_input.h @@ -15,8 +15,8 @@ #ifndef GRPC_TEST_CORE_END2END_FUZZERS_NETWORK_INPUT_H #define GRPC_TEST_CORE_END2END_FUZZERS_NETWORK_INPUT_H -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/endpoint.h" +#include "src/core/util/time.h" #include "test/core/end2end/fuzzers/fuzzer_input.pb.h" #include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h" #include "test/core/test_util/fuzzing_channel_args.h" diff --git a/test/core/end2end/fuzzers/server_fuzzer.cc b/test/core/end2end/fuzzers/server_fuzzer.cc index 05fef731cc4..ebf7034caec 100644 --- a/test/core/end2end/fuzzers/server_fuzzer.cc +++ b/test/core/end2end/fuzzers/server_fuzzer.cc @@ -23,8 +23,8 @@ #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/experiments/config.h" -#include "src/core/lib/gprpp/env.h" #include "src/core/lib/iomgr/exec_ctx.h" +#include "src/core/util/env.h" #include "test/core/end2end/fuzzers/api_fuzzer.pb.h" #include "test/core/end2end/fuzzers/fuzzer_input.pb.h" #include "test/core/end2end/fuzzers/fuzzing_common.h" diff --git a/test/core/end2end/goaway_server_test.cc b/test/core/end2end/goaway_server_test.cc index edf58074223..2ebc094e210 100644 --- a/test/core/end2end/goaway_server_test.cc +++ b/test/core/end2end/goaway_server_test.cc @@ -47,8 +47,6 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/experiments/experiments.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" @@ -60,6 +58,8 @@ #include "src/core/lib/iomgr/socket_utils.h" #include "src/core/resolver/dns/c_ares/grpc_ares_wrapper.h" #include "src/core/resolver/endpoint_addresses.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/time.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/test_util/port.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/end2end/h2_ssl_cert_test.cc b/test/core/end2end/h2_ssl_cert_test.cc index 84050e4c4e0..d9509266d0f 100644 --- a/test/core/end2end/h2_ssl_cert_test.cc +++ b/test/core/end2end/h2_ssl_cert_test.cc @@ -42,7 +42,7 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/config_vars.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "src/core/util/tmpfile.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/data/ssl_test_data.h" diff --git a/test/core/end2end/h2_ssl_session_reuse_test.cc b/test/core/end2end/h2_ssl_session_reuse_test.cc index 6fd220719e5..882f09995e8 100644 --- a/test/core/end2end/h2_ssl_session_reuse_test.cc +++ b/test/core/end2end/h2_ssl_session_reuse_test.cc @@ -37,9 +37,9 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/config_vars.h" -#include "src/core/lib/gprpp/host_port.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" +#include "src/core/util/host_port.h" #include "src/core/util/useful.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/test_util/port.h" diff --git a/test/core/end2end/h2_tls_peer_property_external_verifier_test.cc b/test/core/end2end/h2_tls_peer_property_external_verifier_test.cc index 24fc3e7c3c0..a9f74bed935 100644 --- a/test/core/end2end/h2_tls_peer_property_external_verifier_test.cc +++ b/test/core/end2end/h2_tls_peer_property_external_verifier_test.cc @@ -37,9 +37,9 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/config_vars.h" -#include "src/core/lib/gprpp/host_port.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" +#include "src/core/util/host_port.h" #include "src/core/util/useful.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/test_util/port.h" diff --git a/test/core/end2end/invalid_call_argument_test.cc b/test/core/end2end/invalid_call_argument_test.cc index 572c441d74d..ee7caff77ca 100644 --- a/test/core/end2end/invalid_call_argument_test.cc +++ b/test/core/end2end/invalid_call_argument_test.cc @@ -36,7 +36,7 @@ #include #include -#include "src/core/lib/gprpp/host_port.h" +#include "src/core/util/host_port.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/test_util/port.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/end2end/no_server_test.cc b/test/core/end2end/no_server_test.cc index 6f16b24ca6b..5e8d9add4fd 100644 --- a/test/core/end2end/no_server_test.cc +++ b/test/core/end2end/no_server_test.cc @@ -35,12 +35,12 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/resolver/endpoint_addresses.h" #include "src/core/resolver/fake/fake_resolver.h" #include "src/core/resolver/resolver.h" #include "src/core/service_config/service_config.h" +#include "src/core/util/ref_counted_ptr.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/end2end/tests/bad_ping.cc b/test/core/end2end/tests/bad_ping.cc index edd8760f82b..1a556d5ee52 100644 --- a/test/core/end2end/tests/bad_ping.cc +++ b/test/core/end2end/tests/bad_ping.cc @@ -24,7 +24,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" #define MAX_PING_STRIKES 2 diff --git a/test/core/end2end/tests/binary_metadata.cc b/test/core/end2end/tests/binary_metadata.cc index e4032f73036..a96ce818304 100644 --- a/test/core/end2end/tests/binary_metadata.cc +++ b/test/core/end2end/tests/binary_metadata.cc @@ -24,8 +24,8 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/slice/slice.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/end2end/tests/call_creds.cc b/test/core/end2end/tests/call_creds.cc index fd89930a967..6448243374e 100644 --- a/test/core/end2end/tests/call_creds.cc +++ b/test/core/end2end/tests/call_creds.cc @@ -28,8 +28,8 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/security/credentials/credentials.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/end2end/tests/call_host_override.cc b/test/core/end2end/tests/call_host_override.cc index 66b70c042af..ee847552969 100644 --- a/test/core/end2end/tests/call_host_override.cc +++ b/test/core/end2end/tests/call_host_override.cc @@ -25,7 +25,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/end2end/tests/cancel_after_accept.cc b/test/core/end2end/tests/cancel_after_accept.cc index e79e664332a..e22063354de 100644 --- a/test/core/end2end/tests/cancel_after_accept.cc +++ b/test/core/end2end/tests/cancel_after_accept.cc @@ -26,7 +26,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" #include "test/core/end2end/tests/cancel_test_helpers.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/end2end/tests/cancel_after_client_done.cc b/test/core/end2end/tests/cancel_after_client_done.cc index c1255ae7587..8ca9e005ba8 100644 --- a/test/core/end2end/tests/cancel_after_client_done.cc +++ b/test/core/end2end/tests/cancel_after_client_done.cc @@ -23,7 +23,7 @@ #include -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" #include "test/core/end2end/tests/cancel_test_helpers.h" diff --git a/test/core/end2end/tests/cancel_after_invoke.cc b/test/core/end2end/tests/cancel_after_invoke.cc index e5dec969c87..aeaf45bd2f1 100644 --- a/test/core/end2end/tests/cancel_after_invoke.cc +++ b/test/core/end2end/tests/cancel_after_invoke.cc @@ -24,7 +24,7 @@ #include #include "src/core/ext/transport/chttp2/transport/internal.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" #include "test/core/end2end/tests/cancel_test_helpers.h" diff --git a/test/core/end2end/tests/cancel_after_round_trip.cc b/test/core/end2end/tests/cancel_after_round_trip.cc index fbc54a0f51e..00f268683a4 100644 --- a/test/core/end2end/tests/cancel_after_round_trip.cc +++ b/test/core/end2end/tests/cancel_after_round_trip.cc @@ -26,7 +26,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" #include "test/core/end2end/tests/cancel_test_helpers.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/end2end/tests/cancel_with_status.cc b/test/core/end2end/tests/cancel_with_status.cc index e1dae672c16..4673ade3698 100644 --- a/test/core/end2end/tests/cancel_with_status.cc +++ b/test/core/end2end/tests/cancel_with_status.cc @@ -25,7 +25,7 @@ #include #include "src/core/ext/transport/chttp2/transport/internal.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/end2end/tests/channelz.cc b/test/core/end2end/tests/channelz.cc index 910495eeac4..dcd363a1051 100644 --- a/test/core/end2end/tests/channelz.cc +++ b/test/core/end2end/tests/channelz.cc @@ -27,9 +27,9 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/surface/channel.h" #include "src/core/server/server.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" using testing::HasSubstr; diff --git a/test/core/end2end/tests/client_streaming.cc b/test/core/end2end/tests/client_streaming.cc index e01d63d8f60..2cf6a617556 100644 --- a/test/core/end2end/tests/client_streaming.cc +++ b/test/core/end2end/tests/client_streaming.cc @@ -22,7 +22,7 @@ #include -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/end2end/tests/compressed_payload.cc b/test/core/end2end/tests/compressed_payload.cc index dbe9c350696..cbae272da8e 100644 --- a/test/core/end2end/tests/compressed_payload.cc +++ b/test/core/end2end/tests/compressed_payload.cc @@ -31,8 +31,8 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/bitset.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/bitset.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/end2end/tests/connectivity.cc b/test/core/end2end/tests/connectivity.cc index ee2c78d0b74..00e83236e4d 100644 --- a/test/core/end2end/tests/connectivity.cc +++ b/test/core/end2end/tests/connectivity.cc @@ -23,7 +23,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/end2end/tests/default_host.cc b/test/core/end2end/tests/default_host.cc index 770c15c4d61..fe5100dd845 100644 --- a/test/core/end2end/tests/default_host.cc +++ b/test/core/end2end/tests/default_host.cc @@ -24,7 +24,7 @@ #include -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" using testing::AnyOf; diff --git a/test/core/end2end/tests/disappearing_server.cc b/test/core/end2end/tests/disappearing_server.cc index 2cbff38e352..a42853b538b 100644 --- a/test/core/end2end/tests/disappearing_server.cc +++ b/test/core/end2end/tests/disappearing_server.cc @@ -24,7 +24,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" #ifndef GPR_WINDOWS // b/148110727 for more details diff --git a/test/core/end2end/tests/filter_causes_close.cc b/test/core/end2end/tests/filter_causes_close.cc index 8a77719e401..feae6776991 100644 --- a/test/core/end2end/tests/filter_causes_close.cc +++ b/test/core/end2end/tests/filter_causes_close.cc @@ -30,9 +30,6 @@ #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/channel/promise_based_filter.h" #include "src/core/lib/config/core_configuration.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/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/promise/arena_promise.h" @@ -40,6 +37,9 @@ #include "src/core/lib/surface/channel_stack_type.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/end2end/tests/filter_init_fails.cc b/test/core/end2end/tests/filter_init_fails.cc index c2b08486fee..5183489db1e 100644 --- a/test/core/end2end/tests/filter_init_fails.cc +++ b/test/core/end2end/tests/filter_init_fails.cc @@ -30,8 +30,6 @@ #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/status_helper.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/promise/arena_promise.h" @@ -39,6 +37,8 @@ #include "src/core/lib/surface/channel_stack_type.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" using ::testing::AnyOf; diff --git a/test/core/end2end/tests/filtered_metadata.cc b/test/core/end2end/tests/filtered_metadata.cc index a16afba692a..5f14a22a85b 100644 --- a/test/core/end2end/tests/filtered_metadata.cc +++ b/test/core/end2end/tests/filtered_metadata.cc @@ -24,7 +24,7 @@ #include -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/end2end/tests/graceful_server_shutdown.cc b/test/core/end2end/tests/graceful_server_shutdown.cc index 1cd6fccb2f4..34390d02f07 100644 --- a/test/core/end2end/tests/graceful_server_shutdown.cc +++ b/test/core/end2end/tests/graceful_server_shutdown.cc @@ -22,7 +22,7 @@ #include -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/end2end/tests/grpc_authz.cc b/test/core/end2end/tests/grpc_authz.cc index 710535ea5d3..48553dd0357 100644 --- a/test/core/end2end/tests/grpc_authz.cc +++ b/test/core/end2end/tests/grpc_authz.cc @@ -24,10 +24,10 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/notification.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/security/authorization/authorization_policy_provider.h" #include "src/core/lib/security/authorization/grpc_authorization_policy_provider.h" +#include "src/core/util/notification.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" #include "test/core/test_util/tls_utils.h" diff --git a/test/core/end2end/tests/high_initial_seqno.cc b/test/core/end2end/tests/high_initial_seqno.cc index 03228d34d37..e9dd5cd39a7 100644 --- a/test/core/end2end/tests/high_initial_seqno.cc +++ b/test/core/end2end/tests/high_initial_seqno.cc @@ -24,7 +24,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/end2end/tests/hpack_size.cc b/test/core/end2end/tests/hpack_size.cc index bbd783aa29f..766a00cbe99 100644 --- a/test/core/end2end/tests/hpack_size.cc +++ b/test/core/end2end/tests/hpack_size.cc @@ -29,7 +29,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/no_destruct.h" +#include "src/core/util/no_destruct.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/end2end/tests/http2_stats.cc b/test/core/end2end/tests/http2_stats.cc index a8de51639f7..51561dbbe17 100644 --- a/test/core/end2end/tests/http2_stats.cc +++ b/test/core/end2end/tests/http2_stats.cc @@ -33,9 +33,6 @@ #include "src/core/lib/channel/promise_based_filter.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/experiments/experiments.h" -#include "src/core/lib/gprpp/notification.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/promise/arena_promise.h" #include "src/core/lib/promise/context.h" @@ -48,6 +45,9 @@ #include "src/core/telemetry/call_tracer.h" #include "src/core/telemetry/metrics.h" #include "src/core/telemetry/tcp_tracer.h" +#include "src/core/util/notification.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" #include "test/core/test_util/fake_stats_plugin.h" diff --git a/test/core/end2end/tests/invoke_large_request.cc b/test/core/end2end/tests/invoke_large_request.cc index 283ec5cb7ae..3302ee48e89 100644 --- a/test/core/end2end/tests/invoke_large_request.cc +++ b/test/core/end2end/tests/invoke_large_request.cc @@ -26,8 +26,8 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/slice/slice.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/end2end/tests/keepalive_timeout.cc b/test/core/end2end/tests/keepalive_timeout.cc index 64b2aa09caa..9c94b653c84 100644 --- a/test/core/end2end/tests/keepalive_timeout.cc +++ b/test/core/end2end/tests/keepalive_timeout.cc @@ -27,8 +27,8 @@ #include "src/core/ext/transport/chttp2/transport/internal.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/config_vars.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/port.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/end2end/tests/large_metadata.cc b/test/core/end2end/tests/large_metadata.cc index eb0da4d38db..9f053983980 100644 --- a/test/core/end2end/tests/large_metadata.cc +++ b/test/core/end2end/tests/large_metadata.cc @@ -27,7 +27,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/end2end/tests/max_concurrent_streams.cc b/test/core/end2end/tests/max_concurrent_streams.cc index badbec90b1c..1b0d301b724 100644 --- a/test/core/end2end/tests/max_concurrent_streams.cc +++ b/test/core/end2end/tests/max_concurrent_streams.cc @@ -25,7 +25,7 @@ #include "src/core/ext/transport/chttp2/transport/internal.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/end2end/tests/max_connection_age.cc b/test/core/end2end/tests/max_connection_age.cc index 3b13e36458e..0938eb2393c 100644 --- a/test/core/end2end/tests/max_connection_age.cc +++ b/test/core/end2end/tests/max_connection_age.cc @@ -27,7 +27,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/end2end/tests/max_connection_idle.cc b/test/core/end2end/tests/max_connection_idle.cc index ab9371485ab..1dfbd2f6ede 100644 --- a/test/core/end2end/tests/max_connection_idle.cc +++ b/test/core/end2end/tests/max_connection_idle.cc @@ -27,7 +27,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/end2end/tests/negative_deadline.cc b/test/core/end2end/tests/negative_deadline.cc index 92c7aa2f120..c1c5392c1bf 100644 --- a/test/core/end2end/tests/negative_deadline.cc +++ b/test/core/end2end/tests/negative_deadline.cc @@ -22,7 +22,7 @@ #include -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/end2end/tests/no_logging.cc b/test/core/end2end/tests/no_logging.cc index c6d9db38d16..976c198ecb8 100644 --- a/test/core/end2end/tests/no_logging.cc +++ b/test/core/end2end/tests/no_logging.cc @@ -37,7 +37,7 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/end2end/tests/payload.cc b/test/core/end2end/tests/payload.cc index 06cd8a7b78e..31c5456dee4 100644 --- a/test/core/end2end/tests/payload.cc +++ b/test/core/end2end/tests/payload.cc @@ -22,8 +22,8 @@ #include -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/slice/slice.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/end2end/tests/ping.cc b/test/core/end2end/tests/ping.cc index 61eb6fbeef7..70b2fbb57c2 100644 --- a/test/core/end2end/tests/ping.cc +++ b/test/core/end2end/tests/ping.cc @@ -23,7 +23,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/end2end/tests/ping_pong_streaming.cc b/test/core/end2end/tests/ping_pong_streaming.cc index 3538e89d5fb..9cfd8bb92a9 100644 --- a/test/core/end2end/tests/ping_pong_streaming.cc +++ b/test/core/end2end/tests/ping_pong_streaming.cc @@ -20,8 +20,8 @@ #include -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/slice/slice.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/end2end/tests/proxy_auth.cc b/test/core/end2end/tests/proxy_auth.cc index 1de11151610..9b2b3897b83 100644 --- a/test/core/end2end/tests/proxy_auth.cc +++ b/test/core/end2end/tests/proxy_auth.cc @@ -24,7 +24,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" #include "test/core/end2end/fixtures/http_proxy_fixture.h" diff --git a/test/core/end2end/tests/registered_call.cc b/test/core/end2end/tests/registered_call.cc index 1b2db49211c..1dc13b5acd5 100644 --- a/test/core/end2end/tests/registered_call.cc +++ b/test/core/end2end/tests/registered_call.cc @@ -20,7 +20,7 @@ #include -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/end2end/tests/request_with_flags.cc b/test/core/end2end/tests/request_with_flags.cc index fe36ebdaaa8..60db5aae583 100644 --- a/test/core/end2end/tests/request_with_flags.cc +++ b/test/core/end2end/tests/request_with_flags.cc @@ -30,8 +30,8 @@ #include #include -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/time.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/end2end_tests.h" diff --git a/test/core/end2end/tests/request_with_payload.cc b/test/core/end2end/tests/request_with_payload.cc index bbfdf8ce5ed..d2da70e6ec6 100644 --- a/test/core/end2end/tests/request_with_payload.cc +++ b/test/core/end2end/tests/request_with_payload.cc @@ -22,7 +22,7 @@ #include -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/end2end/tests/resource_quota_server.cc b/test/core/end2end/tests/resource_quota_server.cc index 0bc7a69e034..4b25143b5ec 100644 --- a/test/core/end2end/tests/resource_quota_server.cc +++ b/test/core/end2end/tests/resource_quota_server.cc @@ -31,9 +31,9 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/experiments/experiments.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/slice/slice.h" +#include "src/core/util/crash.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/end2end/tests/retry.cc b/test/core/end2end/tests/retry.cc index ad9d875f9d1..22e3434e553 100644 --- a/test/core/end2end/tests/retry.cc +++ b/test/core/end2end/tests/retry.cc @@ -25,7 +25,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/end2end/tests/retry_cancel_after_first_attempt_starts.cc b/test/core/end2end/tests/retry_cancel_after_first_attempt_starts.cc index 253e34db8cf..cf33d718760 100644 --- a/test/core/end2end/tests/retry_cancel_after_first_attempt_starts.cc +++ b/test/core/end2end/tests/retry_cancel_after_first_attempt_starts.cc @@ -22,7 +22,7 @@ #include "src/core/ext/transport/chttp2/transport/internal.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/end2end/tests/retry_cancel_during_delay.cc b/test/core/end2end/tests/retry_cancel_during_delay.cc index 57c1c825b4d..255d31ffe87 100644 --- a/test/core/end2end/tests/retry_cancel_during_delay.cc +++ b/test/core/end2end/tests/retry_cancel_during_delay.cc @@ -24,7 +24,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" #include "test/core/end2end/tests/cancel_test_helpers.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/end2end/tests/retry_cancel_with_multiple_send_batches.cc b/test/core/end2end/tests/retry_cancel_with_multiple_send_batches.cc index a5b932a7ea0..0fa65238d88 100644 --- a/test/core/end2end/tests/retry_cancel_with_multiple_send_batches.cc +++ b/test/core/end2end/tests/retry_cancel_with_multiple_send_batches.cc @@ -32,13 +32,13 @@ #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/status_helper.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/call_combiner.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/surface/channel_stack_type.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" #include "test/core/end2end/tests/cancel_test_helpers.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/end2end/tests/retry_cancellation.cc b/test/core/end2end/tests/retry_cancellation.cc index 37000c08bf9..fd26c53c513 100644 --- a/test/core/end2end/tests/retry_cancellation.cc +++ b/test/core/end2end/tests/retry_cancellation.cc @@ -25,7 +25,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" #include "test/core/end2end/tests/cancel_test_helpers.h" diff --git a/test/core/end2end/tests/retry_disabled.cc b/test/core/end2end/tests/retry_disabled.cc index dc59d38f28b..be335e8cd6d 100644 --- a/test/core/end2end/tests/retry_disabled.cc +++ b/test/core/end2end/tests/retry_disabled.cc @@ -25,7 +25,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/end2end/tests/retry_exceeds_buffer_size_in_delay.cc b/test/core/end2end/tests/retry_exceeds_buffer_size_in_delay.cc index 3a0b681d198..0171d6a828d 100644 --- a/test/core/end2end/tests/retry_exceeds_buffer_size_in_delay.cc +++ b/test/core/end2end/tests/retry_exceeds_buffer_size_in_delay.cc @@ -23,7 +23,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/end2end/tests/retry_exceeds_buffer_size_in_initial_batch.cc b/test/core/end2end/tests/retry_exceeds_buffer_size_in_initial_batch.cc index 9d1382f4fa7..90ac8edd5a0 100644 --- a/test/core/end2end/tests/retry_exceeds_buffer_size_in_initial_batch.cc +++ b/test/core/end2end/tests/retry_exceeds_buffer_size_in_initial_batch.cc @@ -25,7 +25,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/end2end/tests/retry_exceeds_buffer_size_in_subsequent_batch.cc b/test/core/end2end/tests/retry_exceeds_buffer_size_in_subsequent_batch.cc index 1d6669c1121..f962de41719 100644 --- a/test/core/end2end/tests/retry_exceeds_buffer_size_in_subsequent_batch.cc +++ b/test/core/end2end/tests/retry_exceeds_buffer_size_in_subsequent_batch.cc @@ -25,7 +25,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/end2end/tests/retry_lb_drop.cc b/test/core/end2end/tests/retry_lb_drop.cc index d53c680037d..abe92f8f9ac 100644 --- a/test/core/end2end/tests/retry_lb_drop.cc +++ b/test/core/end2end/tests/retry_lb_drop.cc @@ -31,12 +31,12 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/load_balancing/lb_policy.h" #include "src/core/load_balancing/lb_policy_factory.h" #include "src/core/util/json/json.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" #include "test/core/test_util/test_lb_policies.h" diff --git a/test/core/end2end/tests/retry_lb_fail.cc b/test/core/end2end/tests/retry_lb_fail.cc index 84f8b3fac60..77ef319f3e3 100644 --- a/test/core/end2end/tests/retry_lb_fail.cc +++ b/test/core/end2end/tests/retry_lb_fail.cc @@ -25,7 +25,7 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" #include "test/core/test_util/test_lb_policies.h" diff --git a/test/core/end2end/tests/retry_non_retriable_status.cc b/test/core/end2end/tests/retry_non_retriable_status.cc index ce09e2a575d..4051f38daa6 100644 --- a/test/core/end2end/tests/retry_non_retriable_status.cc +++ b/test/core/end2end/tests/retry_non_retriable_status.cc @@ -25,7 +25,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/end2end/tests/retry_non_retriable_status_before_trailers.cc b/test/core/end2end/tests/retry_non_retriable_status_before_trailers.cc index 55bd0480e1f..07340b8d7f9 100644 --- a/test/core/end2end/tests/retry_non_retriable_status_before_trailers.cc +++ b/test/core/end2end/tests/retry_non_retriable_status_before_trailers.cc @@ -25,7 +25,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/end2end/tests/retry_per_attempt_recv_timeout.cc b/test/core/end2end/tests/retry_per_attempt_recv_timeout.cc index 4f7cbc05aa2..d21ce8ae7c3 100644 --- a/test/core/end2end/tests/retry_per_attempt_recv_timeout.cc +++ b/test/core/end2end/tests/retry_per_attempt_recv_timeout.cc @@ -24,7 +24,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/end2end/tests/retry_per_attempt_recv_timeout_on_last_attempt.cc b/test/core/end2end/tests/retry_per_attempt_recv_timeout_on_last_attempt.cc index 7e126c5dd26..f0447521b8c 100644 --- a/test/core/end2end/tests/retry_per_attempt_recv_timeout_on_last_attempt.cc +++ b/test/core/end2end/tests/retry_per_attempt_recv_timeout_on_last_attempt.cc @@ -24,7 +24,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/end2end/tests/retry_recv_initial_metadata.cc b/test/core/end2end/tests/retry_recv_initial_metadata.cc index 9738cd5dee1..2c4d44e6e1a 100644 --- a/test/core/end2end/tests/retry_recv_initial_metadata.cc +++ b/test/core/end2end/tests/retry_recv_initial_metadata.cc @@ -25,7 +25,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/end2end/tests/retry_recv_message.cc b/test/core/end2end/tests/retry_recv_message.cc index bee892a9e9e..a2fcbc5ebd0 100644 --- a/test/core/end2end/tests/retry_recv_message.cc +++ b/test/core/end2end/tests/retry_recv_message.cc @@ -25,7 +25,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/end2end/tests/retry_recv_message_replay.cc b/test/core/end2end/tests/retry_recv_message_replay.cc index c3057f88161..1260785976a 100644 --- a/test/core/end2end/tests/retry_recv_message_replay.cc +++ b/test/core/end2end/tests/retry_recv_message_replay.cc @@ -30,14 +30,14 @@ #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/status_helper.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" #include "src/core/lib/surface/channel_stack_type.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/time.h" +#include "src/core/util/unique_type_name.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/end2end/tests/retry_recv_trailing_metadata_error.cc b/test/core/end2end/tests/retry_recv_trailing_metadata_error.cc index cdbd9b75449..ab8a0fe4e34 100644 --- a/test/core/end2end/tests/retry_recv_trailing_metadata_error.cc +++ b/test/core/end2end/tests/retry_recv_trailing_metadata_error.cc @@ -28,13 +28,13 @@ #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/config/core_configuration.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/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/surface/channel_stack_type.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/end2end/tests/retry_send_initial_metadata_refs.cc b/test/core/end2end/tests/retry_send_initial_metadata_refs.cc index 5958580cb90..2f99da1ed2f 100644 --- a/test/core/end2end/tests/retry_send_initial_metadata_refs.cc +++ b/test/core/end2end/tests/retry_send_initial_metadata_refs.cc @@ -26,7 +26,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/end2end/tests/retry_send_op_fails.cc b/test/core/end2end/tests/retry_send_op_fails.cc index 825745ab96a..46ac40cff79 100644 --- a/test/core/end2end/tests/retry_send_op_fails.cc +++ b/test/core/end2end/tests/retry_send_op_fails.cc @@ -30,13 +30,13 @@ #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/status_helper.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/call_combiner.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/surface/channel_stack_type.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/end2end/tests/retry_send_recv_batch.cc b/test/core/end2end/tests/retry_send_recv_batch.cc index 75194d043c3..5f9ac9c7aa4 100644 --- a/test/core/end2end/tests/retry_send_recv_batch.cc +++ b/test/core/end2end/tests/retry_send_recv_batch.cc @@ -22,7 +22,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/end2end/tests/retry_server_pushback_delay.cc b/test/core/end2end/tests/retry_server_pushback_delay.cc index dff07f9698f..58507c833c3 100644 --- a/test/core/end2end/tests/retry_server_pushback_delay.cc +++ b/test/core/end2end/tests/retry_server_pushback_delay.cc @@ -25,7 +25,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/end2end/tests/retry_server_pushback_disabled.cc b/test/core/end2end/tests/retry_server_pushback_disabled.cc index ecbac8e8969..33226294b89 100644 --- a/test/core/end2end/tests/retry_server_pushback_disabled.cc +++ b/test/core/end2end/tests/retry_server_pushback_disabled.cc @@ -25,7 +25,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/end2end/tests/retry_streaming.cc b/test/core/end2end/tests/retry_streaming.cc index ab06d00a862..57b081803ac 100644 --- a/test/core/end2end/tests/retry_streaming.cc +++ b/test/core/end2end/tests/retry_streaming.cc @@ -27,8 +27,8 @@ #include "src/core/channelz/channelz.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/surface/channel.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" using testing::HasSubstr; diff --git a/test/core/end2end/tests/retry_streaming_after_commit.cc b/test/core/end2end/tests/retry_streaming_after_commit.cc index ecb42085956..2e642d4852f 100644 --- a/test/core/end2end/tests/retry_streaming_after_commit.cc +++ b/test/core/end2end/tests/retry_streaming_after_commit.cc @@ -25,7 +25,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/end2end/tests/retry_streaming_succeeds_before_replay_finished.cc b/test/core/end2end/tests/retry_streaming_succeeds_before_replay_finished.cc index 6870ec0ab9f..1d2e1f54d81 100644 --- a/test/core/end2end/tests/retry_streaming_succeeds_before_replay_finished.cc +++ b/test/core/end2end/tests/retry_streaming_succeeds_before_replay_finished.cc @@ -25,7 +25,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/end2end/tests/retry_throttled.cc b/test/core/end2end/tests/retry_throttled.cc index 52415d623ea..a0ca05f8757 100644 --- a/test/core/end2end/tests/retry_throttled.cc +++ b/test/core/end2end/tests/retry_throttled.cc @@ -25,7 +25,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/end2end/tests/retry_too_many_attempts.cc b/test/core/end2end/tests/retry_too_many_attempts.cc index 90cea14dd77..b68b5c14853 100644 --- a/test/core/end2end/tests/retry_too_many_attempts.cc +++ b/test/core/end2end/tests/retry_too_many_attempts.cc @@ -25,7 +25,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/end2end/tests/retry_transparent_goaway.cc b/test/core/end2end/tests/retry_transparent_goaway.cc index be68169cc26..40352a5148f 100644 --- a/test/core/end2end/tests/retry_transparent_goaway.cc +++ b/test/core/end2end/tests/retry_transparent_goaway.cc @@ -27,15 +27,15 @@ #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/status_helper.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" #include "src/core/lib/surface/channel_stack_type.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/time.h" +#include "src/core/util/unique_type_name.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/end2end/tests/retry_transparent_max_concurrent_streams.cc b/test/core/end2end/tests/retry_transparent_max_concurrent_streams.cc index 7cb19fc15db..75e4c8a9264 100644 --- a/test/core/end2end/tests/retry_transparent_max_concurrent_streams.cc +++ b/test/core/end2end/tests/retry_transparent_max_concurrent_streams.cc @@ -25,7 +25,7 @@ #include "src/core/ext/transport/chttp2/transport/internal.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/end2end/tests/retry_transparent_not_sent_on_wire.cc b/test/core/end2end/tests/retry_transparent_not_sent_on_wire.cc index b55ee605c4c..1a7ca65aae6 100644 --- a/test/core/end2end/tests/retry_transparent_not_sent_on_wire.cc +++ b/test/core/end2end/tests/retry_transparent_not_sent_on_wire.cc @@ -29,15 +29,15 @@ #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/status_helper.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" #include "src/core/lib/surface/channel_stack_type.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/time.h" +#include "src/core/util/unique_type_name.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/end2end/tests/retry_unref_before_finish.cc b/test/core/end2end/tests/retry_unref_before_finish.cc index 8957160457b..5c6a460c23d 100644 --- a/test/core/end2end/tests/retry_unref_before_finish.cc +++ b/test/core/end2end/tests/retry_unref_before_finish.cc @@ -22,7 +22,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/end2end/tests/retry_unref_before_recv.cc b/test/core/end2end/tests/retry_unref_before_recv.cc index c6503dea747..569e8114d6b 100644 --- a/test/core/end2end/tests/retry_unref_before_recv.cc +++ b/test/core/end2end/tests/retry_unref_before_recv.cc @@ -23,7 +23,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/end2end/tests/server_finishes_request.cc b/test/core/end2end/tests/server_finishes_request.cc index 6061207fd4c..b1df0a39904 100644 --- a/test/core/end2end/tests/server_finishes_request.cc +++ b/test/core/end2end/tests/server_finishes_request.cc @@ -22,7 +22,7 @@ #include -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/end2end/tests/server_streaming.cc b/test/core/end2end/tests/server_streaming.cc index f1397b8e9d4..fd4e34d9afc 100644 --- a/test/core/end2end/tests/server_streaming.cc +++ b/test/core/end2end/tests/server_streaming.cc @@ -24,7 +24,7 @@ #include -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/end2end_tests.h" diff --git a/test/core/end2end/tests/shutdown_finishes_calls.cc b/test/core/end2end/tests/shutdown_finishes_calls.cc index 5474f263f09..03e83c57c62 100644 --- a/test/core/end2end/tests/shutdown_finishes_calls.cc +++ b/test/core/end2end/tests/shutdown_finishes_calls.cc @@ -23,7 +23,7 @@ #include #include -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/end2end/tests/simple_delayed_request.cc b/test/core/end2end/tests/simple_delayed_request.cc index bbdfe4ab790..e9c61145e2b 100644 --- a/test/core/end2end/tests/simple_delayed_request.cc +++ b/test/core/end2end/tests/simple_delayed_request.cc @@ -26,7 +26,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/end2end/tests/simple_metadata.cc b/test/core/end2end/tests/simple_metadata.cc index 93893c85118..4d1df2c05ff 100644 --- a/test/core/end2end/tests/simple_metadata.cc +++ b/test/core/end2end/tests/simple_metadata.cc @@ -22,7 +22,7 @@ #include -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/end2end/tests/simple_request.cc b/test/core/end2end/tests/simple_request.cc index a68816ec78c..5236e9692da 100644 --- a/test/core/end2end/tests/simple_request.cc +++ b/test/core/end2end/tests/simple_request.cc @@ -30,9 +30,9 @@ #include -#include "src/core/lib/gprpp/time.h" #include "src/core/telemetry/stats.h" #include "src/core/telemetry/stats_data.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" using testing::HasSubstr; diff --git a/test/core/end2end/tests/streaming_error_response.cc b/test/core/end2end/tests/streaming_error_response.cc index 47d1e2ea9f1..3ac939ed861 100644 --- a/test/core/end2end/tests/streaming_error_response.cc +++ b/test/core/end2end/tests/streaming_error_response.cc @@ -25,7 +25,7 @@ #include -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/end2end/tests/timeout_before_request_call.cc b/test/core/end2end/tests/timeout_before_request_call.cc index 9d1635bd245..3a7217ed49d 100644 --- a/test/core/end2end/tests/timeout_before_request_call.cc +++ b/test/core/end2end/tests/timeout_before_request_call.cc @@ -24,8 +24,8 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/slice/slice.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/end2end/tests/trailing_metadata.cc b/test/core/end2end/tests/trailing_metadata.cc index b20f996f625..268b699b427 100644 --- a/test/core/end2end/tests/trailing_metadata.cc +++ b/test/core/end2end/tests/trailing_metadata.cc @@ -22,7 +22,7 @@ #include -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/end2end/tests/write_buffering.cc b/test/core/end2end/tests/write_buffering.cc index a551eb02c8d..d3956f80031 100644 --- a/test/core/end2end/tests/write_buffering.cc +++ b/test/core/end2end/tests/write_buffering.cc @@ -23,7 +23,7 @@ #include #include -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/end2end/tests/write_buffering_at_end.cc b/test/core/end2end/tests/write_buffering_at_end.cc index 684318d2186..064e979e8fb 100644 --- a/test/core/end2end/tests/write_buffering_at_end.cc +++ b/test/core/end2end/tests/write_buffering_at_end.cc @@ -23,7 +23,7 @@ #include #include -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/event_engine/common_closures_test.cc b/test/core/event_engine/common_closures_test.cc index ee4f71937d1..a09d2061d69 100644 --- a/test/core/event_engine/common_closures_test.cc +++ b/test/core/event_engine/common_closures_test.cc @@ -21,7 +21,7 @@ #include -#include "src/core/lib/gprpp/notification.h" +#include "src/core/util/notification.h" using ::grpc_event_engine::experimental::AnyInvocableClosure; using ::grpc_event_engine::experimental::SelfDeletingClosure; diff --git a/test/core/event_engine/event_engine_test_utils.cc b/test/core/event_engine/event_engine_test_utils.cc index c567ffa5f19..65b609a63d4 100644 --- a/test/core/event_engine/event_engine_test_utils.cc +++ b/test/core/event_engine/event_engine_test_utils.cc @@ -39,10 +39,10 @@ #include "src/core/lib/event_engine/channel_args_endpoint_config.h" #include "src/core/lib/event_engine/tcp_socket_utils.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/notification.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/resource_quota/memory_quota.h" +#include "src/core/util/crash.h" +#include "src/core/util/notification.h" +#include "src/core/util/time.h" #include "test/core/test_util/build.h" // IWYU pragma: no_include diff --git a/test/core/event_engine/event_engine_test_utils.h b/test/core/event_engine/event_engine_test_utils.h index 1b71dc549f7..fa0f3622e1a 100644 --- a/test/core/event_engine/event_engine_test_utils.h +++ b/test/core/event_engine/event_engine_test_utils.h @@ -31,9 +31,9 @@ #include #include -#include "src/core/lib/gprpp/notification.h" -#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/resource_quota/memory_quota.h" +#include "src/core/util/notification.h" +#include "src/core/util/sync.h" using EventEngineFactory = std::function< std::unique_ptr()>; diff --git a/test/core/event_engine/forkable_test.cc b/test/core/event_engine/forkable_test.cc index c15c3d76494..86dbe636593 100644 --- a/test/core/event_engine/forkable_test.cc +++ b/test/core/event_engine/forkable_test.cc @@ -30,7 +30,7 @@ #include "gtest/gtest.h" #include "src/core/lib/config/config_vars.h" -#include "src/core/lib/gprpp/no_destruct.h" +#include "src/core/util/no_destruct.h" namespace { using ::grpc_event_engine::experimental::Forkable; diff --git a/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.cc b/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.cc index 913da903038..0a85dafe2b4 100644 --- a/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.cc +++ b/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.cc @@ -32,10 +32,10 @@ #include "src/core/lib/debug/trace.h" #include "src/core/lib/event_engine/tcp_socket_utils.h" -#include "src/core/lib/gprpp/dump_args.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/port.h" #include "src/core/telemetry/stats.h" +#include "src/core/util/dump_args.h" +#include "src/core/util/time.h" #include "src/core/util/useful.h" #include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.pb.h" #include "test/core/test_util/port.h" @@ -43,7 +43,7 @@ #if defined(GRPC_POSIX_SOCKET_TCP) #include "src/core/lib/event_engine/posix_engine/native_posix_dns_resolver.h" #else -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #endif // IWYU pragma: no_include diff --git a/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h b/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h index 93aa42c3563..23193ce99c6 100644 --- a/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h +++ b/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h @@ -42,8 +42,8 @@ #include #include "src/core/lib/event_engine/time_util.h" -#include "src/core/lib/gprpp/no_destruct.h" -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/no_destruct.h" +#include "src/core/util/sync.h" #include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.pb.h" #include "test/core/test_util/port.h" diff --git a/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine_unittest.cc b/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine_unittest.cc index e78e4aaa01e..e5eb79fccc3 100644 --- a/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine_unittest.cc +++ b/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine_unittest.cc @@ -21,7 +21,7 @@ #include -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" using ::grpc_event_engine::experimental::FuzzingEventEngine; diff --git a/test/core/event_engine/posix/event_poller_posix_test.cc b/test/core/event_engine/posix/event_poller_posix_test.cc index d6c29bcfc51..673c4f9c78a 100644 --- a/test/core/event_engine/posix/event_poller_posix_test.cc +++ b/test/core/event_engine/posix/event_poller_posix_test.cc @@ -35,8 +35,8 @@ #include "src/core/lib/event_engine/poller.h" #include "src/core/lib/event_engine/posix_engine/wakeup_fd_pipe.h" #include "src/core/lib/event_engine/posix_engine/wakeup_fd_posix.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/iomgr/port.h" +#include "src/core/util/ref_counted_ptr.h" // IWYU pragma: no_include // IWYU pragma: no_include @@ -63,10 +63,10 @@ #include "src/core/lib/event_engine/posix_engine/event_poller_posix_default.h" #include "src/core/lib/event_engine/posix_engine/posix_engine.h" #include "src/core/lib/event_engine/posix_engine/posix_engine_closure.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/dual_ref_counted.h" -#include "src/core/lib/gprpp/notification.h" -#include "src/core/lib/gprpp/strerror.h" +#include "src/core/util/crash.h" +#include "src/core/util/dual_ref_counted.h" +#include "src/core/util/notification.h" +#include "src/core/util/strerror.h" #include "test/core/event_engine/posix/posix_engine_test_utils.h" #include "test/core/test_util/port.h" diff --git a/test/core/event_engine/posix/lock_free_event_test.cc b/test/core/event_engine/posix/lock_free_event_test.cc index c00ac1c6e2a..f53aea94ad5 100644 --- a/test/core/event_engine/posix/lock_free_event_test.cc +++ b/test/core/event_engine/posix/lock_free_event_test.cc @@ -32,7 +32,7 @@ #include "src/core/lib/event_engine/posix_engine/event_poller.h" #include "src/core/lib/event_engine/posix_engine/lockfree_event.h" #include "src/core/lib/event_engine/posix_engine/posix_engine_closure.h" -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/sync.h" using ::grpc_event_engine::experimental::EventEngine; using ::grpc_event_engine::experimental::Scheduler; diff --git a/test/core/event_engine/posix/log_too_many_open_files_test.cc b/test/core/event_engine/posix/log_too_many_open_files_test.cc index 3ae18a73ede..c87b879a286 100644 --- a/test/core/event_engine/posix/log_too_many_open_files_test.cc +++ b/test/core/event_engine/posix/log_too_many_open_files_test.cc @@ -24,7 +24,7 @@ #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/gprpp/strerror.h" +#include "src/core/util/strerror.h" #include "test/core/test_util/test_config.h" using ::grpc_event_engine::experimental::PosixSocketWrapper; diff --git a/test/core/event_engine/posix/posix_endpoint_test.cc b/test/core/event_engine/posix/posix_endpoint_test.cc index 5effe01234e..a8ec3af12c5 100644 --- a/test/core/event_engine/posix/posix_endpoint_test.cc +++ b/test/core/event_engine/posix/posix_endpoint_test.cc @@ -45,10 +45,10 @@ #include "src/core/lib/event_engine/posix_engine/posix_engine_closure.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/gprpp/dual_ref_counted.h" -#include "src/core/lib/gprpp/notification.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/resource_quota/resource_quota.h" +#include "src/core/util/dual_ref_counted.h" +#include "src/core/util/notification.h" +#include "src/core/util/ref_counted_ptr.h" #include "test/core/event_engine/event_engine_test_utils.h" #include "test/core/event_engine/posix/posix_engine_test_utils.h" #include "test/core/event_engine/test_suite/posix/oracle_event_engine_posix.h" diff --git a/test/core/event_engine/posix/posix_engine_test_utils.cc b/test/core/event_engine/posix/posix_engine_test_utils.cc index 6f35b9065b9..30c7f408804 100644 --- a/test/core/event_engine/posix/posix_engine_test_utils.cc +++ b/test/core/event_engine/posix/posix_engine_test_utils.cc @@ -23,7 +23,7 @@ #include "absl/log/log.h" #include "absl/strings/str_format.h" -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" namespace grpc_event_engine { namespace experimental { diff --git a/test/core/event_engine/posix/posix_event_engine_connect_test.cc b/test/core/event_engine/posix/posix_event_engine_connect_test.cc index bf89dafc3fb..989e6c9f341 100644 --- a/test/core/event_engine/posix/posix_event_engine_connect_test.cc +++ b/test/core/event_engine/posix/posix_event_engine_connect_test.cc @@ -43,10 +43,10 @@ #include "src/core/lib/event_engine/channel_args_endpoint_config.h" #include "src/core/lib/event_engine/posix_engine/posix_engine.h" #include "src/core/lib/event_engine/tcp_socket_utils.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/notification.h" #include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/lib/resource_quota/resource_quota.h" +#include "src/core/util/crash.h" +#include "src/core/util/notification.h" #include "test/core/event_engine/event_engine_test_utils.h" #include "test/core/test_util/port.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/event_engine/posix/timer_heap_test.cc b/test/core/event_engine/posix/timer_heap_test.cc index e9249444dd4..ee1a82e6e0b 100644 --- a/test/core/event_engine/posix/timer_heap_test.cc +++ b/test/core/event_engine/posix/timer_heap_test.cc @@ -29,7 +29,7 @@ #include "gtest/gtest.h" #include "src/core/lib/event_engine/posix_engine/timer.h" -#include "src/core/lib/gprpp/bitset.h" +#include "src/core/util/bitset.h" using testing::Contains; using testing::Not; diff --git a/test/core/event_engine/posix/timer_list_test.cc b/test/core/event_engine/posix/timer_list_test.cc index 4d77f2a5e58..0fae801fb94 100644 --- a/test/core/event_engine/posix/timer_list_test.cc +++ b/test/core/event_engine/posix/timer_list_test.cc @@ -28,7 +28,7 @@ #include #include "src/core/lib/event_engine/posix_engine/timer.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" using testing::Mock; using testing::Return; diff --git a/test/core/event_engine/posix/traced_buffer_list_test.cc b/test/core/event_engine/posix/traced_buffer_list_test.cc index b6c8c0b7b3d..9e267fe1d3f 100644 --- a/test/core/event_engine/posix/traced_buffer_list_test.cc +++ b/test/core/event_engine/posix/traced_buffer_list_test.cc @@ -24,9 +24,9 @@ #include #include -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/port.h" +#include "src/core/util/time.h" #include "src/core/util/useful.h" #ifdef GRPC_LINUX_ERRQUEUE diff --git a/test/core/event_engine/query_extensions_test.cc b/test/core/event_engine/query_extensions_test.cc index 5f9f43ab55e..d657f43b81f 100644 --- a/test/core/event_engine/query_extensions_test.cc +++ b/test/core/event_engine/query_extensions_test.cc @@ -23,7 +23,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" namespace grpc_event_engine { namespace experimental { diff --git a/test/core/event_engine/test_suite/posix/oracle_event_engine_posix.cc b/test/core/event_engine/test_suite/posix/oracle_event_engine_posix.cc index 54cf3d599e8..3efef67009f 100644 --- a/test/core/event_engine/test_suite/posix/oracle_event_engine_posix.cc +++ b/test/core/event_engine/test_suite/posix/oracle_event_engine_posix.cc @@ -35,9 +35,9 @@ #include #include "src/core/lib/address_utils/sockaddr_utils.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/strerror.h" #include "src/core/lib/iomgr/resolved_address.h" +#include "src/core/util/crash.h" +#include "src/core/util/strerror.h" namespace grpc_event_engine { namespace experimental { diff --git a/test/core/event_engine/test_suite/posix/oracle_event_engine_posix.h b/test/core/event_engine/test_suite/posix/oracle_event_engine_posix.h index 52e9953c2b1..94fbb928832 100644 --- a/test/core/event_engine/test_suite/posix/oracle_event_engine_posix.h +++ b/test/core/event_engine/test_suite/posix/oracle_event_engine_posix.h @@ -30,10 +30,10 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/notification.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/thd.h" +#include "src/core/util/crash.h" +#include "src/core/util/notification.h" +#include "src/core/util/sync.h" +#include "src/core/util/thd.h" #include "test/core/event_engine/event_engine_test_utils.h" namespace grpc_event_engine { diff --git a/test/core/event_engine/test_suite/tests/client_test.cc b/test/core/event_engine/test_suite/tests/client_test.cc index 331d59a6c57..c6bd435a3cb 100644 --- a/test/core/event_engine/test_suite/tests/client_test.cc +++ b/test/core/event_engine/test_suite/tests/client_test.cc @@ -37,10 +37,10 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/event_engine/channel_args_endpoint_config.h" #include "src/core/lib/event_engine/tcp_socket_utils.h" -#include "src/core/lib/gprpp/notification.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/lib/resource_quota/resource_quota.h" +#include "src/core/util/notification.h" #include "test/core/event_engine/event_engine_test_utils.h" #include "test/core/event_engine/test_suite/event_engine_test_framework.h" #include "test/core/test_util/port.h" diff --git a/test/core/event_engine/test_suite/tests/dns_test.cc b/test/core/event_engine/test_suite/tests/dns_test.cc index 635a796a1e4..a50102970ed 100644 --- a/test/core/event_engine/test_suite/tests/dns_test.cc +++ b/test/core/event_engine/test_suite/tests/dns_test.cc @@ -37,9 +37,9 @@ #include "src/core/lib/config/config_vars.h" #include "src/core/lib/event_engine/tcp_socket_utils.h" -#include "src/core/lib/gprpp/crash.h" // IWYU pragma: keep -#include "src/core/lib/gprpp/notification.h" #include "src/core/lib/iomgr/sockaddr.h" +#include "src/core/util/crash.h" // IWYU pragma: keep +#include "src/core/util/notification.h" #include "test/core/event_engine/test_suite/event_engine_test_framework.h" #include "test/core/test_util/fake_udp_and_tcp_server.h" #include "test/core/test_util/port.h" diff --git a/test/core/event_engine/test_suite/tests/server_test.cc b/test/core/event_engine/test_suite/tests/server_test.cc index e71bcd58cb8..88e64ef04e0 100644 --- a/test/core/event_engine/test_suite/tests/server_test.cc +++ b/test/core/event_engine/test_suite/tests/server_test.cc @@ -37,10 +37,10 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/event_engine/channel_args_endpoint_config.h" #include "src/core/lib/event_engine/tcp_socket_utils.h" -#include "src/core/lib/gprpp/notification.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/lib/resource_quota/resource_quota.h" +#include "src/core/util/notification.h" #include "test/core/event_engine/event_engine_test_utils.h" #include "test/core/event_engine/test_suite/event_engine_test_framework.h" #include "test/core/test_util/port.h" diff --git a/test/core/event_engine/test_suite/tests/timer_test.cc b/test/core/event_engine/test_suite/tests/timer_test.cc index 543f5c97d2c..c4a4e5cc35a 100644 --- a/test/core/event_engine/test_suite/tests/timer_test.cc +++ b/test/core/event_engine/test_suite/tests/timer_test.cc @@ -35,7 +35,7 @@ #include #include "src/core/lib/event_engine/time_util.h" -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/sync.h" #include "test/core/event_engine/test_suite/event_engine_test_framework.h" using ::testing::ElementsAre; diff --git a/test/core/event_engine/test_suite/tools/echo_client.cc b/test/core/event_engine/test_suite/tools/echo_client.cc index afc109e78ed..76749f58309 100644 --- a/test/core/event_engine/test_suite/tools/echo_client.cc +++ b/test/core/event_engine/test_suite/tools/echo_client.cc @@ -53,9 +53,9 @@ #include "src/core/lib/event_engine/channel_args_endpoint_config.h" #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/event_engine/tcp_socket_utils.h" -#include "src/core/lib/gprpp/notification.h" #include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/resolver/resolver_registry.h" +#include "src/core/util/notification.h" extern absl::AnyInvocable< std::unique_ptr(void)> diff --git a/test/core/event_engine/thread_pool_test.cc b/test/core/event_engine/thread_pool_test.cc index ead7e44e134..29f32d16691 100644 --- a/test/core/event_engine/thread_pool_test.cc +++ b/test/core/event_engine/thread_pool_test.cc @@ -32,9 +32,9 @@ #include "src/core/lib/event_engine/thread_pool/thread_count.h" #include "src/core/lib/event_engine/thread_pool/work_stealing_thread_pool.h" -#include "src/core/lib/gprpp/notification.h" -#include "src/core/lib/gprpp/thd.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/notification.h" +#include "src/core/util/thd.h" +#include "src/core/util/time.h" #include "test/core/test_util/test_config.h" namespace grpc_event_engine { diff --git a/test/core/event_engine/windows/iocp_test.cc b/test/core/event_engine/windows/iocp_test.cc index e96b8d3816d..b5ee504c643 100644 --- a/test/core/event_engine/windows/iocp_test.cc +++ b/test/core/event_engine/windows/iocp_test.cc @@ -32,8 +32,8 @@ #include "src/core/lib/event_engine/thread_pool/thread_pool.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/notification.h" #include "src/core/lib/iomgr/error.h" +#include "src/core/util/notification.h" #include "test/core/event_engine/windows/create_sockpair.h" namespace { diff --git a/test/core/event_engine/windows/win_socket_test.cc b/test/core/event_engine/windows/win_socket_test.cc index fe780f8c190..daa3c5360f5 100644 --- a/test/core/event_engine/windows/win_socket_test.cc +++ b/test/core/event_engine/windows/win_socket_test.cc @@ -27,8 +27,8 @@ #include "src/core/lib/event_engine/thread_pool/thread_pool.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/notification.h" #include "src/core/lib/iomgr/error.h" +#include "src/core/util/notification.h" #include "test/core/event_engine/windows/create_sockpair.h" namespace { diff --git a/test/core/event_engine/windows/windows_endpoint_test.cc b/test/core/event_engine/windows/windows_endpoint_test.cc index a5682b7c356..9ada4bbf471 100644 --- a/test/core/event_engine/windows/windows_endpoint_test.cc +++ b/test/core/event_engine/windows/windows_endpoint_test.cc @@ -28,8 +28,8 @@ #include "src/core/lib/event_engine/windows/iocp.h" #include "src/core/lib/event_engine/windows/windows_endpoint.h" #include "src/core/lib/event_engine/windows/windows_engine.h" -#include "src/core/lib/gprpp/notification.h" #include "src/core/lib/resource_quota/memory_quota.h" +#include "src/core/util/notification.h" #include "test/core/event_engine/windows/create_sockpair.h" namespace grpc_event_engine { diff --git a/test/core/ext/filters/event_engine_client_channel_resolver/resolver_fuzzer.cc b/test/core/ext/filters/event_engine_client_channel_resolver/resolver_fuzzer.cc index a363e872eac..56e8783629b 100644 --- a/test/core/ext/filters/event_engine_client_channel_resolver/resolver_fuzzer.cc +++ b/test/core/ext/filters/event_engine_client_channel_resolver/resolver_fuzzer.cc @@ -33,13 +33,13 @@ #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/event_engine/tcp_socket_utils.h" #include "src/core/lib/experiments/config.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/work_serializer.h" -#include "src/core/lib/uri/uri_parser.h" #include "src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.h" #include "src/core/resolver/resolver.h" #include "src/core/resolver/resolver_factory.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/uri.h" +#include "src/core/util/work_serializer.h" #include "src/libfuzzer/libfuzzer_macro.h" #include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h" #include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.pb.h" diff --git a/test/core/ext/filters/rbac/rbac_service_config_parser_test.cc b/test/core/ext/filters/rbac/rbac_service_config_parser_test.cc index 0d5868881ec..369ebcc468d 100644 --- a/test/core/ext/filters/rbac/rbac_service_config_parser_test.cc +++ b/test/core/ext/filters/rbac/rbac_service_config_parser_test.cc @@ -28,11 +28,11 @@ #include #include -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/security/authorization/audit_logging.h" #include "src/core/service_config/service_config.h" #include "src/core/service_config/service_config_impl.h" #include "src/core/util/json/json_writer.h" +#include "src/core/util/ref_counted_ptr.h" #include "test/core/test_util/test_config.h" namespace grpc_core { diff --git a/test/core/filters/client_auth_filter_test.cc b/test/core/filters/client_auth_filter_test.cc index a8659d9f3cd..f6a29e17d89 100644 --- a/test/core/filters/client_auth_filter_test.cc +++ b/test/core/filters/client_auth_filter_test.cc @@ -28,8 +28,6 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/promise_based_filter.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/unique_type_name.h" #include "src/core/lib/promise/arena_promise.h" #include "src/core/lib/promise/promise.h" #include "src/core/lib/security/context/security_context.h" @@ -39,6 +37,8 @@ #include "src/core/lib/security/transport/auth_filters.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/unique_type_name.h" #include "src/core/util/useful.h" #include "test/core/filters/filter_test.h" diff --git a/test/core/filters/filter_test.cc b/test/core/filters/filter_test.cc index 694c26350b9..11ff4cfa087 100644 --- a/test/core/filters/filter_test.cc +++ b/test/core/filters/filter_test.cc @@ -29,7 +29,6 @@ #include "src/core/lib/channel/call_finalization.h" #include "src/core/lib/event_engine/default_event_engine.h" -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/iomgr/timer_manager.h" #include "src/core/lib/promise/activity.h" #include "src/core/lib/promise/arena_promise.h" @@ -39,6 +38,7 @@ #include "src/core/lib/promise/seq.h" #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/slice/slice.h" +#include "src/core/util/crash.h" #include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.pb.h" using grpc_event_engine::experimental::FuzzingEventEngine; diff --git a/test/core/filters/filter_test.h b/test/core/filters/filter_test.h index e905b84c8c6..4c193efce31 100644 --- a/test/core/filters/filter_test.h +++ b/test/core/filters/filter_test.h @@ -38,13 +38,13 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/promise_based_filter.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/lib/resource_quota/resource_quota.h" #include "src/core/lib/slice/slice_buffer.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/ref_counted_ptr.h" #include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h" #include "test/core/filters/filter_test.h" diff --git a/test/core/filters/gcp_authentication_filter_test.cc b/test/core/filters/gcp_authentication_filter_test.cc index 4c677df2b45..5f3880fa998 100644 --- a/test/core/filters/gcp_authentication_filter_test.cc +++ b/test/core/filters/gcp_authentication_filter_test.cc @@ -25,8 +25,6 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/promise_based_filter.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/unique_type_name.h" #include "src/core/lib/security/context/security_context.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/credentials/gcp_service_account_identity/gcp_service_account_identity_credentials.h" @@ -34,6 +32,8 @@ #include "src/core/resolver/xds/xds_resolver_attributes.h" #include "src/core/service_config/service_config_call_data.h" #include "src/core/service_config/service_config_impl.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/unique_type_name.h" #include "test/core/filters/filter_test.h" namespace grpc_core { diff --git a/test/core/gprpp/BUILD b/test/core/gprpp/BUILD deleted file mode 100644 index 70ba9534766..00000000000 --- a/test/core/gprpp/BUILD +++ /dev/null @@ -1,516 +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. - -load("//bazel:custom_exec_properties.bzl", "LARGE_MACHINE") -load("//bazel:grpc_build_system.bzl", "grpc_cc_test", "grpc_package") -load("//test/core/test_util:grpc_fuzzer.bzl", "grpc_proto_fuzzer") - -licenses(["notice"]) - -grpc_package(name = "test/core/gprpp") - -grpc_cc_test( - name = "directory_reader_test", - srcs = ["directory_reader_test.cc"], - data = [ - "//test/core/tsi/test_creds/crl_data/crls:ab06acdd.r0", - "//test/core/tsi/test_creds/crl_data/crls:b9322cac.r0", - "//test/core/tsi/test_creds/crl_data/crls:current.crl", - "//test/core/tsi/test_creds/crl_data/crls:intermediate.crl", - ], - external_deps = [ - "gtest", - ], - language = "C++", - uses_event_engine = False, - uses_polling = False, - deps = [ - "//src/core:directory_reader", - "//test/core/test_util:grpc_test_util", - ], -) - -grpc_cc_test( - name = "examine_stack_test", - srcs = ["examine_stack_test.cc"], - external_deps = [ - "absl/debugging:stacktrace", - "absl/debugging:symbolize", - "absl/log:log", - "gtest", - ], - language = "C++", - # TODO(https://github.com/grpc/grpc/issues/24627): Disable this on Windows - tags = ["no_windows"], - uses_event_engine = False, - uses_polling = False, - deps = [ - "//:gpr", - "//test/core/test_util:grpc_test_util", - ], -) - -grpc_cc_test( - name = "dump_args_test", - srcs = ["dump_args_test.cc"], - external_deps = [ - "gtest", - ], - language = "C++", - uses_event_engine = False, - uses_polling = False, - deps = [ - "//src/core:dump_args", - ], -) - -# TODO(hork): solidify fork support requirements for EventEngines -grpc_cc_test( - name = "fork_test", - srcs = ["fork_test.cc"], - external_deps = ["gtest"], - language = "C++", - tags = ["no_windows"], - uses_event_engine = True, # engines should behave appropriately on Fork - uses_polling = False, - deps = [ - "//:gpr", - "//test/core/test_util:grpc_test_util", - ], -) - -grpc_cc_test( - name = "bitset_test", - srcs = ["bitset_test.cc"], - external_deps = ["gtest"], - language = "C++", - uses_event_engine = False, - uses_polling = False, - deps = [ - "//src/core:bitset", - ], -) - -grpc_cc_test( - name = "if_list_test", - srcs = ["if_list_test.cc"], - external_deps = ["gtest"], - language = "C++", - uses_event_engine = False, - uses_polling = False, - deps = [ - "//src/core:if_list", - ], -) - -grpc_cc_test( - name = "no_destruct_test", - srcs = ["no_destruct_test.cc"], - external_deps = ["gtest"], - language = "C++", - uses_event_engine = False, - uses_polling = False, - deps = [ - "//src/core:no_destruct", - ], -) - -grpc_cc_test( - name = "match_test", - srcs = ["match_test.cc"], - external_deps = ["gtest"], - language = "C++", - uses_event_engine = False, - uses_polling = False, - deps = [ - "//src/core:match", - ], -) - -grpc_cc_test( - name = "overload_test", - srcs = ["overload_test.cc"], - external_deps = ["gtest"], - language = "C++", - uses_event_engine = False, - uses_polling = False, - deps = [ - "//src/core:overload", - ], -) - -grpc_cc_test( - name = "down_cast_test", - srcs = ["down_cast_test.cc"], - external_deps = ["gtest"], - language = "C++", - uses_event_engine = False, - uses_polling = False, - deps = [ - "//src/core:down_cast", - ], -) - -grpc_cc_test( - name = "table_test", - srcs = ["table_test.cc"], - external_deps = [ - "gtest", - "absl/types:optional", - ], - language = "C++", - uses_event_engine = False, - uses_polling = False, - deps = [ - "//src/core:table", - ], -) - -grpc_cc_test( - name = "host_port_test", - srcs = ["host_port_test.cc"], - external_deps = ["gtest"], - language = "C++", - uses_event_engine = False, - uses_polling = False, - deps = [ - "//:gpr", - "//test/core/test_util:grpc_test_util", - ], -) - -grpc_cc_test( - name = "mpscq_test", - srcs = ["mpscq_test.cc"], - exec_properties = LARGE_MACHINE, - external_deps = [ - "absl/log:log", - "gtest", - ], - language = "C++", - tags = ["no_windows"], # LARGE_MACHINE is not configured for windows RBE - uses_event_engine = False, - uses_polling = False, - deps = [ - "//:gpr", - "//test/core/test_util:grpc_test_util", - ], -) - -grpc_cc_test( - name = "orphanable_test", - srcs = ["orphanable_test.cc"], - external_deps = [ - "gtest", - ], - language = "C++", - deps = [ - "//:orphanable", - "//test/core/test_util:grpc_test_util", - ], -) - -grpc_cc_test( - name = "ref_counted_test", - srcs = ["ref_counted_test.cc"], - external_deps = [ - "gtest", - ], - language = "C++", - deps = [ - "//src/core:ref_counted", - "//test/core/test_util:grpc_test_util", - ], -) - -grpc_cc_test( - name = "dual_ref_counted_test", - srcs = ["dual_ref_counted_test.cc"], - external_deps = [ - "absl/log:check", - "gtest", - ], - language = "C++", - deps = [ - "//src/core:dual_ref_counted", - "//test/core/test_util:grpc_test_util", - ], -) - -grpc_cc_test( - name = "ref_counted_ptr_test", - srcs = ["ref_counted_ptr_test.cc"], - external_deps = [ - "absl/container:flat_hash_set", - "absl/log:check", - "gtest", - ], - language = "C++", - deps = [ - "//:ref_counted_ptr", - "//src/core:dual_ref_counted", - "//src/core:ref_counted", - "//test/core/test_util:grpc_test_util", - ], -) - -grpc_cc_test( - name = "thd_test", - srcs = ["thd_test.cc"], - external_deps = ["gtest"], - language = "C++", - uses_event_engine = False, - uses_polling = False, - deps = [ - "//:gpr", - "//test/core/test_util:grpc_test_util", - ], -) - -grpc_cc_test( - name = "stat_test", - srcs = ["stat_test.cc"], - external_deps = [ - "gtest", - ], - language = "C++", - uses_event_engine = False, - uses_polling = False, - deps = [ - "//:gpr", - "//:grpc", - "//test/core/test_util:grpc_test_util", - ], -) - -grpc_cc_test( - name = "status_helper_test", - srcs = ["status_helper_test.cc"], - external_deps = [ - "gtest", - ], - language = "C++", - uses_event_engine = False, - uses_polling = False, - deps = [ - "//:gpr", - "//test/core/test_util:grpc_test_util", - ], -) - -grpc_cc_test( - name = "time_util_test", - srcs = ["time_util_test.cc"], - external_deps = [ - "gtest", - ], - language = "C++", - uses_event_engine = False, - uses_polling = False, - deps = [ - "//:gpr", - "//test/core/test_util:grpc_test_util", - ], -) - -grpc_cc_test( - name = "cpp_impl_of_test", - srcs = ["cpp_impl_of_test.cc"], - external_deps = ["gtest"], - language = "c++", - uses_event_engine = False, - uses_polling = False, - deps = [ - "//:cpp_impl_of", - ], -) - -grpc_cc_test( - name = "chunked_vector_test", - srcs = ["chunked_vector_test.cc"], - external_deps = ["gtest"], - language = "c++", - tags = [ - "resource_quota_test", - ], - uses_event_engine = False, - uses_polling = False, - deps = [ - "//:gpr", - "//src/core:chunked_vector", - "//src/core:resource_quota", - ], -) - -grpc_proto_fuzzer( - name = "chunked_vector_fuzzer", - srcs = ["chunked_vector_fuzzer.cc"], - corpus = "chunked_vector_corpora", - external_deps = ["absl/log:check"], - language = "C++", - proto = "chunked_vector_fuzzer.proto", - tags = ["no_windows"], - uses_event_engine = False, - uses_polling = False, - deps = [ - "//src/core:chunked_vector", - "//src/core:resource_quota", - "//test/core/test_util:grpc_test_util", - ], -) - -grpc_cc_test( - name = "time_test", - srcs = ["time_test.cc"], - external_deps = ["gtest"], - language = "c++", - uses_event_engine = False, - uses_polling = False, - deps = [ - "//src/core:time", - ], -) - -grpc_cc_test( - name = "single_set_ptr_test", - srcs = ["single_set_ptr_test.cc"], - external_deps = [ - "absl/log:log", - "gtest", - ], - language = "c++", - uses_event_engine = False, - uses_polling = False, - deps = [ - "//src/core:single_set_ptr", - ], -) - -grpc_cc_test( - name = "sorted_pack_test", - srcs = ["sorted_pack_test.cc"], - external_deps = ["gtest"], - language = "c++", - uses_event_engine = False, - uses_polling = False, - deps = [ - "//src/core:sorted_pack", - ], -) - -grpc_cc_test( - name = "unique_type_name_test", - srcs = ["unique_type_name_test.cc"], - external_deps = [ - "gtest", - "absl/strings:str_format", - "absl/container:flat_hash_map", - ], - language = "c++", - uses_event_engine = False, - uses_polling = False, - deps = [ - "//src/core:unique_type_name", - ], -) - -grpc_cc_test( - name = "work_serializer_test", - srcs = ["work_serializer_test.cc"], - exec_properties = LARGE_MACHINE, - external_deps = [ - "gtest", - ], - flaky = True, - language = "C++", - shard_count = 5, - tags = [ - "no_windows", # LARGE_MACHINE is not configured for windows RBE - ], - deps = [ - "//:gpr", - "//:grpc", - "//test/core/event_engine:event_engine_test_utils", - "//test/core/test_util:grpc_test_util", - ], -) - -grpc_cc_test( - name = "validation_errors_test", - srcs = ["validation_errors_test.cc"], - external_deps = [ - "gtest", - ], - language = "C++", - deps = [ - "//src/core:validation_errors", - "//test/core/test_util:grpc_test_util", - ], -) - -grpc_cc_test( - name = "notification_test", - srcs = ["notification_test.cc"], - external_deps = [ - "gtest", - ], - language = "C++", - uses_event_engine = False, - uses_polling = False, - deps = ["//src/core:notification"], -) - -grpc_cc_test( - name = "load_file_test", - srcs = ["load_file_test.cc"], - external_deps = [ - "gtest", - ], - language = "C++", - uses_event_engine = False, - uses_polling = False, - deps = [ - "//src/core:load_file", - "//test/core/test_util:grpc_test_util", - ], -) - -grpc_cc_test( - name = "uuid_v4_test", - srcs = ["uuid_v4_test.cc"], - external_deps = [ - "gtest", - ], - language = "C++", - uses_event_engine = False, - uses_polling = False, - deps = [ - "//src/core:uuid_v4", - "//test/core/test_util:grpc_test_util", - ], -) - -grpc_cc_test( - name = "glob_test", - srcs = ["glob_test.cc"], - external_deps = ["gtest"], - language = "C++", - uses_event_engine = False, - uses_polling = False, - deps = [ - "//:gpr", - "//src/core:useful", - "//test/core/test_util:grpc_test_util", - ], -) diff --git a/test/core/gprpp/time_test.cc b/test/core/gprpp/time_test.cc deleted file mode 100644 index db554ac68cb..00000000000 --- a/test/core/gprpp/time_test.cc +++ /dev/null @@ -1,113 +0,0 @@ -// Copyright 2021 gRPC authors. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#include "src/core/lib/gprpp/time.h" - -#include - -#include "gtest/gtest.h" - -namespace grpc_core { -namespace testing { - -TEST(TimestampTest, Empty) { - EXPECT_EQ(Timestamp(), Timestamp::ProcessEpoch()); -} - -TEST(TimestampTest, Infinities) { - EXPECT_EQ(Timestamp::InfFuture() - Duration::Milliseconds(1), - Timestamp::InfFuture()); - EXPECT_EQ(Timestamp::InfPast() + Duration::Milliseconds(1), - Timestamp::InfPast()); - EXPECT_EQ(Timestamp::Now() - Timestamp::InfPast(), Duration::Infinity()); - EXPECT_EQ(Timestamp::Now() - Timestamp::InfFuture(), - Duration::NegativeInfinity()); - EXPECT_EQ(Timestamp::InfPast() - Timestamp::InfPast(), - Duration::NegativeInfinity()); - EXPECT_EQ(Timestamp::InfFuture() - Timestamp::InfPast(), - Duration::Infinity()); - EXPECT_EQ(Timestamp::InfFuture() - Timestamp::InfFuture(), - Duration::Infinity()); - EXPECT_EQ(Timestamp::InfPast() - Timestamp::InfFuture(), - Duration::NegativeInfinity()); -} - -TEST(TimestampTest, ToString) { - EXPECT_EQ(Timestamp::FromMillisecondsAfterProcessEpoch(42).ToString(), - "@42ms"); - EXPECT_EQ(Timestamp::InfFuture().ToString(), "@∞"); - EXPECT_EQ(Timestamp::InfPast().ToString(), "@-∞"); -} - -TEST(DurationTest, Empty) { EXPECT_EQ(Duration(), Duration::Zero()); } - -TEST(DurationTest, Scales) { - EXPECT_EQ(Duration::Milliseconds(1000), Duration::Seconds(1)); - EXPECT_EQ(Duration::Seconds(60), Duration::Minutes(1)); - EXPECT_EQ(Duration::Minutes(60), Duration::Hours(1)); - EXPECT_EQ(Duration::FromSecondsAsDouble(1.2), Duration::Milliseconds(1200)); - EXPECT_EQ(Duration::FromSecondsAndNanoseconds(1, 300000000), - Duration::Milliseconds(1300)); -} - -TEST(DurationTest, Epsilon) { - EXPECT_LE(Duration::Epsilon(), Duration::Milliseconds(1)); -} - -TEST(DurationTest, Infinities) { - EXPECT_EQ(Duration::Infinity() - Duration::Milliseconds(1), - Duration::Infinity()); - EXPECT_EQ(Duration::Infinity() + Duration::Milliseconds(1), - Duration::Infinity()); - EXPECT_EQ(Duration::Infinity() * 2, Duration::Infinity()); - EXPECT_EQ(Duration::Infinity() * -1, Duration::NegativeInfinity()); - EXPECT_EQ(Duration::Infinity() / 3, Duration::Infinity()); - EXPECT_EQ(Duration::NegativeInfinity() / -3, Duration::Infinity()); - EXPECT_EQ(Duration::NegativeInfinity() + Duration::Milliseconds(1), - Duration::NegativeInfinity()); - EXPECT_EQ(Duration::NegativeInfinity() - Duration::Milliseconds(1), - Duration::NegativeInfinity()); - EXPECT_EQ(Duration::NegativeInfinity() / 3, Duration::NegativeInfinity()); - EXPECT_EQ(Duration::Hours(std::numeric_limits::max()), - Duration::Infinity()); - EXPECT_EQ(Duration::FromSecondsAsDouble(1e100), Duration::Infinity()); - EXPECT_EQ(Duration::FromSecondsAsDouble(-1e100), - Duration::NegativeInfinity()); -} - -TEST(DurationTest, Multiplication) { - Duration d = Duration::Seconds(5); - EXPECT_EQ(d * 2, Duration::Seconds(10)); - d *= 3; - EXPECT_EQ(d, Duration::Seconds(15)); -} - -TEST(DurationTest, FromTimespan) { - EXPECT_EQ(Duration::FromTimespec(gpr_time_from_millis(1234, GPR_TIMESPAN)), - Duration::Milliseconds(1234)); -} - -TEST(DurationTest, ToString) { - EXPECT_EQ(Duration::Milliseconds(42).ToString(), "42ms"); - EXPECT_EQ(Duration::Infinity().ToString(), "∞"); - EXPECT_EQ(Duration::NegativeInfinity().ToString(), "-∞"); -} - -} // namespace testing -} // namespace grpc_core - -int main(int argc, char** argv) { - ::testing::InitGoogleTest(&argc, argv); - return RUN_ALL_TESTS(); -} diff --git a/test/core/handshake/client_ssl.cc b/test/core/handshake/client_ssl.cc index 8eb2db12ea6..3032abf8ced 100644 --- a/test/core/handshake/client_ssl.cc +++ b/test/core/handshake/client_ssl.cc @@ -58,9 +58,9 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/thd.h" +#include "src/core/util/crash.h" +#include "src/core/util/sync.h" +#include "src/core/util/thd.h" #include "test/core/test_util/tls_utils.h" #define SSL_CERT_PATH "src/core/tsi/test_creds/server1.pem" diff --git a/test/core/handshake/readahead_handshaker_server_ssl.cc b/test/core/handshake/readahead_handshaker_server_ssl.cc index b15edfc32c6..9b4203ec6f2 100644 --- a/test/core/handshake/readahead_handshaker_server_ssl.cc +++ b/test/core/handshake/readahead_handshaker_server_ssl.cc @@ -29,13 +29,13 @@ #include "src/core/handshaker/handshaker_registry.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.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/iomgr_fwd.h" #include "src/core/lib/iomgr/tcp_server.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" #include "test/core/handshake/server_ssl_common.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/handshake/server_ssl_common.cc b/test/core/handshake/server_ssl_common.cc index 0bebf83ed2e..7a8910fac34 100644 --- a/test/core/handshake/server_ssl_common.cc +++ b/test/core/handshake/server_ssl_common.cc @@ -46,10 +46,10 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/thd.h" #include "src/core/lib/iomgr/error.h" +#include "src/core/util/crash.h" +#include "src/core/util/sync.h" +#include "src/core/util/thd.h" #include "test/core/test_util/port.h" #include "test/core/test_util/test_config.h" #include "test/core/test_util/tls_utils.h" diff --git a/test/core/handshake/verify_peer_options.cc b/test/core/handshake/verify_peer_options.cc index 3e5e2b1590d..626dc964468 100644 --- a/test/core/handshake/verify_peer_options.cc +++ b/test/core/handshake/verify_peer_options.cc @@ -41,8 +41,8 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/thd.h" +#include "src/core/util/crash.h" +#include "src/core/util/thd.h" #include "test/core/test_util/port.h" #include "test/core/test_util/test_config.h" #include "test/core/test_util/tls_utils.h" diff --git a/test/core/http/httpcli_test.cc b/test/core/http/httpcli_test.cc index e63cbfe4f22..0f9b26ab912 100644 --- a/test/core/http/httpcli_test.cc +++ b/test/core/http/httpcli_test.cc @@ -43,14 +43,14 @@ #include #include -#include "src/core/lib/gprpp/status_helper.h" -#include "src/core/lib/gprpp/time.h" -#include "src/core/lib/gprpp/time_util.h" #include "src/core/lib/iomgr/pollset.h" #include "src/core/lib/iomgr/pollset_set.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/resolver/dns/c_ares/grpc_ares_wrapper.h" +#include "src/core/util/status_helper.h" #include "src/core/util/subprocess.h" +#include "src/core/util/time.h" +#include "src/core/util/time_util.h" #include "test/core/http/httpcli_test_util.h" #include "test/core/test_util/fake_udp_and_tcp_server.h" #include "test/core/test_util/port.h" diff --git a/test/core/http/httpscli_test.cc b/test/core/http/httpscli_test.cc index 4c15ea82dcf..11596745a6d 100644 --- a/test/core/http/httpscli_test.cc +++ b/test/core/http/httpscli_test.cc @@ -42,11 +42,6 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/status_helper.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/time.h" -#include "src/core/lib/gprpp/time_util.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" @@ -54,11 +49,16 @@ #include "src/core/lib/iomgr/polling_entity.h" #include "src/core/lib/iomgr/pollset.h" #include "src/core/lib/security/credentials/credentials.h" // IWYU pragma: keep -#include "src/core/lib/uri/uri_parser.h" #include "src/core/util/http_client/httpcli.h" #include "src/core/util/http_client/httpcli_ssl_credentials.h" #include "src/core/util/http_client/parser.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/status_helper.h" #include "src/core/util/subprocess.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.h" +#include "src/core/util/time_util.h" +#include "src/core/util/uri.h" #include "test/core/http/httpcli_test_util.h" #include "test/core/test_util/fake_udp_and_tcp_server.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/iomgr/buffer_list_test.cc b/test/core/iomgr/buffer_list_test.cc index 9994961a727..d6620314c29 100644 --- a/test/core/iomgr/buffer_list_test.cc +++ b/test/core/iomgr/buffer_list_test.cc @@ -25,10 +25,10 @@ #include #include -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/internal_errqueue.h" #include "src/core/lib/iomgr/port.h" +#include "src/core/util/time.h" #include "src/core/util/useful.h" #ifdef GRPC_LINUX_ERRQUEUE diff --git a/test/core/iomgr/combiner_test.cc b/test/core/iomgr/combiner_test.cc index bdd625adad5..1e3daba3978 100644 --- a/test/core/iomgr/combiner_test.cc +++ b/test/core/iomgr/combiner_test.cc @@ -25,9 +25,9 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/notification.h" -#include "src/core/lib/gprpp/thd.h" +#include "src/core/util/crash.h" +#include "src/core/util/notification.h" +#include "src/core/util/thd.h" #include "src/core/util/useful.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/iomgr/endpoint_pair_test.cc b/test/core/iomgr/endpoint_pair_test.cc index 71b631fb184..76518fa5cd0 100644 --- a/test/core/iomgr/endpoint_pair_test.cc +++ b/test/core/iomgr/endpoint_pair_test.cc @@ -35,9 +35,9 @@ #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/event_engine/shim.h" #include "src/core/lib/event_engine/tcp_socket_utils.h" -#include "src/core/lib/gprpp/notification.h" #include "src/core/lib/iomgr/event_engine_shims/endpoint.h" #include "src/core/lib/resource_quota/memory_quota.h" +#include "src/core/util/notification.h" #include "src/core/util/useful.h" #include "test/core/iomgr/endpoint_tests.h" #include "test/core/test_util/port.h" diff --git a/test/core/iomgr/endpoint_tests.cc b/test/core/iomgr/endpoint_tests.cc index 828fc5d40f5..5f0044bb6f0 100644 --- a/test/core/iomgr/endpoint_tests.cc +++ b/test/core/iomgr/endpoint_tests.cc @@ -29,10 +29,10 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/slice/slice_internal.h" +#include "src/core/util/crash.h" +#include "src/core/util/time.h" #include "src/core/util/useful.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/iomgr/error_test.cc b/test/core/iomgr/error_test.cc index 86650ac9d45..93ce01db702 100644 --- a/test/core/iomgr/error_test.cc +++ b/test/core/iomgr/error_test.cc @@ -28,8 +28,8 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/strerror.h" +#include "src/core/util/crash.h" +#include "src/core/util/strerror.h" #include "test/core/test_util/test_config.h" TEST(ErrorTest, SetGetInt) { diff --git a/test/core/iomgr/fd_conservation_posix_test.cc b/test/core/iomgr/fd_conservation_posix_test.cc index 4a37f512a06..8a75b4f41e2 100644 --- a/test/core/iomgr/fd_conservation_posix_test.cc +++ b/test/core/iomgr/fd_conservation_posix_test.cc @@ -22,9 +22,9 @@ #include -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/iomgr/endpoint_pair.h" #include "src/core/lib/iomgr/iomgr.h" +#include "src/core/util/crash.h" #include "test/core/test_util/test_config.h" int main(int argc, char** argv) { diff --git a/test/core/iomgr/fd_posix_test.cc b/test/core/iomgr/fd_posix_test.cc index 8395b75dec2..4de02c79db3 100644 --- a/test/core/iomgr/fd_posix_test.cc +++ b/test/core/iomgr/fd_posix_test.cc @@ -44,11 +44,11 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/strerror.h" #include "src/core/lib/iomgr/ev_posix.h" #include "src/core/lib/iomgr/iomgr.h" #include "src/core/lib/iomgr/socket_utils_posix.h" +#include "src/core/util/crash.h" +#include "src/core/util/strerror.h" static gpr_mu* g_mu; static grpc_pollset* g_pollset; diff --git a/test/core/iomgr/grpc_ipv6_loopback_available_test.cc b/test/core/iomgr/grpc_ipv6_loopback_available_test.cc index 2b8ae366778..e1d615ea9ca 100644 --- a/test/core/iomgr/grpc_ipv6_loopback_available_test.cc +++ b/test/core/iomgr/grpc_ipv6_loopback_available_test.cc @@ -20,8 +20,8 @@ #include -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/iomgr/port.h" +#include "src/core/util/crash.h" #include "test/core/test_util/test_config.h" #ifdef GPR_WINDOWS diff --git a/test/core/iomgr/pollset_windows_starvation_test.cc b/test/core/iomgr/pollset_windows_starvation_test.cc index ef554e4c468..dc75b1f61d6 100644 --- a/test/core/iomgr/pollset_windows_starvation_test.cc +++ b/test/core/iomgr/pollset_windows_starvation_test.cc @@ -20,13 +20,13 @@ #include #include -#include "src/core/lib/gprpp/thd.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/iocp_windows.h" #include "src/core/lib/iomgr/iomgr_internal.h" #include "src/core/lib/iomgr/pollset.h" #include "src/core/lib/iomgr/pollset_windows.h" #include "src/core/lib/surface/init.h" +#include "src/core/util/thd.h" #include "test/core/test_util/test_config.h" #if defined(GRPC_WINSOCK_SOCKET) diff --git a/test/core/iomgr/resolve_address_posix_test.cc b/test/core/iomgr/resolve_address_posix_test.cc index 9cebdbfa87e..1c0eecfa04c 100644 --- a/test/core/iomgr/resolve_address_posix_test.cc +++ b/test/core/iomgr/resolve_address_posix_test.cc @@ -35,15 +35,15 @@ #include #include "src/core/lib/config/config_vars.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/env.h" -#include "src/core/lib/gprpp/thd.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/executor.h" #include "src/core/lib/iomgr/iomgr.h" #include "src/core/lib/iomgr/pollset.h" #include "src/core/lib/iomgr/resolve_address.h" +#include "src/core/util/crash.h" +#include "src/core/util/env.h" #include "src/core/util/string.h" +#include "src/core/util/thd.h" +#include "src/core/util/time.h" #include "src/core/util/useful.h" #include "test/core/test_util/cmdline.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/iomgr/resolve_address_test.cc b/test/core/iomgr/resolve_address_test.cc index ec18410a267..97da4df464c 100644 --- a/test/core/iomgr/resolve_address_test.cc +++ b/test/core/iomgr/resolve_address_test.cc @@ -35,14 +35,14 @@ #include #include "src/core/lib/config/config_vars.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/executor.h" #include "src/core/lib/iomgr/iomgr.h" #include "src/core/lib/iomgr/pollset.h" #include "src/core/resolver/dns/c_ares/grpc_ares_wrapper.h" +#include "src/core/util/crash.h" #include "src/core/util/string.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.h" #include "test/core/test_util/cmdline.h" #include "test/core/test_util/fake_udp_and_tcp_server.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/iomgr/socket_utils_test.cc b/test/core/iomgr/socket_utils_test.cc index 6d56ad9d65c..861ea5eae25 100644 --- a/test/core/iomgr/socket_utils_test.cc +++ b/test/core/iomgr/socket_utils_test.cc @@ -33,9 +33,9 @@ #include #include -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/iomgr/socket_mutator.h" #include "src/core/lib/iomgr/socket_utils_posix.h" +#include "src/core/util/crash.h" #include "src/core/util/useful.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/iomgr/tcp_client_posix_test.cc b/test/core/iomgr/tcp_client_posix_test.cc index a32e874a9d7..6a567765b38 100644 --- a/test/core/iomgr/tcp_client_posix_test.cc +++ b/test/core/iomgr/tcp_client_posix_test.cc @@ -20,8 +20,8 @@ #include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/port.h" +#include "src/core/util/time.h" #include "test/core/test_util/port.h" #include "test/core/test_util/test_config.h" @@ -43,13 +43,13 @@ #include #include "src/core/lib/event_engine/channel_args_endpoint_config.h" -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/iomgr/iomgr.h" #include "src/core/lib/iomgr/pollset_set.h" #include "src/core/lib/iomgr/socket_utils_posix.h" #include "src/core/lib/iomgr/tcp_client.h" #include "src/core/lib/iomgr/timer.h" #include "src/core/lib/resource_quota/api.h" +#include "src/core/util/crash.h" static grpc_pollset_set* g_pollset_set; static gpr_mu* g_mu; diff --git a/test/core/iomgr/tcp_posix_test.cc b/test/core/iomgr/tcp_posix_test.cc index 6117be2beb1..897df84cf3e 100644 --- a/test/core/iomgr/tcp_posix_test.cc +++ b/test/core/iomgr/tcp_posix_test.cc @@ -19,9 +19,9 @@ #include "absl/time/time.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/notification.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/port.h" +#include "src/core/util/notification.h" +#include "src/core/util/time.h" // This test won't work except with posix sockets enabled #ifdef GRPC_POSIX_SOCKET_TCP @@ -47,7 +47,6 @@ #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/event_engine/posix.h" #include "src/core/lib/event_engine/shim.h" -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/iomgr/buffer_list.h" #include "src/core/lib/iomgr/ev_posix.h" #include "src/core/lib/iomgr/event_engine_shims/endpoint.h" @@ -55,6 +54,7 @@ #include "src/core/lib/iomgr/socket_utils_posix.h" #include "src/core/lib/iomgr/tcp_posix.h" #include "src/core/lib/slice/slice_internal.h" +#include "src/core/util/crash.h" #include "src/core/util/useful.h" #include "test/core/iomgr/endpoint_tests.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/iomgr/tcp_server_posix_test.cc b/test/core/iomgr/tcp_server_posix_test.cc index 6f4cc33cb00..09c4a5c0d83 100644 --- a/test/core/iomgr/tcp_server_posix_test.cc +++ b/test/core/iomgr/tcp_server_posix_test.cc @@ -19,8 +19,8 @@ #include #include "src/core/lib/event_engine/shim.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/port.h" +#include "src/core/util/time.h" #include "test/core/test_util/test_config.h" // This test won't work except with posix sockets enabled @@ -51,14 +51,14 @@ #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/event_engine/channel_args_endpoint_config.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/memory.h" -#include "src/core/lib/gprpp/strerror.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/iomgr.h" #include "src/core/lib/iomgr/resolve_address.h" #include "src/core/lib/iomgr/tcp_server.h" #include "src/core/lib/resource_quota/api.h" +#include "src/core/util/crash.h" +#include "src/core/util/memory.h" +#include "src/core/util/strerror.h" #include "test/core/test_util/port.h" #define LOG_TEST(x) LOG(INFO) << #x diff --git a/test/core/iomgr/timer_heap_test.cc b/test/core/iomgr/timer_heap_test.cc index af4571a4031..3e2b907e7b5 100644 --- a/test/core/iomgr/timer_heap_test.cc +++ b/test/core/iomgr/timer_heap_test.cc @@ -27,8 +27,8 @@ #include -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/iomgr/port.h" +#include "src/core/util/crash.h" #include "src/core/util/useful.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/iomgr/timer_list_test.cc b/test/core/iomgr/timer_list_test.cc index e3c98e83780..cd0a5221d60 100644 --- a/test/core/iomgr/timer_list_test.cc +++ b/test/core/iomgr/timer_list_test.cc @@ -27,11 +27,11 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/iomgr_internal.h" #include "src/core/lib/iomgr/port.h" #include "src/core/lib/iomgr/timer.h" +#include "src/core/util/crash.h" +#include "src/core/util/time.h" #include "test/core/test_util/test_config.h" #include "test/core/test_util/tracer_util.h" diff --git a/test/core/json/json_object_loader_test.cc b/test/core/json/json_object_loader_test.cc index 6ea9b7b0598..aad3567f86b 100644 --- a/test/core/json/json_object_loader_test.cc +++ b/test/core/json/json_object_loader_test.cc @@ -22,10 +22,10 @@ #include -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/util/json/json_reader.h" #include "src/core/util/json/json_writer.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_core { namespace { diff --git a/test/core/load_balancing/lb_policy_test_lib.h b/test/core/load_balancing/lb_policy_test_lib.h index 3066fbbc590..00c21dcd9a3 100644 --- a/test/core/load_balancing/lb_policy_test_lib.h +++ b/test/core/load_balancing/lb_policy_test_lib.h @@ -62,19 +62,10 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/event_engine/default_event_engine.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/match.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/gprpp/time.h" -#include "src/core/lib/gprpp/unique_type_name.h" -#include "src/core/lib/gprpp/work_serializer.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/resolved_address.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/transport/connectivity_state.h" -#include "src/core/lib/uri/uri_parser.h" #include "src/core/load_balancing/backend_metric_data.h" #include "src/core/load_balancing/health_check_client_internal.h" #include "src/core/load_balancing/lb_policy.h" @@ -84,7 +75,16 @@ #include "src/core/load_balancing/subchannel_interface.h" #include "src/core/resolver/endpoint_addresses.h" #include "src/core/service_config/service_config_call_data.h" +#include "src/core/util/debug_location.h" #include "src/core/util/json/json.h" +#include "src/core/util/match.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.h" +#include "src/core/util/unique_type_name.h" +#include "src/core/util/uri.h" +#include "src/core/util/work_serializer.h" #include "test/core/event_engine/event_engine_test_utils.h" #include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h" #include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.pb.h" diff --git a/test/core/load_balancing/outlier_detection_lb_config_parser_test.cc b/test/core/load_balancing/outlier_detection_lb_config_parser_test.cc index 40dad8d96d3..b5145f451ff 100644 --- a/test/core/load_balancing/outlier_detection_lb_config_parser_test.cc +++ b/test/core/load_balancing/outlier_detection_lb_config_parser_test.cc @@ -24,9 +24,9 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/service_config/service_config.h" #include "src/core/service_config/service_config_impl.h" +#include "src/core/util/ref_counted_ptr.h" #include "test/core/test_util/test_config.h" namespace grpc_core { diff --git a/test/core/load_balancing/outlier_detection_test.cc b/test/core/load_balancing/outlier_detection_test.cc index 2a809d485f7..e92c3bc4e84 100644 --- a/test/core/load_balancing/outlier_detection_test.cc +++ b/test/core/load_balancing/outlier_detection_test.cc @@ -35,13 +35,13 @@ #include #include -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/load_balancing/backend_metric_data.h" #include "src/core/load_balancing/lb_policy.h" #include "src/core/resolver/endpoint_addresses.h" #include "src/core/util/json/json.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" #include "test/core/load_balancing/lb_policy_test_lib.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/load_balancing/pick_first_test.cc b/test/core/load_balancing/pick_first_test.cc index 413c58be6ff..0f07d6fd39d 100644 --- a/test/core/load_balancing/pick_first_test.cc +++ b/test/core/load_balancing/pick_first_test.cc @@ -38,16 +38,16 @@ #include #include "src/core/lib/experiments/experiments.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/time.h" -#include "src/core/lib/gprpp/work_serializer.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/load_balancing/lb_policy.h" #include "src/core/resolver/endpoint_addresses.h" #include "src/core/telemetry/metrics.h" +#include "src/core/util/debug_location.h" #include "src/core/util/json/json.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" +#include "src/core/util/work_serializer.h" #include "test/core/load_balancing/lb_policy_test_lib.h" #include "test/core/test_util/fake_stats_plugin.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/load_balancing/ring_hash_test.cc b/test/core/load_balancing/ring_hash_test.cc index 9420834d51f..0861cdcb5db 100644 --- a/test/core/load_balancing/ring_hash_test.cc +++ b/test/core/load_balancing/ring_hash_test.cc @@ -34,11 +34,11 @@ #include #include -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/xxhash_inline.h" #include "src/core/load_balancing/lb_policy.h" #include "src/core/resolver/endpoint_addresses.h" #include "src/core/util/json/json.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/xxhash_inline.h" #include "test/core/load_balancing/lb_policy_test_lib.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/load_balancing/rls_lb_config_parser_test.cc b/test/core/load_balancing/rls_lb_config_parser_test.cc index 1bfef19d2df..edf3e8127bf 100644 --- a/test/core/load_balancing/rls_lb_config_parser_test.cc +++ b/test/core/load_balancing/rls_lb_config_parser_test.cc @@ -24,9 +24,9 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/service_config/service_config.h" #include "src/core/service_config/service_config_impl.h" +#include "src/core/util/ref_counted_ptr.h" #include "test/core/test_util/test_config.h" namespace grpc_core { diff --git a/test/core/load_balancing/round_robin_test.cc b/test/core/load_balancing/round_robin_test.cc index 697b0ebc107..78da9b904f3 100644 --- a/test/core/load_balancing/round_robin_test.cc +++ b/test/core/load_balancing/round_robin_test.cc @@ -24,9 +24,9 @@ #include -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/resolver/endpoint_addresses.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" #include "test/core/load_balancing/lb_policy_test_lib.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/load_balancing/static_stride_scheduler_benchmark.cc b/test/core/load_balancing/static_stride_scheduler_benchmark.cc index 7ae3973637b..aba086e7e40 100644 --- a/test/core/load_balancing/static_stride_scheduler_benchmark.cc +++ b/test/core/load_balancing/static_stride_scheduler_benchmark.cc @@ -27,8 +27,8 @@ #include "absl/types/optional.h" #include "absl/types/span.h" -#include "src/core/lib/gprpp/no_destruct.h" #include "src/core/load_balancing/weighted_round_robin/static_stride_scheduler.h" +#include "src/core/util/no_destruct.h" namespace grpc_core { namespace { diff --git a/test/core/load_balancing/weighted_round_robin_config_test.cc b/test/core/load_balancing/weighted_round_robin_config_test.cc index 7d6f3bb81b2..5da2fb5a006 100644 --- a/test/core/load_balancing/weighted_round_robin_config_test.cc +++ b/test/core/load_balancing/weighted_round_robin_config_test.cc @@ -23,9 +23,9 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/service_config/service_config.h" #include "src/core/service_config/service_config_impl.h" +#include "src/core/util/ref_counted_ptr.h" #include "test/core/test_util/test_config.h" namespace grpc_core { diff --git a/test/core/load_balancing/weighted_round_robin_test.cc b/test/core/load_balancing/weighted_round_robin_test.cc index d680a1c3e37..8faa6c693e1 100644 --- a/test/core/load_balancing/weighted_round_robin_test.cc +++ b/test/core/load_balancing/weighted_round_robin_test.cc @@ -40,16 +40,16 @@ #include #include -#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/time.h" #include "src/core/load_balancing/backend_metric_data.h" #include "src/core/load_balancing/lb_policy.h" #include "src/core/load_balancing/weighted_target/weighted_target.h" #include "src/core/resolver/endpoint_addresses.h" +#include "src/core/util/debug_location.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_writer.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" #include "test/core/load_balancing/lb_policy_test_lib.h" #include "test/core/test_util/fake_stats_plugin.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/load_balancing/xds_override_host_lb_config_parser_test.cc b/test/core/load_balancing/xds_override_host_lb_config_parser_test.cc index 175c41aedbd..3407ababe59 100644 --- a/test/core/load_balancing/xds_override_host_lb_config_parser_test.cc +++ b/test/core/load_balancing/xds_override_host_lb_config_parser_test.cc @@ -24,10 +24,10 @@ #include "src/core/client_channel/client_channel_service_config.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/load_balancing/xds/xds_override_host.h" #include "src/core/service_config/service_config.h" #include "src/core/service_config/service_config_impl.h" +#include "src/core/util/ref_counted_ptr.h" #include "src/core/xds/grpc/xds_health_status.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/load_balancing/xds_override_host_test.cc b/test/core/load_balancing/xds_override_host_test.cc index 11208870e89..4352b6db370 100644 --- a/test/core/load_balancing/xds_override_host_test.cc +++ b/test/core/load_balancing/xds_override_host_test.cc @@ -39,12 +39,11 @@ #include "src/core/ext/filters/stateful_session/stateful_session_filter.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/load_balancing/lb_policy.h" #include "src/core/resolver/endpoint_addresses.h" #include "src/core/resolver/xds/xds_config.h" #include "src/core/util/json/json.h" +#include "src/core/util/ref_counted_ptr.h" #include "src/core/xds/grpc/xds_health_status.h" #include "test/core/load_balancing/lb_policy_test_lib.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/matchers/BUILD b/test/core/matchers/BUILD deleted file mode 100644 index 8609304bd6c..00000000000 --- a/test/core/matchers/BUILD +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 2017 gRPC authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -load("//bazel:grpc_build_system.bzl", "grpc_cc_test", "grpc_package") - -licenses(["notice"]) - -grpc_package(name = "test/core/matchers") - -grpc_cc_test( - name = "matchers_test", - srcs = ["matchers_test.cc"], - external_deps = ["gtest"], - language = "C++", - deps = [ - "//:gpr", - "//:grpc", - "//test/core/test_util:grpc_test_util", - "//test/core/test_util:grpc_test_util_base", - ], -) diff --git a/test/core/memory_usage/callback_client.cc b/test/core/memory_usage/callback_client.cc index f36abd6ca1c..449fcbd34fe 100644 --- a/test/core/memory_usage/callback_client.cc +++ b/test/core/memory_usage/callback_client.cc @@ -38,7 +38,7 @@ #include #include -#include "src/core/lib/gprpp/notification.h" +#include "src/core/util/notification.h" #include "src/cpp/ext/chaotic_good.h" #include "src/proto/grpc/testing/benchmark_service.grpc.pb.h" #include "src/proto/grpc/testing/messages.pb.h" diff --git a/test/core/memory_usage/memory_usage_test.cc b/test/core/memory_usage/memory_usage_test.cc index 9433d633cef..798b90093da 100644 --- a/test/core/memory_usage/memory_usage_test.cc +++ b/test/core/memory_usage/memory_usage_test.cc @@ -46,7 +46,7 @@ #include #include "src/core/lib/config/config_vars.h" -#include "src/core/lib/gprpp/env.h" +#include "src/core/util/env.h" #include "src/core/util/subprocess.h" #include "src/proto/grpc/testing/xds/v3/cluster.pb.h" #include "src/proto/grpc/testing/xds/v3/health_check.pb.h" diff --git a/test/core/memory_usage/server.cc b/test/core/memory_usage/server.cc index 2a91f74368f..4f41754d06c 100644 --- a/test/core/memory_usage/server.cc +++ b/test/core/memory_usage/server.cc @@ -49,7 +49,7 @@ #include "src/core/ext/transport/chaotic_good/server/chaotic_good_server.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/host_port.h" +#include "src/core/util/host_port.h" #include "src/core/xds/grpc/xds_enabled_server.h" #include "test/core/end2end/data/ssl_test_data.h" #include "test/core/memory_usage/memstats.h" diff --git a/test/core/message_size/message_size_service_config_test.cc b/test/core/message_size/message_size_service_config_test.cc index e88434ed4d5..65fd3a11118 100644 --- a/test/core/message_size/message_size_service_config_test.cc +++ b/test/core/message_size/message_size_service_config_test.cc @@ -28,10 +28,10 @@ #include "src/core/ext/filters/message_size/message_size_filter.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/service_config/service_config.h" #include "src/core/service_config/service_config_impl.h" #include "src/core/service_config/service_config_parser.h" +#include "src/core/util/ref_counted_ptr.h" #include "test/core/test_util/test_config.h" namespace grpc_core { diff --git a/test/core/network_benchmarks/low_level_ping_pong.cc b/test/core/network_benchmarks/low_level_ping_pong.cc index 49bd712bb7a..9211b83e7ea 100644 --- a/test/core/network_benchmarks/low_level_ping_pong.cc +++ b/test/core/network_benchmarks/low_level_ping_pong.cc @@ -41,10 +41,10 @@ #include #include -#include "src/core/lib/gprpp/strerror.h" -#include "src/core/lib/gprpp/thd.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/socket_utils_posix.h" +#include "src/core/util/strerror.h" +#include "src/core/util/thd.h" #include "src/core/util/useful.h" #include "test/core/test_util/cmdline.h" #include "test/core/test_util/histogram.h" diff --git a/test/core/promise/arena_promise_test.cc b/test/core/promise/arena_promise_test.cc index d8f43426012..2f4da3b2c5d 100644 --- a/test/core/promise/arena_promise_test.cc +++ b/test/core/promise/arena_promise_test.cc @@ -21,10 +21,10 @@ #include -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/lib/resource_quota/resource_quota.h" +#include "src/core/util/ref_counted_ptr.h" #include "test/core/promise/test_context.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/promise/event_engine_wakeup_scheduler_test.cc b/test/core/promise/event_engine_wakeup_scheduler_test.cc index 306105d26ce..739c1a25f4e 100644 --- a/test/core/promise/event_engine_wakeup_scheduler_test.cc +++ b/test/core/promise/event_engine_wakeup_scheduler_test.cc @@ -24,9 +24,9 @@ #include #include -#include "src/core/lib/gprpp/notification.h" #include "src/core/lib/promise/activity.h" #include "src/core/lib/promise/poll.h" +#include "src/core/util/notification.h" namespace grpc_core { diff --git a/test/core/promise/for_each_test.cc b/test/core/promise/for_each_test.cc index 4ce3914004f..ea0f63732c1 100644 --- a/test/core/promise/for_each_test.cc +++ b/test/core/promise/for_each_test.cc @@ -21,7 +21,6 @@ #include -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/promise/activity.h" #include "src/core/lib/promise/inter_activity_pipe.h" #include "src/core/lib/promise/join.h" @@ -32,6 +31,7 @@ #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/lib/resource_quota/resource_quota.h" +#include "src/core/util/ref_counted_ptr.h" #include "test/core/promise/test_wakeup_schedulers.h" using testing::Mock; diff --git a/test/core/promise/inter_activity_latch_test.cc b/test/core/promise/inter_activity_latch_test.cc index 087489b240e..925062c561b 100644 --- a/test/core/promise/inter_activity_latch_test.cc +++ b/test/core/promise/inter_activity_latch_test.cc @@ -20,9 +20,9 @@ #include #include "src/core/lib/event_engine/default_event_engine.h" -#include "src/core/lib/gprpp/notification.h" #include "src/core/lib/promise/event_engine_wakeup_scheduler.h" #include "src/core/lib/promise/seq.h" +#include "src/core/util/notification.h" using grpc_event_engine::experimental::GetDefaultEventEngine; diff --git a/test/core/promise/interceptor_list_test.cc b/test/core/promise/interceptor_list_test.cc index f9ff107d289..d52ba611006 100644 --- a/test/core/promise/interceptor_list_test.cc +++ b/test/core/promise/interceptor_list_test.cc @@ -20,10 +20,10 @@ #include -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/lib/resource_quota/resource_quota.h" +#include "src/core/util/ref_counted_ptr.h" #include "test/core/promise/test_context.h" namespace grpc_core { diff --git a/test/core/promise/map_pipe_test.cc b/test/core/promise/map_pipe_test.cc index 0bcc4f7c739..5b702f2f8d0 100644 --- a/test/core/promise/map_pipe_test.cc +++ b/test/core/promise/map_pipe_test.cc @@ -22,7 +22,6 @@ #include -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/promise/activity.h" #include "src/core/lib/promise/for_each.h" #include "src/core/lib/promise/join.h" @@ -33,6 +32,7 @@ #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/lib/resource_quota/resource_quota.h" +#include "src/core/util/ref_counted_ptr.h" #include "test/core/promise/test_wakeup_schedulers.h" using testing::Mock; diff --git a/test/core/promise/observable_test.cc b/test/core/promise/observable_test.cc index 12fd66fe36c..45fb438ebd1 100644 --- a/test/core/promise/observable_test.cc +++ b/test/core/promise/observable_test.cc @@ -25,9 +25,9 @@ #include -#include "src/core/lib/gprpp/notification.h" #include "src/core/lib/promise/loop.h" #include "src/core/lib/promise/map.h" +#include "src/core/util/notification.h" #include "test/core/promise/poll_matcher.h" using testing::Mock; diff --git a/test/core/promise/party_test.cc b/test/core/promise/party_test.cc index 5695abffe09..09075395bf4 100644 --- a/test/core/promise/party_test.cc +++ b/test/core/promise/party_test.cc @@ -32,10 +32,6 @@ #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/event_engine/event_engine_context.h" -#include "src/core/lib/gprpp/notification.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/promise/context.h" #include "src/core/lib/promise/inter_activity_latch.h" @@ -45,6 +41,10 @@ #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/lib/resource_quota/resource_quota.h" +#include "src/core/util/notification.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.h" namespace grpc_core { diff --git a/test/core/promise/pipe_test.cc b/test/core/promise/pipe_test.cc index e1219c55400..b74f29df2e8 100644 --- a/test/core/promise/pipe_test.cc +++ b/test/core/promise/pipe_test.cc @@ -26,14 +26,14 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/promise/activity.h" #include "src/core/lib/promise/join.h" #include "src/core/lib/promise/map.h" #include "src/core/lib/promise/seq.h" #include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/lib/resource_quota/resource_quota.h" +#include "src/core/util/crash.h" +#include "src/core/util/ref_counted_ptr.h" #include "test/core/promise/test_wakeup_schedulers.h" using testing::MockFunction; diff --git a/test/core/promise/sleep_test.cc b/test/core/promise/sleep_test.cc index fc0c2f03c4b..eaa816294da 100644 --- a/test/core/promise/sleep_test.cc +++ b/test/core/promise/sleep_test.cc @@ -28,12 +28,12 @@ #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/event_engine/event_engine_context.h" -#include "src/core/lib/gprpp/notification.h" -#include "src/core/lib/gprpp/orphanable.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/promise/exec_ctx_wakeup_scheduler.h" #include "src/core/lib/promise/race.h" #include "src/core/lib/resource_quota/arena.h" +#include "src/core/util/notification.h" +#include "src/core/util/orphanable.h" #include "test/core/event_engine/mock_event_engine.h" #include "test/core/promise/test_wakeup_schedulers.h" diff --git a/test/core/promise/wait_for_callback_test.cc b/test/core/promise/wait_for_callback_test.cc index cb54ccf2e0e..25f5771379c 100644 --- a/test/core/promise/wait_for_callback_test.cc +++ b/test/core/promise/wait_for_callback_test.cc @@ -17,8 +17,8 @@ #include "absl/status/status.h" #include "gtest/gtest.h" -#include "src/core/lib/gprpp/notification.h" #include "src/core/lib/promise/map.h" +#include "src/core/util/notification.h" #include "test/core/promise/test_wakeup_schedulers.h" namespace grpc_core { diff --git a/test/core/resolver/binder_resolver_test.cc b/test/core/resolver/binder_resolver_test.cc index 9fad73a6704..7f6d3b9f14c 100644 --- a/test/core/resolver/binder_resolver_test.cc +++ b/test/core/resolver/binder_resolver_test.cc @@ -22,13 +22,13 @@ #include "gtest/gtest.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/orphanable.h" #include "src/core/lib/iomgr/port.h" #include "src/core/lib/iomgr/resolved_address.h" -#include "src/core/lib/uri/uri_parser.h" #include "src/core/resolver/endpoint_addresses.h" #include "src/core/resolver/resolver.h" #include "src/core/resolver/resolver_factory.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/uri.h" #include "test/core/test_util/test_config.h" #ifdef GRPC_HAVE_UNIX_SOCKET diff --git a/test/core/resolver/dns_resolver_cooldown_test.cc b/test/core/resolver/dns_resolver_cooldown_test.cc index 0bc27e4b3c0..ad7b6a3a8c3 100644 --- a/test/core/resolver/dns_resolver_cooldown_test.cc +++ b/test/core/resolver/dns_resolver_cooldown_test.cc @@ -42,12 +42,6 @@ #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/experiments/experiments.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/no_destruct.h" -#include "src/core/lib/gprpp/notification.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/time.h" -#include "src/core/lib/gprpp/work_serializer.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" @@ -56,12 +50,18 @@ #include "src/core/lib/iomgr/pollset_set.h" #include "src/core/lib/iomgr/resolve_address.h" #include "src/core/lib/iomgr/resolved_address.h" -#include "src/core/lib/uri/uri_parser.h" #include "src/core/resolver/dns/c_ares/grpc_ares_wrapper.h" #include "src/core/resolver/endpoint_addresses.h" #include "src/core/resolver/resolver.h" #include "src/core/resolver/resolver_factory.h" #include "src/core/resolver/resolver_registry.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/no_destruct.h" +#include "src/core/util/notification.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/time.h" +#include "src/core/util/uri.h" +#include "src/core/util/work_serializer.h" #include "test/core/test_util/test_config.h" using ::grpc_event_engine::experimental::GetDefaultEventEngine; diff --git a/test/core/resolver/dns_resolver_test.cc b/test/core/resolver/dns_resolver_test.cc index 14bb534ed43..4bf8a069c8b 100644 --- a/test/core/resolver/dns_resolver_test.cc +++ b/test/core/resolver/dns_resolver_test.cc @@ -30,13 +30,13 @@ #include "src/core/lib/config/config_vars.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/event_engine/default_event_engine.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/work_serializer.h" #include "src/core/lib/iomgr/exec_ctx.h" -#include "src/core/lib/uri/uri_parser.h" #include "src/core/resolver/resolver.h" #include "src/core/resolver/resolver_factory.h" #include "src/core/resolver/resolver_registry.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/uri.h" +#include "src/core/util/work_serializer.h" #include "test/core/test_util/test_config.h" using ::grpc_event_engine::experimental::GetDefaultEventEngine; diff --git a/test/core/resolver/endpoint_addresses_test.cc b/test/core/resolver/endpoint_addresses_test.cc index d5f14f624da..dafb5a54aac 100644 --- a/test/core/resolver/endpoint_addresses_test.cc +++ b/test/core/resolver/endpoint_addresses_test.cc @@ -29,7 +29,7 @@ #include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/iomgr/resolved_address.h" -#include "src/core/lib/uri/uri_parser.h" +#include "src/core/util/uri.h" #include "test/core/test_util/test_config.h" namespace grpc_core { diff --git a/test/core/resolver/fake_resolver_test.cc b/test/core/resolver/fake_resolver_test.cc index c9ece82509c..888ecac3399 100644 --- a/test/core/resolver/fake_resolver_test.cc +++ b/test/core/resolver/fake_resolver_test.cc @@ -41,16 +41,16 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/event_engine/default_event_engine.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/work_serializer.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/resolved_address.h" -#include "src/core/lib/uri/uri_parser.h" #include "src/core/resolver/endpoint_addresses.h" #include "src/core/resolver/resolver_factory.h" #include "src/core/resolver/resolver_registry.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/uri.h" +#include "src/core/util/work_serializer.h" #include "test/core/test_util/test_config.h" namespace grpc_core { diff --git a/test/core/resolver/google_c2p_resolver_test.cc b/test/core/resolver/google_c2p_resolver_test.cc index a95843b588c..96ddc587c4e 100644 --- a/test/core/resolver/google_c2p_resolver_test.cc +++ b/test/core/resolver/google_c2p_resolver_test.cc @@ -32,7 +32,7 @@ #include #include -#include "src/core/lib/gprpp/env.h" +#include "src/core/util/env.h" #include "test/core/test_util/fake_udp_and_tcp_server.h" #include "test/core/test_util/port.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/resolver/sockaddr_resolver_test.cc b/test/core/resolver/sockaddr_resolver_test.cc index a4aa4bc068d..faf90400364 100644 --- a/test/core/resolver/sockaddr_resolver_test.cc +++ b/test/core/resolver/sockaddr_resolver_test.cc @@ -27,14 +27,14 @@ #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/event_engine/default_event_engine.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/work_serializer.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/port.h" -#include "src/core/lib/uri/uri_parser.h" #include "src/core/resolver/resolver.h" #include "src/core/resolver/resolver_factory.h" #include "src/core/resolver/resolver_registry.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/uri.h" +#include "src/core/util/work_serializer.h" #include "test/core/test_util/test_config.h" static std::shared_ptr* g_work_serializer; diff --git a/test/core/resource_quota/arena_test.cc b/test/core/resource_quota/arena_test.cc index ee22b8d4b6f..997b7760d22 100644 --- a/test/core/resource_quota/arena_test.cc +++ b/test/core/resource_quota/arena_test.cc @@ -35,10 +35,10 @@ #include #include -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/thd.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/resource_quota/resource_quota.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/thd.h" #include "test/core/test_util/test_config.h" using testing::Mock; diff --git a/test/core/resource_quota/memory_quota_fuzzer.cc b/test/core/resource_quota/memory_quota_fuzzer.cc index 2fb432cbe28..654f20e291a 100644 --- a/test/core/resource_quota/memory_quota_fuzzer.cc +++ b/test/core/resource_quota/memory_quota_fuzzer.cc @@ -31,11 +31,11 @@ #include "src/core/lib/debug/trace.h" #include "src/core/lib/experiments/config.h" -#include "src/core/lib/gprpp/debug_location.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/resource_quota/memory_quota.h" +#include "src/core/util/debug_location.h" #include "src/core/util/useful.h" #include "src/libfuzzer/libfuzzer_macro.h" #include "test/core/resource_quota/call_checker.h" diff --git a/test/core/resource_quota/memory_quota_stress_test.cc b/test/core/resource_quota/memory_quota_stress_test.cc index ab1634c3775..a8086810cc7 100644 --- a/test/core/resource_quota/memory_quota_stress_test.cc +++ b/test/core/resource_quota/memory_quota_stress_test.cc @@ -33,9 +33,9 @@ #include #include -#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/resource_quota/memory_quota.h" +#include "src/core/util/sync.h" #include "test/core/test_util/test_config.h" namespace grpc_core { diff --git a/test/core/security/alts_credentials_fuzzer.cc b/test/core/security/alts_credentials_fuzzer.cc index 4913a3b29c9..9f76b2bf738 100644 --- a/test/core/security/alts_credentials_fuzzer.cc +++ b/test/core/security/alts_credentials_fuzzer.cc @@ -26,11 +26,11 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/env.h" #include "src/core/lib/security/credentials/alts/alts_credentials.h" #include "src/core/lib/security/credentials/alts/check_gcp_environment.h" #include "src/core/lib/security/credentials/alts/grpc_alts_credentials_options.h" +#include "src/core/util/crash.h" +#include "src/core/util/env.h" #include "test/core/test_util/fuzzer_util.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/security/alts_security_connector_test.cc b/test/core/security/alts_security_connector_test.cc index 3fa83df1e65..02a7cf5e1a4 100644 --- a/test/core/security/alts_security_connector_test.cc +++ b/test/core/security/alts_security_connector_test.cc @@ -29,11 +29,11 @@ #include #include -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/security/context/security_context.h" #include "src/core/lib/transport/transport.h" #include "src/core/tsi/alts/handshaker/alts_tsi_handshaker.h" #include "src/core/tsi/transport_security.h" +#include "src/core/util/crash.h" using grpc_core::internal::grpc_alts_auth_context_from_tsi_peer; diff --git a/test/core/security/auth_context_test.cc b/test/core/security/auth_context_test.cc index ea9be077e24..9443712cc91 100644 --- a/test/core/security/auth_context_test.cc +++ b/test/core/security/auth_context_test.cc @@ -22,9 +22,9 @@ #include "absl/log/log.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/security/context/security_context.h" +#include "src/core/util/crash.h" +#include "src/core/util/ref_counted_ptr.h" #include "src/core/util/string.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/security/check_gcp_environment_linux_test.cc b/test/core/security/check_gcp_environment_linux_test.cc index 4217c0eb346..b4122a8051e 100644 --- a/test/core/security/check_gcp_environment_linux_test.cc +++ b/test/core/security/check_gcp_environment_linux_test.cc @@ -24,8 +24,8 @@ #include #include -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/security/credentials/alts/check_gcp_environment.h" +#include "src/core/util/crash.h" #include "src/core/util/tmpfile.h" #if GPR_LINUX diff --git a/test/core/security/check_gcp_environment_windows_test.cc b/test/core/security/check_gcp_environment_windows_test.cc index 8a1cbbb3fba..7d1db40d69f 100644 --- a/test/core/security/check_gcp_environment_windows_test.cc +++ b/test/core/security/check_gcp_environment_windows_test.cc @@ -24,8 +24,8 @@ #include #include -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/security/credentials/alts/check_gcp_environment.h" +#include "src/core/util/crash.h" #include "src/core/util/tmpfile.h" #ifdef GPR_WINDOWS diff --git a/test/core/security/create_jwt.cc b/test/core/security/create_jwt.cc index 79be2b68e1c..f4f84a4ff4b 100644 --- a/test/core/security/create_jwt.cc +++ b/test/core/security/create_jwt.cc @@ -23,8 +23,8 @@ #include #include -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/security/credentials/jwt/jwt_credentials.h" +#include "src/core/util/crash.h" #include "test/core/test_util/cmdline.h" #include "test/core/test_util/tls_utils.h" diff --git a/test/core/security/credentials_test.cc b/test/core/security/credentials_test.cc index 4a999142988..da207a6474b 100644 --- a/test/core/security/credentials_test.cc +++ b/test/core/security/credentials_test.cc @@ -42,11 +42,6 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/env.h" -#include "src/core/lib/gprpp/host_port.h" -#include "src/core/lib/gprpp/time.h" -#include "src/core/lib/gprpp/unique_type_name.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/timer_manager.h" #include "src/core/lib/promise/exec_ctx_wakeup_scheduler.h" @@ -69,12 +64,17 @@ #include "src/core/lib/security/credentials/xds/xds_credentials.h" #include "src/core/lib/security/transport/auth_filters.h" #include "src/core/lib/transport/error_utils.h" -#include "src/core/lib/uri/uri_parser.h" +#include "src/core/util/crash.h" +#include "src/core/util/env.h" +#include "src/core/util/host_port.h" #include "src/core/util/http_client/httpcli.h" #include "src/core/util/http_client/httpcli_ssl_credentials.h" #include "src/core/util/json/json_reader.h" #include "src/core/util/string.h" +#include "src/core/util/time.h" #include "src/core/util/tmpfile.h" +#include "src/core/util/unique_type_name.h" +#include "src/core/util/uri.h" #include "test/core/event_engine/event_engine_test_utils.h" #include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/security/fetch_oauth2.cc b/test/core/security/fetch_oauth2.cc index 8faad222de3..b99d41f9dce 100644 --- a/test/core/security/fetch_oauth2.cc +++ b/test/core/security/fetch_oauth2.cc @@ -30,10 +30,10 @@ #include #include -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/util/json_util.h" +#include "src/core/util/crash.h" #include "src/cpp/client/secure_credentials.h" #include "test/core/security/oauth2_utils.h" #include "test/core/test_util/cmdline.h" diff --git a/test/core/security/grpc_alts_credentials_options_test.cc b/test/core/security/grpc_alts_credentials_options_test.cc index 9c53cd25bf3..77f41ef7a8d 100644 --- a/test/core/security/grpc_alts_credentials_options_test.cc +++ b/test/core/security/grpc_alts_credentials_options_test.cc @@ -26,7 +26,7 @@ #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #define ALTS_CLIENT_OPTIONS_TEST_TARGET_SERVICE_ACCOUNT_1 "abc@google.com" #define ALTS_CLIENT_OPTIONS_TEST_TARGET_SERVICE_ACCOUNT_2 "def@google.com" diff --git a/test/core/security/grpc_tls_certificate_distributor_test.cc b/test/core/security/grpc_tls_certificate_distributor_test.cc index e0fbd238468..c3459b22370 100644 --- a/test/core/security/grpc_tls_certificate_distributor_test.cc +++ b/test/core/security/grpc_tls_certificate_distributor_test.cc @@ -29,8 +29,8 @@ #include #include -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/slice/slice_internal.h" +#include "src/core/util/crash.h" #include "test/core/test_util/test_config.h" #include "test/core/test_util/tls_utils.h" diff --git a/test/core/security/grpc_tls_certificate_provider_test.cc b/test/core/security/grpc_tls_certificate_provider_test.cc index 31e7a06bd63..31abfedee47 100644 --- a/test/core/security/grpc_tls_certificate_provider_test.cc +++ b/test/core/security/grpc_tls_certificate_provider_test.cc @@ -27,8 +27,8 @@ #include #include -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/slice/slice_internal.h" +#include "src/core/util/crash.h" #include "src/core/util/tmpfile.h" #include "test/core/test_util/test_config.h" #include "test/core/test_util/tls_utils.h" diff --git a/test/core/security/grpc_tls_certificate_verifier_test.cc b/test/core/security/grpc_tls_certificate_verifier_test.cc index e775fe7a847..162c2e3c367 100644 --- a/test/core/security/grpc_tls_certificate_verifier_test.cc +++ b/test/core/security/grpc_tls_certificate_verifier_test.cc @@ -27,9 +27,9 @@ #include #include -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/security/security_connector/tls/tls_security_connector.h" #include "src/core/lib/slice/slice_internal.h" +#include "src/core/util/crash.h" #include "src/core/util/tmpfile.h" #include "test/core/test_util/test_config.h" #include "test/core/test_util/tls_utils.h" diff --git a/test/core/security/grpc_tls_credentials_options_test.cc b/test/core/security/grpc_tls_credentials_options_test.cc index 8270f7955dd..8e2784c77d6 100644 --- a/test/core/security/grpc_tls_credentials_options_test.cc +++ b/test/core/security/grpc_tls_credentials_options_test.cc @@ -27,9 +27,9 @@ #include #include "src/core/lib/config/config_vars.h" -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/security/credentials/tls/tls_credentials.h" #include "src/core/lib/security/security_connector/tls/tls_security_connector.h" +#include "src/core/util/crash.h" #include "src/core/util/tmpfile.h" #include "test/core/test_util/test_config.h" #include "test/core/test_util/tls_utils.h" diff --git a/test/core/security/json_token_test.cc b/test/core/security/json_token_test.cc index 95e01826c57..03569c4d1b5 100644 --- a/test/core/security/json_token_test.cc +++ b/test/core/security/json_token_test.cc @@ -31,9 +31,9 @@ #include #include -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/security/credentials/oauth2/oauth2_credentials.h" #include "src/core/lib/slice/slice_internal.h" +#include "src/core/util/crash.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_reader.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/security/jwt_verifier_test.cc b/test/core/security/jwt_verifier_test.cc index e250d352cce..448dd57e7fc 100644 --- a/test/core/security/jwt_verifier_test.cc +++ b/test/core/security/jwt_verifier_test.cc @@ -29,8 +29,8 @@ #include #include -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/security/credentials/jwt/json_token.h" +#include "src/core/util/crash.h" #include "src/core/util/http_client/httpcli.h" #include "src/core/util/json/json_reader.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/security/oauth2_utils.cc b/test/core/security/oauth2_utils.cc index b135ac3eef2..6111bb25e61 100644 --- a/test/core/security/oauth2_utils.cc +++ b/test/core/security/oauth2_utils.cc @@ -30,14 +30,14 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/notification.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/promise/exec_ctx_wakeup_scheduler.h" #include "src/core/lib/promise/map.h" #include "src/core/lib/resource_quota/resource_quota.h" #include "src/core/lib/security/context/security_context.h" #include "src/core/lib/security/credentials/credentials.h" +#include "src/core/util/crash.h" +#include "src/core/util/notification.h" char* grpc_test_fetch_oauth2_token_with_credentials( grpc_call_credentials* creds) { diff --git a/test/core/security/print_google_default_creds_token.cc b/test/core/security/print_google_default_creds_token.cc index 305ea25eb59..1d715fe18cd 100644 --- a/test/core/security/print_google_default_creds_token.cc +++ b/test/core/security/print_google_default_creds_token.cc @@ -28,10 +28,10 @@ #include #include -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/security/credentials/composite/composite_credentials.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/slice/slice_string_helpers.h" +#include "src/core/util/crash.h" #include "src/core/util/string.h" #include "test/core/test_util/cmdline.h" diff --git a/test/core/security/rbac_translator_test.cc b/test/core/security/rbac_translator_test.cc index 49e9c21a10a..0d7a798da34 100644 --- a/test/core/security/rbac_translator_test.cc +++ b/test/core/security/rbac_translator_test.cc @@ -24,8 +24,8 @@ #include -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/security/authorization/audit_logging.h" +#include "src/core/util/crash.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_writer.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/security/secure_endpoint_test.cc b/test/core/security/secure_endpoint_test.cc index b09e04c4b19..6f4cd318820 100644 --- a/test/core/security/secure_endpoint_test.cc +++ b/test/core/security/secure_endpoint_test.cc @@ -28,11 +28,11 @@ #include #include -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/iomgr/endpoint_pair.h" #include "src/core/lib/iomgr/iomgr.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/tsi/fake_transport_security.h" +#include "src/core/util/crash.h" #include "src/core/util/useful.h" #include "test/core/iomgr/endpoint_tests.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/security/security_connector_test.cc b/test/core/security/security_connector_test.cc index 63d14a065fc..dfccc4b7abe 100644 --- a/test/core/security/security_connector_test.cc +++ b/test/core/security/security_connector_test.cc @@ -31,13 +31,13 @@ #include #include "src/core/lib/config/config_vars.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/security/context/security_context.h" #include "src/core/lib/security/security_connector/ssl_utils.h" #include "src/core/lib/slice/slice_string_helpers.h" #include "src/core/tsi/ssl_transport_security.h" #include "src/core/tsi/transport_security.h" +#include "src/core/util/crash.h" +#include "src/core/util/ref_counted_ptr.h" #include "src/core/util/string.h" #include "src/core/util/tmpfile.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/security/ssl_credentials_test.cc b/test/core/security/ssl_credentials_test.cc index 5d1de6b08b0..8e63303c8b8 100644 --- a/test/core/security/ssl_credentials_test.cc +++ b/test/core/security/ssl_credentials_test.cc @@ -26,9 +26,9 @@ #include #include -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/security/security_connector/ssl_utils.h" #include "src/core/tsi/ssl_transport_security.h" +#include "src/core/util/crash.h" #include "test/core/test_util/test_config.h" TEST(SslCredentialsTest, ConvertGrpcToTsiCertPairs) { diff --git a/test/core/security/ssl_server_fuzzer.cc b/test/core/security/ssl_server_fuzzer.cc index 214a40812ec..7ca9762c124 100644 --- a/test/core/security/ssl_server_fuzzer.cc +++ b/test/core/security/ssl_server_fuzzer.cc @@ -25,9 +25,9 @@ #include #include "src/core/lib/event_engine/default_event_engine.h" -#include "src/core/lib/gprpp/notification.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/security_connector/security_connector.h" +#include "src/core/util/notification.h" #include "test/core/test_util/mock_endpoint.h" #include "test/core/test_util/test_config.h" #include "test/core/test_util/tls_utils.h" diff --git a/test/core/security/system_roots_test.cc b/test/core/security/system_roots_test.cc index 5bb566d89b1..9d94185edfb 100644 --- a/test/core/security/system_roots_test.cc +++ b/test/core/security/system_roots_test.cc @@ -33,9 +33,6 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/env.h" -#include "src/core/lib/gprpp/load_file.h" #include "src/core/lib/security/context/security_context.h" #include "src/core/lib/security/security_connector/load_system_roots.h" #include "src/core/lib/security/security_connector/load_system_roots_supported.h" @@ -44,6 +41,9 @@ #include "src/core/lib/slice/slice_string_helpers.h" #include "src/core/tsi/ssl_transport_security.h" #include "src/core/tsi/transport_security.h" +#include "src/core/util/crash.h" +#include "src/core/util/env.h" +#include "src/core/util/load_file.h" #include "src/core/util/tmpfile.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/security/tls_security_connector_test.cc b/test/core/security/tls_security_connector_test.cc index 7c602c37750..b2e933d6d16 100644 --- a/test/core/security/tls_security_connector_test.cc +++ b/test/core/security/tls_security_connector_test.cc @@ -32,13 +32,13 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/config_vars.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/unique_type_name.h" #include "src/core/lib/security/context/security_context.h" #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h" #include "src/core/lib/security/credentials/tls/grpc_tls_credentials_options.h" #include "src/core/lib/security/credentials/tls/tls_credentials.h" #include "src/core/tsi/transport_security.h" +#include "src/core/util/crash.h" +#include "src/core/util/unique_type_name.h" #include "test/core/test_util/test_config.h" #include "test/core/test_util/tls_utils.h" diff --git a/test/core/security/verify_jwt.cc b/test/core/security/verify_jwt.cc index cf5a2581c92..b330c0dbf33 100644 --- a/test/core/security/verify_jwt.cc +++ b/test/core/security/verify_jwt.cc @@ -27,10 +27,10 @@ #include #include -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/pollset.h" #include "src/core/lib/security/credentials/jwt/jwt_verifier.h" +#include "src/core/util/crash.h" #include "src/core/util/json/json_writer.h" #include "test/core/test_util/cmdline.h" diff --git a/test/core/service_config/service_config_test.cc b/test/core/service_config/service_config_test.cc index d20b92ae55c..24112d7732f 100644 --- a/test/core/service_config/service_config_test.cc +++ b/test/core/service_config/service_config_test.cc @@ -32,13 +32,13 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/validation_errors.h" #include "src/core/service_config/service_config_impl.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" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/validation_errors.h" #include "test/core/test_util/test_config.h" namespace grpc_core { diff --git a/test/core/slice/slice_test.cc b/test/core/slice/slice_test.cc index 3b1977145bb..1503e11abc7 100644 --- a/test/core/slice/slice_test.cc +++ b/test/core/slice/slice_test.cc @@ -35,10 +35,10 @@ #include #include -#include "src/core/lib/gprpp/memory.h" -#include "src/core/lib/gprpp/no_destruct.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/slice/slice_refcount.h" +#include "src/core/util/memory.h" +#include "src/core/util/no_destruct.h" #include "test/core/test_util/build.h" TEST(GrpcSliceTest, MallocReturnsSomethingSensible) { diff --git a/test/core/surface/completion_queue_threading_test.cc b/test/core/surface/completion_queue_threading_test.cc index ad81f5194f9..3d6dbd1fc97 100644 --- a/test/core/surface/completion_queue_threading_test.cc +++ b/test/core/surface/completion_queue_threading_test.cc @@ -30,10 +30,10 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/thd.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/surface/completion_queue.h" +#include "src/core/util/crash.h" +#include "src/core/util/thd.h" #include "src/core/util/useful.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/surface/concurrent_connectivity_test.cc b/test/core/surface/concurrent_connectivity_test.cc index a4123639273..329dd0ef286 100644 --- a/test/core/surface/concurrent_connectivity_test.cc +++ b/test/core/surface/concurrent_connectivity_test.cc @@ -37,8 +37,6 @@ #include "src/core/lib/channel/channel_args_preconditioning.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/event_engine/channel_args_endpoint_config.h" -#include "src/core/lib/gprpp/thd.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/error.h" @@ -48,6 +46,8 @@ #include "src/core/lib/iomgr/resolved_address.h" #include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/iomgr/tcp_server.h" +#include "src/core/util/thd.h" +#include "src/core/util/time.h" #include "test/core/test_util/port.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/surface/lame_client_test.cc b/test/core/surface/lame_client_test.cc index 7d5b57af46f..c81f2492c2b 100644 --- a/test/core/surface/lame_client_test.cc +++ b/test/core/surface/lame_client_test.cc @@ -32,13 +32,13 @@ #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/experiments/experiments.h" -#include "src/core/lib/gprpp/orphanable.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/surface/channel.h" #include "src/core/lib/transport/connectivity_state.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/orphanable.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/surface/num_external_connectivity_watchers_test.cc b/test/core/surface/num_external_connectivity_watchers_test.cc index 0194592f5e8..8eeb546e35b 100644 --- a/test/core/surface/num_external_connectivity_watchers_test.cc +++ b/test/core/surface/num_external_connectivity_watchers_test.cc @@ -31,9 +31,9 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/host_port.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" +#include "src/core/util/host_port.h" #include "test/core/test_util/port.h" #include "test/core/test_util/test_config.h" #include "test/core/test_util/tls_utils.h" diff --git a/test/core/surface/sequential_connectivity_test.cc b/test/core/surface/sequential_connectivity_test.cc index 79accd74c3d..ab6dfe4b1a6 100644 --- a/test/core/surface/sequential_connectivity_test.cc +++ b/test/core/surface/sequential_connectivity_test.cc @@ -33,9 +33,9 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/host_port.h" -#include "src/core/lib/gprpp/thd.h" #include "src/core/lib/iomgr/error.h" +#include "src/core/util/host_port.h" +#include "src/core/util/thd.h" #include "test/core/test_util/port.h" #include "test/core/test_util/test_config.h" #include "test/core/test_util/tls_utils.h" diff --git a/test/core/surface/server_chttp2_test.cc b/test/core/surface/server_chttp2_test.cc index 9c11f06037d..359af60ff28 100644 --- a/test/core/surface/server_chttp2_test.cc +++ b/test/core/surface/server_chttp2_test.cc @@ -27,8 +27,8 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/host_port.h" #include "src/core/lib/security/credentials/fake/fake_credentials.h" +#include "src/core/util/host_port.h" #include "test/core/test_util/port.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/surface/server_test.cc b/test/core/surface/server_test.cc index 958d033cef0..ec58b556a7f 100644 --- a/test/core/surface/server_test.cc +++ b/test/core/surface/server_test.cc @@ -34,10 +34,10 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/host_port.h" #include "src/core/lib/iomgr/resolve_address.h" #include "src/core/lib/iomgr/resolved_address.h" #include "src/core/lib/security/credentials/fake/fake_credentials.h" +#include "src/core/util/host_port.h" #include "src/core/util/useful.h" #include "test/core/test_util/port.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/telemetry/call_tracer_test.cc b/test/core/telemetry/call_tracer_test.cc index c9af4d745b4..688a5114156 100644 --- a/test/core/telemetry/call_tracer_test.cc +++ b/test/core/telemetry/call_tracer_test.cc @@ -25,10 +25,10 @@ #include #include -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/promise/context.h" #include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/lib/resource_quota/resource_quota.h" +#include "src/core/util/ref_counted_ptr.h" #include "test/core/test_util/fake_stats_plugin.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/test_util/BUILD b/test/core/test_util/BUILD index 653c1639a25..854105b5fe2 100644 --- a/test/core/test_util/BUILD +++ b/test/core/test_util/BUILD @@ -142,7 +142,7 @@ grpc_cc_library( "//:orphanable", "//:ref_counted_ptr", "//:tsi_ssl_credentials", - "//:uri_parser", + "//:uri", "//src/core:channel_args_endpoint_config", "//src/core:channel_args_preconditioning", "//src/core:closure", @@ -188,7 +188,7 @@ grpc_cc_library( "//:httpcli", "//:orphanable", "//:ref_counted_ptr", - "//:uri_parser", + "//:uri", "//src/core:channel_args_endpoint_config", "//src/core:channel_args_preconditioning", "//src/core:closure", @@ -332,7 +332,7 @@ grpc_cc_library( "//:orphanable", "//:parse_address", "//:ref_counted_ptr", - "//:uri_parser", + "//:uri", "//src/core:channel_args", "//src/core:delegating_helper", "//src/core:down_cast", diff --git a/test/core/test_util/cmdline.cc b/test/core/test_util/cmdline.cc index f3bf0abbc69..b22d0767c09 100644 --- a/test/core/test_util/cmdline.cc +++ b/test/core/test_util/cmdline.cc @@ -33,7 +33,7 @@ #include -#include "src/core/lib/gprpp/memory.h" +#include "src/core/util/memory.h" typedef enum { ARGTYPE_INT, ARGTYPE_BOOL, ARGTYPE_STRING } argtype; diff --git a/test/core/test_util/evaluate_args_test_util.h b/test/core/test_util/evaluate_args_test_util.h index 1bd6438f1aa..2d681d3b50f 100644 --- a/test/core/test_util/evaluate_args_test_util.h +++ b/test/core/test_util/evaluate_args_test_util.h @@ -27,7 +27,6 @@ #include "src/core/handshaker/endpoint_info/endpoint_info_handshaker.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/lib/resource_quota/resource_quota.h" @@ -35,6 +34,7 @@ #include "src/core/lib/security/context/security_context.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/transport/metadata_batch.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_core { diff --git a/test/core/test_util/fake_stats_plugin.h b/test/core/test_util/fake_stats_plugin.h index e5e93a6b503..4c60f0735fb 100644 --- a/test/core/test_util/fake_stats_plugin.h +++ b/test/core/test_util/fake_stats_plugin.h @@ -30,10 +30,10 @@ #include "gmock/gmock.h" #include "src/core/lib/channel/promise_based_filter.h" -#include "src/core/lib/gprpp/ref_counted.h" #include "src/core/telemetry/call_tracer.h" #include "src/core/telemetry/metrics.h" #include "src/core/telemetry/tcp_tracer.h" +#include "src/core/util/ref_counted.h" namespace grpc_core { diff --git a/test/core/test_util/fuzzer_corpus_test.cc b/test/core/test_util/fuzzer_corpus_test.cc index 0bdbf3a8c8f..3eaef693f10 100644 --- a/test/core/test_util/fuzzer_corpus_test.cc +++ b/test/core/test_util/fuzzer_corpus_test.cc @@ -35,8 +35,8 @@ #include #include -#include "src/core/lib/gprpp/env.h" #include "src/core/lib/iomgr/error.h" +#include "src/core/util/env.h" #include "test/core/test_util/test_config.h" #include "test/core/test_util/tls_utils.h" #include "test/cpp/util/test_config.h" diff --git a/test/core/test_util/fuzzing_channel_args.h b/test/core/test_util/fuzzing_channel_args.h index 9b4eb78f0a4..83cb5497bd3 100644 --- a/test/core/test_util/fuzzing_channel_args.h +++ b/test/core/test_util/fuzzing_channel_args.h @@ -20,8 +20,8 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/resource_quota/resource_quota.h" +#include "src/core/util/ref_counted_ptr.h" #include "test/core/test_util/fuzzing_channel_args.pb.h" namespace grpc_core { diff --git a/test/core/test_util/mock_endpoint.cc b/test/core/test_util/mock_endpoint.cc index e09fb191cb6..8d16b2293ee 100644 --- a/test/core/test_util/mock_endpoint.cc +++ b/test/core/test_util/mock_endpoint.cc @@ -29,8 +29,8 @@ #include #include "src/core/lib/event_engine/tcp_socket_utils.h" -#include "src/core/lib/gprpp/down_cast.h" #include "src/core/lib/iomgr/event_engine_shims/endpoint.h" +#include "src/core/util/down_cast.h" namespace grpc_event_engine { namespace experimental { diff --git a/test/core/test_util/one_corpus_entry_fuzzer.cc b/test/core/test_util/one_corpus_entry_fuzzer.cc index ffde40a4f0f..d6cbe2b6827 100644 --- a/test/core/test_util/one_corpus_entry_fuzzer.cc +++ b/test/core/test_util/one_corpus_entry_fuzzer.cc @@ -22,8 +22,8 @@ #include -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/iomgr/exec_ctx.h" +#include "src/core/util/crash.h" #include "test/core/test_util/tls_utils.h" extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size); diff --git a/test/core/test_util/passthrough_endpoint.h b/test/core/test_util/passthrough_endpoint.h index f7af994b1c8..cf8abe834d1 100644 --- a/test/core/test_util/passthrough_endpoint.h +++ b/test/core/test_util/passthrough_endpoint.h @@ -21,7 +21,7 @@ #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/event_engine/tcp_socket_utils.h" -#include "src/core/lib/gprpp/ref_counted.h" +#include "src/core/util/ref_counted.h" namespace grpc_event_engine { namespace experimental { diff --git a/test/core/test_util/port.cc b/test/core/test_util/port.cc index 123608d61c2..3a5a04bf117 100644 --- a/test/core/test_util/port.cc +++ b/test/core/test_util/port.cc @@ -29,7 +29,7 @@ #include #include -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/sync.h" #include "test/core/test_util/port.h" #include "test/core/test_util/port_server_client.h" diff --git a/test/core/test_util/port_isolated_runtime_environment.cc b/test/core/test_util/port_isolated_runtime_environment.cc index 8e841cf1b4d..57fa3865112 100644 --- a/test/core/test_util/port_isolated_runtime_environment.cc +++ b/test/core/test_util/port_isolated_runtime_environment.cc @@ -29,8 +29,8 @@ #include #include -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/iomgr/port.h" +#include "src/core/util/crash.h" #include "test/core/test_util/port.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/test_util/port_server_client.cc b/test/core/test_util/port_server_client.cc index 2f59e1c473b..5a8b4d4d2ed 100644 --- a/test/core/test_util/port_server_client.cc +++ b/test/core/test_util/port_server_client.cc @@ -40,10 +40,6 @@ #include #include -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/status_helper.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" @@ -51,9 +47,13 @@ #include "src/core/lib/iomgr/polling_entity.h" #include "src/core/lib/iomgr/pollset.h" #include "src/core/lib/security/credentials/credentials.h" -#include "src/core/lib/uri/uri_parser.h" #include "src/core/util/http_client/httpcli.h" #include "src/core/util/http_client/parser.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/time.h" +#include "src/core/util/uri.h" typedef struct freereq { gpr_mu* mu = nullptr; diff --git a/test/core/test_util/scoped_env_var.h b/test/core/test_util/scoped_env_var.h index 0f5041ab119..6a7127a2faf 100644 --- a/test/core/test_util/scoped_env_var.h +++ b/test/core/test_util/scoped_env_var.h @@ -19,7 +19,7 @@ #include -#include "src/core/lib/gprpp/env.h" +#include "src/core/util/env.h" namespace grpc_core { namespace testing { diff --git a/test/core/test_util/stack_tracer.cc b/test/core/test_util/stack_tracer.cc index 1960ce3353c..305a43c8fc4 100644 --- a/test/core/test_util/stack_tracer.cc +++ b/test/core/test_util/stack_tracer.cc @@ -26,7 +26,7 @@ #include -#include "src/core/lib/gprpp/examine_stack.h" +#include "src/core/util/examine_stack.h" namespace { diff --git a/test/core/test_util/test_config.cc b/test/core/test_util/test_config.cc index 1f428d55776..0395887fe7a 100644 --- a/test/core/test_util/test_config.cc +++ b/test/core/test_util/test_config.cc @@ -36,8 +36,8 @@ #include #include -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/surface/init.h" +#include "src/core/util/crash.h" #include "test/core/event_engine/test_init.h" #include "test/core/test_util/build.h" #include "test/core/test_util/stack_tracer.h" diff --git a/test/core/test_util/test_lb_policies.cc b/test/core/test_util/test_lb_policies.cc index 348d430e3d6..afd701417cb 100644 --- a/test/core/test_util/test_lb_policies.cc +++ b/test/core/test_util/test_lb_policies.cc @@ -34,23 +34,23 @@ #include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/down_cast.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/status_helper.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/pollset_set.h" #include "src/core/lib/iomgr/resolved_address.h" -#include "src/core/lib/uri/uri_parser.h" #include "src/core/load_balancing/delegating_helper.h" #include "src/core/load_balancing/lb_policy.h" #include "src/core/load_balancing/lb_policy_factory.h" #include "src/core/load_balancing/lb_policy_registry.h" #include "src/core/load_balancing/oob_backend_metric.h" #include "src/core/load_balancing/subchannel_interface.h" +#include "src/core/util/down_cast.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_util.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/time.h" +#include "src/core/util/uri.h" namespace grpc_core { diff --git a/test/core/test_util/test_tcp_server.cc b/test/core/test_util/test_tcp_server.cc index 41cb382dd46..cc3d2957648 100644 --- a/test/core/test_util/test_tcp_server.cc +++ b/test/core/test_util/test_tcp_server.cc @@ -34,7 +34,6 @@ #include "src/core/lib/channel/channel_args_preconditioning.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/event_engine/channel_args_endpoint_config.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/pollset.h" @@ -42,6 +41,7 @@ #include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/iomgr/socket_utils.h" #include "src/core/lib/iomgr/tcp_server.h" +#include "src/core/util/time.h" #include "test/core/test_util/test_config.h" static void on_server_destroyed(void* data, grpc_error_handle /*error*/) { diff --git a/test/core/test_util/tls_utils.cc b/test/core/test_util/tls_utils.cc index aca44f0fbb8..c2dfd13eea9 100644 --- a/test/core/test_util/tls_utils.cc +++ b/test/core/test_util/tls_utils.cc @@ -25,9 +25,9 @@ #include #include -#include "src/core/lib/gprpp/load_file.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/slice/slice_internal.h" +#include "src/core/util/load_file.h" #include "src/core/util/tmpfile.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/test_util/tls_utils.h b/test/core/test_util/tls_utils.h index 6b1bc1f1fa2..5cd12ac6a10 100644 --- a/test/core/test_util/tls_utils.h +++ b/test/core/test_util/tls_utils.h @@ -28,9 +28,9 @@ #include #include -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/thd.h" #include "src/core/lib/security/security_connector/ssl_utils.h" +#include "src/core/util/sync.h" +#include "src/core/util/thd.h" namespace grpc_core { diff --git a/test/core/transport/binder/binder_transport_test.cc b/test/core/transport/binder/binder_transport_test.cc index bc42040826c..5ad7150e8e2 100644 --- a/test/core/transport/binder/binder_transport_test.cc +++ b/test/core/transport/binder/binder_transport_test.cc @@ -32,8 +32,8 @@ #include #include "src/core/ext/transport/binder/transport/binder_stream.h" -#include "src/core/lib/gprpp/notification.h" #include "src/core/lib/resource_quota/resource_quota.h" +#include "src/core/util/notification.h" #include "test/core/test_util/test_config.h" #include "test/core/transport/binder/mock_objects.h" diff --git a/test/core/transport/binder/end2end/fake_binder.cc b/test/core/transport/binder/end2end/fake_binder.cc index bc132e8fe07..6a5cc9698ac 100644 --- a/test/core/transport/binder/end2end/fake_binder.cc +++ b/test/core/transport/binder/end2end/fake_binder.cc @@ -19,7 +19,7 @@ #include "absl/log/log.h" -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" namespace grpc_binder { namespace end2end_testing { diff --git a/test/core/transport/binder/end2end/fake_binder.h b/test/core/transport/binder/end2end/fake_binder.h index a50359e0f2f..6dbb532a230 100644 --- a/test/core/transport/binder/end2end/fake_binder.h +++ b/test/core/transport/binder/end2end/fake_binder.h @@ -66,8 +66,8 @@ #include "src/core/ext/transport/binder/wire_format/binder.h" #include "src/core/ext/transport/binder/wire_format/wire_reader.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/thd.h" +#include "src/core/util/sync.h" +#include "src/core/util/thd.h" namespace grpc_binder { namespace end2end_testing { diff --git a/test/core/transport/binder/end2end/fuzzers/fuzzer_utils.h b/test/core/transport/binder/end2end/fuzzers/fuzzer_utils.h index 2506cb0c242..8b4affab2cc 100644 --- a/test/core/transport/binder/end2end/fuzzers/fuzzer_utils.h +++ b/test/core/transport/binder/end2end/fuzzers/fuzzer_utils.h @@ -26,7 +26,7 @@ #include "src/core/ext/transport/binder/wire_format/binder.h" #include "src/core/ext/transport/binder/wire_format/wire_reader.h" -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "test/core/transport/binder/end2end/fuzzers/binder_transport_fuzzer.pb.h" namespace grpc_binder { diff --git a/test/core/transport/call_arena_allocator_test.cc b/test/core/transport/call_arena_allocator_test.cc index b33335ce6f4..1c5c222cf86 100644 --- a/test/core/transport/call_arena_allocator_test.cc +++ b/test/core/transport/call_arena_allocator_test.cc @@ -35,10 +35,10 @@ #include #include -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/thd.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/resource_quota/resource_quota.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/thd.h" #include "test/core/test_util/test_config.h" namespace grpc_core { diff --git a/test/core/transport/call_spine_benchmarks.h b/test/core/transport/call_spine_benchmarks.h index ebdf7c18884..d89f3678bdb 100644 --- a/test/core/transport/call_spine_benchmarks.h +++ b/test/core/transport/call_spine_benchmarks.h @@ -21,13 +21,13 @@ #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/event_engine/event_engine_context.h" -#include "src/core/lib/gprpp/notification.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/promise/all_ok.h" #include "src/core/lib/promise/map.h" #include "src/core/lib/resource_quota/resource_quota.h" #include "src/core/lib/transport/call_spine.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/notification.h" namespace grpc_core { diff --git a/test/core/transport/chaotic_good/BUILD b/test/core/transport/chaotic_good/BUILD index 2b22ea94c4c..e400aae142b 100644 --- a/test/core/transport/chaotic_good/BUILD +++ b/test/core/transport/chaotic_good/BUILD @@ -241,7 +241,7 @@ grpc_cc_test( "//:grpc++", "//:grpc_public_hdrs", "//:parse_address", - "//:uri_parser", + "//:uri", "//src/core:channel_args", "//src/core:chaotic_good_connector", "//src/core:chaotic_good_server", diff --git a/test/core/transport/chaotic_good/chaotic_good_server_test.cc b/test/core/transport/chaotic_good/chaotic_good_server_test.cc index 0b9b49a370b..1f1335f5f6c 100644 --- a/test/core/transport/chaotic_good/chaotic_good_server_test.cc +++ b/test/core/transport/chaotic_good/chaotic_good_server_test.cc @@ -35,10 +35,10 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/event_engine/tcp_socket_utils.h" -#include "src/core/lib/gprpp/notification.h" -#include "src/core/lib/gprpp/time.h" -#include "src/core/lib/uri/uri_parser.h" #include "src/core/server/server.h" +#include "src/core/util/notification.h" +#include "src/core/util/time.h" +#include "src/core/util/uri.h" #include "test/core/event_engine/event_engine_test_utils.h" #include "test/core/test_util/build.h" #include "test/core/test_util/port.h" diff --git a/test/core/transport/chaotic_good/client_transport_error_test.cc b/test/core/transport/chaotic_good/client_transport_error_test.cc index 190580f1eb7..8de27018183 100644 --- a/test/core/transport/chaotic_good/client_transport_error_test.cc +++ b/test/core/transport/chaotic_good/client_transport_error_test.cc @@ -39,7 +39,6 @@ #include "src/core/ext/transport/chaotic_good/client_transport.h" #include "src/core/lib/config/core_configuration.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/timer_manager.h" #include "src/core/lib/promise/activity.h" #include "src/core/lib/promise/event_engine_wakeup_scheduler.h" @@ -56,6 +55,7 @@ #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/promise_endpoint.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/ref_counted_ptr.h" #include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h" #include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.pb.h" diff --git a/test/core/transport/chaotic_good/frame_fuzzer.cc b/test/core/transport/chaotic_good/frame_fuzzer.cc index 23530d10a44..3082b3645f0 100644 --- a/test/core/transport/chaotic_good/frame_fuzzer.cc +++ b/test/core/transport/chaotic_good/frame_fuzzer.cc @@ -29,13 +29,13 @@ #include "src/core/ext/transport/chaotic_good/frame_header.h" #include "src/core/ext/transport/chttp2/transport/hpack_encoder.h" #include "src/core/ext/transport/chttp2/transport/hpack_parser.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/resource_quota/memory_quota.h" #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/util/ref_counted_ptr.h" #include "src/libfuzzer/libfuzzer_macro.h" #include "test/core/promise/test_context.h" #include "test/core/transport/chaotic_good/frame_fuzzer.pb.h" diff --git a/test/core/transport/chaotic_good/server_transport_test.cc b/test/core/transport/chaotic_good/server_transport_test.cc index 21977563c60..af5b223c2fb 100644 --- a/test/core/transport/chaotic_good/server_transport_test.cc +++ b/test/core/transport/chaotic_good/server_transport_test.cc @@ -34,7 +34,6 @@ #include #include -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/iomgr/timer_manager.h" #include "src/core/lib/promise/seq.h" #include "src/core/lib/resource_quota/arena.h" @@ -43,6 +42,7 @@ #include "src/core/lib/slice/slice_buffer.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/transport/metadata_batch.h" +#include "src/core/util/ref_counted_ptr.h" #include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h" #include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.pb.h" #include "test/core/transport/chaotic_good/mock_promise_endpoint.h" diff --git a/test/core/transport/chttp2/flow_control_fuzzer.cc b/test/core/transport/chttp2/flow_control_fuzzer.cc index 99e82f4853a..b72541d4d38 100644 --- a/test/core/transport/chttp2/flow_control_fuzzer.cc +++ b/test/core/transport/chttp2/flow_control_fuzzer.cc @@ -36,10 +36,10 @@ #include "src/core/ext/transport/chttp2/transport/flow_control.h" #include "src/core/lib/experiments/config.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/lib/transport/bdp_estimator.h" +#include "src/core/util/time.h" #include "src/core/util/useful.h" #include "src/libfuzzer/libfuzzer_macro.h" #include "test/core/test_util/fuzz_config_vars.h" diff --git a/test/core/transport/chttp2/flow_control_test.cc b/test/core/transport/chttp2/flow_control_test.cc index 75652fcfb16..618cdfb0643 100644 --- a/test/core/transport/chttp2/flow_control_test.cc +++ b/test/core/transport/chttp2/flow_control_test.cc @@ -23,11 +23,11 @@ #include #include "src/core/lib/experiments/experiments.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/resource_quota/resource_quota.h" #include "src/core/lib/transport/bdp_estimator.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" #include "src/core/util/useful.h" extern gpr_timespec (*gpr_now_impl)(gpr_clock_type clock_type); diff --git a/test/core/transport/chttp2/graceful_shutdown_test.cc b/test/core/transport/chttp2/graceful_shutdown_test.cc index 4f24b8d65af..7402c2ba28c 100644 --- a/test/core/transport/chttp2/graceful_shutdown_test.cc +++ b/test/core/transport/chttp2/graceful_shutdown_test.cc @@ -48,10 +48,6 @@ #include "src/core/ext/transport/chttp2/transport/frame_goaway.h" #include "src/core/ext/transport/chttp2/transport/frame_ping.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/notification.h" -#include "src/core/lib/gprpp/orphanable.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/endpoint_pair.h" @@ -61,6 +57,10 @@ #include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/surface/completion_queue.h" #include "src/core/server/server.h" +#include "src/core/util/crash.h" +#include "src/core/util/notification.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/sync.h" #include "src/core/util/useful.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/transport/chttp2/hpack_encoder_test.cc b/test/core/transport/chttp2/hpack_encoder_test.cc index 91d835c631e..141d38f71c4 100644 --- a/test/core/transport/chttp2/hpack_encoder_test.cc +++ b/test/core/transport/chttp2/hpack_encoder_test.cc @@ -32,11 +32,11 @@ #include #include "src/core/ext/transport/chttp2/transport/legacy_frame.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/lib/resource_quota/resource_quota.h" +#include "src/core/util/ref_counted_ptr.h" #include "test/core/test_util/parse_hexstring.h" #include "test/core/test_util/slice_splitter.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/transport/chttp2/hpack_parser_fuzzer_test.cc b/test/core/transport/chttp2/hpack_parser_fuzzer_test.cc index 538988ebf9f..7954ccbaeca 100644 --- a/test/core/transport/chttp2/hpack_parser_fuzzer_test.cc +++ b/test/core/transport/chttp2/hpack_parser_fuzzer_test.cc @@ -31,14 +31,14 @@ #include "src/core/ext/transport/chttp2/transport/hpack_parser.h" #include "src/core/lib/experiments/config.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/status_helper.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/lib/resource_quota/resource_quota.h" #include "src/core/lib/transport/metadata_batch.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/status_helper.h" #include "src/libfuzzer/libfuzzer_macro.h" #include "test/core/test_util/fuzz_config_vars.h" #include "test/core/test_util/proto_bit_gen.h" diff --git a/test/core/transport/chttp2/hpack_parser_input_size_fuzzer.cc b/test/core/transport/chttp2/hpack_parser_input_size_fuzzer.cc index 4094a669b3c..c01dff488a8 100644 --- a/test/core/transport/chttp2/hpack_parser_input_size_fuzzer.cc +++ b/test/core/transport/chttp2/hpack_parser_input_size_fuzzer.cc @@ -35,8 +35,6 @@ #include #include "src/core/ext/transport/chttp2/transport/hpack_parser.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/status_helper.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/resource_quota/arena.h" @@ -44,6 +42,8 @@ #include "src/core/lib/resource_quota/resource_quota.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/transport/metadata_batch.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/status_helper.h" #include "test/core/test_util/slice_splitter.h" bool squelch = true; diff --git a/test/core/transport/chttp2/hpack_parser_test.cc b/test/core/transport/chttp2/hpack_parser_test.cc index d15d990678c..0439490d7c2 100644 --- a/test/core/transport/chttp2/hpack_parser_test.cc +++ b/test/core/transport/chttp2/hpack_parser_test.cc @@ -36,15 +36,15 @@ #include #include -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/status_helper.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/lib/resource_quota/resource_quota.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/transport/error_utils.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/time.h" #include "test/core/test_util/parse_hexstring.h" #include "test/core/test_util/slice_splitter.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/transport/chttp2/hpack_sync_fuzzer.cc b/test/core/transport/chttp2/hpack_sync_fuzzer.cc index 2697029928d..dff3b687999 100644 --- a/test/core/transport/chttp2/hpack_sync_fuzzer.cc +++ b/test/core/transport/chttp2/hpack_sync_fuzzer.cc @@ -32,8 +32,6 @@ #include "src/core/ext/transport/chttp2/transport/hpack_parser.h" #include "src/core/ext/transport/chttp2/transport/hpack_parser_table.h" #include "src/core/lib/experiments/config.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/status_helper.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/resource_quota/arena.h" @@ -42,6 +40,8 @@ #include "src/core/lib/slice/slice.h" #include "src/core/lib/slice/slice_buffer.h" #include "src/core/lib/transport/metadata_batch.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/status_helper.h" #include "src/libfuzzer/libfuzzer_macro.h" #include "test/core/test_util/fuzz_config_vars.h" #include "test/core/test_util/proto_bit_gen.h" diff --git a/test/core/transport/chttp2/ping_callbacks_test.cc b/test/core/transport/chttp2/ping_callbacks_test.cc index 32b02fa0241..18731f4f761 100644 --- a/test/core/transport/chttp2/ping_callbacks_test.cc +++ b/test/core/transport/chttp2/ping_callbacks_test.cc @@ -20,7 +20,7 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "test/core/event_engine/mock_event_engine.h" using grpc_event_engine::experimental::EventEngine; diff --git a/test/core/transport/chttp2/ping_configuration_test.cc b/test/core/transport/chttp2/ping_configuration_test.cc index 705276ff38e..30873180124 100644 --- a/test/core/transport/chttp2/ping_configuration_test.cc +++ b/test/core/transport/chttp2/ping_configuration_test.cc @@ -28,9 +28,10 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/experiments/config.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/resource_quota/resource_quota.h" +#include "src/core/util/time.h" #include "test/core/test_util/mock_endpoint.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/transport/chttp2/remove_stream_from_stalled_lists_test.cc b/test/core/transport/chttp2/remove_stream_from_stalled_lists_test.cc index 56cf4721205..291add0aaef 100644 --- a/test/core/transport/chttp2/remove_stream_from_stalled_lists_test.cc +++ b/test/core/transport/chttp2/remove_stream_from_stalled_lists_test.cc @@ -45,8 +45,8 @@ #include "src/core/ext/transport/chttp2/transport/flow_control.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/config_vars.h" -#include "src/core/lib/gprpp/host_port.h" -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/host_port.h" +#include "src/core/util/sync.h" #include "test/core/test_util/port.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/transport/chttp2/settings_timeout_test.cc b/test/core/transport/chttp2/settings_timeout_test.cc index 3093bc2afaf..7e5c5204530 100644 --- a/test/core/transport/chttp2/settings_timeout_test.cc +++ b/test/core/transport/chttp2/settings_timeout_test.cc @@ -45,8 +45,6 @@ #include "src/core/lib/channel/channel_args_preconditioning.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/event_engine/channel_args_endpoint_config.h" -#include "src/core/lib/gprpp/status_helper.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/error.h" @@ -58,6 +56,8 @@ #include "src/core/lib/iomgr/resolved_address.h" #include "src/core/lib/iomgr/tcp_client.h" #include "src/core/lib/resource_quota/api.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/time.h" #include "test/core/test_util/port.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/transport/chttp2/stream_leak_with_queued_flow_control_update_test.cc b/test/core/transport/chttp2/stream_leak_with_queued_flow_control_update_test.cc index 0bae088a3aa..178e29de625 100644 --- a/test/core/transport/chttp2/stream_leak_with_queued_flow_control_update_test.cc +++ b/test/core/transport/chttp2/stream_leak_with_queued_flow_control_update_test.cc @@ -36,8 +36,8 @@ #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/host_port.h" -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/host_port.h" +#include "src/core/util/sync.h" #include "test/core/test_util/port.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/transport/chttp2/streams_not_seen_test.cc b/test/core/transport/chttp2/streams_not_seen_test.cc index cc296008f84..49a6075cd42 100644 --- a/test/core/transport/chttp2/streams_not_seen_test.cc +++ b/test/core/transport/chttp2/streams_not_seen_test.cc @@ -55,11 +55,6 @@ #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/host_port.h" -#include "src/core/lib/gprpp/notification.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/error.h" @@ -71,6 +66,11 @@ #include "src/core/lib/surface/channel_stack_type.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/host_port.h" +#include "src/core/util/notification.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.h" #include "src/core/util/useful.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/test_util/port.h" diff --git a/test/core/transport/chttp2/too_many_pings_test.cc b/test/core/transport/chttp2/too_many_pings_test.cc index 7d84bdb0bdc..942268fc967 100644 --- a/test/core/transport/chttp2/too_many_pings_test.cc +++ b/test/core/transport/chttp2/too_many_pings_test.cc @@ -46,17 +46,17 @@ #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" #include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/host_port.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/resolved_address.h" #include "src/core/lib/surface/channel.h" -#include "src/core/lib/uri/uri_parser.h" #include "src/core/resolver/endpoint_addresses.h" #include "src/core/resolver/fake/fake_resolver.h" #include "src/core/resolver/resolver.h" +#include "src/core/util/host_port.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.h" +#include "src/core/util/uri.h" #include "src/core/util/useful.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/test_util/port.h" diff --git a/test/core/transport/error_utils_test.cc b/test/core/transport/error_utils_test.cc index 0817f34ee53..c60b4bf5d79 100644 --- a/test/core/transport/error_utils_test.cc +++ b/test/core/transport/error_utils_test.cc @@ -23,8 +23,8 @@ #include "absl/status/status.h" #include "gtest/gtest.h" -#include "src/core/lib/gprpp/status_helper.h" #include "src/core/lib/iomgr/error.h" +#include "src/core/util/status_helper.h" #include "test/core/test_util/test_config.h" namespace { diff --git a/test/core/transport/metadata_map_test.cc b/test/core/transport/metadata_map_test.cc index 91d60baab27..1e985459a74 100644 --- a/test/core/transport/metadata_map_test.cc +++ b/test/core/transport/metadata_map_test.cc @@ -28,13 +28,13 @@ #include -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/lib/resource_quota/resource_quota.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/transport/metadata_batch.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" #include "test/core/test_util/test_config.h" namespace grpc_core { diff --git a/test/core/transport/timeout_encoding_test.cc b/test/core/transport/timeout_encoding_test.cc index 0f03dfa7b3f..6de2dcd0398 100644 --- a/test/core/transport/timeout_encoding_test.cc +++ b/test/core/transport/timeout_encoding_test.cc @@ -24,7 +24,7 @@ #include "absl/strings/string_view.h" #include "gtest/gtest.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "src/core/util/useful.h" namespace grpc_core { diff --git a/test/core/tsi/alts/fake_handshaker/fake_handshaker_server.cc b/test/core/tsi/alts/fake_handshaker/fake_handshaker_server.cc index e7f58d93c94..1c2c8892e4c 100644 --- a/test/core/tsi/alts/fake_handshaker/fake_handshaker_server.cc +++ b/test/core/tsi/alts/fake_handshaker/fake_handshaker_server.cc @@ -33,7 +33,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "test/core/tsi/alts/fake_handshaker/handshaker.grpc.pb.h" #include "test/core/tsi/alts/fake_handshaker/handshaker.pb.h" #include "test/core/tsi/alts/fake_handshaker/transport_security_common.pb.h" diff --git a/test/core/tsi/alts/fake_handshaker/fake_handshaker_server_main.cc b/test/core/tsi/alts/fake_handshaker/fake_handshaker_server_main.cc index 711ca4206d1..4e8df4b23f0 100644 --- a/test/core/tsi/alts/fake_handshaker/fake_handshaker_server_main.cc +++ b/test/core/tsi/alts/fake_handshaker/fake_handshaker_server_main.cc @@ -24,7 +24,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "test/core/test_util/test_config.h" #include "test/core/tsi/alts/fake_handshaker/fake_handshaker_server.h" #include "test/cpp/util/test_config.h" diff --git a/test/core/tsi/alts/frame_protector/alts_counter_test.cc b/test/core/tsi/alts/frame_protector/alts_counter_test.cc index b36700c9f27..989530d5e27 100644 --- a/test/core/tsi/alts/frame_protector/alts_counter_test.cc +++ b/test/core/tsi/alts/frame_protector/alts_counter_test.cc @@ -22,7 +22,7 @@ #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "test/core/tsi/alts/crypt/gsec_test_util.h" const size_t kSmallCounterSize = 4; diff --git a/test/core/tsi/alts/frame_protector/alts_frame_protector_test.cc b/test/core/tsi/alts/frame_protector/alts_frame_protector_test.cc index e513caf0678..551788819fc 100644 --- a/test/core/tsi/alts/frame_protector/alts_frame_protector_test.cc +++ b/test/core/tsi/alts/frame_protector/alts_frame_protector_test.cc @@ -24,9 +24,9 @@ #include -#include "src/core/lib/gprpp/crash.h" #include "src/core/tsi/alts/crypt/gsec.h" #include "src/core/tsi/transport_security_interface.h" +#include "src/core/util/crash.h" #include "test/core/tsi/alts/crypt/gsec_test_util.h" #include "test/core/tsi/transport_security_test_lib.h" diff --git a/test/core/tsi/alts/frame_protector/frame_handler_test.cc b/test/core/tsi/alts/frame_protector/frame_handler_test.cc index feb7a5310aa..2784bc0f74b 100644 --- a/test/core/tsi/alts/frame_protector/frame_handler_test.cc +++ b/test/core/tsi/alts/frame_protector/frame_handler_test.cc @@ -28,7 +28,7 @@ #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "src/core/util/useful.h" #include "test/core/tsi/alts/crypt/gsec_test_util.h" diff --git a/test/core/tsi/alts/handshaker/alts_concurrent_connectivity_test.cc b/test/core/tsi/alts/handshaker/alts_concurrent_connectivity_test.cc index a6327cb31bb..0b079ebc88e 100644 --- a/test/core/tsi/alts/handshaker/alts_concurrent_connectivity_test.cc +++ b/test/core/tsi/alts/handshaker/alts_concurrent_connectivity_test.cc @@ -47,14 +47,14 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/host_port.h" -#include "src/core/lib/gprpp/thd.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/security/credentials/alts/alts_credentials.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/security_connector/alts/alts_security_connector.h" #include "src/core/lib/slice/slice_string_helpers.h" +#include "src/core/util/crash.h" +#include "src/core/util/host_port.h" +#include "src/core/util/thd.h" #include "src/core/util/useful.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/test_util/build.h" diff --git a/test/core/tsi/alts/handshaker/alts_handshaker_client_test.cc b/test/core/tsi/alts/handshaker/alts_handshaker_client_test.cc index 1d2248a4617..22c42030cb5 100644 --- a/test/core/tsi/alts/handshaker/alts_handshaker_client_test.cc +++ b/test/core/tsi/alts/handshaker/alts_handshaker_client_test.cc @@ -26,13 +26,13 @@ #include #include -#include "src/core/lib/gprpp/env.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/tsi/alts/handshaker/alts_shared_resource.h" #include "src/core/tsi/alts/handshaker/alts_tsi_handshaker.h" #include "src/core/tsi/alts/handshaker/alts_tsi_handshaker_private.h" #include "src/core/tsi/transport_security.h" #include "src/core/tsi/transport_security_interface.h" +#include "src/core/util/env.h" #include "test/core/test_util/test_config.h" #include "test/core/tsi/alts/handshaker/alts_handshaker_service_api_test_lib.h" diff --git a/test/core/tsi/alts/handshaker/alts_tsi_handshaker_test.cc b/test/core/tsi/alts/handshaker/alts_tsi_handshaker_test.cc index 59479f0c7fb..3fb9cc715ec 100644 --- a/test/core/tsi/alts/handshaker/alts_tsi_handshaker_test.cc +++ b/test/core/tsi/alts/handshaker/alts_tsi_handshaker_test.cc @@ -28,12 +28,12 @@ #include #include -#include "src/core/lib/gprpp/thd.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/tsi/alts/handshaker/alts_handshaker_client.h" #include "src/core/tsi/alts/handshaker/alts_shared_resource.h" #include "src/core/tsi/alts/handshaker/alts_tsi_handshaker_private.h" #include "src/core/tsi/transport_security_grpc.h" +#include "src/core/util/thd.h" #include "src/proto/grpc/gcp/altscontext.upb.h" #include "test/core/test_util/test_config.h" #include "test/core/tsi/alts/handshaker/alts_handshaker_service_api_test_lib.h" diff --git a/test/core/tsi/crl_ssl_transport_security_test.cc b/test/core/tsi/crl_ssl_transport_security_test.cc index 37f0f905b16..0b8d4cf0811 100644 --- a/test/core/tsi/crl_ssl_transport_security_test.cc +++ b/test/core/tsi/crl_ssl_transport_security_test.cc @@ -31,11 +31,11 @@ #include #include -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/security/security_connector/security_connector.h" #include "src/core/tsi/ssl_transport_security.h" #include "src/core/tsi/transport_security.h" #include "src/core/tsi/transport_security_interface.h" +#include "src/core/util/crash.h" #include "test/core/test_util/test_config.h" #include "test/core/test_util/tls_utils.h" #include "test/core/tsi/transport_security_test_lib.h" diff --git a/test/core/tsi/fake_transport_security_test.cc b/test/core/tsi/fake_transport_security_test.cc index 69c280717a4..c61b9a487a7 100644 --- a/test/core/tsi/fake_transport_security_test.cc +++ b/test/core/tsi/fake_transport_security_test.cc @@ -27,9 +27,9 @@ #include #include -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/security/security_connector/security_connector.h" #include "src/core/tsi/transport_security.h" +#include "src/core/util/crash.h" #include "test/core/test_util/test_config.h" #include "test/core/tsi/transport_security_test_lib.h" diff --git a/test/core/tsi/ssl_session_cache_test.cc b/test/core/tsi/ssl_session_cache_test.cc index f9711f2eba1..61a5f707e93 100644 --- a/test/core/tsi/ssl_session_cache_test.cc +++ b/test/core/tsi/ssl_session_cache_test.cc @@ -27,7 +27,7 @@ #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "test/core/test_util/test_config.h" namespace grpc_core { diff --git a/test/core/tsi/ssl_transport_security_test.cc b/test/core/tsi/ssl_transport_security_test.cc index a66720e0ca0..228372d86b6 100644 --- a/test/core/tsi/ssl_transport_security_test.cc +++ b/test/core/tsi/ssl_transport_security_test.cc @@ -34,9 +34,9 @@ #include #include -#include "src/core/lib/gprpp/memory.h" #include "src/core/tsi/transport_security.h" #include "src/core/tsi/transport_security_interface.h" +#include "src/core/util/memory.h" #include "test/core/test_util/build.h" #include "test/core/test_util/test_config.h" #include "test/core/test_util/tls_utils.h" diff --git a/test/core/tsi/ssl_transport_security_utils_test.cc b/test/core/tsi/ssl_transport_security_utils_test.cc index 5b64dc212df..ac105c42fa5 100644 --- a/test/core/tsi/ssl_transport_security_utils_test.cc +++ b/test/core/tsi/ssl_transport_security_utils_test.cc @@ -34,10 +34,10 @@ #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" -#include "src/core/lib/gprpp/load_file.h" #include "src/core/lib/slice/slice.h" #include "src/core/tsi/transport_security.h" #include "src/core/tsi/transport_security_interface.h" +#include "src/core/util/load_file.h" #include "test/core/test_util/test_config.h" #include "test/core/tsi/transport_security_test_lib.h" diff --git a/test/core/tsi/transport_security_test.cc b/test/core/tsi/transport_security_test.cc index 8d9e1bed6e6..a0ff0488b93 100644 --- a/test/core/tsi/transport_security_test.cc +++ b/test/core/tsi/transport_security_test.cc @@ -31,9 +31,9 @@ #include #include -#include "src/core/lib/gprpp/crash.h" #include "src/core/tsi/fake_transport_security.h" #include "src/core/tsi/ssl_transport_security.h" +#include "src/core/util/crash.h" #include "src/core/util/string.h" #include "src/core/util/useful.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/tsi/transport_security_test_lib.cc b/test/core/tsi/transport_security_test_lib.cc index 1c744415db2..1239270a0e6 100644 --- a/test/core/tsi/transport_security_test_lib.cc +++ b/test/core/tsi/transport_security_test_lib.cc @@ -37,9 +37,9 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/memory.h" #include "src/core/lib/iomgr/error.h" +#include "src/core/util/crash.h" +#include "src/core/util/memory.h" static void notification_signal(tsi_test_fixture* fixture) { gpr_mu_lock(&fixture->mu); diff --git a/test/core/uri/BUILD b/test/core/uri/BUILD deleted file mode 100644 index 4bac9d7cba7..00000000000 --- a/test/core/uri/BUILD +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 2017 gRPC authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -load("//bazel:grpc_build_system.bzl", "grpc_cc_test", "grpc_package") -load("//test/core/test_util:grpc_fuzzer.bzl", "grpc_fuzzer") - -grpc_package(name = "test/core/uri") - -licenses(["notice"]) - -grpc_fuzzer( - name = "uri_fuzzer_test", - srcs = ["uri_fuzzer_test.cc"], - corpus = "uri_corpus", - language = "C++", - tags = [ - "no_windows", - # Without "nofixdeps", "//:grpc" gets substituted with "//:event_engine_base_hdrs" - "nofixdeps", - ], - deps = [ - "//:exec_ctx", - "//:gpr", - "//:grpc", - "//:uri_parser", - ], -) - -grpc_cc_test( - name = "uri_parser_test", - srcs = ["uri_parser_test.cc"], - external_deps = [ - "absl/status", - "gtest", - ], - language = "C++", - deps = [ - "//:event_engine_base_hdrs", - "//:uri_parser", - "//test/core/test_util:grpc_test_util_unsecure", - ], -) diff --git a/test/core/util/BUILD b/test/core/util/BUILD index 869a9b96672..ca652af6aba 100644 --- a/test/core/util/BUILD +++ b/test/core/util/BUILD @@ -12,12 +12,588 @@ # See the License for the specific language governing permissions and # limitations under the License. +load("//bazel:custom_exec_properties.bzl", "LARGE_MACHINE") load("//bazel:grpc_build_system.bzl", "grpc_cc_test", "grpc_package") +load( + "//test/core/test_util:grpc_fuzzer.bzl", + "grpc_fuzzer", + "grpc_proto_fuzzer", +) licenses(["notice"]) grpc_package(name = "test/core/util") +grpc_cc_test( + name = "directory_reader_test", + srcs = ["directory_reader_test.cc"], + data = [ + "//test/core/tsi/test_creds/crl_data/crls:ab06acdd.r0", + "//test/core/tsi/test_creds/crl_data/crls:b9322cac.r0", + "//test/core/tsi/test_creds/crl_data/crls:current.crl", + "//test/core/tsi/test_creds/crl_data/crls:intermediate.crl", + ], + external_deps = [ + "gtest", + ], + language = "C++", + uses_event_engine = False, + uses_polling = False, + deps = [ + "//src/core:directory_reader", + "//test/core/test_util:grpc_test_util", + ], +) + +grpc_cc_test( + name = "examine_stack_test", + srcs = ["examine_stack_test.cc"], + external_deps = [ + "absl/debugging:stacktrace", + "absl/debugging:symbolize", + "absl/log:log", + "gtest", + ], + language = "C++", + # TODO(https://github.com/grpc/grpc/issues/24627): Disable this on Windows + tags = ["no_windows"], + uses_event_engine = False, + uses_polling = False, + deps = [ + "//:gpr", + "//test/core/test_util:grpc_test_util", + ], +) + +grpc_cc_test( + name = "dump_args_test", + srcs = ["dump_args_test.cc"], + external_deps = [ + "gtest", + ], + language = "C++", + uses_event_engine = False, + uses_polling = False, + deps = [ + "//src/core:dump_args", + ], +) + +# TODO(hork): solidify fork support requirements for EventEngines +grpc_cc_test( + name = "fork_test", + srcs = ["fork_test.cc"], + external_deps = ["gtest"], + language = "C++", + tags = ["no_windows"], + uses_event_engine = True, # engines should behave appropriately on Fork + uses_polling = False, + deps = [ + "//:gpr", + "//test/core/test_util:grpc_test_util", + ], +) + +grpc_cc_test( + name = "bitset_test", + srcs = ["bitset_test.cc"], + external_deps = ["gtest"], + language = "C++", + uses_event_engine = False, + uses_polling = False, + deps = [ + "//src/core:bitset", + ], +) + +grpc_cc_test( + name = "if_list_test", + srcs = ["if_list_test.cc"], + external_deps = ["gtest"], + language = "C++", + uses_event_engine = False, + uses_polling = False, + deps = [ + "//src/core:if_list", + ], +) + +grpc_cc_test( + name = "no_destruct_test", + srcs = ["no_destruct_test.cc"], + external_deps = ["gtest"], + language = "C++", + uses_event_engine = False, + uses_polling = False, + deps = [ + "//src/core:no_destruct", + ], +) + +grpc_cc_test( + name = "match_test", + srcs = ["match_test.cc"], + external_deps = ["gtest"], + language = "C++", + uses_event_engine = False, + uses_polling = False, + deps = [ + "//src/core:match", + ], +) + +grpc_cc_test( + name = "overload_test", + srcs = ["overload_test.cc"], + external_deps = ["gtest"], + language = "C++", + uses_event_engine = False, + uses_polling = False, + deps = [ + "//src/core:overload", + ], +) + +grpc_cc_test( + name = "down_cast_test", + srcs = ["down_cast_test.cc"], + external_deps = ["gtest"], + language = "C++", + uses_event_engine = False, + uses_polling = False, + deps = [ + "//src/core:down_cast", + ], +) + +grpc_cc_test( + name = "table_test", + srcs = ["table_test.cc"], + external_deps = [ + "gtest", + "absl/types:optional", + ], + language = "C++", + uses_event_engine = False, + uses_polling = False, + deps = [ + "//src/core:table", + ], +) + +grpc_cc_test( + name = "host_port_test", + srcs = ["host_port_test.cc"], + external_deps = ["gtest"], + language = "C++", + uses_event_engine = False, + uses_polling = False, + deps = [ + "//:gpr", + "//test/core/test_util:grpc_test_util", + ], +) + +grpc_cc_test( + name = "mpscq_test", + srcs = ["mpscq_test.cc"], + exec_properties = LARGE_MACHINE, + external_deps = [ + "absl/log:log", + "gtest", + ], + language = "C++", + tags = ["no_windows"], # LARGE_MACHINE is not configured for windows RBE + uses_event_engine = False, + uses_polling = False, + deps = [ + "//:gpr", + "//test/core/test_util:grpc_test_util", + ], +) + +grpc_cc_test( + name = "orphanable_test", + srcs = ["orphanable_test.cc"], + external_deps = [ + "gtest", + ], + language = "C++", + deps = [ + "//:orphanable", + "//test/core/test_util:grpc_test_util", + ], +) + +grpc_cc_test( + name = "ref_counted_test", + srcs = ["ref_counted_test.cc"], + external_deps = [ + "gtest", + ], + language = "C++", + deps = [ + "//src/core:ref_counted", + "//test/core/test_util:grpc_test_util", + ], +) + +grpc_cc_test( + name = "dual_ref_counted_test", + srcs = ["dual_ref_counted_test.cc"], + external_deps = [ + "absl/log:check", + "gtest", + ], + language = "C++", + deps = [ + "//src/core:dual_ref_counted", + "//test/core/test_util:grpc_test_util", + ], +) + +grpc_cc_test( + name = "ref_counted_ptr_test", + srcs = ["ref_counted_ptr_test.cc"], + external_deps = [ + "absl/container:flat_hash_set", + "absl/log:check", + "gtest", + ], + language = "C++", + deps = [ + "//:ref_counted_ptr", + "//src/core:dual_ref_counted", + "//src/core:ref_counted", + "//test/core/test_util:grpc_test_util", + ], +) + +grpc_cc_test( + name = "thd_test", + srcs = ["thd_test.cc"], + external_deps = ["gtest"], + language = "C++", + uses_event_engine = False, + uses_polling = False, + deps = [ + "//:gpr", + "//test/core/test_util:grpc_test_util", + ], +) + +grpc_cc_test( + name = "stat_test", + srcs = ["stat_test.cc"], + external_deps = [ + "gtest", + ], + language = "C++", + uses_event_engine = False, + uses_polling = False, + deps = [ + "//:gpr", + "//:grpc", + "//test/core/test_util:grpc_test_util", + ], +) + +grpc_cc_test( + name = "status_helper_test", + srcs = ["status_helper_test.cc"], + external_deps = [ + "gtest", + ], + language = "C++", + uses_event_engine = False, + uses_polling = False, + deps = [ + "//:gpr", + "//test/core/test_util:grpc_test_util", + ], +) + +grpc_cc_test( + name = "time_util_test", + srcs = ["time_util_test.cc"], + external_deps = [ + "gtest", + ], + language = "C++", + uses_event_engine = False, + uses_polling = False, + deps = [ + "//:gpr", + "//test/core/test_util:grpc_test_util", + ], +) + +grpc_cc_test( + name = "cpp_impl_of_test", + srcs = ["cpp_impl_of_test.cc"], + external_deps = ["gtest"], + language = "c++", + uses_event_engine = False, + uses_polling = False, + deps = [ + "//:cpp_impl_of", + ], +) + +grpc_cc_test( + name = "chunked_vector_test", + srcs = ["chunked_vector_test.cc"], + external_deps = ["gtest"], + language = "c++", + tags = [ + "resource_quota_test", + ], + uses_event_engine = False, + uses_polling = False, + deps = [ + "//:gpr", + "//src/core:chunked_vector", + "//src/core:resource_quota", + ], +) + +grpc_proto_fuzzer( + name = "chunked_vector_fuzzer", + srcs = ["chunked_vector_fuzzer.cc"], + corpus = "chunked_vector_corpora", + external_deps = ["absl/log:check"], + language = "C++", + proto = "chunked_vector_fuzzer.proto", + tags = ["no_windows"], + uses_event_engine = False, + uses_polling = False, + deps = [ + "//src/core:chunked_vector", + "//src/core:resource_quota", + "//test/core/test_util:grpc_test_util", + ], +) + +grpc_cc_test( + name = "time_test", + srcs = ["time_test.cc"], + external_deps = ["gtest"], + language = "c++", + uses_event_engine = False, + uses_polling = False, + deps = [ + "//src/core:time", + ], +) + +grpc_cc_test( + name = "single_set_ptr_test", + srcs = ["single_set_ptr_test.cc"], + external_deps = [ + "absl/log:log", + "gtest", + ], + language = "c++", + uses_event_engine = False, + uses_polling = False, + deps = [ + "//src/core:single_set_ptr", + ], +) + +grpc_cc_test( + name = "sorted_pack_test", + srcs = ["sorted_pack_test.cc"], + external_deps = ["gtest"], + language = "c++", + uses_event_engine = False, + uses_polling = False, + deps = [ + "//src/core:sorted_pack", + ], +) + +grpc_cc_test( + name = "unique_type_name_test", + srcs = ["unique_type_name_test.cc"], + external_deps = [ + "gtest", + "absl/container:flat_hash_map", + "absl/strings:str_format", + ], + language = "c++", + uses_event_engine = False, + uses_polling = False, + deps = [ + "//src/core:unique_type_name", + ], +) + +grpc_cc_test( + name = "work_serializer_test", + srcs = ["work_serializer_test.cc"], + exec_properties = LARGE_MACHINE, + external_deps = [ + "gtest", + ], + flaky = True, + language = "C++", + shard_count = 5, + tags = [ + "no_windows", # LARGE_MACHINE is not configured for windows RBE + ], + deps = [ + "//:gpr", + "//:grpc", + "//test/core/event_engine:event_engine_test_utils", + "//test/core/test_util:grpc_test_util", + ], +) + +grpc_cc_test( + name = "validation_errors_test", + srcs = ["validation_errors_test.cc"], + external_deps = [ + "gtest", + ], + language = "C++", + deps = [ + "//src/core:validation_errors", + "//test/core/test_util:grpc_test_util", + ], +) + +grpc_cc_test( + name = "notification_test", + srcs = ["notification_test.cc"], + external_deps = [ + "gtest", + ], + language = "C++", + uses_event_engine = False, + uses_polling = False, + deps = ["//src/core:notification"], +) + +grpc_cc_test( + name = "load_file_test", + srcs = ["load_file_test.cc"], + external_deps = [ + "gtest", + ], + language = "C++", + uses_event_engine = False, + uses_polling = False, + deps = [ + "//src/core:load_file", + "//test/core/test_util:grpc_test_util", + ], +) + +grpc_cc_test( + name = "uuid_v4_test", + srcs = ["uuid_v4_test.cc"], + external_deps = [ + "gtest", + ], + language = "C++", + uses_event_engine = False, + uses_polling = False, + deps = [ + "//src/core:uuid_v4", + "//test/core/test_util:grpc_test_util", + ], +) + +grpc_cc_test( + name = "glob_test", + srcs = ["glob_test.cc"], + external_deps = ["gtest"], + language = "C++", + uses_event_engine = False, + uses_polling = False, + deps = [ + "//:gpr", + "//src/core:useful", + "//test/core/test_util:grpc_test_util", + ], +) + +grpc_fuzzer( + name = "uri_fuzzer_test", + srcs = ["uri_fuzzer_test.cc"], + corpus = "uri_corpus", + language = "C++", + tags = [ + "no_windows", + # Without "nofixdeps", "//:grpc" gets substituted with "//:event_engine_base_hdrs" + "nofixdeps", + ], + deps = [ + "//:exec_ctx", + "//:gpr", + "//:grpc", + "//:uri", + ], +) + +grpc_cc_test( + name = "uri_test", + srcs = ["uri_test.cc"], + external_deps = [ + "absl/status", + "gtest", + ], + language = "C++", + deps = [ + "//:event_engine_base_hdrs", + "//:uri", + "//test/core/test_util:grpc_test_util_unsecure", + ], +) + +grpc_cc_test( + name = "matchers_test", + srcs = ["matchers_test.cc"], + external_deps = ["gtest"], + language = "C++", + deps = [ + "//:gpr", + "//:grpc", + "//test/core/test_util:grpc_test_util", + "//test/core/test_util:grpc_test_util_base", + ], +) + +grpc_cc_test( + name = "backoff_test", + srcs = ["backoff_test.cc"], + external_deps = ["gtest"], + language = "C++", + uses_event_engine = False, + uses_polling = False, + deps = [ + "//:backoff", + "//:exec_ctx", + "//:grpc", + "//src/core:time", + "//test/core/test_util:grpc_test_util", + ], +) + +grpc_cc_test( + name = "random_early_detection_test", + srcs = ["random_early_detection_test.cc"], + external_deps = [ + "absl/random", + "gtest", + ], + language = "C++", + uses_event_engine = False, + uses_polling = False, + deps = ["//src/core:random_early_detection"], +) + grpc_cc_test( name = "alloc_test", srcs = ["alloc_test.cc"], @@ -100,8 +676,8 @@ grpc_cc_test( ) grpc_cc_test( - name = "time_test", - srcs = ["time_test.cc"], + name = "gpr_time_test", + srcs = ["gpr_time_test.cc"], external_deps = ["gtest"], language = "C++", uses_event_engine = False, @@ -151,6 +727,33 @@ grpc_cc_test( ], ) +grpc_cc_test( + name = "avl_test", + srcs = ["avl_test.cc"], + external_deps = ["gtest"], + language = "C++", + uses_event_engine = False, + uses_polling = False, + deps = [ + "//src/core:avl", + ], +) + +grpc_proto_fuzzer( + name = "avl_fuzzer", + srcs = ["avl_fuzzer.cc"], + corpus = "avl_fuzzer_corpus", + language = "C++", + proto = "avl_fuzzer.proto", + tags = ["no_windows"], + uses_event_engine = False, + uses_polling = False, + deps = [ + "//src/core:avl", + "//test/core/test_util:grpc_test_util", + ], +) + grpc_cc_test( name = "lru_cache_test", srcs = ["lru_cache_test.cc"], diff --git a/test/core/avl/avl_fuzzer.cc b/test/core/util/avl_fuzzer.cc similarity index 97% rename from test/core/avl/avl_fuzzer.cc rename to test/core/util/avl_fuzzer.cc index 914fdb78b3a..a0760e659cd 100644 --- a/test/core/avl/avl_fuzzer.cc +++ b/test/core/util/avl_fuzzer.cc @@ -19,9 +19,9 @@ #include #include -#include "src/core/lib/avl/avl.h" +#include "src/core/util/avl.h" #include "src/libfuzzer/libfuzzer_macro.h" -#include "test/core/avl/avl_fuzzer.pb.h" +#include "test/core/util/avl_fuzzer.pb.h" bool squelch = true; bool leak_check = true; diff --git a/test/core/avl/avl_fuzzer.proto b/test/core/util/avl_fuzzer.proto similarity index 100% rename from test/core/avl/avl_fuzzer.proto rename to test/core/util/avl_fuzzer.proto diff --git a/test/core/avl/avl_fuzzer_corpus/0 b/test/core/util/avl_fuzzer_corpus/0 similarity index 100% rename from test/core/avl/avl_fuzzer_corpus/0 rename to test/core/util/avl_fuzzer_corpus/0 diff --git a/test/core/avl/avl_fuzzer_corpus/crash-060a9a897130ba7bb2f4313daa604c47f7c7c907 b/test/core/util/avl_fuzzer_corpus/crash-060a9a897130ba7bb2f4313daa604c47f7c7c907 similarity index 100% rename from test/core/avl/avl_fuzzer_corpus/crash-060a9a897130ba7bb2f4313daa604c47f7c7c907 rename to test/core/util/avl_fuzzer_corpus/crash-060a9a897130ba7bb2f4313daa604c47f7c7c907 diff --git a/test/core/avl/avl_fuzzer_corpus/crash-1fbe8edb82f9a7aa4c2dffe4a6eaa40c34b1e360 b/test/core/util/avl_fuzzer_corpus/crash-1fbe8edb82f9a7aa4c2dffe4a6eaa40c34b1e360 similarity index 100% rename from test/core/avl/avl_fuzzer_corpus/crash-1fbe8edb82f9a7aa4c2dffe4a6eaa40c34b1e360 rename to test/core/util/avl_fuzzer_corpus/crash-1fbe8edb82f9a7aa4c2dffe4a6eaa40c34b1e360 diff --git a/test/core/avl/avl_test.cc b/test/core/util/avl_test.cc similarity index 97% rename from test/core/avl/avl_test.cc rename to test/core/util/avl_test.cc index 2bd56c81bc6..1c8c33a18bf 100644 --- a/test/core/avl/avl_test.cc +++ b/test/core/util/avl_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/core/lib/avl/avl.h" +#include "src/core/util/avl.h" #include diff --git a/test/core/backoff/backoff_test.cc b/test/core/util/backoff_test.cc similarity index 98% rename from test/core/backoff/backoff_test.cc rename to test/core/util/backoff_test.cc index 13710acffad..3ee1cf7fe21 100644 --- a/test/core/backoff/backoff_test.cc +++ b/test/core/util/backoff_test.cc @@ -16,7 +16,7 @@ // // -#include "src/core/lib/backoff/backoff.h" +#include "src/core/util/backoff.h" #include #include @@ -26,7 +26,7 @@ #include -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "test/core/test_util/test_config.h" namespace grpc_core { diff --git a/test/core/gprpp/bitset_test.cc b/test/core/util/bitset_test.cc similarity index 98% rename from test/core/gprpp/bitset_test.cc rename to test/core/util/bitset_test.cc index 58a23f628c1..99f1f72a7ee 100644 --- a/test/core/gprpp/bitset_test.cc +++ b/test/core/util/bitset_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/core/lib/gprpp/bitset.h" +#include "src/core/util/bitset.h" #include #include diff --git a/test/core/gprpp/chunked_vector_corpora/crash-a0868ce3a0f76feefcc715148ed9e71fa0738c2a b/test/core/util/chunked_vector_corpora/crash-a0868ce3a0f76feefcc715148ed9e71fa0738c2a similarity index 100% rename from test/core/gprpp/chunked_vector_corpora/crash-a0868ce3a0f76feefcc715148ed9e71fa0738c2a rename to test/core/util/chunked_vector_corpora/crash-a0868ce3a0f76feefcc715148ed9e71fa0738c2a diff --git a/test/core/gprpp/chunked_vector_corpora/testcase-5405829431427072 b/test/core/util/chunked_vector_corpora/testcase-5405829431427072 similarity index 100% rename from test/core/gprpp/chunked_vector_corpora/testcase-5405829431427072 rename to test/core/util/chunked_vector_corpora/testcase-5405829431427072 diff --git a/test/core/gprpp/chunked_vector_fuzzer.cc b/test/core/util/chunked_vector_fuzzer.cc similarity index 97% rename from test/core/gprpp/chunked_vector_fuzzer.cc rename to test/core/util/chunked_vector_fuzzer.cc index d857208c2e5..37bcc3df4e1 100644 --- a/test/core/gprpp/chunked_vector_fuzzer.cc +++ b/test/core/util/chunked_vector_fuzzer.cc @@ -24,13 +24,13 @@ #include -#include "src/core/lib/gprpp/chunked_vector.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/lib/resource_quota/resource_quota.h" +#include "src/core/util/chunked_vector.h" +#include "src/core/util/ref_counted_ptr.h" #include "src/libfuzzer/libfuzzer_macro.h" -#include "test/core/gprpp/chunked_vector_fuzzer.pb.h" +#include "test/core/util/chunked_vector_fuzzer.pb.h" bool squelch = true; bool leak_check = true; diff --git a/test/core/gprpp/chunked_vector_fuzzer.proto b/test/core/util/chunked_vector_fuzzer.proto similarity index 100% rename from test/core/gprpp/chunked_vector_fuzzer.proto rename to test/core/util/chunked_vector_fuzzer.proto diff --git a/test/core/gprpp/chunked_vector_test.cc b/test/core/util/chunked_vector_test.cc similarity index 97% rename from test/core/gprpp/chunked_vector_test.cc rename to test/core/util/chunked_vector_test.cc index 6299b0209d7..82f10436edc 100644 --- a/test/core/gprpp/chunked_vector_test.cc +++ b/test/core/util/chunked_vector_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/core/lib/gprpp/chunked_vector.h" +#include "src/core/util/chunked_vector.h" #include #include @@ -21,9 +21,9 @@ #include -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/lib/resource_quota/resource_quota.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_core { namespace testing { diff --git a/test/core/gprpp/cpp_impl_of_test.cc b/test/core/util/cpp_impl_of_test.cc similarity index 95% rename from test/core/gprpp/cpp_impl_of_test.cc rename to test/core/util/cpp_impl_of_test.cc index 00b164cb3aa..49653bee36b 100644 --- a/test/core/gprpp/cpp_impl_of_test.cc +++ b/test/core/util/cpp_impl_of_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/core/lib/gprpp/cpp_impl_of.h" +#include "src/core/util/cpp_impl_of.h" #include diff --git a/test/core/util/cpu_test.cc b/test/core/util/cpu_test.cc index b71922e4594..1c480304f47 100644 --- a/test/core/util/cpu_test.cc +++ b/test/core/util/cpu_test.cc @@ -34,7 +34,7 @@ #include #include -#include "src/core/lib/gprpp/thd.h" +#include "src/core/util/thd.h" #include "test/core/test_util/test_config.h" // Test structure is essentially: diff --git a/test/core/gprpp/directory_reader_test.cc b/test/core/util/directory_reader_test.cc similarity index 97% rename from test/core/gprpp/directory_reader_test.cc rename to test/core/util/directory_reader_test.cc index b20e167b078..e117bc2b058 100644 --- a/test/core/gprpp/directory_reader_test.cc +++ b/test/core/util/directory_reader_test.cc @@ -14,7 +14,7 @@ // limitations under the License. // -#include "src/core/lib/gprpp/directory_reader.h" +#include "src/core/util/directory_reader.h" #include #include diff --git a/test/core/gprpp/down_cast_test.cc b/test/core/util/down_cast_test.cc similarity index 96% rename from test/core/gprpp/down_cast_test.cc rename to test/core/util/down_cast_test.cc index e0af7081734..dd84b197f70 100644 --- a/test/core/gprpp/down_cast_test.cc +++ b/test/core/util/down_cast_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/core/lib/gprpp/down_cast.h" +#include "src/core/util/down_cast.h" #include "gtest/gtest.h" diff --git a/test/core/gprpp/dual_ref_counted_test.cc b/test/core/util/dual_ref_counted_test.cc similarity index 96% rename from test/core/gprpp/dual_ref_counted_test.cc rename to test/core/util/dual_ref_counted_test.cc index 1f7cf80e41d..4c9e2de162f 100644 --- a/test/core/gprpp/dual_ref_counted_test.cc +++ b/test/core/util/dual_ref_counted_test.cc @@ -14,15 +14,15 @@ // limitations under the License. // -#include "src/core/lib/gprpp/dual_ref_counted.h" +#include "src/core/util/dual_ref_counted.h" #include #include "absl/log/check.h" #include "gtest/gtest.h" -#include "src/core/lib/gprpp/manual_constructor.h" -#include "src/core/lib/gprpp/ref_counted.h" +#include "src/core/util/manual_constructor.h" +#include "src/core/util/ref_counted.h" #include "test/core/test_util/test_config.h" namespace grpc_core { diff --git a/test/core/gprpp/dump_args_test.cc b/test/core/util/dump_args_test.cc similarity index 96% rename from test/core/gprpp/dump_args_test.cc rename to test/core/util/dump_args_test.cc index 09c6fafc387..06f26a1fce5 100644 --- a/test/core/gprpp/dump_args_test.cc +++ b/test/core/util/dump_args_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/core/lib/gprpp/dump_args.h" +#include "src/core/util/dump_args.h" #include diff --git a/test/core/util/env_test.cc b/test/core/util/env_test.cc index b3f09966c07..df82aa37752 100644 --- a/test/core/util/env_test.cc +++ b/test/core/util/env_test.cc @@ -16,7 +16,7 @@ // // -#include "src/core/lib/gprpp/env.h" +#include "src/core/util/env.h" #include "absl/log/log.h" #include "gtest/gtest.h" diff --git a/test/core/gprpp/examine_stack_test.cc b/test/core/util/examine_stack_test.cc similarity index 98% rename from test/core/gprpp/examine_stack_test.cc rename to test/core/util/examine_stack_test.cc index f9384842c7d..e257f114828 100644 --- a/test/core/gprpp/examine_stack_test.cc +++ b/test/core/util/examine_stack_test.cc @@ -16,7 +16,7 @@ // // -#include "src/core/lib/gprpp/examine_stack.h" +#include "src/core/util/examine_stack.h" #include "absl/debugging/stacktrace.h" #include "absl/debugging/symbolize.h" diff --git a/test/core/gprpp/fork_test.cc b/test/core/util/fork_test.cc similarity index 98% rename from test/core/gprpp/fork_test.cc rename to test/core/util/fork_test.cc index 24f74c77d6b..543c00da713 100644 --- a/test/core/gprpp/fork_test.cc +++ b/test/core/util/fork_test.cc @@ -16,7 +16,7 @@ // // -#include "src/core/lib/gprpp/fork.h" +#include "src/core/util/fork.h" #include @@ -24,7 +24,7 @@ #include -#include "src/core/lib/gprpp/thd.h" +#include "src/core/util/thd.h" #include "test/core/test_util/test_config.h" TEST(ForkTest, Init) { diff --git a/test/core/gprpp/glob_test.cc b/test/core/util/glob_test.cc similarity index 98% rename from test/core/gprpp/glob_test.cc rename to test/core/util/glob_test.cc index 5233c666235..84df18db721 100644 --- a/test/core/gprpp/glob_test.cc +++ b/test/core/util/glob_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/core/lib/gprpp/glob.h" +#include "src/core/util/glob.h" #include "absl/strings/match.h" #include "gtest/gtest.h" diff --git a/test/core/util/gpr_time_test.cc b/test/core/util/gpr_time_test.cc new file mode 100644 index 00000000000..48ea2ce17a2 --- /dev/null +++ b/test/core/util/gpr_time_test.cc @@ -0,0 +1,268 @@ +// +// +// 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. +// +// + +// Test of gpr time support. + +#include +#include +#include + +#include + +#include "gtest/gtest.h" + +#include + +#include "test/core/test_util/test_config.h" + +static void to_fp(void* arg, const char* buf, size_t len) { + fwrite(buf, 1, len, static_cast(arg)); +} + +// Convert gpr_intmax x to ascii base b (2..16), and write with +// (*writer)(arg, ...), zero padding to "chars" digits). +static void i_to_s(intmax_t x, int base, int chars, + void (*writer)(void* arg, const char* buf, size_t len), + void* arg) { + char buf[64]; + char fmt[32]; + ASSERT_TRUE(base == 16 || base == 10); + sprintf(fmt, "%%0%d%s", chars, base == 16 ? PRIxMAX : PRIdMAX); + sprintf(buf, fmt, x); + (*writer)(arg, buf, strlen(buf)); +} + +// Convert ts to ascii, and write with (*writer)(arg, ...). +static void ts_to_s(gpr_timespec t, + void (*writer)(void* arg, const char* buf, size_t len), + void* arg) { + if (t.tv_sec < 0 && t.tv_nsec != 0) { + t.tv_sec++; + t.tv_nsec = GPR_NS_PER_SEC - t.tv_nsec; + } + i_to_s(t.tv_sec, 10, 0, writer, arg); + (*writer)(arg, ".", 1); + i_to_s(t.tv_nsec, 10, 9, writer, arg); +} + +TEST(TimeTest, Values) { + int i; + + gpr_timespec x = gpr_time_0(GPR_CLOCK_REALTIME); + ASSERT_TRUE(x.tv_sec == 0 && x.tv_nsec == 0); + + x = gpr_inf_future(GPR_CLOCK_REALTIME); + fprintf(stderr, "far future "); + fflush(stderr); + i_to_s(x.tv_sec, 16, 16, &to_fp, stderr); + fprintf(stderr, "\n"); + ASSERT_EQ(x.tv_sec, INT64_MAX); + fprintf(stderr, "far future "); + fflush(stderr); + ts_to_s(x, &to_fp, stderr); + fprintf(stderr, "\n"); + fflush(stderr); + + x = gpr_inf_past(GPR_CLOCK_REALTIME); + fprintf(stderr, "far past "); + fflush(stderr); + i_to_s(x.tv_sec, 16, 16, &to_fp, stderr); + fprintf(stderr, "\n"); + fflush(stderr); + ASSERT_EQ(x.tv_sec, INT64_MIN); + fprintf(stderr, "far past "); + fflush(stderr); + ts_to_s(x, &to_fp, stderr); + fprintf(stderr, "\n"); + fflush(stderr); + + for (i = 1; i != 1000 * 1000 * 1000; i *= 10) { + x = gpr_time_from_micros(i, GPR_TIMESPAN); + ASSERT_TRUE(x.tv_sec == i / GPR_US_PER_SEC && + x.tv_nsec == (i % GPR_US_PER_SEC) * GPR_NS_PER_US); + x = gpr_time_from_nanos(i, GPR_TIMESPAN); + ASSERT_TRUE(x.tv_sec == i / GPR_NS_PER_SEC && + x.tv_nsec == (i % GPR_NS_PER_SEC)); + x = gpr_time_from_millis(i, GPR_TIMESPAN); + ASSERT_TRUE(x.tv_sec == i / GPR_MS_PER_SEC && + x.tv_nsec == (i % GPR_MS_PER_SEC) * GPR_NS_PER_MS); + } + + // Test possible overflow in conversion of -ve values. + x = gpr_time_from_micros(-(INT64_MAX - 999997), GPR_TIMESPAN); + ASSERT_LT(x.tv_sec, 0); + ASSERT_TRUE(x.tv_nsec >= 0 && x.tv_nsec < GPR_NS_PER_SEC); + EXPECT_EQ((x.tv_sec * GPR_US_PER_SEC + + x.tv_nsec / (GPR_NS_PER_SEC / GPR_US_PER_SEC)), + -(INT64_MAX - 999997)); + + x = gpr_time_from_nanos(-(INT64_MAX - 999999997), GPR_TIMESPAN); + ASSERT_LT(x.tv_sec, 0); + ASSERT_TRUE(x.tv_nsec >= 0 && x.tv_nsec < GPR_NS_PER_SEC); + EXPECT_EQ((x.tv_sec * GPR_NS_PER_SEC + x.tv_nsec), -(INT64_MAX - 999999997)); + + x = gpr_time_from_millis(-(INT64_MAX - 997), GPR_TIMESPAN); + ASSERT_LT(x.tv_sec, 0); + ASSERT_TRUE(x.tv_nsec >= 0 && x.tv_nsec < GPR_NS_PER_SEC); + EXPECT_EQ((x.tv_sec * GPR_MS_PER_SEC + + x.tv_nsec / (GPR_NS_PER_SEC / GPR_MS_PER_SEC)), + -(INT64_MAX - 997)); + + // Test general -ve values. + for (i = -1; i > -1000 * 1000 * 1000; i *= 7) { + x = gpr_time_from_micros(i, GPR_TIMESPAN); + ASSERT_EQ(x.tv_sec * GPR_US_PER_SEC + x.tv_nsec / GPR_NS_PER_US, i); + x = gpr_time_from_nanos(i, GPR_TIMESPAN); + ASSERT_EQ(x.tv_sec * GPR_NS_PER_SEC + x.tv_nsec, i); + x = gpr_time_from_millis(i, GPR_TIMESPAN); + ASSERT_EQ(x.tv_sec * GPR_MS_PER_SEC + x.tv_nsec / GPR_NS_PER_MS, i); + } +} + +TEST(TimeTest, AddSub) { + int i; + int j; + int k; + // Basic addition and subtraction. + for (i = -100; i <= 100; i++) { + for (j = -100; j <= 100; j++) { + for (k = 1; k <= 10000000; k *= 10) { + int sum = i + j; + int diff = i - j; + gpr_timespec it = gpr_time_from_micros(i * k, GPR_TIMESPAN); + gpr_timespec jt = gpr_time_from_micros(j * k, GPR_TIMESPAN); + gpr_timespec sumt = gpr_time_add(it, jt); + gpr_timespec difft = gpr_time_sub(it, jt); + if (gpr_time_cmp(gpr_time_from_micros(sum * k, GPR_TIMESPAN), sumt) != + 0) { + fprintf(stderr, "i %d j %d sum %d sumt ", i, j, sum); + fflush(stderr); + ts_to_s(sumt, &to_fp, stderr); + fprintf(stderr, "\n"); + fflush(stderr); + ASSERT_TRUE(0); + } + if (gpr_time_cmp(gpr_time_from_micros(diff * k, GPR_TIMESPAN), difft) != + 0) { + fprintf(stderr, "i %d j %d diff %d diff ", i, j, diff); + fflush(stderr); + ts_to_s(sumt, &to_fp, stderr); + fprintf(stderr, "\n"); + fflush(stderr); + ASSERT_TRUE(0); + } + } + } + } +} + +TEST(TimeTest, Overflow) { + // overflow + gpr_timespec x = gpr_time_from_micros(1, GPR_TIMESPAN); + do { + x = gpr_time_add(x, x); + } while (gpr_time_cmp(x, gpr_inf_future(GPR_TIMESPAN)) < 0); + ASSERT_EQ(gpr_time_cmp(x, gpr_inf_future(GPR_TIMESPAN)), 0); + x = gpr_time_from_micros(-1, GPR_TIMESPAN); + do { + x = gpr_time_add(x, x); + } while (gpr_time_cmp(x, gpr_inf_past(GPR_TIMESPAN)) > 0); + ASSERT_EQ(gpr_time_cmp(x, gpr_inf_past(GPR_TIMESPAN)), 0); +} + +TEST(TimeTest, StickyInfinities) { + int i; + int j; + int k; + gpr_timespec infinity[2]; + gpr_timespec addend[3]; + infinity[0] = gpr_inf_future(GPR_TIMESPAN); + infinity[1] = gpr_inf_past(GPR_TIMESPAN); + addend[0] = gpr_inf_future(GPR_TIMESPAN); + addend[1] = gpr_inf_past(GPR_TIMESPAN); + addend[2] = gpr_time_0(GPR_TIMESPAN); + + // Infinities are sticky + for (i = 0; i != sizeof(infinity) / sizeof(infinity[0]); i++) { + for (j = 0; j != sizeof(addend) / sizeof(addend[0]); j++) { + gpr_timespec x = gpr_time_add(infinity[i], addend[j]); + ASSERT_EQ(gpr_time_cmp(x, infinity[i]), 0); + x = gpr_time_sub(infinity[i], addend[j]); + ASSERT_EQ(gpr_time_cmp(x, infinity[i]), 0); + } + for (k = -200; k <= 200; k++) { + gpr_timespec y = gpr_time_from_micros(k * 100000, GPR_TIMESPAN); + gpr_timespec x = gpr_time_add(infinity[i], y); + ASSERT_EQ(gpr_time_cmp(x, infinity[i]), 0); + x = gpr_time_sub(infinity[i], y); + ASSERT_EQ(gpr_time_cmp(x, infinity[i]), 0); + } + } +} + +TEST(TimeTest, Similar) { + ASSERT_EQ(1, gpr_time_similar(gpr_inf_future(GPR_TIMESPAN), + gpr_inf_future(GPR_TIMESPAN), + gpr_time_0(GPR_TIMESPAN))); + ASSERT_EQ(1, gpr_time_similar(gpr_inf_past(GPR_TIMESPAN), + gpr_inf_past(GPR_TIMESPAN), + gpr_time_0(GPR_TIMESPAN))); + ASSERT_EQ(0, gpr_time_similar(gpr_inf_past(GPR_TIMESPAN), + gpr_inf_future(GPR_TIMESPAN), + gpr_time_0(GPR_TIMESPAN))); + ASSERT_EQ(0, gpr_time_similar(gpr_inf_future(GPR_TIMESPAN), + gpr_inf_past(GPR_TIMESPAN), + gpr_time_0(GPR_TIMESPAN))); + ASSERT_EQ(1, gpr_time_similar(gpr_time_from_micros(10, GPR_TIMESPAN), + gpr_time_from_micros(10, GPR_TIMESPAN), + gpr_time_0(GPR_TIMESPAN))); + ASSERT_EQ(1, gpr_time_similar(gpr_time_from_micros(10, GPR_TIMESPAN), + gpr_time_from_micros(15, GPR_TIMESPAN), + gpr_time_from_micros(10, GPR_TIMESPAN))); + ASSERT_EQ(1, gpr_time_similar(gpr_time_from_micros(15, GPR_TIMESPAN), + gpr_time_from_micros(10, GPR_TIMESPAN), + gpr_time_from_micros(10, GPR_TIMESPAN))); + ASSERT_EQ(0, gpr_time_similar(gpr_time_from_micros(10, GPR_TIMESPAN), + gpr_time_from_micros(25, GPR_TIMESPAN), + gpr_time_from_micros(10, GPR_TIMESPAN))); + ASSERT_EQ(0, gpr_time_similar(gpr_time_from_micros(25, GPR_TIMESPAN), + gpr_time_from_micros(10, GPR_TIMESPAN), + gpr_time_from_micros(10, GPR_TIMESPAN))); +} + +TEST(TimeTest, ConvertExtreme) { + gpr_timespec realtime = {INT64_MAX, 1, GPR_CLOCK_REALTIME}; + gpr_timespec monotime = gpr_convert_clock_type(realtime, GPR_CLOCK_MONOTONIC); + ASSERT_EQ(monotime.tv_sec, realtime.tv_sec); + ASSERT_EQ(monotime.clock_type, GPR_CLOCK_MONOTONIC); +} + +TEST(TimeTest, CmpExtreme) { + gpr_timespec t1 = {INT64_MAX, 1, GPR_CLOCK_REALTIME}; + gpr_timespec t2 = {INT64_MAX, 2, GPR_CLOCK_REALTIME}; + ASSERT_EQ(gpr_time_cmp(t1, t2), 0); + t1.tv_sec = INT64_MIN; + t2.tv_sec = INT64_MIN; + ASSERT_EQ(gpr_time_cmp(t1, t2), 0); +} + +int main(int argc, char** argv) { + grpc::testing::TestEnvironment env(&argc, argv); + ::testing::InitGoogleTest(&argc, argv); + return RUN_ALL_TESTS(); +} diff --git a/test/core/gprpp/host_port_test.cc b/test/core/util/host_port_test.cc similarity index 98% rename from test/core/gprpp/host_port_test.cc rename to test/core/util/host_port_test.cc index 77432e3155d..3f7607c0a56 100644 --- a/test/core/gprpp/host_port_test.cc +++ b/test/core/util/host_port_test.cc @@ -16,7 +16,7 @@ // // -#include "src/core/lib/gprpp/host_port.h" +#include "src/core/util/host_port.h" #include "gtest/gtest.h" diff --git a/test/core/gprpp/if_list_test.cc b/test/core/util/if_list_test.cc similarity index 96% rename from test/core/gprpp/if_list_test.cc rename to test/core/util/if_list_test.cc index 38dce561bf4..d99d8ed6ba3 100644 --- a/test/core/gprpp/if_list_test.cc +++ b/test/core/util/if_list_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/core/lib/gprpp/if_list.h" +#include "src/core/util/if_list.h" #include diff --git a/test/core/gprpp/load_file_test.cc b/test/core/util/load_file_test.cc similarity index 98% rename from test/core/gprpp/load_file_test.cc rename to test/core/util/load_file_test.cc index 180624c9eb4..4888749fb40 100644 --- a/test/core/gprpp/load_file_test.cc +++ b/test/core/util/load_file_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/core/lib/gprpp/load_file.h" +#include "src/core/util/load_file.h" #include #include diff --git a/test/core/gprpp/match_test.cc b/test/core/util/match_test.cc similarity index 98% rename from test/core/gprpp/match_test.cc rename to test/core/util/match_test.cc index 8df0b69a173..481bb2d6c59 100644 --- a/test/core/gprpp/match_test.cc +++ b/test/core/util/match_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/core/lib/gprpp/match.h" +#include "src/core/util/match.h" #include diff --git a/test/core/matchers/matchers_test.cc b/test/core/util/matchers_test.cc similarity index 99% rename from test/core/matchers/matchers_test.cc rename to test/core/util/matchers_test.cc index 75c6b498886..d772dcbcfbe 100644 --- a/test/core/matchers/matchers_test.cc +++ b/test/core/util/matchers_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/core/lib/matchers/matchers.h" +#include "src/core/util/matchers.h" #include "absl/status/status.h" #include "gtest/gtest.h" diff --git a/test/core/gprpp/mpscq_test.cc b/test/core/util/mpscq_test.cc similarity index 98% rename from test/core/gprpp/mpscq_test.cc rename to test/core/util/mpscq_test.cc index 1bf92acd189..65dce481d43 100644 --- a/test/core/gprpp/mpscq_test.cc +++ b/test/core/util/mpscq_test.cc @@ -16,7 +16,7 @@ // // -#include "src/core/lib/gprpp/mpscq.h" +#include "src/core/util/mpscq.h" #include #include @@ -29,7 +29,7 @@ #include #include -#include "src/core/lib/gprpp/thd.h" +#include "src/core/util/thd.h" #include "src/core/util/useful.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/gprpp/no_destruct_test.cc b/test/core/util/no_destruct_test.cc similarity index 97% rename from test/core/gprpp/no_destruct_test.cc rename to test/core/util/no_destruct_test.cc index d0f9d19a4c9..7a440e65a2d 100644 --- a/test/core/gprpp/no_destruct_test.cc +++ b/test/core/util/no_destruct_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/core/lib/gprpp/no_destruct.h" +#include "src/core/util/no_destruct.h" #include diff --git a/test/core/gprpp/notification_test.cc b/test/core/util/notification_test.cc similarity index 97% rename from test/core/gprpp/notification_test.cc rename to test/core/util/notification_test.cc index ed5dcf48021..3a4fb77a53d 100644 --- a/test/core/gprpp/notification_test.cc +++ b/test/core/util/notification_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/core/lib/gprpp/notification.h" +#include "src/core/util/notification.h" #include #include diff --git a/test/core/gprpp/orphanable_test.cc b/test/core/util/orphanable_test.cc similarity index 98% rename from test/core/gprpp/orphanable_test.cc rename to test/core/util/orphanable_test.cc index fe53367c9a2..4e38d719d9c 100644 --- a/test/core/gprpp/orphanable_test.cc +++ b/test/core/util/orphanable_test.cc @@ -16,7 +16,7 @@ // // -#include "src/core/lib/gprpp/orphanable.h" +#include "src/core/util/orphanable.h" #include "gtest/gtest.h" diff --git a/test/core/gprpp/overload_test.cc b/test/core/util/overload_test.cc similarity index 96% rename from test/core/gprpp/overload_test.cc rename to test/core/util/overload_test.cc index e7443a5be2c..c3b26549fd4 100644 --- a/test/core/gprpp/overload_test.cc +++ b/test/core/util/overload_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/core/lib/gprpp/overload.h" +#include "src/core/util/overload.h" #include diff --git a/test/core/backoff/random_early_detection_test.cc b/test/core/util/random_early_detection_test.cc similarity index 97% rename from test/core/backoff/random_early_detection_test.cc rename to test/core/util/random_early_detection_test.cc index 778fe873bf0..c0531d647d5 100644 --- a/test/core/backoff/random_early_detection_test.cc +++ b/test/core/util/random_early_detection_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/core/lib/backoff/random_early_detection.h" +#include "src/core/util/random_early_detection.h" #include diff --git a/test/core/gprpp/ref_counted_ptr_test.cc b/test/core/util/ref_counted_ptr_test.cc similarity index 99% rename from test/core/gprpp/ref_counted_ptr_test.cc rename to test/core/util/ref_counted_ptr_test.cc index 5c3e0f0f6c7..e2d7cd0f4db 100644 --- a/test/core/gprpp/ref_counted_ptr_test.cc +++ b/test/core/util/ref_counted_ptr_test.cc @@ -16,7 +16,7 @@ // // -#include "src/core/lib/gprpp/ref_counted_ptr.h" +#include "src/core/util/ref_counted_ptr.h" #include @@ -24,8 +24,8 @@ #include "absl/log/check.h" #include "gtest/gtest.h" -#include "src/core/lib/gprpp/dual_ref_counted.h" -#include "src/core/lib/gprpp/ref_counted.h" +#include "src/core/util/dual_ref_counted.h" +#include "src/core/util/ref_counted.h" #include "test/core/test_util/test_config.h" namespace grpc_core { diff --git a/test/core/gprpp/ref_counted_test.cc b/test/core/util/ref_counted_test.cc similarity index 99% rename from test/core/gprpp/ref_counted_test.cc rename to test/core/util/ref_counted_test.cc index 15ee86e5c52..5b0171d3b4f 100644 --- a/test/core/gprpp/ref_counted_test.cc +++ b/test/core/util/ref_counted_test.cc @@ -16,7 +16,7 @@ // // -#include "src/core/lib/gprpp/ref_counted.h" +#include "src/core/util/ref_counted.h" #include #include diff --git a/test/core/gprpp/single_set_ptr_test.cc b/test/core/util/single_set_ptr_test.cc similarity index 97% rename from test/core/gprpp/single_set_ptr_test.cc rename to test/core/util/single_set_ptr_test.cc index b93aa14c3e8..67f9cc39b96 100644 --- a/test/core/gprpp/single_set_ptr_test.cc +++ b/test/core/util/single_set_ptr_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/core/lib/gprpp/single_set_ptr.h" +#include "src/core/util/single_set_ptr.h" #include #include diff --git a/test/core/gprpp/sorted_pack_test.cc b/test/core/util/sorted_pack_test.cc similarity index 97% rename from test/core/gprpp/sorted_pack_test.cc rename to test/core/util/sorted_pack_test.cc index ad4e911c813..74e0bb6823d 100644 --- a/test/core/gprpp/sorted_pack_test.cc +++ b/test/core/util/sorted_pack_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/core/lib/gprpp/sorted_pack.h" +#include "src/core/util/sorted_pack.h" #include diff --git a/test/core/util/spinlock_test.cc b/test/core/util/spinlock_test.cc index 6e8be4a853e..da7c4b4ca57 100644 --- a/test/core/util/spinlock_test.cc +++ b/test/core/util/spinlock_test.cc @@ -30,7 +30,7 @@ #include #include -#include "src/core/lib/gprpp/thd.h" +#include "src/core/util/thd.h" #include "test/core/test_util/test_config.h" // ------------------------------------------------- diff --git a/test/core/gprpp/stat_test.cc b/test/core/util/stat_test.cc similarity index 98% rename from test/core/gprpp/stat_test.cc rename to test/core/util/stat_test.cc index 29536b4a0e6..4595a6208bd 100644 --- a/test/core/gprpp/stat_test.cc +++ b/test/core/util/stat_test.cc @@ -14,7 +14,7 @@ // limitations under the License. // -#include "src/core/lib/gprpp/stat.h" +#include "src/core/util/stat.h" #include diff --git a/test/core/gprpp/status_helper_test.cc b/test/core/util/status_helper_test.cc similarity index 99% rename from test/core/gprpp/status_helper_test.cc rename to test/core/util/status_helper_test.cc index 51f9a571cff..a5c7c14e357 100644 --- a/test/core/gprpp/status_helper_test.cc +++ b/test/core/util/status_helper_test.cc @@ -14,7 +14,7 @@ // limitations under the License. // -#include "src/core/lib/gprpp/status_helper.h" +#include "src/core/util/status_helper.h" #include diff --git a/test/core/util/sync_test.cc b/test/core/util/sync_test.cc index 32f44c56a9e..256664302e2 100644 --- a/test/core/util/sync_test.cc +++ b/test/core/util/sync_test.cc @@ -29,7 +29,7 @@ #include #include -#include "src/core/lib/gprpp/thd.h" +#include "src/core/util/thd.h" #include "test/core/test_util/test_config.h" // ==================Example use of interface=================== diff --git a/test/core/gprpp/table_test.cc b/test/core/util/table_test.cc similarity index 99% rename from test/core/gprpp/table_test.cc rename to test/core/util/table_test.cc index 9c9ba507263..7d959b311e5 100644 --- a/test/core/gprpp/table_test.cc +++ b/test/core/util/table_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/core/lib/gprpp/table.h" +#include "src/core/util/table.h" #include #include diff --git a/test/core/gprpp/thd_test.cc b/test/core/util/thd_test.cc similarity index 98% rename from test/core/gprpp/thd_test.cc rename to test/core/util/thd_test.cc index c26a417a387..fd93eb278d3 100644 --- a/test/core/gprpp/thd_test.cc +++ b/test/core/util/thd_test.cc @@ -18,7 +18,7 @@ // Test of gpr thread support. -#include "src/core/lib/gprpp/thd.h" +#include "src/core/util/thd.h" #include diff --git a/test/core/gprpp/time_averaged_stats_test.cc b/test/core/util/time_averaged_stats_test.cc similarity index 99% rename from test/core/gprpp/time_averaged_stats_test.cc rename to test/core/util/time_averaged_stats_test.cc index 1407c2694aa..f42f27e3353 100644 --- a/test/core/gprpp/time_averaged_stats_test.cc +++ b/test/core/util/time_averaged_stats_test.cc @@ -16,7 +16,7 @@ // // -#include "src/core/lib/gprpp/time_averaged_stats.h" +#include "src/core/util/time_averaged_stats.h" #include diff --git a/test/core/util/time_test.cc b/test/core/util/time_test.cc index 48ea2ce17a2..01ab35e3b47 100644 --- a/test/core/util/time_test.cc +++ b/test/core/util/time_test.cc @@ -1,6 +1,4 @@ -// -// -// Copyright 2015 gRPC authors. +// Copyright 2021 gRPC authors. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -13,256 +11,103 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -// -// -// Test of gpr time support. +#include "src/core/util/time.h" -#include -#include -#include - -#include +#include #include "gtest/gtest.h" -#include - -#include "test/core/test_util/test_config.h" +namespace grpc_core { +namespace testing { -static void to_fp(void* arg, const char* buf, size_t len) { - fwrite(buf, 1, len, static_cast(arg)); +TEST(TimestampTest, Empty) { + EXPECT_EQ(Timestamp(), Timestamp::ProcessEpoch()); } -// Convert gpr_intmax x to ascii base b (2..16), and write with -// (*writer)(arg, ...), zero padding to "chars" digits). -static void i_to_s(intmax_t x, int base, int chars, - void (*writer)(void* arg, const char* buf, size_t len), - void* arg) { - char buf[64]; - char fmt[32]; - ASSERT_TRUE(base == 16 || base == 10); - sprintf(fmt, "%%0%d%s", chars, base == 16 ? PRIxMAX : PRIdMAX); - sprintf(buf, fmt, x); - (*writer)(arg, buf, strlen(buf)); +TEST(TimestampTest, Infinities) { + EXPECT_EQ(Timestamp::InfFuture() - Duration::Milliseconds(1), + Timestamp::InfFuture()); + EXPECT_EQ(Timestamp::InfPast() + Duration::Milliseconds(1), + Timestamp::InfPast()); + EXPECT_EQ(Timestamp::Now() - Timestamp::InfPast(), Duration::Infinity()); + EXPECT_EQ(Timestamp::Now() - Timestamp::InfFuture(), + Duration::NegativeInfinity()); + EXPECT_EQ(Timestamp::InfPast() - Timestamp::InfPast(), + Duration::NegativeInfinity()); + EXPECT_EQ(Timestamp::InfFuture() - Timestamp::InfPast(), + Duration::Infinity()); + EXPECT_EQ(Timestamp::InfFuture() - Timestamp::InfFuture(), + Duration::Infinity()); + EXPECT_EQ(Timestamp::InfPast() - Timestamp::InfFuture(), + Duration::NegativeInfinity()); } -// Convert ts to ascii, and write with (*writer)(arg, ...). -static void ts_to_s(gpr_timespec t, - void (*writer)(void* arg, const char* buf, size_t len), - void* arg) { - if (t.tv_sec < 0 && t.tv_nsec != 0) { - t.tv_sec++; - t.tv_nsec = GPR_NS_PER_SEC - t.tv_nsec; - } - i_to_s(t.tv_sec, 10, 0, writer, arg); - (*writer)(arg, ".", 1); - i_to_s(t.tv_nsec, 10, 9, writer, arg); +TEST(TimestampTest, ToString) { + EXPECT_EQ(Timestamp::FromMillisecondsAfterProcessEpoch(42).ToString(), + "@42ms"); + EXPECT_EQ(Timestamp::InfFuture().ToString(), "@∞"); + EXPECT_EQ(Timestamp::InfPast().ToString(), "@-∞"); } -TEST(TimeTest, Values) { - int i; - - gpr_timespec x = gpr_time_0(GPR_CLOCK_REALTIME); - ASSERT_TRUE(x.tv_sec == 0 && x.tv_nsec == 0); - - x = gpr_inf_future(GPR_CLOCK_REALTIME); - fprintf(stderr, "far future "); - fflush(stderr); - i_to_s(x.tv_sec, 16, 16, &to_fp, stderr); - fprintf(stderr, "\n"); - ASSERT_EQ(x.tv_sec, INT64_MAX); - fprintf(stderr, "far future "); - fflush(stderr); - ts_to_s(x, &to_fp, stderr); - fprintf(stderr, "\n"); - fflush(stderr); +TEST(DurationTest, Empty) { EXPECT_EQ(Duration(), Duration::Zero()); } - x = gpr_inf_past(GPR_CLOCK_REALTIME); - fprintf(stderr, "far past "); - fflush(stderr); - i_to_s(x.tv_sec, 16, 16, &to_fp, stderr); - fprintf(stderr, "\n"); - fflush(stderr); - ASSERT_EQ(x.tv_sec, INT64_MIN); - fprintf(stderr, "far past "); - fflush(stderr); - ts_to_s(x, &to_fp, stderr); - fprintf(stderr, "\n"); - fflush(stderr); - - for (i = 1; i != 1000 * 1000 * 1000; i *= 10) { - x = gpr_time_from_micros(i, GPR_TIMESPAN); - ASSERT_TRUE(x.tv_sec == i / GPR_US_PER_SEC && - x.tv_nsec == (i % GPR_US_PER_SEC) * GPR_NS_PER_US); - x = gpr_time_from_nanos(i, GPR_TIMESPAN); - ASSERT_TRUE(x.tv_sec == i / GPR_NS_PER_SEC && - x.tv_nsec == (i % GPR_NS_PER_SEC)); - x = gpr_time_from_millis(i, GPR_TIMESPAN); - ASSERT_TRUE(x.tv_sec == i / GPR_MS_PER_SEC && - x.tv_nsec == (i % GPR_MS_PER_SEC) * GPR_NS_PER_MS); - } - - // Test possible overflow in conversion of -ve values. - x = gpr_time_from_micros(-(INT64_MAX - 999997), GPR_TIMESPAN); - ASSERT_LT(x.tv_sec, 0); - ASSERT_TRUE(x.tv_nsec >= 0 && x.tv_nsec < GPR_NS_PER_SEC); - EXPECT_EQ((x.tv_sec * GPR_US_PER_SEC + - x.tv_nsec / (GPR_NS_PER_SEC / GPR_US_PER_SEC)), - -(INT64_MAX - 999997)); - - x = gpr_time_from_nanos(-(INT64_MAX - 999999997), GPR_TIMESPAN); - ASSERT_LT(x.tv_sec, 0); - ASSERT_TRUE(x.tv_nsec >= 0 && x.tv_nsec < GPR_NS_PER_SEC); - EXPECT_EQ((x.tv_sec * GPR_NS_PER_SEC + x.tv_nsec), -(INT64_MAX - 999999997)); - - x = gpr_time_from_millis(-(INT64_MAX - 997), GPR_TIMESPAN); - ASSERT_LT(x.tv_sec, 0); - ASSERT_TRUE(x.tv_nsec >= 0 && x.tv_nsec < GPR_NS_PER_SEC); - EXPECT_EQ((x.tv_sec * GPR_MS_PER_SEC + - x.tv_nsec / (GPR_NS_PER_SEC / GPR_MS_PER_SEC)), - -(INT64_MAX - 997)); - - // Test general -ve values. - for (i = -1; i > -1000 * 1000 * 1000; i *= 7) { - x = gpr_time_from_micros(i, GPR_TIMESPAN); - ASSERT_EQ(x.tv_sec * GPR_US_PER_SEC + x.tv_nsec / GPR_NS_PER_US, i); - x = gpr_time_from_nanos(i, GPR_TIMESPAN); - ASSERT_EQ(x.tv_sec * GPR_NS_PER_SEC + x.tv_nsec, i); - x = gpr_time_from_millis(i, GPR_TIMESPAN); - ASSERT_EQ(x.tv_sec * GPR_MS_PER_SEC + x.tv_nsec / GPR_NS_PER_MS, i); - } +TEST(DurationTest, Scales) { + EXPECT_EQ(Duration::Milliseconds(1000), Duration::Seconds(1)); + EXPECT_EQ(Duration::Seconds(60), Duration::Minutes(1)); + EXPECT_EQ(Duration::Minutes(60), Duration::Hours(1)); + EXPECT_EQ(Duration::FromSecondsAsDouble(1.2), Duration::Milliseconds(1200)); + EXPECT_EQ(Duration::FromSecondsAndNanoseconds(1, 300000000), + Duration::Milliseconds(1300)); } -TEST(TimeTest, AddSub) { - int i; - int j; - int k; - // Basic addition and subtraction. - for (i = -100; i <= 100; i++) { - for (j = -100; j <= 100; j++) { - for (k = 1; k <= 10000000; k *= 10) { - int sum = i + j; - int diff = i - j; - gpr_timespec it = gpr_time_from_micros(i * k, GPR_TIMESPAN); - gpr_timespec jt = gpr_time_from_micros(j * k, GPR_TIMESPAN); - gpr_timespec sumt = gpr_time_add(it, jt); - gpr_timespec difft = gpr_time_sub(it, jt); - if (gpr_time_cmp(gpr_time_from_micros(sum * k, GPR_TIMESPAN), sumt) != - 0) { - fprintf(stderr, "i %d j %d sum %d sumt ", i, j, sum); - fflush(stderr); - ts_to_s(sumt, &to_fp, stderr); - fprintf(stderr, "\n"); - fflush(stderr); - ASSERT_TRUE(0); - } - if (gpr_time_cmp(gpr_time_from_micros(diff * k, GPR_TIMESPAN), difft) != - 0) { - fprintf(stderr, "i %d j %d diff %d diff ", i, j, diff); - fflush(stderr); - ts_to_s(sumt, &to_fp, stderr); - fprintf(stderr, "\n"); - fflush(stderr); - ASSERT_TRUE(0); - } - } - } - } +TEST(DurationTest, Epsilon) { + EXPECT_LE(Duration::Epsilon(), Duration::Milliseconds(1)); } -TEST(TimeTest, Overflow) { - // overflow - gpr_timespec x = gpr_time_from_micros(1, GPR_TIMESPAN); - do { - x = gpr_time_add(x, x); - } while (gpr_time_cmp(x, gpr_inf_future(GPR_TIMESPAN)) < 0); - ASSERT_EQ(gpr_time_cmp(x, gpr_inf_future(GPR_TIMESPAN)), 0); - x = gpr_time_from_micros(-1, GPR_TIMESPAN); - do { - x = gpr_time_add(x, x); - } while (gpr_time_cmp(x, gpr_inf_past(GPR_TIMESPAN)) > 0); - ASSERT_EQ(gpr_time_cmp(x, gpr_inf_past(GPR_TIMESPAN)), 0); +TEST(DurationTest, Infinities) { + EXPECT_EQ(Duration::Infinity() - Duration::Milliseconds(1), + Duration::Infinity()); + EXPECT_EQ(Duration::Infinity() + Duration::Milliseconds(1), + Duration::Infinity()); + EXPECT_EQ(Duration::Infinity() * 2, Duration::Infinity()); + EXPECT_EQ(Duration::Infinity() * -1, Duration::NegativeInfinity()); + EXPECT_EQ(Duration::Infinity() / 3, Duration::Infinity()); + EXPECT_EQ(Duration::NegativeInfinity() / -3, Duration::Infinity()); + EXPECT_EQ(Duration::NegativeInfinity() + Duration::Milliseconds(1), + Duration::NegativeInfinity()); + EXPECT_EQ(Duration::NegativeInfinity() - Duration::Milliseconds(1), + Duration::NegativeInfinity()); + EXPECT_EQ(Duration::NegativeInfinity() / 3, Duration::NegativeInfinity()); + EXPECT_EQ(Duration::Hours(std::numeric_limits::max()), + Duration::Infinity()); + EXPECT_EQ(Duration::FromSecondsAsDouble(1e100), Duration::Infinity()); + EXPECT_EQ(Duration::FromSecondsAsDouble(-1e100), + Duration::NegativeInfinity()); } -TEST(TimeTest, StickyInfinities) { - int i; - int j; - int k; - gpr_timespec infinity[2]; - gpr_timespec addend[3]; - infinity[0] = gpr_inf_future(GPR_TIMESPAN); - infinity[1] = gpr_inf_past(GPR_TIMESPAN); - addend[0] = gpr_inf_future(GPR_TIMESPAN); - addend[1] = gpr_inf_past(GPR_TIMESPAN); - addend[2] = gpr_time_0(GPR_TIMESPAN); - - // Infinities are sticky - for (i = 0; i != sizeof(infinity) / sizeof(infinity[0]); i++) { - for (j = 0; j != sizeof(addend) / sizeof(addend[0]); j++) { - gpr_timespec x = gpr_time_add(infinity[i], addend[j]); - ASSERT_EQ(gpr_time_cmp(x, infinity[i]), 0); - x = gpr_time_sub(infinity[i], addend[j]); - ASSERT_EQ(gpr_time_cmp(x, infinity[i]), 0); - } - for (k = -200; k <= 200; k++) { - gpr_timespec y = gpr_time_from_micros(k * 100000, GPR_TIMESPAN); - gpr_timespec x = gpr_time_add(infinity[i], y); - ASSERT_EQ(gpr_time_cmp(x, infinity[i]), 0); - x = gpr_time_sub(infinity[i], y); - ASSERT_EQ(gpr_time_cmp(x, infinity[i]), 0); - } - } +TEST(DurationTest, Multiplication) { + Duration d = Duration::Seconds(5); + EXPECT_EQ(d * 2, Duration::Seconds(10)); + d *= 3; + EXPECT_EQ(d, Duration::Seconds(15)); } -TEST(TimeTest, Similar) { - ASSERT_EQ(1, gpr_time_similar(gpr_inf_future(GPR_TIMESPAN), - gpr_inf_future(GPR_TIMESPAN), - gpr_time_0(GPR_TIMESPAN))); - ASSERT_EQ(1, gpr_time_similar(gpr_inf_past(GPR_TIMESPAN), - gpr_inf_past(GPR_TIMESPAN), - gpr_time_0(GPR_TIMESPAN))); - ASSERT_EQ(0, gpr_time_similar(gpr_inf_past(GPR_TIMESPAN), - gpr_inf_future(GPR_TIMESPAN), - gpr_time_0(GPR_TIMESPAN))); - ASSERT_EQ(0, gpr_time_similar(gpr_inf_future(GPR_TIMESPAN), - gpr_inf_past(GPR_TIMESPAN), - gpr_time_0(GPR_TIMESPAN))); - ASSERT_EQ(1, gpr_time_similar(gpr_time_from_micros(10, GPR_TIMESPAN), - gpr_time_from_micros(10, GPR_TIMESPAN), - gpr_time_0(GPR_TIMESPAN))); - ASSERT_EQ(1, gpr_time_similar(gpr_time_from_micros(10, GPR_TIMESPAN), - gpr_time_from_micros(15, GPR_TIMESPAN), - gpr_time_from_micros(10, GPR_TIMESPAN))); - ASSERT_EQ(1, gpr_time_similar(gpr_time_from_micros(15, GPR_TIMESPAN), - gpr_time_from_micros(10, GPR_TIMESPAN), - gpr_time_from_micros(10, GPR_TIMESPAN))); - ASSERT_EQ(0, gpr_time_similar(gpr_time_from_micros(10, GPR_TIMESPAN), - gpr_time_from_micros(25, GPR_TIMESPAN), - gpr_time_from_micros(10, GPR_TIMESPAN))); - ASSERT_EQ(0, gpr_time_similar(gpr_time_from_micros(25, GPR_TIMESPAN), - gpr_time_from_micros(10, GPR_TIMESPAN), - gpr_time_from_micros(10, GPR_TIMESPAN))); +TEST(DurationTest, FromTimespan) { + EXPECT_EQ(Duration::FromTimespec(gpr_time_from_millis(1234, GPR_TIMESPAN)), + Duration::Milliseconds(1234)); } -TEST(TimeTest, ConvertExtreme) { - gpr_timespec realtime = {INT64_MAX, 1, GPR_CLOCK_REALTIME}; - gpr_timespec monotime = gpr_convert_clock_type(realtime, GPR_CLOCK_MONOTONIC); - ASSERT_EQ(monotime.tv_sec, realtime.tv_sec); - ASSERT_EQ(monotime.clock_type, GPR_CLOCK_MONOTONIC); +TEST(DurationTest, ToString) { + EXPECT_EQ(Duration::Milliseconds(42).ToString(), "42ms"); + EXPECT_EQ(Duration::Infinity().ToString(), "∞"); + EXPECT_EQ(Duration::NegativeInfinity().ToString(), "-∞"); } -TEST(TimeTest, CmpExtreme) { - gpr_timespec t1 = {INT64_MAX, 1, GPR_CLOCK_REALTIME}; - gpr_timespec t2 = {INT64_MAX, 2, GPR_CLOCK_REALTIME}; - ASSERT_EQ(gpr_time_cmp(t1, t2), 0); - t1.tv_sec = INT64_MIN; - t2.tv_sec = INT64_MIN; - ASSERT_EQ(gpr_time_cmp(t1, t2), 0); -} +} // namespace testing +} // namespace grpc_core int main(int argc, char** argv) { - grpc::testing::TestEnvironment env(&argc, argv); ::testing::InitGoogleTest(&argc, argv); return RUN_ALL_TESTS(); } diff --git a/test/core/gprpp/time_util_test.cc b/test/core/util/time_util_test.cc similarity index 99% rename from test/core/gprpp/time_util_test.cc rename to test/core/util/time_util_test.cc index 09a6650932e..749a6f26ec0 100644 --- a/test/core/gprpp/time_util_test.cc +++ b/test/core/util/time_util_test.cc @@ -14,7 +14,7 @@ // limitations under the License. // -#include "src/core/lib/gprpp/time_util.h" +#include "src/core/util/time_util.h" #include #include diff --git a/test/core/gprpp/unique_type_name_test.cc b/test/core/util/unique_type_name_test.cc similarity index 98% rename from test/core/gprpp/unique_type_name_test.cc rename to test/core/util/unique_type_name_test.cc index 74f8a7c1d0d..80cffc497aa 100644 --- a/test/core/gprpp/unique_type_name_test.cc +++ b/test/core/util/unique_type_name_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/core/lib/gprpp/unique_type_name.h" +#include "src/core/util/unique_type_name.h" #include #include diff --git a/test/core/uri/uri_corpus/02d156dc5e6f2c11c90c2e06fcee04adf036a342 b/test/core/util/uri_corpus/02d156dc5e6f2c11c90c2e06fcee04adf036a342 similarity index 100% rename from test/core/uri/uri_corpus/02d156dc5e6f2c11c90c2e06fcee04adf036a342 rename to test/core/util/uri_corpus/02d156dc5e6f2c11c90c2e06fcee04adf036a342 diff --git a/test/core/uri/uri_corpus/042dc4512fa3d391c5170cf3aa61e6a638f84342 b/test/core/util/uri_corpus/042dc4512fa3d391c5170cf3aa61e6a638f84342 similarity index 100% rename from test/core/uri/uri_corpus/042dc4512fa3d391c5170cf3aa61e6a638f84342 rename to test/core/util/uri_corpus/042dc4512fa3d391c5170cf3aa61e6a638f84342 diff --git a/test/core/uri/uri_corpus/0e9bbe975f2027e8c39c89f85f667530368e7d11 b/test/core/util/uri_corpus/0e9bbe975f2027e8c39c89f85f667530368e7d11 similarity index 100% rename from test/core/uri/uri_corpus/0e9bbe975f2027e8c39c89f85f667530368e7d11 rename to test/core/util/uri_corpus/0e9bbe975f2027e8c39c89f85f667530368e7d11 diff --git a/test/core/uri/uri_corpus/1155aa6ea7ef262a81a63692513ea395f84dad6f b/test/core/util/uri_corpus/1155aa6ea7ef262a81a63692513ea395f84dad6f similarity index 100% rename from test/core/uri/uri_corpus/1155aa6ea7ef262a81a63692513ea395f84dad6f rename to test/core/util/uri_corpus/1155aa6ea7ef262a81a63692513ea395f84dad6f diff --git a/test/core/uri/uri_corpus/13856a5569ffd085a4d5c07af5f8e9310835a118 b/test/core/util/uri_corpus/13856a5569ffd085a4d5c07af5f8e9310835a118 similarity index 100% rename from test/core/uri/uri_corpus/13856a5569ffd085a4d5c07af5f8e9310835a118 rename to test/core/util/uri_corpus/13856a5569ffd085a4d5c07af5f8e9310835a118 diff --git a/test/core/uri/uri_corpus/14b57bcbf1e17b1db1de491ef2ba3768f704b7dc b/test/core/util/uri_corpus/14b57bcbf1e17b1db1de491ef2ba3768f704b7dc similarity index 100% rename from test/core/uri/uri_corpus/14b57bcbf1e17b1db1de491ef2ba3768f704b7dc rename to test/core/util/uri_corpus/14b57bcbf1e17b1db1de491ef2ba3768f704b7dc diff --git a/test/core/uri/uri_corpus/1794310671a060eead6e5ee66ac978a18ec7e84f b/test/core/util/uri_corpus/1794310671a060eead6e5ee66ac978a18ec7e84f similarity index 100% rename from test/core/uri/uri_corpus/1794310671a060eead6e5ee66ac978a18ec7e84f rename to test/core/util/uri_corpus/1794310671a060eead6e5ee66ac978a18ec7e84f diff --git a/test/core/uri/uri_corpus/1d30b2a79afbaf2828ff42b9a9647e942ba1ab80 b/test/core/util/uri_corpus/1d30b2a79afbaf2828ff42b9a9647e942ba1ab80 similarity index 100% rename from test/core/uri/uri_corpus/1d30b2a79afbaf2828ff42b9a9647e942ba1ab80 rename to test/core/util/uri_corpus/1d30b2a79afbaf2828ff42b9a9647e942ba1ab80 diff --git a/test/core/uri/uri_corpus/1fcf5d9c333b70596cf5ba04d1f7affdf445b971 b/test/core/util/uri_corpus/1fcf5d9c333b70596cf5ba04d1f7affdf445b971 similarity index 100% rename from test/core/uri/uri_corpus/1fcf5d9c333b70596cf5ba04d1f7affdf445b971 rename to test/core/util/uri_corpus/1fcf5d9c333b70596cf5ba04d1f7affdf445b971 diff --git a/test/core/uri/uri_corpus/23162c8a8936e20b195404c21337ee734d02a6bc b/test/core/util/uri_corpus/23162c8a8936e20b195404c21337ee734d02a6bc similarity index 100% rename from test/core/uri/uri_corpus/23162c8a8936e20b195404c21337ee734d02a6bc rename to test/core/util/uri_corpus/23162c8a8936e20b195404c21337ee734d02a6bc diff --git a/test/core/uri/uri_corpus/23f3198b815ca60bdadcaae682b9f965dda387f1 b/test/core/util/uri_corpus/23f3198b815ca60bdadcaae682b9f965dda387f1 similarity index 100% rename from test/core/uri/uri_corpus/23f3198b815ca60bdadcaae682b9f965dda387f1 rename to test/core/util/uri_corpus/23f3198b815ca60bdadcaae682b9f965dda387f1 diff --git a/test/core/uri/uri_corpus/2ef3893b43f1f60b77b59ce06a6bce9815d78eaf b/test/core/util/uri_corpus/2ef3893b43f1f60b77b59ce06a6bce9815d78eaf similarity index 100% rename from test/core/uri/uri_corpus/2ef3893b43f1f60b77b59ce06a6bce9815d78eaf rename to test/core/util/uri_corpus/2ef3893b43f1f60b77b59ce06a6bce9815d78eaf diff --git a/test/core/uri/uri_corpus/356c3c129e203b5c74550b4209764d74b9caefce b/test/core/util/uri_corpus/356c3c129e203b5c74550b4209764d74b9caefce similarity index 100% rename from test/core/uri/uri_corpus/356c3c129e203b5c74550b4209764d74b9caefce rename to test/core/util/uri_corpus/356c3c129e203b5c74550b4209764d74b9caefce diff --git a/test/core/uri/uri_corpus/396568fc41c8ccb31ec925b4a862e4d29ead1327 b/test/core/util/uri_corpus/396568fc41c8ccb31ec925b4a862e4d29ead1327 similarity index 100% rename from test/core/uri/uri_corpus/396568fc41c8ccb31ec925b4a862e4d29ead1327 rename to test/core/util/uri_corpus/396568fc41c8ccb31ec925b4a862e4d29ead1327 diff --git a/test/core/uri/uri_corpus/3b1e7526a99918006b87e499d2beb6c4ac9c3c0c b/test/core/util/uri_corpus/3b1e7526a99918006b87e499d2beb6c4ac9c3c0c similarity index 100% rename from test/core/uri/uri_corpus/3b1e7526a99918006b87e499d2beb6c4ac9c3c0c rename to test/core/util/uri_corpus/3b1e7526a99918006b87e499d2beb6c4ac9c3c0c diff --git a/test/core/uri/uri_corpus/3b58860f3451d3e7aad99690a8d39782ca5116fc b/test/core/util/uri_corpus/3b58860f3451d3e7aad99690a8d39782ca5116fc similarity index 100% rename from test/core/uri/uri_corpus/3b58860f3451d3e7aad99690a8d39782ca5116fc rename to test/core/util/uri_corpus/3b58860f3451d3e7aad99690a8d39782ca5116fc diff --git a/test/core/uri/uri_corpus/41963cc10752f70c3af7e3d85868efb097a0ea9c b/test/core/util/uri_corpus/41963cc10752f70c3af7e3d85868efb097a0ea9c similarity index 100% rename from test/core/uri/uri_corpus/41963cc10752f70c3af7e3d85868efb097a0ea9c rename to test/core/util/uri_corpus/41963cc10752f70c3af7e3d85868efb097a0ea9c diff --git a/test/core/uri/uri_corpus/47b5228404451fc9d4071fa69192514bb4ce33c1 b/test/core/util/uri_corpus/47b5228404451fc9d4071fa69192514bb4ce33c1 similarity index 100% rename from test/core/uri/uri_corpus/47b5228404451fc9d4071fa69192514bb4ce33c1 rename to test/core/util/uri_corpus/47b5228404451fc9d4071fa69192514bb4ce33c1 diff --git a/test/core/uri/uri_corpus/56a2da4b2e6fb795243901023ed8d0aa083d1aab b/test/core/util/uri_corpus/56a2da4b2e6fb795243901023ed8d0aa083d1aab similarity index 100% rename from test/core/uri/uri_corpus/56a2da4b2e6fb795243901023ed8d0aa083d1aab rename to test/core/util/uri_corpus/56a2da4b2e6fb795243901023ed8d0aa083d1aab diff --git a/test/core/uri/uri_corpus/574c2f13858a9a6d724654bd913ede9ae3abf822 b/test/core/util/uri_corpus/574c2f13858a9a6d724654bd913ede9ae3abf822 similarity index 100% rename from test/core/uri/uri_corpus/574c2f13858a9a6d724654bd913ede9ae3abf822 rename to test/core/util/uri_corpus/574c2f13858a9a6d724654bd913ede9ae3abf822 diff --git a/test/core/uri/uri_corpus/582f789c19033a152094cbf8565f14154a778ddb b/test/core/util/uri_corpus/582f789c19033a152094cbf8565f14154a778ddb similarity index 100% rename from test/core/uri/uri_corpus/582f789c19033a152094cbf8565f14154a778ddb rename to test/core/util/uri_corpus/582f789c19033a152094cbf8565f14154a778ddb diff --git a/test/core/uri/uri_corpus/636c5606fc23713a1bae88c8899c0541cfad4fd8 b/test/core/util/uri_corpus/636c5606fc23713a1bae88c8899c0541cfad4fd8 similarity index 100% rename from test/core/uri/uri_corpus/636c5606fc23713a1bae88c8899c0541cfad4fd8 rename to test/core/util/uri_corpus/636c5606fc23713a1bae88c8899c0541cfad4fd8 diff --git a/test/core/uri/uri_corpus/63fe493b270b17426d77a27cbf3abac5b2c2794a b/test/core/util/uri_corpus/63fe493b270b17426d77a27cbf3abac5b2c2794a similarity index 100% rename from test/core/uri/uri_corpus/63fe493b270b17426d77a27cbf3abac5b2c2794a rename to test/core/util/uri_corpus/63fe493b270b17426d77a27cbf3abac5b2c2794a diff --git a/test/core/uri/uri_corpus/655300a902b62662296a8e46bfb04fbcb07182cb b/test/core/util/uri_corpus/655300a902b62662296a8e46bfb04fbcb07182cb similarity index 100% rename from test/core/uri/uri_corpus/655300a902b62662296a8e46bfb04fbcb07182cb rename to test/core/util/uri_corpus/655300a902b62662296a8e46bfb04fbcb07182cb diff --git a/test/core/uri/uri_corpus/6ae3acd9d8507b61bf235748026080a4138dba58 b/test/core/util/uri_corpus/6ae3acd9d8507b61bf235748026080a4138dba58 similarity index 100% rename from test/core/uri/uri_corpus/6ae3acd9d8507b61bf235748026080a4138dba58 rename to test/core/util/uri_corpus/6ae3acd9d8507b61bf235748026080a4138dba58 diff --git a/test/core/uri/uri_corpus/6b70979a70a038ff6607d6cf85485ee95baf58e6 b/test/core/util/uri_corpus/6b70979a70a038ff6607d6cf85485ee95baf58e6 similarity index 100% rename from test/core/uri/uri_corpus/6b70979a70a038ff6607d6cf85485ee95baf58e6 rename to test/core/util/uri_corpus/6b70979a70a038ff6607d6cf85485ee95baf58e6 diff --git a/test/core/uri/uri_corpus/7314ab3545a7535a26e0e8aad67caea5534d68b1 b/test/core/util/uri_corpus/7314ab3545a7535a26e0e8aad67caea5534d68b1 similarity index 100% rename from test/core/uri/uri_corpus/7314ab3545a7535a26e0e8aad67caea5534d68b1 rename to test/core/util/uri_corpus/7314ab3545a7535a26e0e8aad67caea5534d68b1 diff --git a/test/core/uri/uri_corpus/7ff4d8b8d1ffd0d42c48bbb91e5856a9ec31aecb b/test/core/util/uri_corpus/7ff4d8b8d1ffd0d42c48bbb91e5856a9ec31aecb similarity index 100% rename from test/core/uri/uri_corpus/7ff4d8b8d1ffd0d42c48bbb91e5856a9ec31aecb rename to test/core/util/uri_corpus/7ff4d8b8d1ffd0d42c48bbb91e5856a9ec31aecb diff --git a/test/core/uri/uri_corpus/87daa131e0973b77a232a870ed749ef29cf58e6d b/test/core/util/uri_corpus/87daa131e0973b77a232a870ed749ef29cf58e6d similarity index 100% rename from test/core/uri/uri_corpus/87daa131e0973b77a232a870ed749ef29cf58e6d rename to test/core/util/uri_corpus/87daa131e0973b77a232a870ed749ef29cf58e6d diff --git a/test/core/uri/uri_corpus/884dcaee2908ffe5f12b65b8eba81016099c4266 b/test/core/util/uri_corpus/884dcaee2908ffe5f12b65b8eba81016099c4266 similarity index 100% rename from test/core/uri/uri_corpus/884dcaee2908ffe5f12b65b8eba81016099c4266 rename to test/core/util/uri_corpus/884dcaee2908ffe5f12b65b8eba81016099c4266 diff --git a/test/core/uri/uri_corpus/8d7e944fd5d0ede94097fcc98b47b09a3f9c76cb b/test/core/util/uri_corpus/8d7e944fd5d0ede94097fcc98b47b09a3f9c76cb similarity index 100% rename from test/core/uri/uri_corpus/8d7e944fd5d0ede94097fcc98b47b09a3f9c76cb rename to test/core/util/uri_corpus/8d7e944fd5d0ede94097fcc98b47b09a3f9c76cb diff --git a/test/core/uri/uri_corpus/9671149af0b444f59bbdf71340d3441dadd8a7b4 b/test/core/util/uri_corpus/9671149af0b444f59bbdf71340d3441dadd8a7b4 similarity index 100% rename from test/core/uri/uri_corpus/9671149af0b444f59bbdf71340d3441dadd8a7b4 rename to test/core/util/uri_corpus/9671149af0b444f59bbdf71340d3441dadd8a7b4 diff --git a/test/core/uri/uri_corpus/96c8d266b7dc037288ef305c996608270f72e7fb b/test/core/util/uri_corpus/96c8d266b7dc037288ef305c996608270f72e7fb similarity index 100% rename from test/core/uri/uri_corpus/96c8d266b7dc037288ef305c996608270f72e7fb rename to test/core/util/uri_corpus/96c8d266b7dc037288ef305c996608270f72e7fb diff --git a/test/core/uri/uri_corpus/975536c71ade4800415a7e9c2f1b45c35a6d5ea8 b/test/core/util/uri_corpus/975536c71ade4800415a7e9c2f1b45c35a6d5ea8 similarity index 100% rename from test/core/uri/uri_corpus/975536c71ade4800415a7e9c2f1b45c35a6d5ea8 rename to test/core/util/uri_corpus/975536c71ade4800415a7e9c2f1b45c35a6d5ea8 diff --git a/test/core/uri/uri_corpus/99750aa67d30beaea8af565c829d4999aa8cb91b b/test/core/util/uri_corpus/99750aa67d30beaea8af565c829d4999aa8cb91b similarity index 100% rename from test/core/uri/uri_corpus/99750aa67d30beaea8af565c829d4999aa8cb91b rename to test/core/util/uri_corpus/99750aa67d30beaea8af565c829d4999aa8cb91b diff --git a/test/core/uri/uri_corpus/a1140f3f8b5cffc1010221b9a4084a25fb75c1f6 b/test/core/util/uri_corpus/a1140f3f8b5cffc1010221b9a4084a25fb75c1f6 similarity index 100% rename from test/core/uri/uri_corpus/a1140f3f8b5cffc1010221b9a4084a25fb75c1f6 rename to test/core/util/uri_corpus/a1140f3f8b5cffc1010221b9a4084a25fb75c1f6 diff --git a/test/core/uri/uri_corpus/a1f0f9b75bb354eb063d7cba4fcfa2d0b88d63de b/test/core/util/uri_corpus/a1f0f9b75bb354eb063d7cba4fcfa2d0b88d63de similarity index 100% rename from test/core/uri/uri_corpus/a1f0f9b75bb354eb063d7cba4fcfa2d0b88d63de rename to test/core/util/uri_corpus/a1f0f9b75bb354eb063d7cba4fcfa2d0b88d63de diff --git a/test/core/uri/uri_corpus/a296eb3d1d436ed7df7195b10aa3c4de3896f98d b/test/core/util/uri_corpus/a296eb3d1d436ed7df7195b10aa3c4de3896f98d similarity index 100% rename from test/core/uri/uri_corpus/a296eb3d1d436ed7df7195b10aa3c4de3896f98d rename to test/core/util/uri_corpus/a296eb3d1d436ed7df7195b10aa3c4de3896f98d diff --git a/test/core/uri/uri_corpus/a8b8e66050b424f1b8c07d46f868199fb7f60e38 b/test/core/util/uri_corpus/a8b8e66050b424f1b8c07d46f868199fb7f60e38 similarity index 100% rename from test/core/uri/uri_corpus/a8b8e66050b424f1b8c07d46f868199fb7f60e38 rename to test/core/util/uri_corpus/a8b8e66050b424f1b8c07d46f868199fb7f60e38 diff --git a/test/core/uri/uri_corpus/aba1472880406a318ce207ee79815b7acf087757 b/test/core/util/uri_corpus/aba1472880406a318ce207ee79815b7acf087757 similarity index 100% rename from test/core/uri/uri_corpus/aba1472880406a318ce207ee79815b7acf087757 rename to test/core/util/uri_corpus/aba1472880406a318ce207ee79815b7acf087757 diff --git a/test/core/uri/uri_corpus/af55baf8c8855e563befdf1eefbcbd46c5ddb8d2 b/test/core/util/uri_corpus/af55baf8c8855e563befdf1eefbcbd46c5ddb8d2 similarity index 100% rename from test/core/uri/uri_corpus/af55baf8c8855e563befdf1eefbcbd46c5ddb8d2 rename to test/core/util/uri_corpus/af55baf8c8855e563befdf1eefbcbd46c5ddb8d2 diff --git a/test/core/uri/uri_corpus/b3c0bf66c2bf5d24ef1daf4cc5a9d6d5bd0e8bfd b/test/core/util/uri_corpus/b3c0bf66c2bf5d24ef1daf4cc5a9d6d5bd0e8bfd similarity index 100% rename from test/core/uri/uri_corpus/b3c0bf66c2bf5d24ef1daf4cc5a9d6d5bd0e8bfd rename to test/core/util/uri_corpus/b3c0bf66c2bf5d24ef1daf4cc5a9d6d5bd0e8bfd diff --git a/test/core/uri/uri_corpus/c28a47409cf5d95bb372238d01e73d8b831408e4 b/test/core/util/uri_corpus/c28a47409cf5d95bb372238d01e73d8b831408e4 similarity index 100% rename from test/core/uri/uri_corpus/c28a47409cf5d95bb372238d01e73d8b831408e4 rename to test/core/util/uri_corpus/c28a47409cf5d95bb372238d01e73d8b831408e4 diff --git a/test/core/uri/uri_corpus/c3ef1d41888063a08700c3add1e4465aabcf8807 b/test/core/util/uri_corpus/c3ef1d41888063a08700c3add1e4465aabcf8807 similarity index 100% rename from test/core/uri/uri_corpus/c3ef1d41888063a08700c3add1e4465aabcf8807 rename to test/core/util/uri_corpus/c3ef1d41888063a08700c3add1e4465aabcf8807 diff --git a/test/core/uri/uri_corpus/c550a76af21f9b9cc92a386d5c8998b26f8f2e4d b/test/core/util/uri_corpus/c550a76af21f9b9cc92a386d5c8998b26f8f2e4d similarity index 100% rename from test/core/uri/uri_corpus/c550a76af21f9b9cc92a386d5c8998b26f8f2e4d rename to test/core/util/uri_corpus/c550a76af21f9b9cc92a386d5c8998b26f8f2e4d diff --git a/test/core/uri/uri_corpus/c79721406d0ab80495f186fd88e37fba98637ae9 b/test/core/util/uri_corpus/c79721406d0ab80495f186fd88e37fba98637ae9 similarity index 100% rename from test/core/uri/uri_corpus/c79721406d0ab80495f186fd88e37fba98637ae9 rename to test/core/util/uri_corpus/c79721406d0ab80495f186fd88e37fba98637ae9 diff --git a/test/core/uri/uri_corpus/ceb4e2264ba7a8d5be47d276b37ec09489e00245 b/test/core/util/uri_corpus/ceb4e2264ba7a8d5be47d276b37ec09489e00245 similarity index 100% rename from test/core/uri/uri_corpus/ceb4e2264ba7a8d5be47d276b37ec09489e00245 rename to test/core/util/uri_corpus/ceb4e2264ba7a8d5be47d276b37ec09489e00245 diff --git a/test/core/uri/uri_corpus/cf4395958f5bfb46fd6f535a39657d016c75114c b/test/core/util/uri_corpus/cf4395958f5bfb46fd6f535a39657d016c75114c similarity index 100% rename from test/core/uri/uri_corpus/cf4395958f5bfb46fd6f535a39657d016c75114c rename to test/core/util/uri_corpus/cf4395958f5bfb46fd6f535a39657d016c75114c diff --git a/test/core/uri/uri_corpus/d46668372b7e20154a89409a7430a28e642afdca b/test/core/util/uri_corpus/d46668372b7e20154a89409a7430a28e642afdca similarity index 100% rename from test/core/uri/uri_corpus/d46668372b7e20154a89409a7430a28e642afdca rename to test/core/util/uri_corpus/d46668372b7e20154a89409a7430a28e642afdca diff --git a/test/core/uri/uri_corpus/d6fe7412a0a1d1c733160246f3fa425f4f97682a b/test/core/util/uri_corpus/d6fe7412a0a1d1c733160246f3fa425f4f97682a similarity index 100% rename from test/core/uri/uri_corpus/d6fe7412a0a1d1c733160246f3fa425f4f97682a rename to test/core/util/uri_corpus/d6fe7412a0a1d1c733160246f3fa425f4f97682a diff --git a/test/core/uri/uri_corpus/dns.txt b/test/core/util/uri_corpus/dns.txt similarity index 100% rename from test/core/uri/uri_corpus/dns.txt rename to test/core/util/uri_corpus/dns.txt diff --git a/test/core/uri/uri_corpus/e241f29957b0e30ec11aaaf91b2339f7015fa5fd b/test/core/util/uri_corpus/e241f29957b0e30ec11aaaf91b2339f7015fa5fd similarity index 100% rename from test/core/uri/uri_corpus/e241f29957b0e30ec11aaaf91b2339f7015fa5fd rename to test/core/util/uri_corpus/e241f29957b0e30ec11aaaf91b2339f7015fa5fd diff --git a/test/core/uri/uri_corpus/ea02d9fea9bad5b89cf353a0169238f584177e71 b/test/core/util/uri_corpus/ea02d9fea9bad5b89cf353a0169238f584177e71 similarity index 100% rename from test/core/uri/uri_corpus/ea02d9fea9bad5b89cf353a0169238f584177e71 rename to test/core/util/uri_corpus/ea02d9fea9bad5b89cf353a0169238f584177e71 diff --git a/test/core/uri/uri_corpus/ec4731dddf94ed3ea92ae4d5a71f145ab6e3f6ee b/test/core/util/uri_corpus/ec4731dddf94ed3ea92ae4d5a71f145ab6e3f6ee similarity index 100% rename from test/core/uri/uri_corpus/ec4731dddf94ed3ea92ae4d5a71f145ab6e3f6ee rename to test/core/util/uri_corpus/ec4731dddf94ed3ea92ae4d5a71f145ab6e3f6ee diff --git a/test/core/uri/uri_corpus/ed2f78646f19fc47dd85ff0877c232b71913ece2 b/test/core/util/uri_corpus/ed2f78646f19fc47dd85ff0877c232b71913ece2 similarity index 100% rename from test/core/uri/uri_corpus/ed2f78646f19fc47dd85ff0877c232b71913ece2 rename to test/core/util/uri_corpus/ed2f78646f19fc47dd85ff0877c232b71913ece2 diff --git a/test/core/uri/uri_corpus/f6889f4a6350fea1596a3adea5cdac02bd5d1ff3 b/test/core/util/uri_corpus/f6889f4a6350fea1596a3adea5cdac02bd5d1ff3 similarity index 100% rename from test/core/uri/uri_corpus/f6889f4a6350fea1596a3adea5cdac02bd5d1ff3 rename to test/core/util/uri_corpus/f6889f4a6350fea1596a3adea5cdac02bd5d1ff3 diff --git a/test/core/uri/uri_corpus/f6f3bd030f0d321efe7c51ca3f057de23509af67 b/test/core/util/uri_corpus/f6f3bd030f0d321efe7c51ca3f057de23509af67 similarity index 100% rename from test/core/uri/uri_corpus/f6f3bd030f0d321efe7c51ca3f057de23509af67 rename to test/core/util/uri_corpus/f6f3bd030f0d321efe7c51ca3f057de23509af67 diff --git a/test/core/uri/uri_corpus/f97598cff03306af3c70400608fec47268b5075d b/test/core/util/uri_corpus/f97598cff03306af3c70400608fec47268b5075d similarity index 100% rename from test/core/uri/uri_corpus/f97598cff03306af3c70400608fec47268b5075d rename to test/core/util/uri_corpus/f97598cff03306af3c70400608fec47268b5075d diff --git a/test/core/uri/uri_corpus/f9e1ec1fc642b575bc9955618b7065747f56b101 b/test/core/util/uri_corpus/f9e1ec1fc642b575bc9955618b7065747f56b101 similarity index 100% rename from test/core/uri/uri_corpus/f9e1ec1fc642b575bc9955618b7065747f56b101 rename to test/core/util/uri_corpus/f9e1ec1fc642b575bc9955618b7065747f56b101 diff --git a/test/core/uri/uri_corpus/fe0630a3aeed2ec6f474f362e4c839478290d5c4 b/test/core/util/uri_corpus/fe0630a3aeed2ec6f474f362e4c839478290d5c4 similarity index 100% rename from test/core/uri/uri_corpus/fe0630a3aeed2ec6f474f362e4c839478290d5c4 rename to test/core/util/uri_corpus/fe0630a3aeed2ec6f474f362e4c839478290d5c4 diff --git a/test/core/uri/uri_corpus/ipv4.txt b/test/core/util/uri_corpus/ipv4.txt similarity index 100% rename from test/core/uri/uri_corpus/ipv4.txt rename to test/core/util/uri_corpus/ipv4.txt diff --git a/test/core/uri/uri_corpus/ipv6.txt b/test/core/util/uri_corpus/ipv6.txt similarity index 100% rename from test/core/uri/uri_corpus/ipv6.txt rename to test/core/util/uri_corpus/ipv6.txt diff --git a/test/core/uri/uri_corpus/unix.txt b/test/core/util/uri_corpus/unix.txt similarity index 100% rename from test/core/uri/uri_corpus/unix.txt rename to test/core/util/uri_corpus/unix.txt diff --git a/test/core/uri/uri_fuzzer_test.cc b/test/core/util/uri_fuzzer_test.cc similarity index 96% rename from test/core/uri/uri_fuzzer_test.cc rename to test/core/util/uri_fuzzer_test.cc index 0220c20b700..dd4b1c0f861 100644 --- a/test/core/uri/uri_fuzzer_test.cc +++ b/test/core/util/uri_fuzzer_test.cc @@ -23,7 +23,7 @@ #include #include "src/core/lib/iomgr/exec_ctx.h" -#include "src/core/lib/uri/uri_parser.h" +#include "src/core/util/uri.h" bool squelch = true; bool leak_check = true; diff --git a/test/core/uri/uri_parser_test.cc b/test/core/util/uri_test.cc similarity index 99% rename from test/core/uri/uri_parser_test.cc rename to test/core/util/uri_test.cc index adadba6e779..965d208ae7c 100644 --- a/test/core/uri/uri_parser_test.cc +++ b/test/core/util/uri_test.cc @@ -14,7 +14,7 @@ // limitations under the License. // -#include "src/core/lib/uri/uri_parser.h" +#include "src/core/util/uri.h" #include diff --git a/test/core/gprpp/uuid_v4_test.cc b/test/core/util/uuid_v4_test.cc similarity index 96% rename from test/core/gprpp/uuid_v4_test.cc rename to test/core/util/uuid_v4_test.cc index e970d54ebce..a5a73e2f826 100644 --- a/test/core/gprpp/uuid_v4_test.cc +++ b/test/core/util/uuid_v4_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/core/lib/gprpp/uuid_v4.h" +#include "src/core/util/uuid_v4.h" #include "gtest/gtest.h" diff --git a/test/core/gprpp/validation_errors_test.cc b/test/core/util/validation_errors_test.cc similarity index 98% rename from test/core/gprpp/validation_errors_test.cc rename to test/core/util/validation_errors_test.cc index cbf5add2feb..e3222408d2e 100644 --- a/test/core/gprpp/validation_errors_test.cc +++ b/test/core/util/validation_errors_test.cc @@ -14,7 +14,7 @@ // limitations under the License. // -#include "src/core/lib/gprpp/validation_errors.h" +#include "src/core/util/validation_errors.h" #include "gtest/gtest.h" diff --git a/test/core/gprpp/work_serializer_test.cc b/test/core/util/work_serializer_test.cc similarity index 99% rename from test/core/gprpp/work_serializer_test.cc rename to test/core/util/work_serializer_test.cc index 0d92acecba8..773255725bb 100644 --- a/test/core/gprpp/work_serializer_test.cc +++ b/test/core/util/work_serializer_test.cc @@ -16,7 +16,7 @@ // // -#include "src/core/lib/gprpp/work_serializer.h" +#include "src/core/util/work_serializer.h" #include @@ -37,12 +37,12 @@ #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/experiments/experiments.h" -#include "src/core/lib/gprpp/notification.h" -#include "src/core/lib/gprpp/thd.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/telemetry/histogram_view.h" #include "src/core/telemetry/stats.h" #include "src/core/telemetry/stats_data.h" +#include "src/core/util/notification.h" +#include "src/core/util/thd.h" #include "test/core/event_engine/event_engine_test_utils.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/xds/certificate_provider_store_test.cc b/test/core/xds/certificate_provider_store_test.cc index 3cbd6146059..a0b76e521fb 100644 --- a/test/core/xds/certificate_provider_store_test.cc +++ b/test/core/xds/certificate_provider_store_test.cc @@ -29,7 +29,7 @@ #include #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/unique_type_name.h" +#include "src/core/util/unique_type_name.h" #include "test/core/test_util/test_config.h" namespace grpc_core { diff --git a/test/core/xds/xds_audit_logger_registry_test.cc b/test/core/xds/xds_audit_logger_registry_test.cc index dc79749f983..1d673ff7302 100644 --- a/test/core/xds/xds_audit_logger_registry_test.cc +++ b/test/core/xds/xds_audit_logger_registry_test.cc @@ -36,8 +36,8 @@ #include #include -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/security/authorization/audit_logging.h" +#include "src/core/util/crash.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_writer.h" #include "src/core/xds/grpc/xds_bootstrap_grpc.h" diff --git a/test/core/xds/xds_bootstrap_test.cc b/test/core/xds/xds_bootstrap_test.cc index 1a30de17492..cc77846ae13 100644 --- a/test/core/xds/xds_bootstrap_test.cc +++ b/test/core/xds/xds_bootstrap_test.cc @@ -36,16 +36,16 @@ #include #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/env.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/validation_errors.h" #include "src/core/lib/security/certificate_provider/certificate_provider_factory.h" #include "src/core/lib/security/credentials/channel_creds_registry.h" +#include "src/core/util/env.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" #include "src/core/util/json/json_reader.h" +#include "src/core/util/ref_counted_ptr.h" #include "src/core/util/tmpfile.h" +#include "src/core/util/validation_errors.h" #include "src/core/xds/grpc/certificate_provider_store.h" #include "src/core/xds/grpc/xds_bootstrap_grpc.h" #include "src/core/xds/grpc/xds_server_grpc.h" diff --git a/test/core/xds/xds_certificate_provider_test.cc b/test/core/xds/xds_certificate_provider_test.cc index a005b1d0f6c..a81e03421e8 100644 --- a/test/core/xds/xds_certificate_provider_test.cc +++ b/test/core/xds/xds_certificate_provider_test.cc @@ -25,9 +25,9 @@ #include -#include "src/core/lib/gprpp/status_helper.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/security/security_connector/ssl_utils.h" +#include "src/core/util/status_helper.h" #include "src/core/util/useful.h" #include "test/core/test_util/test_config.h" #include "test/core/test_util/tls_utils.h" diff --git a/test/core/xds/xds_client_fuzzer.cc b/test/core/xds/xds_client_fuzzer.cc index 4649329523e..21b94895a1a 100644 --- a/test/core/xds/xds_client_fuzzer.cc +++ b/test/core/xds/xds_client_fuzzer.cc @@ -31,8 +31,8 @@ #include #include "src/core/lib/event_engine/default_event_engine.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" #include "src/core/xds/grpc/xds_bootstrap_grpc.h" #include "src/core/xds/grpc/xds_cluster.h" #include "src/core/xds/grpc/xds_cluster_parser.h" diff --git a/test/core/xds/xds_client_test.cc b/test/core/xds/xds_client_test.cc index 9ad6dce3d59..520b2118a49 100644 --- a/test/core/xds/xds_client_test.cc +++ b/test/core/xds/xds_client_test.cc @@ -47,14 +47,14 @@ #include #include "src/core/lib/event_engine/default_event_engine.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/match.h" -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/debug_location.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" #include "src/core/util/json/json_reader.h" #include "src/core/util/json/json_writer.h" +#include "src/core/util/match.h" +#include "src/core/util/sync.h" #include "src/core/xds/xds_client/xds_bootstrap.h" #include "src/core/xds/xds_client/xds_resource_type_impl.h" #include "src/proto/grpc/testing/xds/v3/base.pb.h" diff --git a/test/core/xds/xds_cluster_resource_type_test.cc b/test/core/xds/xds_cluster_resource_type_test.cc index 2ce68f2e0a3..5039ab9b985 100644 --- a/test/core/xds/xds_cluster_resource_type_test.cc +++ b/test/core/xds/xds_cluster_resource_type_test.cc @@ -36,13 +36,13 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/error.h" #include "src/core/load_balancing/outlier_detection/outlier_detection.h" +#include "src/core/util/crash.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_writer.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" #include "src/core/xds/grpc/xds_bootstrap_grpc.h" #include "src/core/xds/grpc/xds_cluster.h" #include "src/core/xds/grpc/xds_cluster_parser.h" diff --git a/test/core/xds/xds_common_types_test.cc b/test/core/xds/xds_common_types_test.cc index d940015cc8f..45ac7574b75 100644 --- a/test/core/xds/xds_common_types_test.cc +++ b/test/core/xds/xds_common_types_test.cc @@ -39,13 +39,13 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/time.h" -#include "src/core/lib/gprpp/validation_errors.h" -#include "src/core/lib/matchers/matchers.h" +#include "src/core/util/crash.h" #include "src/core/util/json/json_writer.h" +#include "src/core/util/matchers.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" #include "src/core/util/upb_utils.h" +#include "src/core/util/validation_errors.h" #include "src/core/xds/grpc/xds_bootstrap_grpc.h" #include "src/core/xds/grpc/xds_common_types_parser.h" #include "src/core/xds/xds_client/xds_bootstrap.h" diff --git a/test/core/xds/xds_endpoint_resource_type_test.cc b/test/core/xds/xds_endpoint_resource_type_test.cc index 353e5727a5f..9b12b5517e9 100644 --- a/test/core/xds/xds_endpoint_resource_type_test.cc +++ b/test/core/xds/xds_endpoint_resource_type_test.cc @@ -38,11 +38,11 @@ #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/resolved_address.h" #include "src/core/resolver/endpoint_addresses.h" +#include "src/core/util/crash.h" +#include "src/core/util/ref_counted_ptr.h" #include "src/core/xds/grpc/xds_bootstrap_grpc.h" #include "src/core/xds/grpc/xds_endpoint.h" #include "src/core/xds/grpc/xds_endpoint_parser.h" diff --git a/test/core/xds/xds_http_filters_test.cc b/test/core/xds/xds_http_filters_test.cc index c720f72fef5..c5a76d01ee2 100644 --- a/test/core/xds/xds_http_filters_test.cc +++ b/test/core/xds/xds_http_filters_test.cc @@ -44,10 +44,10 @@ #include "src/core/ext/filters/rbac/rbac_service_config_parser.h" #include "src/core/ext/filters/stateful_session/stateful_session_filter.h" #include "src/core/ext/filters/stateful_session/stateful_session_service_config_parser.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/iomgr/error.h" +#include "src/core/util/crash.h" #include "src/core/util/json/json_writer.h" +#include "src/core/util/ref_counted_ptr.h" #include "src/core/xds/grpc/xds_bootstrap_grpc.h" #include "src/core/xds/grpc/xds_http_filter.h" #include "src/core/xds/grpc/xds_http_filter_registry.h" diff --git a/test/core/xds/xds_lb_policy_registry_test.cc b/test/core/xds/xds_lb_policy_registry_test.cc index c1e0e0fdda3..34f516e84ef 100644 --- a/test/core/xds/xds_lb_policy_registry_test.cc +++ b/test/core/xds/xds_lb_policy_registry_test.cc @@ -35,13 +35,13 @@ #include #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/validation_errors.h" #include "src/core/load_balancing/lb_policy.h" #include "src/core/load_balancing/lb_policy_factory.h" +#include "src/core/util/crash.h" #include "src/core/util/json/json_writer.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/validation_errors.h" #include "src/core/xds/grpc/xds_bootstrap_grpc.h" #include "src/proto/grpc/testing/xds/v3/client_side_weighted_round_robin.pb.h" #include "src/proto/grpc/testing/xds/v3/cluster.pb.h" diff --git a/test/core/xds/xds_listener_resource_type_test.cc b/test/core/xds/xds_listener_resource_type_test.cc index 629d069b259..0f3f815faf9 100644 --- a/test/core/xds/xds_listener_resource_type_test.cc +++ b/test/core/xds/xds_listener_resource_type_test.cc @@ -40,12 +40,12 @@ #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/error.h" +#include "src/core/util/crash.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_writer.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" #include "src/core/xds/grpc/xds_bootstrap_grpc.h" #include "src/core/xds/grpc/xds_common_types.h" #include "src/core/xds/grpc/xds_listener.h" diff --git a/test/core/xds/xds_metadata_test.cc b/test/core/xds/xds_metadata_test.cc index ad489b45464..76769ea1b70 100644 --- a/test/core/xds/xds_metadata_test.cc +++ b/test/core/xds/xds_metadata_test.cc @@ -29,10 +29,10 @@ #include "gtest/gtest.h" #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" +#include "src/core/util/crash.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_writer.h" +#include "src/core/util/ref_counted_ptr.h" #include "src/core/xds/grpc/xds_bootstrap_grpc.h" #include "src/core/xds/grpc/xds_metadata_parser.h" #include "src/core/xds/xds_client/xds_bootstrap.h" diff --git a/test/core/xds/xds_route_config_resource_type_test.cc b/test/core/xds/xds_route_config_resource_type_test.cc index 4fa3a11bc20..61311226c52 100644 --- a/test/core/xds/xds_route_config_resource_type_test.cc +++ b/test/core/xds/xds_route_config_resource_type_test.cc @@ -45,12 +45,12 @@ #include "src/core/lib/channel/status_util.h" #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/error.h" -#include "src/core/lib/matchers/matchers.h" +#include "src/core/util/crash.h" #include "src/core/util/json/json_writer.h" +#include "src/core/util/matchers.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" #include "src/core/xds/grpc/xds_bootstrap_grpc.h" #include "src/core/xds/grpc/xds_route_config.h" #include "src/core/xds/grpc/xds_route_config_parser.h" diff --git a/test/core/xds/xds_transport_fake.cc b/test/core/xds/xds_transport_fake.cc index bd6c21730fc..b8ea78ff794 100644 --- a/test/core/xds/xds_transport_fake.cc +++ b/test/core/xds/xds_transport_fake.cc @@ -30,9 +30,9 @@ #include #include "src/core/lib/event_engine/default_event_engine.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/iomgr/exec_ctx.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" #include "src/core/xds/xds_client/xds_bootstrap.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/xds/xds_transport_fake.h b/test/core/xds/xds_transport_fake.h index 54c75c92d86..dc4d9c87772 100644 --- a/test/core/xds/xds_transport_fake.h +++ b/test/core/xds/xds_transport_fake.h @@ -34,10 +34,10 @@ #include -#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" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" #include "src/core/xds/xds_client/xds_bootstrap.h" #include "src/core/xds/xds_client/xds_transport.h" diff --git a/test/cpp/client/credentials_test.cc b/test/cpp/client/credentials_test.cc index 10b0c80e066..866fe098f94 100644 --- a/test/cpp/client/credentials_test.cc +++ b/test/cpp/client/credentials_test.cc @@ -31,7 +31,7 @@ #include #include -#include "src/core/lib/gprpp/env.h" +#include "src/core/util/env.h" #include "src/core/util/tmpfile.h" #include "src/cpp/client/secure_credentials.h" #include "test/cpp/util/tls_test_utils.h" diff --git a/test/cpp/client/destroy_grpclb_channel_with_active_connect_stress_test.cc b/test/cpp/client/destroy_grpclb_channel_with_active_connect_stress_test.cc index 9331d2042c6..c2777262475 100644 --- a/test/cpp/client/destroy_grpclb_channel_with_active_connect_stress_test.cc +++ b/test/cpp/client/destroy_grpclb_channel_with_active_connect_stress_test.cc @@ -38,14 +38,14 @@ #include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/thd.h" #include "src/core/lib/iomgr/sockaddr.h" #include "src/core/load_balancing/grpclb/grpclb_balancer_addresses.h" #include "src/core/resolver/endpoint_addresses.h" #include "src/core/resolver/fake/fake_resolver.h" #include "src/core/service_config/service_config_impl.h" +#include "src/core/util/crash.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/thd.h" #include "test/core/test_util/port.h" #include "test/core/test_util/test_config.h" diff --git a/test/cpp/cocoapods/generic/generic.mm b/test/cpp/cocoapods/generic/generic.mm index 138bbe6604c..5f38c2070fd 100644 --- a/test/cpp/cocoapods/generic/generic.mm +++ b/test/cpp/cocoapods/generic/generic.mm @@ -32,7 +32,7 @@ #include #include -#include "src/core/lib/gprpp/thd.h" +#include "src/core/util/thd.h" #include "test/core/test_util/port.h" #include "test/core/test_util/test_config.h" diff --git a/test/cpp/common/alarm_test.cc b/test/cpp/common/alarm_test.cc index c9ec2bb6508..63eb170dfc1 100644 --- a/test/cpp/common/alarm_test.cc +++ b/test/cpp/common/alarm_test.cc @@ -26,7 +26,7 @@ #include #include -#include "src/core/lib/gprpp/notification.h" +#include "src/core/util/notification.h" #include "test/core/test_util/test_config.h" namespace grpc { diff --git a/test/cpp/common/time_jump_test.cc b/test/cpp/common/time_jump_test.cc index ef7adb4ad02..e1593a59daa 100644 --- a/test/cpp/common/time_jump_test.cc +++ b/test/cpp/common/time_jump_test.cc @@ -31,13 +31,13 @@ #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/timer.h" #include "src/core/lib/iomgr/timer_manager.h" +#include "src/core/util/crash.h" +#include "src/core/util/sync.h" #include "test/core/test_util/test_config.h" extern char** environ; diff --git a/test/cpp/common/timer_test.cc b/test/cpp/common/timer_test.cc index 3cc129cefb2..e3f2a31c1dd 100644 --- a/test/cpp/common/timer_test.cc +++ b/test/cpp/common/timer_test.cc @@ -25,12 +25,12 @@ #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/timer_manager.h" +#include "src/core/util/crash.h" +#include "src/core/util/time.h" #include "test/core/test_util/test_config.h" #ifdef GRPC_POSIX_SOCKET_EV diff --git a/test/cpp/end2end/async_end2end_test.cc b/test/cpp/end2end/async_end2end_test.cc index b4f7657ecfc..0f59bcab892 100644 --- a/test/cpp/end2end/async_end2end_test.cc +++ b/test/cpp/end2end/async_end2end_test.cc @@ -39,9 +39,9 @@ #include "src/core/client_channel/backup_poller.h" #include "src/core/lib/config/config_vars.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/debug_location.h" #include "src/core/lib/iomgr/port.h" +#include "src/core/util/crash.h" +#include "src/core/util/debug_location.h" #include "src/proto/grpc/health/v1/health.grpc.pb.h" #include "src/proto/grpc/testing/duplicate/echo_duplicate.grpc.pb.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" diff --git a/test/cpp/end2end/cfstream_test.cc b/test/cpp/end2end/cfstream_test.cc index 907622e0b62..c0139db761f 100644 --- a/test/cpp/end2end/cfstream_test.cc +++ b/test/cpp/end2end/cfstream_test.cc @@ -39,10 +39,10 @@ #include #include -#include "src/core/lib/backoff/backoff.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/env.h" #include "src/core/lib/iomgr/port.h" +#include "src/core/util/backoff.h" +#include "src/core/util/crash.h" +#include "src/core/util/env.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/core/test_util/port.h" #include "test/core/test_util/test_config.h" diff --git a/test/cpp/end2end/channelz_service_test.cc b/test/cpp/end2end/channelz_service_test.cc index 98a6fff4436..708b4ff53f9 100644 --- a/test/cpp/end2end/channelz_service_test.cc +++ b/test/cpp/end2end/channelz_service_test.cc @@ -36,10 +36,10 @@ #include #include "src/core/lib/event_engine/default_event_engine.h" -#include "src/core/lib/gprpp/env.h" #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h" #include "src/core/lib/security/security_connector/ssl_utils.h" #include "src/core/lib/slice/slice_internal.h" +#include "src/core/util/env.h" #include "src/cpp/client/secure_credentials.h" #include "src/proto/grpc/channelz/channelz.grpc.pb.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" diff --git a/test/cpp/end2end/client_callback_end2end_test.cc b/test/cpp/end2end/client_callback_end2end_test.cc index 88ce497a590..fefcc81a976 100644 --- a/test/cpp/end2end/client_callback_end2end_test.cc +++ b/test/cpp/end2end/client_callback_end2end_test.cc @@ -39,8 +39,8 @@ #include #include -#include "src/core/lib/gprpp/env.h" #include "src/core/lib/iomgr/iomgr.h" +#include "src/core/util/env.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/core/test_util/port.h" #include "test/core/test_util/test_config.h" diff --git a/test/cpp/end2end/client_crash_test.cc b/test/cpp/end2end/client_crash_test.cc index fbd98164931..39e857562c8 100644 --- a/test/cpp/end2end/client_crash_test.cc +++ b/test/cpp/end2end/client_crash_test.cc @@ -30,7 +30,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "src/proto/grpc/testing/duplicate/echo_duplicate.grpc.pb.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/core/test_util/port.h" diff --git a/test/cpp/end2end/client_crash_test_server.cc b/test/cpp/end2end/client_crash_test_server.cc index 441e8e3dbcb..6d166740ee2 100644 --- a/test/cpp/end2end/client_crash_test_server.cc +++ b/test/cpp/end2end/client_crash_test_server.cc @@ -27,7 +27,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/cpp/util/test_config.h" diff --git a/test/cpp/end2end/client_fork_test.cc b/test/cpp/end2end/client_fork_test.cc index 2388e558528..c93ff755e83 100644 --- a/test/cpp/end2end/client_fork_test.cc +++ b/test/cpp/end2end/client_fork_test.cc @@ -36,7 +36,7 @@ int main(int /* argc */, char** /* argv */) { return 0; } #include #include -#include "src/core/lib/gprpp/fork.h" +#include "src/core/util/fork.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/core/test_util/port.h" #include "test/core/test_util/test_config.h" diff --git a/test/cpp/end2end/client_lb_end2end_test.cc b/test/cpp/end2end/client_lb_end2end_test.cc index b3d1394480d..0b7349ceb26 100644 --- a/test/cpp/end2end/client_lb_end2end_test.cc +++ b/test/cpp/end2end/client_lb_end2end_test.cc @@ -54,15 +54,8 @@ #include "src/core/client_channel/global_subchannel_pool.h" #include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/address_utils/sockaddr_utils.h" -#include "src/core/lib/backoff/backoff.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/config_vars.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/env.h" -#include "src/core/lib/gprpp/notification.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/tcp_client.h" #include "src/core/lib/security/credentials/fake/fake_credentials.h" #include "src/core/lib/transport/connectivity_state.h" @@ -71,6 +64,13 @@ #include "src/core/server/server.h" #include "src/core/service_config/service_config.h" #include "src/core/service_config/service_config_impl.h" +#include "src/core/util/backoff.h" +#include "src/core/util/crash.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/env.h" +#include "src/core/util/notification.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" #include "src/cpp/server/secure_server_credentials.h" #include "src/proto/grpc/health/v1/health.grpc.pb.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" diff --git a/test/cpp/end2end/connection_attempt_injector.cc b/test/cpp/end2end/connection_attempt_injector.cc index ab285203d8b..a7b64bfcea3 100644 --- a/test/cpp/end2end/connection_attempt_injector.cc +++ b/test/cpp/end2end/connection_attempt_injector.cc @@ -23,8 +23,8 @@ #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/event_engine/default_event_engine.h" -#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/iomgr/exec_ctx.h" +#include "src/core/util/sync.h" // defined in tcp_client.cc extern grpc_tcp_client_vtable* grpc_tcp_client_impl; diff --git a/test/cpp/end2end/connection_attempt_injector.h b/test/cpp/end2end/connection_attempt_injector.h index bc56f85284b..4eb35d6850e 100644 --- a/test/cpp/end2end/connection_attempt_injector.h +++ b/test/cpp/end2end/connection_attempt_injector.h @@ -18,8 +18,8 @@ #include #include "src/core/lib/event_engine/channel_args_endpoint_config.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/tcp_client.h" +#include "src/core/util/time.h" namespace grpc { namespace testing { diff --git a/test/cpp/end2end/counted_service.h b/test/cpp/end2end/counted_service.h index 4d875acc65d..2f07675eb59 100644 --- a/test/cpp/end2end/counted_service.h +++ b/test/cpp/end2end/counted_service.h @@ -17,7 +17,7 @@ #ifndef GRPC_TEST_CPP_END2END_COUNTED_SERVICE_H #define GRPC_TEST_CPP_END2END_COUNTED_SERVICE_H -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/sync.h" namespace grpc { namespace testing { diff --git a/test/cpp/end2end/end2end_test.cc b/test/cpp/end2end/end2end_test.cc index 543be34226f..1bf43444442 100644 --- a/test/cpp/end2end/end2end_test.cc +++ b/test/cpp/end2end/end2end_test.cc @@ -44,10 +44,10 @@ #include "src/core/client_channel/backup_poller.h" #include "src/core/lib/config/config_vars.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/env.h" #include "src/core/lib/iomgr/iomgr.h" #include "src/core/lib/security/credentials/credentials.h" +#include "src/core/util/crash.h" +#include "src/core/util/env.h" #include "src/proto/grpc/testing/duplicate/echo_duplicate.grpc.pb.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/core/test_util/port.h" diff --git a/test/cpp/end2end/flaky_network_test.cc b/test/cpp/end2end/flaky_network_test.cc index add00a63cca..3df6f1e080f 100644 --- a/test/cpp/end2end/flaky_network_test.cc +++ b/test/cpp/end2end/flaky_network_test.cc @@ -41,9 +41,9 @@ #include #include -#include "src/core/lib/backoff/backoff.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/env.h" +#include "src/core/util/backoff.h" +#include "src/core/util/crash.h" +#include "src/core/util/env.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/core/test_util/port.h" #include "test/core/test_util/test_config.h" diff --git a/test/cpp/end2end/grpclb_end2end_test.cc b/test/cpp/end2end/grpclb_end2end_test.cc index 4734f8cd736..34eeb7b5202 100644 --- a/test/cpp/end2end/grpclb_end2end_test.cc +++ b/test/cpp/end2end/grpclb_end2end_test.cc @@ -48,11 +48,6 @@ #include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/config_vars.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/env.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/security/credentials/fake/fake_credentials.h" #include "src/core/load_balancing/grpclb/grpclb.h" @@ -60,6 +55,11 @@ #include "src/core/resolver/endpoint_addresses.h" #include "src/core/resolver/fake/fake_resolver.h" #include "src/core/service_config/service_config_impl.h" +#include "src/core/util/crash.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/env.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" #include "src/cpp/server/secure_server_credentials.h" #include "src/proto/grpc/lb/v1/load_balancer.grpc.pb.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" diff --git a/test/cpp/end2end/health_service_end2end_test.cc b/test/cpp/end2end/health_service_end2end_test.cc index 48209bb5e49..167396cad45 100644 --- a/test/cpp/end2end/health_service_end2end_test.cc +++ b/test/cpp/end2end/health_service_end2end_test.cc @@ -33,7 +33,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "src/proto/grpc/health/v1/health.grpc.pb.h" #include "src/proto/grpc/testing/duplicate/echo_duplicate.grpc.pb.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" diff --git a/test/cpp/end2end/hybrid_end2end_test.cc b/test/cpp/end2end/hybrid_end2end_test.cc index 20b920f6276..139dda2eb5d 100644 --- a/test/cpp/end2end/hybrid_end2end_test.cc +++ b/test/cpp/end2end/hybrid_end2end_test.cc @@ -33,8 +33,8 @@ #include #include -#include "src/core/lib/gprpp/env.h" #include "src/core/lib/iomgr/iomgr.h" +#include "src/core/util/env.h" #include "src/proto/grpc/testing/duplicate/echo_duplicate.grpc.pb.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/core/test_util/port.h" diff --git a/test/cpp/end2end/interceptors_util.h b/test/cpp/end2end/interceptors_util.h index 73e443a46b3..c16c34cd714 100644 --- a/test/cpp/end2end/interceptors_util.h +++ b/test/cpp/end2end/interceptors_util.h @@ -28,7 +28,7 @@ #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/cpp/util/string_ref_helper.h" diff --git a/test/cpp/end2end/mock_test.cc b/test/cpp/end2end/mock_test.cc index 073b67dcbfe..281267a7f9c 100644 --- a/test/cpp/end2end/mock_test.cc +++ b/test/cpp/end2end/mock_test.cc @@ -36,7 +36,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "src/proto/grpc/testing/duplicate/echo_duplicate.grpc.pb.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "src/proto/grpc/testing/echo_mock.grpc.pb.h" diff --git a/test/cpp/end2end/orca_service_end2end_test.cc b/test/cpp/end2end/orca_service_end2end_test.cc index bf67dd0bc36..ce88cb19110 100644 --- a/test/cpp/end2end/orca_service_end2end_test.cc +++ b/test/cpp/end2end/orca_service_end2end_test.cc @@ -32,7 +32,7 @@ #include #include -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "src/proto/grpc/testing/xds/v3/orca_service.grpc.pb.h" #include "src/proto/grpc/testing/xds/v3/orca_service.pb.h" #include "test/core/test_util/port.h" diff --git a/test/cpp/end2end/port_sharing_end2end_test.cc b/test/cpp/end2end/port_sharing_end2end_test.cc index 95f37870957..93461bd9ff4 100644 --- a/test/cpp/end2end/port_sharing_end2end_test.cc +++ b/test/cpp/end2end/port_sharing_end2end_test.cc @@ -36,15 +36,15 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/env.h" -#include "src/core/lib/gprpp/host_port.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/pollset.h" #include "src/core/lib/iomgr/port.h" #include "src/core/lib/iomgr/tcp_server.h" #include "src/core/lib/security/credentials/credentials.h" +#include "src/core/util/crash.h" +#include "src/core/util/env.h" +#include "src/core/util/host_port.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/core/test_util/port.h" #include "test/core/test_util/resolve_localhost_ip46.h" diff --git a/test/cpp/end2end/raw_end2end_test.cc b/test/cpp/end2end/raw_end2end_test.cc index c41bb7a60df..8b28df798f6 100644 --- a/test/cpp/end2end/raw_end2end_test.cc +++ b/test/cpp/end2end/raw_end2end_test.cc @@ -34,9 +34,9 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/env.h" #include "src/core/lib/iomgr/port.h" +#include "src/core/util/crash.h" +#include "src/core/util/env.h" #include "src/proto/grpc/testing/duplicate/echo_duplicate.grpc.pb.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/core/test_util/port.h" diff --git a/test/cpp/end2end/resource_quota_end2end_stress_test.cc b/test/cpp/end2end/resource_quota_end2end_stress_test.cc index 9960bdff93d..64987700a62 100644 --- a/test/cpp/end2end/resource_quota_end2end_stress_test.cc +++ b/test/cpp/end2end/resource_quota_end2end_stress_test.cc @@ -32,8 +32,8 @@ #include "src/core/lib/event_engine/tcp_socket_utils.h" #include "src/core/lib/experiments/config.h" -#include "src/core/lib/gprpp/notification.h" #include "src/core/lib/security/credentials/fake/fake_credentials.h" +#include "src/core/util/notification.h" #include "src/cpp/server/secure_server_credentials.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/core/test_util/port.h" diff --git a/test/cpp/end2end/rls_end2end_test.cc b/test/cpp/end2end/rls_end2end_test.cc index 348a700cfa7..2ed47362d5e 100644 --- a/test/cpp/end2end/rls_end2end_test.cc +++ b/test/cpp/end2end/rls_end2end_test.cc @@ -46,15 +46,15 @@ #include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/config_vars.h" -#include "src/core/lib/gprpp/env.h" -#include "src/core/lib/gprpp/host_port.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/security/credentials/fake/fake_credentials.h" -#include "src/core/lib/uri/uri_parser.h" #include "src/core/load_balancing/rls/rls.h" #include "src/core/resolver/fake/fake_resolver.h" #include "src/core/service_config/service_config_impl.h" +#include "src/core/util/env.h" +#include "src/core/util/host_port.h" +#include "src/core/util/time.h" +#include "src/core/util/uri.h" #include "src/cpp/server/secure_server_credentials.h" #include "src/proto/grpc/lookup/v1/rls.grpc.pb.h" #include "src/proto/grpc/lookup/v1/rls.pb.h" diff --git a/test/cpp/end2end/rls_server.h b/test/cpp/end2end/rls_server.h index a169c15dfe6..149e38c6395 100644 --- a/test/cpp/end2end/rls_server.h +++ b/test/cpp/end2end/rls_server.h @@ -19,7 +19,7 @@ #include "absl/types/optional.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "src/proto/grpc/lookup/v1/rls.grpc.pb.h" #include "src/proto/grpc/lookup/v1/rls.pb.h" #include "test/cpp/end2end/counted_service.h" diff --git a/test/cpp/end2end/server_crash_test.cc b/test/cpp/end2end/server_crash_test.cc index 6973f054dcb..bbdea2c1af2 100644 --- a/test/cpp/end2end/server_crash_test.cc +++ b/test/cpp/end2end/server_crash_test.cc @@ -31,7 +31,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "src/proto/grpc/testing/duplicate/echo_duplicate.grpc.pb.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/core/test_util/port.h" diff --git a/test/cpp/end2end/server_crash_test_client.cc b/test/cpp/end2end/server_crash_test_client.cc index 4d2e266f025..01b25967be3 100644 --- a/test/cpp/end2end/server_crash_test_client.cc +++ b/test/cpp/end2end/server_crash_test_client.cc @@ -29,7 +29,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/cpp/util/test_config.h" diff --git a/test/cpp/end2end/server_early_return_test.cc b/test/cpp/end2end/server_early_return_test.cc index 2489b09341c..ddcc713cb86 100644 --- a/test/cpp/end2end/server_early_return_test.cc +++ b/test/cpp/end2end/server_early_return_test.cc @@ -30,7 +30,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/core/test_util/port.h" #include "test/core/test_util/test_config.h" diff --git a/test/cpp/end2end/server_load_reporting_end2end_test.cc b/test/cpp/end2end/server_load_reporting_end2end_test.cc index d5e057d386a..5365264c5bd 100644 --- a/test/cpp/end2end/server_load_reporting_end2end_test.cc +++ b/test/cpp/end2end/server_load_reporting_end2end_test.cc @@ -32,7 +32,7 @@ #include "src/core/client_channel/backup_poller.h" #include "src/core/lib/config/config_vars.h" -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "src/proto/grpc/lb/v1/load_reporter.grpc.pb.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/core/test_util/port.h" diff --git a/test/cpp/end2end/service_config_end2end_test.cc b/test/cpp/end2end/service_config_end2end_test.cc index 380ebc2e261..6ff1835aa2f 100644 --- a/test/cpp/end2end/service_config_end2end_test.cc +++ b/test/cpp/end2end/service_config_end2end_test.cc @@ -48,18 +48,18 @@ #include "src/core/client_channel/backup_poller.h" #include "src/core/client_channel/global_subchannel_pool.h" #include "src/core/lib/address_utils/parse_address.h" -#include "src/core/lib/backoff/backoff.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/config_vars.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/iomgr/tcp_client.h" #include "src/core/lib/security/credentials/fake/fake_credentials.h" #include "src/core/lib/transport/error_utils.h" #include "src/core/resolver/endpoint_addresses.h" #include "src/core/resolver/fake/fake_resolver.h" #include "src/core/service_config/service_config_impl.h" +#include "src/core/util/backoff.h" +#include "src/core/util/crash.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/ref_counted_ptr.h" #include "src/cpp/server/secure_server_credentials.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/core/test_util/port.h" diff --git a/test/cpp/end2end/shutdown_test.cc b/test/cpp/end2end/shutdown_test.cc index baae51856b5..dcfb52099b6 100644 --- a/test/cpp/end2end/shutdown_test.cc +++ b/test/cpp/end2end/shutdown_test.cc @@ -32,8 +32,8 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/env.h" +#include "src/core/util/crash.h" +#include "src/core/util/env.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/core/test_util/port.h" #include "test/core/test_util/test_config.h" diff --git a/test/cpp/end2end/streaming_throughput_test.cc b/test/cpp/end2end/streaming_throughput_test.cc index a7a3511d157..8fb9f975349 100644 --- a/test/cpp/end2end/streaming_throughput_test.cc +++ b/test/cpp/end2end/streaming_throughput_test.cc @@ -37,7 +37,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "src/proto/grpc/testing/duplicate/echo_duplicate.grpc.pb.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/core/test_util/port.h" diff --git a/test/cpp/end2end/test_service_impl.cc b/test/cpp/end2end/test_service_impl.cc index 079dca44feb..26810842ac3 100644 --- a/test/cpp/end2end/test_service_impl.cc +++ b/test/cpp/end2end/test_service_impl.cc @@ -30,8 +30,8 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/notification.h" +#include "src/core/util/crash.h" +#include "src/core/util/notification.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/cpp/util/string_ref_helper.h" diff --git a/test/cpp/end2end/test_service_impl.h b/test/cpp/end2end/test_service_impl.h index 84cb324e46b..c1860573d9e 100644 --- a/test/cpp/end2end/test_service_impl.h +++ b/test/cpp/end2end/test_service_impl.h @@ -35,7 +35,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/core/test_util/test_config.h" #include "test/cpp/util/string_ref_helper.h" diff --git a/test/cpp/end2end/thread_stress_test.cc b/test/cpp/end2end/thread_stress_test.cc index ee2f558a5be..b8171015e6c 100644 --- a/test/cpp/end2end/thread_stress_test.cc +++ b/test/cpp/end2end/thread_stress_test.cc @@ -35,7 +35,7 @@ #include #include -#include "src/core/lib/gprpp/env.h" +#include "src/core/util/env.h" #include "src/proto/grpc/testing/duplicate/echo_duplicate.grpc.pb.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/core/test_util/port.h" diff --git a/test/cpp/end2end/time_change_test.cc b/test/cpp/end2end/time_change_test.cc index fa7dff06028..dd8a9a94441 100644 --- a/test/cpp/end2end/time_change_test.cc +++ b/test/cpp/end2end/time_change_test.cc @@ -34,8 +34,8 @@ #include #include -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/iomgr/timer.h" +#include "src/core/util/crash.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/core/test_util/port.h" #include "test/core/test_util/test_config.h" diff --git a/test/cpp/end2end/xds/xds_cluster_type_end2end_test.cc b/test/cpp/end2end/xds/xds_cluster_type_end2end_test.cc index 19ba50ecd8c..b80b344da03 100644 --- a/test/cpp/end2end/xds/xds_cluster_type_end2end_test.cc +++ b/test/cpp/end2end/xds/xds_cluster_type_end2end_test.cc @@ -28,10 +28,10 @@ #include "src/core/client_channel/backup_poller.h" #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/config/config_vars.h" -#include "src/core/lib/gprpp/env.h" #include "src/core/load_balancing/xds/xds_channel_args.h" #include "src/core/resolver/endpoint_addresses.h" #include "src/core/resolver/fake/fake_resolver.h" +#include "src/core/util/env.h" #include "src/proto/grpc/testing/xds/v3/aggregate_cluster.grpc.pb.h" #include "test/core/test_util/resolve_localhost_ip46.h" #include "test/core/test_util/scoped_env_var.h" diff --git a/test/cpp/end2end/xds/xds_end2end_test.cc b/test/cpp/end2end/xds/xds_end2end_test.cc index 451eae32dde..cf003274740 100644 --- a/test/cpp/end2end/xds/xds_end2end_test.cc +++ b/test/cpp/end2end/xds/xds_end2end_test.cc @@ -63,12 +63,6 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/config_vars.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/env.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/time.h" -#include "src/core/lib/gprpp/time_util.h" #include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/security/authorization/audit_logging.h" #include "src/core/lib/security/certificate_provider/certificate_provider_registry.h" @@ -77,8 +71,14 @@ #include "src/core/load_balancing/xds/xds_channel_args.h" #include "src/core/resolver/endpoint_addresses.h" #include "src/core/resolver/fake/fake_resolver.h" +#include "src/core/util/crash.h" +#include "src/core/util/env.h" +#include "src/core/util/ref_counted_ptr.h" #include "src/core/util/string.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.h" #include "src/core/util/time_precise.h" +#include "src/core/util/time_util.h" #include "src/core/util/tmpfile.h" #include "src/core/xds/grpc/xds_listener.h" #include "src/core/xds/xds_client/xds_api.h" diff --git a/test/cpp/end2end/xds/xds_end2end_test_lib.cc b/test/cpp/end2end/xds/xds_end2end_test_lib.cc index 51812c21e12..1ba85995c09 100644 --- a/test/cpp/end2end/xds/xds_end2end_test_lib.cc +++ b/test/cpp/end2end/xds/xds_end2end_test_lib.cc @@ -38,8 +38,8 @@ #include #include "src/core/ext/filters/http/server/http_server_filter.h" -#include "src/core/lib/gprpp/env.h" #include "src/core/server/server.h" +#include "src/core/util/env.h" #include "src/core/util/tmpfile.h" #include "src/core/xds/grpc/xds_client_grpc.h" #include "src/core/xds/xds_client/xds_channel_args.h" diff --git a/test/cpp/end2end/xds/xds_override_host_end2end_test.cc b/test/cpp/end2end/xds/xds_override_host_end2end_test.cc index 88f57285c21..69eb72cbddd 100644 --- a/test/cpp/end2end/xds/xds_override_host_end2end_test.cc +++ b/test/cpp/end2end/xds/xds_override_host_end2end_test.cc @@ -24,7 +24,7 @@ #include "absl/strings/str_split.h" #include "src/core/lib/config/config_vars.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "src/proto/grpc/testing/xds/v3/stateful_session.pb.h" #include "src/proto/grpc/testing/xds/v3/stateful_session_cookie.pb.h" #include "test/core/test_util/scoped_env_var.h" diff --git a/test/cpp/end2end/xds/xds_pick_first_end2end_test.cc b/test/cpp/end2end/xds/xds_pick_first_end2end_test.cc index c637f637552..f0d6796691d 100644 --- a/test/cpp/end2end/xds/xds_pick_first_end2end_test.cc +++ b/test/cpp/end2end/xds/xds_pick_first_end2end_test.cc @@ -32,9 +32,9 @@ #include "src/core/client_channel/backup_poller.h" #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/config/config_vars.h" -#include "src/core/lib/gprpp/env.h" #include "src/core/load_balancing/xds/xds_channel_args.h" #include "src/core/resolver/fake/fake_resolver.h" +#include "src/core/util/env.h" #include "src/proto/grpc/testing/xds/v3/cluster.grpc.pb.h" #include "src/proto/grpc/testing/xds/v3/pick_first.pb.h" #include "test/core/test_util/test_config.h" diff --git a/test/cpp/end2end/xds/xds_ring_hash_end2end_test.cc b/test/cpp/end2end/xds/xds_ring_hash_end2end_test.cc index cfa4440d21d..86aba3e8121 100644 --- a/test/cpp/end2end/xds/xds_ring_hash_end2end_test.cc +++ b/test/cpp/end2end/xds/xds_ring_hash_end2end_test.cc @@ -29,9 +29,9 @@ #include "src/core/client_channel/backup_poller.h" #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/config/config_vars.h" -#include "src/core/lib/gprpp/env.h" #include "src/core/load_balancing/xds/xds_channel_args.h" #include "src/core/resolver/fake/fake_resolver.h" +#include "src/core/util/env.h" #include "src/proto/grpc/testing/xds/v3/aggregate_cluster.grpc.pb.h" #include "src/proto/grpc/testing/xds/v3/cluster.grpc.pb.h" #include "test/core/test_util/resolve_localhost_ip46.h" diff --git a/test/cpp/end2end/xds/xds_rls_end2end_test.cc b/test/cpp/end2end/xds/xds_rls_end2end_test.cc index 4e18874b7e8..2297d159ca9 100644 --- a/test/cpp/end2end/xds/xds_rls_end2end_test.cc +++ b/test/cpp/end2end/xds/xds_rls_end2end_test.cc @@ -23,7 +23,7 @@ #include "src/core/client_channel/backup_poller.h" #include "src/core/lib/config/config_vars.h" -#include "src/core/lib/gprpp/env.h" +#include "src/core/util/env.h" #include "src/proto/grpc/lookup/v1/rls.grpc.pb.h" #include "src/proto/grpc/lookup/v1/rls.pb.h" #include "src/proto/grpc/lookup/v1/rls_config.pb.h" diff --git a/test/cpp/end2end/xds/xds_server.cc b/test/cpp/end2end/xds/xds_server.cc index a4019c7fdfe..bbae462c994 100644 --- a/test/cpp/end2end/xds/xds_server.cc +++ b/test/cpp/end2end/xds/xds_server.cc @@ -27,8 +27,8 @@ #include "absl/types/optional.h" #include "src/core/lib/address_utils/parse_address.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/crash.h" +#include "src/core/util/sync.h" #include "src/proto/grpc/testing/xds/v3/ads.grpc.pb.h" #include "src/proto/grpc/testing/xds/v3/discovery.grpc.pb.h" #include "src/proto/grpc/testing/xds/v3/lrs.grpc.pb.h" diff --git a/test/cpp/end2end/xds/xds_server.h b/test/cpp/end2end/xds/xds_server.h index 4cd3982c955..4131362f7b0 100644 --- a/test/cpp/end2end/xds/xds_server.h +++ b/test/cpp/end2end/xds/xds_server.h @@ -30,8 +30,8 @@ #include #include "src/core/lib/address_utils/parse_address.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/crash.h" +#include "src/core/util/sync.h" #include "src/proto/grpc/testing/xds/v3/ads.grpc.pb.h" #include "src/proto/grpc/testing/xds/v3/cluster.grpc.pb.h" #include "src/proto/grpc/testing/xds/v3/discovery.grpc.pb.h" diff --git a/test/cpp/end2end/xds/xds_utils.cc b/test/cpp/end2end/xds/xds_utils.cc index b1b69ddcc54..c52e819172e 100644 --- a/test/cpp/end2end/xds/xds_utils.cc +++ b/test/cpp/end2end/xds/xds_utils.cc @@ -34,8 +34,8 @@ #include #include "src/core/ext/filters/http/server/http_server_filter.h" -#include "src/core/lib/gprpp/env.h" #include "src/core/server/server.h" +#include "src/core/util/env.h" #include "src/core/util/tmpfile.h" #include "src/core/xds/grpc/xds_client_grpc.h" #include "src/core/xds/xds_client/xds_channel_args.h" diff --git a/test/cpp/ext/csm/mesh_id_test.cc b/test/cpp/ext/csm/mesh_id_test.cc index 7d0b8ba8c21..e1a7f86fc80 100644 --- a/test/cpp/ext/csm/mesh_id_test.cc +++ b/test/cpp/ext/csm/mesh_id_test.cc @@ -20,7 +20,7 @@ #include -#include "src/core/lib/gprpp/env.h" +#include "src/core/util/env.h" #include "src/core/util/tmpfile.h" #include "src/cpp/ext/csm/metadata_exchange.h" #include "test/core/test_util/test_config.h" diff --git a/test/cpp/ext/csm/metadata_exchange_test.cc b/test/cpp/ext/csm/metadata_exchange_test.cc index f83577cc7d9..1b85eaf185a 100644 --- a/test/cpp/ext/csm/metadata_exchange_test.cc +++ b/test/cpp/ext/csm/metadata_exchange_test.cc @@ -30,8 +30,8 @@ #include #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/env.h" #include "src/core/telemetry/call_tracer.h" +#include "src/core/util/env.h" #include "src/core/util/tmpfile.h" #include "src/cpp/ext/csm/csm_observability.h" #include "src/cpp/ext/otel/otel_plugin.h" diff --git a/test/cpp/ext/filters/logging/library.h b/test/cpp/ext/filters/logging/library.h index 92b7311c5a6..f1ca3fc9576 100644 --- a/test/cpp/ext/filters/logging/library.h +++ b/test/cpp/ext/filters/logging/library.h @@ -35,7 +35,7 @@ #include #include "src/core/ext/filters/logging/logging_filter.h" -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/sync.h" #include "src/cpp/ext/gcp/observability_logging_sink.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "src/proto/grpc/testing/echo_messages.pb.h" diff --git a/test/cpp/ext/filters/logging/logging_census_integration_test.cc b/test/cpp/ext/filters/logging/logging_census_integration_test.cc index b8c196d1c09..622c93ffbb4 100644 --- a/test/cpp/ext/filters/logging/logging_census_integration_test.cc +++ b/test/cpp/ext/filters/logging/logging_census_integration_test.cc @@ -32,7 +32,7 @@ #include "src/core/ext/filters/logging/logging_filter.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/sync.h" #include "src/cpp/ext/gcp/observability_logging_sink.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "src/proto/grpc/testing/echo_messages.pb.h" diff --git a/test/cpp/ext/filters/logging/logging_test.cc b/test/cpp/ext/filters/logging/logging_test.cc index 09df6f7f906..6441e1cefcf 100644 --- a/test/cpp/ext/filters/logging/logging_test.cc +++ b/test/cpp/ext/filters/logging/logging_test.cc @@ -29,8 +29,8 @@ #include #include "src/core/ext/filters/logging/logging_filter.h" -#include "src/core/lib/gprpp/dump_args.h" -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/dump_args.h" +#include "src/core/util/sync.h" #include "src/cpp/ext/gcp/observability_logging_sink.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "src/proto/grpc/testing/echo_messages.pb.h" diff --git a/test/cpp/ext/gcp/environment_autodetect_test.cc b/test/cpp/ext/gcp/environment_autodetect_test.cc index 947f18838bd..d466a48ba93 100644 --- a/test/cpp/ext/gcp/environment_autodetect_test.cc +++ b/test/cpp/ext/gcp/environment_autodetect_test.cc @@ -29,8 +29,8 @@ #include -#include "src/core/lib/gprpp/env.h" -#include "src/core/lib/gprpp/notification.h" +#include "src/core/util/env.h" +#include "src/core/util/notification.h" #include "test/core/test_util/test_config.h" namespace grpc { diff --git a/test/cpp/ext/gcp/observability_config_test.cc b/test/cpp/ext/gcp/observability_config_test.cc index 4a586ba2175..391832b13d5 100644 --- a/test/cpp/ext/gcp/observability_config_test.cc +++ b/test/cpp/ext/gcp/observability_config_test.cc @@ -22,7 +22,7 @@ #include #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/env.h" +#include "src/core/util/env.h" #include "src/core/util/json/json_reader.h" #include "src/core/util/tmpfile.h" #include "test/core/test_util/test_config.h" diff --git a/test/cpp/ext/otel/otel_test_library.cc b/test/cpp/ext/otel/otel_test_library.cc index 7bc0daac261..131aeef222f 100644 --- a/test/cpp/ext/otel/otel_test_library.cc +++ b/test/cpp/ext/otel/otel_test_library.cc @@ -33,8 +33,8 @@ #include "src/core/lib/channel/promise_based_filter.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/notification.h" #include "src/core/telemetry/call_tracer.h" +#include "src/core/util/notification.h" #include "test/core/test_util/fake_stats_plugin.h" #include "test/core/test_util/test_config.h" #include "test/cpp/end2end/test_service_impl.h" diff --git a/test/cpp/interop/backend_metrics_lb_policy_test.cc b/test/cpp/interop/backend_metrics_lb_policy_test.cc index 56d5e9f6e96..0a5fb277bab 100644 --- a/test/cpp/interop/backend_metrics_lb_policy_test.cc +++ b/test/cpp/interop/backend_metrics_lb_policy_test.cc @@ -31,7 +31,7 @@ #include #include "src/core/lib/config/config_vars.h" -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/sync.h" #include "src/proto/grpc/testing/messages.pb.h" #include "src/proto/grpc/testing/test.grpc.pb.h" #include "test/core/test_util/port.h" diff --git a/test/cpp/interop/client.cc b/test/cpp/interop/client.cc index 8a708c345da..fe211e71ddb 100644 --- a/test/cpp/interop/client.cc +++ b/test/cpp/interop/client.cc @@ -28,7 +28,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "src/core/util/string.h" #include "test/core/test_util/test_config.h" #include "test/cpp/interop/client_helper.h" diff --git a/test/cpp/interop/grpclb_fallback_test.cc b/test/cpp/interop/grpclb_fallback_test.cc index 594c5b6b39b..7d3c637fee2 100644 --- a/test/cpp/interop/grpclb_fallback_test.cc +++ b/test/cpp/interop/grpclb_fallback_test.cc @@ -43,9 +43,9 @@ #include #include -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/iomgr/port.h" #include "src/core/lib/iomgr/socket_mutator.h" +#include "src/core/util/crash.h" #include "src/core/util/string.h" #include "src/proto/grpc/testing/empty.pb.h" #include "src/proto/grpc/testing/messages.pb.h" diff --git a/test/cpp/interop/http2_client.cc b/test/cpp/interop/http2_client.cc index 62c728d4c78..d19b0b6616a 100644 --- a/test/cpp/interop/http2_client.cc +++ b/test/cpp/interop/http2_client.cc @@ -29,7 +29,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "src/core/util/string.h" #include "src/core/util/useful.h" #include "src/proto/grpc/testing/messages.pb.h" diff --git a/test/cpp/interop/interop_client.cc b/test/cpp/interop/interop_client.cc index 1cfcb10be65..1190ecd7476 100644 --- a/test/cpp/interop/interop_client.cc +++ b/test/cpp/interop/interop_client.cc @@ -43,7 +43,7 @@ #include "src/core/lib/config/config_vars.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "src/proto/grpc/testing/empty.pb.h" #include "src/proto/grpc/testing/messages.pb.h" #include "src/proto/grpc/testing/test.grpc.pb.h" diff --git a/test/cpp/interop/interop_server.cc b/test/cpp/interop/interop_server.cc index fb7d3430107..25f5f633bfc 100644 --- a/test/cpp/interop/interop_server.cc +++ b/test/cpp/interop/interop_server.cc @@ -35,9 +35,9 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/crash.h" #include "src/core/util/string.h" +#include "src/core/util/sync.h" #include "src/proto/grpc/testing/empty.pb.h" #include "src/proto/grpc/testing/messages.pb.h" #include "src/proto/grpc/testing/test.grpc.pb.h" diff --git a/test/cpp/interop/interop_test.cc b/test/cpp/interop/interop_test.cc index d46e2a531cd..1134971371d 100644 --- a/test/cpp/interop/interop_test.cc +++ b/test/cpp/interop/interop_test.cc @@ -34,8 +34,8 @@ #include -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/iomgr/socket_utils_posix.h" +#include "src/core/util/crash.h" #include "src/core/util/string.h" #include "test/core/test_util/port.h" #include "test/cpp/util/test_config.h" diff --git a/test/cpp/interop/istio_echo_server.cc b/test/cpp/interop/istio_echo_server.cc index e81b1b2f170..bb24edcae46 100644 --- a/test/cpp/interop/istio_echo_server.cc +++ b/test/cpp/interop/istio_echo_server.cc @@ -45,9 +45,9 @@ #include #include "src/core/lib/channel/status_util.h" -#include "src/core/lib/gprpp/env.h" -#include "src/core/lib/gprpp/host_port.h" -#include "src/core/lib/iomgr/gethostname.h" +#include "src/core/util/env.h" +#include "src/core/util/gethostname.h" +#include "src/core/util/host_port.h" #include "src/proto/grpc/testing/istio_echo.pb.h" #include "test/core/test_util/test_config.h" #include "test/cpp/interop/istio_echo_server_lib.h" diff --git a/test/cpp/interop/istio_echo_server_lib.cc b/test/cpp/interop/istio_echo_server_lib.cc index cb39a15cf99..f0ddd49c80a 100644 --- a/test/cpp/interop/istio_echo_server_lib.cc +++ b/test/cpp/interop/istio_echo_server_lib.cc @@ -27,7 +27,7 @@ #include #include -#include "src/core/lib/gprpp/host_port.h" +#include "src/core/util/host_port.h" #include "src/proto/grpc/testing/istio_echo.pb.h" using proto::EchoRequest; diff --git a/test/cpp/interop/istio_echo_server_test.cc b/test/cpp/interop/istio_echo_server_test.cc index 8f1e39c2c3c..faa9a47ac57 100644 --- a/test/cpp/interop/istio_echo_server_test.cc +++ b/test/cpp/interop/istio_echo_server_test.cc @@ -27,8 +27,8 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/host_port.h" +#include "src/core/util/crash.h" +#include "src/core/util/host_port.h" #include "test/core/test_util/port.h" #include "test/core/test_util/test_config.h" #include "test/cpp/interop/istio_echo_server_lib.h" diff --git a/test/cpp/interop/metrics_client.cc b/test/cpp/interop/metrics_client.cc index c42208fd46c..9eb4f488b14 100644 --- a/test/cpp/interop/metrics_client.cc +++ b/test/cpp/interop/metrics_client.cc @@ -23,7 +23,7 @@ #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "src/proto/grpc/testing/metrics.grpc.pb.h" #include "src/proto/grpc/testing/metrics.pb.h" #include "test/core/test_util/test_config.h" diff --git a/test/cpp/interop/observability_client.cc b/test/cpp/interop/observability_client.cc index 247ab1d1738..c264aa504ec 100644 --- a/test/cpp/interop/observability_client.cc +++ b/test/cpp/interop/observability_client.cc @@ -32,7 +32,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "src/core/util/string.h" #include "test/core/test_util/test_config.h" #include "test/cpp/interop/client_helper.h" diff --git a/test/cpp/interop/pre_stop_hook_server.cc b/test/cpp/interop/pre_stop_hook_server.cc index ff9def05fd2..a00ab791a9d 100644 --- a/test/cpp/interop/pre_stop_hook_server.cc +++ b/test/cpp/interop/pre_stop_hook_server.cc @@ -24,7 +24,7 @@ #include -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/sync.h" #include "src/proto/grpc/testing/messages.pb.h" namespace grpc { diff --git a/test/cpp/interop/pre_stop_hook_server.h b/test/cpp/interop/pre_stop_hook_server.h index c491d4140df..a2ab3f35568 100644 --- a/test/cpp/interop/pre_stop_hook_server.h +++ b/test/cpp/interop/pre_stop_hook_server.h @@ -22,7 +22,7 @@ #include #include -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/sync.h" #include "src/proto/grpc/testing/messages.pb.h" #include "src/proto/grpc/testing/test.grpc.pb.h" diff --git a/test/cpp/interop/pre_stop_hook_server_test.cc b/test/cpp/interop/pre_stop_hook_server_test.cc index c1da2a6a624..32aa91b1bc2 100644 --- a/test/cpp/interop/pre_stop_hook_server_test.cc +++ b/test/cpp/interop/pre_stop_hook_server_test.cc @@ -27,7 +27,7 @@ #include #include -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/sync.h" #include "src/proto/grpc/testing/empty.pb.h" #include "src/proto/grpc/testing/messages.pb.h" #include "src/proto/grpc/testing/test.grpc.pb.h" diff --git a/test/cpp/interop/reconnect_interop_client.cc b/test/cpp/interop/reconnect_interop_client.cc index bdc7b27aa07..1c2e4837ec0 100644 --- a/test/cpp/interop/reconnect_interop_client.cc +++ b/test/cpp/interop/reconnect_interop_client.cc @@ -28,7 +28,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "src/proto/grpc/testing/empty.pb.h" #include "src/proto/grpc/testing/messages.pb.h" #include "src/proto/grpc/testing/test.grpc.pb.h" diff --git a/test/cpp/interop/reconnect_interop_server.cc b/test/cpp/interop/reconnect_interop_server.cc index 656bf77e906..a5ac668bb29 100644 --- a/test/cpp/interop/reconnect_interop_server.cc +++ b/test/cpp/interop/reconnect_interop_server.cc @@ -34,7 +34,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "src/proto/grpc/testing/empty.pb.h" #include "src/proto/grpc/testing/messages.pb.h" #include "src/proto/grpc/testing/test.grpc.pb.h" diff --git a/test/cpp/interop/stress_interop_client.cc b/test/cpp/interop/stress_interop_client.cc index 91a33d2547c..0ccacfaefb1 100644 --- a/test/cpp/interop/stress_interop_client.cc +++ b/test/cpp/interop/stress_interop_client.cc @@ -28,7 +28,7 @@ #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "test/cpp/interop/interop_client.h" #include "test/cpp/util/metrics_server.h" diff --git a/test/cpp/interop/stress_test.cc b/test/cpp/interop/stress_test.cc index a87d8b7d2cd..3f27484111c 100644 --- a/test/cpp/interop/stress_test.cc +++ b/test/cpp/interop/stress_test.cc @@ -33,7 +33,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "src/proto/grpc/testing/metrics.grpc.pb.h" #include "src/proto/grpc/testing/metrics.pb.h" #include "test/cpp/interop/interop_client.h" diff --git a/test/cpp/interop/xds_interop_client.cc b/test/cpp/interop/xds_interop_client.cc index 8480c24691d..f3af46b19f2 100644 --- a/test/cpp/interop/xds_interop_client.cc +++ b/test/cpp/interop/xds_interop_client.cc @@ -48,7 +48,7 @@ #include #include "src/core/lib/channel/status_util.h" -#include "src/core/lib/gprpp/env.h" +#include "src/core/util/env.h" #include "src/proto/grpc/testing/empty.pb.h" #include "src/proto/grpc/testing/messages.pb.h" #include "src/proto/grpc/testing/test.grpc.pb.h" diff --git a/test/cpp/interop/xds_interop_server.cc b/test/cpp/interop/xds_interop_server.cc index 09553cb82b6..eb2fa7ad08f 100644 --- a/test/cpp/interop/xds_interop_server.cc +++ b/test/cpp/interop/xds_interop_server.cc @@ -28,7 +28,7 @@ #include #include -#include "src/core/lib/iomgr/gethostname.h" +#include "src/core/util/gethostname.h" #include "test/core/test_util/test_config.h" #include "test/cpp/interop/xds_interop_server_lib.h" #include "test/cpp/util/test_config.h" diff --git a/test/cpp/interop/xds_interop_server_test.cc b/test/cpp/interop/xds_interop_server_test.cc index 479bf9125c3..808924ed0b3 100644 --- a/test/cpp/interop/xds_interop_server_test.cc +++ b/test/cpp/interop/xds_interop_server_test.cc @@ -24,7 +24,7 @@ #include #include -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/sync.h" #include "src/proto/grpc/testing/empty.pb.h" #include "src/proto/grpc/testing/test.grpc.pb.h" #include "test/core/test_util/port.h" diff --git a/test/cpp/microbenchmarks/bm_basic_work_queue.cc b/test/cpp/microbenchmarks/bm_basic_work_queue.cc index 320c8fc5093..c84cd3d1829 100644 --- a/test/cpp/microbenchmarks/bm_basic_work_queue.cc +++ b/test/cpp/microbenchmarks/bm_basic_work_queue.cc @@ -22,7 +22,7 @@ #include "src/core/lib/event_engine/common_closures.h" #include "src/core/lib/event_engine/work_queue/basic_work_queue.h" -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/sync.h" #include "test/core/test_util/test_config.h" namespace { diff --git a/test/cpp/microbenchmarks/bm_chttp2_hpack.cc b/test/cpp/microbenchmarks/bm_chttp2_hpack.cc index 1a8bda0380b..90d4ccee01f 100644 --- a/test/cpp/microbenchmarks/bm_chttp2_hpack.cc +++ b/test/cpp/microbenchmarks/bm_chttp2_hpack.cc @@ -34,13 +34,13 @@ #include "src/core/ext/transport/chttp2/transport/hpack_encoder.h" #include "src/core/ext/transport/chttp2/transport/hpack_parser.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/resource_quota/resource_quota.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/slice/slice_string_helpers.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/timeout_encoding.h" +#include "src/core/util/crash.h" +#include "src/core/util/time.h" #include "test/core/test_util/test_config.h" #include "test/cpp/microbenchmarks/helpers.h" #include "test/cpp/util/test_config.h" diff --git a/test/cpp/microbenchmarks/bm_cq.cc b/test/cpp/microbenchmarks/bm_cq.cc index 6b769f7da7f..6b490df906b 100644 --- a/test/cpp/microbenchmarks/bm_cq.cc +++ b/test/cpp/microbenchmarks/bm_cq.cc @@ -27,9 +27,9 @@ #include #include -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/surface/completion_queue.h" +#include "src/core/util/crash.h" #include "test/core/test_util/test_config.h" #include "test/cpp/microbenchmarks/helpers.h" #include "test/cpp/util/test_config.h" diff --git a/test/cpp/microbenchmarks/bm_cq_multiple_threads.cc b/test/cpp/microbenchmarks/bm_cq_multiple_threads.cc index e0144995e0d..f504af9f5fe 100644 --- a/test/cpp/microbenchmarks/bm_cq_multiple_threads.cc +++ b/test/cpp/microbenchmarks/bm_cq_multiple_threads.cc @@ -28,11 +28,11 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/ev_posix.h" #include "src/core/lib/iomgr/port.h" #include "src/core/lib/surface/completion_queue.h" +#include "src/core/util/crash.h" +#include "src/core/util/time.h" #include "test/core/test_util/test_config.h" #include "test/cpp/microbenchmarks/helpers.h" #include "test/cpp/util/test_config.h" diff --git a/test/cpp/microbenchmarks/bm_event_engine_run.cc b/test/cpp/microbenchmarks/bm_event_engine_run.cc index 8693024f955..5f70aea856f 100644 --- a/test/cpp/microbenchmarks/bm_event_engine_run.cc +++ b/test/cpp/microbenchmarks/bm_event_engine_run.cc @@ -29,8 +29,8 @@ #include "src/core/lib/event_engine/common_closures.h" #include "src/core/lib/event_engine/default_event_engine.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/notification.h" +#include "src/core/util/crash.h" +#include "src/core/util/notification.h" #include "test/core/test_util/test_config.h" #include "test/cpp/microbenchmarks/helpers.h" #include "test/cpp/util/test_config.h" diff --git a/test/cpp/microbenchmarks/bm_exec_ctx.cc b/test/cpp/microbenchmarks/bm_exec_ctx.cc index 3df871af00e..4a464856764 100644 --- a/test/cpp/microbenchmarks/bm_exec_ctx.cc +++ b/test/cpp/microbenchmarks/bm_exec_ctx.cc @@ -19,8 +19,8 @@ #include -#include "src/core/lib/gprpp/notification.h" #include "src/core/lib/iomgr/exec_ctx.h" +#include "src/core/util/notification.h" #include "test/core/test_util/test_config.h" #include "test/cpp/microbenchmarks/helpers.h" #include "test/cpp/util/test_config.h" diff --git a/test/cpp/microbenchmarks/bm_huffman_decode.cc b/test/cpp/microbenchmarks/bm_huffman_decode.cc index 1766f028269..59a684f1298 100644 --- a/test/cpp/microbenchmarks/bm_huffman_decode.cc +++ b/test/cpp/microbenchmarks/bm_huffman_decode.cc @@ -21,8 +21,8 @@ #include "src/core/ext/transport/chttp2/transport/bin_encoder.h" #include "src/core/ext/transport/chttp2/transport/decode_huff.h" -#include "src/core/lib/gprpp/no_destruct.h" #include "src/core/lib/slice/slice.h" +#include "src/core/util/no_destruct.h" #include "test/core/test_util/test_config.h" #include "test/cpp/microbenchmarks/huffman_geometries/index.h" diff --git a/test/cpp/microbenchmarks/bm_rng.cc b/test/cpp/microbenchmarks/bm_rng.cc index 8797ee633a6..bf84e39910e 100644 --- a/test/cpp/microbenchmarks/bm_rng.cc +++ b/test/cpp/microbenchmarks/bm_rng.cc @@ -22,7 +22,7 @@ #include "absl/random/random.h" -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/sync.h" static void BM_OneRngFromFreshBitSet(benchmark::State& state) { for (auto _ : state) { diff --git a/test/cpp/microbenchmarks/bm_thread_pool.cc b/test/cpp/microbenchmarks/bm_thread_pool.cc index 323c5267c56..620a7ce7d1c 100644 --- a/test/cpp/microbenchmarks/bm_thread_pool.cc +++ b/test/cpp/microbenchmarks/bm_thread_pool.cc @@ -27,8 +27,8 @@ #include "src/core/lib/event_engine/common_closures.h" #include "src/core/lib/event_engine/thread_pool/thread_pool.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/notification.h" +#include "src/core/util/crash.h" +#include "src/core/util/notification.h" #include "src/core/util/useful.h" #include "test/core/test_util/test_config.h" #include "test/cpp/microbenchmarks/helpers.h" diff --git a/test/cpp/microbenchmarks/fullstack_context_mutators.h b/test/cpp/microbenchmarks/fullstack_context_mutators.h index 29b668ddf30..f239052e80b 100644 --- a/test/cpp/microbenchmarks/fullstack_context_mutators.h +++ b/test/cpp/microbenchmarks/fullstack_context_mutators.h @@ -27,7 +27,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "test/cpp/microbenchmarks/helpers.h" namespace grpc { diff --git a/test/cpp/microbenchmarks/fullstack_fixtures.h b/test/cpp/microbenchmarks/fullstack_fixtures.h index dcfd227e53a..79e48ae646b 100644 --- a/test/cpp/microbenchmarks/fullstack_fixtures.h +++ b/test/cpp/microbenchmarks/fullstack_fixtures.h @@ -33,7 +33,6 @@ #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/endpoint_pair.h" #include "src/core/lib/iomgr/exec_ctx.h" @@ -42,6 +41,7 @@ #include "src/core/lib/surface/channel_create.h" #include "src/core/lib/surface/completion_queue.h" #include "src/core/server/server.h" +#include "src/core/util/crash.h" #include "src/cpp/client/create_channel_internal.h" #include "test/core/test_util/port.h" #include "test/core/test_util/test_config.h" diff --git a/test/cpp/naming/address_sorting_test.cc b/test/cpp/naming/address_sorting_test.cc index 563ce7d8a36..e1fa4111ed6 100644 --- a/test/cpp/naming/address_sorting_test.cc +++ b/test/cpp/naming/address_sorting_test.cc @@ -37,8 +37,6 @@ #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/config_vars.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/host_port.h" #include "src/core/lib/iomgr/combiner.h" #include "src/core/lib/iomgr/executor.h" #include "src/core/lib/iomgr/iomgr.h" @@ -47,6 +45,8 @@ #include "src/core/resolver/endpoint_addresses.h" #include "src/core/resolver/resolver.h" #include "src/core/resolver/resolver_registry.h" +#include "src/core/util/crash.h" +#include "src/core/util/host_port.h" #include "src/core/util/string.h" #include "test/core/test_util/port.h" #include "test/core/test_util/test_config.h" diff --git a/test/cpp/naming/cancel_ares_query_test.cc b/test/cpp/naming/cancel_ares_query_test.cc index 775dc1961ce..b77330ee595 100644 --- a/test/cpp/naming/cancel_ares_query_test.cc +++ b/test/cpp/naming/cancel_ares_query_test.cc @@ -40,11 +40,6 @@ #include "src/core/lib/event_engine/ares_resolver.h" #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/experiments/experiments.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/notification.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/thd.h" -#include "src/core/lib/gprpp/work_serializer.h" #include "src/core/lib/iomgr/iomgr.h" #include "src/core/lib/iomgr/pollset.h" #include "src/core/lib/iomgr/pollset_set.h" @@ -53,7 +48,12 @@ #include "src/core/resolver/resolver_registry.h" #include "src/core/telemetry/stats.h" #include "src/core/telemetry/stats_data.h" +#include "src/core/util/crash.h" +#include "src/core/util/notification.h" +#include "src/core/util/orphanable.h" #include "src/core/util/string.h" +#include "src/core/util/thd.h" +#include "src/core/util/work_serializer.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/test_util/cmdline.h" #include "test/core/test_util/fake_udp_and_tcp_server.h" diff --git a/test/cpp/naming/resolver_component_test.cc b/test/cpp/naming/resolver_component_test.cc index d42e5f7dda1..f5a4984e98c 100644 --- a/test/cpp/naming/resolver_component_test.cc +++ b/test/cpp/naming/resolver_component_test.cc @@ -48,10 +48,6 @@ #include "src/core/lib/event_engine/ares_resolver.h" #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/experiments/experiments.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/host_port.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/work_serializer.h" #include "src/core/lib/iomgr/executor.h" #include "src/core/lib/iomgr/iomgr.h" #include "src/core/lib/iomgr/resolve_address.h" @@ -61,7 +57,11 @@ #include "src/core/resolver/endpoint_addresses.h" #include "src/core/resolver/resolver.h" #include "src/core/resolver/resolver_registry.h" +#include "src/core/util/crash.h" +#include "src/core/util/host_port.h" +#include "src/core/util/orphanable.h" #include "src/core/util/string.h" +#include "src/core/util/work_serializer.h" #include "test/core/test_util/fake_udp_and_tcp_server.h" #include "test/core/test_util/port.h" #include "test/core/test_util/socket_use_after_close_detector.h" diff --git a/test/cpp/naming/resolver_component_tests_runner_invoker.cc b/test/cpp/naming/resolver_component_tests_runner_invoker.cc index 4fb67300c5c..26fe87fb600 100644 --- a/test/cpp/naming/resolver_component_tests_runner_invoker.cc +++ b/test/cpp/naming/resolver_component_tests_runner_invoker.cc @@ -35,13 +35,13 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #ifdef __FreeBSD__ #include #endif -#include "src/core/lib/gprpp/env.h" +#include "src/core/util/env.h" #include "test/core/test_util/port.h" #include "test/core/test_util/test_config.h" #include "test/cpp/util/subprocess.h" diff --git a/test/cpp/performance/writes_per_rpc_test.cc b/test/cpp/performance/writes_per_rpc_test.cc index 54a1d6faadf..d540c21a225 100644 --- a/test/cpp/performance/writes_per_rpc_test.cc +++ b/test/cpp/performance/writes_per_rpc_test.cc @@ -38,7 +38,6 @@ #include "src/core/lib/event_engine/channel_args_endpoint_config.h" #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/event_engine/tcp_socket_utils.h" -#include "src/core/lib/gprpp/notification.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/event_engine_shims/endpoint.h" #include "src/core/lib/iomgr/exec_ctx.h" @@ -46,6 +45,7 @@ #include "src/core/lib/surface/channel_create.h" #include "src/core/server/server.h" #include "src/core/telemetry/stats.h" +#include "src/core/util/notification.h" #include "src/cpp/client/create_channel_internal.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h" diff --git a/test/cpp/qps/benchmark_config.cc b/test/cpp/qps/benchmark_config.cc index 39cfbe6b18f..58b4f57be42 100644 --- a/test/cpp/qps/benchmark_config.cc +++ b/test/cpp/qps/benchmark_config.cc @@ -24,7 +24,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "test/cpp/util/test_credentials_provider.h" ABSL_FLAG(bool, enable_log_reporter, true, diff --git a/test/cpp/qps/client.h b/test/cpp/qps/client.h index 792d271242b..fe66465bbce 100644 --- a/test/cpp/qps/client.h +++ b/test/cpp/qps/client.h @@ -40,8 +40,8 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/env.h" +#include "src/core/util/crash.h" +#include "src/core/util/env.h" #include "src/proto/grpc/testing/benchmark_service.grpc.pb.h" #include "src/proto/grpc/testing/payloads.pb.h" #include "test/cpp/qps/histogram.h" diff --git a/test/cpp/qps/client_async.cc b/test/cpp/qps/client_async.cc index 11fd6b89e62..889d935f989 100644 --- a/test/cpp/qps/client_async.cc +++ b/test/cpp/qps/client_async.cc @@ -38,8 +38,8 @@ #include #include -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/surface/completion_queue.h" +#include "src/core/util/crash.h" #include "src/proto/grpc/testing/benchmark_service.grpc.pb.h" #include "test/cpp/qps/client.h" #include "test/cpp/qps/usage_timer.h" diff --git a/test/cpp/qps/client_callback.cc b/test/cpp/qps/client_callback.cc index 51cead4e3ea..29a35676aa4 100644 --- a/test/cpp/qps/client_callback.cc +++ b/test/cpp/qps/client_callback.cc @@ -34,7 +34,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "src/proto/grpc/testing/benchmark_service.grpc.pb.h" #include "test/cpp/qps/client.h" #include "test/cpp/qps/usage_timer.h" diff --git a/test/cpp/qps/client_sync.cc b/test/cpp/qps/client_sync.cc index eb1d8aeea72..23778475ac7 100644 --- a/test/cpp/qps/client_sync.cc +++ b/test/cpp/qps/client_sync.cc @@ -35,7 +35,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "src/proto/grpc/testing/benchmark_service.grpc.pb.h" #include "test/cpp/qps/client.h" #include "test/cpp/qps/interarrival.h" diff --git a/test/cpp/qps/driver.cc b/test/cpp/qps/driver.cc index d7d6c5baf5c..3f015de1236 100644 --- a/test/cpp/qps/driver.cc +++ b/test/cpp/qps/driver.cc @@ -35,9 +35,9 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/env.h" -#include "src/core/lib/gprpp/host_port.h" +#include "src/core/util/crash.h" +#include "src/core/util/env.h" +#include "src/core/util/host_port.h" #include "src/proto/grpc/testing/worker_service.grpc.pb.h" #include "test/core/test_util/port.h" #include "test/core/test_util/test_config.h" diff --git a/test/cpp/qps/inproc_sync_unary_ping_pong_test.cc b/test/cpp/qps/inproc_sync_unary_ping_pong_test.cc index e876e50cf78..57e826a5dff 100644 --- a/test/cpp/qps/inproc_sync_unary_ping_pong_test.cc +++ b/test/cpp/qps/inproc_sync_unary_ping_pong_test.cc @@ -20,7 +20,7 @@ #include "absl/log/log.h" -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "test/core/test_util/test_config.h" #include "test/cpp/qps/benchmark_config.h" #include "test/cpp/qps/driver.h" diff --git a/test/cpp/qps/json_run_localhost.cc b/test/cpp/qps/json_run_localhost.cc index 8bc842328c9..59d46414bca 100644 --- a/test/cpp/qps/json_run_localhost.cc +++ b/test/cpp/qps/json_run_localhost.cc @@ -31,8 +31,8 @@ #include "absl/log/check.h" #include "absl/log/log.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/env.h" +#include "src/core/util/crash.h" +#include "src/core/util/env.h" #include "test/core/test_util/port.h" #include "test/cpp/util/subprocess.h" diff --git a/test/cpp/qps/parse_json.cc b/test/cpp/qps/parse_json.cc index e283c8eae7d..0b6af9f962d 100644 --- a/test/cpp/qps/parse_json.cc +++ b/test/cpp/qps/parse_json.cc @@ -24,7 +24,7 @@ #include "absl/log/log.h" #include "absl/strings/str_format.h" -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" namespace grpc { namespace testing { diff --git a/test/cpp/qps/qps_json_driver.cc b/test/cpp/qps/qps_json_driver.cc index 50734258b50..c11e9f2bd81 100644 --- a/test/cpp/qps/qps_json_driver.cc +++ b/test/cpp/qps/qps_json_driver.cc @@ -27,7 +27,7 @@ #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "test/core/test_util/test_config.h" #include "test/cpp/qps/benchmark_config.h" #include "test/cpp/qps/driver.h" diff --git a/test/cpp/qps/qps_openloop_test.cc b/test/cpp/qps/qps_openloop_test.cc index 21c83418427..92db5ef53c4 100644 --- a/test/cpp/qps/qps_openloop_test.cc +++ b/test/cpp/qps/qps_openloop_test.cc @@ -20,7 +20,7 @@ #include "absl/log/log.h" -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "test/core/test_util/test_config.h" #include "test/cpp/qps/benchmark_config.h" #include "test/cpp/qps/driver.h" diff --git a/test/cpp/qps/qps_worker.cc b/test/cpp/qps/qps_worker.cc index f2b444fc9c8..4f396456c51 100644 --- a/test/cpp/qps/qps_worker.cc +++ b/test/cpp/qps/qps_worker.cc @@ -37,8 +37,8 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/host_port.h" +#include "src/core/util/crash.h" +#include "src/core/util/host_port.h" #include "src/proto/grpc/testing/worker_service.grpc.pb.h" #include "test/core/test_util/grpc_profiler.h" #include "test/core/test_util/histogram.h" diff --git a/test/cpp/qps/report.cc b/test/cpp/qps/report.cc index fa43276cf86..e0b0cd646b2 100644 --- a/test/cpp/qps/report.cc +++ b/test/cpp/qps/report.cc @@ -24,7 +24,7 @@ #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "src/proto/grpc/testing/report_qps_scenario_service.grpc.pb.h" #include "test/cpp/qps/driver.h" #include "test/cpp/qps/parse_json.h" diff --git a/test/cpp/qps/secure_sync_unary_ping_pong_test.cc b/test/cpp/qps/secure_sync_unary_ping_pong_test.cc index 6829f0dcd29..d64d40c8e8a 100644 --- a/test/cpp/qps/secure_sync_unary_ping_pong_test.cc +++ b/test/cpp/qps/secure_sync_unary_ping_pong_test.cc @@ -20,7 +20,7 @@ #include "absl/log/log.h" -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "test/core/test_util/test_config.h" #include "test/cpp/qps/benchmark_config.h" #include "test/cpp/qps/driver.h" diff --git a/test/cpp/qps/server.h b/test/cpp/qps/server.h index 2413d2d566d..98d0ee1dd6d 100644 --- a/test/cpp/qps/server.h +++ b/test/cpp/qps/server.h @@ -29,7 +29,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "src/proto/grpc/testing/control.pb.h" #include "src/proto/grpc/testing/messages.pb.h" #include "test/core/end2end/data/ssl_test_data.h" diff --git a/test/cpp/qps/server_async.cc b/test/cpp/qps/server_async.cc index 4d2017dd23e..f091c11d69b 100644 --- a/test/cpp/qps/server_async.cc +++ b/test/cpp/qps/server_async.cc @@ -35,9 +35,9 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/host_port.h" #include "src/core/lib/surface/completion_queue.h" +#include "src/core/util/crash.h" +#include "src/core/util/host_port.h" #include "src/proto/grpc/testing/benchmark_service.grpc.pb.h" #include "test/core/test_util/test_config.h" #include "test/cpp/qps/qps_server_builder.h" diff --git a/test/cpp/qps/server_callback.cc b/test/cpp/qps/server_callback.cc index c198b3d86b0..07c65226872 100644 --- a/test/cpp/qps/server_callback.cc +++ b/test/cpp/qps/server_callback.cc @@ -24,7 +24,7 @@ #include #include -#include "src/core/lib/gprpp/host_port.h" +#include "src/core/util/host_port.h" #include "src/proto/grpc/testing/benchmark_service.grpc.pb.h" #include "test/cpp/qps/qps_server_builder.h" #include "test/cpp/qps/server.h" diff --git a/test/cpp/qps/server_sync.cc b/test/cpp/qps/server_sync.cc index 59a688d9b3e..fe9f8274f52 100644 --- a/test/cpp/qps/server_sync.cc +++ b/test/cpp/qps/server_sync.cc @@ -27,7 +27,7 @@ #include #include -#include "src/core/lib/gprpp/host_port.h" +#include "src/core/util/host_port.h" #include "src/proto/grpc/testing/benchmark_service.grpc.pb.h" #include "test/cpp/qps/qps_server_builder.h" #include "test/cpp/qps/server.h" diff --git a/test/cpp/qps/usage_timer.cc b/test/cpp/qps/usage_timer.cc index 0f717141d25..9bea4846a4f 100644 --- a/test/cpp/qps/usage_timer.cc +++ b/test/cpp/qps/usage_timer.cc @@ -26,7 +26,7 @@ #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #ifdef __linux__ #include #include diff --git a/test/cpp/server/server_builder_test.cc b/test/cpp/server/server_builder_test.cc index 089f7c38ecf..73e02cedbde 100644 --- a/test/cpp/server/server_builder_test.cc +++ b/test/cpp/server/server_builder_test.cc @@ -26,7 +26,7 @@ #include #include -#include "src/core/lib/gprpp/notification.h" +#include "src/core/util/notification.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/core/event_engine/event_engine_test_utils.h" #include "test/core/test_util/port.h" diff --git a/test/cpp/server/server_request_call_test.cc b/test/cpp/server/server_request_call_test.cc index 96bbf15400a..bf781e3e2bf 100644 --- a/test/cpp/server/server_request_call_test.cc +++ b/test/cpp/server/server_request_call_test.cc @@ -29,7 +29,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/core/test_util/port.h" #include "test/core/test_util/test_config.h" diff --git a/test/cpp/thread_manager/thread_manager_test.cc b/test/cpp/thread_manager/thread_manager_test.cc index 6c7eb3a3f34..751ab3977c6 100644 --- a/test/cpp/thread_manager/thread_manager_test.cc +++ b/test/cpp/thread_manager/thread_manager_test.cc @@ -31,7 +31,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "test/core/test_util/test_config.h" namespace grpc { diff --git a/test/cpp/util/channel_trace_proto_helper.cc b/test/cpp/util/channel_trace_proto_helper.cc index e92f496e62a..0c11284c81a 100644 --- a/test/cpp/util/channel_trace_proto_helper.cc +++ b/test/cpp/util/channel_trace_proto_helper.cc @@ -25,8 +25,8 @@ #include #include -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/iomgr/error.h" +#include "src/core/util/crash.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_reader.h" #include "src/core/util/json/json_writer.h" diff --git a/test/cpp/util/channelz_sampler_test.cc b/test/cpp/util/channelz_sampler_test.cc index fde2a019f97..5c5f1118d60 100644 --- a/test/cpp/util/channelz_sampler_test.cc +++ b/test/cpp/util/channelz_sampler_test.cc @@ -43,7 +43,7 @@ #include #include -#include "src/core/lib/gprpp/env.h" +#include "src/core/util/env.h" #include "src/cpp/server/channelz/channelz_service.h" #include "src/proto/grpc/testing/test.grpc.pb.h" #include "test/core/test_util/port.h" diff --git a/test/cpp/util/cli_call.cc b/test/cpp/util/cli_call.cc index 3cae389d898..9f7df96bf8e 100644 --- a/test/cpp/util/cli_call.cc +++ b/test/cpp/util/cli_call.cc @@ -30,7 +30,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" namespace grpc { namespace testing { diff --git a/test/cpp/util/cli_credentials.cc b/test/cpp/util/cli_credentials.cc index d0c355a09cc..61e90282ae0 100644 --- a/test/cpp/util/cli_credentials.cc +++ b/test/cpp/util/cli_credentials.cc @@ -24,8 +24,8 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/load_file.h" +#include "src/core/util/crash.h" +#include "src/core/util/load_file.h" ABSL_RETIRED_FLAG(bool, enable_ssl, false, "Replaced by --channel_creds_type=ssl."); diff --git a/test/cpp/util/create_test_channel.cc b/test/cpp/util/create_test_channel.cc index a355c15ce20..73d92b20ae4 100644 --- a/test/cpp/util/create_test_channel.cc +++ b/test/cpp/util/create_test_channel.cc @@ -24,7 +24,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "test/cpp/util/test_credentials_provider.h" ABSL_FLAG(std::string, grpc_test_use_grpclb_with_child_policy, "", diff --git a/test/cpp/util/get_grpc_test_runfile_dir.cc b/test/cpp/util/get_grpc_test_runfile_dir.cc index 4e0ce11ca5a..68107d63685 100644 --- a/test/cpp/util/get_grpc_test_runfile_dir.cc +++ b/test/cpp/util/get_grpc_test_runfile_dir.cc @@ -14,7 +14,7 @@ #include "test/cpp/util/get_grpc_test_runfile_dir.h" -#include "src/core/lib/gprpp/env.h" +#include "src/core/util/env.h" namespace grpc { diff --git a/test/cpp/util/grpc_tool_test.cc b/test/cpp/util/grpc_tool_test.cc index c6a513bbd38..6d3b6d528da 100644 --- a/test/cpp/util/grpc_tool_test.cc +++ b/test/cpp/util/grpc_tool_test.cc @@ -38,7 +38,7 @@ #include #include -#include "src/core/lib/gprpp/env.h" +#include "src/core/util/env.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "src/proto/grpc/testing/echo.pb.h" #include "test/core/test_util/port.h" diff --git a/test/cpp/util/metrics_server.cc b/test/cpp/util/metrics_server.cc index 57a3abf3ea7..28dc7e670be 100644 --- a/test/cpp/util/metrics_server.cc +++ b/test/cpp/util/metrics_server.cc @@ -23,7 +23,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "src/proto/grpc/testing/metrics.grpc.pb.h" #include "src/proto/grpc/testing/metrics.pb.h" diff --git a/test/cpp/util/proto_reflection_descriptor_database.cc b/test/cpp/util/proto_reflection_descriptor_database.cc index b5441f87596..ac0113fd509 100644 --- a/test/cpp/util/proto_reflection_descriptor_database.cc +++ b/test/cpp/util/proto_reflection_descriptor_database.cc @@ -22,7 +22,7 @@ #include "absl/log/log.h" -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" using grpc::reflection::v1alpha::ErrorResponse; using grpc::reflection::v1alpha::ListServiceResponse; diff --git a/test/cpp/util/test_credentials_provider.cc b/test/cpp/util/test_credentials_provider.cc index 0198a3f14ff..b4d3e116cd3 100644 --- a/test/cpp/util/test_credentials_provider.cc +++ b/test/cpp/util/test_credentials_provider.cc @@ -32,7 +32,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "test/core/end2end/data/ssl_test_data.h" ABSL_FLAG(std::string, tls_cert_file, "", diff --git a/test/cpp/util/tls_test_utils.cc b/test/cpp/util/tls_test_utils.cc index 15c9b6211ed..45d1e5c7f88 100644 --- a/test/cpp/util/tls_test_utils.cc +++ b/test/cpp/util/tls_test_utils.cc @@ -18,7 +18,7 @@ #include -#include "src/core/lib/gprpp/thd.h" +#include "src/core/util/thd.h" #include "test/core/test_util/port.h" #include "test/core/test_util/test_config.h" diff --git a/test/cpp/util/tls_test_utils.h b/test/cpp/util/tls_test_utils.h index 6f7d84acaa9..9b4e69bcd80 100644 --- a/test/cpp/util/tls_test_utils.h +++ b/test/cpp/util/tls_test_utils.h @@ -23,7 +23,7 @@ #include #include -#include "src/core/lib/gprpp/thd.h" +#include "src/core/util/thd.h" namespace grpc { namespace testing { diff --git a/test/cpp/util/windows/manifest_file.cc b/test/cpp/util/windows/manifest_file.cc index a1f377032fd..85ac3d7eb37 100644 --- a/test/cpp/util/windows/manifest_file.cc +++ b/test/cpp/util/windows/manifest_file.cc @@ -29,7 +29,7 @@ #include "absl/strings/str_replace.h" #include "absl/strings/str_split.h" -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" namespace grpc { namespace testing { diff --git a/tools/codegen/core/gen_grpc_tls_credentials_options.py b/tools/codegen/core/gen_grpc_tls_credentials_options.py index 20350765fda..24a153e9c9a 100755 --- a/tools/codegen/core/gen_grpc_tls_credentials_options.py +++ b/tools/codegen/core/gen_grpc_tls_credentials_options.py @@ -308,7 +308,7 @@ print( #include #include -#include "src/core/lib/gprpp/ref_counted.h" +#include "src/core/util/ref_counted.h" #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.h" #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h" #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_verifier.h" diff --git a/tools/codegen/core/gen_huffman_decompressor.cc b/tools/codegen/core/gen_huffman_decompressor.cc index 9ffc1744aa0..2e760cc9e02 100644 --- a/tools/codegen/core/gen_huffman_decompressor.cc +++ b/tools/codegen/core/gen_huffman_decompressor.cc @@ -38,8 +38,8 @@ #include "absl/types/variant.h" #include "src/core/ext/transport/chttp2/transport/huffsyms.h" -#include "src/core/lib/gprpp/env.h" -#include "src/core/lib/gprpp/match.h" +#include "src/core/util/env.h" +#include "src/core/util/match.h" /////////////////////////////////////////////////////////////////////////////// // SHA256 hash handling diff --git a/tools/codegen/core/gen_if_list.py b/tools/codegen/core/gen_if_list.py index 0411ef3ef88..ecd131d5a6b 100755 --- a/tools/codegen/core/gen_if_list.py +++ b/tools/codegen/core/gen_if_list.py @@ -25,7 +25,7 @@ def put_banner(files, banner): print("", file=f) -with open("src/core/lib/gprpp/if_list.h", "w") as H: +with open("src/core/util/if_list.h", "w") as H: # copy-paste copyright notice from this file with open(sys.argv[0]) as my_source: copyright = [] @@ -44,8 +44,8 @@ with open("src/core/lib/gprpp/if_list.h", "w") as H: put_banner([H], ["", "Automatically generated by %s" % sys.argv[0], ""]) - print("#ifndef GRPC_CORE_LIB_GPRPP_IF_LIST_H", file=H) - print("#define GRPC_CORE_LIB_GPRPP_IF_LIST_H", file=H) + print("#ifndef GRPC_CORE_UTIL_IF_LIST_H", file=H) + print("#define GRPC_CORE_UTIL_IF_LIST_H", file=H) print("", file=H) print("#include ", file=H) print("", file=H) @@ -78,4 +78,4 @@ with open("src/core/lib/gprpp/if_list.h", "w") as H: print("", file=H) print("}", file=H) print("", file=H) - print("#endif // GRPC_CORE_LIB_GPRPP_IF_LIST_H", file=H) + print("#endif // GRPC_CORE_UTIL_IF_LIST_H", file=H) diff --git a/tools/codegen/core/gen_join.py b/tools/codegen/core/gen_join.py index cd90390ae3c..4f53a982d41 100755 --- a/tools/codegen/core/gen_join.py +++ b/tools/codegen/core/gen_join.py @@ -104,10 +104,10 @@ front_matter = """ #include "absl/log/log.h" #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/construct_destruct.h" +#include "src/core/util/construct_destruct.h" #include "src/core/lib/promise/detail/promise_like.h" #include "src/core/lib/promise/poll.h" -#include "src/core/lib/gprpp/bitset.h" +#include "src/core/util/bitset.h" #include #include #include diff --git a/tools/codegen/core/gen_seq.py b/tools/codegen/core/gen_seq.py index a33072270f3..1b735c1eba1 100755 --- a/tools/codegen/core/gen_seq.py +++ b/tools/codegen/core/gen_seq.py @@ -191,8 +191,8 @@ front_matter = """ #include "absl/strings/str_cat.h" #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/construct_destruct.h" -#include "src/core/lib/gprpp/debug_location.h" +#include "src/core/util/construct_destruct.h" +#include "src/core/util/debug_location.h" #include "src/core/lib/promise/detail/promise_factory.h" #include "src/core/lib/promise/detail/promise_like.h" #include "src/core/lib/promise/poll.h" diff --git a/tools/codegen/core/gen_stats_data.py b/tools/codegen/core/gen_stats_data.py index 44fdcb00abc..64764473c76 100755 --- a/tools/codegen/core/gen_stats_data.py +++ b/tools/codegen/core/gen_stats_data.py @@ -289,7 +289,7 @@ with open("src/core/telemetry/stats_data.h", "w") as H: print("#include ", file=H) print('#include "src/core/telemetry/histogram_view.h"', file=H) print('#include "absl/strings/string_view.h"', file=H) - print('#include "src/core/lib/gprpp/per_cpu.h"', file=H) + print('#include "src/core/util/per_cpu.h"', file=H) print(file=H) print("namespace grpc_core {", file=H) diff --git a/tools/codegen/core/templates/trace_flags.cc.mako b/tools/codegen/core/templates/trace_flags.cc.mako index 401f5feed0c..417921351ee 100644 --- a/tools/codegen/core/templates/trace_flags.cc.mako +++ b/tools/codegen/core/templates/trace_flags.cc.mako @@ -19,7 +19,7 @@ #include "${absl_prefix}absl/container/flat_hash_map.h" #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/no_destruct.h" +#include "src/core/util/no_destruct.h" namespace grpc_core { diff --git a/tools/distrib/check_namespace_qualification.py b/tools/distrib/check_namespace_qualification.py index f08f73c66fc..be12f113fda 100755 --- a/tools/distrib/check_namespace_qualification.py +++ b/tools/distrib/check_namespace_qualification.py @@ -74,10 +74,9 @@ IGNORED_FILES = [ # users would be better off using unique namespaces. "src/compiler/cpp_generator.cc", # multi-line #define statements are not handled - "src/core/lib/gprpp/global_config_env.h", "src/core/lib/profiling/timers.h", - "src/core/lib/gprpp/crash.h", - "src/core/lib/gprpp/unique_type_name.h", + "src/core/util/crash.h", + "src/core/util/unique_type_name.h", # The grpc_core::Server redundant namespace qualification is required for # older gcc versions. "src/core/ext/transport/chttp2/server/chttp2_server.h", diff --git a/tools/distrib/fix_build_deps.py b/tools/distrib/fix_build_deps.py index 79bd9bbbe86..01d0704c7e4 100755 --- a/tools/distrib/fix_build_deps.py +++ b/tools/distrib/fix_build_deps.py @@ -399,13 +399,13 @@ for dirname in [ "src/cpp/ext/gcp", "src/cpp/ext/csm", "src/cpp/ext/otel", - "test/core/backoff", + "test/core/util", "test/core/call", "test/core/call/yodel", "test/core/client_channel", "test/core/experiments", "test/core/load_balancing", - "test/core/uri", + "test/core/util", "test/core/test_util", "test/core/end2end", "test/core/event_engine", diff --git a/tools/doxygen/Doxyfile.c++.internal b/tools/doxygen/Doxyfile.c++.internal index 0332a7ddb15..420e439352b 100644 --- a/tools/doxygen/Doxyfile.c++.internal +++ b/tools/doxygen/Doxyfile.c++.internal @@ -2104,11 +2104,6 @@ src/core/lib/address_utils/parse_address.cc \ src/core/lib/address_utils/parse_address.h \ src/core/lib/address_utils/sockaddr_utils.cc \ src/core/lib/address_utils/sockaddr_utils.h \ -src/core/lib/avl/avl.h \ -src/core/lib/backoff/backoff.cc \ -src/core/lib/backoff/backoff.h \ -src/core/lib/backoff/random_early_detection.cc \ -src/core/lib/backoff/random_early_detection.h \ src/core/lib/channel/call_finalization.h \ src/core/lib/channel/channel_args.cc \ src/core/lib/channel/channel_args.h \ @@ -2139,8 +2134,6 @@ src/core/lib/config/core_configuration.cc \ src/core/lib/config/core_configuration.h \ src/core/lib/config/load_config.cc \ src/core/lib/config/load_config.h \ -src/core/lib/debug/event_log.cc \ -src/core/lib/debug/event_log.h \ src/core/lib/debug/trace.cc \ src/core/lib/debug/trace.h \ src/core/lib/debug/trace_flags.cc \ @@ -2261,83 +2254,6 @@ src/core/lib/experiments/config.cc \ src/core/lib/experiments/config.h \ src/core/lib/experiments/experiments.cc \ src/core/lib/experiments/experiments.h \ -src/core/lib/gprpp/atomic_utils.h \ -src/core/lib/gprpp/bitset.h \ -src/core/lib/gprpp/chunked_vector.h \ -src/core/lib/gprpp/construct_destruct.h \ -src/core/lib/gprpp/cpp_impl_of.h \ -src/core/lib/gprpp/crash.cc \ -src/core/lib/gprpp/crash.h \ -src/core/lib/gprpp/debug_location.h \ -src/core/lib/gprpp/directory_reader.h \ -src/core/lib/gprpp/down_cast.h \ -src/core/lib/gprpp/dual_ref_counted.h \ -src/core/lib/gprpp/dump_args.cc \ -src/core/lib/gprpp/dump_args.h \ -src/core/lib/gprpp/env.h \ -src/core/lib/gprpp/examine_stack.cc \ -src/core/lib/gprpp/examine_stack.h \ -src/core/lib/gprpp/fork.cc \ -src/core/lib/gprpp/fork.h \ -src/core/lib/gprpp/glob.cc \ -src/core/lib/gprpp/glob.h \ -src/core/lib/gprpp/host_port.cc \ -src/core/lib/gprpp/host_port.h \ -src/core/lib/gprpp/if_list.h \ -src/core/lib/gprpp/linux/env.cc \ -src/core/lib/gprpp/load_file.cc \ -src/core/lib/gprpp/load_file.h \ -src/core/lib/gprpp/manual_constructor.h \ -src/core/lib/gprpp/match.h \ -src/core/lib/gprpp/memory.h \ -src/core/lib/gprpp/mpscq.cc \ -src/core/lib/gprpp/mpscq.h \ -src/core/lib/gprpp/no_destruct.h \ -src/core/lib/gprpp/notification.h \ -src/core/lib/gprpp/orphanable.h \ -src/core/lib/gprpp/overload.h \ -src/core/lib/gprpp/packed_table.h \ -src/core/lib/gprpp/per_cpu.cc \ -src/core/lib/gprpp/per_cpu.h \ -src/core/lib/gprpp/posix/directory_reader.cc \ -src/core/lib/gprpp/posix/env.cc \ -src/core/lib/gprpp/posix/stat.cc \ -src/core/lib/gprpp/posix/thd.cc \ -src/core/lib/gprpp/ref_counted.h \ -src/core/lib/gprpp/ref_counted_ptr.h \ -src/core/lib/gprpp/ref_counted_string.cc \ -src/core/lib/gprpp/ref_counted_string.h \ -src/core/lib/gprpp/single_set_ptr.h \ -src/core/lib/gprpp/sorted_pack.h \ -src/core/lib/gprpp/stat.h \ -src/core/lib/gprpp/status_helper.cc \ -src/core/lib/gprpp/status_helper.h \ -src/core/lib/gprpp/strerror.cc \ -src/core/lib/gprpp/strerror.h \ -src/core/lib/gprpp/sync.h \ -src/core/lib/gprpp/table.h \ -src/core/lib/gprpp/tchar.cc \ -src/core/lib/gprpp/tchar.h \ -src/core/lib/gprpp/thd.h \ -src/core/lib/gprpp/time.cc \ -src/core/lib/gprpp/time.h \ -src/core/lib/gprpp/time_averaged_stats.cc \ -src/core/lib/gprpp/time_averaged_stats.h \ -src/core/lib/gprpp/time_util.cc \ -src/core/lib/gprpp/time_util.h \ -src/core/lib/gprpp/type_list.h \ -src/core/lib/gprpp/unique_type_name.h \ -src/core/lib/gprpp/uuid_v4.cc \ -src/core/lib/gprpp/uuid_v4.h \ -src/core/lib/gprpp/validation_errors.cc \ -src/core/lib/gprpp/validation_errors.h \ -src/core/lib/gprpp/windows/directory_reader.cc \ -src/core/lib/gprpp/windows/env.cc \ -src/core/lib/gprpp/windows/stat.cc \ -src/core/lib/gprpp/windows/thd.cc \ -src/core/lib/gprpp/work_serializer.cc \ -src/core/lib/gprpp/work_serializer.h \ -src/core/lib/gprpp/xxhash_inline.h \ src/core/lib/iomgr/block_annotate.h \ src/core/lib/iomgr/buffer_list.cc \ src/core/lib/iomgr/buffer_list.h \ @@ -2382,13 +2298,6 @@ src/core/lib/iomgr/executor.cc \ src/core/lib/iomgr/executor.h \ src/core/lib/iomgr/fork_posix.cc \ src/core/lib/iomgr/fork_windows.cc \ -src/core/lib/iomgr/gethostname.h \ -src/core/lib/iomgr/gethostname_fallback.cc \ -src/core/lib/iomgr/gethostname_host_name_max.cc \ -src/core/lib/iomgr/gethostname_sysconf.cc \ -src/core/lib/iomgr/grpc_if_nametoindex.h \ -src/core/lib/iomgr/grpc_if_nametoindex_posix.cc \ -src/core/lib/iomgr/grpc_if_nametoindex_unsupported.cc \ src/core/lib/iomgr/internal_errqueue.cc \ src/core/lib/iomgr/internal_errqueue.h \ src/core/lib/iomgr/iocp_windows.cc \ @@ -2479,8 +2388,6 @@ src/core/lib/iomgr/wakeup_fd_pipe.cc \ src/core/lib/iomgr/wakeup_fd_pipe.h \ src/core/lib/iomgr/wakeup_fd_posix.cc \ src/core/lib/iomgr/wakeup_fd_posix.h \ -src/core/lib/matchers/matchers.cc \ -src/core/lib/matchers/matchers.h \ src/core/lib/promise/activity.cc \ src/core/lib/promise/activity.h \ src/core/lib/promise/all_ok.h \ @@ -2741,8 +2648,6 @@ src/core/lib/transport/transport.cc \ src/core/lib/transport/transport.h \ src/core/lib/transport/transport_fwd.h \ src/core/lib/transport/transport_op_string.cc \ -src/core/lib/uri/uri_parser.cc \ -src/core/lib/uri/uri_parser.h \ src/core/load_balancing/address_filtering.cc \ src/core/load_balancing/address_filtering.h \ src/core/load_balancing/backend_metric_data.h \ @@ -2927,8 +2832,43 @@ src/core/tsi/transport_security_interface.h \ src/core/util/alloc.cc \ src/core/util/alloc.h \ src/core/util/atm.cc \ +src/core/util/atomic_utils.h \ +src/core/util/avl.h \ +src/core/util/backoff.cc \ +src/core/util/backoff.h \ +src/core/util/bitset.h \ +src/core/util/chunked_vector.h \ +src/core/util/construct_destruct.h \ +src/core/util/cpp_impl_of.h \ +src/core/util/crash.cc \ +src/core/util/crash.h \ +src/core/util/debug_location.h \ +src/core/util/directory_reader.h \ +src/core/util/down_cast.h \ +src/core/util/dual_ref_counted.h \ +src/core/util/dump_args.cc \ +src/core/util/dump_args.h \ +src/core/util/env.h \ +src/core/util/event_log.cc \ +src/core/util/event_log.h \ +src/core/util/examine_stack.cc \ +src/core/util/examine_stack.h \ +src/core/util/fork.cc \ +src/core/util/fork.h \ src/core/util/gcp_metadata_query.cc \ src/core/util/gcp_metadata_query.h \ +src/core/util/gethostname.h \ +src/core/util/gethostname_fallback.cc \ +src/core/util/gethostname_host_name_max.cc \ +src/core/util/gethostname_sysconf.cc \ +src/core/util/glob.cc \ +src/core/util/glob.h \ +src/core/util/gpr_time.cc \ +src/core/util/grpc_if_nametoindex.h \ +src/core/util/grpc_if_nametoindex_posix.cc \ +src/core/util/grpc_if_nametoindex_unsupported.cc \ +src/core/util/host_port.cc \ +src/core/util/host_port.h \ src/core/util/http_client/format_request.cc \ src/core/util/http_client/format_request.h \ src/core/util/http_client/httpcli.cc \ @@ -2937,6 +2877,7 @@ src/core/util/http_client/httpcli_security_connector.cc \ src/core/util/http_client/httpcli_ssl_credentials.h \ src/core/util/http_client/parser.cc \ src/core/util/http_client/parser.h \ +src/core/util/if_list.h \ src/core/util/iphone/cpu.cc \ src/core/util/json/json.h \ src/core/util/json/json_args.h \ @@ -2952,33 +2893,92 @@ src/core/util/json/json_writer.h \ src/core/util/latent_see.cc \ src/core/util/latent_see.h \ src/core/util/linux/cpu.cc \ +src/core/util/linux/env.cc \ +src/core/util/load_file.cc \ +src/core/util/load_file.h \ src/core/util/log.cc \ src/core/util/lru_cache.h \ +src/core/util/manual_constructor.h \ +src/core/util/match.h \ +src/core/util/matchers.cc \ +src/core/util/matchers.h \ +src/core/util/memory.h \ +src/core/util/mpscq.cc \ +src/core/util/mpscq.h \ src/core/util/msys/tmpfile.cc \ +src/core/util/no_destruct.h \ +src/core/util/notification.h \ +src/core/util/orphanable.h \ +src/core/util/overload.h \ +src/core/util/packed_table.h \ +src/core/util/per_cpu.cc \ +src/core/util/per_cpu.h \ src/core/util/posix/cpu.cc \ +src/core/util/posix/directory_reader.cc \ +src/core/util/posix/env.cc \ +src/core/util/posix/stat.cc \ src/core/util/posix/string.cc \ src/core/util/posix/sync.cc \ +src/core/util/posix/thd.cc \ src/core/util/posix/time.cc \ src/core/util/posix/tmpfile.cc \ +src/core/util/random_early_detection.cc \ +src/core/util/random_early_detection.h \ +src/core/util/ref_counted.h \ +src/core/util/ref_counted_ptr.h \ +src/core/util/ref_counted_string.cc \ +src/core/util/ref_counted_string.h \ src/core/util/ring_buffer.h \ +src/core/util/single_set_ptr.h \ +src/core/util/sorted_pack.h \ src/core/util/spinlock.h \ +src/core/util/stat.h \ +src/core/util/status_helper.cc \ +src/core/util/status_helper.h \ +src/core/util/strerror.cc \ +src/core/util/strerror.h \ src/core/util/string.cc \ src/core/util/string.h \ src/core/util/sync.cc \ +src/core/util/sync.h \ src/core/util/sync_abseil.cc \ +src/core/util/table.h \ +src/core/util/tchar.cc \ +src/core/util/tchar.h \ +src/core/util/thd.h \ src/core/util/time.cc \ +src/core/util/time.h \ +src/core/util/time_averaged_stats.cc \ +src/core/util/time_averaged_stats.h \ src/core/util/time_precise.cc \ src/core/util/time_precise.h \ +src/core/util/time_util.cc \ +src/core/util/time_util.h \ src/core/util/tmpfile.h \ +src/core/util/type_list.h \ src/core/util/unique_ptr_with_bitset.h \ +src/core/util/unique_type_name.h \ src/core/util/upb_utils.h \ +src/core/util/uri.cc \ +src/core/util/uri.h \ src/core/util/useful.h \ +src/core/util/uuid_v4.cc \ +src/core/util/uuid_v4.h \ +src/core/util/validation_errors.cc \ +src/core/util/validation_errors.h \ src/core/util/windows/cpu.cc \ +src/core/util/windows/directory_reader.cc \ +src/core/util/windows/env.cc \ +src/core/util/windows/stat.cc \ src/core/util/windows/string.cc \ src/core/util/windows/string_util.cc \ src/core/util/windows/sync.cc \ +src/core/util/windows/thd.cc \ src/core/util/windows/time.cc \ src/core/util/windows/tmpfile.cc \ +src/core/util/work_serializer.cc \ +src/core/util/work_serializer.h \ +src/core/util/xxhash_inline.h \ src/core/xds/grpc/certificate_provider_store.cc \ src/core/xds/grpc/certificate_provider_store.h \ src/core/xds/grpc/file_watcher_certificate_provider_factory.cc \ diff --git a/tools/doxygen/Doxyfile.core.internal b/tools/doxygen/Doxyfile.core.internal index 380ede52170..095a8988889 100644 --- a/tools/doxygen/Doxyfile.core.internal +++ b/tools/doxygen/Doxyfile.core.internal @@ -1872,11 +1872,6 @@ src/core/lib/address_utils/parse_address.cc \ src/core/lib/address_utils/parse_address.h \ src/core/lib/address_utils/sockaddr_utils.cc \ src/core/lib/address_utils/sockaddr_utils.h \ -src/core/lib/avl/avl.h \ -src/core/lib/backoff/backoff.cc \ -src/core/lib/backoff/backoff.h \ -src/core/lib/backoff/random_early_detection.cc \ -src/core/lib/backoff/random_early_detection.h \ src/core/lib/channel/README.md \ src/core/lib/channel/call_finalization.h \ src/core/lib/channel/channel_args.cc \ @@ -1908,8 +1903,6 @@ src/core/lib/config/core_configuration.cc \ src/core/lib/config/core_configuration.h \ src/core/lib/config/load_config.cc \ src/core/lib/config/load_config.h \ -src/core/lib/debug/event_log.cc \ -src/core/lib/debug/event_log.h \ src/core/lib/debug/trace.cc \ src/core/lib/debug/trace.h \ src/core/lib/debug/trace_flags.cc \ @@ -2030,84 +2023,6 @@ src/core/lib/experiments/config.cc \ src/core/lib/experiments/config.h \ src/core/lib/experiments/experiments.cc \ src/core/lib/experiments/experiments.h \ -src/core/lib/gprpp/README.md \ -src/core/lib/gprpp/atomic_utils.h \ -src/core/lib/gprpp/bitset.h \ -src/core/lib/gprpp/chunked_vector.h \ -src/core/lib/gprpp/construct_destruct.h \ -src/core/lib/gprpp/cpp_impl_of.h \ -src/core/lib/gprpp/crash.cc \ -src/core/lib/gprpp/crash.h \ -src/core/lib/gprpp/debug_location.h \ -src/core/lib/gprpp/directory_reader.h \ -src/core/lib/gprpp/down_cast.h \ -src/core/lib/gprpp/dual_ref_counted.h \ -src/core/lib/gprpp/dump_args.cc \ -src/core/lib/gprpp/dump_args.h \ -src/core/lib/gprpp/env.h \ -src/core/lib/gprpp/examine_stack.cc \ -src/core/lib/gprpp/examine_stack.h \ -src/core/lib/gprpp/fork.cc \ -src/core/lib/gprpp/fork.h \ -src/core/lib/gprpp/glob.cc \ -src/core/lib/gprpp/glob.h \ -src/core/lib/gprpp/host_port.cc \ -src/core/lib/gprpp/host_port.h \ -src/core/lib/gprpp/if_list.h \ -src/core/lib/gprpp/linux/env.cc \ -src/core/lib/gprpp/load_file.cc \ -src/core/lib/gprpp/load_file.h \ -src/core/lib/gprpp/manual_constructor.h \ -src/core/lib/gprpp/match.h \ -src/core/lib/gprpp/memory.h \ -src/core/lib/gprpp/mpscq.cc \ -src/core/lib/gprpp/mpscq.h \ -src/core/lib/gprpp/no_destruct.h \ -src/core/lib/gprpp/notification.h \ -src/core/lib/gprpp/orphanable.h \ -src/core/lib/gprpp/overload.h \ -src/core/lib/gprpp/packed_table.h \ -src/core/lib/gprpp/per_cpu.cc \ -src/core/lib/gprpp/per_cpu.h \ -src/core/lib/gprpp/posix/directory_reader.cc \ -src/core/lib/gprpp/posix/env.cc \ -src/core/lib/gprpp/posix/stat.cc \ -src/core/lib/gprpp/posix/thd.cc \ -src/core/lib/gprpp/ref_counted.h \ -src/core/lib/gprpp/ref_counted_ptr.h \ -src/core/lib/gprpp/ref_counted_string.cc \ -src/core/lib/gprpp/ref_counted_string.h \ -src/core/lib/gprpp/single_set_ptr.h \ -src/core/lib/gprpp/sorted_pack.h \ -src/core/lib/gprpp/stat.h \ -src/core/lib/gprpp/status_helper.cc \ -src/core/lib/gprpp/status_helper.h \ -src/core/lib/gprpp/strerror.cc \ -src/core/lib/gprpp/strerror.h \ -src/core/lib/gprpp/sync.h \ -src/core/lib/gprpp/table.h \ -src/core/lib/gprpp/tchar.cc \ -src/core/lib/gprpp/tchar.h \ -src/core/lib/gprpp/thd.h \ -src/core/lib/gprpp/time.cc \ -src/core/lib/gprpp/time.h \ -src/core/lib/gprpp/time_averaged_stats.cc \ -src/core/lib/gprpp/time_averaged_stats.h \ -src/core/lib/gprpp/time_util.cc \ -src/core/lib/gprpp/time_util.h \ -src/core/lib/gprpp/type_list.h \ -src/core/lib/gprpp/unique_type_name.h \ -src/core/lib/gprpp/uuid_v4.cc \ -src/core/lib/gprpp/uuid_v4.h \ -src/core/lib/gprpp/validation_errors.cc \ -src/core/lib/gprpp/validation_errors.h \ -src/core/lib/gprpp/windows/directory_reader.cc \ -src/core/lib/gprpp/windows/env.cc \ -src/core/lib/gprpp/windows/stat.cc \ -src/core/lib/gprpp/windows/thd.cc \ -src/core/lib/gprpp/work_serializer.cc \ -src/core/lib/gprpp/work_serializer.h \ -src/core/lib/gprpp/xxhash_inline.h \ src/core/lib/iomgr/README.md \ src/core/lib/iomgr/block_annotate.h \ src/core/lib/iomgr/buffer_list.cc \ @@ -2153,13 +2068,6 @@ src/core/lib/iomgr/executor.cc \ src/core/lib/iomgr/executor.h \ src/core/lib/iomgr/fork_posix.cc \ src/core/lib/iomgr/fork_windows.cc \ -src/core/lib/iomgr/gethostname.h \ -src/core/lib/iomgr/gethostname_fallback.cc \ -src/core/lib/iomgr/gethostname_host_name_max.cc \ -src/core/lib/iomgr/gethostname_sysconf.cc \ -src/core/lib/iomgr/grpc_if_nametoindex.h \ -src/core/lib/iomgr/grpc_if_nametoindex_posix.cc \ -src/core/lib/iomgr/grpc_if_nametoindex_unsupported.cc \ src/core/lib/iomgr/internal_errqueue.cc \ src/core/lib/iomgr/internal_errqueue.h \ src/core/lib/iomgr/iocp_windows.cc \ @@ -2250,8 +2158,6 @@ src/core/lib/iomgr/wakeup_fd_pipe.cc \ src/core/lib/iomgr/wakeup_fd_pipe.h \ src/core/lib/iomgr/wakeup_fd_posix.cc \ src/core/lib/iomgr/wakeup_fd_posix.h \ -src/core/lib/matchers/matchers.cc \ -src/core/lib/matchers/matchers.h \ src/core/lib/promise/activity.cc \ src/core/lib/promise/activity.h \ src/core/lib/promise/all_ok.h \ @@ -2514,8 +2420,6 @@ src/core/lib/transport/transport.cc \ src/core/lib/transport/transport.h \ src/core/lib/transport/transport_fwd.h \ src/core/lib/transport/transport_op_string.cc \ -src/core/lib/uri/uri_parser.cc \ -src/core/lib/uri/uri_parser.h \ src/core/load_balancing/address_filtering.cc \ src/core/load_balancing/address_filtering.h \ src/core/load_balancing/backend_metric_data.h \ @@ -2706,8 +2610,43 @@ src/core/util/README.md \ src/core/util/alloc.cc \ src/core/util/alloc.h \ src/core/util/atm.cc \ +src/core/util/atomic_utils.h \ +src/core/util/avl.h \ +src/core/util/backoff.cc \ +src/core/util/backoff.h \ +src/core/util/bitset.h \ +src/core/util/chunked_vector.h \ +src/core/util/construct_destruct.h \ +src/core/util/cpp_impl_of.h \ +src/core/util/crash.cc \ +src/core/util/crash.h \ +src/core/util/debug_location.h \ +src/core/util/directory_reader.h \ +src/core/util/down_cast.h \ +src/core/util/dual_ref_counted.h \ +src/core/util/dump_args.cc \ +src/core/util/dump_args.h \ +src/core/util/env.h \ +src/core/util/event_log.cc \ +src/core/util/event_log.h \ +src/core/util/examine_stack.cc \ +src/core/util/examine_stack.h \ +src/core/util/fork.cc \ +src/core/util/fork.h \ src/core/util/gcp_metadata_query.cc \ src/core/util/gcp_metadata_query.h \ +src/core/util/gethostname.h \ +src/core/util/gethostname_fallback.cc \ +src/core/util/gethostname_host_name_max.cc \ +src/core/util/gethostname_sysconf.cc \ +src/core/util/glob.cc \ +src/core/util/glob.h \ +src/core/util/gpr_time.cc \ +src/core/util/grpc_if_nametoindex.h \ +src/core/util/grpc_if_nametoindex_posix.cc \ +src/core/util/grpc_if_nametoindex_unsupported.cc \ +src/core/util/host_port.cc \ +src/core/util/host_port.h \ src/core/util/http_client/format_request.cc \ src/core/util/http_client/format_request.h \ src/core/util/http_client/httpcli.cc \ @@ -2716,6 +2655,7 @@ src/core/util/http_client/httpcli_security_connector.cc \ src/core/util/http_client/httpcli_ssl_credentials.h \ src/core/util/http_client/parser.cc \ src/core/util/http_client/parser.h \ +src/core/util/if_list.h \ src/core/util/iphone/cpu.cc \ src/core/util/json/json.h \ src/core/util/json/json_args.h \ @@ -2731,33 +2671,92 @@ src/core/util/json/json_writer.h \ src/core/util/latent_see.cc \ src/core/util/latent_see.h \ src/core/util/linux/cpu.cc \ +src/core/util/linux/env.cc \ +src/core/util/load_file.cc \ +src/core/util/load_file.h \ src/core/util/log.cc \ src/core/util/lru_cache.h \ +src/core/util/manual_constructor.h \ +src/core/util/match.h \ +src/core/util/matchers.cc \ +src/core/util/matchers.h \ +src/core/util/memory.h \ +src/core/util/mpscq.cc \ +src/core/util/mpscq.h \ src/core/util/msys/tmpfile.cc \ +src/core/util/no_destruct.h \ +src/core/util/notification.h \ +src/core/util/orphanable.h \ +src/core/util/overload.h \ +src/core/util/packed_table.h \ +src/core/util/per_cpu.cc \ +src/core/util/per_cpu.h \ src/core/util/posix/cpu.cc \ +src/core/util/posix/directory_reader.cc \ +src/core/util/posix/env.cc \ +src/core/util/posix/stat.cc \ src/core/util/posix/string.cc \ src/core/util/posix/sync.cc \ +src/core/util/posix/thd.cc \ src/core/util/posix/time.cc \ src/core/util/posix/tmpfile.cc \ +src/core/util/random_early_detection.cc \ +src/core/util/random_early_detection.h \ +src/core/util/ref_counted.h \ +src/core/util/ref_counted_ptr.h \ +src/core/util/ref_counted_string.cc \ +src/core/util/ref_counted_string.h \ src/core/util/ring_buffer.h \ +src/core/util/single_set_ptr.h \ +src/core/util/sorted_pack.h \ src/core/util/spinlock.h \ +src/core/util/stat.h \ +src/core/util/status_helper.cc \ +src/core/util/status_helper.h \ +src/core/util/strerror.cc \ +src/core/util/strerror.h \ src/core/util/string.cc \ src/core/util/string.h \ src/core/util/sync.cc \ +src/core/util/sync.h \ src/core/util/sync_abseil.cc \ +src/core/util/table.h \ +src/core/util/tchar.cc \ +src/core/util/tchar.h \ +src/core/util/thd.h \ src/core/util/time.cc \ +src/core/util/time.h \ +src/core/util/time_averaged_stats.cc \ +src/core/util/time_averaged_stats.h \ src/core/util/time_precise.cc \ src/core/util/time_precise.h \ +src/core/util/time_util.cc \ +src/core/util/time_util.h \ src/core/util/tmpfile.h \ +src/core/util/type_list.h \ src/core/util/unique_ptr_with_bitset.h \ +src/core/util/unique_type_name.h \ src/core/util/upb_utils.h \ +src/core/util/uri.cc \ +src/core/util/uri.h \ src/core/util/useful.h \ +src/core/util/uuid_v4.cc \ +src/core/util/uuid_v4.h \ +src/core/util/validation_errors.cc \ +src/core/util/validation_errors.h \ src/core/util/windows/cpu.cc \ +src/core/util/windows/directory_reader.cc \ +src/core/util/windows/env.cc \ +src/core/util/windows/stat.cc \ src/core/util/windows/string.cc \ src/core/util/windows/string_util.cc \ src/core/util/windows/sync.cc \ +src/core/util/windows/thd.cc \ src/core/util/windows/time.cc \ src/core/util/windows/tmpfile.cc \ +src/core/util/work_serializer.cc \ +src/core/util/work_serializer.h \ +src/core/util/xxhash_inline.h \ src/core/xds/grpc/certificate_provider_store.cc \ src/core/xds/grpc/certificate_provider_store.h \ src/core/xds/grpc/file_watcher_certificate_provider_factory.cc \ diff --git a/tools/run_tests/generated/tests.json b/tools/run_tests/generated/tests.json index 5152c4f42e5..16c73265ad2 100644 --- a/tools/run_tests/generated/tests.json +++ b/tools/run_tests/generated/tests.json @@ -4095,6 +4095,30 @@ ], "uses_polling": true }, + { + "args": [], + "benchmark": false, + "ci_platforms": [ + "linux", + "mac", + "posix", + "windows" + ], + "cpu_cost": 1.0, + "exclude_configs": [], + "exclude_iomgrs": [], + "flaky": false, + "gtest": true, + "language": "c++", + "name": "gpr_time_test", + "platforms": [ + "linux", + "mac", + "posix", + "windows" + ], + "uses_polling": false + }, { "args": [], "benchmark": false, @@ -10589,30 +10613,6 @@ ], "uses_polling": true }, - { - "args": [], - "benchmark": false, - "ci_platforms": [ - "linux", - "mac", - "posix", - "windows" - ], - "cpu_cost": 1.0, - "exclude_configs": [], - "exclude_iomgrs": [], - "flaky": false, - "gtest": true, - "language": "c++", - "name": "test_core_gprpp_time_test", - "platforms": [ - "linux", - "mac", - "posix", - "windows" - ], - "uses_polling": false - }, { "args": [], "benchmark": false, @@ -11554,7 +11554,7 @@ "flaky": false, "gtest": true, "language": "c++", - "name": "uri_parser_test", + "name": "uri_test", "platforms": [ "linux", "mac", diff --git a/tools/run_tests/sanity/check_absl_mutex.sh b/tools/run_tests/sanity/check_absl_mutex.sh index 7243f9e471a..99bdbc60b73 100755 --- a/tools/run_tests/sanity/check_absl_mutex.sh +++ b/tools/run_tests/sanity/check_absl_mutex.sh @@ -28,7 +28,7 @@ find . \( \( -name "*.cc" \) -or \( -name "*.h" \) \) \ -or \( -wholename "./include/*" \) \ -or \( -wholename "./test/*" \) \) \ -a -not -wholename "./include/grpcpp/impl/sync.h" \ - -a -not -wholename "./src/core/lib/gprpp/sync.h" \ + -a -not -wholename "./src/core/util/sync.h" \ -a -not -wholename "./src/core/util/sync_abseil.cc" \ -a -not -wholename "./test/core/transport/call_spine_benchmarks.h" \ -print0 |\ diff --git a/tools/run_tests/sanity/cpp_banned_constructs.sh b/tools/run_tests/sanity/cpp_banned_constructs.sh index 2296cfd8ebd..2318fd95b71 100755 --- a/tools/run_tests/sanity/cpp_banned_constructs.sh +++ b/tools/run_tests/sanity/cpp_banned_constructs.sh @@ -26,7 +26,7 @@ cd "$(dirname "$0")/../../.." grep -EIrn \ 'std::(mutex|condition_variable|lock_guard|unique_lock|thread)' \ include/grpc include/grpcpp src/core src/cpp | \ - grep -Ev 'include/grpcpp/impl/sync.h|src/core/lib/gprpp/work_serializer.cc' | \ + grep -Ev 'include/grpcpp/impl/sync.h|src/core/util/work_serializer.cc' | \ diff - /dev/null # @@ -36,7 +36,7 @@ grep -EIrn \ grep -EIrn \ '^#include (||||||)' \ include/grpc include/grpcpp src/core src/cpp | \ - grep -Ev 'include/grpcpp/impl/sync.h|src/core/lib/gprpp/work_serializer.cc' | \ + grep -Ev 'include/grpcpp/impl/sync.h|src/core/util/work_serializer.cc' | \ diff - /dev/null # From 542f9b7e96bb3e4ec215a3997d51f2029c6ae1a9 Mon Sep 17 00:00:00 2001 From: Chris Kennelly Date: Fri, 20 Sep 2024 16:45:19 -0700 Subject: [PATCH 02/75] [cleanup] remove unused variable PiperOrigin-RevId: 677014894 --- test/core/resolver/fake_resolver_test.cc | 1 - 1 file changed, 1 deletion(-) diff --git a/test/core/resolver/fake_resolver_test.cc b/test/core/resolver/fake_resolver_test.cc index 888ecac3399..9b14b43d431 100644 --- a/test/core/resolver/fake_resolver_test.cc +++ b/test/core/resolver/fake_resolver_test.cc @@ -115,7 +115,6 @@ class FakeResolverTest : public ::testing::Test { EXPECT_TRUE(uri.ok()); grpc_resolved_address address; EXPECT_TRUE(grpc_parse_uri(*uri, &address)); - absl::InlinedVector args_to_add; addresses.emplace_back(address, ChannelArgs()); } ++test_counter; From 9560fbb82f35886f7e4d6e674b76a3109aa06271 Mon Sep 17 00:00:00 2001 From: Yousuk Seung Date: Sat, 21 Sep 2024 14:59:33 -0700 Subject: [PATCH 03/75] Don't grab GIL from C-Core during shutdown (retry with fix) (#37784) This is a retry of #37762 with a fix. We no longer hold the C mutex and GIL at the same to avoid a deadlock. MetadataPluginCallCredentials passes a function pointer to C-core to be called during destruction. This function grabs GIL which may race between GIL destruction during process shutdown. Since GIL destruction happens after Python's exit handlers, we cana mark that Python is shutting down from an exit handler and don't grab GIL in this function afterwards using a C mutex. Closes #37784 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37784 from yousukseung:python-atexit-retry b17addf8058df70a760d52004c5b32a9e8905820 PiperOrigin-RevId: 677280657 --- .../grpc/_cython/_cygrpc/credentials.pyx.pxi | 54 ++++++++++++++++++- 1 file changed, 52 insertions(+), 2 deletions(-) diff --git a/src/python/grpcio/grpc/_cython/_cygrpc/credentials.pyx.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/credentials.pyx.pxi index 181704cb85a..2e689bcec3d 100644 --- a/src/python/grpcio/grpc/_cython/_cygrpc/credentials.pyx.pxi +++ b/src/python/grpcio/grpc/_cython/_cygrpc/credentials.pyx.pxi @@ -12,6 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +import atexit def _spawn_callback_in_thread(cb_func, args): t = ForkManagedThread(target=cb_func, args=args) @@ -65,11 +66,59 @@ cdef int _get_metadata(void *state, return 0 # Asynchronous return -cdef void _destroy(void *state) except * with gil: - cpython.Py_DECREF(state) +# Protects access to GIL from _destroy() and to g_shutting_down. +# Do NOT hold this while holding GIL to prevent a deadlock. +cdef mutex g_shutdown_mu +# Number of C-core clean up calls in progress. Set to -1 when Python is shutting +# down. +cdef int g_shutting_down = 0 + +# This is called by C-core when the plugin is destroyed, which may race between +# GIL destruction during process shutdown. Since GIL destruction happens after +# Python's exit handlers, we mark that Python is shutting down from an exit +# handler and don't grab GIL in this function afterwards using a C mutex. +cdef void _destroy(void *state) nogil: + global g_shutdown_mu + global g_shutting_down + g_shutdown_mu.lock() + if g_shutting_down > -1: + g_shutting_down += 1 + g_shutdown_mu.unlock() + with gil: + cpython.Py_DECREF(state) + g_shutdown_mu.lock() + g_shutting_down -= 1 + g_shutdown_mu.unlock() grpc_shutdown() +g_shutdown_handler_registered = False + +def _maybe_register_shutdown_handler(): + global g_shutdown_handler_registered + if g_shutdown_handler_registered: + return + g_shutdown_handler_registered = True + atexit.register(_on_shutdown) + +cdef void _on_shutdown() nogil: + global g_shutdown_mu + global g_shutting_down + # Wait for up to ~2s if C-core is still cleaning up. + cdef int wait_ms = 10 + while wait_ms < 1500: + g_shutdown_mu.lock() + if g_shutting_down == 0: + g_shutting_down = -1 + g_shutdown_mu.unlock() + return + g_shutdown_mu.unlock() + with gil: + time.sleep(wait_ms / 1000) + wait_ms = wait_ms * 2 + with gil: + _LOGGER.error('Timed out waiting for C-core clean-up') + cdef class MetadataPluginCallCredentials(CallCredentials): def __cinit__(self, metadata_plugin, name): @@ -83,6 +132,7 @@ cdef class MetadataPluginCallCredentials(CallCredentials): c_metadata_plugin.state = self._metadata_plugin c_metadata_plugin.type = self._name cpython.Py_INCREF(self._metadata_plugin) + _maybe_register_shutdown_handler() fork_handlers_and_grpc_init() # TODO(yihuazhang): Expose min_security_level via the Python API so that # applications can decide what minimum security level their plugins require. From cbccf975d07da4b6ddb716518de58917348c3e14 Mon Sep 17 00:00:00 2001 From: Yousuk Seung Date: Sat, 21 Sep 2024 15:22:10 -0700 Subject: [PATCH 04/75] [ssl] Ensure OPENSSL global cleanup happens after gRPC shutdowns (#37768) Ensure OPENSSL global clean up happens after gRPC shutdown completes. OPENSSL registers an exit handler to clean up global objects, which may happen before gRPC removes all references to OPENSSL. Closes #37768 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37768 from yousukseung:openssl-atexit-wait d3d1c964a837179050acebd5e82b1d1e20338611 PiperOrigin-RevId: 677284514 --- BUILD | 2 ++ src/core/lib/surface/init.cc | 19 ++++++++++++++ src/core/lib/surface/init.h | 5 ++++ src/core/tsi/ssl_transport_security.cc | 8 ++++++ test/core/surface/init_test.cc | 35 ++++++++++++++++++++++++++ 5 files changed, 69 insertions(+) diff --git a/BUILD b/BUILD index b5a5a5754b9..d9cabe6fb60 100644 --- a/BUILD +++ b/BUILD @@ -571,6 +571,7 @@ grpc_cc_library( external_deps = [ "absl/base:core_headers", "absl/log:log", + "absl/time:time", ], language = "c++", public_hdrs = GRPC_PUBLIC_HDRS, @@ -642,6 +643,7 @@ grpc_cc_library( external_deps = [ "absl/base:core_headers", "absl/log:log", + "absl/time:time", ], language = "c++", public_hdrs = GRPC_PUBLIC_HDRS, diff --git a/src/core/lib/surface/init.cc b/src/core/lib/surface/init.cc index 637941ccbd3..233f6f97d16 100644 --- a/src/core/lib/surface/init.cc +++ b/src/core/lib/surface/init.cc @@ -20,6 +20,8 @@ #include "absl/base/thread_annotations.h" #include "absl/log/log.h" +#include "absl/time/clock.h" +#include "absl/time/time.h" #include #include @@ -216,3 +218,20 @@ void grpc_maybe_wait_for_async_shutdown(void) { g_shutting_down_cv->Wait(g_init_mu); } } + +bool grpc_wait_for_shutdown_with_timeout(absl::Duration timeout) { + GRPC_TRACE_LOG(api, INFO) << "grpc_wait_for_shutdown_with_timeout()"; + const auto started = absl::Now(); + const auto deadline = started + timeout; + gpr_once_init(&g_basic_init, do_basic_init); + grpc_core::MutexLock lock(g_init_mu); + while (g_initializations != 0) { + if (g_shutting_down_cv->WaitWithDeadline(g_init_mu, deadline)) { + LOG(ERROR) << "grpc_wait_for_shutdown_with_timeout() timed out."; + return false; + } + } + GRPC_TRACE_LOG(api, INFO) + << "grpc_wait_for_shutdown_with_timeout() took " << absl::Now() - started; + return true; +} diff --git a/src/core/lib/surface/init.h b/src/core/lib/surface/init.h index 0d0035ae304..804b79c5d5b 100644 --- a/src/core/lib/surface/init.h +++ b/src/core/lib/surface/init.h @@ -18,8 +18,13 @@ #ifndef GRPC_SRC_CORE_LIB_SURFACE_INIT_H #define GRPC_SRC_CORE_LIB_SURFACE_INIT_H +#include "absl/time/time.h" + #include void grpc_maybe_wait_for_async_shutdown(void); +// Returns false if the timeout expired before fully shut down. +bool grpc_wait_for_shutdown_with_timeout(absl::Duration timeout); + #endif // GRPC_SRC_CORE_LIB_SURFACE_INIT_H diff --git a/src/core/tsi/ssl_transport_security.cc b/src/core/tsi/ssl_transport_security.cc index 8012dc8459c..47184174351 100644 --- a/src/core/tsi/ssl_transport_security.cc +++ b/src/core/tsi/ssl_transport_security.cc @@ -21,8 +21,11 @@ #include #include +#include + #include +#include "src/core/lib/surface/init.h" #include "src/core/tsi/transport_security_interface.h" // TODO(jboeuf): refactor inet_ntop into a portability header. @@ -189,6 +192,11 @@ static void verified_root_cert_free(void* /*parent*/, void* ptr, static void init_openssl(void) { #if OPENSSL_VERSION_NUMBER >= 0x10100000 OPENSSL_init_ssl(0, nullptr); + // Ensure OPENSSL global clean up happens after gRPC shutdown completes. + // OPENSSL registers an exit handler to clean up global objects, which + // otherwise may happen before gRPC removes all references to OPENSSL. Below + // exit handler is guaranteed to run after OPENSSL's. + std::atexit([]() { grpc_wait_for_shutdown_with_timeout(absl::Seconds(2)); }); #else SSL_library_init(); SSL_load_error_strings(); diff --git a/test/core/surface/init_test.cc b/test/core/surface/init_test.cc index fe0ca1e57e3..58d0347a2bb 100644 --- a/test/core/surface/init_test.cc +++ b/test/core/surface/init_test.cc @@ -30,6 +30,7 @@ #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/iomgr/exec_ctx.h" +#include "src/core/util/thd.h" #include "test/core/test_util/test_config.h" static void test(int rounds) { @@ -115,6 +116,40 @@ TEST(Init, Repeatedly) { EXPECT_FALSE(grpc_is_initialized()); } +TEST(Init, WaitForShutdownBeforeInit) { + EXPECT_TRUE(grpc_wait_for_shutdown_with_timeout(absl::ZeroDuration())); +} + +TEST(Init, WaitForShutdownAfterShutdown) { + grpc_init(); + grpc_shutdown(); + EXPECT_TRUE(grpc_wait_for_shutdown_with_timeout(absl::ZeroDuration())); +} + +TEST(Init, WaitForShutdownWithTimeout) { + grpc_init(); + grpc_init(); + grpc_shutdown(); + grpc_core::Thread t0( + "init_test", + [](void*) { + EXPECT_FALSE(grpc_wait_for_shutdown_with_timeout(absl::Seconds(0.5))); + }, + nullptr); + grpc_core::Thread t1( + "init_test", + [](void*) { + EXPECT_TRUE(grpc_wait_for_shutdown_with_timeout(absl::Seconds(1.5))); + }, + nullptr); + t0.Start(); + t1.Start(); + absl::SleepFor(absl::Seconds(1)); + grpc_shutdown(); + t0.Join(); + t1.Join(); +} + TEST(Init, RepeatedlyBlocking) { for (int i = 0; i < 10; i++) { grpc_init(); From a9114ff9e4f188745b50a29bd50b7aace97982e0 Mon Sep 17 00:00:00 2001 From: Xuan Wang Date: Mon, 23 Sep 2024 08:31:11 -0700 Subject: [PATCH 05/75] [Python test] Add log to print test start time and duration (#37761) Some of our tests failed because RPC was canceled by server, error message: ``` I0000 00:00:1726598495.788119 64528 chttp2_transport.cc:1182] ipv4:127.0.0.1:41825: Got goaway [2] err=UNAVAILABLE:GOAWAY received; Error code: 2; Debug Text: Cancelling all calls {grpc_status:14, http2_error:2, created_time:"2024-09-17T18:41:35.78810597+00:00"} ``` It's possible that the request waited too long to be processed and thus canceled by server (default maximum time gRPC server allows a request to be received by the server but not handled is `30s`, controlled by `grpc.server_max_unrequested_time_in_server`). This PR will print the test start/finish time so we know if we should increase `grpc.server_max_unrequested_time_in_server` time. Example before change: ``` Testing gRPC Python... SUCCESS tests.unit._metadata_flags_test.MetadataFlagsTest.test_call_wait_for_ready_default Running tests.unit._metadata_flags_test.MetadataFlagsTest.test_call_wait_for_ready_disabled SUCCESS tests.unit._metadata_flags_test.MetadataFlagsTest.test_call_wait_for_ready_disabled Running tests.unit._metadata_flags_test.MetadataFlagsTest.test_call_wait_for_ready_enabled ``` Example after change: ``` [2024-09-20 18:32:15.228947]Testing gRPC Python... [2024-09-20 18:32:15.237855]START tests.unit._metadata_flags_test.MetadataFlagsTest.test_call_wait_for_ready_default [2024-09-20 18:32:15.265477]SUCCESS tests.unit._metadata_flags_test.MetadataFlagsTest.test_call_wait_for_ready_default[Duration: 0:00:00.027622s] Running tests.unit._metadata_flags_test.MetadataFlagsTest.test_call_wait_for_ready_disabled [2024-09-20 18:32:15.278142]START tests.unit._metadata_flags_test.MetadataFlagsTest.test_call_wait_for_ready_disabled [2024-09-20 18:32:15.316065]FAILURE tests.unit._metadata_flags_test.MetadataFlagsTest.test_call_wait_for_ready_disabled[Duration: 0:00:00.037911] Running tests.unit._metadata_flags_test.MetadataFlagsTest.test_call_wait_for_ready_enabled [2024-09-20 18:32:15.328680]START tests.unit._metadata_flags_test.MetadataFlagsTest.test_call_wait_for_ready_enabled [2024-09-20 18:32:16.938745]SUCCESS tests.unit._metadata_flags_test.MetadataFlagsTest.test_call_wait_for_ready_enabled[Duration: 0:00:01.610065s] ``` Closes #37761 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37761 from XuanWang-Amos:add_time_to_unit_test d2ecd8ce22783e4704bf4010cca94edaf6023aa9 PiperOrigin-RevId: 677805375 --- src/python/grpcio_tests/tests/_result.py | 36 ++++++++++++++++++++---- 1 file changed, 31 insertions(+), 5 deletions(-) diff --git a/src/python/grpcio_tests/tests/_result.py b/src/python/grpcio_tests/tests/_result.py index 151c621fb6f..aa710a4c0fb 100644 --- a/src/python/grpcio_tests/tests/_result.py +++ b/src/python/grpcio_tests/tests/_result.py @@ -291,16 +291,28 @@ class TerminalResult(CoverageResult): """ super(TerminalResult, self).__init__(id_map=id_map) self.out = out + self.start_time = None def startTestRun(self): """See unittest.TestResult.startTestRun.""" super(TerminalResult, self).startTestRun() self.out.write( _Colors.HEADER - + "[{}]Testing gRPC Python...\n".format(datetime.datetime.now()) + + " [{}]Testing gRPC Python...\n".format(datetime.datetime.now()) + _Colors.END ) + def startTest(self, test): + """See unittest.TestResult.startTest.""" + super(TerminalResult, self).startTest(test) + self.start_time = datetime.datetime.now() + self.out.write( + _Colors.INFO + + " [{}]START {}\n".format(self.start_time, test.id()) + + _Colors.END + ) + self.out.flush() + def stopTestRun(self): """See unittest.TestResult.stopTestRun.""" super(TerminalResult, self).stopTestRun() @@ -310,26 +322,40 @@ class TerminalResult(CoverageResult): def addError(self, test, err): """See unittest.TestResult.addError.""" super(TerminalResult, self).addError(test, err) + end_time = datetime.datetime.now() + duration = end_time - self.start_time self.out.write( - _Colors.FAIL + "ERROR {}\n".format(test.id()) + _Colors.END + _Colors.FAIL + + " [{}]ERROR {}[Duration: {}]\n".format( + datetime.datetime.now(), test.id(), duration + ) + + _Colors.END ) self.out.flush() def addFailure(self, test, err): """See unittest.TestResult.addFailure.""" super(TerminalResult, self).addFailure(test, err) + end_time = datetime.datetime.now() + duration = end_time - self.start_time self.out.write( - _Colors.FAIL + "FAILURE {}\n".format(test.id()) + _Colors.END + _Colors.FAIL + + " [{}]FAILURE {}[Duration: {}]\n".format( + datetime.datetime.now(), test.id(), duration + ) + + _Colors.END ) self.out.flush() def addSuccess(self, test): """See unittest.TestResult.addSuccess.""" super(TerminalResult, self).addSuccess(test) + end_time = datetime.datetime.now() + duration = end_time - self.start_time self.out.write( _Colors.OK - + "[{}]SUCCESS {}\n".format( - datetime.datetime.now(), test.id() + + " [{}]SUCCESS {}[Duration: {}]\n".format( + end_time, test.id(), duration ) + _Colors.END ) From b87ed725df3b7bc562acbccff079b3494a8628a8 Mon Sep 17 00:00:00 2001 From: Matthew Stevenson Date: Mon, 23 Sep 2024 10:25:10 -0700 Subject: [PATCH 06/75] [tls] Add ValidateCredentials API to the TLS certificate provider. (#37565) Add a ValidateCredentials API to the TLS certificate provider interface. A user can call this API to check that the credentials currently held by the certificate provider instance are valid. The definition of "valid" depends on provider that is being used. For the static data and file watcher providers, "valid" means that the credentials consist of valid PEM. ~Currently there is no check to ensure that credentials consist of valid PEM blocks before a TLS handshake commences. This PR creates a static factory for FileWatcherCertificateProvider (and marks the constructor as deprecated) which performs this validation check. The analogous work for StaticDataCertificateProvider will be done in a follow-up PR.~ Closes #37565 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37565 from matthewstevenson88:filewatcher f2232280232a9600cb32008597ed096352b65e34 PiperOrigin-RevId: 677847751 --- BUILD | 3 + .../security/tls_certificate_provider.h | 18 +++++ .../tls/grpc_tls_certificate_provider.cc | 72 +++++++++++++++++++ .../tls/grpc_tls_certificate_provider.h | 6 +- src/core/tsi/test_creds/BUILD | 2 + src/core/tsi/test_creds/README | 7 ++ src/core/tsi/test_creds/malformed-cert.pem | 22 ++++++ src/core/tsi/test_creds/malformed-key.pem | 28 ++++++++ src/cpp/common/tls_certificate_provider.cc | 16 +++++ test/core/security/BUILD | 2 + .../grpc_tls_certificate_provider_test.cc | 72 +++++++++++++++++++ test/cpp/server/BUILD | 2 + test/cpp/server/credentials_test.cc | 37 ++++++++++ 13 files changed, 286 insertions(+), 1 deletion(-) create mode 100644 src/core/tsi/test_creds/malformed-cert.pem create mode 100644 src/core/tsi/test_creds/malformed-key.pem diff --git a/BUILD b/BUILD index d9cabe6fb60..ef5ae907776 100644 --- a/BUILD +++ b/BUILD @@ -894,6 +894,7 @@ grpc_cc_library( "absl/log:log", "absl/log:absl_check", "absl/log:absl_log", + "absl/status:statusor", "absl/strings:cord", "absl/synchronization", "protobuf_headers", @@ -1247,6 +1248,7 @@ grpc_cc_library( "absl/log:log", "absl/log:absl_check", "absl/log:absl_log", + "absl/status:statusor", "absl/strings", "absl/synchronization", ], @@ -2491,6 +2493,7 @@ grpc_cc_library( "//src/core:grpc_backend_metric_provider", "//src/core:grpc_crl_provider", "//src/core:grpc_service_config", + "//src/core:grpc_tls_credentials", "//src/core:grpc_transport_chttp2_server", "//src/core:grpc_transport_inproc", "//src/core:json", diff --git a/include/grpcpp/security/tls_certificate_provider.h b/include/grpcpp/security/tls_certificate_provider.h index 6b918fec0a1..fc34d67a6d5 100644 --- a/include/grpcpp/security/tls_certificate_provider.h +++ b/include/grpcpp/security/tls_certificate_provider.h @@ -18,12 +18,16 @@ #define GRPCPP_SECURITY_TLS_CERTIFICATE_PROVIDER_H #include +#include #include +#include "absl/status/statusor.h" + #include #include #include #include +#include #include namespace grpc { @@ -67,6 +71,12 @@ class GRPCXX_DLL StaticDataCertificateProvider grpc_tls_certificate_provider* c_provider() override { return c_provider_; } + // Returns an OK status if the following conditions hold: + // - the root certificates consist of one or more valid PEM blocks, and + // - every identity key-cert pair has a certificate chain that consists of + // valid PEM blocks and has a private key is a valid PEM block. + absl::Status ValidateCredentials() const; + private: grpc_tls_certificate_provider* c_provider_ = nullptr; }; @@ -117,6 +127,14 @@ class GRPCXX_DLL FileWatcherCertificateProvider final grpc_tls_certificate_provider* c_provider() override { return c_provider_; } + // Returns an OK status if the following conditions hold: + // - the currently-loaded root certificates, if any, consist of one or more + // valid PEM blocks, and + // - every currently-loaded identity key-cert pair, if any, has a certificate + // chain that consists of valid PEM blocks and has a private key is a valid + // PEM block. + absl::Status ValidateCredentials() const; + private: grpc_tls_certificate_provider* c_provider_ = nullptr; }; diff --git a/src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.cc b/src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.cc index 30bc3e462c7..0bcabaa6505 100644 --- a/src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.cc +++ b/src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.cc @@ -26,6 +26,7 @@ #include "absl/log/check.h" #include "absl/log/log.h" #include "absl/status/status.h" +#include "absl/strings/string_view.h" #include #include @@ -35,13 +36,53 @@ #include "src/core/lib/debug/trace.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" +#include "src/core/lib/security/security_connector/ssl_utils.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/slice/slice_internal.h" +#include "src/core/tsi/ssl_transport_security_utils.h" #include "src/core/util/load_file.h" #include "src/core/util/stat.h" #include "src/core/util/status_helper.h" namespace grpc_core { +namespace { + +absl::Status ValidateRootCertificates(absl::string_view root_certificates) { + if (root_certificates.empty()) return absl::OkStatus(); + absl::StatusOr> parsed_roots = + ParsePemCertificateChain(root_certificates); + if (!parsed_roots.ok()) { + return parsed_roots.status(); + } + for (X509* x509 : *parsed_roots) { + X509_free(x509); + } + return absl::OkStatus(); +} + +absl::Status ValidatePemKeyCertPair(absl::string_view cert_chain, + absl::string_view private_key) { + if (cert_chain.empty() && private_key.empty()) return absl::OkStatus(); + // Check that the cert chain consists of valid PEM blocks. + absl::StatusOr> parsed_certs = + ParsePemCertificateChain(cert_chain); + if (!parsed_certs.ok()) { + return parsed_certs.status(); + } + for (X509* x509 : *parsed_certs) { + X509_free(x509); + } + // Check that the private key consists of valid PEM blocks. + absl::StatusOr parsed_private_key = + ParsePemPrivateKey(private_key); + if (!parsed_private_key.ok()) { + return parsed_private_key.status(); + } + EVP_PKEY_free(*parsed_private_key); + return absl::OkStatus(); +} + +} // namespace StaticDataCertificateProvider::StaticDataCertificateProvider( std::string root_certificate, PemKeyCertPairList pem_key_cert_pairs) @@ -102,6 +143,21 @@ UniqueTypeName StaticDataCertificateProvider::type() const { return kFactory.Create(); } +absl::Status StaticDataCertificateProvider::ValidateCredentials() const { + absl::Status status = ValidateRootCertificates(root_certificate_); + if (!status.ok()) { + return status; + } + for (const PemKeyCertPair& pair : pem_key_cert_pairs_) { + absl::Status status = + ValidatePemKeyCertPair(pair.cert_chain(), pair.private_key()); + if (!status.ok()) { + return status; + } + } + return absl::OkStatus(); +} + namespace { gpr_timespec TimeoutSecondsToDeadline(int64_t seconds) { @@ -206,6 +262,22 @@ UniqueTypeName FileWatcherCertificateProvider::type() const { return kFactory.Create(); } +absl::Status FileWatcherCertificateProvider::ValidateCredentials() const { + MutexLock lock(&mu_); + absl::Status status = ValidateRootCertificates(root_certificate_); + if (!status.ok()) { + return status; + } + for (const PemKeyCertPair& pair : pem_key_cert_pairs_) { + absl::Status status = + ValidatePemKeyCertPair(pair.cert_chain(), pair.private_key()); + if (!status.ok()) { + return status; + } + } + return absl::OkStatus(); +} + void FileWatcherCertificateProvider::ForceUpdate() { absl::optional root_certificate; absl::optional pem_key_cert_pairs; diff --git a/src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h b/src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h index 73b9cd70864..cca18a1baeb 100644 --- a/src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h +++ b/src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h @@ -108,6 +108,8 @@ class StaticDataCertificateProvider final UniqueTypeName type() const override; + absl::Status ValidateCredentials() const; + private: struct WatcherInfo { bool root_being_watched = false; @@ -147,6 +149,8 @@ class FileWatcherCertificateProvider final UniqueTypeName type() const override; + absl::Status ValidateCredentials() const; + int64_t TestOnlyGetRefreshIntervalSecond() const; private: @@ -183,7 +187,7 @@ class FileWatcherCertificateProvider final gpr_event shutdown_event_; // Guards members below. - Mutex mu_; + mutable Mutex mu_; // The most-recent credential data. It will be empty if the most recent read // attempt failed. std::string root_certificate_ ABSL_GUARDED_BY(mu_); diff --git a/src/core/tsi/test_creds/BUILD b/src/core/tsi/test_creds/BUILD index f6072bc552b..eeac5e35d7b 100644 --- a/src/core/tsi/test_creds/BUILD +++ b/src/core/tsi/test_creds/BUILD @@ -32,4 +32,6 @@ exports_files([ "multi-domain.pem", "leaf_signed_by_intermediate.key", "leaf_and_intermediate_chain.pem", + "malformed-cert.pem", + "malformed-key.pem", ]) diff --git a/src/core/tsi/test_creds/README b/src/core/tsi/test_creds/README index f3a6679e39c..d092361183b 100644 --- a/src/core/tsi/test_creds/README +++ b/src/core/tsi/test_creds/README @@ -13,6 +13,13 @@ When prompted for certificate information, everything is default except the common name which is set to badserver.test.google.com. +Malformed credentials (malformed.*): +===================================== + +These are invalid PEM blocks. They can be built by generating a valid +PEM-encoded certificate or private key and deleting a random character in the +body of the PEM-encoding. + Valid test credentials: ======================= diff --git a/src/core/tsi/test_creds/malformed-cert.pem b/src/core/tsi/test_creds/malformed-cert.pem new file mode 100644 index 00000000000..59326fceebf --- /dev/null +++ b/src/core/tsi/test_creds/malformed-cert.pem @@ -0,0 +1,22 @@ +-----BEGIN CERTIFICATE----- +MIIDszCCApugAwIBAgIUONWbkUn1obHCw9L7lMNEE5REvb8wDQYJKoZIhvcNAQEL +BQAwaTELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoM +GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDEiMCAGA1UEAwwZYmFkY2xpZW50LnRl +c3QuZ29vZ2xlLmNvbTAeFw0yMDAzMTcxNzQzMjNaFw0zMDAzMTUxNzQzMjNaMGkx +CzAJBgNVBAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRl +cm5ldCBXaWRnaXRzIFB0eSBMdGQxIjAgBgNVBAMMGWJhZGNsaWVudC50ZXN0Lmdv +b2dsZS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDvdzKDTYvR +gjBOUOrzDwkAZGwNFHHlMYyMGI5tItj3tCzXkbpM0uz3ZjHVahu+eYc+KvYApM64 +F2dBb16hs713FCk8mihYABjnSndrQsl/U2v8YFT7DipfLReqqaOGu2o9HdvWfiUl +aiC/UGGfR+YblpK7CG+7/hvTXtUsMw+OppoeH9z87rhOJMxtiC7XwU5rhEmab/1f +1XM/nLoZrfDAcTbDywoeu826SJ3mifajq7oK3LDdNLjWZwfEsCO1qp2C4gLvBlOO +KsWOLNby6ByxCOPlCTa0UCaVuoNclYol71jyi17KW+Nk0nNe9yaVcyr6H0z3bImf +JhbSu4rzI93nAgMBAAGjUzBRB0GA1UdDgQWBBTKJskEYd2ndrwihPTg2PzYF/kP +gzAfBgNVHSMEGDAWgBTKJskEYd2ndrwihPTg2PzYF/kPgzAPBgNVHRMBAf8EBTAD +AQH/MA0GCSqGSIb3DQEBCwUAA4IBAQBoGwWR0pLM1icX4bIJ6yduFU/A4jSiqET6 +gvJhwgErilqTKfH6Y89rqtzW8k4UurAOCsE4FA6wbkHWwrUMnClY4lkHJh+MuNaJ +nCGrK8wRKGb/mqW9d5pP72Et1Q6OW6DAKqGfjDWh2MzSPHBxcCLeyigO1wqd4W1T +nvvql6l4L+B5IT/c+/EHO3PwbI9v6MGTtLjsZgkRKItaPh+YeJdmBYhRD1BvWb6s +VwEb7aQ1oSF+esUvMmjGVuHXuQvWJahnjYdYT2DikyqR+AwaKzre4GJMHsX3/Cf8 +qdxyI+B1jUwNr7sLA2EYDjnUR0jEHcrOBSpIQyRMGWduj0P16yb9 +-----END CERTIFICATE----- diff --git a/src/core/tsi/test_creds/malformed-key.pem b/src/core/tsi/test_creds/malformed-key.pem new file mode 100644 index 00000000000..238055d7c9d --- /dev/null +++ b/src/core/tsi/test_creds/malformed-key.pem @@ -0,0 +1,28 @@ +-----BEGIN PRIVATE KEY----- +MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDvdzKDTYvRgjBO +UOrzDwkAZGwNFHHlMYyMGI5tItj3tCzXkbpM0uz3ZjHVahu+eYc+KvYApM64F2dB +b16hs713FCk8mihYABjnSndrQsl/U2v8YFT7DipfLReqqaOGu2o9HdvWfiUlaiC/ +UGGfR+YblpK7CG+7/hvTXtUsMw+OppoeH9z87rhOJMxtiC7XwU5rhEmab/1f1XM/ +nLoZrfDAcTbDywoeu826SJ3mifajq7oK3LDdNLjWZwfEsCO1qp2C4gLvBlOOKsWO +LNby6ByxCOPlCTa0UCaVuoNclYol71jyi17KW+Nk0nNe9yaVcyr6H0z3bImfJhbS +u4rzI93nAgMBAAECggEBAOIPOJRTpGaH7GpCYUpLK0g/hPFkF5EyEWg/1lSYzRIp ++RsX6zOS+zkiNHEv1jkeKNo7XDiHXM7U6RkQtdkZAQdk9PjM3sEUdm4CEnIjfmzA +p/R8TD0kxkNLIkhuFH2gd05y3ZHDS/XiFkAE9eOT0FrC7om6ESD7ZfFIWR18pncW +ZGq7tFAZZRmpkum2D+MJy1gWxIXBxt5madTEpRxQd56toEnfx372F0y4zkcX3pnE +4H6FaJUBjdvKl2QzF5c0jBqgxMRvWP5YfNu8+dmaQORPkpzSptOPmZM9VKV+tJVS +1xnOI6DtrnNZRojegR/E6KhNyiPTYy97UgYzdKS+SSECgYEA+wgSIqrfkeqqotJx +cGxF4x9v/ldKr5hlhJNoKXLkepkcrvhhxfHKgjWz1nZY/+Rpg42GFMvxWRrGTMIJ +ddiOr24p0HCkusWRMKQL7XxvuHDq0ro8SGqXzqWGuH31R+YNP8dy2pqd3OlwzTgg +8v0wwzx8AuyP5Ys4M20Ewv7Xuy0CgYEA9DSGMU8jmjxJ/uPDCXWOEAqtE78wTtIw +uMBv+ge0inc37xf+fN6D/ziTrJvgw/XyT15pmQdOlXx3Sg1h9XBZeIlaeCdFWrFB +oYrVsiuoXRswfkFwA0yOkCsHyGiI4TE0W1rGbqP158IjwXPczBswWI7i/D6LpINL +BD7YYpfHmeMCgYB08AiKr7Cf54H/gSqo5TcVGzLvdzhqXgKEZKp0DHpUhfivpTLe +o8jjKSMSN2U0JvHj/0xDdGO4YMYhJcll3C4VggSejaybpA46WJJCdt9PtSUv36P +eWAoOkFstfhJuufXGxDstnPtUa1jW881gi5x9D4MmqhZlKXkhtdeApr6LQKBgQDd +ItsJt9JTjpirGfC5lhwI5sIICa9jEO9RveEoluWkJYUfG6k1xgHdkYwYWCdXDFZa +DPKuwnEk6MrU4f181joO7sJf35/sGmuGL0SHzQTvGvn0uqkGM8M9RdoMXqzkzzvM +Jg1ej1bUgXcDbTnaEhzbdLiTFsg5NzMtKwOjdDIpZQKBgEIHeJIqiGjYgf7mUlX2 +vNWgFNlzApkFSCQ8TkzkDOjtCdSHfdRDJ6+q8cS2TSQ7QPoAlI1woS0G48TNbVSo +wD0jNVRTdpA6R5FPsg09ohB/caSn0zlGVha2GS08ceYrn7nn4PSZ/UIYTm3pjUlV +H5tvHv0gG2C5vy3tIYQtSQCk +-----END PRIVATE KEY---- diff --git a/src/cpp/common/tls_certificate_provider.cc b/src/cpp/common/tls_certificate_provider.cc index 7d841b38fd5..88c684b3a45 100644 --- a/src/cpp/common/tls_certificate_provider.cc +++ b/src/cpp/common/tls_certificate_provider.cc @@ -23,6 +23,8 @@ #include #include +#include "src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h" + namespace grpc { namespace experimental { @@ -44,6 +46,13 @@ StaticDataCertificateProvider::~StaticDataCertificateProvider() { grpc_tls_certificate_provider_release(c_provider_); }; +absl::Status StaticDataCertificateProvider::ValidateCredentials() const { + auto* provider = + grpc_core::DownCast( + c_provider_); + return provider->ValidateCredentials(); +} + FileWatcherCertificateProvider::FileWatcherCertificateProvider( const std::string& private_key_path, const std::string& identity_certificate_path, @@ -58,5 +67,12 @@ FileWatcherCertificateProvider::~FileWatcherCertificateProvider() { grpc_tls_certificate_provider_release(c_provider_); }; +absl::Status FileWatcherCertificateProvider::ValidateCredentials() const { + auto* provider = + grpc_core::DownCast( + c_provider_); + return provider->ValidateCredentials(); +} + } // namespace experimental } // namespace grpc diff --git a/test/core/security/BUILD b/test/core/security/BUILD index ed139dd4ffb..62e4b5ef811 100644 --- a/test/core/security/BUILD +++ b/test/core/security/BUILD @@ -439,6 +439,8 @@ grpc_cc_test( srcs = ["grpc_tls_certificate_provider_test.cc"], data = [ "//src/core/tsi/test_creds:ca.pem", + "//src/core/tsi/test_creds:malformed-cert.pem", + "//src/core/tsi/test_creds:malformed-key.pem", "//src/core/tsi/test_creds:multi-domain.key", "//src/core/tsi/test_creds:multi-domain.pem", "//src/core/tsi/test_creds:server0.key", diff --git a/test/core/security/grpc_tls_certificate_provider_test.cc b/test/core/security/grpc_tls_certificate_provider_test.cc index 31abfedee47..d0ce58ecafb 100644 --- a/test/core/security/grpc_tls_certificate_provider_test.cc +++ b/test/core/security/grpc_tls_certificate_provider_test.cc @@ -23,6 +23,7 @@ #include #include "absl/log/check.h" +#include "absl/status/status.h" #include #include @@ -40,6 +41,8 @@ #define SERVER_CERT_PATH_2 "src/core/tsi/test_creds/server0.pem" #define SERVER_KEY_PATH_2 "src/core/tsi/test_creds/server0.key" #define INVALID_PATH "invalid/path" +#define MALFORMED_CERT_PATH "src/core/tsi/test_creds/malformed-cert.pem" +#define MALFORMED_KEY_PATH "src/core/tsi/test_creds/malformed-key.pem" namespace grpc_core { @@ -162,6 +165,8 @@ class GrpcTlsCertificateProviderTest : public ::testing::Test { root_cert_2_ = GetFileContents(CA_CERT_PATH_2); cert_chain_2_ = GetFileContents(SERVER_CERT_PATH_2); private_key_2_ = GetFileContents(SERVER_KEY_PATH_2); + malformed_cert_ = GetFileContents(MALFORMED_CERT_PATH); + malformed_key_ = GetFileContents(MALFORMED_KEY_PATH); } WatcherState* MakeWatcher( @@ -195,6 +200,8 @@ class GrpcTlsCertificateProviderTest : public ::testing::Test { std::string root_cert_2_; std::string private_key_2_; std::string cert_chain_2_; + std::string malformed_cert_; + std::string malformed_key_; RefCountedPtr distributor_; // Use a std::list<> here to avoid the address invalidation caused by internal // reallocation of std::vector<>. @@ -230,6 +237,40 @@ TEST_F(GrpcTlsCertificateProviderTest, StaticDataCertificateProviderCreation) { CancelWatch(watcher_state_3); } +TEST_F(GrpcTlsCertificateProviderTest, + StaticDataCertificateProviderWithGoodPathsAndCredentialValidation) { + StaticDataCertificateProvider provider( + root_cert_, MakeCertKeyPairs(private_key_.c_str(), cert_chain_.c_str())); + EXPECT_EQ(provider.ValidateCredentials(), absl::OkStatus()); +} + +TEST_F(GrpcTlsCertificateProviderTest, + StaticDataCertificateProviderWithMalformedRootCertificate) { + StaticDataCertificateProvider provider( + malformed_cert_, + MakeCertKeyPairs(private_key_.c_str(), cert_chain_.c_str())); + EXPECT_EQ(provider.ValidateCredentials(), + absl::FailedPreconditionError("Invalid PEM.")); +} + +TEST_F(GrpcTlsCertificateProviderTest, + StaticDataCertificateProviderWithMalformedIdentityCertificate) { + StaticDataCertificateProvider provider( + root_cert_, + MakeCertKeyPairs(private_key_.c_str(), malformed_cert_.c_str())); + EXPECT_EQ(provider.ValidateCredentials(), + absl::FailedPreconditionError("Invalid PEM.")); +} + +TEST_F(GrpcTlsCertificateProviderTest, + StaticDataCertificateProviderWithMalformedIdentityKey) { + StaticDataCertificateProvider provider( + root_cert_, + MakeCertKeyPairs(malformed_key_.c_str(), cert_chain_.c_str())); + EXPECT_EQ(provider.ValidateCredentials(), + absl::NotFoundError("No private key found.")); +} + TEST_F(GrpcTlsCertificateProviderTest, FileWatcherCertificateProviderWithGoodPaths) { FileWatcherCertificateProvider provider(SERVER_KEY_PATH, SERVER_CERT_PATH, @@ -258,6 +299,37 @@ TEST_F(GrpcTlsCertificateProviderTest, CancelWatch(watcher_state_3); } +TEST_F(GrpcTlsCertificateProviderTest, + FileWatcherCertificateProviderWithGoodPathsAndCredentialValidation) { + FileWatcherCertificateProvider provider(SERVER_KEY_PATH, SERVER_CERT_PATH, + CA_CERT_PATH, 1); + EXPECT_EQ(provider.ValidateCredentials(), absl::OkStatus()); +} + +TEST_F(GrpcTlsCertificateProviderTest, + FileWatcherCertificateProviderWithMalformedRootCertificate) { + FileWatcherCertificateProvider provider(SERVER_KEY_PATH_2, SERVER_CERT_PATH_2, + MALFORMED_CERT_PATH, 1); + EXPECT_EQ(provider.ValidateCredentials(), + absl::FailedPreconditionError("Invalid PEM.")); +} + +TEST_F(GrpcTlsCertificateProviderTest, + FileWatcherCertificateProviderWithMalformedIdentityCertificate) { + FileWatcherCertificateProvider provider( + SERVER_KEY_PATH_2, MALFORMED_CERT_PATH, CA_CERT_PATH_2, 1); + EXPECT_EQ(provider.ValidateCredentials(), + absl::FailedPreconditionError("Invalid PEM.")); +} + +TEST_F(GrpcTlsCertificateProviderTest, + FileWatcherCertificateProviderWithMalformedIdentityKey) { + FileWatcherCertificateProvider provider( + MALFORMED_KEY_PATH, SERVER_CERT_PATH_2, CA_CERT_PATH_2, 1); + EXPECT_EQ(provider.ValidateCredentials(), + absl::NotFoundError("No private key found.")); +} + TEST_F(GrpcTlsCertificateProviderTest, FileWatcherCertificateProviderWithBadPaths) { FileWatcherCertificateProvider provider(INVALID_PATH, INVALID_PATH, diff --git a/test/cpp/server/BUILD b/test/cpp/server/BUILD index b65ec5c9e86..92423465fb4 100644 --- a/test/cpp/server/BUILD +++ b/test/cpp/server/BUILD @@ -69,6 +69,8 @@ grpc_cc_test( srcs = ["credentials_test.cc"], data = [ "//src/core/tsi/test_creds:ca.pem", + "//src/core/tsi/test_creds:malformed-cert.pem", + "//src/core/tsi/test_creds:malformed-key.pem", "//src/core/tsi/test_creds:server1.key", "//src/core/tsi/test_creds:server1.pem", ], diff --git a/test/cpp/server/credentials_test.cc b/test/cpp/server/credentials_test.cc index b5665c15556..32f14c38752 100644 --- a/test/cpp/server/credentials_test.cc +++ b/test/cpp/server/credentials_test.cc @@ -28,12 +28,14 @@ #include #include "test/core/test_util/test_config.h" +#include "test/core/test_util/tls_utils.h" #include "test/cpp/util/tls_test_utils.h" #define CA_CERT_PATH "src/core/tsi/test_creds/ca.pem" #define SERVER_CERT_PATH "src/core/tsi/test_creds/server1.pem" #define SERVER_KEY_PATH "src/core/tsi/test_creds/server1.key" #define CRL_DIR_PATH "test/core/tsi/test_creds/crl_data/crls" +#define MALFORMED_CERT_PATH "src/core/tsi/test_creds/malformed-cert.pem" namespace { @@ -50,6 +52,7 @@ using ::grpc::experimental::NoOpCertificateVerifier; using ::grpc::experimental::StaticDataCertificateProvider; using ::grpc::experimental::TlsServerCredentials; using ::grpc::experimental::TlsServerCredentialsOptions; +using ::grpc_core::testing::GetFileContents; } // namespace @@ -116,6 +119,40 @@ TEST( CHECK_NE(server_credentials.get(), nullptr); } +TEST(CredentialsTest, + StaticDataCertificateProviderValidationSuccessWithAllCredentials) { + std::string root_certificates = GetFileContents(CA_CERT_PATH); + experimental::IdentityKeyCertPair key_cert_pair; + key_cert_pair.private_key = GetFileContents(SERVER_KEY_PATH); + key_cert_pair.certificate_chain = GetFileContents(SERVER_CERT_PATH); + StaticDataCertificateProvider provider(root_certificates, {key_cert_pair}); + EXPECT_EQ(provider.ValidateCredentials(), absl::OkStatus()); +} + +TEST(CredentialsTest, StaticDataCertificateProviderWithMalformedRoot) { + std::string root_certificates = GetFileContents(MALFORMED_CERT_PATH); + experimental::IdentityKeyCertPair key_cert_pair; + key_cert_pair.private_key = GetFileContents(SERVER_KEY_PATH); + key_cert_pair.certificate_chain = GetFileContents(SERVER_CERT_PATH); + StaticDataCertificateProvider provider(root_certificates, {key_cert_pair}); + EXPECT_EQ(provider.ValidateCredentials(), + absl::FailedPreconditionError("Invalid PEM.")); +} + +TEST(CredentialsTest, + FileWatcherCertificateProviderValidationSuccessWithAllCredentials) { + FileWatcherCertificateProvider provider(SERVER_KEY_PATH, SERVER_CERT_PATH, + CA_CERT_PATH, 1); + EXPECT_EQ(provider.ValidateCredentials(), absl::OkStatus()); +} + +TEST(CredentialsTest, FileWatcherCertificateProviderWithMalformedRoot) { + FileWatcherCertificateProvider provider(SERVER_KEY_PATH, SERVER_CERT_PATH, + MALFORMED_CERT_PATH, 1); + EXPECT_EQ(provider.ValidateCredentials(), + absl::FailedPreconditionError("Invalid PEM.")); +} + TEST(CredentialsTest, TlsServerCredentialsWithCrlChecking) { auto certificate_provider = std::make_shared( SERVER_KEY_PATH, SERVER_CERT_PATH, CA_CERT_PATH, 1); From c7cc8c1eac2f26d078c2b1fe77a229acd0024b18 Mon Sep 17 00:00:00 2001 From: "Mark D. Roth" Date: Mon, 23 Sep 2024 10:43:34 -0700 Subject: [PATCH 07/75] [fault injection] add defensive check against can't happen condition (#37743) Fixes #37698. Closes #37743 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37743 from markdroth:fault_injection_defensive 1684f059118a3a8f47baa1ba6c38e93955c862db PiperOrigin-RevId: 677854945 --- .../ext/filters/fault_injection/fault_injection_filter.cc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/core/ext/filters/fault_injection/fault_injection_filter.cc b/src/core/ext/filters/fault_injection/fault_injection_filter.cc index e52ca7906ee..e0e4d3e031b 100644 --- a/src/core/ext/filters/fault_injection/fault_injection_filter.cc +++ b/src/core/ext/filters/fault_injection/fault_injection_filter.cc @@ -174,6 +174,12 @@ FaultInjectionFilter::MakeInjectionDecision( fi_policy = method_params->fault_injection_policy(index_); } + // Shouldn't ever be null, but just in case, return a no-op decision. + if (fi_policy == nullptr) { + return InjectionDecision(/*max_faults=*/0, /*delay_time=*/Duration::Zero(), + /*abort_request=*/absl::nullopt); + } + grpc_status_code abort_code = fi_policy->abort_code; uint32_t abort_percentage_numerator = fi_policy->abort_percentage_numerator; uint32_t delay_percentage_numerator = fi_policy->delay_percentage_numerator; From cdbc99d81156a80e051d50e9745b2c7640655181 Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Mon, 23 Sep 2024 11:12:06 -0700 Subject: [PATCH 08/75] [tooling] Make start_port_server less spammy when starting for the first time (#37628) This has freaked more than one new team member out historically Closes #37628 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37628 from ctiller:cgf ded4d14b12b20b7ae4ff9470dee6588f0b31e7c6 PiperOrigin-RevId: 677866795 --- tools/run_tests/python_utils/start_port_server.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/run_tests/python_utils/start_port_server.py b/tools/run_tests/python_utils/start_port_server.py index 4205dddb852..9d9f0b10450 100644 --- a/tools/run_tests/python_utils/start_port_server.py +++ b/tools/run_tests/python_utils/start_port_server.py @@ -31,7 +31,7 @@ import jobset _PORT_SERVER_PORT = 32766 -def start_port_server(): +def start_port_server(verbose=False): # check if a compatible port server is running # if incompatible (version mismatch) ==> start a new one # if not running ==> start a new one @@ -45,7 +45,8 @@ def start_port_server(): logging.info("detected port server running version %d", version) running = True except Exception as e: - logging.exception("failed to detect port server") + if verbose: + logging.exception("failed to detect port server") running = False if running: current_version = int( From d1fddda871b8e5b255896384c8821e24b1f74214 Mon Sep 17 00:00:00 2001 From: Yijie Ma Date: Mon, 23 Sep 2024 11:27:03 -0700 Subject: [PATCH 09/75] [lb_policy] Remove 2 nullptr checks for `endpoint_list_` in round_robin and wrr (#37685) Closes #37673 Closes #37685 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37685 from yijiem:nullptr-check-lb fecac2b751f094543946a3e408beb9e5c76a69d5 PiperOrigin-RevId: 677872993 --- src/core/load_balancing/round_robin/round_robin.cc | 8 ++------ .../weighted_round_robin/weighted_round_robin.cc | 8 +++----- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/src/core/load_balancing/round_robin/round_robin.cc b/src/core/load_balancing/round_robin/round_robin.cc index 1d9d5b2e2d9..5c4c23370ed 100644 --- a/src/core/load_balancing/round_robin/round_robin.cc +++ b/src/core/load_balancing/round_robin/round_robin.cc @@ -361,14 +361,10 @@ void RoundRobin::RoundRobinEndpointList:: (num_ready_ > 0 && AllEndpointsSeenInitialState()) || num_transient_failure_ == size())) { if (GRPC_TRACE_FLAG_ENABLED(round_robin)) { - const std::string old_counters_string = - round_robin->endpoint_list_ != nullptr - ? round_robin->endpoint_list_->CountersString() - : ""; LOG(INFO) << "[RR " << round_robin << "] swapping out child list " << round_robin->endpoint_list_.get() << " (" - << old_counters_string << ") in favor of " << this << " (" - << CountersString() << ")"; + << round_robin->endpoint_list_->CountersString() + << ") in favor of " << this << " (" << CountersString() << ")"; } round_robin->endpoint_list_ = std::move(round_robin->latest_pending_endpoint_list_); diff --git a/src/core/load_balancing/weighted_round_robin/weighted_round_robin.cc b/src/core/load_balancing/weighted_round_robin/weighted_round_robin.cc index d1276d417d3..c0403f84bd1 100644 --- a/src/core/load_balancing/weighted_round_robin/weighted_round_robin.cc +++ b/src/core/load_balancing/weighted_round_robin/weighted_round_robin.cc @@ -947,12 +947,10 @@ void WeightedRoundRobin::WrrEndpointList:: (num_ready_ > 0 && AllEndpointsSeenInitialState()) || num_transient_failure_ == size())) { if (GRPC_TRACE_FLAG_ENABLED(weighted_round_robin_lb)) { - const std::string old_counters_string = - wrr->endpoint_list_ != nullptr ? wrr->endpoint_list_->CountersString() - : ""; LOG(INFO) << "[WRR " << wrr << "] swapping out endpoint list " - << wrr->endpoint_list_.get() << " (" << old_counters_string - << ") in favor of " << this << " (" << CountersString() << ")"; + << wrr->endpoint_list_.get() << " (" + << wrr->endpoint_list_->CountersString() << ") in favor of " + << this << " (" << CountersString() << ")"; } wrr->endpoint_list_ = std::move(wrr->latest_pending_endpoint_list_); } From a1b83dc99526e1124220980b4ddea6d94b197763 Mon Sep 17 00:00:00 2001 From: Yijie Ma Date: Mon, 23 Sep 2024 11:46:41 -0700 Subject: [PATCH 10/75] [alts] Fix memory leak in `atls_frame_protector.cc::alts_create_frame_protector()` (#37737) Fix https://github.com/grpc/grpc/issues/37727. A better idea might be to set up Fuzzing for these APIs to find those sort of things. Maybe that can be a next step if we want to further hardening things. Closes #37737 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37737 from yijiem:memory-leak-alts-2 6be8a49e63729abdf5b3bde05a2a148b1b59f521 PiperOrigin-RevId: 677880955 --- .../alts/frame_protector/alts_frame_protector.cc | 1 + .../frame_protector/alts_frame_protector_test.cc | 13 +++++++++++++ 2 files changed, 14 insertions(+) diff --git a/src/core/tsi/alts/frame_protector/alts_frame_protector.cc b/src/core/tsi/alts/frame_protector/alts_frame_protector.cc index ee88688e4bb..b8593f225e2 100644 --- a/src/core/tsi/alts/frame_protector/alts_frame_protector.cc +++ b/src/core/tsi/alts/frame_protector/alts_frame_protector.cc @@ -380,6 +380,7 @@ tsi_result alts_create_frame_protector(const uint8_t* key, size_t key_size, if (status != GRPC_STATUS_OK) { LOG(ERROR) << "Failed to create ALTS crypters, " << error_details; gpr_free(error_details); + gpr_free(impl); return TSI_INTERNAL_ERROR; } /// diff --git a/test/core/tsi/alts/frame_protector/alts_frame_protector_test.cc b/test/core/tsi/alts/frame_protector/alts_frame_protector_test.cc index 551788819fc..06b18b7f7ae 100644 --- a/test/core/tsi/alts/frame_protector/alts_frame_protector_test.cc +++ b/test/core/tsi/alts/frame_protector/alts_frame_protector_test.cc @@ -402,6 +402,19 @@ TEST(AltsFrameProtectorTest, MainTest) { alts_test_do_round_trip_all(/*rekey=*/true); } +TEST(AltsFrameProtectorTest, MemoryLeakTest) { + tsi_frame_protector* client_frame_protector = nullptr; + // Create a key with a wrong key length (off-by-one). + uint8_t* key = nullptr; + size_t key_length = kAes128GcmKeyLength - 1; + gsec_test_random_array(&key, key_length); + EXPECT_EQ(alts_create_frame_protector(key, key_length, /*is_client=*/true, + /*is_rekey=*/false, nullptr, + &client_frame_protector), + TSI_INTERNAL_ERROR); + gpr_free(key); +} + int main(int argc, char** argv) { ::testing::InitGoogleTest(&argc, argv); return RUN_ALL_TESTS(); From 509db2463ae5a9e9b768aa57b08d97c0bf79b757 Mon Sep 17 00:00:00 2001 From: "Mark D. Roth" Date: Mon, 23 Sep 2024 12:08:54 -0700 Subject: [PATCH 11/75] [health checking] connected subchannel may be null on READY notification (#37781) b/360085586 Closes #37781 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37781 from markdroth:health_check_crash_fix 7eaf22ecd5b70a75469dbcf80bdeb73463257231 PiperOrigin-RevId: 677889828 --- src/core/load_balancing/health_check_client.cc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/core/load_balancing/health_check_client.cc b/src/core/load_balancing/health_check_client.cc index 523c1bd342a..b2d3f1ac3a9 100644 --- a/src/core/load_balancing/health_check_client.cc +++ b/src/core/load_balancing/health_check_client.cc @@ -403,13 +403,17 @@ void HealthProducer::OnConnectivityStateChange(grpc_connectivity_state state, << ": subchannel state update: state=" << ConnectivityStateName(state) << " status=" << status; MutexLock lock(&mu_); - state_ = state; - status_ = status; if (state == GRPC_CHANNEL_READY) { connected_subchannel_ = subchannel_->connected_subchannel(); + // If the subchannel became disconnected again before we got this + // notification, then just ignore the READY notification. We should + // get another notification shortly indicating a different state. + if (connected_subchannel_ == nullptr) return; } else { connected_subchannel_.reset(); } + state_ = state; + status_ = status; for (const auto& p : health_checkers_) { p.second->OnConnectivityStateChangeLocked(state, status); } From 8bad4481ba00af89178944fcab1a0aa2b2a6e18c Mon Sep 17 00:00:00 2001 From: Arjan Singh Bal <46515553+arjan-bal@users.noreply.github.com> Date: Mon, 23 Sep 2024 12:39:06 -0700 Subject: [PATCH 12/75] [Interop]Rebuild Go base image to use go1.23.1 (#37723) Passing manual build: https://btx.cloud.google.com/invocations/9adb3cd8-628c-42e5-a7a3-c2ba1ab6127f Closes #37723 PiperOrigin-RevId: 677900305 --- .../interoptest/grpc_interop_go/Dockerfile.template | 4 ++++ tools/bazelify_tests/dockerimage_current_versions.bzl | 2 +- tools/dockerfile/interoptest/grpc_interop_go.current_version | 2 +- tools/dockerfile/interoptest/grpc_interop_go/Dockerfile | 4 ++++ 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/templates/tools/dockerfile/interoptest/grpc_interop_go/Dockerfile.template b/templates/tools/dockerfile/interoptest/grpc_interop_go/Dockerfile.template index c661cd4d199..bf6d317fe7c 100644 --- a/templates/tools/dockerfile/interoptest/grpc_interop_go/Dockerfile.template +++ b/templates/tools/dockerfile/interoptest/grpc_interop_go/Dockerfile.template @@ -14,6 +14,10 @@ # See the License for the specific language governing permissions and # limitations under the License. + # Since the image names depend on the digest of the Dockerfile, updating the + # the following comment is a simple way to re-build the image with a new Go + # version. + # latest points to 1.23.1 at the time of building. FROM golang:latest <%include file="../../go_path.include"/> diff --git a/tools/bazelify_tests/dockerimage_current_versions.bzl b/tools/bazelify_tests/dockerimage_current_versions.bzl index f530880c612..5a349762058 100644 --- a/tools/bazelify_tests/dockerimage_current_versions.bzl +++ b/tools/bazelify_tests/dockerimage_current_versions.bzl @@ -72,7 +72,7 @@ DOCKERIMAGE_CURRENT_VERSIONS = { "tools/dockerfile/interoptest/grpc_interop_aspnetcore.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_interop_aspnetcore@sha256:8e2e732e78724a8382c340dca72e7653c5f82c251a3110fa2874cc00ba538878", "tools/dockerfile/interoptest/grpc_interop_cxx.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_interop_cxx@sha256:e5a474d33773d52ec6a8abbe2d61ee0c2a9c2b5f48793a5ea3b82c4445becf3f", "tools/dockerfile/interoptest/grpc_interop_dart.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_interop_dart@sha256:4915a280788126dad029858eb384dbbef2dc18cadccb434df6450dfd7a4929f2", - "tools/dockerfile/interoptest/grpc_interop_go.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_interop_go@sha256:9d02b61552a93770ebb022f588daf9acd1088d29197fe120e0b082ede73f4584", + "tools/dockerfile/interoptest/grpc_interop_go.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_interop_go@sha256:c925667feb3e065abf586a9e8b028f64b4673cb94bfb4b5e389c652ce906f5dc", "tools/dockerfile/interoptest/grpc_interop_go1.11.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_interop_go1.11@sha256:f2fe3a0a581c687ee4217bf58fd42b18bb1f63d3d006f1b67379ff553b0e23c6", "tools/dockerfile/interoptest/grpc_interop_go1.16.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_interop_go1.16@sha256:3767f47c9d06584c6c07b7ab536e13f3e87550330e6c2652ad288d3a72b0de23", "tools/dockerfile/interoptest/grpc_interop_go1.19.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_interop_go1.19@sha256:889e7ff34399a5e16af87940d1eaa239e56da307f7faca3f8f1d28379c2e3df3", diff --git a/tools/dockerfile/interoptest/grpc_interop_go.current_version b/tools/dockerfile/interoptest/grpc_interop_go.current_version index 9be91cba0c4..2aca19d40be 100644 --- a/tools/dockerfile/interoptest/grpc_interop_go.current_version +++ b/tools/dockerfile/interoptest/grpc_interop_go.current_version @@ -1 +1 @@ -us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_interop_go:98dba9a99a13bf3cd11a4ebdde4fea2e3eaa9b41@sha256:9d02b61552a93770ebb022f588daf9acd1088d29197fe120e0b082ede73f4584 \ No newline at end of file +us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_interop_go:969ce4614d1152a43f9083e7d08f1932c63a1616@sha256:c925667feb3e065abf586a9e8b028f64b4673cb94bfb4b5e389c652ce906f5dc \ No newline at end of file diff --git a/tools/dockerfile/interoptest/grpc_interop_go/Dockerfile b/tools/dockerfile/interoptest/grpc_interop_go/Dockerfile index 38e85431532..bf41ce181e0 100644 --- a/tools/dockerfile/interoptest/grpc_interop_go/Dockerfile +++ b/tools/dockerfile/interoptest/grpc_interop_go/Dockerfile @@ -12,6 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. +# Since the image names depend on the digest of the Dockerfile, updating the +# the following comment is a simple way to re-build the image with a new Go +# version. +# latest points to 1.23.1 at the time of building. FROM golang:latest # Using login shell removes Go from path, so we add it. From c8765eb9c48a462a379ae8376c04b65cc85d6566 Mon Sep 17 00:00:00 2001 From: Yijie Ma Date: Mon, 23 Sep 2024 14:39:48 -0700 Subject: [PATCH 13/75] [OTel plugin] Do not crash when the gauge in `AddCallback` is different from the gauge in `Report` (#37764) Log error message instead of crashing for this API misuse. Closes #37764 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37764 from yijiem:report-different-gauge-wont-crash 1b6e912bfc65c44b754e9fa143f8c22e15ba49ef PiperOrigin-RevId: 677944595 --- src/cpp/ext/otel/otel_plugin.cc | 18 ++++++++++ test/cpp/ext/otel/otel_plugin_test.cc | 47 +++++++++++++++++++++++++++ 2 files changed, 65 insertions(+) diff --git a/src/cpp/ext/otel/otel_plugin.cc b/src/cpp/ext/otel/otel_plugin.cc index c904df2e40a..7f71ec517f6 100644 --- a/src/cpp/ext/otel/otel_plugin.cc +++ b/src/cpp/ext/otel/otel_plugin.cc @@ -302,6 +302,15 @@ void OpenTelemetryPluginImpl::CallbackMetricReporter::ReportInt64( grpc_core::GlobalInstrumentsRegistry::GetInstrumentDescriptor(handle); CHECK(descriptor.label_keys.size() == label_values.size()); CHECK(descriptor.optional_label_keys.size() == optional_values.size()); + if ((*callback_gauge_state)->caches.find(key_) == + (*callback_gauge_state)->caches.end()) { + LOG(ERROR) << "This may occur when the gauge used in AddCallback is " + "different from the gauge used in Report. This indicates a " + "misuse of the API. The value " + << value << " will not be recorded for instrument " + << handle.index; + return; + } auto& cell = (*callback_gauge_state)->caches.at(key_); std::vector key; key.reserve(label_values.size() + @@ -330,6 +339,15 @@ void OpenTelemetryPluginImpl::CallbackMetricReporter::ReportDouble( grpc_core::GlobalInstrumentsRegistry::GetInstrumentDescriptor(handle); CHECK(descriptor.label_keys.size() == label_values.size()); CHECK(descriptor.optional_label_keys.size() == optional_values.size()); + if ((*callback_gauge_state)->caches.find(key_) == + (*callback_gauge_state)->caches.end()) { + LOG(ERROR) << "This may occur when the gauge used in AddCallback is " + "different from the gauge used in Report. This indicates a " + "misuse of the API. The value " + << value << " will not be recorded for instrument " + << handle.index; + return; + } auto& cell = (*callback_gauge_state)->caches.at(key_); std::vector key; key.reserve(label_values.size() + diff --git a/test/cpp/ext/otel/otel_plugin_test.cc b/test/cpp/ext/otel/otel_plugin_test.cc index 22b971ac370..d5f95377d00 100644 --- a/test/cpp/ext/otel/otel_plugin_test.cc +++ b/test/cpp/ext/otel/otel_plugin_test.cc @@ -2085,6 +2085,53 @@ TEST_F(OpenTelemetryPluginCallbackMetricsTest, VerifyCallbacksAreCleanedUp) { EXPECT_EQ(report_count_2, 2 * kIterations); } +TEST_F(OpenTelemetryPluginCallbackMetricsTest, + ReportDifferentGaugeThanRegisteredWontCrash) { + constexpr absl::string_view kInt64CallbackGaugeMetric = + "yet_another_int64_callback_gauge"; + constexpr absl::string_view kDoubleCallbackGaugeMetric = + "yet_another_double_callback_gauge"; + auto integer_gauge_handle = + grpc_core::GlobalInstrumentsRegistry::RegisterCallbackInt64Gauge( + kInt64CallbackGaugeMetric, "An int64 callback gauge.", "unit", + /*enable_by_default=*/true) + .Build(); + auto double_gauge_handle = + grpc_core::GlobalInstrumentsRegistry::RegisterCallbackDoubleGauge( + kDoubleCallbackGaugeMetric, "A double callback gauge.", "unit", + /*enable_by_default=*/true) + .Build(); + Init(std::move(Options().set_metric_names( + {kInt64CallbackGaugeMetric, kDoubleCallbackGaugeMetric}))); + auto stats_plugins = + grpc_core::GlobalStatsPluginRegistry::GetStatsPluginsForChannel( + grpc_core::experimental::StatsPluginChannelScope( + "dns:///localhost:8080", "", endpoint_config_)); + // Registers integer_gauge_handle but reports double_gauge_handle. + int report_count_1 = 0; + double double_value_1 = 0.5; + auto registered_metric_callback_1 = stats_plugins.RegisterCallback( + [&](grpc_core::CallbackMetricReporter& reporter) { + ++report_count_1; + reporter.Report(double_gauge_handle, double_value_1++, {}, {}); + }, + grpc_core::Duration::Milliseconds(50) * grpc_test_slowdown_factor(), + integer_gauge_handle); + constexpr int kIterations = 50; + { + MetricsCollectorThread collector{ + this, + grpc_core::Duration::Milliseconds(100) * grpc_test_slowdown_factor(), + kIterations, + [&](const absl::flat_hash_map< + std::string, + std::vector>& + data) { return false; }}; + } + // Verify that callbacks are invoked + EXPECT_EQ(report_count_1, kIterations); +} + TEST(OpenTelemetryPluginMetricsEnablingDisablingTest, TestEnableDisableAPIs) { grpc::internal::OpenTelemetryPluginBuilderImpl builder; // First disable all metrics From 08a777e658f4535b3ad13fdc9b944cd811c1b38d Mon Sep 17 00:00:00 2001 From: Eugene Ostroukhov Date: Mon, 23 Sep 2024 14:53:19 -0700 Subject: [PATCH 14/75] [doc] Add xDS fallback to the feature matrix (#37676) Closes #37676 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37676 from grpc:eugeneo-xds-fallback-matrix 34cdf83b8654fa4d3dd1b79a5c010d541938edbd PiperOrigin-RevId: 677949315 --- doc/grpc_xds_features.md | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/grpc_xds_features.md b/doc/grpc_xds_features.md index 3d673302e9b..07519b88032 100644 --- a/doc/grpc_xds_features.md +++ b/doc/grpc_xds_features.md @@ -81,3 +81,4 @@ LRS Custom Metrics Support | [A64](https://github.com/grpc/proposal/blob/master/ mTLS Credentials in xDS Bootstrap File | [A65](https://github.com/grpc/proposal/blob/master/A65-xds-mtls-creds-in-bootstrap.md) | v1.65.0 | | v1.61.0 | | Stateful Session Affinity | [A55](https://github.com/grpc/proposal/blob/master/A55-xds-stateful-session-affinity.md), [A60](https://github.com/grpc/proposal/blob/master/A60-xds-stateful-session-affinity-weighted-clusters.md), [A75](https://github.com/grpc/proposal/blob/master/A75-xds-aggregate-cluster-behavior-fixes.md) | v1.61.0 | | | | xDS Locality label for OpenTelemetry metrics | [A78](https://github.com/grpc/proposal/blob/master/A78-grpc-metrics-wrr-pf-xds.md) | v1.63.0 (C++) | v1.64.0 | | | +xDS Fallback | [A71](https://github.com/grpc/proposal/blob/master/A71-xds-fallback.md) | v1.67.0 | | | | From e88ac072b7e88f52974b9593268a7d1e0bc5e24e Mon Sep 17 00:00:00 2001 From: Eugene Ostroukhov Date: Mon, 23 Sep 2024 15:07:38 -0700 Subject: [PATCH 15/75] [sample] Client-side flow control (#37604) Closes #37604 PiperOrigin-RevId: 677954309 --- examples/cpp/flow_control/BUILD | 27 ++++ examples/cpp/flow_control/CMakeLists.txt | 1 + .../client_flow_control_client.cc | 126 ++++++++++++++++++ .../client_flow_control_server.cc | 111 +++++++++++++++ 4 files changed, 265 insertions(+) create mode 100644 examples/cpp/flow_control/client_flow_control_client.cc create mode 100644 examples/cpp/flow_control/client_flow_control_server.cc diff --git a/examples/cpp/flow_control/BUILD b/examples/cpp/flow_control/BUILD index 9cd66865c3c..981b7530838 100644 --- a/examples/cpp/flow_control/BUILD +++ b/examples/cpp/flow_control/BUILD @@ -14,6 +14,33 @@ licenses(["notice"]) +cc_binary( + name = "client_flow_control_client", + srcs = ["client_flow_control_client.cc"], + defines = ["BAZEL_BUILD"], + deps = [ + "//:grpc++", + "//:grpc++_reflection", + "//examples/protos:helloworld_cc_grpc", + "@com_google_absl//absl/flags:flag", + "@com_google_absl//absl/flags:parse", + ], +) + +cc_binary( + name = "client_flow_control_server", + srcs = ["client_flow_control_server.cc"], + defines = ["BAZEL_BUILD"], + deps = [ + "//:grpc++", + "//:grpc++_reflection", + "//examples/protos:helloworld_cc_grpc", + "@com_google_absl//absl/flags:flag", + "@com_google_absl//absl/flags:parse", + "@com_google_absl//absl/strings:str_format", + ], +) + cc_binary( name = "server_flow_control_client", srcs = ["server_flow_control_client.cc"], diff --git a/examples/cpp/flow_control/CMakeLists.txt b/examples/cpp/flow_control/CMakeLists.txt index c546af0a274..0d6d4353177 100644 --- a/examples/cpp/flow_control/CMakeLists.txt +++ b/examples/cpp/flow_control/CMakeLists.txt @@ -59,6 +59,7 @@ target_link_libraries(hw_grpc_proto # Targets greeter_[async_](client|server) foreach(_target + client_flow_control_client client_flow_control_server server_flow_control_client server_flow_control_server) add_executable(${_target} "${_target}.cc") target_link_libraries(${_target} diff --git a/examples/cpp/flow_control/client_flow_control_client.cc b/examples/cpp/flow_control/client_flow_control_client.cc new file mode 100644 index 00000000000..933489d7d04 --- /dev/null +++ b/examples/cpp/flow_control/client_flow_control_client.cc @@ -0,0 +1,126 @@ +/* + * + * 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 +#include + +#include "absl/flags/flag.h" +#include "absl/flags/parse.h" + +#include +#include +#include + +#ifdef BAZEL_BUILD +#include "examples/protos/helloworld.grpc.pb.h" +#else +#include "helloworld.grpc.pb.h" +#endif + +ABSL_FLAG(std::string, target, "localhost:50051", "Server address"); + +using grpc::CallbackServerContext; +using grpc::Channel; +using grpc::ClientContext; +using grpc::Server; +using grpc::ServerBuilder; +using grpc::ServerUnaryReactor; +using grpc::Status; +using helloworld::Greeter; +using helloworld::HelloReply; +using helloworld::HelloRequest; + +namespace { + +// Sends requests as quickly as possible and times how long it takes to perform +// the write operation. +class GreeterClientReactor final + : public grpc::ClientBidiReactor { + public: + explicit GreeterClientReactor(int reqs, size_t req_size) : reqs_(reqs) { + req_.set_name(std::string(req_size, '*')); + } + + void Start() { + absl::MutexLock lock(&mu_); + StartCall(); + Write(); + } + + ~GreeterClientReactor() override { + absl::MutexLock lock(&mu_); + mu_.Await(absl::Condition(+[](bool* done) { return *done; }, &done_)); + } + + void OnWriteDone(bool ok) override { + absl::MutexLock lock(&mu_); + std::cout << "Writing took " << absl::Now() - *time_ << std::endl; + time_ = absl::nullopt; + if (ok) { + Write(); + } + } + + void OnDone(const grpc::Status& status) override { + if (status.ok()) { + std::cout << "Done\n"; + } else { + std::cout << "Done with error: [" << status.error_code() << "] " + << status.error_message() << "\n"; + } + absl::MutexLock lock(&mu_); + done_ = true; + } + + private: + void Write() ABSL_EXCLUSIVE_LOCKS_REQUIRED(&mu_) { + if (reqs_ == 0) { + StartWritesDone(); + return; + } + --reqs_; + StartWrite(&req_); + time_ = absl::Now(); + } + + absl::Mutex mu_; + bool done_ ABSL_GUARDED_BY(&mu_) = false; + HelloRequest req_; + size_t reqs_; + absl::optional time_ ABSL_GUARDED_BY(mu_); +}; + +} // namespace + +int main(int argc, char** argv) { + absl::ParseCommandLine(argc, argv); + grpc::ChannelArguments channel_arguments; + auto channel = grpc::CreateCustomChannel(absl::GetFlag(FLAGS_target), + grpc::InsecureChannelCredentials(), + channel_arguments); + auto stub = Greeter::NewStub(channel); + // Send 10 requests with 3Mb payload. This will eventually fill the buffer + // and make + GreeterClientReactor reactor(10, 3 * 1024 * 1024); + grpc::ClientContext context; + stub->async()->SayHelloBidiStream(&context, &reactor); + reactor.Start(); + return 0; +} diff --git a/examples/cpp/flow_control/client_flow_control_server.cc b/examples/cpp/flow_control/client_flow_control_server.cc new file mode 100644 index 00000000000..31de9275d7c --- /dev/null +++ b/examples/cpp/flow_control/client_flow_control_server.cc @@ -0,0 +1,111 @@ +/* + * + * Copyright 2021 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 +#include + +#include "absl/flags/flag.h" +#include "absl/flags/parse.h" +#include "absl/strings/str_format.h" + +#include +#include +#include + +#ifdef BAZEL_BUILD +#include "examples/protos/helloworld.grpc.pb.h" +#else +#include "helloworld.grpc.pb.h" +#endif + +ABSL_FLAG(uint16_t, port, 50051, "Server port for the service"); +ABSL_FLAG(size_t, quota, 20, "Resource quota, in megabytes"); + +namespace { + +// +// Server reactor that is slow to read incoming messages, causing the buffers +// to fill. +// +class SlowReadingBidiReactor final + : public grpc::ServerBidiReactor { + public: + SlowReadingBidiReactor() { StartRead(&req_); } + + void OnReadDone(bool ok) override { + std::cout << "Recieved request with " << req_.name().length() + << " bytes name\n"; + if (!ok) { + Finish(grpc::Status::OK); + return; + } + sleep(1); + StartRead(&req_); + } + + void OnDone() override { + std::cout << "Done\n"; + delete this; + } + + private: + absl::Mutex mu_; + helloworld::HelloRequest req_; +}; + +// Logic and data behind the server's behavior. +class GreeterServiceImpl final : public helloworld::Greeter::CallbackService { + grpc::ServerBidiReactor* + SayHelloBidiStream(grpc::CallbackServerContext* /* context */) override { + return new SlowReadingBidiReactor(); + } +}; + +} // namespace + +void RunServer(uint16_t port) { + std::string server_address = absl::StrFormat("0.0.0.0:%d", port); + GreeterServiceImpl service; + + grpc::EnableDefaultHealthCheckService(true); + grpc::reflection::InitProtoReflectionServerBuilderPlugin(); + grpc::ServerBuilder builder; + // Listen on the given address without any authentication mechanism. + builder.AddListeningPort(server_address, grpc::InsecureServerCredentials()); + // Register "service" as the instance through which we'll communicate with + // clients. In this case it corresponds to an *synchronous* service. + builder.RegisterService(&service); + grpc::ResourceQuota quota; + quota.Resize(absl::GetFlag(FLAGS_quota) * 1024 * 1024); + // Finally assemble the server. + auto server = builder.BuildAndStart(); + std::cout << "Server listening on " << server_address << std::endl; + + // Wait for the server to shutdown. Note that some other thread must be + // responsible for shutting down the server for this call to ever return. + server->Wait(); +} + +int main(int argc, char** argv) { + absl::ParseCommandLine(argc, argv); + RunServer(absl::GetFlag(FLAGS_port)); + return 0; +} From 7f550b11b8bd82c8434a47fe929b7cae52f51592 Mon Sep 17 00:00:00 2001 From: Eugene Ostroukhov Date: Mon, 23 Sep 2024 15:19:26 -0700 Subject: [PATCH 16/75] [experiments] Use proper delete for array deallocation (#37704) Fixes: #37693 Closes #37704 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37704 from grpc:eugeneo-delete-array 98e026c1525b5868e86837f5283ad72d896e11a0 PiperOrigin-RevId: 677958660 --- src/core/lib/experiments/config.cc | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/core/lib/experiments/config.cc b/src/core/lib/experiments/config.cc index 3abe6870f81..cab35e0f04a 100644 --- a/src/core/lib/experiments/config.cc +++ b/src/core/lib/experiments/config.cc @@ -21,6 +21,7 @@ #include #include #include +#include #include "absl/functional/any_invocable.h" #include "absl/log/check.h" @@ -66,8 +67,8 @@ absl::AnyInvocable* g_check_constraints_cb = class TestExperiments { public: TestExperiments(const ExperimentMetadata* experiment_metadata, - size_t num_experiments) { - enabled_ = new bool[num_experiments]; + size_t num_experiments) + : enabled_(num_experiments) { for (size_t i = 0; i < num_experiments; i++) { if (g_check_constraints_cb != nullptr) { enabled_[i] = (*g_check_constraints_cb)(experiment_metadata[i]); @@ -91,12 +92,10 @@ class TestExperiments { } // Overloading [] operator to access elements in array style - bool operator[](int index) { return enabled_[index]; } - - ~TestExperiments() { delete enabled_; } + bool operator[](int index) const { return enabled_[index]; } private: - bool* enabled_; + std::vector enabled_; }; TestExperiments* g_test_experiments = nullptr; From 7379a9fbbe3c97dceb7f9eaa258861633f4a0ea2 Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Mon, 23 Sep 2024 15:21:00 -0700 Subject: [PATCH 17/75] [call-v3] Outbound request buffer (#37448) Basic building block for retries, hedging: buffer outgoing messages & metadata, allow for replay whilst buffered (with a single reader able to read once buffering ends) Closes #37448 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37448 from ctiller:once-again-into-the-breach-my-friends 79cb1210547a095adaff603167a63a7c29676d81 PiperOrigin-RevId: 677959212 --- CMakeLists.txt | 101 ++++ build_autogenerated.yaml | 168 ++++++ src/core/BUILD | 17 + src/core/call/request_buffer.cc | 168 ++++++ src/core/call/request_buffer.h | 182 +++++++ src/core/lib/transport/message.h | 5 + test/core/call/BUILD | 13 + test/core/call/request_buffer_test.cc | 722 ++++++++++++++++++++++++++ tools/run_tests/generated/tests.json | 24 + 9 files changed, 1400 insertions(+) create mode 100644 src/core/call/request_buffer.cc create mode 100644 src/core/call/request_buffer.h create mode 100644 test/core/call/request_buffer_test.cc diff --git a/CMakeLists.txt b/CMakeLists.txt index 30472acaacf..b401fc53b49 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1329,6 +1329,7 @@ if(gRPC_BUILD_TESTS) if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) add_dependencies(buildtests_cxx remove_stream_from_stalled_lists_test) endif() + add_dependencies(buildtests_cxx request_buffer_test) add_dependencies(buildtests_cxx request_with_flags_test) add_dependencies(buildtests_cxx request_with_payload_test) if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) @@ -24090,6 +24091,106 @@ endif() endif() if(gRPC_BUILD_TESTS) +add_executable(request_buffer_test + src/core/call/request_buffer.cc + src/core/ext/upb-gen/google/protobuf/any.upb_minitable.c + src/core/ext/upb-gen/google/rpc/status.upb_minitable.c + src/core/lib/channel/channel_args.cc + src/core/lib/compression/compression.cc + src/core/lib/compression/compression_internal.cc + src/core/lib/debug/trace.cc + src/core/lib/debug/trace_flags.cc + src/core/lib/experiments/config.cc + src/core/lib/experiments/experiments.cc + src/core/lib/iomgr/closure.cc + src/core/lib/iomgr/combiner.cc + src/core/lib/iomgr/error.cc + src/core/lib/iomgr/exec_ctx.cc + src/core/lib/iomgr/executor.cc + src/core/lib/iomgr/iomgr_internal.cc + src/core/lib/promise/activity.cc + src/core/lib/promise/party.cc + src/core/lib/resource_quota/arena.cc + src/core/lib/resource_quota/connection_quota.cc + src/core/lib/resource_quota/memory_quota.cc + src/core/lib/resource_quota/periodic_update.cc + src/core/lib/resource_quota/resource_quota.cc + src/core/lib/resource_quota/thread_quota.cc + src/core/lib/slice/percent_encoding.cc + src/core/lib/slice/slice.cc + src/core/lib/slice/slice_buffer.cc + src/core/lib/slice/slice_string_helpers.cc + src/core/lib/surface/channel_stack_type.cc + src/core/lib/transport/call_arena_allocator.cc + 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/error_utils.cc + src/core/lib/transport/message.cc + src/core/lib/transport/metadata.cc + src/core/lib/transport/metadata_batch.cc + src/core/lib/transport/parsed_metadata.cc + src/core/lib/transport/status_conversion.cc + src/core/lib/transport/timeout_encoding.cc + src/core/util/dump_args.cc + src/core/util/glob.cc + src/core/util/latent_see.cc + src/core/util/per_cpu.cc + src/core/util/ref_counted_string.cc + src/core/util/status_helper.cc + src/core/util/time.cc + test/core/call/request_buffer_test.cc +) +if(WIN32 AND MSVC) + if(BUILD_SHARED_LIBS) + target_compile_definitions(request_buffer_test + PRIVATE + "GPR_DLL_IMPORTS" + ) + endif() +endif() +target_compile_features(request_buffer_test PUBLIC cxx_std_14) +target_include_directories(request_buffer_test + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_RE2_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_XXHASH_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} +) + +target_link_libraries(request_buffer_test + ${_gRPC_ALLTARGETS_LIBRARIES} + gtest + upb_mini_descriptor_lib + upb_wire_lib + absl::config + absl::no_destructor + absl::flat_hash_map + absl::inlined_vector + absl::function_ref + absl::hash + absl::type_traits + absl::statusor + absl::utility + gpr +) + + +endif() +if(gRPC_BUILD_TESTS) + add_executable(request_with_flags_test src/core/ext/transport/chaotic_good/client/chaotic_good_connector.cc src/core/ext/transport/chaotic_good/client_transport.cc diff --git a/build_autogenerated.yaml b/build_autogenerated.yaml index c70e708cea4..f256a8355c3 100644 --- a/build_autogenerated.yaml +++ b/build_autogenerated.yaml @@ -15297,6 +15297,174 @@ targets: - linux - posix - mac +- name: request_buffer_test + gtest: true + build: test + language: c++ + headers: + - src/core/call/request_buffer.h + - src/core/ext/upb-gen/google/protobuf/any.upb.h + - src/core/ext/upb-gen/google/protobuf/any.upb_minitable.h + - src/core/ext/upb-gen/google/rpc/status.upb.h + - src/core/ext/upb-gen/google/rpc/status.upb_minitable.h + - src/core/lib/channel/channel_args.h + - src/core/lib/compression/compression_internal.h + - src/core/lib/debug/trace.h + - src/core/lib/debug/trace_flags.h + - src/core/lib/debug/trace_impl.h + - src/core/lib/event_engine/event_engine_context.h + - src/core/lib/experiments/config.h + - src/core/lib/experiments/experiments.h + - src/core/lib/iomgr/closure.h + - src/core/lib/iomgr/combiner.h + - src/core/lib/iomgr/error.h + - src/core/lib/iomgr/exec_ctx.h + - src/core/lib/iomgr/executor.h + - src/core/lib/iomgr/iomgr_internal.h + - src/core/lib/promise/activity.h + - src/core/lib/promise/context.h + - src/core/lib/promise/detail/basic_seq.h + - src/core/lib/promise/detail/promise_factory.h + - src/core/lib/promise/detail/promise_like.h + - src/core/lib/promise/detail/seq_state.h + - src/core/lib/promise/detail/status.h + - src/core/lib/promise/exec_ctx_wakeup_scheduler.h + - src/core/lib/promise/for_each.h + - src/core/lib/promise/if.h + - src/core/lib/promise/interceptor_list.h + - src/core/lib/promise/latch.h + - src/core/lib/promise/loop.h + - src/core/lib/promise/map.h + - src/core/lib/promise/party.h + - src/core/lib/promise/pipe.h + - src/core/lib/promise/poll.h + - src/core/lib/promise/prioritized_race.h + - src/core/lib/promise/promise.h + - src/core/lib/promise/race.h + - src/core/lib/promise/seq.h + - src/core/lib/promise/status_flag.h + - src/core/lib/promise/try_seq.h + - src/core/lib/promise/wait_set.h + - src/core/lib/resource_quota/arena.h + - src/core/lib/resource_quota/connection_quota.h + - src/core/lib/resource_quota/memory_quota.h + - src/core/lib/resource_quota/periodic_update.h + - src/core/lib/resource_quota/resource_quota.h + - src/core/lib/resource_quota/thread_quota.h + - src/core/lib/slice/percent_encoding.h + - src/core/lib/slice/slice.h + - src/core/lib/slice/slice_buffer.h + - src/core/lib/slice/slice_internal.h + - src/core/lib/slice/slice_refcount.h + - src/core/lib/slice/slice_string_helpers.h + - src/core/lib/surface/channel_stack_type.h + - src/core/lib/transport/call_arena_allocator.h + - src/core/lib/transport/call_filters.h + - src/core/lib/transport/call_final_info.h + - src/core/lib/transport/call_spine.h + - src/core/lib/transport/call_state.h + - src/core/lib/transport/custom_metadata.h + - src/core/lib/transport/error_utils.h + - src/core/lib/transport/http2_errors.h + - src/core/lib/transport/message.h + - src/core/lib/transport/metadata.h + - src/core/lib/transport/metadata_batch.h + - src/core/lib/transport/metadata_compression_traits.h + - src/core/lib/transport/parsed_metadata.h + - src/core/lib/transport/simple_slice_based_metadata.h + - src/core/lib/transport/status_conversion.h + - src/core/lib/transport/timeout_encoding.h + - src/core/util/atomic_utils.h + - src/core/util/avl.h + - src/core/util/bitset.h + - src/core/util/chunked_vector.h + - src/core/util/cpp_impl_of.h + - src/core/util/down_cast.h + - src/core/util/dual_ref_counted.h + - src/core/util/dump_args.h + - src/core/util/glob.h + - src/core/util/if_list.h + - src/core/util/latent_see.h + - src/core/util/manual_constructor.h + - src/core/util/orphanable.h + - src/core/util/packed_table.h + - src/core/util/per_cpu.h + - src/core/util/ref_counted.h + - src/core/util/ref_counted_ptr.h + - src/core/util/ref_counted_string.h + - src/core/util/ring_buffer.h + - src/core/util/sorted_pack.h + - src/core/util/spinlock.h + - src/core/util/status_helper.h + - src/core/util/table.h + - src/core/util/time.h + - src/core/util/type_list.h + - test/core/promise/poll_matcher.h + - third_party/upb/upb/generated_code_support.h + src: + - src/core/call/request_buffer.cc + - src/core/ext/upb-gen/google/protobuf/any.upb_minitable.c + - src/core/ext/upb-gen/google/rpc/status.upb_minitable.c + - src/core/lib/channel/channel_args.cc + - src/core/lib/compression/compression.cc + - src/core/lib/compression/compression_internal.cc + - src/core/lib/debug/trace.cc + - src/core/lib/debug/trace_flags.cc + - src/core/lib/experiments/config.cc + - src/core/lib/experiments/experiments.cc + - src/core/lib/iomgr/closure.cc + - src/core/lib/iomgr/combiner.cc + - src/core/lib/iomgr/error.cc + - src/core/lib/iomgr/exec_ctx.cc + - src/core/lib/iomgr/executor.cc + - src/core/lib/iomgr/iomgr_internal.cc + - src/core/lib/promise/activity.cc + - src/core/lib/promise/party.cc + - src/core/lib/resource_quota/arena.cc + - src/core/lib/resource_quota/connection_quota.cc + - src/core/lib/resource_quota/memory_quota.cc + - src/core/lib/resource_quota/periodic_update.cc + - src/core/lib/resource_quota/resource_quota.cc + - src/core/lib/resource_quota/thread_quota.cc + - src/core/lib/slice/percent_encoding.cc + - src/core/lib/slice/slice.cc + - src/core/lib/slice/slice_buffer.cc + - src/core/lib/slice/slice_string_helpers.cc + - src/core/lib/surface/channel_stack_type.cc + - src/core/lib/transport/call_arena_allocator.cc + - 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/error_utils.cc + - src/core/lib/transport/message.cc + - src/core/lib/transport/metadata.cc + - src/core/lib/transport/metadata_batch.cc + - src/core/lib/transport/parsed_metadata.cc + - src/core/lib/transport/status_conversion.cc + - src/core/lib/transport/timeout_encoding.cc + - src/core/util/dump_args.cc + - src/core/util/glob.cc + - src/core/util/latent_see.cc + - src/core/util/per_cpu.cc + - src/core/util/ref_counted_string.cc + - src/core/util/status_helper.cc + - src/core/util/time.cc + - test/core/call/request_buffer_test.cc + deps: + - gtest + - upb_mini_descriptor_lib + - upb_wire_lib + - absl/base:config + - absl/base:no_destructor + - absl/container:flat_hash_map + - absl/container:inlined_vector + - absl/functional:function_ref + - absl/hash:hash + - absl/meta:type_traits + - absl/status:statusor + - absl/utility:utility + - gpr - name: request_with_flags_test gtest: true build: test diff --git a/src/core/BUILD b/src/core/BUILD index 8220654c837..f5949c8e05f 100644 --- a/src/core/BUILD +++ b/src/core/BUILD @@ -1608,6 +1608,23 @@ grpc_cc_library( ], ) +grpc_cc_library( + name = "request_buffer", + srcs = [ + "call/request_buffer.cc", + ], + hdrs = [ + "call/request_buffer.h", + ], + external_deps = ["absl/types:optional"], + deps = [ + "call_spine", + "message", + "metadata", + "wait_set", + ], +) + grpc_cc_library( name = "slice_refcount", hdrs = [ diff --git a/src/core/call/request_buffer.cc b/src/core/call/request_buffer.cc new file mode 100644 index 00000000000..257743cbb90 --- /dev/null +++ b/src/core/call/request_buffer.cc @@ -0,0 +1,168 @@ +// 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/call/request_buffer.h" + +#include + +#include "absl/types/optional.h" + +namespace grpc_core { + +ValueOrFailure RequestBuffer::PushClientInitialMetadata( + ClientMetadataHandle md) { + MutexLock lock(&mu_); + if (absl::get_if(&state_)) return Failure{}; + auto& buffering = absl::get(state_); + CHECK_EQ(buffering.initial_metadata.get(), nullptr); + buffering.initial_metadata = std::move(md); + buffering.buffered += buffering.initial_metadata->TransportSize(); + WakeupAsyncAllPullers(); + return buffering.buffered; +} + +Poll> RequestBuffer::PollPushMessage( + MessageHandle& message) { + MutexLock lock(&mu_); + if (absl::get_if(&state_)) return Failure{}; + size_t buffered = 0; + if (auto* buffering = absl::get_if(&state_)) { + if (winner_ != nullptr) return PendingPush(); + buffering->buffered += message->payload()->Length(); + buffered = buffering->buffered; + buffering->messages.push_back(std::move(message)); + } else { + auto& streaming = absl::get(state_); + CHECK_EQ(streaming.end_of_stream, false); + if (streaming.message != nullptr) { + return PendingPush(); + } + streaming.message = std::move(message); + } + WakeupAsyncAllPullers(); + return buffered; +} + +StatusFlag RequestBuffer::FinishSends() { + MutexLock lock(&mu_); + if (absl::get_if(&state_)) return Failure{}; + if (auto* buffering = absl::get_if(&state_)) { + Buffered buffered(std::move(buffering->initial_metadata), + std::move(buffering->messages)); + state_.emplace(std::move(buffered)); + } else { + auto& streaming = absl::get(state_); + CHECK_EQ(streaming.end_of_stream, false); + streaming.end_of_stream = true; + } + WakeupAsyncAllPullers(); + return Success{}; +} + +void RequestBuffer::Cancel(absl::Status error) { + MutexLock lock(&mu_); + if (absl::holds_alternative(state_)) return; + state_.emplace(std::move(error)); + WakeupAsyncAllPullers(); +} + +void RequestBuffer::Commit(Reader* winner) { + MutexLock lock(&mu_); + CHECK_EQ(winner_, nullptr); + winner_ = winner; + if (auto* buffering = absl::get_if(&state_)) { + if (buffering->initial_metadata != nullptr && + winner->message_index_ == buffering->messages.size() && + winner->pulled_client_initial_metadata_) { + state_.emplace(); + } + } else if (auto* buffered = absl::get_if(&state_)) { + CHECK_NE(buffered->initial_metadata.get(), nullptr); + if (winner->message_index_ == buffered->messages.size()) { + state_.emplace().end_of_stream = true; + } + } + WakeupAsyncAllPullersExcept(winner); +} + +void RequestBuffer::WakeupAsyncAllPullersExcept(Reader* except_reader) { + for (auto wakeup_reader : readers_) { + if (wakeup_reader == except_reader) continue; + wakeup_reader->pull_waker_.WakeupAsync(); + } +} + +Poll> +RequestBuffer::Reader::PollPullClientInitialMetadata() { + MutexLock lock(&buffer_->mu_); + if (buffer_->winner_ != nullptr && buffer_->winner_ != this) { + error_ = absl::CancelledError("Another call was chosen"); + return Failure{}; + } + if (auto* buffering = absl::get_if(&buffer_->state_)) { + if (buffering->initial_metadata.get() == nullptr) { + return buffer_->PendingPull(this); + } + pulled_client_initial_metadata_ = true; + auto result = ClaimObject(buffering->initial_metadata); + buffer_->MaybeSwitchToStreaming(); + return result; + } + if (auto* buffered = absl::get_if(&buffer_->state_)) { + pulled_client_initial_metadata_ = true; + return ClaimObject(buffered->initial_metadata); + } + error_ = absl::get(buffer_->state_).error; + return Failure{}; +} + +Poll>> +RequestBuffer::Reader::PollPullMessage() { + ReleasableMutexLock lock(&buffer_->mu_); + if (buffer_->winner_ != nullptr && buffer_->winner_ != this) { + error_ = absl::CancelledError("Another call was chosen"); + return Failure{}; + } + if (auto* buffering = absl::get_if(&buffer_->state_)) { + if (message_index_ == buffering->messages.size()) { + return buffer_->PendingPull(this); + } + const auto idx = message_index_; + auto result = ClaimObject(buffering->messages[idx]); + ++message_index_; + buffer_->MaybeSwitchToStreaming(); + return result; + } + if (auto* buffered = absl::get_if(&buffer_->state_)) { + if (message_index_ == buffered->messages.size()) return absl::nullopt; + const auto idx = message_index_; + ++message_index_; + return ClaimObject(buffered->messages[idx]); + } + if (auto* streaming = absl::get_if(&buffer_->state_)) { + if (streaming->message == nullptr) { + if (streaming->end_of_stream) return absl::nullopt; + return buffer_->PendingPull(this); + } + auto msg = std::move(streaming->message); + auto waker = std::move(buffer_->push_waker_); + lock.Release(); + waker.Wakeup(); + return msg; + } + error_ = absl::get(buffer_->state_).error; + return Failure{}; +} + +} // namespace grpc_core diff --git a/src/core/call/request_buffer.h b/src/core/call/request_buffer.h new file mode 100644 index 00000000000..719a562bdba --- /dev/null +++ b/src/core/call/request_buffer.h @@ -0,0 +1,182 @@ +// 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_CALL_REQUEST_BUFFER_H +#define GRPC_SRC_CORE_CALL_REQUEST_BUFFER_H + +#include + +#include "src/core/lib/transport/call_spine.h" +#include "src/core/lib/transport/message.h" +#include "src/core/lib/transport/metadata.h" + +namespace grpc_core { + +// Outbound request buffer. +// Collects client->server metadata and messages whilst in its initial buffering +// mode. In buffering mode it can have zero or more Reader objects attached to +// it. +// The buffer can later be switched to committed mode, at which point it +// will have exactly one Reader object attached to it. +// Callers can choose to switch to committed mode based upon policy of their +// choice. +class RequestBuffer { + public: + // One reader of the request buffer. + class Reader { + public: + explicit Reader(RequestBuffer* buffer) ABSL_LOCKS_EXCLUDED(buffer->mu_) + : buffer_(buffer) { + buffer->AddReader(this); + } + ~Reader() ABSL_LOCKS_EXCLUDED(buffer_->mu_) { buffer_->RemoveReader(this); } + + Reader(const Reader&) = delete; + Reader& operator=(const Reader&) = delete; + + // Pull client initial metadata. Returns a promise that resolves to + // ValueOrFailure. + GRPC_MUST_USE_RESULT auto PullClientInitialMetadata() { + return [this]() { return PollPullClientInitialMetadata(); }; + } + // Pull a message. Returns a promise that resolves to a + // ValueOrFailure>. + GRPC_MUST_USE_RESULT auto PullMessage() { + return [this]() { return PollPullMessage(); }; + } + + absl::Status TakeError() { return std::move(error_); } + + private: + friend class RequestBuffer; + + Poll> PollPullClientInitialMetadata(); + Poll>> PollPullMessage(); + + template + T ClaimObject(T& object) ABSL_EXCLUSIVE_LOCKS_REQUIRED(buffer_->mu_) { + if (buffer_->winner_ == this) return std::move(object); + return CopyObject(object); + } + + ClientMetadataHandle CopyObject(const ClientMetadataHandle& md) { + return Arena::MakePooled(md->Copy()); + } + + MessageHandle CopyObject(const MessageHandle& msg) { + return Arena::MakePooled(msg->payload()->Copy(), msg->flags()); + } + + RequestBuffer* const buffer_; + bool pulled_client_initial_metadata_ = false; + size_t message_index_ = 0; + absl::Status error_; + Waker pull_waker_; + }; + + // Push ClientInitialMetadata into the buffer. + // This is instantaneous, and returns success with the amount of data + // buffered, or failure. + ValueOrFailure PushClientInitialMetadata(ClientMetadataHandle md); + // Resolves to a ValueOrFailure where the size_t is the amount of data + // buffered (or 0 if we're in committed mode). + GRPC_MUST_USE_RESULT auto PushMessage(MessageHandle message) { + return [this, message = std::move(message)]() mutable { + return PollPushMessage(message); + }; + } + // Push end of stream (client half-closure). + StatusFlag FinishSends(); + // Cancel the request, propagate failure to all readers. + void Cancel(absl::Status error = absl::CancelledError()); + + // Switch to committed mode - needs to be called exactly once with the winning + // reader. All other readers will see failure. + void Commit(Reader* winner); + + private: + // Buffering state: we're collecting metadata and messages. + struct Buffering { + // Initial metadata, or nullptr if not yet received. + ClientMetadataHandle initial_metadata; + // Buffered messages. + absl::InlinedVector messages; + // Amount of data buffered. + size_t buffered = 0; + }; + // Buffered state: all messages have been collected (the client has finished + // sending). + struct Buffered { + Buffered(ClientMetadataHandle md, + absl::InlinedVector msgs) + : initial_metadata(std::move(md)), messages(std::move(msgs)) {} + ClientMetadataHandle initial_metadata; + absl::InlinedVector messages; + }; + // Streaming state: we're streaming messages to the server. + // This implies winner_ is set. + struct Streaming { + MessageHandle message; + bool end_of_stream = false; + }; + // Cancelled state: the request has been cancelled. + struct Cancelled { + explicit Cancelled(absl::Status error) : error(std::move(error)) {} + absl::Status error; + }; + using State = absl::variant; + + Poll> PollPushMessage(MessageHandle& message); + Pending PendingPull(Reader* reader) ABSL_EXCLUSIVE_LOCKS_REQUIRED(mu_) { + reader->pull_waker_ = Activity::current()->MakeOwningWaker(); + return Pending{}; + } + Pending PendingPush() ABSL_EXCLUSIVE_LOCKS_REQUIRED(mu_) { + push_waker_ = Activity::current()->MakeOwningWaker(); + return Pending{}; + } + void MaybeSwitchToStreaming() ABSL_EXCLUSIVE_LOCKS_REQUIRED(mu_) { + auto& buffering = absl::get(state_); + if (winner_ == nullptr) return; + if (winner_->message_index_ < buffering.messages.size()) return; + state_.emplace(); + push_waker_.Wakeup(); + } + + void WakeupAsyncAllPullers() ABSL_EXCLUSIVE_LOCKS_REQUIRED(mu_) { + WakeupAsyncAllPullersExcept(nullptr); + } + void WakeupAsyncAllPullersExcept(Reader* except_reader) + ABSL_EXCLUSIVE_LOCKS_REQUIRED(mu_); + + void AddReader(Reader* reader) ABSL_EXCLUSIVE_LOCKS_REQUIRED(mu_) { + readers_.insert(reader); + } + + void RemoveReader(Reader* reader) ABSL_EXCLUSIVE_LOCKS_REQUIRED(mu_) { + readers_.erase(reader); + } + + Mutex mu_; + Reader* winner_ ABSL_GUARDED_BY(mu_){nullptr}; + State state_ ABSL_GUARDED_BY(mu_){Buffering{}}; + // TODO(ctiller): change this to an intrusively linked list to avoid + // allocations. + absl::flat_hash_set readers_ ABSL_GUARDED_BY(mu_); + Waker push_waker_ ABSL_GUARDED_BY(mu_); +}; + +} // namespace grpc_core + +#endif // GRPC_SRC_CORE_CALL_REQUEST_BUFFER_H diff --git a/src/core/lib/transport/message.h b/src/core/lib/transport/message.h index 6390e9886be..f7375d060a9 100644 --- a/src/core/lib/transport/message.h +++ b/src/core/lib/transport/message.h @@ -49,6 +49,11 @@ class Message { std::string DebugString() const; + template + friend void AbslStringify(Sink& sink, const Message& message) { + sink.Append(message.DebugString()); + } + private: SliceBuffer payload_; uint32_t flags_ = 0; diff --git a/test/core/call/BUILD b/test/core/call/BUILD index 3c726fbf280..75a590cd3e7 100644 --- a/test/core/call/BUILD +++ b/test/core/call/BUILD @@ -87,3 +87,16 @@ grpc_cc_benchmark( "//src/core:default_event_engine", ], ) + +grpc_cc_test( + name = "request_buffer_test", + srcs = [ + "request_buffer_test.cc", + ], + external_deps = ["gtest"], + language = "C++", + deps = [ + "//src/core:request_buffer", + "//test/core/promise:poll_matcher", + ], +) diff --git a/test/core/call/request_buffer_test.cc b/test/core/call/request_buffer_test.cc new file mode 100644 index 00000000000..98aba0ac495 --- /dev/null +++ b/test/core/call/request_buffer_test.cc @@ -0,0 +1,722 @@ +// 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/call/request_buffer.h" + +#include "gtest/gtest.h" + +#include "test/core/promise/poll_matcher.h" + +using testing::Mock; +using testing::StrictMock; + +namespace grpc_core { + +namespace { +void CrashOnParseError(absl::string_view error, const Slice& data) { + LOG(FATAL) << "Failed to parse " << error << " from " + << data.as_string_view(); +} + +// A mock activity that can be activated and deactivated. +class MockActivity : public Activity, public Wakeable { + public: + MOCK_METHOD(void, WakeupRequested, ()); + + void ForceImmediateRepoll(WakeupMask /*mask*/) override { WakeupRequested(); } + void Orphan() override {} + Waker MakeOwningWaker() override { return Waker(this, 0); } + Waker MakeNonOwningWaker() override { return Waker(this, 0); } + void Wakeup(WakeupMask /*mask*/) override { WakeupRequested(); } + void WakeupAsync(WakeupMask /*mask*/) override { WakeupRequested(); } + void Drop(WakeupMask /*mask*/) override {} + std::string DebugTag() const override { return "MockActivity"; } + std::string ActivityDebugTag(WakeupMask /*mask*/) const override { + return DebugTag(); + } + + void Activate() { + if (scoped_activity_ == nullptr) { + scoped_activity_ = std::make_unique(this); + } + } + + void Deactivate() { scoped_activity_.reset(); } + + private: + std::unique_ptr scoped_activity_; +}; + +#define EXPECT_WAKEUP(activity, statement) \ + EXPECT_CALL((activity), WakeupRequested()).Times(::testing::AtLeast(1)); \ + statement; \ + Mock::VerifyAndClearExpectations(&(activity)); + +ClientMetadataHandle TestMetadata() { + ClientMetadataHandle md = Arena::MakePooledForOverwrite(); + md->Append("key", Slice::FromStaticString("value"), CrashOnParseError); + return md; +} + +MessageHandle TestMessage(int index = 0) { + return Arena::MakePooled( + SliceBuffer(Slice::FromCopiedString(absl::StrCat("message ", index))), 0); +} + +MATCHER(IsTestMetadata, "") { + if (arg == nullptr) return false; + std::string backing; + if (arg->GetStringValue("key", &backing) != "value") { + *result_listener << arg->DebugString(); + return false; + } + return true; +} + +MATCHER(IsTestMessage, "") { + if (arg == nullptr) return false; + if (arg->flags() != 0) { + *result_listener << "flags: " << arg->flags(); + return false; + } + if (arg->payload()->JoinIntoString() != "message 0") { + *result_listener << "payload: " << arg->payload()->JoinIntoString(); + return false; + } + return true; +} + +MATCHER_P(IsTestMessage, index, "") { + if (arg == nullptr) return false; + if (arg->flags() != 0) { + *result_listener << "flags: " << arg->flags(); + return false; + } + if (arg->payload()->JoinIntoString() != absl::StrCat("message ", index)) { + *result_listener << "payload: " << arg->payload()->JoinIntoString(); + return false; + } + return true; +} + +} // namespace + +TEST(RequestBufferTest, NoOp) { RequestBuffer buffer; } + +TEST(RequestBufferTest, PushThenPullClientInitialMetadata) { + RequestBuffer buffer; + EXPECT_EQ(buffer.PushClientInitialMetadata(TestMetadata()), 40); + RequestBuffer::Reader reader(&buffer); + auto poll = reader.PullClientInitialMetadata()(); + ASSERT_THAT(poll, IsReady()); + auto value = std::move(poll.value()); + ASSERT_TRUE(value.ok()); + EXPECT_THAT(*value, IsTestMetadata()); +} + +TEST(RequestBufferTest, PushThenFinishThenPullClientInitialMetadata) { + RequestBuffer buffer; + EXPECT_EQ(buffer.PushClientInitialMetadata(TestMetadata()), 40); + buffer.FinishSends(); + RequestBuffer::Reader reader(&buffer); + auto poll = reader.PullClientInitialMetadata()(); + ASSERT_THAT(poll, IsReady()); + auto value = std::move(poll.value()); + ASSERT_TRUE(value.ok()); + EXPECT_THAT(*value, IsTestMetadata()); +} + +TEST(RequestBufferTest, PullThenPushClientInitialMetadata) { + StrictMock activity; + RequestBuffer buffer; + RequestBuffer::Reader reader(&buffer); + activity.Activate(); + auto poller = reader.PullClientInitialMetadata(); + auto poll = poller(); + EXPECT_THAT(poll, IsPending()); + ClientMetadataHandle md = Arena::MakePooledForOverwrite(); + md->Append("key", Slice::FromStaticString("value"), CrashOnParseError); + EXPECT_WAKEUP(activity, + EXPECT_EQ(buffer.PushClientInitialMetadata(std::move(md)), 40)); + poll = poller(); + ASSERT_THAT(poll, IsReady()); + auto value = std::move(poll.value()); + ASSERT_TRUE(value.ok()); + EXPECT_THAT(*value, IsTestMetadata()); +} + +TEST(RequestBufferTest, PushThenPullMessage) { + RequestBuffer buffer; + EXPECT_EQ(buffer.PushClientInitialMetadata(TestMetadata()), 40); + auto pusher = buffer.PushMessage(TestMessage()); + EXPECT_THAT(pusher(), IsReady(49)); + RequestBuffer::Reader reader(&buffer); + auto pull_md = reader.PullClientInitialMetadata(); + EXPECT_THAT(pull_md(), IsReady()); // value tested elsewhere + auto pull_msg = reader.PullMessage(); + auto poll_msg = pull_msg(); + ASSERT_THAT(poll_msg, IsReady()); + ASSERT_TRUE(poll_msg.value().ok()); + ASSERT_TRUE(poll_msg.value().value().has_value()); + EXPECT_THAT(poll_msg.value().value().value(), IsTestMessage()); +} + +TEST(RequestBufferTest, PushThenPullMessageStreamBeforeInitialMetadata) { + RequestBuffer buffer; + EXPECT_EQ(buffer.PushClientInitialMetadata(TestMetadata()), 40); + auto pusher = buffer.PushMessage(TestMessage()); + EXPECT_THAT(pusher(), IsReady(49)); + RequestBuffer::Reader reader(&buffer); + buffer.Commit(&reader); + auto pull_md = reader.PullClientInitialMetadata(); + EXPECT_THAT(pull_md(), IsReady()); // value tested elsewhere + auto pull_msg = reader.PullMessage(); + auto poll_msg = pull_msg(); + ASSERT_THAT(poll_msg, IsReady()); + ASSERT_TRUE(poll_msg.value().ok()); + ASSERT_TRUE(poll_msg.value().value().has_value()); + EXPECT_THAT(poll_msg.value().value().value(), IsTestMessage()); +} + +TEST(RequestBufferTest, PushThenPullMessageStreamBeforeFirstMessage) { + RequestBuffer buffer; + EXPECT_EQ(buffer.PushClientInitialMetadata(TestMetadata()), 40); + auto pusher = buffer.PushMessage(TestMessage()); + EXPECT_THAT(pusher(), IsReady(49)); + RequestBuffer::Reader reader(&buffer); + auto pull_md = reader.PullClientInitialMetadata(); + EXPECT_THAT(pull_md(), IsReady()); // value tested elsewhere + buffer.Commit(&reader); + auto pull_msg = reader.PullMessage(); + auto poll_msg = pull_msg(); + ASSERT_THAT(poll_msg, IsReady()); + ASSERT_TRUE(poll_msg.value().ok()); + ASSERT_TRUE(poll_msg.value().value().has_value()); + EXPECT_THAT(poll_msg.value().value().value(), IsTestMessage()); +} + +TEST(RequestBufferTest, PullThenPushMessage) { + StrictMock activity; + activity.Activate(); + RequestBuffer buffer; + EXPECT_EQ(buffer.PushClientInitialMetadata(TestMetadata()), 40); + RequestBuffer::Reader reader(&buffer); + auto pull_md = reader.PullClientInitialMetadata(); + EXPECT_THAT(pull_md(), IsReady()); // value tested elsewhere + auto pull_msg = reader.PullMessage(); + auto poll_msg = pull_msg(); + EXPECT_THAT(poll_msg, IsPending()); + auto pusher = buffer.PushMessage(TestMessage()); + EXPECT_WAKEUP(activity, EXPECT_THAT(pusher(), IsReady(49))); + poll_msg = pull_msg(); + ASSERT_THAT(poll_msg, IsReady()); + ASSERT_TRUE(poll_msg.value().ok()); + ASSERT_TRUE(poll_msg.value().value().has_value()); + EXPECT_THAT(poll_msg.value().value().value(), IsTestMessage()); +} + +TEST(RequestBufferTest, PullThenPushMessageSwitchBeforePullMessage) { + StrictMock activity; + activity.Activate(); + RequestBuffer buffer; + EXPECT_EQ(buffer.PushClientInitialMetadata(TestMetadata()), 40); + RequestBuffer::Reader reader(&buffer); + auto pull_md = reader.PullClientInitialMetadata(); + EXPECT_THAT(pull_md(), IsReady()); // value tested elsewhere + buffer.Commit(&reader); + auto pull_msg = reader.PullMessage(); + auto poll_msg = pull_msg(); + EXPECT_THAT(poll_msg, IsPending()); + auto pusher = buffer.PushMessage(TestMessage()); + EXPECT_WAKEUP(activity, EXPECT_THAT(pusher(), IsReady(0))); + poll_msg = pull_msg(); + ASSERT_THAT(poll_msg, IsReady()); + ASSERT_TRUE(poll_msg.value().ok()); + ASSERT_TRUE(poll_msg.value().value().has_value()); + EXPECT_THAT(poll_msg.value().value().value(), IsTestMessage()); +} + +TEST(RequestBufferTest, PullThenPushMessageSwitchBeforePushMessage) { + StrictMock activity; + activity.Activate(); + RequestBuffer buffer; + EXPECT_EQ(buffer.PushClientInitialMetadata(TestMetadata()), 40); + RequestBuffer::Reader reader(&buffer); + auto pull_md = reader.PullClientInitialMetadata(); + EXPECT_THAT(pull_md(), IsReady()); // value tested elsewhere + auto pull_msg = reader.PullMessage(); + auto poll_msg = pull_msg(); + EXPECT_THAT(poll_msg, IsPending()); + buffer.Commit(&reader); + auto pusher = buffer.PushMessage(TestMessage()); + EXPECT_WAKEUP(activity, EXPECT_THAT(pusher(), IsReady(0))); + poll_msg = pull_msg(); + ASSERT_THAT(poll_msg, IsReady()); + ASSERT_TRUE(poll_msg.value().ok()); + ASSERT_TRUE(poll_msg.value().value().has_value()); + EXPECT_THAT(poll_msg.value().value().value(), IsTestMessage()); +} + +TEST(RequestBufferTest, PullThenPushMessageSwitchAfterPushMessage) { + StrictMock activity; + activity.Activate(); + RequestBuffer buffer; + EXPECT_EQ(buffer.PushClientInitialMetadata(TestMetadata()), 40); + RequestBuffer::Reader reader(&buffer); + auto pull_md = reader.PullClientInitialMetadata(); + EXPECT_THAT(pull_md(), IsReady()); // value tested elsewhere + auto pull_msg = reader.PullMessage(); + auto poll_msg = pull_msg(); + EXPECT_THAT(poll_msg, IsPending()); + auto pusher = buffer.PushMessage(TestMessage()); + EXPECT_WAKEUP(activity, EXPECT_THAT(pusher(), IsReady(49))); + buffer.Commit(&reader); + poll_msg = pull_msg(); + ASSERT_THAT(poll_msg, IsReady()); + ASSERT_TRUE(poll_msg.value().ok()); + ASSERT_TRUE(poll_msg.value().value().has_value()); + EXPECT_THAT(poll_msg.value().value().value(), IsTestMessage()); +} + +TEST(RequestBufferTest, PullEndOfStream) { + RequestBuffer buffer; + EXPECT_EQ(buffer.PushClientInitialMetadata(TestMetadata()), 40); + auto pusher = buffer.PushMessage(TestMessage()); + EXPECT_THAT(pusher(), IsReady(49)); + RequestBuffer::Reader reader(&buffer); + auto pull_md = reader.PullClientInitialMetadata(); + EXPECT_THAT(pull_md(), IsReady()); // value tested elsewhere + auto pull_msg = reader.PullMessage(); + auto poll_msg = pull_msg(); + ASSERT_THAT(poll_msg, IsReady()); + ASSERT_TRUE(poll_msg.value().ok()); + ASSERT_TRUE(poll_msg.value().value().has_value()); + EXPECT_THAT(poll_msg.value().value().value(), IsTestMessage()); + EXPECT_EQ(buffer.FinishSends(), Success{}); + auto pull_msg2 = reader.PullMessage(); + poll_msg = pull_msg2(); + ASSERT_THAT(poll_msg, IsReady()); + ASSERT_TRUE(poll_msg.value().ok()); + ASSERT_FALSE(poll_msg.value().value().has_value()); +} + +TEST(RequestBufferTest, PullEndOfStreamSwitchBeforePullMessage) { + RequestBuffer buffer; + EXPECT_EQ(buffer.PushClientInitialMetadata(TestMetadata()), 40); + auto pusher = buffer.PushMessage(TestMessage()); + EXPECT_THAT(pusher(), IsReady(49)); + RequestBuffer::Reader reader(&buffer); + auto pull_md = reader.PullClientInitialMetadata(); + EXPECT_THAT(pull_md(), IsReady()); // value tested elsewhere + buffer.Commit(&reader); + auto pull_msg = reader.PullMessage(); + auto poll_msg = pull_msg(); + ASSERT_THAT(poll_msg, IsReady()); + ASSERT_TRUE(poll_msg.value().ok()); + ASSERT_TRUE(poll_msg.value().value().has_value()); + EXPECT_THAT(poll_msg.value().value().value(), IsTestMessage()); + EXPECT_EQ(buffer.FinishSends(), Success{}); + auto pull_msg2 = reader.PullMessage(); + poll_msg = pull_msg2(); + ASSERT_THAT(poll_msg, IsReady()); + ASSERT_TRUE(poll_msg.value().ok()); + ASSERT_FALSE(poll_msg.value().value().has_value()); +} + +TEST(RequestBufferTest, PullEndOfStreamSwitchBeforePushMessage) { + StrictMock activity; + activity.Activate(); + RequestBuffer buffer; + EXPECT_EQ(buffer.PushClientInitialMetadata(TestMetadata()), 40); + RequestBuffer::Reader reader(&buffer); + buffer.Commit(&reader); + auto pusher = buffer.PushMessage(TestMessage()); + EXPECT_THAT(pusher(), IsPending()); + auto pull_md = reader.PullClientInitialMetadata(); + EXPECT_WAKEUP(activity, + EXPECT_THAT(pull_md(), IsReady())); // value tested elsewhere + EXPECT_THAT(pusher(), IsReady(0)); + auto pull_msg = reader.PullMessage(); + auto poll_msg = pull_msg(); + ASSERT_THAT(poll_msg, IsReady()); + ASSERT_TRUE(poll_msg.value().ok()); + ASSERT_TRUE(poll_msg.value().value().has_value()); + EXPECT_THAT(poll_msg.value().value().value(), IsTestMessage()); + EXPECT_EQ(buffer.FinishSends(), Success{}); + auto pull_msg2 = reader.PullMessage(); + poll_msg = pull_msg2(); + ASSERT_THAT(poll_msg, IsReady()); + ASSERT_TRUE(poll_msg.value().ok()); + ASSERT_FALSE(poll_msg.value().value().has_value()); +} + +TEST(RequestBufferTest, PullEndOfStreamQueuedWithMessage) { + RequestBuffer buffer; + EXPECT_EQ(buffer.PushClientInitialMetadata(TestMetadata()), 40); + auto pusher = buffer.PushMessage(TestMessage()); + EXPECT_THAT(pusher(), IsReady(49)); + EXPECT_EQ(buffer.FinishSends(), Success{}); + RequestBuffer::Reader reader(&buffer); + auto pull_md = reader.PullClientInitialMetadata(); + EXPECT_THAT(pull_md(), IsReady()); // value tested elsewhere + auto pull_msg = reader.PullMessage(); + auto poll_msg = pull_msg(); + ASSERT_THAT(poll_msg, IsReady()); + ASSERT_TRUE(poll_msg.value().ok()); + ASSERT_TRUE(poll_msg.value().value().has_value()); + EXPECT_THAT(poll_msg.value().value().value(), IsTestMessage()); + auto pull_msg2 = reader.PullMessage(); + poll_msg = pull_msg2(); + ASSERT_THAT(poll_msg, IsReady()); + ASSERT_TRUE(poll_msg.value().ok()); + ASSERT_FALSE(poll_msg.value().value().has_value()); +} + +TEST(RequestBufferTest, + PullEndOfStreamQueuedWithMessageSwitchBeforePushMessage) { + StrictMock activity; + activity.Activate(); + RequestBuffer buffer; + EXPECT_EQ(buffer.PushClientInitialMetadata(TestMetadata()), 40); + RequestBuffer::Reader reader(&buffer); + buffer.Commit(&reader); + auto pusher = buffer.PushMessage(TestMessage()); + EXPECT_THAT(pusher(), IsPending()); + auto pull_md = reader.PullClientInitialMetadata(); + EXPECT_WAKEUP(activity, + EXPECT_THAT(pull_md(), IsReady())); // value tested elsewhere + EXPECT_THAT(pusher(), IsReady(0)); + EXPECT_EQ(buffer.FinishSends(), Success{}); + auto pull_msg = reader.PullMessage(); + auto poll_msg = pull_msg(); + ASSERT_THAT(poll_msg, IsReady()); + ASSERT_TRUE(poll_msg.value().ok()); + ASSERT_TRUE(poll_msg.value().value().has_value()); + EXPECT_THAT(poll_msg.value().value().value(), IsTestMessage()); + auto pull_msg2 = reader.PullMessage(); + poll_msg = pull_msg2(); + ASSERT_THAT(poll_msg, IsReady()); + ASSERT_TRUE(poll_msg.value().ok()); + ASSERT_FALSE(poll_msg.value().value().has_value()); +} + +TEST(RequestBufferTest, + PullEndOfStreamQueuedWithMessageSwitchBeforePullMessage) { + RequestBuffer buffer; + EXPECT_EQ(buffer.PushClientInitialMetadata(TestMetadata()), 40); + auto pusher = buffer.PushMessage(TestMessage()); + EXPECT_THAT(pusher(), IsReady(49)); + EXPECT_EQ(buffer.FinishSends(), Success{}); + RequestBuffer::Reader reader(&buffer); + auto pull_md = reader.PullClientInitialMetadata(); + EXPECT_THAT(pull_md(), IsReady()); // value tested elsewhere + buffer.Commit(&reader); + auto pull_msg = reader.PullMessage(); + auto poll_msg = pull_msg(); + ASSERT_THAT(poll_msg, IsReady()); + ASSERT_TRUE(poll_msg.value().ok()); + ASSERT_TRUE(poll_msg.value().value().has_value()); + EXPECT_THAT(poll_msg.value().value().value(), IsTestMessage()); + auto pull_msg2 = reader.PullMessage(); + poll_msg = pull_msg2(); + ASSERT_THAT(poll_msg, IsReady()); + ASSERT_TRUE(poll_msg.value().ok()); + ASSERT_FALSE(poll_msg.value().value().has_value()); +} + +TEST(RequestBufferTest, + PullEndOfStreamQueuedWithMessageSwitchDuringPullMessage) { + RequestBuffer buffer; + EXPECT_EQ(buffer.PushClientInitialMetadata(TestMetadata()), 40); + auto pusher = buffer.PushMessage(TestMessage()); + EXPECT_THAT(pusher(), IsReady(49)); + EXPECT_EQ(buffer.FinishSends(), Success{}); + RequestBuffer::Reader reader(&buffer); + auto pull_md = reader.PullClientInitialMetadata(); + EXPECT_THAT(pull_md(), IsReady()); // value tested elsewhere + auto pull_msg = reader.PullMessage(); + buffer.Commit(&reader); + auto poll_msg = pull_msg(); + ASSERT_THAT(poll_msg, IsReady()); + ASSERT_TRUE(poll_msg.value().ok()); + ASSERT_TRUE(poll_msg.value().value().has_value()); + EXPECT_THAT(poll_msg.value().value().value(), IsTestMessage()); + auto pull_msg2 = reader.PullMessage(); + poll_msg = pull_msg2(); + ASSERT_THAT(poll_msg, IsReady()); + ASSERT_TRUE(poll_msg.value().ok()); + ASSERT_FALSE(poll_msg.value().value().has_value()); +} + +TEST(RequestBufferTest, PushThenPullMessageRepeatedly) { + RequestBuffer buffer; + EXPECT_EQ(buffer.PushClientInitialMetadata(TestMetadata()), 40); + RequestBuffer::Reader reader(&buffer); + auto pull_md = reader.PullClientInitialMetadata(); + EXPECT_THAT(pull_md(), IsReady()); // value tested elsewhere + for (int i = 0; i < 10; i++) { + auto pusher = buffer.PushMessage(TestMessage(i)); + EXPECT_THAT(pusher(), IsReady(40 + 9 * (i + 1))); + auto pull_msg = reader.PullMessage(); + auto poll_msg = pull_msg(); + ASSERT_THAT(poll_msg, IsReady()); + ASSERT_TRUE(poll_msg.value().ok()); + ASSERT_TRUE(poll_msg.value().value().has_value()); + EXPECT_THAT(poll_msg.value().value().value(), IsTestMessage(i)); + } +} + +TEST(RequestBufferTest, PushSomeSwitchThenPushPullMessages) { + StrictMock activity; + activity.Activate(); + RequestBuffer buffer; + EXPECT_EQ(buffer.PushClientInitialMetadata(TestMetadata()), 40); + RequestBuffer::Reader reader(&buffer); + auto pull_md = reader.PullClientInitialMetadata(); + EXPECT_THAT(pull_md(), IsReady()); // value tested elsewhere + for (int i = 0; i < 10; i++) { + auto pusher = buffer.PushMessage(TestMessage(i)); + EXPECT_THAT(pusher(), IsReady(40 + 9 * (i + 1))); + } + buffer.Commit(&reader); + for (int i = 0; i < 10; i++) { + auto pull_msg = reader.PullMessage(); + auto poll_msg = pull_msg(); + ASSERT_THAT(poll_msg, IsReady()); + ASSERT_TRUE(poll_msg.value().ok()); + ASSERT_TRUE(poll_msg.value().value().has_value()); + EXPECT_THAT(poll_msg.value().value().value(), IsTestMessage(i)); + } + for (int i = 0; i < 10; i++) { + auto pusher = buffer.PushMessage(TestMessage(i)); + EXPECT_THAT(pusher(), IsReady(0)); + auto pull_msg = reader.PullMessage(); + auto poll_msg = pull_msg(); + ASSERT_THAT(poll_msg, IsReady()); + ASSERT_TRUE(poll_msg.value().ok()); + ASSERT_TRUE(poll_msg.value().value().has_value()); + EXPECT_THAT(poll_msg.value().value().value(), IsTestMessage(i)); + } +} + +TEST(RequestBufferTest, HedgeReadMetadata) { + RequestBuffer buffer; + EXPECT_EQ(buffer.PushClientInitialMetadata(TestMetadata()), 40); + RequestBuffer::Reader reader1(&buffer); + RequestBuffer::Reader reader2(&buffer); + auto pull_md1 = reader1.PullClientInitialMetadata(); + auto pull_md2 = reader2.PullClientInitialMetadata(); + auto poll_md1 = pull_md1(); + auto poll_md2 = pull_md2(); + ASSERT_THAT(poll_md1, IsReady()); + ASSERT_THAT(poll_md2, IsReady()); + auto value1 = std::move(poll_md1.value()); + auto value2 = std::move(poll_md2.value()); + ASSERT_TRUE(value1.ok()); + ASSERT_TRUE(value2.ok()); + EXPECT_THAT(*value1, IsTestMetadata()); + EXPECT_THAT(*value2, IsTestMetadata()); +} + +TEST(RequestBufferTest, HedgeReadMetadataSwitchBeforeFirstRead) { + RequestBuffer buffer; + EXPECT_EQ(buffer.PushClientInitialMetadata(TestMetadata()), 40); + RequestBuffer::Reader reader1(&buffer); + buffer.Commit(&reader1); + RequestBuffer::Reader reader2(&buffer); + auto pull_md1 = reader1.PullClientInitialMetadata(); + auto pull_md2 = reader2.PullClientInitialMetadata(); + auto poll_md1 = pull_md1(); + auto poll_md2 = pull_md2(); + ASSERT_THAT(poll_md1, IsReady()); + ASSERT_THAT(poll_md2, IsReady()); + auto value1 = std::move(poll_md1.value()); + auto value2 = std::move(poll_md2.value()); + ASSERT_TRUE(value1.ok()); + EXPECT_FALSE(value2.ok()); + EXPECT_THAT(*value1, IsTestMetadata()); +} + +TEST(RequestBufferTest, HedgeReadMetadataLate) { + RequestBuffer buffer; + EXPECT_EQ(buffer.PushClientInitialMetadata(TestMetadata()), 40); + RequestBuffer::Reader reader1(&buffer); + auto pull_md1 = reader1.PullClientInitialMetadata(); + auto poll_md1 = pull_md1(); + ASSERT_THAT(poll_md1, IsReady()); + auto value1 = std::move(poll_md1.value()); + ASSERT_TRUE(value1.ok()); + EXPECT_THAT(*value1, IsTestMetadata()); + RequestBuffer::Reader reader2(&buffer); + auto pull_md2 = reader2.PullClientInitialMetadata(); + auto poll_md2 = pull_md2(); + ASSERT_THAT(poll_md2, IsReady()); + auto value2 = std::move(poll_md2.value()); + ASSERT_TRUE(value2.ok()); + EXPECT_THAT(*value2, IsTestMetadata()); +} + +TEST(RequestBufferTest, HedgeReadMetadataLateSwitchAfterPullInitialMetadata) { + RequestBuffer buffer; + EXPECT_EQ(buffer.PushClientInitialMetadata(TestMetadata()), 40); + RequestBuffer::Reader reader1(&buffer); + auto pull_md1 = reader1.PullClientInitialMetadata(); + auto poll_md1 = pull_md1(); + ASSERT_THAT(poll_md1, IsReady()); + auto value1 = std::move(poll_md1.value()); + ASSERT_TRUE(value1.ok()); + EXPECT_THAT(*value1, IsTestMetadata()); + RequestBuffer::Reader reader2(&buffer); + buffer.Commit(&reader1); + auto pull_md2 = reader2.PullClientInitialMetadata(); + auto poll_md2 = pull_md2(); + ASSERT_THAT(poll_md2, IsReady()); + auto value2 = std::move(poll_md2.value()); + EXPECT_FALSE(value2.ok()); +} + +TEST(RequestBufferTest, StreamingPushBeforeLastMessagePulled) { + StrictMock activity; + activity.Activate(); + RequestBuffer buffer; + EXPECT_EQ(buffer.PushClientInitialMetadata(TestMetadata()), 40); + RequestBuffer::Reader reader(&buffer); + auto pull_md = reader.PullClientInitialMetadata(); + EXPECT_THAT(pull_md(), IsReady()); // value tested elsewhere + buffer.Commit(&reader); + auto pusher1 = buffer.PushMessage(TestMessage(1)); + EXPECT_THAT(pusher1(), IsReady(0)); + auto pusher2 = buffer.PushMessage(TestMessage(2)); + EXPECT_THAT(pusher2(), IsPending()); + auto pull1 = reader.PullMessage(); + EXPECT_WAKEUP(activity, auto poll1 = pull1()); + ASSERT_THAT(poll1, IsReady()); + ASSERT_TRUE(poll1.value().ok()); + ASSERT_TRUE(poll1.value().value().has_value()); + EXPECT_THAT(poll1.value().value().value(), IsTestMessage(1)); + auto pull2 = reader.PullMessage(); + auto poll2 = pull2(); + EXPECT_THAT(poll2, IsPending()); + EXPECT_WAKEUP(activity, EXPECT_THAT(pusher2(), IsReady(0))); + poll2 = pull2(); + ASSERT_THAT(poll2, IsReady()); + ASSERT_TRUE(poll2.value().ok()); + ASSERT_TRUE(poll2.value().value().has_value()); + EXPECT_THAT(poll2.value().value().value(), IsTestMessage(2)); +} + +TEST(RequestBufferTest, SwitchAfterEndOfStream) { + RequestBuffer buffer; + EXPECT_EQ(buffer.PushClientInitialMetadata(TestMetadata()), 40); + RequestBuffer::Reader reader(&buffer); + auto pull_md = reader.PullClientInitialMetadata(); + EXPECT_THAT(pull_md(), IsReady()); // value tested elsewhere + auto pusher = buffer.PushMessage(TestMessage()); + EXPECT_THAT(pusher(), IsReady(49)); + EXPECT_EQ(buffer.FinishSends(), Success{}); + auto pull_msg = reader.PullMessage(); + auto poll_msg = pull_msg(); + ASSERT_THAT(poll_msg, IsReady()); + ASSERT_TRUE(poll_msg.value().ok()); + ASSERT_TRUE(poll_msg.value().value().has_value()); + EXPECT_THAT(poll_msg.value().value().value(), IsTestMessage()); + buffer.Commit(&reader); + auto pull_msg2 = reader.PullMessage(); + poll_msg = pull_msg2(); + ASSERT_THAT(poll_msg, IsReady()); + ASSERT_TRUE(poll_msg.value().ok()); + EXPECT_FALSE(poll_msg.value().value().has_value()); +} + +TEST(RequestBufferTest, NothingAfterEndOfStream) { + RequestBuffer buffer; + EXPECT_EQ(buffer.PushClientInitialMetadata(TestMetadata()), 40); + RequestBuffer::Reader reader(&buffer); + auto pull_md = reader.PullClientInitialMetadata(); + EXPECT_THAT(pull_md(), IsReady()); // value tested elsewhere + auto pusher = buffer.PushMessage(TestMessage()); + EXPECT_THAT(pusher(), IsReady(49)); + EXPECT_EQ(buffer.FinishSends(), Success{}); + auto pull_msg = reader.PullMessage(); + auto poll_msg = pull_msg(); + ASSERT_THAT(poll_msg, IsReady()); + ASSERT_TRUE(poll_msg.value().ok()); + ASSERT_TRUE(poll_msg.value().value().has_value()); + EXPECT_THAT(poll_msg.value().value().value(), IsTestMessage()); + auto pull_msg2 = reader.PullMessage(); + poll_msg = pull_msg2(); + ASSERT_THAT(poll_msg, IsReady()); + ASSERT_TRUE(poll_msg.value().ok()); + EXPECT_FALSE(poll_msg.value().value().has_value()); +} + +TEST(RequestBufferTest, CancelBeforeInitialMetadataPush) { + RequestBuffer buffer; + buffer.Cancel(); + EXPECT_EQ(buffer.PushClientInitialMetadata(TestMetadata()), Failure{}); + RequestBuffer::Reader reader(&buffer); + auto pull_md = reader.PullClientInitialMetadata(); + auto poll_md = pull_md(); + ASSERT_THAT(poll_md, IsReady()); + ASSERT_FALSE(poll_md.value().ok()); +} + +TEST(RequestBufferTest, CancelBeforeInitialMetadataPull) { + RequestBuffer buffer; + EXPECT_EQ(buffer.PushClientInitialMetadata(TestMetadata()), 40); + buffer.Cancel(); + RequestBuffer::Reader reader(&buffer); + auto pull_md = reader.PullClientInitialMetadata(); + auto poll_md = pull_md(); + ASSERT_THAT(poll_md, IsReady()); + ASSERT_FALSE(poll_md.value().ok()); +} + +TEST(RequestBufferTest, CancelBeforeMessagePush) { + RequestBuffer buffer; + EXPECT_EQ(buffer.PushClientInitialMetadata(TestMetadata()), 40); + buffer.Cancel(); + auto pusher = buffer.PushMessage(TestMessage()); + auto poll = pusher(); + ASSERT_THAT(poll, IsReady()); + ASSERT_FALSE(poll.value().ok()); + RequestBuffer::Reader reader(&buffer); + auto pull_md = reader.PullClientInitialMetadata(); + auto poll_md = pull_md(); + ASSERT_THAT(poll_md, IsReady()); + ASSERT_FALSE(poll_md.value().ok()); +} + +TEST(RequestBufferTest, CancelBeforeMessagePushButAfterInitialMetadataPull) { + RequestBuffer buffer; + EXPECT_EQ(buffer.PushClientInitialMetadata(TestMetadata()), 40); + RequestBuffer::Reader reader(&buffer); + auto pull_md = reader.PullClientInitialMetadata(); + auto poll_md = pull_md(); + ASSERT_THAT(poll_md, IsReady()); + ASSERT_TRUE(poll_md.value().ok()); + EXPECT_THAT(*poll_md.value(), IsTestMetadata()); + buffer.Cancel(); + auto pusher = buffer.PushMessage(TestMessage()); + auto poll = pusher(); + ASSERT_THAT(poll, IsReady()); + ASSERT_FALSE(poll.value().ok()); +} + +} // namespace grpc_core + +int main(int argc, char** argv) { + ::testing::InitGoogleTest(&argc, argv); + return RUN_ALL_TESTS(); +} diff --git a/tools/run_tests/generated/tests.json b/tools/run_tests/generated/tests.json index 16c73265ad2..6253d9f900c 100644 --- a/tools/run_tests/generated/tests.json +++ b/tools/run_tests/generated/tests.json @@ -7765,6 +7765,30 @@ ], "uses_polling": true }, + { + "args": [], + "benchmark": false, + "ci_platforms": [ + "linux", + "mac", + "posix", + "windows" + ], + "cpu_cost": 1.0, + "exclude_configs": [], + "exclude_iomgrs": [], + "flaky": false, + "gtest": true, + "language": "c++", + "name": "request_buffer_test", + "platforms": [ + "linux", + "mac", + "posix", + "windows" + ], + "uses_polling": true + }, { "args": [], "benchmark": false, From febe0f1458a1d057c2e08cb608904f1dfd6bf9a6 Mon Sep 17 00:00:00 2001 From: Alisha Nanda Date: Mon, 23 Sep 2024 16:58:49 -0700 Subject: [PATCH 18/75] Get name of connector from local connector rather than from handshaker args. PiperOrigin-RevId: 677992968 --- src/core/handshaker/security/security_handshaker.cc | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/core/handshaker/security/security_handshaker.cc b/src/core/handshaker/security/security_handshaker.cc index 65fec6243a7..82756fc8723 100644 --- a/src/core/handshaker/security/security_handshaker.cc +++ b/src/core/handshaker/security/security_handshaker.cc @@ -358,16 +358,12 @@ grpc_error_handle SecurityHandshaker::OnHandshakeNextDoneLocked( return error; } if (result != TSI_OK) { - auto* security_connector = args_->args.GetObject(); - absl::string_view connector_type = ""; - 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_)); + connector_->type().name(), " handshake failed (", + tsi_result_to_string(result), ")", + (tsi_handshake_error_.empty() ? "" : ": "), tsi_handshake_error_)); } // Update handshaker result. if (handshaker_result != nullptr) { From 97f22ce29528927b98b8494b8e7338d943b6487e Mon Sep 17 00:00:00 2001 From: Tanvi Jagtap <139093547+tanvi-jagtap@users.noreply.github.com> Date: Mon, 23 Sep 2024 23:31:52 -0700 Subject: [PATCH 19/75] [PH2][Refactor][is_client] Split functions (#37641) [PH2][Refactor][is_client] Split two functions for better readability 1. send_initial_metadata_locked - Moved out the tracing part 2. grpc_chttp2_config_default_keepalive_args - Split the client and server path to reduce cyclomatic complexity. Closes #37641 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37641 from tanvi-jagtap:remove_is_client_02 bfbc9361dbcbc78282e4e0c7a5d4b41b9f53f30c PiperOrigin-RevId: 678096501 --- .../chttp2/transport/chttp2_transport.cc | 70 ++++++++++--------- 1 file changed, 37 insertions(+), 33 deletions(-) diff --git a/src/core/ext/transport/chttp2/transport/chttp2_transport.cc b/src/core/ext/transport/chttp2/transport/chttp2_transport.cc index f25e8b2c672..02fffbf41ca 100644 --- a/src/core/ext/transport/chttp2/transport/chttp2_transport.cc +++ b/src/core/ext/transport/chttp2/transport/chttp2_transport.cc @@ -1361,10 +1361,7 @@ static void log_metadata(const grpc_metadata_batch* md_batch, uint32_t id, }); } -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) { +static void trace_annotations(grpc_chttp2_stream* s) { if (!grpc_core::IsCallTracerInTransportEnabled()) { if (s->call_tracer != nullptr) { s->call_tracer->RecordAnnotation( @@ -1383,6 +1380,13 @@ static void send_initial_metadata_locked( .Add(s->flow_control.stats())); } } +} + +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) { + trace_annotations(s); if (t->is_client && t->channelz_socket != nullptr) { t->channelz_socket->RecordStreamStartedFromLocal(); } @@ -2915,48 +2919,48 @@ static void next_bdp_ping_timer_expired_locked( } void grpc_chttp2_config_default_keepalive_args(grpc_channel_args* args, - bool is_client) { + const bool is_client) { grpc_chttp2_config_default_keepalive_args(grpc_core::ChannelArgs::FromC(args), is_client); } -void grpc_chttp2_config_default_keepalive_args( - const grpc_core::ChannelArgs& channel_args, bool is_client) { - const auto keepalive_time = +static void grpc_chttp2_config_default_keepalive_args_client( + const grpc_core::ChannelArgs& channel_args) { + g_default_client_keepalive_time = std::max(grpc_core::Duration::Milliseconds(1), channel_args.GetDurationFromIntMillis(GRPC_ARG_KEEPALIVE_TIME_MS) - .value_or(is_client ? g_default_client_keepalive_time - : g_default_server_keepalive_time)); - if (is_client) { - g_default_client_keepalive_time = keepalive_time; - } else { - g_default_server_keepalive_time = keepalive_time; - } - - const auto keepalive_timeout = std::max( + .value_or(g_default_client_keepalive_time)); + g_default_client_keepalive_timeout = std::max( grpc_core::Duration::Zero(), channel_args.GetDurationFromIntMillis(GRPC_ARG_KEEPALIVE_TIMEOUT_MS) - .value_or(is_client ? g_default_client_keepalive_timeout - : g_default_server_keepalive_timeout)); - if (is_client) { - g_default_client_keepalive_timeout = keepalive_timeout; - } else { - g_default_server_keepalive_timeout = keepalive_timeout; - } + .value_or(g_default_client_keepalive_timeout)); + g_default_client_keepalive_permit_without_calls = + channel_args.GetBool(GRPC_ARG_KEEPALIVE_PERMIT_WITHOUT_CALLS) + .value_or(g_default_client_keepalive_permit_without_calls); +} - const bool keepalive_permit_without_calls = +static void grpc_chttp2_config_default_keepalive_args_server( + const grpc_core::ChannelArgs& channel_args) { + g_default_server_keepalive_time = + std::max(grpc_core::Duration::Milliseconds(1), + channel_args.GetDurationFromIntMillis(GRPC_ARG_KEEPALIVE_TIME_MS) + .value_or(g_default_server_keepalive_time)); + g_default_server_keepalive_timeout = std::max( + grpc_core::Duration::Zero(), + channel_args.GetDurationFromIntMillis(GRPC_ARG_KEEPALIVE_TIMEOUT_MS) + .value_or(g_default_server_keepalive_timeout)); + g_default_server_keepalive_permit_without_calls = channel_args.GetBool(GRPC_ARG_KEEPALIVE_PERMIT_WITHOUT_CALLS) - .value_or(is_client - ? g_default_client_keepalive_permit_without_calls - : g_default_server_keepalive_permit_without_calls); + .value_or(g_default_server_keepalive_permit_without_calls); +} + +void grpc_chttp2_config_default_keepalive_args( + const grpc_core::ChannelArgs& channel_args, const bool is_client) { if (is_client) { - g_default_client_keepalive_permit_without_calls = - keepalive_permit_without_calls; + grpc_chttp2_config_default_keepalive_args_client(channel_args); } else { - g_default_server_keepalive_permit_without_calls = - keepalive_permit_without_calls; + grpc_chttp2_config_default_keepalive_args_server(channel_args); } - grpc_core::Chttp2PingAbusePolicy::SetDefaults(channel_args); grpc_core::Chttp2PingRatePolicy::SetDefaults(channel_args); } From 94b7927def35cde7d05b616141dc7d3c7fbf7ffb Mon Sep 17 00:00:00 2001 From: "Mark D. Roth" Date: Tue, 24 Sep 2024 09:17:40 -0700 Subject: [PATCH 20/75] [doc] add version of C-core for xDS dualstack support (#37662) Closes #37662 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37662 from markdroth:xds_features_dualstack f6b69e30484645fbd589601516ad99346f0d29b5 PiperOrigin-RevId: 678277887 --- doc/grpc_xds_features.md | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/grpc_xds_features.md b/doc/grpc_xds_features.md index 07519b88032..927f606bdf6 100644 --- a/doc/grpc_xds_features.md +++ b/doc/grpc_xds_features.md @@ -82,3 +82,4 @@ mTLS Credentials in xDS Bootstrap File | [A65](https://github.com/grpc/proposal/ Stateful Session Affinity | [A55](https://github.com/grpc/proposal/blob/master/A55-xds-stateful-session-affinity.md), [A60](https://github.com/grpc/proposal/blob/master/A60-xds-stateful-session-affinity-weighted-clusters.md), [A75](https://github.com/grpc/proposal/blob/master/A75-xds-aggregate-cluster-behavior-fixes.md) | v1.61.0 | | | | xDS Locality label for OpenTelemetry metrics | [A78](https://github.com/grpc/proposal/blob/master/A78-grpc-metrics-wrr-pf-xds.md) | v1.63.0 (C++) | v1.64.0 | | | xDS Fallback | [A71](https://github.com/grpc/proposal/blob/master/A71-xds-fallback.md) | v1.67.0 | | | | +Dualstack Backend Support | [A61](https://github.com/grpc/proposal/blob/master/A61-IPv4-IPv6-dualstack-backends.md) | v1.66.1 | | | | From 06d3e40d81304cd29155f2a994f5501480b583df Mon Sep 17 00:00:00 2001 From: "Mark D. Roth" Date: Tue, 24 Sep 2024 09:28:39 -0700 Subject: [PATCH 21/75] [xDS] split LRS client into its own API (#37605) Closes #37605 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37605 from markdroth:xds_client_lrs_refactor f9b86b8f06d858809bf117eeb879d58fae85543c PiperOrigin-RevId: 678281548 --- BUILD | 6 +- CMakeLists.txt | 2 +- Makefile | 2 +- Package.swift | 5 +- build_autogenerated.yaml | 5 +- config.m4 | 2 +- config.w32 | 2 +- gRPC-C++.podspec | 6 +- gRPC-Core.podspec | 8 +- grpc.gemspec | 5 +- package.xml | 5 +- src/core/BUILD | 1 + .../load_balancing/xds/xds_cluster_impl.cc | 52 +- .../load_balancing/xds/xds_wrr_locality.cc | 2 +- src/core/xds/grpc/xds_client_grpc.cc | 41 +- src/core/xds/grpc/xds_client_grpc.h | 10 +- src/core/xds/grpc/xds_cluster.cc | 2 +- src/core/xds/grpc/xds_cluster.h | 16 +- src/core/xds/grpc/xds_cluster_parser.cc | 2 +- src/core/xds/grpc/xds_endpoint.h | 2 +- src/core/xds/grpc/xds_transport_grpc.cc | 117 +- src/core/xds/grpc/xds_transport_grpc.h | 40 +- src/core/xds/xds_client/lrs_client.cc | 1206 +++++++++++++++++ src/core/xds/xds_client/lrs_client.h | 358 +++++ src/core/xds/xds_client/xds_api.cc | 262 +--- src/core/xds/xds_client/xds_api.h | 37 +- src/core/xds/xds_client/xds_client.cc | 601 +------- src/core/xds/xds_client/xds_client.h | 94 +- src/core/xds/xds_client/xds_client_stats.cc | 164 --- src/core/xds/xds_client/xds_client_stats.h | 258 ---- src/core/xds/xds_client/xds_locality.h | 103 ++ src/core/xds/xds_client/xds_transport.h | 40 +- src/python/grpcio/grpc_core_dependencies.py | 2 +- test/core/xds/xds_client_fuzzer.cc | 11 +- test/core/xds/xds_client_test.cc | 70 +- .../xds/xds_cluster_resource_type_test.cc | 4 +- .../xds/xds_endpoint_resource_type_test.cc | 2 +- test/core/xds/xds_transport_fake.cc | 71 +- test/core/xds/xds_transport_fake.h | 61 +- tools/doxygen/Doxyfile.c++.internal | 5 +- tools/doxygen/Doxyfile.core.internal | 5 +- 41 files changed, 2114 insertions(+), 1573 deletions(-) create mode 100644 src/core/xds/xds_client/lrs_client.cc create mode 100644 src/core/xds/xds_client/lrs_client.h delete mode 100644 src/core/xds/xds_client/xds_client_stats.cc delete mode 100644 src/core/xds/xds_client/xds_client_stats.h create mode 100644 src/core/xds/xds_client/xds_locality.h diff --git a/BUILD b/BUILD index ef5ae907776..093cddb95af 100644 --- a/BUILD +++ b/BUILD @@ -4395,17 +4395,18 @@ grpc_cc_library( grpc_cc_library( name = "xds_client", srcs = [ + "//src/core:xds/xds_client/lrs_client.cc", "//src/core:xds/xds_client/xds_api.cc", "//src/core:xds/xds_client/xds_bootstrap.cc", "//src/core:xds/xds_client/xds_client.cc", - "//src/core:xds/xds_client/xds_client_stats.cc", ], hdrs = [ + "//src/core:xds/xds_client/lrs_client.h", "//src/core:xds/xds_client/xds_api.h", "//src/core:xds/xds_client/xds_bootstrap.h", "//src/core:xds/xds_client/xds_channel_args.h", "//src/core:xds/xds_client/xds_client.h", - "//src/core:xds/xds_client/xds_client_stats.h", + "//src/core:xds/xds_client/xds_locality.h", "//src/core:xds/xds_client/xds_metrics.h", "//src/core:xds/xds_client/xds_resource_type.h", "//src/core:xds/xds_client/xds_resource_type_impl.h", @@ -4464,6 +4465,7 @@ grpc_cc_library( "//src/core:json", "//src/core:per_cpu", "//src/core:ref_counted", + "//src/core:ref_counted_string", "//src/core:time", "//src/core:upb_utils", "//src/core:useful", diff --git a/CMakeLists.txt b/CMakeLists.txt index b401fc53b49..586898b7ec1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2662,10 +2662,10 @@ add_library(grpc 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/lrs_client.cc src/core/xds/xds_client/xds_api.cc src/core/xds/xds_client/xds_bootstrap.cc src/core/xds/xds_client/xds_client.cc - src/core/xds/xds_client/xds_client_stats.cc ) target_compile_features(grpc PUBLIC cxx_std_14) diff --git a/Makefile b/Makefile index 17e4b30baa4..2496f2c9154 100644 --- a/Makefile +++ b/Makefile @@ -1515,10 +1515,10 @@ LIBGRPC_SRC = \ 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/lrs_client.cc \ src/core/xds/xds_client/xds_api.cc \ src/core/xds/xds_client/xds_bootstrap.cc \ src/core/xds/xds_client/xds_client.cc \ - src/core/xds/xds_client/xds_client_stats.cc \ third_party/abseil-cpp/absl/base/internal/cycleclock.cc \ third_party/abseil-cpp/absl/base/internal/low_level_alloc.cc \ third_party/abseil-cpp/absl/base/internal/raw_logging.cc \ diff --git a/Package.swift b/Package.swift index 64e851e770a..26ab8a93c4e 100644 --- a/Package.swift +++ b/Package.swift @@ -2031,6 +2031,8 @@ let package = Package( "src/core/xds/grpc/xds_server_grpc.h", "src/core/xds/grpc/xds_transport_grpc.cc", "src/core/xds/grpc/xds_transport_grpc.h", + "src/core/xds/xds_client/lrs_client.cc", + "src/core/xds/xds_client/lrs_client.h", "src/core/xds/xds_client/xds_api.cc", "src/core/xds/xds_client/xds_api.h", "src/core/xds/xds_client/xds_bootstrap.cc", @@ -2038,8 +2040,7 @@ let package = Package( "src/core/xds/xds_client/xds_channel_args.h", "src/core/xds/xds_client/xds_client.cc", "src/core/xds/xds_client/xds_client.h", - "src/core/xds/xds_client/xds_client_stats.cc", - "src/core/xds/xds_client/xds_client_stats.h", + "src/core/xds/xds_client/xds_locality.h", "src/core/xds/xds_client/xds_metrics.h", "src/core/xds/xds_client/xds_resource_type.h", "src/core/xds/xds_client/xds_resource_type_impl.h", diff --git a/build_autogenerated.yaml b/build_autogenerated.yaml index f256a8355c3..3391b4d9d7a 100644 --- a/build_autogenerated.yaml +++ b/build_autogenerated.yaml @@ -1256,11 +1256,12 @@ libs: - src/core/xds/grpc/xds_routing.h - src/core/xds/grpc/xds_server_grpc.h - src/core/xds/grpc/xds_transport_grpc.h + - src/core/xds/xds_client/lrs_client.h - src/core/xds/xds_client/xds_api.h - src/core/xds/xds_client/xds_bootstrap.h - src/core/xds/xds_client/xds_channel_args.h - src/core/xds/xds_client/xds_client.h - - src/core/xds/xds_client/xds_client_stats.h + - src/core/xds/xds_client/xds_locality.h - src/core/xds/xds_client/xds_metrics.h - src/core/xds/xds_client/xds_resource_type.h - src/core/xds/xds_client/xds_resource_type_impl.h @@ -2076,10 +2077,10 @@ libs: - 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/lrs_client.cc - src/core/xds/xds_client/xds_api.cc - src/core/xds/xds_client/xds_bootstrap.cc - src/core/xds/xds_client/xds_client.cc - - src/core/xds/xds_client/xds_client_stats.cc deps: - upb_json_lib - upb_textformat_lib diff --git a/config.m4 b/config.m4 index e8a2b6321f8..dd953b0801b 100644 --- a/config.m4 +++ b/config.m4 @@ -890,10 +890,10 @@ if test "$PHP_GRPC" != "no"; then 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/lrs_client.cc \ src/core/xds/xds_client/xds_api.cc \ src/core/xds/xds_client/xds_bootstrap.cc \ src/core/xds/xds_client/xds_client.cc \ - src/core/xds/xds_client/xds_client_stats.cc \ src/php/ext/grpc/byte_buffer.c \ src/php/ext/grpc/call.c \ src/php/ext/grpc/call_credentials.c \ diff --git a/config.w32 b/config.w32 index 7a5aa5f8b17..5a8a5d1dd3d 100644 --- a/config.w32 +++ b/config.w32 @@ -855,10 +855,10 @@ if (PHP_GRPC != "no") { "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\\lrs_client.cc " + "src\\core\\xds\\xds_client\\xds_api.cc " + "src\\core\\xds\\xds_client\\xds_bootstrap.cc " + "src\\core\\xds\\xds_client\\xds_client.cc " + - "src\\core\\xds\\xds_client\\xds_client_stats.cc " + "src\\php\\ext\\grpc\\byte_buffer.c " + "src\\php\\ext\\grpc\\call.c " + "src\\php\\ext\\grpc\\call_credentials.c " + diff --git a/gRPC-C++.podspec b/gRPC-C++.podspec index 4f6a4bc1b1f..902195c9fd8 100644 --- a/gRPC-C++.podspec +++ b/gRPC-C++.podspec @@ -1370,11 +1370,12 @@ Pod::Spec.new do |s| 'src/core/xds/grpc/xds_routing.h', 'src/core/xds/grpc/xds_server_grpc.h', 'src/core/xds/grpc/xds_transport_grpc.h', + 'src/core/xds/xds_client/lrs_client.h', 'src/core/xds/xds_client/xds_api.h', 'src/core/xds/xds_client/xds_bootstrap.h', 'src/core/xds/xds_client/xds_channel_args.h', 'src/core/xds/xds_client/xds_client.h', - 'src/core/xds/xds_client/xds_client_stats.h', + 'src/core/xds/xds_client/xds_locality.h', 'src/core/xds/xds_client/xds_metrics.h', 'src/core/xds/xds_client/xds_resource_type.h', 'src/core/xds/xds_client/xds_resource_type_impl.h', @@ -2667,11 +2668,12 @@ Pod::Spec.new do |s| 'src/core/xds/grpc/xds_routing.h', 'src/core/xds/grpc/xds_server_grpc.h', 'src/core/xds/grpc/xds_transport_grpc.h', + 'src/core/xds/xds_client/lrs_client.h', 'src/core/xds/xds_client/xds_api.h', 'src/core/xds/xds_client/xds_bootstrap.h', 'src/core/xds/xds_client/xds_channel_args.h', 'src/core/xds/xds_client/xds_client.h', - 'src/core/xds/xds_client/xds_client_stats.h', + 'src/core/xds/xds_client/xds_locality.h', 'src/core/xds/xds_client/xds_metrics.h', 'src/core/xds/xds_client/xds_resource_type.h', 'src/core/xds/xds_client/xds_resource_type_impl.h', diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec index 3ebf0103b56..5ef2d92c5c1 100644 --- a/gRPC-Core.podspec +++ b/gRPC-Core.podspec @@ -2147,6 +2147,8 @@ Pod::Spec.new do |s| 'src/core/xds/grpc/xds_server_grpc.h', 'src/core/xds/grpc/xds_transport_grpc.cc', 'src/core/xds/grpc/xds_transport_grpc.h', + 'src/core/xds/xds_client/lrs_client.cc', + 'src/core/xds/xds_client/lrs_client.h', 'src/core/xds/xds_client/xds_api.cc', 'src/core/xds/xds_client/xds_api.h', 'src/core/xds/xds_client/xds_bootstrap.cc', @@ -2154,8 +2156,7 @@ Pod::Spec.new do |s| 'src/core/xds/xds_client/xds_channel_args.h', 'src/core/xds/xds_client/xds_client.cc', 'src/core/xds/xds_client/xds_client.h', - 'src/core/xds/xds_client/xds_client_stats.cc', - 'src/core/xds/xds_client/xds_client_stats.h', + 'src/core/xds/xds_client/xds_locality.h', 'src/core/xds/xds_client/xds_metrics.h', 'src/core/xds/xds_client/xds_resource_type.h', 'src/core/xds/xds_client/xds_resource_type_impl.h', @@ -3450,11 +3451,12 @@ Pod::Spec.new do |s| 'src/core/xds/grpc/xds_routing.h', 'src/core/xds/grpc/xds_server_grpc.h', 'src/core/xds/grpc/xds_transport_grpc.h', + 'src/core/xds/xds_client/lrs_client.h', 'src/core/xds/xds_client/xds_api.h', 'src/core/xds/xds_client/xds_bootstrap.h', 'src/core/xds/xds_client/xds_channel_args.h', 'src/core/xds/xds_client/xds_client.h', - 'src/core/xds/xds_client/xds_client_stats.h', + 'src/core/xds/xds_client/xds_locality.h', 'src/core/xds/xds_client/xds_metrics.h', 'src/core/xds/xds_client/xds_resource_type.h', 'src/core/xds/xds_client/xds_resource_type_impl.h', diff --git a/grpc.gemspec b/grpc.gemspec index 6784a5f4eed..ca3b9344c17 100644 --- a/grpc.gemspec +++ b/grpc.gemspec @@ -2033,6 +2033,8 @@ Gem::Specification.new do |s| s.files += %w( src/core/xds/grpc/xds_server_grpc.h ) s.files += %w( src/core/xds/grpc/xds_transport_grpc.cc ) s.files += %w( src/core/xds/grpc/xds_transport_grpc.h ) + s.files += %w( src/core/xds/xds_client/lrs_client.cc ) + s.files += %w( src/core/xds/xds_client/lrs_client.h ) s.files += %w( src/core/xds/xds_client/xds_api.cc ) s.files += %w( src/core/xds/xds_client/xds_api.h ) s.files += %w( src/core/xds/xds_client/xds_bootstrap.cc ) @@ -2040,8 +2042,7 @@ Gem::Specification.new do |s| s.files += %w( src/core/xds/xds_client/xds_channel_args.h ) s.files += %w( src/core/xds/xds_client/xds_client.cc ) s.files += %w( src/core/xds/xds_client/xds_client.h ) - s.files += %w( src/core/xds/xds_client/xds_client_stats.cc ) - s.files += %w( src/core/xds/xds_client/xds_client_stats.h ) + s.files += %w( src/core/xds/xds_client/xds_locality.h ) s.files += %w( src/core/xds/xds_client/xds_metrics.h ) s.files += %w( src/core/xds/xds_client/xds_resource_type.h ) s.files += %w( src/core/xds/xds_client/xds_resource_type_impl.h ) diff --git a/package.xml b/package.xml index 341c3a6d827..7982ab53596 100644 --- a/package.xml +++ b/package.xml @@ -2015,6 +2015,8 @@ + + @@ -2022,8 +2024,7 @@ - - + diff --git a/src/core/BUILD b/src/core/BUILD index f5949c8e05f..9483e15f051 100644 --- a/src/core/BUILD +++ b/src/core/BUILD @@ -5696,6 +5696,7 @@ grpc_cc_library( external_deps = [ "absl/base:core_headers", "absl/cleanup", + "absl/container:flat_hash_map", "absl/functional:bind_front", "absl/log:check", "absl/log:log", diff --git a/src/core/load_balancing/xds/xds_cluster_impl.cc b/src/core/load_balancing/xds/xds_cluster_impl.cc index 66aed1e65d3..eb1a4b3259a 100644 --- a/src/core/load_balancing/xds/xds_cluster_impl.cc +++ b/src/core/load_balancing/xds/xds_cluster_impl.cc @@ -73,7 +73,7 @@ #include "src/core/xds/grpc/xds_endpoint.h" #include "src/core/xds/xds_client/xds_bootstrap.h" #include "src/core/xds/xds_client/xds_client.h" -#include "src/core/xds/xds_client/xds_client_stats.h" +#include "src/core/xds/xds_client/xds_locality.h" namespace grpc_core { @@ -189,13 +189,13 @@ class XdsClusterImplLb final : public LoadBalancingPolicy { private: class StatsSubchannelWrapper final : public DelegatingSubchannel { public: - // If load reporting is enabled and we have an XdsClusterLocalityStats + // If load reporting is enabled and we have a ClusterLocalityStats // object, that object already contains the locality label. We // need to store the locality label directly only in the case where // load reporting is disabled. using LocalityData = absl::variant< RefCountedStringValue /*locality*/, - RefCountedPtr /*locality_stats*/>; + RefCountedPtr /*locality_stats*/>; StatsSubchannelWrapper( RefCountedPtr wrapped_subchannel, @@ -209,20 +209,20 @@ class XdsClusterImplLb final : public LoadBalancingPolicy { return Match( locality_data_, [](RefCountedStringValue locality) { return locality; }, - [](const RefCountedPtr& locality_stats) { + [](const RefCountedPtr& + locality_stats) { return locality_stats->locality_name()->human_readable_string(); }); } - XdsClusterLocalityStats* locality_stats() const { + LrsClient::ClusterLocalityStats* locality_stats() const { return Match( locality_data_, [](const RefCountedStringValue&) { - return static_cast(nullptr); + return static_cast(nullptr); }, - [](const RefCountedPtr& locality_stats) { - return locality_stats.get(); - }); + [](const RefCountedPtr& + locality_stats) { return locality_stats.get(); }); } const grpc_event_engine::experimental::Slice& hostname() const { @@ -250,7 +250,7 @@ class XdsClusterImplLb final : public LoadBalancingPolicy { RefCountedStringValue service_telemetry_label_; RefCountedStringValue namespace_telemetry_label_; RefCountedPtr drop_config_; - RefCountedPtr drop_stats_; + RefCountedPtr drop_stats_; RefCountedPtr picker_; }; @@ -304,7 +304,7 @@ class XdsClusterImplLb final : public LoadBalancingPolicy { RefCountedPtr xds_client_; // The stats for client-side load reporting. - RefCountedPtr drop_stats_; + RefCountedPtr drop_stats_; OrphanablePtr child_policy_; @@ -324,7 +324,7 @@ class XdsClusterImplLb::Picker::SubchannelCallTracker final SubchannelCallTracker( std::unique_ptr original_subchannel_call_tracker, - RefCountedPtr locality_stats, + RefCountedPtr locality_stats, RefCountedPtr call_counter) : original_subchannel_call_tracker_( std::move(original_subchannel_call_tracker)), @@ -380,7 +380,7 @@ class XdsClusterImplLb::Picker::SubchannelCallTracker final private: std::unique_ptr original_subchannel_call_tracker_; - RefCountedPtr locality_stats_; + RefCountedPtr locality_stats_; RefCountedPtr call_counter_; #ifndef NDEBUG bool started_ = false; @@ -454,7 +454,7 @@ LoadBalancingPolicy::PickResult XdsClusterImplLb::Picker::Pick( subchannel_wrapper->locality()); } // Handle load reporting. - RefCountedPtr locality_stats; + RefCountedPtr locality_stats; if (subchannel_wrapper->locality_stats() != nullptr) { locality_stats = subchannel_wrapper->locality_stats()->Ref( DEBUG_LOCATION, "SubchannelCallTracker"); @@ -618,14 +618,15 @@ absl::Status XdsClusterImplLb::UpdateLocked(UpdateArgs args) { // Note: We need a drop stats object whenever load reporting is enabled, // even if we have no EDS drop config, because we also use it when // reporting circuit breaker drops. - if (!new_cluster_config.cluster->lrs_load_reporting_server.has_value()) { + if (new_cluster_config.cluster->lrs_load_reporting_server == nullptr) { drop_stats_.reset(); } else if (cluster_resource_ == nullptr || old_eds_service_name != new_eds_service_name || - cluster_resource_->lrs_load_reporting_server != - new_cluster_config.cluster->lrs_load_reporting_server) { - drop_stats_ = xds_client_->AddClusterDropStats( - *new_cluster_config.cluster->lrs_load_reporting_server, + !LrsServersEqual( + cluster_resource_->lrs_load_reporting_server, + new_cluster_config.cluster->lrs_load_reporting_server)) { + drop_stats_ = xds_client_->lrs_client().AddClusterDropStats( + new_cluster_config.cluster->lrs_load_reporting_server, new_config->cluster_name(), new_eds_service_name); if (drop_stats_ == nullptr) { LOG(ERROR) @@ -819,12 +820,13 @@ RefCountedPtr XdsClusterImplLb::Helper::CreateSubchannel( // (if load reporting is enabled) the locality stats object, which // will be used by the picker. auto locality_name = per_address_args.GetObjectRef(); - RefCountedPtr locality_stats; - if (parent()->cluster_resource_->lrs_load_reporting_server.has_value()) { - locality_stats = parent()->xds_client_->AddClusterLocalityStats( - parent()->cluster_resource_->lrs_load_reporting_server.value(), - parent()->config_->cluster_name(), - GetEdsResourceName(*parent()->cluster_resource_), locality_name); + RefCountedPtr locality_stats; + if (parent()->cluster_resource_->lrs_load_reporting_server != nullptr) { + locality_stats = + parent()->xds_client_->lrs_client().AddClusterLocalityStats( + parent()->cluster_resource_->lrs_load_reporting_server, + parent()->config_->cluster_name(), + GetEdsResourceName(*parent()->cluster_resource_), locality_name); if (locality_stats == nullptr) { LOG(ERROR) << "[xds_cluster_impl_lb " << parent() diff --git a/src/core/load_balancing/xds/xds_wrr_locality.cc b/src/core/load_balancing/xds/xds_wrr_locality.cc index ce3f3079e22..efdb91844d6 100644 --- a/src/core/load_balancing/xds/xds_wrr_locality.cc +++ b/src/core/load_balancing/xds/xds_wrr_locality.cc @@ -50,7 +50,7 @@ #include "src/core/util/ref_counted_ptr.h" #include "src/core/util/ref_counted_string.h" #include "src/core/util/validation_errors.h" -#include "src/core/xds/xds_client/xds_client_stats.h" +#include "src/core/xds/xds_client/xds_locality.h" namespace grpc_core { diff --git a/src/core/xds/grpc/xds_client_grpc.cc b/src/core/xds/grpc/xds_client_grpc.cc index 81425bb5d21..bc47f168b71 100644 --- a/src/core/xds/grpc/xds_client_grpc.cc +++ b/src/core/xds/grpc/xds_client_grpc.cc @@ -242,7 +242,7 @@ absl::StatusOr> GrpcXdsClient::GetOrCreate( auto channel_args = ChannelArgs::FromC(xds_channel_args); return MakeRefCounted( key, std::move(*bootstrap), channel_args, - MakeOrphanable(channel_args)); + MakeRefCounted(channel_args)); } // Otherwise, use the global instance. MutexLock lock(g_mu); @@ -265,7 +265,7 @@ absl::StatusOr> GrpcXdsClient::GetOrCreate( auto channel_args = ChannelArgs::FromC(g_channel_args); auto xds_client = MakeRefCounted( key, std::move(*bootstrap), channel_args, - MakeOrphanable(channel_args)); + MakeRefCounted(channel_args)); g_xds_client_map->emplace(xds_client->key(), xds_client.get()); GRPC_TRACE_LOG(xds_client, INFO) << "[xds_client " << xds_client.get() << "] Created xDS client for key " << key; @@ -286,21 +286,28 @@ GlobalStatsPluginRegistry::StatsPluginGroup GetStatsPluginGroupForKey( return GlobalStatsPluginRegistry::GetStatsPluginsForChannel(scope); } +std::string UserAgentName() { + return absl::StrCat("gRPC C-core ", GPR_PLATFORM_STRING, + GRPC_XDS_USER_AGENT_NAME_SUFFIX_STRING); +} + +std::string UserAgentVersion() { + return absl::StrCat("C-core ", grpc_version_string(), + GRPC_XDS_USER_AGENT_NAME_SUFFIX_STRING, + GRPC_XDS_USER_AGENT_VERSION_SUFFIX_STRING); +} + } // namespace GrpcXdsClient::GrpcXdsClient( - absl::string_view key, std::unique_ptr bootstrap, + absl::string_view key, std::shared_ptr bootstrap, const ChannelArgs& args, - OrphanablePtr transport_factory) + RefCountedPtr transport_factory) : XdsClient( - std::move(bootstrap), std::move(transport_factory), + bootstrap, transport_factory, grpc_event_engine::experimental::GetDefaultEventEngine(), - std::make_unique(*this), - absl::StrCat("gRPC C-core ", GPR_PLATFORM_STRING, - GRPC_XDS_USER_AGENT_NAME_SUFFIX_STRING), - absl::StrCat("C-core ", grpc_version_string(), - GRPC_XDS_USER_AGENT_NAME_SUFFIX_STRING, - GRPC_XDS_USER_AGENT_VERSION_SUFFIX_STRING), + std::make_unique(*this), UserAgentName(), + UserAgentVersion(), std::max(Duration::Zero(), args.GetDurationFromIntMillis( GRPC_ARG_XDS_RESOURCE_DOES_NOT_EXIST_TIMEOUT_MS) @@ -314,11 +321,16 @@ GrpcXdsClient::GrpcXdsClient( [this](CallbackMetricReporter& reporter) { ReportCallbackMetrics(reporter); }, - Duration::Seconds(5), kMetricConnected, kMetricResources)) {} + Duration::Seconds(5), kMetricConnected, kMetricResources)), + lrs_client_(MakeRefCounted( + std::move(bootstrap), UserAgentName(), UserAgentVersion(), + std::move(transport_factory), + grpc_event_engine::experimental::GetDefaultEventEngine())) {} void GrpcXdsClient::Orphaned() { registered_metric_callback_.reset(); XdsClient::Orphaned(); + lrs_client_.reset(); MutexLock lock(g_mu); auto it = g_xds_client_map->find(key_); if (it != g_xds_client_map->end() && it->second == this) { @@ -326,6 +338,11 @@ void GrpcXdsClient::Orphaned() { } } +void GrpcXdsClient::ResetBackoff() { + XdsClient::ResetBackoff(); + lrs_client_->ResetBackoff(); +} + grpc_pollset_set* GrpcXdsClient::interested_parties() const { return reinterpret_cast(transport_factory()) ->interested_parties(); diff --git a/src/core/xds/grpc/xds_client_grpc.h b/src/core/xds/grpc/xds_client_grpc.h index 3093bcab198..bf6828f20f6 100644 --- a/src/core/xds/grpc/xds_client_grpc.h +++ b/src/core/xds/grpc/xds_client_grpc.h @@ -34,6 +34,7 @@ #include "src/core/util/useful.h" #include "src/core/xds/grpc/certificate_provider_store.h" #include "src/core/xds/grpc/xds_bootstrap_grpc.h" +#include "src/core/xds/xds_client/lrs_client.h" #include "src/core/xds/xds_client/xds_client.h" #include "src/core/xds/xds_client/xds_transport.h" @@ -61,9 +62,9 @@ class GrpcXdsClient final : public XdsClient { // that also use certificate_provider_store(), but we should consider // alternatives for that case as well. GrpcXdsClient(absl::string_view key, - std::unique_ptr bootstrap, + std::shared_ptr bootstrap, const ChannelArgs& args, - OrphanablePtr transport_factory); + RefCountedPtr transport_factory); // Helpers for encoding the XdsClient object in channel args. static absl::string_view ChannelArgName() { @@ -73,6 +74,8 @@ class GrpcXdsClient final : public XdsClient { return QsortCompare(a, b); } + void ResetBackoff() override; + grpc_pollset_set* interested_parties() const; CertificateProviderStore& certificate_provider_store() const { @@ -81,6 +84,8 @@ class GrpcXdsClient final : public XdsClient { absl::string_view key() const { return key_; } + LrsClient& lrs_client() { return *lrs_client_; } + // Builds ClientStatusResponse containing all resources from all XdsClients static grpc_slice DumpAllClientConfigs(); @@ -94,6 +99,7 @@ class GrpcXdsClient final : public XdsClient { OrphanablePtr certificate_provider_store_; GlobalStatsPluginRegistry::StatsPluginGroup stats_plugin_group_; std::unique_ptr registered_metric_callback_; + RefCountedPtr lrs_client_; }; namespace internal { diff --git a/src/core/xds/grpc/xds_cluster.cc b/src/core/xds/grpc/xds_cluster.cc index 1de3379682e..2d4c2834ff0 100644 --- a/src/core/xds/grpc/xds_cluster.cc +++ b/src/core/xds/grpc/xds_cluster.cc @@ -49,7 +49,7 @@ std::string XdsClusterResource::ToString() const { }); contents.push_back(absl::StrCat("lb_policy_config=", JsonDump(Json::FromArray(lb_policy_config)))); - if (lrs_load_reporting_server.has_value()) { + if (lrs_load_reporting_server != nullptr) { contents.push_back(absl::StrCat("lrs_load_reporting_server_name=", lrs_load_reporting_server->server_uri())); } diff --git a/src/core/xds/grpc/xds_cluster.h b/src/core/xds/grpc/xds_cluster.h index 7021b61b300..f733a9328f8 100644 --- a/src/core/xds/grpc/xds_cluster.h +++ b/src/core/xds/grpc/xds_cluster.h @@ -35,6 +35,15 @@ namespace grpc_core { +inline bool LrsServersEqual( + const std::shared_ptr& lrs_server1, + const std::shared_ptr& lrs_server2) { + if (lrs_server1 == nullptr) return lrs_server2 == nullptr; + if (lrs_server2 == nullptr) return false; + // Neither one is null, so compare them. + return *lrs_server1 == *lrs_server2; +} + struct XdsClusterResource : public XdsResourceType::ResourceData { struct Eds { // If empty, defaults to the cluster name. @@ -71,8 +80,8 @@ struct XdsClusterResource : public XdsResourceType::ResourceData { // Note: Remaining fields are not used for aggregate clusters. // The LRS server to use for load reporting. - // If not set, load reporting will be disabled. - absl::optional lrs_load_reporting_server; + // If null, load reporting will be disabled. + std::shared_ptr lrs_load_reporting_server; // Tls Context used by clients CommonTlsContext common_tls_context; @@ -92,7 +101,8 @@ struct XdsClusterResource : public XdsResourceType::ResourceData { bool operator==(const XdsClusterResource& other) const { return type == other.type && lb_policy_config == other.lb_policy_config && - lrs_load_reporting_server == other.lrs_load_reporting_server && + LrsServersEqual(lrs_load_reporting_server, + other.lrs_load_reporting_server) && common_tls_context == other.common_tls_context && connection_idle_timeout == other.connection_idle_timeout && max_concurrent_requests == other.max_concurrent_requests && diff --git a/src/core/xds/grpc/xds_cluster_parser.cc b/src/core/xds/grpc/xds_cluster_parser.cc index 53a88d6ef9a..4b0f2683f10 100644 --- a/src/core/xds/grpc/xds_cluster_parser.cc +++ b/src/core/xds/grpc/xds_cluster_parser.cc @@ -454,7 +454,7 @@ absl::StatusOr> CdsResourceParse( ValidationErrors::ScopedField field(&errors, ".lrs_server"); errors.AddError("ConfigSource is not self"); } - cds_update->lrs_load_reporting_server.emplace( + cds_update->lrs_load_reporting_server = std::make_shared( static_cast(context.server)); } // Protocol options. diff --git a/src/core/xds/grpc/xds_endpoint.h b/src/core/xds/grpc/xds_endpoint.h index 191a3b73b42..4a07e5871c0 100644 --- a/src/core/xds/grpc/xds_endpoint.h +++ b/src/core/xds/grpc/xds_endpoint.h @@ -29,7 +29,7 @@ #include "src/core/util/ref_counted.h" #include "src/core/util/ref_counted_ptr.h" #include "src/core/util/sync.h" -#include "src/core/xds/xds_client/xds_client_stats.h" +#include "src/core/xds/xds_client/xds_locality.h" #include "src/core/xds/xds_client/xds_resource_type.h" #include "src/core/xds/xds_client/xds_resource_type_impl.h" diff --git a/src/core/xds/grpc/xds_transport_grpc.cc b/src/core/xds/grpc/xds_transport_grpc.cc index 435a07083ba..5bc75266959 100644 --- a/src/core/xds/grpc/xds_transport_grpc.cc +++ b/src/core/xds/grpc/xds_transport_grpc.cc @@ -41,6 +41,7 @@ #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/config/core_configuration.h" +#include "src/core/lib/debug/trace.h" #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/exec_ctx.h" @@ -68,7 +69,7 @@ namespace grpc_core { // GrpcXdsTransportFactory::GrpcXdsTransport::GrpcStreamingCall::GrpcStreamingCall( - RefCountedPtr factory, Channel* channel, + WeakRefCountedPtr factory, Channel* channel, const char* method, std::unique_ptr event_handler) : factory_(std::move(factory)), event_handler_(std::move(event_handler)) { @@ -229,25 +230,24 @@ void GrpcXdsTransportFactory::GrpcXdsTransport::GrpcStreamingCall:: class GrpcXdsTransportFactory::GrpcXdsTransport::StateWatcher final : public AsyncConnectivityStateWatcherInterface { public: - explicit StateWatcher( - std::function on_connectivity_failure) - : on_connectivity_failure_(std::move(on_connectivity_failure)) {} + explicit StateWatcher(RefCountedPtr watcher) + : watcher_(std::move(watcher)) {} private: void OnConnectivityStateChange(grpc_connectivity_state new_state, const absl::Status& status) override { if (new_state == GRPC_CHANNEL_TRANSIENT_FAILURE) { - on_connectivity_failure_(absl::Status( + watcher_->OnConnectivityFailure(absl::Status( status.code(), absl::StrCat("channel in TRANSIENT_FAILURE: ", status.message()))); } } - std::function on_connectivity_failure_; + RefCountedPtr watcher_; }; // -// GrpcXdsClient::GrpcXdsTransport +// GrpcXdsTransportFactory::GrpcXdsTransport // namespace { @@ -264,35 +264,74 @@ RefCountedPtr CreateXdsChannel(const ChannelArgs& args, } // namespace GrpcXdsTransportFactory::GrpcXdsTransport::GrpcXdsTransport( - GrpcXdsTransportFactory* factory, const XdsBootstrap::XdsServer& server, - std::function on_connectivity_failure, - absl::Status* status) - : factory_(factory) { - channel_ = CreateXdsChannel(factory->args_, + WeakRefCountedPtr factory, + const XdsBootstrap::XdsServer& server, absl::Status* status) + : XdsTransport(GRPC_TRACE_FLAG_ENABLED(xds_client_refcount) + ? "GrpcXdsTransport" + : nullptr), + factory_(std::move(factory)), + key_(server.Key()) { + GRPC_TRACE_LOG(xds_client, INFO) + << "[GrpcXdsTransport " << this << "] created"; + channel_ = CreateXdsChannel(factory_->args_, static_cast(server)); CHECK(channel_ != nullptr); if (channel_->IsLame()) { *status = absl::UnavailableError("xds client has a lame channel"); - } else { - watcher_ = new StateWatcher(std::move(on_connectivity_failure)); - channel_->AddConnectivityWatcher( - GRPC_CHANNEL_IDLE, - OrphanablePtr(watcher_)); } } -void GrpcXdsTransportFactory::GrpcXdsTransport::Orphan() { - if (!channel_->IsLame()) { - channel_->RemoveConnectivityWatcher(watcher_); +GrpcXdsTransportFactory::GrpcXdsTransport::~GrpcXdsTransport() { + GRPC_TRACE_LOG(xds_client, INFO) + << "[GrpcXdsTransport " << this << "] destroying"; +} + +void GrpcXdsTransportFactory::GrpcXdsTransport::Orphaned() { + GRPC_TRACE_LOG(xds_client, INFO) + << "[GrpcXdsTransport " << this << "] orphaned"; + { + MutexLock lock(&factory_->mu_); + auto it = factory_->transports_.find(key_); + if (it != factory_->transports_.end() && it->second == this) { + factory_->transports_.erase(it); + } } // Do an async hop before unreffing. This avoids a deadlock upon // shutdown in the case where the xDS channel is itself an xDS channel // (e.g., when using one control plane to find another control plane). - grpc_event_engine::experimental::GetDefaultEventEngine()->Run([this]() { - ApplicationCallbackExecCtx application_exec_ctx; - ExecCtx exec_ctx; - Unref(); - }); + grpc_event_engine::experimental::GetDefaultEventEngine()->Run( + [self = WeakRefAsSubclass()]() mutable { + ApplicationCallbackExecCtx application_exec_ctx; + ExecCtx exec_ctx; + self.reset(); + }); +} + +void GrpcXdsTransportFactory::GrpcXdsTransport::StartConnectivityFailureWatch( + RefCountedPtr watcher) { + if (channel_->IsLame()) return; + auto* state_watcher = new StateWatcher(watcher); + { + MutexLock lock(&mu_); + watchers_.emplace(watcher, state_watcher); + } + channel_->AddConnectivityWatcher( + GRPC_CHANNEL_IDLE, + OrphanablePtr(state_watcher)); +} + +void GrpcXdsTransportFactory::GrpcXdsTransport::StopConnectivityFailureWatch( + const RefCountedPtr& watcher) { + if (channel_->IsLame()) return; + StateWatcher* state_watcher = nullptr; + { + MutexLock lock(&mu_); + auto it = watchers_.find(watcher); + if (it == watchers_.end()) return; + state_watcher = it->second; + watchers_.erase(it); + } + channel_->RemoveConnectivityWatcher(state_watcher); } OrphanablePtr @@ -300,9 +339,8 @@ GrpcXdsTransportFactory::GrpcXdsTransport::CreateStreamingCall( const char* method, std::unique_ptr event_handler) { return MakeOrphanable( - factory_->RefAsSubclass(DEBUG_LOCATION, - "StreamingCall"), - channel_.get(), method, std::move(event_handler)); + factory_.WeakRef(DEBUG_LOCATION, "StreamingCall"), channel_.get(), method, + std::move(event_handler)); } void GrpcXdsTransportFactory::GrpcXdsTransport::ResetBackoff() { @@ -336,13 +374,22 @@ GrpcXdsTransportFactory::~GrpcXdsTransportFactory() { ShutdownInternally(); } -OrphanablePtr -GrpcXdsTransportFactory::Create( - const XdsBootstrap::XdsServer& server, - std::function on_connectivity_failure, - absl::Status* status) { - return MakeOrphanable( - this, server, std::move(on_connectivity_failure), status); +RefCountedPtr +GrpcXdsTransportFactory::GetTransport(const XdsBootstrap::XdsServer& server, + absl::Status* status) { + std::string key = server.Key(); + RefCountedPtr transport; + MutexLock lock(&mu_); + auto it = transports_.find(key); + if (it != transports_.end()) { + transport = it->second->RefIfNonZero().TakeAsSubclass(); + } + if (transport == nullptr) { + transport = MakeRefCounted( + WeakRefAsSubclass(), server, status); + transports_.emplace(std::move(key), transport.get()); + } + return transport; } } // namespace grpc_core diff --git a/src/core/xds/grpc/xds_transport_grpc.h b/src/core/xds/grpc/xds_transport_grpc.h index 90ff36aa41c..7615d19f6c8 100644 --- a/src/core/xds/grpc/xds_transport_grpc.h +++ b/src/core/xds/grpc/xds_transport_grpc.h @@ -21,6 +21,7 @@ #include #include +#include "absl/container/flat_hash_map.h" #include "absl/status/status.h" #include @@ -35,6 +36,7 @@ #include "src/core/lib/surface/channel.h" #include "src/core/util/orphanable.h" #include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" #include "src/core/xds/xds_client/xds_bootstrap.h" #include "src/core/xds/xds_client/xds_transport.h" @@ -47,18 +49,20 @@ class GrpcXdsTransportFactory final : public XdsTransportFactory { explicit GrpcXdsTransportFactory(const ChannelArgs& args); ~GrpcXdsTransportFactory() override; - void Orphan() override { Unref(); } + void Orphaned() override {} - OrphanablePtr Create( - const XdsBootstrap::XdsServer& server, - std::function on_connectivity_failure, - absl::Status* status) override; + RefCountedPtr GetTransport( + const XdsBootstrap::XdsServer& server, absl::Status* status) override; grpc_pollset_set* interested_parties() const { return interested_parties_; } private: ChannelArgs args_; grpc_pollset_set* interested_parties_; + + Mutex mu_; + absl::flat_hash_map + transports_ ABSL_GUARDED_BY(&mu_); }; class GrpcXdsTransportFactory::GrpcXdsTransport final @@ -66,12 +70,16 @@ class GrpcXdsTransportFactory::GrpcXdsTransport final public: class GrpcStreamingCall; - GrpcXdsTransport(GrpcXdsTransportFactory* factory, - const XdsBootstrap::XdsServer& server, - std::function on_connectivity_failure, - absl::Status* status); + GrpcXdsTransport(WeakRefCountedPtr factory, + const XdsBootstrap::XdsServer& server, absl::Status* status); + ~GrpcXdsTransport() override; - void Orphan() override; + void Orphaned() override; + + void StartConnectivityFailureWatch( + RefCountedPtr watcher) override; + void StopConnectivityFailureWatch( + const RefCountedPtr& watcher) override; OrphanablePtr CreateStreamingCall( const char* method, @@ -82,15 +90,19 @@ class GrpcXdsTransportFactory::GrpcXdsTransport final private: class StateWatcher; - GrpcXdsTransportFactory* factory_; // Not owned. + WeakRefCountedPtr factory_; + std::string key_; RefCountedPtr channel_; - StateWatcher* watcher_; + + Mutex mu_; + absl::flat_hash_map, StateWatcher*> + watchers_ ABSL_GUARDED_BY(&mu_); }; class GrpcXdsTransportFactory::GrpcXdsTransport::GrpcStreamingCall final : public XdsTransportFactory::XdsTransport::StreamingCall { public: - GrpcStreamingCall(RefCountedPtr factory, + GrpcStreamingCall(WeakRefCountedPtr factory, Channel* channel, const char* method, std::unique_ptr event_handler); ~GrpcStreamingCall() override; @@ -107,7 +119,7 @@ class GrpcXdsTransportFactory::GrpcXdsTransport::GrpcStreamingCall final static void OnResponseReceived(void* arg, grpc_error_handle /*error*/); static void OnStatusReceived(void* arg, grpc_error_handle /*error*/); - RefCountedPtr factory_; + WeakRefCountedPtr factory_; std::unique_ptr event_handler_; diff --git a/src/core/xds/xds_client/lrs_client.cc b/src/core/xds/xds_client/lrs_client.cc new file mode 100644 index 00000000000..b1767a0e037 --- /dev/null +++ b/src/core/xds/xds_client/lrs_client.cc @@ -0,0 +1,1206 @@ +// +// Copyright 2018 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/xds/xds_client/lrs_client.h" + +#include +#include +#include +#include + +#include "absl/cleanup/cleanup.h" +#include "absl/log/check.h" +#include "absl/log/log.h" +#include "absl/strings/string_view.h" +#include "absl/types/optional.h" +#include "envoy/config/core/v3/base.upb.h" +#include "envoy/config/endpoint/v3/load_report.upb.h" +#include "envoy/service/load_stats/v3/lrs.upb.h" +#include "envoy/service/load_stats/v3/lrs.upbdefs.h" +#include "google/protobuf/duration.upb.h" +#include "upb/base/string_view.h" +#include "upb/mem/arena.h" +#include "upb/reflection/def.h" +#include "upb/text/encode.h" + +#include + +#include "src/core/lib/debug/trace.h" +#include "src/core/lib/iomgr/exec_ctx.h" +#include "src/core/util/backoff.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" +#include "src/core/util/upb_utils.h" +#include "src/core/util/uri.h" +#include "src/core/xds/xds_client/xds_api.h" +#include "src/core/xds/xds_client/xds_bootstrap.h" +#include "src/core/xds/xds_client/xds_locality.h" + +#define GRPC_XDS_INITIAL_CONNECT_BACKOFF_SECONDS 1 +#define GRPC_XDS_RECONNECT_BACKOFF_MULTIPLIER 1.6 +#define GRPC_XDS_RECONNECT_MAX_BACKOFF_SECONDS 120 +#define GRPC_XDS_RECONNECT_JITTER 0.2 +#define GRPC_XDS_MIN_CLIENT_LOAD_REPORTING_INTERVAL_MS 1000 + +namespace grpc_core { + +using ::grpc_event_engine::experimental::EventEngine; + +namespace { + +uint64_t GetAndResetCounter(std::atomic* from) { + return from->exchange(0, std::memory_order_relaxed); +} + +} // namespace + +// +// LrsClient::ClusterDropStats +// + +LrsClient::ClusterDropStats::ClusterDropStats( + RefCountedPtr lrs_client, absl::string_view lrs_server, + absl::string_view cluster_name, absl::string_view eds_service_name) + : RefCounted(GRPC_TRACE_FLAG_ENABLED(xds_client_refcount) + ? "ClusterDropStats" + : nullptr), + lrs_client_(std::move(lrs_client)), + lrs_server_(lrs_server), + cluster_name_(cluster_name), + eds_service_name_(eds_service_name) { + GRPC_TRACE_LOG(xds_client, INFO) + << "[lrs_client " << lrs_client_.get() << "] created drop stats " << this + << " for {" << lrs_server_ << ", " << cluster_name_ << ", " + << eds_service_name_ << "}"; +} + +LrsClient::ClusterDropStats::~ClusterDropStats() { + GRPC_TRACE_LOG(xds_client, INFO) + << "[lrs_client " << lrs_client_.get() << "] destroying drop stats " + << this << " for {" << lrs_server_ << ", " << cluster_name_ << ", " + << eds_service_name_ << "}"; + lrs_client_->RemoveClusterDropStats(lrs_server_, cluster_name_, + eds_service_name_, this); + lrs_client_.reset(DEBUG_LOCATION, "ClusterDropStats"); +} + +LrsClient::ClusterDropStats::Snapshot +LrsClient::ClusterDropStats::GetSnapshotAndReset() { + Snapshot snapshot; + snapshot.uncategorized_drops = GetAndResetCounter(&uncategorized_drops_); + MutexLock lock(&mu_); + snapshot.categorized_drops = std::move(categorized_drops_); + return snapshot; +} + +void LrsClient::ClusterDropStats::AddUncategorizedDrops() { + uncategorized_drops_.fetch_add(1); +} + +void LrsClient::ClusterDropStats::AddCallDropped(const std::string& category) { + MutexLock lock(&mu_); + ++categorized_drops_[category]; +} + +// +// LrsClient::ClusterLocalityStats +// + +LrsClient::ClusterLocalityStats::ClusterLocalityStats( + RefCountedPtr lrs_client, absl::string_view lrs_server, + absl::string_view cluster_name, absl::string_view eds_service_name, + RefCountedPtr name) + : RefCounted(GRPC_TRACE_FLAG_ENABLED(xds_client_refcount) + ? "ClusterLocalityStats" + : nullptr), + lrs_client_(std::move(lrs_client)), + lrs_server_(lrs_server), + cluster_name_(cluster_name), + eds_service_name_(eds_service_name), + name_(std::move(name)) { + GRPC_TRACE_LOG(xds_client, INFO) + << "[lrs_client " << lrs_client_.get() << "] created locality stats " + << this << " for {" << lrs_server_ << ", " << cluster_name_ << ", " + << eds_service_name_ << ", " + << (name_ == nullptr ? "" : name_->human_readable_string().c_str()) + << "}"; +} + +LrsClient::ClusterLocalityStats::~ClusterLocalityStats() { + GRPC_TRACE_LOG(xds_client, INFO) + << "[lrs_client " << lrs_client_.get() << "] destroying locality stats " + << this << " for {" << lrs_server_ << ", " << cluster_name_ << ", " + << eds_service_name_ << ", " + << (name_ == nullptr ? "" : name_->human_readable_string().c_str()) + << "}"; + lrs_client_->RemoveClusterLocalityStats(lrs_server_, cluster_name_, + eds_service_name_, name_, this); + lrs_client_.reset(DEBUG_LOCATION, "ClusterLocalityStats"); +} + +LrsClient::ClusterLocalityStats::Snapshot +LrsClient::ClusterLocalityStats::GetSnapshotAndReset() { + Snapshot snapshot; + for (auto& percpu_stats : stats_) { + Snapshot percpu_snapshot = { + GetAndResetCounter(&percpu_stats.total_successful_requests), + // Don't reset total_requests_in_progress because it's + // not related to a single reporting interval. + percpu_stats.total_requests_in_progress.load(std::memory_order_relaxed), + GetAndResetCounter(&percpu_stats.total_error_requests), + GetAndResetCounter(&percpu_stats.total_issued_requests), + {}}; + { + MutexLock lock(&percpu_stats.backend_metrics_mu); + percpu_snapshot.backend_metrics = std::move(percpu_stats.backend_metrics); + } + snapshot += percpu_snapshot; + } + return snapshot; +} + +void LrsClient::ClusterLocalityStats::AddCallStarted() { + Stats& stats = stats_.this_cpu(); + stats.total_issued_requests.fetch_add(1, std::memory_order_relaxed); + stats.total_requests_in_progress.fetch_add(1, std::memory_order_relaxed); +} + +void LrsClient::ClusterLocalityStats::AddCallFinished( + const std::map* named_metrics, bool fail) { + Stats& stats = stats_.this_cpu(); + std::atomic& to_increment = + fail ? stats.total_error_requests : stats.total_successful_requests; + to_increment.fetch_add(1, std::memory_order_relaxed); + stats.total_requests_in_progress.fetch_add(-1, std::memory_order_acq_rel); + if (named_metrics == nullptr) return; + MutexLock lock(&stats.backend_metrics_mu); + for (const auto& m : *named_metrics) { + stats.backend_metrics[std::string(m.first)] += BackendMetric{1, m.second}; + } +} + +// +// Internal class declarations +// + +// A call wrapper that can restart a call upon failure. +// The template parameter is the kind of wrapped call. +// TODO(roth): This is basically the same code as in XdsClient, and +// probably very similar to many other places in the codebase. +// Consider refactoring this into a common utility library somehow. +template +class LrsClient::LrsChannel::RetryableCall final + : public InternallyRefCounted> { + public: + explicit RetryableCall(WeakRefCountedPtr lrs_channel); + + // Disable thread-safety analysis because this method is called via + // OrphanablePtr<>, but there's no way to pass the lock annotation + // through there. + void Orphan() override ABSL_NO_THREAD_SAFETY_ANALYSIS; + + void OnCallFinishedLocked() ABSL_EXCLUSIVE_LOCKS_REQUIRED(&LrsClient::mu_); + + T* call() const { return call_.get(); } + LrsChannel* lrs_channel() const { return lrs_channel_.get(); } + + bool IsCurrentCallOnChannel() const; + + private: + void StartNewCallLocked(); + void StartRetryTimerLocked() ABSL_EXCLUSIVE_LOCKS_REQUIRED(&LrsClient::mu_); + + void OnRetryTimer(); + + // The wrapped xds call that talks to the xds server. It's instantiated + // every time we start a new call. It's null during call retry backoff. + OrphanablePtr call_; + // The owning xds channel. + WeakRefCountedPtr lrs_channel_; + + // Retry state. + BackOff backoff_; + absl::optional timer_handle_ + ABSL_GUARDED_BY(&LrsClient::mu_); + + bool shutting_down_ = false; +}; + +// An LRS call to the LRS server. +class LrsClient::LrsChannel::LrsCall final + : public InternallyRefCounted { + public: + // The ctor and dtor should not be used directly. + explicit LrsCall(RefCountedPtr> retryable_call); + + void Orphan() override; + + RetryableCall* retryable_call() { return retryable_call_.get(); } + LrsChannel* lrs_channel() const { return retryable_call_->lrs_channel(); } + LrsClient* lrs_client() const { return lrs_channel()->lrs_client(); } + bool seen_response() const { return seen_response_; } + + private: + class StreamEventHandler final + : public XdsTransportFactory::XdsTransport::StreamingCall::EventHandler { + public: + explicit StreamEventHandler(RefCountedPtr lrs_call) + : lrs_call_(std::move(lrs_call)) {} + + void OnRequestSent(bool /*ok*/) override { lrs_call_->OnRequestSent(); } + void OnRecvMessage(absl::string_view payload) override { + lrs_call_->OnRecvMessage(payload); + } + void OnStatusReceived(absl::Status status) override { + lrs_call_->OnStatusReceived(std::move(status)); + } + + private: + RefCountedPtr lrs_call_; + }; + + // A repeating timer for a particular duration. + class Timer final : public InternallyRefCounted { + public: + explicit Timer(RefCountedPtr lrs_call) + : lrs_call_(std::move(lrs_call)) {} + ~Timer() override { lrs_call_.reset(DEBUG_LOCATION, "LRS timer"); } + + // Disable thread-safety analysis because this method is called via + // OrphanablePtr<>, but there's no way to pass the lock annotation + // through there. + void Orphan() override ABSL_NO_THREAD_SAFETY_ANALYSIS; + + void ScheduleNextReportLocked() + ABSL_EXCLUSIVE_LOCKS_REQUIRED(&LrsClient::mu_); + + private: + bool IsCurrentTimerOnCall() const { + return this == lrs_call_->timer_.get(); + } + LrsClient* lrs_client() const { return lrs_call_->lrs_client(); } + + void OnNextReportTimer(); + + // The owning LRS call. + RefCountedPtr lrs_call_; + + absl::optional timer_handle_ + ABSL_GUARDED_BY(&LrsClient::mu_); + }; + + void MaybeScheduleNextReportLocked() + ABSL_EXCLUSIVE_LOCKS_REQUIRED(&LrsClient::mu_); + + void SendReportLocked() ABSL_EXCLUSIVE_LOCKS_REQUIRED(&LrsClient::mu_); + + void SendMessageLocked(std::string payload) + ABSL_EXCLUSIVE_LOCKS_REQUIRED(&LrsClient::mu_); + + void OnRequestSent(); + void OnRecvMessage(absl::string_view payload); + void OnStatusReceived(absl::Status status); + + bool IsCurrentCallOnChannel() const; + + // The owning RetryableCall<>. + RefCountedPtr> retryable_call_; + + OrphanablePtr + streaming_call_; + + bool seen_response_ = false; + bool send_message_pending_ ABSL_GUARDED_BY(&LrsClient::mu_) = false; + + // Load reporting state. + bool send_all_clusters_ = false; + std::set cluster_names_; // Asked for by the LRS server. + Duration load_reporting_interval_; + bool last_report_counters_were_zero_ = false; + OrphanablePtr timer_; +}; + +// +// LrsClient::LrsChannel +// + +LrsClient::LrsChannel::LrsChannel( + WeakRefCountedPtr lrs_client, + std::shared_ptr server) + : DualRefCounted(GRPC_TRACE_FLAG_ENABLED(xds_client_refcount) + ? "LrsChannel" + : nullptr), + lrs_client_(std::move(lrs_client)), + server_(std::move(server)) { + GRPC_TRACE_LOG(xds_client, INFO) + << "[lrs_client " << lrs_client_.get() << "] creating channel " << this + << " for server " << server_->server_uri(); + absl::Status status; + transport_ = lrs_client_->transport_factory_->GetTransport(*server_, &status); + CHECK(transport_ != nullptr); + if (!status.ok()) { + LOG(ERROR) << "Error creating LRS channel to " << server_->server_uri() + << ": " << status; + } +} + +LrsClient::LrsChannel::~LrsChannel() { + GRPC_TRACE_LOG(xds_client, INFO) + << "[lrs_client " << lrs_client() << "] destroying lrs channel " << this + << " for server " << server_->server_uri(); + lrs_client_.reset(DEBUG_LOCATION, "LrsChannel"); +} + +// This method should only ever be called when holding the lock, but we can't +// use a ABSL_EXCLUSIVE_LOCKS_REQUIRED annotation, because Orphan() will be +// called from DualRefCounted::Unref(), which cannot have a lock annotation for +// a lock in this subclass. +void LrsClient::LrsChannel::Orphaned() ABSL_NO_THREAD_SAFETY_ANALYSIS { + GRPC_TRACE_LOG(xds_client, INFO) + << "[lrs_client " << lrs_client() << "] orphaning lrs channel " << this + << " for server " << server_->server_uri(); + transport_.reset(); + // At this time, all strong refs are removed, remove from channel map to + // prevent subsequent subscription from trying to use this LrsChannel as + // it is shutting down. + lrs_client_->lrs_channel_map_.erase(server_->Key()); + lrs_call_.reset(); +} + +void LrsClient::LrsChannel::ResetBackoff() { transport_->ResetBackoff(); } + +void LrsClient::LrsChannel::MaybeStartLrsCall() { + if (lrs_call_ != nullptr) return; + lrs_call_ = MakeOrphanable>( + WeakRef(DEBUG_LOCATION, "LrsCall")); +} + +void LrsClient::LrsChannel::StopLrsCallLocked() { + lrs_client_->load_report_map_.erase(server_->Key()); + lrs_call_.reset(); +} + +// +// LrsClient::LrsChannel::RetryableCall<> +// + +template +LrsClient::LrsChannel::RetryableCall::RetryableCall( + WeakRefCountedPtr lrs_channel) + : lrs_channel_(std::move(lrs_channel)), + backoff_(BackOff::Options() + .set_initial_backoff(Duration::Seconds( + GRPC_XDS_INITIAL_CONNECT_BACKOFF_SECONDS)) + .set_multiplier(GRPC_XDS_RECONNECT_BACKOFF_MULTIPLIER) + .set_jitter(GRPC_XDS_RECONNECT_JITTER) + .set_max_backoff(Duration::Seconds( + GRPC_XDS_RECONNECT_MAX_BACKOFF_SECONDS))) { + StartNewCallLocked(); +} + +template +void LrsClient::LrsChannel::RetryableCall::Orphan() { + shutting_down_ = true; + call_.reset(); + if (timer_handle_.has_value()) { + lrs_channel()->lrs_client()->engine()->Cancel(*timer_handle_); + timer_handle_.reset(); + } + this->Unref(DEBUG_LOCATION, "RetryableCall+orphaned"); +} + +template +void LrsClient::LrsChannel::RetryableCall::OnCallFinishedLocked() { + // If we saw a response on the current stream, reset backoff. + if (call_->seen_response()) backoff_.Reset(); + call_.reset(); + // Start retry timer. + StartRetryTimerLocked(); +} + +template +void LrsClient::LrsChannel::RetryableCall::StartNewCallLocked() { + if (shutting_down_) return; + CHECK(lrs_channel_->transport_ != nullptr); + CHECK(call_ == nullptr); + GRPC_TRACE_LOG(xds_client, INFO) + << "[lrs_client " << lrs_channel()->lrs_client() << "] lrs server " + << lrs_channel()->server_->server_uri() + << ": start new call from retryable call " << this; + call_ = MakeOrphanable( + this->Ref(DEBUG_LOCATION, "RetryableCall+start_new_call")); +} + +template +void LrsClient::LrsChannel::RetryableCall::StartRetryTimerLocked() { + if (shutting_down_) return; + const Duration delay = backoff_.NextAttemptDelay(); + GRPC_TRACE_LOG(xds_client, INFO) + << "[lrs_client " << lrs_channel()->lrs_client() << "] lrs server " + << lrs_channel()->server_->server_uri() + << ": call attempt failed; retry timer will fire in " << delay.millis() + << "ms."; + timer_handle_ = lrs_channel()->lrs_client()->engine()->RunAfter( + delay, + [self = this->Ref(DEBUG_LOCATION, "RetryableCall+retry_timer_start")]() { + ApplicationCallbackExecCtx callback_exec_ctx; + ExecCtx exec_ctx; + self->OnRetryTimer(); + }); +} + +template +void LrsClient::LrsChannel::RetryableCall::OnRetryTimer() { + MutexLock lock(&lrs_channel_->lrs_client()->mu_); + if (timer_handle_.has_value()) { + timer_handle_.reset(); + if (shutting_down_) return; + GRPC_TRACE_LOG(xds_client, INFO) + << "[lrs_client " << lrs_channel()->lrs_client() << "] lrs server " + << lrs_channel()->server_->server_uri() + << ": retry timer fired (retryable call: " << this << ")"; + StartNewCallLocked(); + } +} + +// +// LrsClient::LrsChannel::LrsCall::Timer +// + +void LrsClient::LrsChannel::LrsCall::Timer::Orphan() { + if (timer_handle_.has_value()) { + lrs_client()->engine()->Cancel(*timer_handle_); + timer_handle_.reset(); + } + Unref(DEBUG_LOCATION, "Orphan"); +} + +void LrsClient::LrsChannel::LrsCall::Timer::ScheduleNextReportLocked() { + GRPC_TRACE_LOG(xds_client, INFO) + << "[lrs_client " << lrs_client() << "] lrs server " + << lrs_call_->lrs_channel()->server_->server_uri() + << ": scheduling next load report in " + << lrs_call_->load_reporting_interval_; + timer_handle_ = lrs_client()->engine()->RunAfter( + lrs_call_->load_reporting_interval_, + [self = Ref(DEBUG_LOCATION, "timer")]() { + ApplicationCallbackExecCtx callback_exec_ctx; + ExecCtx exec_ctx; + self->OnNextReportTimer(); + }); +} + +void LrsClient::LrsChannel::LrsCall::Timer::OnNextReportTimer() { + MutexLock lock(&lrs_client()->mu_); + timer_handle_.reset(); + if (IsCurrentTimerOnCall()) lrs_call_->SendReportLocked(); +} + +// +// LrsClient::LrsChannel::LrsCall +// + +LrsClient::LrsChannel::LrsCall::LrsCall( + RefCountedPtr> retryable_call) + : InternallyRefCounted( + GRPC_TRACE_FLAG_ENABLED(xds_client_refcount) ? "LrsCall" : nullptr), + retryable_call_(std::move(retryable_call)) { + // Init the LRS call. Note that the call will progress every time there's + // activity in lrs_client()->interested_parties_, which is comprised of + // the polling entities from client_channel. + CHECK_NE(lrs_client(), nullptr); + const char* method = + "/envoy.service.load_stats.v3.LoadReportingService/StreamLoadStats"; + streaming_call_ = lrs_channel()->transport_->CreateStreamingCall( + method, std::make_unique( + // Passing the initial ref here. This ref will go away when + // the StreamEventHandler is destroyed. + RefCountedPtr(this))); + CHECK(streaming_call_ != nullptr); + // Start the call. + GRPC_TRACE_LOG(xds_client, INFO) + << "[lrs_client " << lrs_client() << "] lrs server " + << lrs_channel()->server_->server_uri() + << ": starting LRS call (lrs_call=" << this + << ", streaming_call=" << streaming_call_.get() << ")"; + // Send the initial request. + std::string serialized_payload = lrs_client()->CreateLrsInitialRequest(); + SendMessageLocked(std::move(serialized_payload)); + // Read initial response. + streaming_call_->StartRecvMessage(); +} + +void LrsClient::LrsChannel::LrsCall::Orphan() { + timer_.reset(); + // Note that the initial ref is held by the StreamEventHandler, which + // will be destroyed when streaming_call_ is destroyed, which may not happen + // here, since there may be other refs held to streaming_call_ by internal + // callbacks. + streaming_call_.reset(); +} + +void LrsClient::LrsChannel::LrsCall::MaybeScheduleNextReportLocked() { + // If there are no more registered stats to report, cancel the call. + auto it = lrs_client()->load_report_map_.find(lrs_channel()->server_->Key()); + if (it == lrs_client()->load_report_map_.end() || + it->second.load_report_map.empty()) { + it->second.lrs_channel->StopLrsCallLocked(); + return; + } + // Don't start if the previous send_message op hasn't completed yet. + // If this happens, we'll be called again from OnRequestSent(). + if (send_message_pending_) return; + // Don't start if no LRS response has arrived. + if (!seen_response()) return; + // If there is no timer, create one. + // This happens on the initial response and whenever the interval changes. + if (timer_ == nullptr) { + timer_ = MakeOrphanable(Ref(DEBUG_LOCATION, "LRS timer")); + } + // Schedule the next load report. + timer_->ScheduleNextReportLocked(); +} + +bool LrsClient::LoadReportCountersAreZero( + const ClusterLoadReportMap& snapshot) { + for (const auto& p : snapshot) { + const ClusterLoadReport& cluster_snapshot = p.second; + if (!cluster_snapshot.dropped_requests.IsZero()) return false; + for (const auto& q : cluster_snapshot.locality_stats) { + const ClusterLocalityStats::Snapshot& locality_snapshot = q.second; + if (!locality_snapshot.IsZero()) return false; + } + } + return true; +} + +void LrsClient::LrsChannel::LrsCall::SendReportLocked() { + // Construct snapshot from all reported stats. + ClusterLoadReportMap snapshot = lrs_client()->BuildLoadReportSnapshotLocked( + *lrs_channel()->server_, send_all_clusters_, cluster_names_); + // Skip client load report if the counters were all zero in the last + // report and they are still zero in this one. + const bool old_val = last_report_counters_were_zero_; + last_report_counters_were_zero_ = LoadReportCountersAreZero(snapshot); + if (old_val && last_report_counters_were_zero_) { + MaybeScheduleNextReportLocked(); + return; + } + // Send a request that contains the snapshot. + std::string serialized_payload = + lrs_client()->CreateLrsRequest(std::move(snapshot)); + SendMessageLocked(std::move(serialized_payload)); +} + +void LrsClient::LrsChannel::LrsCall::SendMessageLocked(std::string payload) { + send_message_pending_ = true; + streaming_call_->SendMessage(std::move(payload)); +} + +void LrsClient::LrsChannel::LrsCall::OnRequestSent() { + MutexLock lock(&lrs_client()->mu_); + send_message_pending_ = false; + if (IsCurrentCallOnChannel()) MaybeScheduleNextReportLocked(); +} + +void LrsClient::LrsChannel::LrsCall::OnRecvMessage(absl::string_view payload) { + MutexLock lock(&lrs_client()->mu_); + // If we're no longer the current call, ignore the result. + if (!IsCurrentCallOnChannel()) return; + // Start recv after any code branch + auto cleanup = absl::MakeCleanup( + [call = streaming_call_.get()]() { call->StartRecvMessage(); }); + // Parse the response. + bool send_all_clusters = false; + std::set new_cluster_names; + Duration new_load_reporting_interval; + absl::Status status = lrs_client()->ParseLrsResponse( + payload, &send_all_clusters, &new_cluster_names, + &new_load_reporting_interval); + if (!status.ok()) { + LOG(ERROR) << "[lrs_client " << lrs_client() << "] lrs server " + << lrs_channel()->server_->server_uri() + << ": LRS response parsing failed: " << status; + return; + } + seen_response_ = true; + if (GRPC_TRACE_FLAG_ENABLED(xds_client)) { + LOG(INFO) << "[lrs_client " << lrs_client() << "] lrs server " + << lrs_channel()->server_->server_uri() + << ": LRS response received, " << new_cluster_names.size() + << " cluster names, send_all_clusters=" << send_all_clusters + << ", load_report_interval=" + << new_load_reporting_interval.millis() << "ms"; + size_t i = 0; + for (const auto& name : new_cluster_names) { + LOG(INFO) << "[lrs_client " << lrs_client() << "] cluster_name " << i++ + << ": " << name; + } + } + if (new_load_reporting_interval < + Duration::Milliseconds(GRPC_XDS_MIN_CLIENT_LOAD_REPORTING_INTERVAL_MS)) { + new_load_reporting_interval = + Duration::Milliseconds(GRPC_XDS_MIN_CLIENT_LOAD_REPORTING_INTERVAL_MS); + GRPC_TRACE_LOG(xds_client, INFO) + << "[lrs_client " << lrs_client() << "] lrs server " + << lrs_channel()->server_->server_uri() + << ": increased load_report_interval to minimum value " + << GRPC_XDS_MIN_CLIENT_LOAD_REPORTING_INTERVAL_MS << "ms"; + } + // Ignore identical update. + if (send_all_clusters == send_all_clusters_ && + cluster_names_ == new_cluster_names && + load_reporting_interval_ == new_load_reporting_interval) { + GRPC_TRACE_LOG(xds_client, INFO) + << "[lrs_client " << lrs_client() << "] lrs server " + << lrs_channel()->server_->server_uri() + << ": incoming LRS response identical to current, ignoring."; + return; + } + // If the interval has changed, we'll need to restart the timer below. + const bool restart_timer = + load_reporting_interval_ != new_load_reporting_interval; + // Record the new config. + send_all_clusters_ = send_all_clusters; + cluster_names_ = std::move(new_cluster_names); + load_reporting_interval_ = new_load_reporting_interval; + // Restart timer if needed. + if (restart_timer) { + timer_.reset(); + MaybeScheduleNextReportLocked(); + } +} + +void LrsClient::LrsChannel::LrsCall::OnStatusReceived(absl::Status status) { + MutexLock lock(&lrs_client()->mu_); + GRPC_TRACE_LOG(xds_client, INFO) + << "[lrs_client " << lrs_client() << "] lrs server " + << lrs_channel()->server_->server_uri() + << ": LRS call status received (lrs_channel=" << lrs_channel() + << ", lrs_call=" << this << ", streaming_call=" << streaming_call_.get() + << "): " << status; + // Ignore status from a stale call. + if (IsCurrentCallOnChannel()) { + // Try to restart the call. + retryable_call_->OnCallFinishedLocked(); + } +} + +bool LrsClient::LrsChannel::LrsCall::IsCurrentCallOnChannel() const { + // If the retryable LRS call is null (which only happens when the lrs + // channel is shutting down), all the LRS calls are stale. + if (lrs_channel()->lrs_call_ == nullptr) return false; + return this == lrs_channel()->lrs_call_->call(); +} + +// +// LrsClient +// + +LrsClient::LrsClient( + std::shared_ptr bootstrap, std::string user_agent_name, + std::string user_agent_version, + RefCountedPtr transport_factory, + std::shared_ptr engine) + : DualRefCounted( + GRPC_TRACE_FLAG_ENABLED(xds_client_refcount) ? "LrsClient" : nullptr), + bootstrap_(std::move(bootstrap)), + user_agent_name_(std::move(user_agent_name)), + user_agent_version_(std::move(user_agent_version)), + transport_factory_(std::move(transport_factory)), + engine_(std::move(engine)) { + GRPC_TRACE_LOG(xds_client, INFO) + << "[lrs_client " << this << "] creating lrs client"; +} + +LrsClient::~LrsClient() { + GRPC_TRACE_LOG(xds_client, INFO) + << "[lrs_client " << this << "] destroying lrs client"; +} + +void LrsClient::Orphaned() { + GRPC_TRACE_LOG(xds_client, INFO) + << "[lrs_client " << this << "] shutting down lrs client"; + MutexLock lock(&mu_); + // We may still be sending lingering queued load report data, so don't + // just clear the load reporting map, but we do want to clear the refs + // we're holding to the LrsChannel objects, to make sure that + // everything shuts down properly. + for (auto& p : load_report_map_) { + p.second.lrs_channel.reset(DEBUG_LOCATION, "LrsClient::Orphan()"); + } +} + +RefCountedPtr LrsClient::GetOrCreateLrsChannelLocked( + std::shared_ptr server, const char* reason) { + std::string key = server->Key(); + auto it = lrs_channel_map_.find(key); + if (it != lrs_channel_map_.end()) { + return it->second->Ref(DEBUG_LOCATION, reason); + } + // Channel not found, so create a new one. + auto lrs_channel = MakeRefCounted( + WeakRef(DEBUG_LOCATION, "LrsChannel"), std::move(server)); + lrs_channel_map_[std::move(key)] = lrs_channel.get(); + return lrs_channel; +} + +RefCountedPtr LrsClient::AddClusterDropStats( + std::shared_ptr lrs_server, + absl::string_view cluster_name, absl::string_view eds_service_name) { + auto key = + std::make_pair(std::string(cluster_name), std::string(eds_service_name)); + RefCountedPtr cluster_drop_stats; + { + MutexLock lock(&mu_); + // We jump through some hoops here to make sure that the + // absl::string_views stored in the ClusterDropStats object point + // to the strings in the load_report_map_ keys, so that + // they have the same lifetime. + auto server_it = + load_report_map_.emplace(lrs_server->Key(), LoadReportServer()).first; + if (server_it->second.lrs_channel == nullptr) { + server_it->second.lrs_channel = GetOrCreateLrsChannelLocked( + lrs_server, "load report map (drop stats)"); + } + auto load_report_it = server_it->second.load_report_map + .emplace(std::move(key), LoadReportState()) + .first; + LoadReportState& load_report_state = load_report_it->second; + if (load_report_state.drop_stats != nullptr) { + cluster_drop_stats = load_report_state.drop_stats->RefIfNonZero(); + } + if (cluster_drop_stats == nullptr) { + if (load_report_state.drop_stats != nullptr) { + load_report_state.deleted_drop_stats += + load_report_state.drop_stats->GetSnapshotAndReset(); + } + cluster_drop_stats = MakeRefCounted( + Ref(DEBUG_LOCATION, "DropStats"), server_it->first /*lrs_server*/, + load_report_it->first.first /*cluster_name*/, + load_report_it->first.second /*eds_service_name*/); + load_report_state.drop_stats = cluster_drop_stats.get(); + } + server_it->second.lrs_channel->MaybeStartLrsCall(); + } + return cluster_drop_stats; +} + +void LrsClient::RemoveClusterDropStats( + absl::string_view lrs_server_key, absl::string_view cluster_name, + absl::string_view eds_service_name, + LrsClient::ClusterDropStats* cluster_drop_stats) { + MutexLock lock(&mu_); + auto server_it = load_report_map_.find(lrs_server_key); + if (server_it == load_report_map_.end()) return; + auto load_report_it = server_it->second.load_report_map.find( + std::make_pair(std::string(cluster_name), std::string(eds_service_name))); + if (load_report_it == server_it->second.load_report_map.end()) return; + LoadReportState& load_report_state = load_report_it->second; + if (load_report_state.drop_stats == cluster_drop_stats) { + // Record final snapshot in deleted_drop_stats, which will be + // added to the next load report. + load_report_state.deleted_drop_stats += + load_report_state.drop_stats->GetSnapshotAndReset(); + load_report_state.drop_stats = nullptr; + } +} + +RefCountedPtr +LrsClient::AddClusterLocalityStats( + std::shared_ptr lrs_server, + absl::string_view cluster_name, absl::string_view eds_service_name, + RefCountedPtr locality) { + auto key = + std::make_pair(std::string(cluster_name), std::string(eds_service_name)); + RefCountedPtr cluster_locality_stats; + { + MutexLock lock(&mu_); + // We jump through some hoops here to make sure that the + // absl::string_views stored in the ClusterLocalityStats object point + // to the strings in the load_report_map_ keys, so that + // they have the same lifetime. + auto server_it = + load_report_map_.emplace(lrs_server->Key(), LoadReportServer()).first; + if (server_it->second.lrs_channel == nullptr) { + server_it->second.lrs_channel = GetOrCreateLrsChannelLocked( + std::move(lrs_server), "load report map (locality stats)"); + } + auto load_report_it = server_it->second.load_report_map + .emplace(std::move(key), LoadReportState()) + .first; + LoadReportState& load_report_state = load_report_it->second; + LoadReportState::LocalityState& locality_state = + load_report_state.locality_stats[locality]; + if (locality_state.locality_stats != nullptr) { + cluster_locality_stats = locality_state.locality_stats->RefIfNonZero(); + } + if (cluster_locality_stats == nullptr) { + if (locality_state.locality_stats != nullptr) { + locality_state.deleted_locality_stats += + locality_state.locality_stats->GetSnapshotAndReset(); + } + cluster_locality_stats = MakeRefCounted( + Ref(DEBUG_LOCATION, "LocalityStats"), server_it->first /*lrs_server*/, + load_report_it->first.first /*cluster_name*/, + load_report_it->first.second /*eds_service_name*/, + std::move(locality)); + locality_state.locality_stats = cluster_locality_stats.get(); + } + server_it->second.lrs_channel->MaybeStartLrsCall(); + } + return cluster_locality_stats; +} + +void LrsClient::RemoveClusterLocalityStats( + absl::string_view lrs_server_key, absl::string_view cluster_name, + absl::string_view eds_service_name, + const RefCountedPtr& locality, + ClusterLocalityStats* cluster_locality_stats) { + MutexLock lock(&mu_); + auto server_it = load_report_map_.find(lrs_server_key); + if (server_it == load_report_map_.end()) return; + auto load_report_it = server_it->second.load_report_map.find( + std::make_pair(std::string(cluster_name), std::string(eds_service_name))); + if (load_report_it == server_it->second.load_report_map.end()) return; + LoadReportState& load_report_state = load_report_it->second; + auto locality_it = load_report_state.locality_stats.find(locality); + if (locality_it == load_report_state.locality_stats.end()) return; + LoadReportState::LocalityState& locality_state = locality_it->second; + if (locality_state.locality_stats == cluster_locality_stats) { + // Record final snapshot in deleted_locality_stats, which will be + // added to the next load report. + locality_state.deleted_locality_stats += + locality_state.locality_stats->GetSnapshotAndReset(); + locality_state.locality_stats = nullptr; + } +} + +void LrsClient::ResetBackoff() { + MutexLock lock(&mu_); + for (auto& p : lrs_channel_map_) { + p.second->ResetBackoff(); + } +} + +LrsClient::ClusterLoadReportMap LrsClient::BuildLoadReportSnapshotLocked( + const XdsBootstrap::XdsServer& lrs_server, bool send_all_clusters, + const std::set& clusters) { + GRPC_TRACE_LOG(xds_client, INFO) + << "[lrs_client " << this << "] start building load report"; + ClusterLoadReportMap snapshot_map; + auto server_it = load_report_map_.find(lrs_server.Key()); + if (server_it == load_report_map_.end()) return snapshot_map; + auto& load_report_map = server_it->second.load_report_map; + for (auto load_report_it = load_report_map.begin(); + load_report_it != load_report_map.end();) { + // Cluster key is cluster and EDS service name. + const auto& cluster_key = load_report_it->first; + LoadReportState& load_report = load_report_it->second; + // If the CDS response for a cluster indicates to use LRS but the + // LRS server does not say that it wants reports for this cluster, + // then we'll have stats objects here whose data we're not going to + // include in the load report. However, we still need to clear out + // the data from the stats objects, so that if the LRS server starts + // asking for the data in the future, we don't incorrectly include + // data from previous reporting intervals in that future report. + const bool record_stats = + send_all_clusters || clusters.find(cluster_key.first) != clusters.end(); + ClusterLoadReport snapshot; + // Aggregate drop stats. + snapshot.dropped_requests = std::move(load_report.deleted_drop_stats); + if (load_report.drop_stats != nullptr) { + snapshot.dropped_requests += + load_report.drop_stats->GetSnapshotAndReset(); + GRPC_TRACE_LOG(xds_client, INFO) + << "[lrs_client " << this << "] cluster=" << cluster_key.first + << " eds_service_name=" << cluster_key.second + << " drop_stats=" << load_report.drop_stats; + } + // Aggregate locality stats. + for (auto it = load_report.locality_stats.begin(); + it != load_report.locality_stats.end();) { + const RefCountedPtr& locality_name = it->first; + auto& locality_state = it->second; + ClusterLocalityStats::Snapshot& locality_snapshot = + snapshot.locality_stats[locality_name]; + locality_snapshot = std::move(locality_state.deleted_locality_stats); + if (locality_state.locality_stats != nullptr) { + locality_snapshot += + locality_state.locality_stats->GetSnapshotAndReset(); + GRPC_TRACE_LOG(xds_client, INFO) + << "[lrs_client " << this + << "] cluster=" << cluster_key.first.c_str() + << " eds_service_name=" << cluster_key.second.c_str() + << " locality=" << locality_name->human_readable_string().c_str() + << " locality_stats=" << locality_state.locality_stats; + } + // If the only thing left in this entry was final snapshots from + // deleted locality stats objects, remove the entry. + if (locality_state.locality_stats == nullptr) { + it = load_report.locality_stats.erase(it); + } else { + ++it; + } + } + // Compute load report interval. + const Timestamp now = Timestamp::Now(); + snapshot.load_report_interval = now - load_report.last_report_time; + load_report.last_report_time = now; + // Record snapshot. + if (record_stats) { + snapshot_map[cluster_key] = std::move(snapshot); + } + // If the only thing left in this entry was final snapshots from + // deleted stats objects, remove the entry. + if (load_report.locality_stats.empty() && + load_report.drop_stats == nullptr) { + load_report_it = load_report_map.erase(load_report_it); + } else { + ++load_report_it; + } + } + return snapshot_map; +} + +namespace { + +struct LrsApiContext { + LrsClient* client; + upb_DefPool* def_pool; + upb_Arena* arena; +}; + +void MaybeLogLrsRequest( + const LrsApiContext& context, + const envoy_service_load_stats_v3_LoadStatsRequest* request) { + if (GRPC_TRACE_FLAG_ENABLED(xds_client) && ABSL_VLOG_IS_ON(2)) { + const upb_MessageDef* msg_type = + envoy_service_load_stats_v3_LoadStatsRequest_getmsgdef( + context.def_pool); + char buf[10240]; + upb_TextEncode(reinterpret_cast(request), msg_type, + nullptr, 0, buf, sizeof(buf)); + VLOG(2) << "[lrs_client " << context.client + << "] constructed LRS request: " << buf; + } +} + +std::string SerializeLrsRequest( + const LrsApiContext& context, + const envoy_service_load_stats_v3_LoadStatsRequest* request) { + size_t output_length; + char* output = envoy_service_load_stats_v3_LoadStatsRequest_serialize( + request, context.arena, &output_length); + return std::string(output, output_length); +} + +} // namespace + +std::string LrsClient::CreateLrsInitialRequest() { + upb::Arena arena; + const LrsApiContext context = {this, def_pool_.ptr(), arena.ptr()}; + // Create a request. + envoy_service_load_stats_v3_LoadStatsRequest* request = + envoy_service_load_stats_v3_LoadStatsRequest_new(arena.ptr()); + // Populate node. + envoy_config_core_v3_Node* node_msg = + envoy_service_load_stats_v3_LoadStatsRequest_mutable_node(request, + arena.ptr()); + PopulateXdsNode(bootstrap_->node(), user_agent_name_, user_agent_version_, + node_msg, arena.ptr()); + envoy_config_core_v3_Node_add_client_features( + node_msg, + upb_StringView_FromString("envoy.lrs.supports_send_all_clusters"), + arena.ptr()); + MaybeLogLrsRequest(context, request); + return SerializeLrsRequest(context, request); +} + +namespace { + +void LocalityStatsPopulate( + const LrsApiContext& context, + envoy_config_endpoint_v3_UpstreamLocalityStats* output, + const XdsLocalityName& locality_name, + const LrsClient::ClusterLocalityStats::Snapshot& snapshot) { + // Set locality. + envoy_config_core_v3_Locality* locality = + envoy_config_endpoint_v3_UpstreamLocalityStats_mutable_locality( + output, context.arena); + if (!locality_name.region().empty()) { + envoy_config_core_v3_Locality_set_region( + locality, StdStringToUpbString(locality_name.region())); + } + if (!locality_name.zone().empty()) { + envoy_config_core_v3_Locality_set_zone( + locality, StdStringToUpbString(locality_name.zone())); + } + if (!locality_name.sub_zone().empty()) { + envoy_config_core_v3_Locality_set_sub_zone( + locality, StdStringToUpbString(locality_name.sub_zone())); + } + // Set total counts. + envoy_config_endpoint_v3_UpstreamLocalityStats_set_total_successful_requests( + output, snapshot.total_successful_requests); + envoy_config_endpoint_v3_UpstreamLocalityStats_set_total_requests_in_progress( + output, snapshot.total_requests_in_progress); + envoy_config_endpoint_v3_UpstreamLocalityStats_set_total_error_requests( + output, snapshot.total_error_requests); + envoy_config_endpoint_v3_UpstreamLocalityStats_set_total_issued_requests( + output, snapshot.total_issued_requests); + // Add backend metrics. + for (const auto& p : snapshot.backend_metrics) { + const std::string& metric_name = p.first; + const LrsClient::ClusterLocalityStats::BackendMetric& metric_value = + p.second; + envoy_config_endpoint_v3_EndpointLoadMetricStats* load_metric = + envoy_config_endpoint_v3_UpstreamLocalityStats_add_load_metric_stats( + output, context.arena); + envoy_config_endpoint_v3_EndpointLoadMetricStats_set_metric_name( + load_metric, StdStringToUpbString(metric_name)); + envoy_config_endpoint_v3_EndpointLoadMetricStats_set_num_requests_finished_with_metric( + load_metric, metric_value.num_requests_finished_with_metric); + envoy_config_endpoint_v3_EndpointLoadMetricStats_set_total_metric_value( + load_metric, metric_value.total_metric_value); + } +} + +} // namespace + +std::string LrsClient::CreateLrsRequest( + ClusterLoadReportMap cluster_load_report_map) { + upb::Arena arena; + const LrsApiContext context = {this, def_pool_.ptr(), arena.ptr()}; + // Create a request. + envoy_service_load_stats_v3_LoadStatsRequest* request = + envoy_service_load_stats_v3_LoadStatsRequest_new(arena.ptr()); + for (auto& p : cluster_load_report_map) { + const std::string& cluster_name = p.first.first; + const std::string& eds_service_name = p.first.second; + const ClusterLoadReport& load_report = p.second; + // Add cluster stats. + envoy_config_endpoint_v3_ClusterStats* cluster_stats = + envoy_service_load_stats_v3_LoadStatsRequest_add_cluster_stats( + request, arena.ptr()); + // Set the cluster name. + envoy_config_endpoint_v3_ClusterStats_set_cluster_name( + cluster_stats, StdStringToUpbString(cluster_name)); + // Set EDS service name, if non-empty. + if (!eds_service_name.empty()) { + envoy_config_endpoint_v3_ClusterStats_set_cluster_service_name( + cluster_stats, StdStringToUpbString(eds_service_name)); + } + // Add locality stats. + for (const auto& p : load_report.locality_stats) { + const XdsLocalityName& locality_name = *p.first; + const auto& snapshot = p.second; + envoy_config_endpoint_v3_UpstreamLocalityStats* locality_stats = + envoy_config_endpoint_v3_ClusterStats_add_upstream_locality_stats( + cluster_stats, arena.ptr()); + LocalityStatsPopulate(context, locality_stats, locality_name, snapshot); + } + // Add dropped requests. + uint64_t total_dropped_requests = 0; + for (const auto& p : load_report.dropped_requests.categorized_drops) { + const std::string& category = p.first; + const uint64_t count = p.second; + envoy_config_endpoint_v3_ClusterStats_DroppedRequests* dropped_requests = + envoy_config_endpoint_v3_ClusterStats_add_dropped_requests( + cluster_stats, arena.ptr()); + envoy_config_endpoint_v3_ClusterStats_DroppedRequests_set_category( + dropped_requests, StdStringToUpbString(category)); + envoy_config_endpoint_v3_ClusterStats_DroppedRequests_set_dropped_count( + dropped_requests, count); + total_dropped_requests += count; + } + total_dropped_requests += load_report.dropped_requests.uncategorized_drops; + // Set total dropped requests. + envoy_config_endpoint_v3_ClusterStats_set_total_dropped_requests( + cluster_stats, total_dropped_requests); + // Set real load report interval. + gpr_timespec timespec = load_report.load_report_interval.as_timespec(); + google_protobuf_Duration* load_report_interval = + envoy_config_endpoint_v3_ClusterStats_mutable_load_report_interval( + cluster_stats, arena.ptr()); + google_protobuf_Duration_set_seconds(load_report_interval, timespec.tv_sec); + google_protobuf_Duration_set_nanos(load_report_interval, timespec.tv_nsec); + } + MaybeLogLrsRequest(context, request); + return SerializeLrsRequest(context, request); +} + +namespace { + +void MaybeLogLrsResponse( + const LrsApiContext& context, + const envoy_service_load_stats_v3_LoadStatsResponse* response) { + if (GRPC_TRACE_FLAG_ENABLED(xds_client) && ABSL_VLOG_IS_ON(2)) { + const upb_MessageDef* msg_type = + envoy_service_load_stats_v3_LoadStatsResponse_getmsgdef( + context.def_pool); + char buf[10240]; + upb_TextEncode(reinterpret_cast(response), msg_type, + nullptr, 0, buf, sizeof(buf)); + VLOG(2) << "[lrs_client " << context.client + << "] received LRS response: " << buf; + } +} + +} // namespace + +absl::Status LrsClient::ParseLrsResponse(absl::string_view encoded_response, + bool* send_all_clusters, + std::set* cluster_names, + Duration* load_reporting_interval) { + upb::Arena arena; + // Decode the response. + const envoy_service_load_stats_v3_LoadStatsResponse* decoded_response = + envoy_service_load_stats_v3_LoadStatsResponse_parse( + encoded_response.data(), encoded_response.size(), arena.ptr()); + // Parse the response. + if (decoded_response == nullptr) { + return absl::UnavailableError("Can't decode response."); + } + const LrsApiContext context = {this, def_pool_.ptr(), arena.ptr()}; + MaybeLogLrsResponse(context, decoded_response); + // Check send_all_clusters. + if (envoy_service_load_stats_v3_LoadStatsResponse_send_all_clusters( + decoded_response)) { + *send_all_clusters = true; + } else { + // Store the cluster names. + size_t size; + const upb_StringView* clusters = + envoy_service_load_stats_v3_LoadStatsResponse_clusters(decoded_response, + &size); + for (size_t i = 0; i < size; ++i) { + cluster_names->emplace(UpbStringToStdString(clusters[i])); + } + } + // Get the load report interval. + const google_protobuf_Duration* load_reporting_interval_duration = + envoy_service_load_stats_v3_LoadStatsResponse_load_reporting_interval( + decoded_response); + *load_reporting_interval = Duration::FromSecondsAndNanoseconds( + google_protobuf_Duration_seconds(load_reporting_interval_duration), + google_protobuf_Duration_nanos(load_reporting_interval_duration)); + return absl::OkStatus(); +} + +} // namespace grpc_core diff --git a/src/core/xds/xds_client/lrs_client.h b/src/core/xds/xds_client/lrs_client.h new file mode 100644 index 00000000000..7bda6f68799 --- /dev/null +++ b/src/core/xds/xds_client/lrs_client.h @@ -0,0 +1,358 @@ +// +// 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_SRC_CORE_XDS_XDS_CLIENT_LRS_CLIENT_H +#define GRPC_SRC_CORE_XDS_XDS_CLIENT_LRS_CLIENT_H + +#include +#include +#include +#include +#include +#include + +#include "absl/base/thread_annotations.h" +#include "absl/status/status.h" +#include "absl/status/statusor.h" +#include "absl/strings/string_view.h" +#include "upb/reflection/def.hpp" + +#include + +#include "src/core/lib/debug/trace.h" +#include "src/core/util/dual_ref_counted.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/per_cpu.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.h" +#include "src/core/util/uri.h" +#include "src/core/util/work_serializer.h" +#include "src/core/xds/xds_client/xds_api.h" +#include "src/core/xds/xds_client/xds_bootstrap.h" +#include "src/core/xds/xds_client/xds_locality.h" +#include "src/core/xds/xds_client/xds_metrics.h" +#include "src/core/xds/xds_client/xds_resource_type.h" +#include "src/core/xds/xds_client/xds_transport.h" + +namespace grpc_core { + +class LrsClient : public DualRefCounted { + public: + // Drop stats for an xds cluster. + class ClusterDropStats final : public RefCounted { + public: + // The total number of requests dropped for any reason is the sum of + // uncategorized_drops, and dropped_requests map. + using CategorizedDropsMap = std::map; + struct Snapshot { + uint64_t uncategorized_drops = 0; + // The number of requests dropped for the specific drop categories + // outlined in the drop_overloads field in the EDS response. + CategorizedDropsMap categorized_drops; + + Snapshot& operator+=(const Snapshot& other) { + uncategorized_drops += other.uncategorized_drops; + for (const auto& p : other.categorized_drops) { + categorized_drops[p.first] += p.second; + } + return *this; + } + + bool IsZero() const { + if (uncategorized_drops != 0) return false; + for (const auto& p : categorized_drops) { + if (p.second != 0) return false; + } + return true; + } + }; + + ClusterDropStats(RefCountedPtr lrs_client, + absl::string_view lrs_server, + absl::string_view cluster_name, + absl::string_view eds_service_name); + ~ClusterDropStats() override; + + // Returns a snapshot of this instance and resets all the counters. + Snapshot GetSnapshotAndReset(); + + void AddUncategorizedDrops(); + void AddCallDropped(const std::string& category); + + private: + RefCountedPtr lrs_client_; + absl::string_view lrs_server_; + absl::string_view cluster_name_; + absl::string_view eds_service_name_; + std::atomic uncategorized_drops_{0}; + // Protects categorized_drops_. A mutex is necessary because the length of + // dropped_requests can be accessed by both the picker (from data plane + // mutex) and the load reporting thread (from the control plane combiner). + Mutex mu_; + CategorizedDropsMap categorized_drops_ ABSL_GUARDED_BY(mu_); + }; + + // Locality stats for an xds cluster. + class ClusterLocalityStats final : public RefCounted { + public: + struct BackendMetric { + uint64_t num_requests_finished_with_metric = 0; + double total_metric_value = 0; + + BackendMetric& operator+=(const BackendMetric& other) { + num_requests_finished_with_metric += + other.num_requests_finished_with_metric; + total_metric_value += other.total_metric_value; + return *this; + } + + bool IsZero() const { + return num_requests_finished_with_metric == 0 && + total_metric_value == 0; + } + }; + + struct Snapshot { + uint64_t total_successful_requests = 0; + uint64_t total_requests_in_progress = 0; + uint64_t total_error_requests = 0; + uint64_t total_issued_requests = 0; + std::map backend_metrics; + + Snapshot& operator+=(const Snapshot& other) { + total_successful_requests += other.total_successful_requests; + total_requests_in_progress += other.total_requests_in_progress; + total_error_requests += other.total_error_requests; + total_issued_requests += other.total_issued_requests; + for (const auto& p : other.backend_metrics) { + backend_metrics[p.first] += p.second; + } + return *this; + } + + bool IsZero() const { + if (total_successful_requests != 0 || total_requests_in_progress != 0 || + total_error_requests != 0 || total_issued_requests != 0) { + return false; + } + for (const auto& p : backend_metrics) { + if (!p.second.IsZero()) return false; + } + return true; + } + }; + + ClusterLocalityStats(RefCountedPtr lrs_client, + absl::string_view lrs_server, + absl::string_view cluster_name, + absl::string_view eds_service_name, + RefCountedPtr name); + ~ClusterLocalityStats() override; + + // Returns a snapshot of this instance and resets all the counters. + Snapshot GetSnapshotAndReset(); + + void AddCallStarted(); + void AddCallFinished( + const std::map* named_metrics, + bool fail = false); + + XdsLocalityName* locality_name() const { return name_.get(); } + + private: + struct Stats { + std::atomic total_successful_requests{0}; + std::atomic total_requests_in_progress{0}; + std::atomic total_error_requests{0}; + std::atomic total_issued_requests{0}; + + // Protects backend_metrics. A mutex is necessary because the length of + // backend_metrics_ can be accessed by both the callback intercepting the + // call's recv_trailing_metadata and the load reporting thread. + Mutex backend_metrics_mu; + std::map backend_metrics + ABSL_GUARDED_BY(backend_metrics_mu); + }; + + RefCountedPtr lrs_client_; + absl::string_view lrs_server_; + absl::string_view cluster_name_; + absl::string_view eds_service_name_; + RefCountedPtr name_; + PerCpu stats_{PerCpuOptions().SetMaxShards(32).SetCpusPerShard(4)}; + }; + + LrsClient( + std::shared_ptr bootstrap, std::string user_agent_name, + std::string user_agent_version, + RefCountedPtr transport_factory, + std::shared_ptr engine); + ~LrsClient() override; + + // Adds and removes drop stats for cluster_name and eds_service_name. + RefCountedPtr AddClusterDropStats( + std::shared_ptr lrs_server, + absl::string_view cluster_name, absl::string_view eds_service_name); + + // Adds and removes locality stats for cluster_name and eds_service_name + // for the specified locality. + RefCountedPtr AddClusterLocalityStats( + std::shared_ptr lrs_server, + absl::string_view cluster_name, absl::string_view eds_service_name, + RefCountedPtr locality); + + // Resets connection backoff state. + void ResetBackoff(); + + XdsTransportFactory* transport_factory() const { + return transport_factory_.get(); + } + + grpc_event_engine::experimental::EventEngine* engine() { + return engine_.get(); + } + + private: + // Contains a channel to the LRS server and all the data related to the + // channel. + class LrsChannel final : public DualRefCounted { + public: + template + class RetryableCall; + + class LrsCall; + + LrsChannel(WeakRefCountedPtr lrs_client, + std::shared_ptr server); + ~LrsChannel() override; + + LrsClient* lrs_client() const { return lrs_client_.get(); } + + void ResetBackoff(); + + void MaybeStartLrsCall(); + + absl::string_view server_uri() const { return server_->server_uri(); } + + private: + void Orphaned() override; + + void StopLrsCallLocked() ABSL_EXCLUSIVE_LOCKS_REQUIRED(&LrsClient::mu_); + + // The owning LrsClient. + WeakRefCountedPtr lrs_client_; + + std::shared_ptr server_; + + RefCountedPtr transport_; + + // The retryable LRS call. + OrphanablePtr> lrs_call_; + }; + + struct LoadReportState { + struct LocalityState { + ClusterLocalityStats* locality_stats = nullptr; + ClusterLocalityStats::Snapshot deleted_locality_stats; + }; + + ClusterDropStats* drop_stats = nullptr; + ClusterDropStats::Snapshot deleted_drop_stats; + std::map, LocalityState, + XdsLocalityName::Less> + locality_stats; + Timestamp last_report_time = Timestamp::Now(); + }; + + // Load report data. + using LoadReportMap = std::map< + std::pair, + LoadReportState>; + + struct LoadReportServer { + RefCountedPtr lrs_channel; + LoadReportMap load_report_map; + }; + + struct ClusterLoadReport { + ClusterDropStats::Snapshot dropped_requests; + std::map, ClusterLocalityStats::Snapshot, + XdsLocalityName::Less> + locality_stats; + Duration load_report_interval; + }; + using ClusterLoadReportMap = std::map< + std::pair, + ClusterLoadReport>; + + void Orphaned() override; + + ClusterLoadReportMap BuildLoadReportSnapshotLocked( + const XdsBootstrap::XdsServer& lrs_server, bool send_all_clusters, + const std::set& clusters) ABSL_EXCLUSIVE_LOCKS_REQUIRED(mu_); + + RefCountedPtr GetOrCreateLrsChannelLocked( + std::shared_ptr server, const char* reason) + ABSL_EXCLUSIVE_LOCKS_REQUIRED(mu_); + + static bool LoadReportCountersAreZero(const ClusterLoadReportMap& snapshot); + + void RemoveClusterDropStats(absl::string_view lrs_server, + absl::string_view cluster_name, + absl::string_view eds_service_name, + ClusterDropStats* cluster_drop_stats); + + void RemoveClusterLocalityStats( + absl::string_view lrs_server, absl::string_view cluster_name, + absl::string_view eds_service_name, + const RefCountedPtr& locality, + ClusterLocalityStats* cluster_locality_stats); + + // Creates an initial LRS request. + std::string CreateLrsInitialRequest() ABSL_EXCLUSIVE_LOCKS_REQUIRED(&mu_); + + // Creates an LRS request sending a client-side load report. + std::string CreateLrsRequest(ClusterLoadReportMap cluster_load_report_map) + ABSL_EXCLUSIVE_LOCKS_REQUIRED(&mu_); + + // Parses the LRS response and populates send_all_clusters, + // cluster_names, and load_reporting_interval. + absl::Status ParseLrsResponse(absl::string_view encoded_response, + bool* send_all_clusters, + std::set* cluster_names, + Duration* load_reporting_interval) + ABSL_EXCLUSIVE_LOCKS_REQUIRED(&mu_); + + std::shared_ptr bootstrap_; + const std::string user_agent_name_; + const std::string user_agent_version_; + RefCountedPtr transport_factory_; + std::shared_ptr engine_; + + Mutex mu_; + upb::DefPool def_pool_ ABSL_GUARDED_BY(mu_); + // Map of existing LRS channels. + std::map lrs_channel_map_ + ABSL_GUARDED_BY(mu_); + std::map> + load_report_map_ ABSL_GUARDED_BY(mu_); +}; + +} // namespace grpc_core + +#endif // GRPC_SRC_CORE_XDS_XDS_CLIENT_LRS_CLIENT_H diff --git a/src/core/xds/xds_client/xds_api.cc b/src/core/xds/xds_client/xds_api.cc index 8ae5e438abf..50522961920 100644 --- a/src/core/xds/xds_client/xds_api.cc +++ b/src/core/xds/xds_client/xds_api.cc @@ -154,42 +154,50 @@ std::string SerializeDiscoveryRequest( void XdsApi::PopulateNode(envoy_config_core_v3_Node* node_msg, upb_Arena* arena) { - if (node_ != nullptr) { - if (!node_->id().empty()) { + PopulateXdsNode(node_, user_agent_name_, user_agent_version_, node_msg, + arena); +} + +void PopulateXdsNode(const XdsBootstrap::Node* node, + absl::string_view user_agent_name, + absl::string_view user_agent_version, + envoy_config_core_v3_Node* node_msg, upb_Arena* arena) { + if (node != nullptr) { + if (!node->id().empty()) { envoy_config_core_v3_Node_set_id(node_msg, - StdStringToUpbString(node_->id())); + StdStringToUpbString(node->id())); } - if (!node_->cluster().empty()) { + if (!node->cluster().empty()) { envoy_config_core_v3_Node_set_cluster( - node_msg, StdStringToUpbString(node_->cluster())); + node_msg, StdStringToUpbString(node->cluster())); } - if (!node_->metadata().empty()) { + if (!node->metadata().empty()) { google_protobuf_Struct* metadata = envoy_config_core_v3_Node_mutable_metadata(node_msg, arena); - PopulateMetadata(metadata, node_->metadata(), arena); + PopulateMetadata(metadata, node->metadata(), arena); } - if (!node_->locality_region().empty() || !node_->locality_zone().empty() || - !node_->locality_sub_zone().empty()) { + if (!node->locality_region().empty() || !node->locality_zone().empty() || + !node->locality_sub_zone().empty()) { envoy_config_core_v3_Locality* locality = envoy_config_core_v3_Node_mutable_locality(node_msg, arena); - if (!node_->locality_region().empty()) { + if (!node->locality_region().empty()) { envoy_config_core_v3_Locality_set_region( - locality, StdStringToUpbString(node_->locality_region())); + locality, StdStringToUpbString(node->locality_region())); } - if (!node_->locality_zone().empty()) { + if (!node->locality_zone().empty()) { envoy_config_core_v3_Locality_set_zone( - locality, StdStringToUpbString(node_->locality_zone())); + locality, StdStringToUpbString(node->locality_zone())); } - if (!node_->locality_sub_zone().empty()) { + if (!node->locality_sub_zone().empty()) { envoy_config_core_v3_Locality_set_sub_zone( - locality, StdStringToUpbString(node_->locality_sub_zone())); + locality, StdStringToUpbString(node->locality_sub_zone())); } } } envoy_config_core_v3_Node_set_user_agent_name( - node_msg, StdStringToUpbString(user_agent_name_)); + node_msg, StdStringToUpbString(user_agent_name)); envoy_config_core_v3_Node_set_user_agent_version( - node_msg, StdStringToUpbString(user_agent_version_)); + node_msg, StdStringToUpbString(user_agent_version)); envoy_config_core_v3_Node_add_client_features( node_msg, upb_StringView_FromString("envoy.lb.does_not_support_overprovisioning"), @@ -344,224 +352,4 @@ absl::Status XdsApi::ParseAdsResponse(absl::string_view encoded_response, return absl::OkStatus(); } -namespace { - -void MaybeLogLrsRequest( - const XdsApiContext& context, - const envoy_service_load_stats_v3_LoadStatsRequest* request) { - if (GRPC_TRACE_FLAG_ENABLED_OBJ(*context.tracer) && ABSL_VLOG_IS_ON(2)) { - const upb_MessageDef* msg_type = - envoy_service_load_stats_v3_LoadStatsRequest_getmsgdef( - context.def_pool); - char buf[10240]; - upb_TextEncode(reinterpret_cast(request), msg_type, - nullptr, 0, buf, sizeof(buf)); - VLOG(2) << "[xds_client " << context.client - << "] constructed LRS request: " << buf; - } -} - -std::string SerializeLrsRequest( - const XdsApiContext& context, - const envoy_service_load_stats_v3_LoadStatsRequest* request) { - size_t output_length; - char* output = envoy_service_load_stats_v3_LoadStatsRequest_serialize( - request, context.arena, &output_length); - return std::string(output, output_length); -} - -} // namespace - -std::string XdsApi::CreateLrsInitialRequest() { - upb::Arena arena; - const XdsApiContext context = {client_, tracer_, def_pool_->ptr(), - arena.ptr()}; - // Create a request. - envoy_service_load_stats_v3_LoadStatsRequest* request = - envoy_service_load_stats_v3_LoadStatsRequest_new(arena.ptr()); - // Populate node. - envoy_config_core_v3_Node* node_msg = - envoy_service_load_stats_v3_LoadStatsRequest_mutable_node(request, - arena.ptr()); - PopulateNode(node_msg, arena.ptr()); - envoy_config_core_v3_Node_add_client_features( - node_msg, - upb_StringView_FromString("envoy.lrs.supports_send_all_clusters"), - arena.ptr()); - MaybeLogLrsRequest(context, request); - return SerializeLrsRequest(context, request); -} - -namespace { - -void LocalityStatsPopulate( - const XdsApiContext& context, - envoy_config_endpoint_v3_UpstreamLocalityStats* output, - const XdsLocalityName& locality_name, - const XdsClusterLocalityStats::Snapshot& snapshot) { - // Set locality. - envoy_config_core_v3_Locality* locality = - envoy_config_endpoint_v3_UpstreamLocalityStats_mutable_locality( - output, context.arena); - if (!locality_name.region().empty()) { - envoy_config_core_v3_Locality_set_region( - locality, StdStringToUpbString(locality_name.region())); - } - if (!locality_name.zone().empty()) { - envoy_config_core_v3_Locality_set_zone( - locality, StdStringToUpbString(locality_name.zone())); - } - if (!locality_name.sub_zone().empty()) { - envoy_config_core_v3_Locality_set_sub_zone( - locality, StdStringToUpbString(locality_name.sub_zone())); - } - // Set total counts. - envoy_config_endpoint_v3_UpstreamLocalityStats_set_total_successful_requests( - output, snapshot.total_successful_requests); - envoy_config_endpoint_v3_UpstreamLocalityStats_set_total_requests_in_progress( - output, snapshot.total_requests_in_progress); - envoy_config_endpoint_v3_UpstreamLocalityStats_set_total_error_requests( - output, snapshot.total_error_requests); - envoy_config_endpoint_v3_UpstreamLocalityStats_set_total_issued_requests( - output, snapshot.total_issued_requests); - // Add backend metrics. - for (const auto& p : snapshot.backend_metrics) { - const std::string& metric_name = p.first; - const XdsClusterLocalityStats::BackendMetric& metric_value = p.second; - envoy_config_endpoint_v3_EndpointLoadMetricStats* load_metric = - envoy_config_endpoint_v3_UpstreamLocalityStats_add_load_metric_stats( - output, context.arena); - envoy_config_endpoint_v3_EndpointLoadMetricStats_set_metric_name( - load_metric, StdStringToUpbString(metric_name)); - envoy_config_endpoint_v3_EndpointLoadMetricStats_set_num_requests_finished_with_metric( - load_metric, metric_value.num_requests_finished_with_metric); - envoy_config_endpoint_v3_EndpointLoadMetricStats_set_total_metric_value( - load_metric, metric_value.total_metric_value); - } -} - -} // namespace - -std::string XdsApi::CreateLrsRequest( - ClusterLoadReportMap cluster_load_report_map) { - upb::Arena arena; - const XdsApiContext context = {client_, tracer_, def_pool_->ptr(), - arena.ptr()}; - // Create a request. - envoy_service_load_stats_v3_LoadStatsRequest* request = - envoy_service_load_stats_v3_LoadStatsRequest_new(arena.ptr()); - for (auto& p : cluster_load_report_map) { - const std::string& cluster_name = p.first.first; - const std::string& eds_service_name = p.first.second; - const ClusterLoadReport& load_report = p.second; - // Add cluster stats. - envoy_config_endpoint_v3_ClusterStats* cluster_stats = - envoy_service_load_stats_v3_LoadStatsRequest_add_cluster_stats( - request, arena.ptr()); - // Set the cluster name. - envoy_config_endpoint_v3_ClusterStats_set_cluster_name( - cluster_stats, StdStringToUpbString(cluster_name)); - // Set EDS service name, if non-empty. - if (!eds_service_name.empty()) { - envoy_config_endpoint_v3_ClusterStats_set_cluster_service_name( - cluster_stats, StdStringToUpbString(eds_service_name)); - } - // Add locality stats. - for (const auto& p : load_report.locality_stats) { - const XdsLocalityName& locality_name = *p.first; - const auto& snapshot = p.second; - envoy_config_endpoint_v3_UpstreamLocalityStats* locality_stats = - envoy_config_endpoint_v3_ClusterStats_add_upstream_locality_stats( - cluster_stats, arena.ptr()); - LocalityStatsPopulate(context, locality_stats, locality_name, snapshot); - } - // Add dropped requests. - uint64_t total_dropped_requests = 0; - for (const auto& p : load_report.dropped_requests.categorized_drops) { - const std::string& category = p.first; - const uint64_t count = p.second; - envoy_config_endpoint_v3_ClusterStats_DroppedRequests* dropped_requests = - envoy_config_endpoint_v3_ClusterStats_add_dropped_requests( - cluster_stats, arena.ptr()); - envoy_config_endpoint_v3_ClusterStats_DroppedRequests_set_category( - dropped_requests, StdStringToUpbString(category)); - envoy_config_endpoint_v3_ClusterStats_DroppedRequests_set_dropped_count( - dropped_requests, count); - total_dropped_requests += count; - } - total_dropped_requests += load_report.dropped_requests.uncategorized_drops; - // Set total dropped requests. - envoy_config_endpoint_v3_ClusterStats_set_total_dropped_requests( - cluster_stats, total_dropped_requests); - // Set real load report interval. - gpr_timespec timespec = load_report.load_report_interval.as_timespec(); - google_protobuf_Duration* load_report_interval = - envoy_config_endpoint_v3_ClusterStats_mutable_load_report_interval( - cluster_stats, arena.ptr()); - google_protobuf_Duration_set_seconds(load_report_interval, timespec.tv_sec); - google_protobuf_Duration_set_nanos(load_report_interval, timespec.tv_nsec); - } - MaybeLogLrsRequest(context, request); - return SerializeLrsRequest(context, request); -} - -namespace { - -void MaybeLogLrsResponse( - const XdsApiContext& context, - const envoy_service_load_stats_v3_LoadStatsResponse* response) { - if (GRPC_TRACE_FLAG_ENABLED_OBJ(*context.tracer) && ABSL_VLOG_IS_ON(2)) { - const upb_MessageDef* msg_type = - envoy_service_load_stats_v3_LoadStatsResponse_getmsgdef( - context.def_pool); - char buf[10240]; - upb_TextEncode(reinterpret_cast(response), msg_type, - nullptr, 0, buf, sizeof(buf)); - VLOG(2) << "[xds_client " << context.client - << "] received LRS response: " << buf; - } -} - -} // namespace - -absl::Status XdsApi::ParseLrsResponse(absl::string_view encoded_response, - bool* send_all_clusters, - std::set* cluster_names, - Duration* load_reporting_interval) { - upb::Arena arena; - // Decode the response. - const envoy_service_load_stats_v3_LoadStatsResponse* decoded_response = - envoy_service_load_stats_v3_LoadStatsResponse_parse( - encoded_response.data(), encoded_response.size(), arena.ptr()); - // Parse the response. - if (decoded_response == nullptr) { - return absl::UnavailableError("Can't decode response."); - } - const XdsApiContext context = {client_, tracer_, def_pool_->ptr(), - arena.ptr()}; - MaybeLogLrsResponse(context, decoded_response); - // Check send_all_clusters. - if (envoy_service_load_stats_v3_LoadStatsResponse_send_all_clusters( - decoded_response)) { - *send_all_clusters = true; - } else { - // Store the cluster names. - size_t size; - const upb_StringView* clusters = - envoy_service_load_stats_v3_LoadStatsResponse_clusters(decoded_response, - &size); - for (size_t i = 0; i < size; ++i) { - cluster_names->emplace(UpbStringToStdString(clusters[i])); - } - } - // Get the load report interval. - const google_protobuf_Duration* load_reporting_interval_duration = - envoy_service_load_stats_v3_LoadStatsResponse_load_reporting_interval( - decoded_response); - *load_reporting_interval = Duration::FromSecondsAndNanoseconds( - google_protobuf_Duration_seconds(load_reporting_interval_duration), - google_protobuf_Duration_nanos(load_reporting_interval_duration)); - return absl::OkStatus(); -} - } // namespace grpc_core diff --git a/src/core/xds/xds_client/xds_api.h b/src/core/xds/xds_client/xds_api.h index 7011174f716..207e78a297a 100644 --- a/src/core/xds/xds_client/xds_api.h +++ b/src/core/xds/xds_client/xds_api.h @@ -38,16 +38,14 @@ #include "src/core/util/ref_counted_ptr.h" #include "src/core/util/time.h" #include "src/core/xds/xds_client/xds_bootstrap.h" -#include "src/core/xds/xds_client/xds_client_stats.h" +#include "src/core/xds/xds_client/xds_locality.h" namespace grpc_core { class XdsClient; -// TODO(roth): When we have time, split this into multiple pieces: -// - ADS request/response handling -// - LRS request/response handling -// - CSDS response generation +// TODO(roth): When we have time, remove this class and move its +// functionality directly inside of XdsClient. class XdsApi final { public: // Interface defined by caller and passed to ParseAdsResponse(). @@ -81,17 +79,6 @@ class XdsApi final { absl::string_view message) = 0; }; - struct ClusterLoadReport { - XdsClusterDropStats::Snapshot dropped_requests; - std::map, XdsClusterLocalityStats::Snapshot, - XdsLocalityName::Less> - locality_stats; - Duration load_report_interval; - }; - using ClusterLoadReportMap = std::map< - std::pair, - ClusterLoadReport>; - // The metadata of the xDS resource; used by the xDS config dump. struct ResourceMetadata { // Resource status from the view of a xDS client, which tells the @@ -160,19 +147,6 @@ class XdsApi final { absl::Status ParseAdsResponse(absl::string_view encoded_response, AdsResponseParserInterface* parser); - // Creates an initial LRS request. - std::string CreateLrsInitialRequest(); - - // Creates an LRS request sending a client-side load report. - std::string CreateLrsRequest(ClusterLoadReportMap cluster_load_report_map); - - // Parses the LRS response and populates send_all_clusters, - // cluster_names, and load_reporting_interval. - absl::Status ParseLrsResponse(absl::string_view encoded_response, - bool* send_all_clusters, - std::set* cluster_names, - Duration* load_reporting_interval); - void PopulateNode(envoy_config_core_v3_Node* node_msg, upb_Arena* arena); private: @@ -184,6 +158,11 @@ class XdsApi final { const std::string user_agent_version_; }; +void PopulateXdsNode(const XdsBootstrap::Node* node, + absl::string_view user_agent_name, + absl::string_view user_agent_version, + envoy_config_core_v3_Node* node_msg, upb_Arena* arena); + } // namespace grpc_core #endif // GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_API_H diff --git a/src/core/xds/xds_client/xds_client.cc b/src/core/xds/xds_client/xds_client.cc index 5eb81d55af7..6381f8ba38c 100644 --- a/src/core/xds/xds_client/xds_client.cc +++ b/src/core/xds/xds_client/xds_client.cc @@ -56,7 +56,7 @@ #include "src/core/util/uri.h" #include "src/core/xds/xds_client/xds_api.h" #include "src/core/xds/xds_client/xds_bootstrap.h" -#include "src/core/xds/xds_client/xds_client_stats.h" +#include "src/core/xds/xds_client/xds_locality.h" #define GRPC_XDS_INITIAL_CONNECT_BACKOFF_SECONDS 1 #define GRPC_XDS_RECONNECT_BACKOFF_MULTIPLIER 1.6 @@ -74,6 +74,9 @@ using ::grpc_event_engine::experimental::EventEngine; // An xds call wrapper that can restart a call upon failure. Holds a ref to // the xds channel. The template parameter is the kind of wrapped xds call. +// TODO(roth): This is basically the same code as in LrsClient, and +// probably very similar to many other places in the codebase. +// Consider refactoring this into a common utility library somehow. template class XdsClient::XdsChannel::RetryableCall final : public InternallyRefCounted> { @@ -355,98 +358,22 @@ class XdsClient::XdsChannel::AdsCall final std::map state_map_; }; -// Contains an LRS call to the xds server. -class XdsClient::XdsChannel::LrsCall final - : public InternallyRefCounted { - public: - // The ctor and dtor should not be used directly. - explicit LrsCall(RefCountedPtr> retryable_call); +// +// XdsClient::XdsChannel::ConnectivityFailureWatcher +// - void Orphan() override; +class XdsClient::XdsChannel::ConnectivityFailureWatcher + : public XdsTransportFactory::XdsTransport::ConnectivityFailureWatcher { + public: + explicit ConnectivityFailureWatcher(WeakRefCountedPtr xds_channel) + : xds_channel_(std::move(xds_channel)) {} - RetryableCall* retryable_call() { return retryable_call_.get(); } - XdsChannel* xds_channel() const { return retryable_call_->xds_channel(); } - XdsClient* xds_client() const { return xds_channel()->xds_client(); } - bool seen_response() const { return seen_response_; } + void OnConnectivityFailure(absl::Status status) override { + xds_channel_->OnConnectivityFailure(std::move(status)); + } private: - class StreamEventHandler final - : public XdsTransportFactory::XdsTransport::StreamingCall::EventHandler { - public: - explicit StreamEventHandler(RefCountedPtr lrs_call) - : lrs_call_(std::move(lrs_call)) {} - - void OnRequestSent(bool /*ok*/) override { lrs_call_->OnRequestSent(); } - void OnRecvMessage(absl::string_view payload) override { - lrs_call_->OnRecvMessage(payload); - } - void OnStatusReceived(absl::Status status) override { - lrs_call_->OnStatusReceived(std::move(status)); - } - - private: - RefCountedPtr lrs_call_; - }; - - // A repeating timer for a particular duration. - class Timer final : public InternallyRefCounted { - public: - explicit Timer(RefCountedPtr lrs_call) - : lrs_call_(std::move(lrs_call)) {} - ~Timer() override { lrs_call_.reset(DEBUG_LOCATION, "LRS timer"); } - - // Disable thread-safety analysis because this method is called via - // OrphanablePtr<>, but there's no way to pass the lock annotation - // through there. - void Orphan() override ABSL_NO_THREAD_SAFETY_ANALYSIS; - - void ScheduleNextReportLocked() - ABSL_EXCLUSIVE_LOCKS_REQUIRED(&XdsClient::mu_); - - private: - bool IsCurrentTimerOnCall() const { - return this == lrs_call_->timer_.get(); - } - XdsClient* xds_client() const { return lrs_call_->xds_client(); } - - void OnNextReportTimer(); - - // The owning LRS call. - RefCountedPtr lrs_call_; - - absl::optional timer_handle_ - ABSL_GUARDED_BY(&XdsClient::mu_); - }; - - void MaybeScheduleNextReportLocked() - ABSL_EXCLUSIVE_LOCKS_REQUIRED(&XdsClient::mu_); - - void SendReportLocked() ABSL_EXCLUSIVE_LOCKS_REQUIRED(&XdsClient::mu_); - - void SendMessageLocked(std::string payload) - ABSL_EXCLUSIVE_LOCKS_REQUIRED(&XdsClient::mu_); - - void OnRequestSent(); - void OnRecvMessage(absl::string_view payload); - void OnStatusReceived(absl::Status status); - - bool IsCurrentCallOnChannel() const; - - // The owning RetryableCall<>. - RefCountedPtr> retryable_call_; - - OrphanablePtr - streaming_call_; - - bool seen_response_ = false; - bool send_message_pending_ ABSL_GUARDED_BY(&XdsClient::mu_) = false; - - // Load reporting state. - bool send_all_clusters_ = false; - std::set cluster_names_; // Asked for by the LRS server. - Duration load_reporting_interval_; - bool last_report_counters_were_zero_ = false; - OrphanablePtr timer_; + WeakRefCountedPtr xds_channel_; }; // @@ -464,15 +391,15 @@ XdsClient::XdsChannel::XdsChannel(WeakRefCountedPtr xds_client, << "[xds_client " << xds_client_.get() << "] creating channel " << this << " for server " << server.server_uri(); absl::Status status; - transport_ = xds_client_->transport_factory_->Create( - server, - [self = WeakRef(DEBUG_LOCATION, "OnConnectivityFailure")]( - absl::Status status) { - self->OnConnectivityFailure(std::move(status)); - }, - &status); + transport_ = xds_client_->transport_factory_->GetTransport(server, &status); CHECK(transport_ != nullptr); - if (!status.ok()) SetChannelStatusLocked(std::move(status)); + if (!status.ok()) { + SetChannelStatusLocked(std::move(status)); + } else { + failure_watcher_ = MakeRefCounted( + WeakRef(DEBUG_LOCATION, "OnConnectivityFailure")); + transport_->StartConnectivityFailureWatch(failure_watcher_); + } } XdsClient::XdsChannel::~XdsChannel() { @@ -491,13 +418,16 @@ void XdsClient::XdsChannel::Orphaned() ABSL_NO_THREAD_SAFETY_ANALYSIS { << "[xds_client " << xds_client() << "] orphaning xds channel " << this << " for server " << server_.server_uri(); shutting_down_ = true; + if (failure_watcher_ != nullptr) { + transport_->StopConnectivityFailureWatch(failure_watcher_); + failure_watcher_.reset(); + } transport_.reset(); // At this time, all strong refs are removed, remove from channel map to // prevent subsequent subscription from trying to use this XdsChannel as // it is shutting down. xds_client_->xds_channel_map_.erase(server_.Key()); ads_call_.reset(); - lrs_call_.reset(); } void XdsClient::XdsChannel::ResetBackoff() { transport_->ResetBackoff(); } @@ -506,21 +436,6 @@ XdsClient::XdsChannel::AdsCall* XdsClient::XdsChannel::ads_call() const { return ads_call_->call(); } -XdsClient::XdsChannel::LrsCall* XdsClient::XdsChannel::lrs_call() const { - return lrs_call_->call(); -} - -void XdsClient::XdsChannel::MaybeStartLrsCall() { - if (lrs_call_ != nullptr) return; - lrs_call_.reset( - new RetryableCall(WeakRef(DEBUG_LOCATION, "XdsChannel+lrs"))); -} - -void XdsClient::XdsChannel::StopLrsCallLocked() { - xds_client_->xds_load_report_server_map_.erase(server_.Key()); - lrs_call_.reset(); -} - void XdsClient::XdsChannel::SubscribeLocked(const XdsResourceType* type, const XdsResourceName& name) { if (ads_call_ == nullptr) { @@ -1280,241 +1195,6 @@ XdsClient::XdsChannel::AdsCall::ResourceNamesForRequest( return resource_names; } -// -// XdsClient::XdsChannel::LrsCall::Timer -// - -void XdsClient::XdsChannel::LrsCall::Timer::Orphan() { - if (timer_handle_.has_value()) { - xds_client()->engine()->Cancel(*timer_handle_); - timer_handle_.reset(); - } - Unref(DEBUG_LOCATION, "Orphan"); -} - -void XdsClient::XdsChannel::LrsCall::Timer::ScheduleNextReportLocked() { - GRPC_TRACE_LOG(xds_client, INFO) - << "[xds_client " << xds_client() << "] xds server " - << lrs_call_->xds_channel()->server_.server_uri() - << ": scheduling next load report in " - << lrs_call_->load_reporting_interval_; - timer_handle_ = xds_client()->engine()->RunAfter( - lrs_call_->load_reporting_interval_, - [self = Ref(DEBUG_LOCATION, "timer")]() { - ApplicationCallbackExecCtx callback_exec_ctx; - ExecCtx exec_ctx; - self->OnNextReportTimer(); - }); -} - -void XdsClient::XdsChannel::LrsCall::Timer::OnNextReportTimer() { - MutexLock lock(&xds_client()->mu_); - timer_handle_.reset(); - if (IsCurrentTimerOnCall()) lrs_call_->SendReportLocked(); -} - -// -// XdsClient::XdsChannel::LrsCall -// - -XdsClient::XdsChannel::LrsCall::LrsCall( - RefCountedPtr> retryable_call) - : InternallyRefCounted( - GRPC_TRACE_FLAG_ENABLED(xds_client_refcount) ? "LrsCall" : nullptr), - retryable_call_(std::move(retryable_call)) { - // Init the LRS call. Note that the call will progress every time there's - // activity in xds_client()->interested_parties_, which is comprised of - // the polling entities from client_channel. - CHECK_NE(xds_client(), nullptr); - const char* method = - "/envoy.service.load_stats.v3.LoadReportingService/StreamLoadStats"; - streaming_call_ = xds_channel()->transport_->CreateStreamingCall( - method, std::make_unique( - // Passing the initial ref here. This ref will go away when - // the StreamEventHandler is destroyed. - RefCountedPtr(this))); - CHECK(streaming_call_ != nullptr); - // Start the call. - GRPC_TRACE_LOG(xds_client, INFO) - << "[xds_client " << xds_client() << "] xds server " - << xds_channel()->server_.server_uri() - << ": starting LRS call (lrs_call=" << this - << ", streaming_call=" << streaming_call_.get() << ")"; - // Send the initial request. - std::string serialized_payload = xds_client()->api_.CreateLrsInitialRequest(); - SendMessageLocked(std::move(serialized_payload)); - // Read initial response. - streaming_call_->StartRecvMessage(); -} - -void XdsClient::XdsChannel::LrsCall::Orphan() { - timer_.reset(); - // Note that the initial ref is held by the StreamEventHandler, which - // will be destroyed when streaming_call_ is destroyed, which may not happen - // here, since there may be other refs held to streaming_call_ by internal - // callbacks. - streaming_call_.reset(); -} - -void XdsClient::XdsChannel::LrsCall::MaybeScheduleNextReportLocked() { - // If there are no more registered stats to report, cancel the call. - auto it = xds_client()->xds_load_report_server_map_.find( - xds_channel()->server_.Key()); - if (it == xds_client()->xds_load_report_server_map_.end() || - it->second.load_report_map.empty()) { - it->second.xds_channel->StopLrsCallLocked(); - return; - } - // Don't start if the previous send_message op hasn't completed yet. - // If this happens, we'll be called again from OnRequestSent(). - if (send_message_pending_) return; - // Don't start if no LRS response has arrived. - if (!seen_response()) return; - // If there is no timer, create one. - // This happens on the initial response and whenever the interval changes. - if (timer_ == nullptr) { - timer_ = MakeOrphanable(Ref(DEBUG_LOCATION, "LRS timer")); - } - // Schedule the next load report. - timer_->ScheduleNextReportLocked(); -} - -namespace { - -bool LoadReportCountersAreZero(const XdsApi::ClusterLoadReportMap& snapshot) { - for (const auto& p : snapshot) { - const XdsApi::ClusterLoadReport& cluster_snapshot = p.second; - if (!cluster_snapshot.dropped_requests.IsZero()) return false; - for (const auto& q : cluster_snapshot.locality_stats) { - const XdsClusterLocalityStats::Snapshot& locality_snapshot = q.second; - if (!locality_snapshot.IsZero()) return false; - } - } - return true; -} - -} // namespace - -void XdsClient::XdsChannel::LrsCall::SendReportLocked() { - // Construct snapshot from all reported stats. - XdsApi::ClusterLoadReportMap snapshot = - xds_client()->BuildLoadReportSnapshotLocked( - xds_channel()->server_, send_all_clusters_, cluster_names_); - // Skip client load report if the counters were all zero in the last - // report and they are still zero in this one. - const bool old_val = last_report_counters_were_zero_; - last_report_counters_were_zero_ = LoadReportCountersAreZero(snapshot); - if (old_val && last_report_counters_were_zero_) { - MaybeScheduleNextReportLocked(); - return; - } - // Send a request that contains the snapshot. - std::string serialized_payload = - xds_client()->api_.CreateLrsRequest(std::move(snapshot)); - SendMessageLocked(std::move(serialized_payload)); -} - -void XdsClient::XdsChannel::LrsCall::SendMessageLocked(std::string payload) { - send_message_pending_ = true; - streaming_call_->SendMessage(std::move(payload)); -} - -void XdsClient::XdsChannel::LrsCall::OnRequestSent() { - MutexLock lock(&xds_client()->mu_); - send_message_pending_ = false; - if (IsCurrentCallOnChannel()) MaybeScheduleNextReportLocked(); -} - -void XdsClient::XdsChannel::LrsCall::OnRecvMessage(absl::string_view payload) { - MutexLock lock(&xds_client()->mu_); - // If we're no longer the current call, ignore the result. - if (!IsCurrentCallOnChannel()) return; - // Start recv after any code branch - auto cleanup = absl::MakeCleanup( - [call = streaming_call_.get()]() { call->StartRecvMessage(); }); - // Parse the response. - bool send_all_clusters = false; - std::set new_cluster_names; - Duration new_load_reporting_interval; - absl::Status status = xds_client()->api_.ParseLrsResponse( - payload, &send_all_clusters, &new_cluster_names, - &new_load_reporting_interval); - if (!status.ok()) { - LOG(ERROR) << "[xds_client " << xds_client() << "] xds server " - << xds_channel()->server_.server_uri() - << ": LRS response parsing failed: " << status; - return; - } - seen_response_ = true; - if (GRPC_TRACE_FLAG_ENABLED(xds_client)) { - LOG(INFO) << "[xds_client " << xds_client() << "] xds server " - << xds_channel()->server_.server_uri() - << ": LRS response received, " << new_cluster_names.size() - << " cluster names, send_all_clusters=" << send_all_clusters - << ", load_report_interval=" - << new_load_reporting_interval.millis() << "ms"; - size_t i = 0; - for (const auto& name : new_cluster_names) { - LOG(INFO) << "[xds_client " << xds_client() << "] cluster_name " << i++ - << ": " << name; - } - } - if (new_load_reporting_interval < - Duration::Milliseconds(GRPC_XDS_MIN_CLIENT_LOAD_REPORTING_INTERVAL_MS)) { - new_load_reporting_interval = - Duration::Milliseconds(GRPC_XDS_MIN_CLIENT_LOAD_REPORTING_INTERVAL_MS); - GRPC_TRACE_LOG(xds_client, INFO) - << "[xds_client " << xds_client() << "] xds server " - << xds_channel()->server_.server_uri() - << ": increased load_report_interval to minimum value " - << GRPC_XDS_MIN_CLIENT_LOAD_REPORTING_INTERVAL_MS << "ms"; - } - // Ignore identical update. - if (send_all_clusters == send_all_clusters_ && - cluster_names_ == new_cluster_names && - load_reporting_interval_ == new_load_reporting_interval) { - GRPC_TRACE_LOG(xds_client, INFO) - << "[xds_client " << xds_client() << "] xds server " - << xds_channel()->server_.server_uri() - << ": incoming LRS response identical to current, ignoring."; - return; - } - // If the interval has changed, we'll need to restart the timer below. - const bool restart_timer = - load_reporting_interval_ != new_load_reporting_interval; - // Record the new config. - send_all_clusters_ = send_all_clusters; - cluster_names_ = std::move(new_cluster_names); - load_reporting_interval_ = new_load_reporting_interval; - // Restart timer if needed. - if (restart_timer) { - timer_.reset(); - MaybeScheduleNextReportLocked(); - } -} - -void XdsClient::XdsChannel::LrsCall::OnStatusReceived(absl::Status status) { - MutexLock lock(&xds_client()->mu_); - GRPC_TRACE_LOG(xds_client, INFO) - << "[xds_client " << xds_client() << "] xds server " - << xds_channel()->server_.server_uri() - << ": LRS call status received (xds_channel=" << xds_channel() - << ", lrs_call=" << this << ", streaming_call=" << streaming_call_.get() - << "): " << status; - // Ignore status from a stale call. - if (IsCurrentCallOnChannel()) { - // Try to restart the call. - retryable_call_->OnCallFinishedLocked(); - } -} - -bool XdsClient::XdsChannel::LrsCall::IsCurrentCallOnChannel() const { - // If the retryable LRS call is null (which only happens when the xds - // channel is shutting down), all the LRS calls are stale. - if (xds_channel()->lrs_call_ == nullptr) return false; - return this == xds_channel()->lrs_call_->call(); -} - // // XdsClient // @@ -1522,8 +1202,8 @@ bool XdsClient::XdsChannel::LrsCall::IsCurrentCallOnChannel() const { constexpr absl::string_view XdsClient::kOldStyleAuthority; XdsClient::XdsClient( - std::unique_ptr bootstrap, - OrphanablePtr transport_factory, + std::shared_ptr bootstrap, + RefCountedPtr transport_factory, std::shared_ptr engine, std::unique_ptr metrics_reporter, std::string user_agent_name, std::string user_agent_version, @@ -1562,13 +1242,6 @@ void XdsClient::Orphaned() { // Clear cache and any remaining watchers that may not have been cancelled. authority_state_map_.clear(); invalid_watchers_.clear(); - // We may still be sending lingering queued load report data, so don't - // just clear the load reporting map, but we do want to clear the refs - // we're holding to the XdsChannel objects, to make sure that - // everything shuts down properly. - for (auto& p : xds_load_report_server_map_) { - p.second.xds_channel.reset(DEBUG_LOCATION, "XdsClient::Orphan()"); - } } RefCountedPtr XdsClient::GetOrCreateXdsChannelLocked( @@ -1842,140 +1515,6 @@ std::string XdsClient::ConstructFullXdsResourceName( return key.id; } -RefCountedPtr XdsClient::AddClusterDropStats( - const XdsBootstrap::XdsServer& xds_server, absl::string_view cluster_name, - absl::string_view eds_service_name) { - auto key = - std::make_pair(std::string(cluster_name), std::string(eds_service_name)); - RefCountedPtr cluster_drop_stats; - { - MutexLock lock(&mu_); - // We jump through some hoops here to make sure that the - // absl::string_views stored in the XdsClusterDropStats object point - // to the strings in the xds_load_report_server_map_ keys, so that - // they have the same lifetime. - auto server_it = xds_load_report_server_map_ - .emplace(xds_server.Key(), LoadReportServer()) - .first; - if (server_it->second.xds_channel == nullptr) { - server_it->second.xds_channel = GetOrCreateXdsChannelLocked( - xds_server, "load report map (drop stats)"); - } - auto load_report_it = server_it->second.load_report_map - .emplace(std::move(key), LoadReportState()) - .first; - LoadReportState& load_report_state = load_report_it->second; - if (load_report_state.drop_stats != nullptr) { - cluster_drop_stats = load_report_state.drop_stats->RefIfNonZero(); - } - if (cluster_drop_stats == nullptr) { - if (load_report_state.drop_stats != nullptr) { - load_report_state.deleted_drop_stats += - load_report_state.drop_stats->GetSnapshotAndReset(); - } - cluster_drop_stats = MakeRefCounted( - Ref(DEBUG_LOCATION, "DropStats"), server_it->first /*xds_server*/, - load_report_it->first.first /*cluster_name*/, - load_report_it->first.second /*eds_service_name*/); - load_report_state.drop_stats = cluster_drop_stats.get(); - } - server_it->second.xds_channel->MaybeStartLrsCall(); - } - work_serializer_.DrainQueue(); - return cluster_drop_stats; -} - -void XdsClient::RemoveClusterDropStats( - absl::string_view xds_server_key, absl::string_view cluster_name, - absl::string_view eds_service_name, - XdsClusterDropStats* cluster_drop_stats) { - MutexLock lock(&mu_); - auto server_it = xds_load_report_server_map_.find(xds_server_key); - if (server_it == xds_load_report_server_map_.end()) return; - auto load_report_it = server_it->second.load_report_map.find( - std::make_pair(std::string(cluster_name), std::string(eds_service_name))); - if (load_report_it == server_it->second.load_report_map.end()) return; - LoadReportState& load_report_state = load_report_it->second; - if (load_report_state.drop_stats == cluster_drop_stats) { - // Record final snapshot in deleted_drop_stats, which will be - // added to the next load report. - load_report_state.deleted_drop_stats += - load_report_state.drop_stats->GetSnapshotAndReset(); - load_report_state.drop_stats = nullptr; - } -} - -RefCountedPtr XdsClient::AddClusterLocalityStats( - const XdsBootstrap::XdsServer& xds_server, absl::string_view cluster_name, - absl::string_view eds_service_name, - RefCountedPtr locality) { - auto key = - std::make_pair(std::string(cluster_name), std::string(eds_service_name)); - RefCountedPtr cluster_locality_stats; - { - MutexLock lock(&mu_); - // We jump through some hoops here to make sure that the - // absl::string_views stored in the XdsClusterDropStats object point - // to the strings in the xds_load_report_server_map_ keys, so that - // they have the same lifetime. - auto server_it = xds_load_report_server_map_ - .emplace(xds_server.Key(), LoadReportServer()) - .first; - if (server_it->second.xds_channel == nullptr) { - server_it->second.xds_channel = GetOrCreateXdsChannelLocked( - xds_server, "load report map (locality stats)"); - } - auto load_report_it = server_it->second.load_report_map - .emplace(std::move(key), LoadReportState()) - .first; - LoadReportState& load_report_state = load_report_it->second; - LoadReportState::LocalityState& locality_state = - load_report_state.locality_stats[locality]; - if (locality_state.locality_stats != nullptr) { - cluster_locality_stats = locality_state.locality_stats->RefIfNonZero(); - } - if (cluster_locality_stats == nullptr) { - if (locality_state.locality_stats != nullptr) { - locality_state.deleted_locality_stats += - locality_state.locality_stats->GetSnapshotAndReset(); - } - cluster_locality_stats = MakeRefCounted( - Ref(DEBUG_LOCATION, "LocalityStats"), server_it->first /*xds_server*/, - load_report_it->first.first /*cluster_name*/, - load_report_it->first.second /*eds_service_name*/, - std::move(locality)); - locality_state.locality_stats = cluster_locality_stats.get(); - } - server_it->second.xds_channel->MaybeStartLrsCall(); - } - work_serializer_.DrainQueue(); - return cluster_locality_stats; -} - -void XdsClient::RemoveClusterLocalityStats( - absl::string_view xds_server_key, absl::string_view cluster_name, - absl::string_view eds_service_name, - const RefCountedPtr& locality, - XdsClusterLocalityStats* cluster_locality_stats) { - MutexLock lock(&mu_); - auto server_it = xds_load_report_server_map_.find(xds_server_key); - if (server_it == xds_load_report_server_map_.end()) return; - auto load_report_it = server_it->second.load_report_map.find( - std::make_pair(std::string(cluster_name), std::string(eds_service_name))); - if (load_report_it == server_it->second.load_report_map.end()) return; - LoadReportState& load_report_state = load_report_it->second; - auto locality_it = load_report_state.locality_stats.find(locality); - if (locality_it == load_report_state.locality_stats.end()) return; - LoadReportState::LocalityState& locality_state = locality_it->second; - if (locality_state.locality_stats == cluster_locality_stats) { - // Record final snapshot in deleted_locality_stats, which will be - // added to the next load report. - locality_state.deleted_locality_stats += - locality_state.locality_stats->GetSnapshotAndReset(); - locality_state.locality_stats = nullptr; - } -} - void XdsClient::ResetBackoff() { MutexLock lock(&mu_); for (auto& p : xds_channel_map_) { @@ -2018,86 +1557,6 @@ void XdsClient::NotifyWatchersOnResourceDoesNotExist( DEBUG_LOCATION); } -XdsApi::ClusterLoadReportMap XdsClient::BuildLoadReportSnapshotLocked( - const XdsBootstrap::XdsServer& xds_server, bool send_all_clusters, - const std::set& clusters) { - GRPC_TRACE_LOG(xds_client, INFO) - << "[xds_client " << this << "] start building load report"; - XdsApi::ClusterLoadReportMap snapshot_map; - auto server_it = xds_load_report_server_map_.find(xds_server.Key()); - if (server_it == xds_load_report_server_map_.end()) return snapshot_map; - auto& load_report_map = server_it->second.load_report_map; - for (auto load_report_it = load_report_map.begin(); - load_report_it != load_report_map.end();) { - // Cluster key is cluster and EDS service name. - const auto& cluster_key = load_report_it->first; - LoadReportState& load_report = load_report_it->second; - // If the CDS response for a cluster indicates to use LRS but the - // LRS server does not say that it wants reports for this cluster, - // then we'll have stats objects here whose data we're not going to - // include in the load report. However, we still need to clear out - // the data from the stats objects, so that if the LRS server starts - // asking for the data in the future, we don't incorrectly include - // data from previous reporting intervals in that future report. - const bool record_stats = - send_all_clusters || clusters.find(cluster_key.first) != clusters.end(); - XdsApi::ClusterLoadReport snapshot; - // Aggregate drop stats. - snapshot.dropped_requests = std::move(load_report.deleted_drop_stats); - if (load_report.drop_stats != nullptr) { - snapshot.dropped_requests += - load_report.drop_stats->GetSnapshotAndReset(); - GRPC_TRACE_LOG(xds_client, INFO) - << "[xds_client " << this << "] cluster=" << cluster_key.first - << " eds_service_name=" << cluster_key.second - << " drop_stats=" << load_report.drop_stats; - } - // Aggregate locality stats. - for (auto it = load_report.locality_stats.begin(); - it != load_report.locality_stats.end();) { - const RefCountedPtr& locality_name = it->first; - auto& locality_state = it->second; - XdsClusterLocalityStats::Snapshot& locality_snapshot = - snapshot.locality_stats[locality_name]; - locality_snapshot = std::move(locality_state.deleted_locality_stats); - if (locality_state.locality_stats != nullptr) { - locality_snapshot += - locality_state.locality_stats->GetSnapshotAndReset(); - GRPC_TRACE_LOG(xds_client, INFO) - << "[xds_client " << this - << "] cluster=" << cluster_key.first.c_str() - << " eds_service_name=" << cluster_key.second.c_str() - << " locality=" << locality_name->human_readable_string().c_str() - << " locality_stats=" << locality_state.locality_stats; - } - // If the only thing left in this entry was final snapshots from - // deleted locality stats objects, remove the entry. - if (locality_state.locality_stats == nullptr) { - it = load_report.locality_stats.erase(it); - } else { - ++it; - } - } - // Compute load report interval. - const Timestamp now = Timestamp::Now(); - snapshot.load_report_interval = now - load_report.last_report_time; - load_report.last_report_time = now; - // Record snapshot. - if (record_stats) { - snapshot_map[cluster_key] = std::move(snapshot); - } - // If the only thing left in this entry was final snapshots from - // deleted stats objects, remove the entry. - if (load_report.locality_stats.empty() && - load_report.drop_stats == nullptr) { - load_report_it = load_report_map.erase(load_report_it); - } else { - ++load_report_it; - } - } - return snapshot_map; -} - namespace { google_protobuf_Timestamp* EncodeTimestamp(Timestamp value, upb_Arena* arena) { diff --git a/src/core/xds/xds_client/xds_client.h b/src/core/xds/xds_client/xds_client.h index d8afa1858bf..b5d4faa0b90 100644 --- a/src/core/xds/xds_client/xds_client.h +++ b/src/core/xds/xds_client/xds_client.h @@ -44,7 +44,7 @@ #include "src/core/util/work_serializer.h" #include "src/core/xds/xds_client/xds_api.h" #include "src/core/xds/xds_client/xds_bootstrap.h" -#include "src/core/xds/xds_client/xds_client_stats.h" +#include "src/core/xds/xds_client/xds_locality.h" #include "src/core/xds/xds_client/xds_metrics.h" #include "src/core/xds/xds_client/xds_resource_type.h" #include "src/core/xds/xds_client/xds_transport.h" @@ -84,22 +84,14 @@ class XdsClient : public DualRefCounted { }; XdsClient( - std::unique_ptr bootstrap, - OrphanablePtr transport_factory, + std::shared_ptr bootstrap, + RefCountedPtr transport_factory, std::shared_ptr engine, std::unique_ptr metrics_reporter, std::string user_agent_name, std::string user_agent_version, Duration resource_request_timeout = Duration::Seconds(15)); ~XdsClient() override; - const XdsBootstrap& bootstrap() const { - return *bootstrap_; // ctor asserts that it is non-null - } - - XdsTransportFactory* transport_factory() const { - return transport_factory_.get(); - } - // Start and cancel watch for a resource. // // The XdsClient takes ownership of the watcher, but the caller may @@ -126,29 +118,16 @@ class XdsClient : public DualRefCounted { ResourceWatcherInterface* watcher, bool delay_unsubscription = false); - // Adds and removes drop stats for cluster_name and eds_service_name. - RefCountedPtr AddClusterDropStats( - const XdsBootstrap::XdsServer& xds_server, absl::string_view cluster_name, - absl::string_view eds_service_name); - void RemoveClusterDropStats(absl::string_view xds_server, - absl::string_view cluster_name, - absl::string_view eds_service_name, - XdsClusterDropStats* cluster_drop_stats); - - // Adds and removes locality stats for cluster_name and eds_service_name - // for the specified locality. - RefCountedPtr AddClusterLocalityStats( - const XdsBootstrap::XdsServer& xds_server, absl::string_view cluster_name, - absl::string_view eds_service_name, - RefCountedPtr locality); - void RemoveClusterLocalityStats( - absl::string_view xds_server, absl::string_view cluster_name, - absl::string_view eds_service_name, - const RefCountedPtr& locality, - XdsClusterLocalityStats* cluster_locality_stats); - // Resets connection backoff state. - void ResetBackoff(); + virtual void ResetBackoff(); + + const XdsBootstrap& bootstrap() const { + return *bootstrap_; // ctor asserts that it is non-null + } + + XdsTransportFactory* transport_factory() const { + return transport_factory_.get(); + } grpc_event_engine::experimental::EventEngine* engine() { return engine_.get(); @@ -212,7 +191,6 @@ class XdsClient : public DualRefCounted { class RetryableCall; class AdsCall; - class LrsCall; XdsChannel(WeakRefCountedPtr xds_client, const XdsBootstrap::XdsServer& server); @@ -220,13 +198,9 @@ class XdsClient : public DualRefCounted { XdsClient* xds_client() const { return xds_client_.get(); } AdsCall* ads_call() const; - LrsCall* lrs_call() const; void ResetBackoff(); - void MaybeStartLrsCall(); - void StopLrsCallLocked() ABSL_EXCLUSIVE_LOCKS_REQUIRED(&XdsClient::mu_); - // Returns non-OK if there has been an error since the last time the // ADS stream saw a response. const absl::Status& status() const { return status_; } @@ -242,6 +216,8 @@ class XdsClient : public DualRefCounted { absl::string_view server_uri() const { return server_.server_uri(); } private: + class ConnectivityFailureWatcher; + // Attempts to find a suitable Xds fallback server. Returns true if // a connection to a suitable server had been established. bool MaybeFallbackLocked(const std::string& authority, @@ -262,13 +238,14 @@ class XdsClient : public DualRefCounted { const XdsBootstrap::XdsServer& server_; // Owned by bootstrap. - OrphanablePtr transport_; + RefCountedPtr transport_; + RefCountedPtr + failure_watcher_; bool shutting_down_ = false; // The retryable ADS and LRS calls. OrphanablePtr> ads_call_; - OrphanablePtr> lrs_call_; // Stores the most recent accepted resource version for each resource type. std::map @@ -292,30 +269,6 @@ class XdsClient : public DualRefCounted { resource_map; }; - struct LoadReportState { - struct LocalityState { - XdsClusterLocalityStats* locality_stats = nullptr; - XdsClusterLocalityStats::Snapshot deleted_locality_stats; - }; - - XdsClusterDropStats* drop_stats = nullptr; - XdsClusterDropStats::Snapshot deleted_drop_stats; - std::map, LocalityState, - XdsLocalityName::Less> - locality_stats; - Timestamp last_report_time = Timestamp::Now(); - }; - - // Load report data. - using LoadReportMap = std::map< - std::pair, - LoadReportState>; - - struct LoadReportServer { - RefCountedPtr xds_channel; - LoadReportMap load_report_map; - }; - // Sends an error notification to a specific set of watchers. void NotifyWatchersOnErrorLocked( const std::map { const XdsResourceType* GetResourceTypeLocked(absl::string_view resource_type) ABSL_EXCLUSIVE_LOCKS_REQUIRED(mu_); + bool HasUncachedResources(const AuthorityState& authority_state); + absl::StatusOr ParseXdsResourceName( absl::string_view name, const XdsResourceType* type); static std::string ConstructFullXdsResourceName( absl::string_view authority, absl::string_view resource_type, const XdsResourceKey& key); - XdsApi::ClusterLoadReportMap BuildLoadReportSnapshotLocked( - const XdsBootstrap::XdsServer& xds_server, bool send_all_clusters, - const std::set& clusters) ABSL_EXCLUSIVE_LOCKS_REQUIRED(mu_); RefCountedPtr GetOrCreateXdsChannelLocked( const XdsBootstrap::XdsServer& server, const char* reason) ABSL_EXCLUSIVE_LOCKS_REQUIRED(mu_); - bool HasUncachedResources(const AuthorityState& authority_state); - std::unique_ptr bootstrap_; - OrphanablePtr transport_factory_; + std::shared_ptr bootstrap_; + RefCountedPtr transport_factory_; const Duration request_timeout_; const bool xds_federation_enabled_; XdsApi api_; @@ -371,9 +322,6 @@ class XdsClient : public DualRefCounted { std::map authority_state_map_ ABSL_GUARDED_BY(mu_); - std::map> - xds_load_report_server_map_ ABSL_GUARDED_BY(mu_); - // Stores started watchers whose resource name was not parsed successfully, // waiting to be cancelled or reset in Orphan(). std::map> diff --git a/src/core/xds/xds_client/xds_client_stats.cc b/src/core/xds/xds_client/xds_client_stats.cc deleted file mode 100644 index 12538303a53..00000000000 --- a/src/core/xds/xds_client/xds_client_stats.cc +++ /dev/null @@ -1,164 +0,0 @@ -// -// -// Copyright 2018 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/xds/xds_client/xds_client_stats.h" - -#include "absl/log/log.h" - -#include - -#include "src/core/lib/debug/trace.h" -#include "src/core/util/debug_location.h" -#include "src/core/xds/xds_client/xds_client.h" - -namespace grpc_core { - -namespace { - -uint64_t GetAndResetCounter(std::atomic* from) { - return from->exchange(0, std::memory_order_relaxed); -} - -} // namespace - -// -// XdsClusterDropStats -// - -XdsClusterDropStats::XdsClusterDropStats(RefCountedPtr xds_client, - absl::string_view lrs_server, - absl::string_view cluster_name, - absl::string_view eds_service_name) - : RefCounted(GRPC_TRACE_FLAG_ENABLED(xds_client_refcount) - ? "XdsClusterDropStats" - : nullptr), - xds_client_(std::move(xds_client)), - lrs_server_(lrs_server), - cluster_name_(cluster_name), - eds_service_name_(eds_service_name) { - GRPC_TRACE_LOG(xds_client, INFO) - << "[xds_client " << xds_client_.get() << "] created drop stats " << this - << " for {" << lrs_server_ << ", " << cluster_name_ << ", " - << eds_service_name_ << "}"; -} - -XdsClusterDropStats::~XdsClusterDropStats() { - GRPC_TRACE_LOG(xds_client, INFO) - << "[xds_client " << xds_client_.get() << "] destroying drop stats " - << this << " for {" << lrs_server_ << ", " << cluster_name_ << ", " - << eds_service_name_ << "}"; - xds_client_->RemoveClusterDropStats(lrs_server_, cluster_name_, - eds_service_name_, this); - xds_client_.reset(DEBUG_LOCATION, "DropStats"); -} - -XdsClusterDropStats::Snapshot XdsClusterDropStats::GetSnapshotAndReset() { - Snapshot snapshot; - snapshot.uncategorized_drops = GetAndResetCounter(&uncategorized_drops_); - MutexLock lock(&mu_); - snapshot.categorized_drops = std::move(categorized_drops_); - return snapshot; -} - -void XdsClusterDropStats::AddUncategorizedDrops() { - uncategorized_drops_.fetch_add(1); -} - -void XdsClusterDropStats::AddCallDropped(const std::string& category) { - MutexLock lock(&mu_); - ++categorized_drops_[category]; -} - -// -// XdsClusterLocalityStats -// - -XdsClusterLocalityStats::XdsClusterLocalityStats( - RefCountedPtr xds_client, absl::string_view lrs_server, - absl::string_view cluster_name, absl::string_view eds_service_name, - RefCountedPtr name) - : RefCounted(GRPC_TRACE_FLAG_ENABLED(xds_client_refcount) - ? "XdsClusterLocalityStats" - : nullptr), - xds_client_(std::move(xds_client)), - lrs_server_(lrs_server), - cluster_name_(cluster_name), - eds_service_name_(eds_service_name), - name_(std::move(name)) { - GRPC_TRACE_LOG(xds_client, INFO) - << "[xds_client " << xds_client_.get() << "] created locality stats " - << this << " for {" << lrs_server_ << ", " << cluster_name_ << ", " - << eds_service_name_ << ", " - << (name_ == nullptr ? "" : name_->human_readable_string().c_str()) - << "}"; -} - -XdsClusterLocalityStats::~XdsClusterLocalityStats() { - GRPC_TRACE_LOG(xds_client, INFO) - << "[xds_client " << xds_client_.get() << "] destroying locality stats " - << this << " for {" << lrs_server_ << ", " << cluster_name_ << ", " - << eds_service_name_ << ", " - << (name_ == nullptr ? "" : name_->human_readable_string().c_str()) - << "}"; - xds_client_->RemoveClusterLocalityStats(lrs_server_, cluster_name_, - eds_service_name_, name_, this); - xds_client_.reset(DEBUG_LOCATION, "LocalityStats"); -} - -XdsClusterLocalityStats::Snapshot -XdsClusterLocalityStats::GetSnapshotAndReset() { - Snapshot snapshot; - for (auto& percpu_stats : stats_) { - Snapshot percpu_snapshot = { - GetAndResetCounter(&percpu_stats.total_successful_requests), - // Don't reset total_requests_in_progress because it's - // not related to a single reporting interval. - percpu_stats.total_requests_in_progress.load(std::memory_order_relaxed), - GetAndResetCounter(&percpu_stats.total_error_requests), - GetAndResetCounter(&percpu_stats.total_issued_requests), - {}}; - { - MutexLock lock(&percpu_stats.backend_metrics_mu); - percpu_snapshot.backend_metrics = std::move(percpu_stats.backend_metrics); - } - snapshot += percpu_snapshot; - } - return snapshot; -} - -void XdsClusterLocalityStats::AddCallStarted() { - Stats& stats = stats_.this_cpu(); - stats.total_issued_requests.fetch_add(1, std::memory_order_relaxed); - stats.total_requests_in_progress.fetch_add(1, std::memory_order_relaxed); -} - -void XdsClusterLocalityStats::AddCallFinished( - const std::map* named_metrics, bool fail) { - Stats& stats = stats_.this_cpu(); - std::atomic& to_increment = - fail ? stats.total_error_requests : stats.total_successful_requests; - to_increment.fetch_add(1, std::memory_order_relaxed); - stats.total_requests_in_progress.fetch_add(-1, std::memory_order_acq_rel); - if (named_metrics == nullptr) return; - MutexLock lock(&stats.backend_metrics_mu); - for (const auto& m : *named_metrics) { - stats.backend_metrics[std::string(m.first)] += BackendMetric{1, m.second}; - } -} - -} // namespace grpc_core diff --git a/src/core/xds/xds_client/xds_client_stats.h b/src/core/xds/xds_client/xds_client_stats.h deleted file mode 100644 index de9f924120d..00000000000 --- a/src/core/xds/xds_client/xds_client_stats.h +++ /dev/null @@ -1,258 +0,0 @@ -// -// -// Copyright 2018 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_XDS_XDS_CLIENT_XDS_CLIENT_STATS_H -#define GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_CLIENT_STATS_H - -#include -#include -#include -#include -#include - -#include "absl/base/thread_annotations.h" -#include "absl/strings/str_format.h" -#include "absl/strings/string_view.h" - -#include - -#include "src/core/resolver/endpoint_addresses.h" -#include "src/core/telemetry/call_tracer.h" -#include "src/core/util/per_cpu.h" -#include "src/core/util/ref_counted.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/sync.h" -#include "src/core/util/useful.h" -#include "src/core/xds/xds_client/xds_bootstrap.h" - -namespace grpc_core { - -// Forward declaration to avoid circular dependency. -class XdsClient; - -// Locality name. -class XdsLocalityName final : public RefCounted { - public: - struct Less { - bool operator()(const XdsLocalityName* lhs, - const XdsLocalityName* rhs) const { - if (lhs == nullptr || rhs == nullptr) return QsortCompare(lhs, rhs); - return lhs->Compare(*rhs) < 0; - } - - bool operator()(const RefCountedPtr& lhs, - const RefCountedPtr& rhs) const { - return (*this)(lhs.get(), rhs.get()); - } - }; - - XdsLocalityName(std::string region, std::string zone, std::string sub_zone) - : region_(std::move(region)), - zone_(std::move(zone)), - sub_zone_(std::move(sub_zone)), - human_readable_string_( - absl::StrFormat("{region=\"%s\", zone=\"%s\", sub_zone=\"%s\"}", - region_, zone_, sub_zone_)) {} - - bool operator==(const XdsLocalityName& other) const { - return region_ == other.region_ && zone_ == other.zone_ && - sub_zone_ == other.sub_zone_; - } - - bool operator!=(const XdsLocalityName& other) const { - return !(*this == other); - } - - int Compare(const XdsLocalityName& other) const { - int cmp_result = region_.compare(other.region_); - if (cmp_result != 0) return cmp_result; - cmp_result = zone_.compare(other.zone_); - if (cmp_result != 0) return cmp_result; - return sub_zone_.compare(other.sub_zone_); - } - - const std::string& region() const { return region_; } - const std::string& zone() const { return zone_; } - const std::string& sub_zone() const { return sub_zone_; } - - const RefCountedStringValue& human_readable_string() const { - return human_readable_string_; - } - - // Channel args traits. - static absl::string_view ChannelArgName() { - return GRPC_ARG_NO_SUBCHANNEL_PREFIX "xds_locality_name"; - } - static int ChannelArgsCompare(const XdsLocalityName* a, - const XdsLocalityName* b) { - return a->Compare(*b); - } - - private: - std::string region_; - std::string zone_; - std::string sub_zone_; - RefCountedStringValue human_readable_string_; -}; - -// Drop stats for an xds cluster. -class XdsClusterDropStats final : public RefCounted { - public: - // The total number of requests dropped for any reason is the sum of - // uncategorized_drops, and dropped_requests map. - using CategorizedDropsMap = std::map; - struct Snapshot { - uint64_t uncategorized_drops = 0; - // The number of requests dropped for the specific drop categories - // outlined in the drop_overloads field in the EDS response. - CategorizedDropsMap categorized_drops; - - Snapshot& operator+=(const Snapshot& other) { - uncategorized_drops += other.uncategorized_drops; - for (const auto& p : other.categorized_drops) { - categorized_drops[p.first] += p.second; - } - return *this; - } - - bool IsZero() const { - if (uncategorized_drops != 0) return false; - for (const auto& p : categorized_drops) { - if (p.second != 0) return false; - } - return true; - } - }; - - XdsClusterDropStats(RefCountedPtr xds_client, - absl::string_view lrs_server, - absl::string_view cluster_name, - absl::string_view eds_service_name); - ~XdsClusterDropStats() override; - - // Returns a snapshot of this instance and resets all the counters. - Snapshot GetSnapshotAndReset(); - - void AddUncategorizedDrops(); - void AddCallDropped(const std::string& category); - - private: - RefCountedPtr xds_client_; - absl::string_view lrs_server_; - absl::string_view cluster_name_; - absl::string_view eds_service_name_; - std::atomic uncategorized_drops_{0}; - // Protects categorized_drops_. A mutex is necessary because the length of - // dropped_requests can be accessed by both the picker (from data plane - // mutex) and the load reporting thread (from the control plane combiner). - Mutex mu_; - CategorizedDropsMap categorized_drops_ ABSL_GUARDED_BY(mu_); -}; - -// Locality stats for an xds cluster. -class XdsClusterLocalityStats final - : public RefCounted { - public: - struct BackendMetric { - uint64_t num_requests_finished_with_metric = 0; - double total_metric_value = 0; - - BackendMetric& operator+=(const BackendMetric& other) { - num_requests_finished_with_metric += - other.num_requests_finished_with_metric; - total_metric_value += other.total_metric_value; - return *this; - } - - bool IsZero() const { - return num_requests_finished_with_metric == 0 && total_metric_value == 0; - } - }; - - struct Snapshot { - uint64_t total_successful_requests = 0; - uint64_t total_requests_in_progress = 0; - uint64_t total_error_requests = 0; - uint64_t total_issued_requests = 0; - std::map backend_metrics; - - Snapshot& operator+=(const Snapshot& other) { - total_successful_requests += other.total_successful_requests; - total_requests_in_progress += other.total_requests_in_progress; - total_error_requests += other.total_error_requests; - total_issued_requests += other.total_issued_requests; - for (const auto& p : other.backend_metrics) { - backend_metrics[p.first] += p.second; - } - return *this; - } - - bool IsZero() const { - if (total_successful_requests != 0 || total_requests_in_progress != 0 || - total_error_requests != 0 || total_issued_requests != 0) { - return false; - } - for (const auto& p : backend_metrics) { - if (!p.second.IsZero()) return false; - } - return true; - } - }; - - XdsClusterLocalityStats(RefCountedPtr xds_client, - absl::string_view lrs_server, - absl::string_view cluster_name, - absl::string_view eds_service_name, - RefCountedPtr name); - ~XdsClusterLocalityStats() override; - - // Returns a snapshot of this instance and resets all the counters. - Snapshot GetSnapshotAndReset(); - - void AddCallStarted(); - void AddCallFinished(const std::map* named_metrics, - bool fail = false); - - XdsLocalityName* locality_name() const { return name_.get(); } - - private: - struct Stats { - std::atomic total_successful_requests{0}; - std::atomic total_requests_in_progress{0}; - std::atomic total_error_requests{0}; - std::atomic total_issued_requests{0}; - - // Protects backend_metrics. A mutex is necessary because the length of - // backend_metrics_ can be accessed by both the callback intercepting the - // call's recv_trailing_metadata and the load reporting thread. - Mutex backend_metrics_mu; - std::map backend_metrics - ABSL_GUARDED_BY(backend_metrics_mu); - }; - - RefCountedPtr xds_client_; - absl::string_view lrs_server_; - absl::string_view cluster_name_; - absl::string_view eds_service_name_; - RefCountedPtr name_; - PerCpu stats_{PerCpuOptions().SetMaxShards(32).SetCpusPerShard(4)}; -}; - -} // namespace grpc_core - -#endif // GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_CLIENT_STATS_H diff --git a/src/core/xds/xds_client/xds_locality.h b/src/core/xds/xds_client/xds_locality.h new file mode 100644 index 00000000000..3223ff48c34 --- /dev/null +++ b/src/core/xds/xds_client/xds_locality.h @@ -0,0 +1,103 @@ +// +// +// Copyright 2018 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_XDS_XDS_CLIENT_XDS_LOCALITY_H +#define GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_LOCALITY_H + +#include +#include + +#include "absl/strings/str_format.h" +#include "absl/strings/string_view.h" + +#include "src/core/resolver/endpoint_addresses.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/ref_counted_string.h" +#include "src/core/util/useful.h" + +namespace grpc_core { + +// An xDS locality name. +class XdsLocalityName final : public RefCounted { + public: + struct Less { + bool operator()(const XdsLocalityName* lhs, + const XdsLocalityName* rhs) const { + if (lhs == nullptr || rhs == nullptr) return QsortCompare(lhs, rhs); + return lhs->Compare(*rhs) < 0; + } + + bool operator()(const RefCountedPtr& lhs, + const RefCountedPtr& rhs) const { + return (*this)(lhs.get(), rhs.get()); + } + }; + + XdsLocalityName(std::string region, std::string zone, std::string sub_zone) + : region_(std::move(region)), + zone_(std::move(zone)), + sub_zone_(std::move(sub_zone)), + human_readable_string_( + absl::StrFormat("{region=\"%s\", zone=\"%s\", sub_zone=\"%s\"}", + region_, zone_, sub_zone_)) {} + + bool operator==(const XdsLocalityName& other) const { + return region_ == other.region_ && zone_ == other.zone_ && + sub_zone_ == other.sub_zone_; + } + + bool operator!=(const XdsLocalityName& other) const { + return !(*this == other); + } + + int Compare(const XdsLocalityName& other) const { + int cmp_result = region_.compare(other.region_); + if (cmp_result != 0) return cmp_result; + cmp_result = zone_.compare(other.zone_); + if (cmp_result != 0) return cmp_result; + return sub_zone_.compare(other.sub_zone_); + } + + const std::string& region() const { return region_; } + const std::string& zone() const { return zone_; } + const std::string& sub_zone() const { return sub_zone_; } + + const RefCountedStringValue& human_readable_string() const { + return human_readable_string_; + } + + // Channel args traits. + static absl::string_view ChannelArgName() { + return GRPC_ARG_NO_SUBCHANNEL_PREFIX "xds_locality_name"; + } + static int ChannelArgsCompare(const XdsLocalityName* a, + const XdsLocalityName* b) { + return a->Compare(*b); + } + + private: + std::string region_; + std::string zone_; + std::string sub_zone_; + RefCountedStringValue human_readable_string_; +}; + +} // namespace grpc_core + +#endif // GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_LOCALITY_H diff --git a/src/core/xds/xds_client/xds_transport.h b/src/core/xds/xds_client/xds_transport.h index 0bff4a86dbc..b471b31477c 100644 --- a/src/core/xds/xds_client/xds_transport.h +++ b/src/core/xds/xds_client/xds_transport.h @@ -17,25 +17,23 @@ #ifndef GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_TRANSPORT_H #define GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_TRANSPORT_H -#include #include #include #include "absl/status/status.h" #include "absl/strings/string_view.h" -#include - +#include "src/core/util/dual_ref_counted.h" #include "src/core/util/orphanable.h" #include "src/core/xds/xds_client/xds_bootstrap.h" namespace grpc_core { // A factory for creating new XdsTransport instances. -class XdsTransportFactory : public InternallyRefCounted { +class XdsTransportFactory : public DualRefCounted { public: // Represents a transport for xDS communication (e.g., a gRPC channel). - class XdsTransport : public InternallyRefCounted { + class XdsTransport : public DualRefCounted { public: // Represents a bidi streaming RPC call. class StreamingCall : public InternallyRefCounted { @@ -63,6 +61,25 @@ class XdsTransportFactory : public InternallyRefCounted { virtual void StartRecvMessage() = 0; }; + // A watcher for connectivity failures. + class ConnectivityFailureWatcher + : public RefCounted { + public: + // Will be invoked whenever there is a connectivity failure on the + // transport. + virtual void OnConnectivityFailure(absl::Status status) = 0; + }; + + explicit XdsTransport(const char* trace = nullptr) + : DualRefCounted(trace) {} + + // Starts a connectivity failure watcher on the transport. + virtual void StartConnectivityFailureWatch( + RefCountedPtr watcher) = 0; + // Stops a connectivity failure watcher on the transport. + virtual void StopConnectivityFailureWatch( + const RefCountedPtr& watcher) = 0; + // Create a streaming call on this transport for the specified method. // Events on the stream will be reported to event_handler. virtual OrphanablePtr CreateStreamingCall( @@ -73,15 +90,14 @@ class XdsTransportFactory : public InternallyRefCounted { virtual void ResetBackoff() = 0; }; - // Creates a new transport for the specified server. - // The on_connectivity_failure callback will be invoked whenever there is - // a connectivity failure on the transport. + // Returns a transport for the specified server. If there is already + // a transport for the server, returns a new ref to that transport; + // otherwise, creates a new transport. + // // *status will be set if there is an error creating the channel, // although the returned channel must still accept calls (which may fail). - virtual OrphanablePtr Create( - const XdsBootstrap::XdsServer& server, - std::function on_connectivity_failure, - absl::Status* status) = 0; + virtual RefCountedPtr GetTransport( + const XdsBootstrap::XdsServer& server, absl::Status* status) = 0; }; } // namespace grpc_core diff --git a/src/python/grpcio/grpc_core_dependencies.py b/src/python/grpcio/grpc_core_dependencies.py index 3af16866c12..80b7fedb8d4 100644 --- a/src/python/grpcio/grpc_core_dependencies.py +++ b/src/python/grpcio/grpc_core_dependencies.py @@ -864,10 +864,10 @@ CORE_SOURCE_FILES = [ '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/lrs_client.cc', 'src/core/xds/xds_client/xds_api.cc', 'src/core/xds/xds_client/xds_bootstrap.cc', 'src/core/xds/xds_client/xds_client.cc', - 'src/core/xds/xds_client/xds_client_stats.cc', 'third_party/abseil-cpp/absl/base/internal/cycleclock.cc', 'third_party/abseil-cpp/absl/base/internal/low_level_alloc.cc', 'third_party/abseil-cpp/absl/base/internal/raw_logging.cc', diff --git a/test/core/xds/xds_client_fuzzer.cc b/test/core/xds/xds_client_fuzzer.cc index 21b94895a1a..ef660977c8d 100644 --- a/test/core/xds/xds_client_fuzzer.cc +++ b/test/core/xds/xds_client_fuzzer.cc @@ -61,13 +61,12 @@ class Fuzzer { // Leave xds_client_ unset, so Act() will be a no-op. return; } - auto transport_factory = MakeOrphanable( + transport_factory_ = MakeRefCounted( []() { Crash("Multiple concurrent reads"); }); - transport_factory->SetAutoCompleteMessagesFromClient(false); - transport_factory->SetAbortOnUndrainedMessages(false); - transport_factory_ = transport_factory.get(); + transport_factory_->SetAutoCompleteMessagesFromClient(false); + transport_factory_->SetAbortOnUndrainedMessages(false); xds_client_ = MakeRefCounted( - std::move(*bootstrap), std::move(transport_factory), + std::move(*bootstrap), transport_factory_, grpc_event_engine::experimental::GetDefaultEventEngine(), /*metrics_reporter=*/nullptr, "foo agent", "foo version"); } @@ -322,7 +321,7 @@ class Fuzzer { } RefCountedPtr xds_client_; - FakeXdsTransportFactory* transport_factory_; + RefCountedPtr transport_factory_; // Maps of currently active watchers for each resource type, keyed by // resource name. diff --git a/test/core/xds/xds_client_test.cc b/test/core/xds/xds_client_test.cc index 520b2118a49..87e3a8a2e11 100644 --- a/test/core/xds/xds_client_test.cc +++ b/test/core/xds/xds_client_test.cc @@ -729,14 +729,12 @@ class XdsClientTest : public ::testing::Test { void InitXdsClient( FakeXdsBootstrap::Builder bootstrap_builder = FakeXdsBootstrap::Builder(), Duration resource_request_timeout = Duration::Seconds(15)) { - auto transport_factory = MakeOrphanable( + transport_factory_ = MakeRefCounted( []() { FAIL() << "Multiple concurrent reads"; }); - transport_factory_ = - transport_factory->Ref().TakeAsSubclass(); auto metrics_reporter = std::make_unique(); metrics_reporter_ = metrics_reporter.get(); xds_client_ = MakeRefCounted( - bootstrap_builder.Build(), std::move(transport_factory), + bootstrap_builder.Build(), transport_factory_, grpc_event_engine::experimental::GetDefaultEventEngine(), std::move(metrics_reporter), "foo agent", "foo version", resource_request_timeout * grpc_test_slowdown_factor()); @@ -986,7 +984,7 @@ TEST_F(XdsClientTest, BasicWatch) { /*resource_names=*/{"foo1"}); // Cancel watch. CancelFooWatch(watcher.get(), "foo1"); - EXPECT_TRUE(stream->Orphaned()); + EXPECT_TRUE(stream->IsOrphaned()); // Check metric data. EXPECT_TRUE(metrics_reporter_->WaitForMetricsReporterData( ::testing::ElementsAre(::testing::Pair( @@ -1081,7 +1079,7 @@ TEST_F(XdsClientTest, UpdateFromServer) { /*resource_names=*/{"foo1"}); // Cancel watch. CancelFooWatch(watcher.get(), "foo1"); - EXPECT_TRUE(stream->Orphaned()); + EXPECT_TRUE(stream->IsOrphaned()); } TEST_F(XdsClientTest, MultipleWatchersForSameResource) { @@ -1185,7 +1183,7 @@ TEST_F(XdsClientTest, MultipleWatchersForSameResource) { ASSERT_FALSE(WaitForRequest(stream.get())); // Now cancel the second watcher. CancelFooWatch(watcher2.get(), "foo1"); - EXPECT_TRUE(stream->Orphaned()); + EXPECT_TRUE(stream->IsOrphaned()); } TEST_F(XdsClientTest, SubscribeToMultipleResources) { @@ -1319,7 +1317,7 @@ TEST_F(XdsClientTest, SubscribeToMultipleResources) { /*error_detail=*/absl::OkStatus(), /*resource_names=*/{"foo2"}); // Now cancel watch for "foo2". CancelFooWatch(watcher2.get(), "foo2"); - EXPECT_TRUE(stream->Orphaned()); + EXPECT_TRUE(stream->IsOrphaned()); } TEST_F(XdsClientTest, UpdateContainsOnlyChangedResource) { @@ -1441,7 +1439,7 @@ TEST_F(XdsClientTest, UpdateContainsOnlyChangedResource) { /*error_detail=*/absl::OkStatus(), /*resource_names=*/{"foo2"}); // Now cancel watch for "foo2". CancelFooWatch(watcher2.get(), "foo2"); - EXPECT_TRUE(stream->Orphaned()); + EXPECT_TRUE(stream->IsOrphaned()); } TEST_F(XdsClientTest, ResourceValidationFailure) { @@ -1568,7 +1566,7 @@ TEST_F(XdsClientTest, ResourceValidationFailure) { // Cancel watch. CancelFooWatch(watcher.get(), "foo1"); CancelFooWatch(watcher2.get(), "foo1"); - EXPECT_TRUE(stream->Orphaned()); + EXPECT_TRUE(stream->IsOrphaned()); } TEST_F(XdsClientTest, ResourceValidationFailureMultipleResources) { @@ -1767,7 +1765,7 @@ TEST_F(XdsClientTest, ResourceValidationFailureMultipleResources) { CancelFooWatch(watcher2.get(), "foo2", /*delay_unsubscription=*/true); CancelFooWatch(watcher3.get(), "foo3", /*delay_unsubscription=*/true); CancelFooWatch(watcher4.get(), "foo4"); - EXPECT_TRUE(stream->Orphaned()); + EXPECT_TRUE(stream->IsOrphaned()); } TEST_F(XdsClientTest, ResourceValidationFailureForCachedResource) { @@ -1882,7 +1880,7 @@ TEST_F(XdsClientTest, ResourceValidationFailureForCachedResource) { // Cancel watches. CancelFooWatch(watcher.get(), "foo1"); CancelFooWatch(watcher2.get(), "foo1"); - EXPECT_TRUE(stream->Orphaned()); + EXPECT_TRUE(stream->IsOrphaned()); } TEST_F(XdsClientTest, WildcardCapableResponseWithEmptyResource) { @@ -1949,7 +1947,7 @@ TEST_F(XdsClientTest, WildcardCapableResponseWithEmptyResource) { /*resource_names=*/{"wc1"}); // Cancel watch. CancelWildcardCapableWatch(watcher.get(), "wc1"); - EXPECT_TRUE(stream->Orphaned()); + EXPECT_TRUE(stream->IsOrphaned()); } // This tests resource removal triggered by the server when using a @@ -2079,7 +2077,7 @@ TEST_F(XdsClientTest, ResourceDeletion) { // Cancel watch. CancelWildcardCapableWatch(watcher.get(), "wc1"); CancelWildcardCapableWatch(watcher2.get(), "wc1"); - EXPECT_TRUE(stream->Orphaned()); + EXPECT_TRUE(stream->IsOrphaned()); } // This tests that when we ignore resource deletions from the server @@ -2213,7 +2211,7 @@ TEST_F(XdsClientTest, ResourceDeletionIgnoredWhenConfigured) { // Cancel watch. CancelWildcardCapableWatch(watcher.get(), "wc1"); CancelWildcardCapableWatch(watcher2.get(), "wc1"); - EXPECT_TRUE(stream->Orphaned()); + EXPECT_TRUE(stream->IsOrphaned()); } TEST_F(XdsClientTest, StreamClosedByServer) { @@ -2262,7 +2260,7 @@ TEST_F(XdsClientTest, StreamClosedByServer) { // XdsClient should NOT report error to watcher, because we saw a // response on the stream before it failed. // Stream should be orphaned. - EXPECT_TRUE(stream->Orphaned()); + EXPECT_TRUE(stream->IsOrphaned()); // Check metric data. EXPECT_THAT(GetServerConnections(), ::testing::ElementsAre(::testing::Pair( kDefaultXdsServerUrl, true))); @@ -2306,7 +2304,7 @@ TEST_F(XdsClientTest, StreamClosedByServer) { // Cancel watcher. CancelFooWatch(watcher.get(), "foo1"); CancelFooWatch(watcher2.get(), "foo1"); - EXPECT_TRUE(stream->Orphaned()); + EXPECT_TRUE(stream->IsOrphaned()); } TEST_F(XdsClientTest, StreamClosedByServerWithoutSeeingResponse) { @@ -2390,7 +2388,7 @@ TEST_F(XdsClientTest, StreamClosedByServerWithoutSeeingResponse) { /*resource_names=*/{"foo1"}); // Cancel watcher. CancelFooWatch(watcher.get(), "foo1"); - EXPECT_TRUE(stream->Orphaned()); + EXPECT_TRUE(stream->IsOrphaned()); } TEST_F(XdsClientTest, ConnectionFails) { @@ -2486,7 +2484,7 @@ TEST_F(XdsClientTest, ConnectionFails) { // Cancel watches. CancelFooWatch(watcher.get(), "foo1"); CancelFooWatch(watcher2.get(), "foo1"); - EXPECT_TRUE(stream->Orphaned()); + EXPECT_TRUE(stream->IsOrphaned()); } TEST_F(XdsClientTest, ResourceDoesNotExistUponTimeout) { @@ -2572,7 +2570,7 @@ TEST_F(XdsClientTest, ResourceDoesNotExistUponTimeout) { // Cancel watch. CancelFooWatch(watcher.get(), "foo1"); CancelFooWatch(watcher2.get(), "foo1"); - EXPECT_TRUE(stream->Orphaned()); + EXPECT_TRUE(stream->IsOrphaned()); } TEST_F(XdsClientTest, ResourceDoesNotExistAfterStreamRestart) { @@ -2687,7 +2685,7 @@ TEST_F(XdsClientTest, ResourceDoesNotExistAfterStreamRestart) { /*resource_names=*/{"foo1"}); // Cancel watcher. CancelFooWatch(watcher.get(), "foo1"); - EXPECT_TRUE(stream->Orphaned()); + EXPECT_TRUE(stream->IsOrphaned()); } TEST_F(XdsClientTest, DoesNotExistTimerNotStartedUntilSendCompletes) { @@ -2765,7 +2763,7 @@ TEST_F(XdsClientTest, DoesNotExistTimerNotStartedUntilSendCompletes) { stream->CompleteSendMessageFromClient(); // Cancel watch. CancelFooWatch(watcher.get(), "foo1"); - EXPECT_TRUE(stream->Orphaned()); + EXPECT_TRUE(stream->IsOrphaned()); } // In https://github.com/grpc/grpc/issues/29583, we ran into a case @@ -2921,7 +2919,7 @@ TEST_F(XdsClientTest, // Cancel watches. CancelFooWatch(watcher.get(), "foo1", /*delay_unsubscription=*/true); CancelFooWatch(watcher2.get(), "foo2"); - EXPECT_TRUE(stream->Orphaned()); + EXPECT_TRUE(stream->IsOrphaned()); } TEST_F(XdsClientTest, DoNotSendDoesNotExistForCachedResource) { @@ -3041,7 +3039,7 @@ TEST_F(XdsClientTest, DoNotSendDoesNotExistForCachedResource) { /*resource_names=*/{"foo1"}); // Cancel watch. CancelFooWatch(watcher.get(), "foo1"); - EXPECT_TRUE(stream->Orphaned()); + EXPECT_TRUE(stream->IsOrphaned()); } TEST_F(XdsClientTest, ResourceWrappedInResourceMessage) { @@ -3096,7 +3094,7 @@ TEST_F(XdsClientTest, ResourceWrappedInResourceMessage) { /*resource_names=*/{"foo1"}); // Cancel watch. CancelFooWatch(watcher.get(), "foo1"); - EXPECT_TRUE(stream->Orphaned()); + EXPECT_TRUE(stream->IsOrphaned()); } TEST_F(XdsClientTest, MultipleResourceTypes) { @@ -3211,7 +3209,7 @@ TEST_F(XdsClientTest, MultipleResourceTypes) { /*error_detail=*/absl::OkStatus(), /*resource_names=*/{}); // Now cancel watch for "bar1". CancelBarWatch(watcher2.get(), "bar1"); - EXPECT_TRUE(stream->Orphaned()); + EXPECT_TRUE(stream->IsOrphaned()); } TEST_F(XdsClientTest, Federation) { @@ -3360,10 +3358,10 @@ TEST_F(XdsClientTest, Federation) { /*resource_names=*/{kXdstpResourceName}); // Cancel watch for "foo1". CancelFooWatch(watcher.get(), "foo1"); - EXPECT_TRUE(stream->Orphaned()); + EXPECT_TRUE(stream->IsOrphaned()); // Now cancel watch for xdstp resource name. CancelFooWatch(watcher2.get(), kXdstpResourceName); - EXPECT_TRUE(stream2->Orphaned()); + EXPECT_TRUE(stream2->IsOrphaned()); } TEST_F(XdsClientTest, FederationAuthorityDefaultsToTopLevelXdsServer) { @@ -3486,7 +3484,7 @@ TEST_F(XdsClientTest, FederationAuthorityDefaultsToTopLevelXdsServer) { /*resource_names=*/{kXdstpResourceName}); // Now cancel watch for xdstp resource name. CancelFooWatch(watcher2.get(), kXdstpResourceName); - EXPECT_TRUE(stream->Orphaned()); + EXPECT_TRUE(stream->IsOrphaned()); } TEST_F(XdsClientTest, FederationWithUnknownAuthority) { @@ -3566,7 +3564,7 @@ TEST_F(XdsClientTest, FederationDisabledWithNewStyleName) { /*resource_names=*/{kXdstpResourceName}); // Cancel watch. CancelFooWatch(watcher.get(), kXdstpResourceName); - EXPECT_TRUE(stream->Orphaned()); + EXPECT_TRUE(stream->IsOrphaned()); } TEST_F(XdsClientTest, FederationChannelFailureReportedToWatchers) { @@ -3719,10 +3717,10 @@ TEST_F(XdsClientTest, FederationChannelFailureReportedToWatchers) { ::testing::Pair(authority_server.server_uri(), 1)))); // Cancel watch for "foo1". CancelFooWatch(watcher.get(), "foo1"); - EXPECT_TRUE(stream->Orphaned()); + EXPECT_TRUE(stream->IsOrphaned()); // Now cancel watch for xdstp resource name. CancelFooWatch(watcher2.get(), kXdstpResourceName); - EXPECT_TRUE(stream2->Orphaned()); + EXPECT_TRUE(stream2->IsOrphaned()); } TEST_F(XdsClientTest, AdsReadWaitsForHandleRelease) { @@ -3808,7 +3806,7 @@ TEST_F(XdsClientTest, AdsReadWaitsForHandleRelease) { /*error_detail=*/absl::OkStatus(), /*resource_names=*/{"foo2"}); CancelFooWatch(watcher2.get(), "foo2"); - EXPECT_TRUE(stream->Orphaned()); + EXPECT_TRUE(stream->IsOrphaned()); } TEST_F(XdsClientTest, FallbackAndRecover) { @@ -4017,7 +4015,7 @@ TEST_F(XdsClientTest, FallbackAndRecover) { EXPECT_THAT(GetServerConnections(), ::testing::ElementsAre(::testing::Pair( kDefaultXdsServerUrl, true))); // Result (remote): The stream to the fallback server has been orphaned. - EXPECT_TRUE(stream2->Orphaned()); + EXPECT_TRUE(stream2->IsOrphaned()); // Result (local): Resources are delivered to watchers. resource = watcher->WaitForNextResource(); ASSERT_NE(resource, nullptr); @@ -4038,7 +4036,7 @@ TEST_F(XdsClientTest, FallbackAndRecover) { CancelFooWatch(watcher.get(), "foo1", /*delay_unsubscription=*/true); CancelFooWatch(watcher2.get(), "foo2"); // Result (remote): The stream to the primary server has been orphaned. - EXPECT_TRUE(stream->Orphaned()); + EXPECT_TRUE(stream->IsOrphaned()); } // Test for both servers being unavailable @@ -4165,7 +4163,7 @@ TEST_F(XdsClientTest, FallbackOnStartup) { .set_nonce("D") .AddFooResource(XdsFooResource("foo1", 42)) .Serialize()); - EXPECT_TRUE(fallback_stream->Orphaned()); + EXPECT_TRUE(fallback_stream->IsOrphaned()); resource = watcher->WaitForNextResource(); ASSERT_NE(resource, nullptr); EXPECT_EQ(resource->name, "foo1"); diff --git a/test/core/xds/xds_cluster_resource_type_test.cc b/test/core/xds/xds_cluster_resource_type_test.cc index 5039ab9b985..fed2848dc65 100644 --- a/test/core/xds/xds_cluster_resource_type_test.cc +++ b/test/core/xds/xds_cluster_resource_type_test.cc @@ -170,7 +170,7 @@ TEST_F(XdsClusterTest, MinimumValidConfig) { EXPECT_EQ(JsonDump(Json::FromArray(resource.lb_policy_config)), "[{\"xds_wrr_locality_experimental\":{\"childPolicy\":" "[{\"round_robin\":{}}]}}]"); - EXPECT_FALSE(resource.lrs_load_reporting_server.has_value()); + EXPECT_EQ(resource.lrs_load_reporting_server, nullptr); EXPECT_EQ(resource.max_concurrent_requests, 1024); EXPECT_FALSE(resource.outlier_detection.has_value()); } @@ -1134,7 +1134,7 @@ TEST_F(LrsTest, Valid) { EXPECT_EQ(*decode_result.name, "foo"); auto& resource = static_cast(**decode_result.resource); - ASSERT_TRUE(resource.lrs_load_reporting_server.has_value()); + ASSERT_NE(resource.lrs_load_reporting_server, nullptr); EXPECT_EQ(*resource.lrs_load_reporting_server, *xds_client_->bootstrap().servers().front()); } diff --git a/test/core/xds/xds_endpoint_resource_type_test.cc b/test/core/xds/xds_endpoint_resource_type_test.cc index 9b12b5517e9..8e9da777bc2 100644 --- a/test/core/xds/xds_endpoint_resource_type_test.cc +++ b/test/core/xds/xds_endpoint_resource_type_test.cc @@ -49,7 +49,7 @@ #include "src/core/xds/grpc/xds_health_status.h" #include "src/core/xds/xds_client/xds_bootstrap.h" #include "src/core/xds/xds_client/xds_client.h" -#include "src/core/xds/xds_client/xds_client_stats.h" +#include "src/core/xds/xds_client/xds_locality.h" #include "src/core/xds/xds_client/xds_resource_type.h" #include "src/proto/grpc/testing/xds/v3/address.pb.h" #include "src/proto/grpc/testing/xds/v3/base.pb.h" diff --git a/test/core/xds/xds_transport_fake.cc b/test/core/xds/xds_transport_fake.cc index b8ea78ff794..8c0fc5f5ea3 100644 --- a/test/core/xds/xds_transport_fake.cc +++ b/test/core/xds/xds_transport_fake.cc @@ -187,7 +187,7 @@ void FakeXdsTransportFactory::FakeStreamingCall::MaybeSendStatusToClient( event_handler->OnStatusReceived(std::move(status)); } -bool FakeXdsTransportFactory::FakeStreamingCall::Orphaned() { +bool FakeXdsTransportFactory::FakeStreamingCall::IsOrphaned() { MutexLock lock(&mu_); return orphaned_; } @@ -198,18 +198,18 @@ bool FakeXdsTransportFactory::FakeStreamingCall::Orphaned() { void FakeXdsTransportFactory::FakeXdsTransport::TriggerConnectionFailure( absl::Status status) { - RefCountedPtr on_connectivity_failure; + std::set> watchers; { MutexLock lock(&mu_); - on_connectivity_failure = on_connectivity_failure_; + watchers = watchers_; } ExecCtx exec_ctx; - if (on_connectivity_failure != nullptr) { - on_connectivity_failure->Run(std::move(status)); + for (const auto& watcher : watchers) { + watcher->OnConnectivityFailure(status); } } -void FakeXdsTransportFactory::FakeXdsTransport::Orphan() { +void FakeXdsTransportFactory::FakeXdsTransport::Orphaned() { { MutexLock lock(&factory_->mu_); auto it = factory_->transport_map_.find(server_.Key()); @@ -220,16 +220,14 @@ void FakeXdsTransportFactory::FakeXdsTransport::Orphan() { factory_.reset(); { MutexLock lock(&mu_); - // Can't destroy on_connectivity_failure_ synchronously, since that - // operation will trigger code in XdsClient that acquires its mutex, but - // it was already holding its mutex when it called us, so it would deadlock. - GetDefaultEventEngine()->Run([on_connectivity_failure = std::move( - on_connectivity_failure_)]() mutable { + // Can't destroy watchers synchronously, since that operation will trigger + // code in XdsClient that acquires its mutex, but it was already holding + // its mutex when it called us, so it would deadlock. + GetDefaultEventEngine()->Run([watchers = std::move(watchers_)]() mutable { ExecCtx exec_ctx; - on_connectivity_failure.reset(); + watchers.clear(); }); } - Unref(); } RefCountedPtr @@ -255,12 +253,24 @@ void FakeXdsTransportFactory::FakeXdsTransport::RemoveStream( } } +void FakeXdsTransportFactory::FakeXdsTransport::StartConnectivityFailureWatch( + RefCountedPtr watcher) { + MutexLock lock(&mu_); + watchers_.insert(std::move(watcher)); +} + +void FakeXdsTransportFactory::FakeXdsTransport::StopConnectivityFailureWatch( + const RefCountedPtr& watcher) { + MutexLock lock(&mu_); + watchers_.erase(watcher); +} + OrphanablePtr FakeXdsTransportFactory::FakeXdsTransport::CreateStreamingCall( const char* method, std::unique_ptr event_handler) { auto call = MakeOrphanable( - RefAsSubclass(), method, std::move(event_handler)); + WeakRefAsSubclass(), method, std::move(event_handler)); MutexLock lock(&mu_); active_calls_[method] = call->Ref().TakeAsSubclass(); cv_.Signal(); @@ -274,19 +284,18 @@ FakeXdsTransportFactory::FakeXdsTransport::CreateStreamingCall( constexpr char FakeXdsTransportFactory::kAdsMethod[]; constexpr char FakeXdsTransportFactory::kLrsMethod[]; -OrphanablePtr -FakeXdsTransportFactory::Create( - const XdsBootstrap::XdsServer& server, - std::function on_connectivity_failure, - absl::Status* /*status*/) { +RefCountedPtr +FakeXdsTransportFactory::GetTransport(const XdsBootstrap::XdsServer& server, + absl::Status* /*status*/) { + std::string key = server.Key(); MutexLock lock(&mu_); - auto& entry = transport_map_[server.Key()]; - CHECK(entry == nullptr); - auto transport = MakeOrphanable( - RefAsSubclass(), server, - std::move(on_connectivity_failure), auto_complete_messages_from_client_, - abort_on_undrained_messages_); - entry = transport->Ref().TakeAsSubclass(); + auto transport = GetTransportLocked(key); + if (transport == nullptr) { + transport = MakeRefCounted( + WeakRefAsSubclass(), server, + auto_complete_messages_from_client_, abort_on_undrained_messages_); + transport_map_.emplace(std::move(key), transport.get()); + } return transport; } @@ -318,8 +327,16 @@ FakeXdsTransportFactory::WaitForStream(const XdsBootstrap::XdsServer& server, RefCountedPtr FakeXdsTransportFactory::GetTransport(const XdsBootstrap::XdsServer& server) { + std::string key = server.Key(); MutexLock lock(&mu_); - return transport_map_[server.Key()]; + return GetTransportLocked(key); +} + +RefCountedPtr +FakeXdsTransportFactory::GetTransportLocked(const std::string& key) { + auto it = transport_map_.find(key); + if (it == transport_map_.end()) return nullptr; + return it->second->RefIfNonZero().TakeAsSubclass(); } } // namespace grpc_core diff --git a/test/core/xds/xds_transport_fake.h b/test/core/xds/xds_transport_fake.h index dc4d9c87772..0eb37e8a489 100644 --- a/test/core/xds/xds_transport_fake.h +++ b/test/core/xds/xds_transport_fake.h @@ -57,7 +57,7 @@ class FakeXdsTransportFactory : public XdsTransportFactory { class FakeStreamingCall : public XdsTransport::StreamingCall { public: FakeStreamingCall( - RefCountedPtr transport, const char* method, + WeakRefCountedPtr transport, const char* method, std::unique_ptr event_handler) : transport_(std::move(transport)), method_(method), @@ -68,6 +68,8 @@ class FakeXdsTransportFactory : public XdsTransportFactory { void Orphan() override; + bool IsOrphaned(); + void StartRecvMessage() override; using StreamingCall::Ref; // Make it public. @@ -86,8 +88,6 @@ class FakeXdsTransportFactory : public XdsTransportFactory { void SendMessageToClient(absl::string_view payload); void MaybeSendStatusToClient(absl::Status status); - bool Orphaned(); - bool WaitForReadsStarted(size_t expected, absl::Duration timeout) { MutexLock lock(&mu_); const absl::Time deadline = absl::Now() + timeout; @@ -124,7 +124,7 @@ class FakeXdsTransportFactory : public XdsTransportFactory { ABSL_EXCLUSIVE_LOCKS_REQUIRED(&mu_); void MaybeDeliverMessageToClient(); - RefCountedPtr transport_; + WeakRefCountedPtr transport_; const char* method_; Mutex mu_; @@ -144,8 +144,6 @@ class FakeXdsTransportFactory : public XdsTransportFactory { : too_many_pending_reads_callback_( std::move(too_many_pending_reads_callback)) {} - using XdsTransportFactory::Ref; // Make it public. - void TriggerConnectionFailure(const XdsBootstrap::XdsServer& server, absl::Status status); @@ -174,26 +172,22 @@ class FakeXdsTransportFactory : public XdsTransportFactory { const XdsBootstrap::XdsServer& server, const char* method, absl::Duration timeout); - void Orphan() override { Unref(); } + void Orphaned() override {} private: class FakeXdsTransport : public XdsTransport { public: - FakeXdsTransport(RefCountedPtr factory, + FakeXdsTransport(WeakRefCountedPtr factory, const XdsBootstrap::XdsServer& server, - std::function on_connectivity_failure, bool auto_complete_messages_from_client, bool abort_on_undrained_messages) : factory_(std::move(factory)), server_(server), auto_complete_messages_from_client_( auto_complete_messages_from_client), - abort_on_undrained_messages_(abort_on_undrained_messages), - on_connectivity_failure_( - MakeRefCounted( - std::move(on_connectivity_failure))) {} + abort_on_undrained_messages_(abort_on_undrained_messages) {} - void Orphan() override; + void Orphaned() override; bool auto_complete_messages_from_client() const { return auto_complete_messages_from_client_; @@ -203,8 +197,6 @@ class FakeXdsTransportFactory : public XdsTransportFactory { return abort_on_undrained_messages_; } - using XdsTransport::Ref; // Make it public. - void TriggerConnectionFailure(absl::Status status); RefCountedPtr WaitForStream(const char* method, @@ -217,20 +209,10 @@ class FakeXdsTransportFactory : public XdsTransportFactory { const XdsBootstrap::XdsServer* server() const { return &server_; } private: - class RefCountedOnConnectivityFailure - : public RefCounted { - public: - explicit RefCountedOnConnectivityFailure( - std::function on_connectivity_failure) - : on_connectivity_failure_(std::move(on_connectivity_failure)) {} - - void Run(absl::Status status) { - on_connectivity_failure_(std::move(status)); - } - - private: - std::function on_connectivity_failure_; - }; + void StartConnectivityFailureWatch( + RefCountedPtr watcher) override; + void StopConnectivityFailureWatch( + const RefCountedPtr& watcher) override; OrphanablePtr CreateStreamingCall( const char* method, @@ -238,30 +220,33 @@ class FakeXdsTransportFactory : public XdsTransportFactory { void ResetBackoff() override {} - RefCountedPtr factory_; + WeakRefCountedPtr factory_; const XdsBootstrap::XdsServer& server_; const bool auto_complete_messages_from_client_; const bool abort_on_undrained_messages_; Mutex mu_; CondVar cv_; - RefCountedPtr on_connectivity_failure_ + std::set> watchers_ ABSL_GUARDED_BY(&mu_); std::map> active_calls_ ABSL_GUARDED_BY(&mu_); }; - OrphanablePtr Create( - const XdsBootstrap::XdsServer& server, - std::function on_connectivity_failure, - absl::Status* status) override; + // Returns an existing transport or creates a new one. + RefCountedPtr GetTransport( + const XdsBootstrap::XdsServer& server, absl::Status* /*status*/) override; + // Returns an existing transport, if any, or nullptr. RefCountedPtr GetTransport( const XdsBootstrap::XdsServer& server); + RefCountedPtr GetTransportLocked(const std::string& key) + ABSL_EXCLUSIVE_LOCKS_REQUIRED(&mu_); + Mutex mu_; - std::map> - transport_map_ ABSL_GUARDED_BY(&mu_); + std::map transport_map_ + ABSL_GUARDED_BY(&mu_); bool auto_complete_messages_from_client_ ABSL_GUARDED_BY(&mu_) = true; bool abort_on_undrained_messages_ ABSL_GUARDED_BY(&mu_) = true; std::function too_many_pending_reads_callback_; diff --git a/tools/doxygen/Doxyfile.c++.internal b/tools/doxygen/Doxyfile.c++.internal index 420e439352b..3688a568841 100644 --- a/tools/doxygen/Doxyfile.c++.internal +++ b/tools/doxygen/Doxyfile.c++.internal @@ -3039,6 +3039,8 @@ src/core/xds/grpc/xds_server_grpc.cc \ src/core/xds/grpc/xds_server_grpc.h \ src/core/xds/grpc/xds_transport_grpc.cc \ src/core/xds/grpc/xds_transport_grpc.h \ +src/core/xds/xds_client/lrs_client.cc \ +src/core/xds/xds_client/lrs_client.h \ src/core/xds/xds_client/xds_api.cc \ src/core/xds/xds_client/xds_api.h \ src/core/xds/xds_client/xds_bootstrap.cc \ @@ -3046,8 +3048,7 @@ src/core/xds/xds_client/xds_bootstrap.h \ src/core/xds/xds_client/xds_channel_args.h \ src/core/xds/xds_client/xds_client.cc \ src/core/xds/xds_client/xds_client.h \ -src/core/xds/xds_client/xds_client_stats.cc \ -src/core/xds/xds_client/xds_client_stats.h \ +src/core/xds/xds_client/xds_locality.h \ src/core/xds/xds_client/xds_metrics.h \ src/core/xds/xds_client/xds_resource_type.h \ src/core/xds/xds_client/xds_resource_type_impl.h \ diff --git a/tools/doxygen/Doxyfile.core.internal b/tools/doxygen/Doxyfile.core.internal index 095a8988889..9b118d61fd8 100644 --- a/tools/doxygen/Doxyfile.core.internal +++ b/tools/doxygen/Doxyfile.core.internal @@ -2816,6 +2816,8 @@ src/core/xds/grpc/xds_server_grpc.cc \ src/core/xds/grpc/xds_server_grpc.h \ src/core/xds/grpc/xds_transport_grpc.cc \ src/core/xds/grpc/xds_transport_grpc.h \ +src/core/xds/xds_client/lrs_client.cc \ +src/core/xds/xds_client/lrs_client.h \ src/core/xds/xds_client/xds_api.cc \ src/core/xds/xds_client/xds_api.h \ src/core/xds/xds_client/xds_bootstrap.cc \ @@ -2823,8 +2825,7 @@ src/core/xds/xds_client/xds_bootstrap.h \ src/core/xds/xds_client/xds_channel_args.h \ src/core/xds/xds_client/xds_client.cc \ src/core/xds/xds_client/xds_client.h \ -src/core/xds/xds_client/xds_client_stats.cc \ -src/core/xds/xds_client/xds_client_stats.h \ +src/core/xds/xds_client/xds_locality.h \ src/core/xds/xds_client/xds_metrics.h \ src/core/xds/xds_client/xds_resource_type.h \ src/core/xds/xds_client/xds_resource_type_impl.h \ From e11336112aa1f47b84434e72e67e2917be1e8891 Mon Sep 17 00:00:00 2001 From: Kannan J Date: Tue, 24 Sep 2024 12:57:03 -0700 Subject: [PATCH 22/75] Docker files for xds example server and client for C++. (#37778) We need to create userguide examples for Xds not involving Observability and currently only the csm observability example has a docker image. Closes #37778 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37778 from kannanjgithub:docker_xds_example_cpp bc91c8d5da04b1f6e9eef6e85c2f9a7d25fb716e PiperOrigin-RevId: 678362755 --- examples/cpp/xds/Dockerfile.client | 37 ++++++++++++++++++++++++++++++ examples/cpp/xds/Dockerfile.server | 37 ++++++++++++++++++++++++++++++ examples/cpp/xds/README.md | 21 +++++++++++++++++ 3 files changed, 95 insertions(+) create mode 100644 examples/cpp/xds/Dockerfile.client create mode 100644 examples/cpp/xds/Dockerfile.server diff --git a/examples/cpp/xds/Dockerfile.client b/examples/cpp/xds/Dockerfile.client new file mode 100644 index 00000000000..a1b0f2101f9 --- /dev/null +++ b/examples/cpp/xds/Dockerfile.client @@ -0,0 +1,37 @@ +# 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. + +FROM python:3.9-slim-bookworm + +RUN apt-get update -y && apt-get upgrade -y && apt-get install -y build-essential clang curl + +WORKDIR /workdir + +RUN ln -s /usr/bin/python3 /usr/bin/python +RUN mkdir /artifacts + +COPY . . +RUN tools/bazel build //examples/cpp/xds:xds_greeter_client +RUN cp -rL /workdir/bazel-bin/examples/cpp/xds/xds_greeter_client /artifacts/ + +FROM python:3.9-slim-bookworm + +RUN apt-get update \ + && apt-get -y upgrade \ + && apt-get -y autoremove \ + && apt-get install -y curl + +COPY --from=0 /artifacts ./ + +ENTRYPOINT ["/xds_greeter_client"] diff --git a/examples/cpp/xds/Dockerfile.server b/examples/cpp/xds/Dockerfile.server new file mode 100644 index 00000000000..f5a6582f293 --- /dev/null +++ b/examples/cpp/xds/Dockerfile.server @@ -0,0 +1,37 @@ +# 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. + +FROM python:3.9-slim-bookworm + +RUN apt-get update -y && apt-get upgrade -y && apt-get install -y build-essential clang curl + +WORKDIR /workdir + +RUN ln -s /usr/bin/python3 /usr/bin/python +RUN mkdir /artifacts + +COPY . . +RUN tools/bazel build //examples/cpp/xds:xds_greeter_server +RUN cp -rL /workdir/bazel-bin/examples/cpp/xds/xds_greeter_server /artifacts/ + +FROM python:3.9-slim-bookworm + +RUN apt-get update \ + && apt-get -y upgrade \ + && apt-get -y autoremove \ + && apt-get install -y curl + +COPY --from=0 /artifacts ./ + +ENTRYPOINT ["/xds_greeter_server"] diff --git a/examples/cpp/xds/README.md b/examples/cpp/xds/README.md index 7949c772db7..6d28838cab1 100644 --- a/examples/cpp/xds/README.md +++ b/examples/cpp/xds/README.md @@ -35,3 +35,24 @@ $ export GRPC_XDS_BOOTSTRAP=/path/to/bootstrap.json $ tools/bazel run examples/cpp/xds:greeter_client ``` +## Building Docker + +From the gRPC workspace folder: + +Client: +``` +docker build -f examples/cpp/xds/Dockerfile.client examples/cpp/xds +``` +Server: +``` +docker build -f examples/cpp/xds/Dockerfile.server examples/cpp/xds +``` + +To push to a registry, add a tag to the image either by adding a `-t` flag to `docker build` command above or run: + +``` +docker image tag ${sha from build command above} ${tag} +``` + +And then push the tagged image using `docker push` + From 169ccf7a70f26d8647122a43a9cffb1ffdb4b4d5 Mon Sep 17 00:00:00 2001 From: Esun Kim Date: Tue, 24 Sep 2024 15:56:17 -0700 Subject: [PATCH 23/75] [CMake] Fixed _gRPC_PROTOBUF_WELLKNOWN_INCLUDE_DIR (#37627) gRPC has been passing the wrong directory of `_gRPC_PROTOBUF_WELLKNOWN_INCLUDE_DIR` to protoc. While protoc often works around this by searching its own installation directory for proto files, this isn't always successful. Let's fix this bug to ensure consistent behavior. Fixes: https://github.com/grpc/grpc/issues/37411 Closes #37627 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37627 from veblush:protobuf-cmake-wkt 412f4a6f8710bd95f3b92898526bc5277ac2a0fc PiperOrigin-RevId: 678428224 --- cmake/protobuf.cmake | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/cmake/protobuf.cmake b/cmake/protobuf.cmake index fab2eb00e96..ad80ca6e466 100644 --- a/cmake/protobuf.cmake +++ b/cmake/protobuf.cmake @@ -65,12 +65,11 @@ elseif(gRPC_PROTOBUF_PROVIDER STREQUAL "package") endif() if(TARGET protobuf::libprotoc) set(_gRPC_PROTOBUF_PROTOC_LIBRARIES protobuf::libprotoc) - # extract the include dir from target's properties - get_target_property(_gRPC_PROTOBUF_WELLKNOWN_INCLUDE_DIR protobuf::libprotoc INTERFACE_INCLUDE_DIRECTORIES) else() set(_gRPC_PROTOBUF_PROTOC_LIBRARIES ${PROTOBUF_PROTOC_LIBRARIES}) - set(_gRPC_PROTOBUF_WELLKNOWN_INCLUDE_DIR ${PROTOBUF_INCLUDE_DIRS}) endif() + # Well-known proto files are expected to be in the Protobuf include directory. + get_target_property(_gRPC_PROTOBUF_WELLKNOWN_INCLUDE_DIR ${_gRPC_PROTOBUF_LIBRARIES} INTERFACE_INCLUDE_DIRECTORIES) if(TARGET protobuf::protoc) set(_gRPC_PROTOBUF_PROTOC protobuf::protoc) if(CMAKE_CROSSCOMPILING) From e4a422ba43c825d7adc289f40305dbe5eaf1fb79 Mon Sep 17 00:00:00 2001 From: Esun Kim Date: Tue, 24 Sep 2024 15:58:28 -0700 Subject: [PATCH 24/75] [Deps] Upgrade protobuf to 28.1 (#37682) Regular protobuf upgrade from 27.2 to 28.1 along with the required change to accommodate https://github.com/protocolbuffers/protobuf/pull/17285 Closes #37682 PiperOrigin-RevId: 678428936 --- CMakeLists.txt | 3 + Makefile | 2 + Package.swift | 5 + bazel/grpc_deps.bzl | 11 +- build_autogenerated.yaml | 7 + build_handwritten.yaml | 2 +- config.m4 | 3 + config.w32 | 3 + .../cmake_externalproject/CMakeLists.txt | 13 +- gRPC-C++.podspec | 6 + gRPC-Core.podspec | 8 + grpc.gemspec | 5 + package.xml | 5 + .../ext/upb-gen/envoy/admin/v3/certs.upb.h | 33 +- .../envoy/admin/v3/certs.upb_minitable.c | 35 +- .../envoy/admin/v3/certs.upb_minitable.h | 8 +- .../ext/upb-gen/envoy/admin/v3/clusters.upb.h | 34 +- .../envoy/admin/v3/clusters.upb_minitable.c | 36 +- .../envoy/admin/v3/clusters.upb_minitable.h | 7 +- .../upb-gen/envoy/admin/v3/config_dump.upb.h | 37 +- .../admin/v3/config_dump.upb_minitable.c | 41 +- .../admin/v3/config_dump.upb_minitable.h | 8 +- .../envoy/admin/v3/config_dump_shared.upb.h | 135 +++- .../v3/config_dump_shared.upb_minitable.c | 151 +++-- .../v3/config_dump_shared.upb_minitable.h | 22 +- .../upb-gen/envoy/admin/v3/init_dump.upb.h | 8 +- .../envoy/admin/v3/init_dump.upb_minitable.c | 10 +- .../envoy/admin/v3/init_dump.upb_minitable.h | 5 +- .../upb-gen/envoy/admin/v3/listeners.upb.h | 15 +- .../envoy/admin/v3/listeners.upb_minitable.c | 16 +- .../envoy/admin/v3/listeners.upb_minitable.h | 5 +- .../ext/upb-gen/envoy/admin/v3/memory.upb.h | 3 +- .../envoy/admin/v3/memory.upb_minitable.c | 5 +- .../envoy/admin/v3/memory.upb_minitable.h | 4 +- .../ext/upb-gen/envoy/admin/v3/metrics.upb.h | 3 +- .../envoy/admin/v3/metrics.upb_minitable.c | 5 +- .../envoy/admin/v3/metrics.upb_minitable.h | 4 +- .../upb-gen/envoy/admin/v3/mutex_stats.upb.h | 3 +- .../admin/v3/mutex_stats.upb_minitable.c | 5 +- .../admin/v3/mutex_stats.upb_minitable.h | 4 +- .../upb-gen/envoy/admin/v3/server_info.upb.h | 17 +- .../admin/v3/server_info.upb_minitable.c | 24 +- .../admin/v3/server_info.upb_minitable.h | 5 +- src/core/ext/upb-gen/envoy/admin/v3/tap.upb.h | 5 +- .../envoy/admin/v3/tap.upb_minitable.c | 9 +- .../envoy/admin/v3/tap.upb_minitable.h | 4 +- .../envoy/annotations/deprecation.upb.h | 3 +- .../annotations/deprecation.upb_minitable.c | 8 +- .../annotations/deprecation.upb_minitable.h | 3 +- .../upb-gen/envoy/annotations/resource.upb.h | 3 +- .../annotations/resource.upb_minitable.c | 14 +- .../annotations/resource.upb_minitable.h | 4 +- .../envoy/config/accesslog/v3/accesslog.upb.h | 59 +- .../accesslog/v3/accesslog.upb_minitable.c | 92 +-- .../accesslog/v3/accesslog.upb_minitable.h | 19 +- .../envoy/config/bootstrap/v3/bootstrap.upb.h | 181 +++++- .../bootstrap/v3/bootstrap.upb_minitable.c | 199 +++--- .../bootstrap/v3/bootstrap.upb_minitable.h | 26 +- .../config/cluster/v3/circuit_breaker.upb.h | 29 +- .../v3/circuit_breaker.upb_minitable.c | 33 +- .../v3/circuit_breaker.upb_minitable.h | 6 +- .../envoy/config/cluster/v3/cluster.upb.h | 183 +++++- .../config/cluster/v3/cluster.upb_minitable.c | 227 ++++--- .../config/cluster/v3/cluster.upb_minitable.h | 28 +- .../envoy/config/cluster/v3/filter.upb.h | 7 +- .../config/cluster/v3/filter.upb_minitable.c | 11 +- .../config/cluster/v3/filter.upb_minitable.h | 4 +- .../config/cluster/v3/outlier_detection.upb.h | 54 +- .../v3/outlier_detection.upb_minitable.c | 55 +- .../v3/outlier_detection.upb_minitable.h | 4 +- .../config/common/matcher/v3/matcher.upb.h | 94 ++- .../common/matcher/v3/matcher.upb_minitable.c | 115 ++-- .../common/matcher/v3/matcher.upb_minitable.h | 18 +- .../envoy/config/core/v3/address.upb.h | 42 +- .../config/core/v3/address.upb_minitable.c | 52 +- .../config/core/v3/address.upb_minitable.h | 11 +- .../envoy/config/core/v3/backoff.upb.h | 7 +- .../config/core/v3/backoff.upb_minitable.c | 11 +- .../config/core/v3/backoff.upb_minitable.h | 4 +- .../upb-gen/envoy/config/core/v3/base.upb.h | 107 +++- .../envoy/config/core/v3/base.upb_minitable.c | 143 +++-- .../envoy/config/core/v3/base.upb_minitable.h | 32 +- .../envoy/config/core/v3/config_source.upb.h | 44 +- .../core/v3/config_source.upb_minitable.c | 53 +- .../core/v3/config_source.upb_minitable.h | 10 +- .../config/core/v3/event_service_config.upb.h | 5 +- .../v3/event_service_config.upb_minitable.c | 9 +- .../v3/event_service_config.upb_minitable.h | 4 +- .../envoy/config/core/v3/extension.upb.h | 5 +- .../config/core/v3/extension.upb_minitable.c | 9 +- .../config/core/v3/extension.upb_minitable.h | 4 +- .../config/core/v3/grpc_method_list.upb.h | 8 +- .../core/v3/grpc_method_list.upb_minitable.c | 10 +- .../core/v3/grpc_method_list.upb_minitable.h | 5 +- .../envoy/config/core/v3/grpc_service.upb.h | 69 +- .../core/v3/grpc_service.upb_minitable.c | 88 +-- .../core/v3/grpc_service.upb_minitable.h | 17 +- .../envoy/config/core/v3/health_check.upb.h | 90 ++- .../core/v3/health_check.upb_minitable.c | 89 +-- .../core/v3/health_check.upb_minitable.h | 12 +- .../envoy/config/core/v3/http_service.upb.h | 10 +- .../core/v3/http_service.upb_minitable.c | 11 +- .../core/v3/http_service.upb_minitable.h | 4 +- .../envoy/config/core/v3/http_uri.upb.h | 5 +- .../config/core/v3/http_uri.upb_minitable.c | 9 +- .../config/core/v3/http_uri.upb_minitable.h | 4 +- .../envoy/config/core/v3/protocol.upb.h | 97 ++- .../config/core/v3/protocol.upb_minitable.c | 130 ++-- .../config/core/v3/protocol.upb_minitable.h | 19 +- .../envoy/config/core/v3/proxy_protocol.upb.h | 5 +- .../core/v3/proxy_protocol.upb_minitable.c | 10 +- .../core/v3/proxy_protocol.upb_minitable.h | 5 +- .../envoy/config/core/v3/resolver.upb.h | 10 +- .../config/core/v3/resolver.upb_minitable.c | 12 +- .../config/core/v3/resolver.upb_minitable.h | 5 +- .../envoy/config/core/v3/socket_option.upb.h | 8 +- .../core/v3/socket_option.upb_minitable.c | 10 +- .../core/v3/socket_option.upb_minitable.h | 5 +- .../core/v3/substitution_format_string.upb.h | 14 +- ...substitution_format_string.upb_minitable.c | 16 +- ...substitution_format_string.upb_minitable.h | 5 +- .../config/core/v3/udp_socket_config.upb.h | 7 +- .../core/v3/udp_socket_config.upb_minitable.c | 11 +- .../core/v3/udp_socket_config.upb_minitable.h | 4 +- .../envoy/config/endpoint/v3/endpoint.upb.h | 33 +- .../endpoint/v3/endpoint.upb_minitable.c | 32 +- .../endpoint/v3/endpoint.upb_minitable.h | 7 +- .../endpoint/v3/endpoint_components.upb.h | 46 +- .../v3/endpoint_components.upb_minitable.c | 59 +- .../v3/endpoint_components.upb_minitable.h | 10 +- .../config/endpoint/v3/load_report.upb.h | 42 +- .../endpoint/v3/load_report.upb_minitable.c | 40 +- .../endpoint/v3/load_report.upb_minitable.h | 9 +- .../config/listener/v3/api_listener.upb.h | 5 +- .../listener/v3/api_listener.upb_minitable.c | 9 +- .../listener/v3/api_listener.upb_minitable.h | 4 +- .../envoy/config/listener/v3/listener.upb.h | 81 ++- .../listener/v3/listener.upb_minitable.c | 84 +-- .../listener/v3/listener.upb_minitable.h | 13 +- .../listener/v3/listener_components.upb.h | 64 +- .../v3/listener_components.upb_minitable.c | 71 ++- .../v3/listener_components.upb_minitable.h | 10 +- .../config/listener/v3/quic_config.upb.h | 25 +- .../listener/v3/quic_config.upb_minitable.c | 29 +- .../listener/v3/quic_config.upb_minitable.h | 4 +- .../listener/v3/udp_listener_config.upb.h | 9 +- .../v3/udp_listener_config.upb_minitable.c | 14 +- .../v3/udp_listener_config.upb_minitable.h | 5 +- .../config/metrics/v3/metrics_service.upb.h | 7 +- .../v3/metrics_service.upb_minitable.c | 11 +- .../v3/metrics_service.upb_minitable.h | 4 +- .../envoy/config/metrics/v3/stats.upb.h | 31 +- .../config/metrics/v3/stats.upb_minitable.c | 46 +- .../config/metrics/v3/stats.upb_minitable.h | 11 +- .../envoy/config/overload/v3/overload.upb.h | 49 +- .../overload/v3/overload.upb_minitable.c | 56 +- .../overload/v3/overload.upb_minitable.h | 13 +- .../upb-gen/envoy/config/rbac/v3/rbac.upb.h | 94 ++- .../envoy/config/rbac/v3/rbac.upb_minitable.c | 103 +-- .../envoy/config/rbac/v3/rbac.upb_minitable.h | 14 +- .../upb-gen/envoy/config/route/v3/route.upb.h | 50 +- .../config/route/v3/route.upb_minitable.c | 37 +- .../config/route/v3/route.upb_minitable.h | 6 +- .../config/route/v3/route_components.upb.h | 433 ++++++++++++- .../route/v3/route_components.upb_minitable.c | 462 ++++++++------ .../route/v3/route_components.upb_minitable.h | 61 +- .../envoy/config/route/v3/scoped_route.upb.h | 12 +- .../route/v3/scoped_route.upb_minitable.c | 17 +- .../route/v3/scoped_route.upb_minitable.h | 6 +- .../upb-gen/envoy/config/tap/v3/common.upb.h | 67 +- .../config/tap/v3/common.upb_minitable.c | 86 +-- .../config/tap/v3/common.upb_minitable.h | 15 +- .../envoy/config/trace/v3/datadog.upb.h | 7 +- .../config/trace/v3/datadog.upb_minitable.c | 14 +- .../config/trace/v3/datadog.upb_minitable.h | 5 +- .../envoy/config/trace/v3/dynamic_ot.upb.h | 5 +- .../trace/v3/dynamic_ot.upb_minitable.c | 9 +- .../trace/v3/dynamic_ot.upb_minitable.h | 4 +- .../envoy/config/trace/v3/http_tracer.upb.h | 7 +- .../trace/v3/http_tracer.upb_minitable.c | 14 +- .../trace/v3/http_tracer.upb_minitable.h | 5 +- .../envoy/config/trace/v3/lightstep.upb.h | 5 +- .../config/trace/v3/lightstep.upb_minitable.c | 9 +- .../config/trace/v3/lightstep.upb_minitable.h | 4 +- .../envoy/config/trace/v3/opencensus.upb.h | 9 +- .../trace/v3/opencensus.upb_minitable.c | 13 +- .../trace/v3/opencensus.upb_minitable.h | 4 +- .../envoy/config/trace/v3/opentelemetry.upb.h | 14 +- .../trace/v3/opentelemetry.upb_minitable.c | 15 +- .../trace/v3/opentelemetry.upb_minitable.h | 4 +- .../envoy/config/trace/v3/service.upb.h | 5 +- .../config/trace/v3/service.upb_minitable.c | 9 +- .../config/trace/v3/service.upb_minitable.h | 4 +- .../envoy/config/trace/v3/skywalking.upb.h | 9 +- .../trace/v3/skywalking.upb_minitable.c | 16 +- .../trace/v3/skywalking.upb_minitable.h | 5 +- .../upb-gen/envoy/config/trace/v3/trace.upb.h | 3 +- .../config/trace/v3/trace.upb_minitable.c | 4 +- .../config/trace/v3/trace.upb_minitable.h | 3 +- .../upb-gen/envoy/config/trace/v3/xray.upb.h | 11 +- .../config/trace/v3/xray.upb_minitable.c | 18 +- .../config/trace/v3/xray.upb_minitable.h | 5 +- .../envoy/config/trace/v3/zipkin.upb.h | 5 +- .../config/trace/v3/zipkin.upb_minitable.c | 9 +- .../config/trace/v3/zipkin.upb_minitable.h | 4 +- .../envoy/data/accesslog/v3/accesslog.upb.h | 100 ++- .../accesslog/v3/accesslog.upb_minitable.c | 108 ++-- .../accesslog/v3/accesslog.upb_minitable.h | 19 +- .../clusters/aggregate/v3/cluster.upb.h | 3 +- .../aggregate/v3/cluster.upb_minitable.c | 5 +- .../aggregate/v3/cluster.upb_minitable.h | 4 +- .../filters/common/fault/v3/fault.upb.h | 15 +- .../common/fault/v3/fault.upb_minitable.c | 25 +- .../common/fault/v3/fault.upb_minitable.h | 8 +- .../filters/http/fault/v3/fault.upb.h | 22 +- .../http/fault/v3/fault.upb_minitable.c | 27 +- .../http/fault/v3/fault.upb_minitable.h | 6 +- .../filters/http/gcp_authn/v3/gcp_authn.upb.h | 15 +- .../gcp_authn/v3/gcp_authn.upb_minitable.c | 24 +- .../gcp_authn/v3/gcp_authn.upb_minitable.h | 7 +- .../filters/http/rbac/v3/rbac.upb.h | 13 +- .../filters/http/rbac/v3/rbac.upb_minitable.c | 20 +- .../filters/http/rbac/v3/rbac.upb_minitable.h | 5 +- .../filters/http/router/v3/router.upb.h | 19 +- .../http/router/v3/router.upb_minitable.c | 20 +- .../http/router/v3/router.upb_minitable.h | 5 +- .../v3/stateful_session.upb.h | 7 +- .../v3/stateful_session.upb_minitable.c | 14 +- .../v3/stateful_session.upb_minitable.h | 5 +- .../v3/http_connection_manager.upb.h | 179 +++++- .../http_connection_manager.upb_minitable.c | 203 +++--- .../http_connection_manager.upb_minitable.h | 24 +- .../stateful_session/cookie/v3/cookie.upb.h | 5 +- .../cookie/v3/cookie.upb_minitable.c | 9 +- .../cookie/v3/cookie.upb_minitable.h | 4 +- .../v3/client_side_weighted_round_robin.upb.h | 15 +- ..._side_weighted_round_robin.upb_minitable.c | 19 +- ..._side_weighted_round_robin.upb_minitable.h | 4 +- .../common/v3/common.upb.h | 19 +- .../common/v3/common.upb_minitable.c | 33 +- .../common/v3/common.upb_minitable.h | 8 +- .../pick_first/v3/pick_first.upb.h | 3 +- .../pick_first/v3/pick_first.upb_minitable.c | 5 +- .../pick_first/v3/pick_first.upb_minitable.h | 4 +- .../ring_hash/v3/ring_hash.upb.h | 13 +- .../ring_hash/v3/ring_hash.upb_minitable.c | 17 +- .../ring_hash/v3/ring_hash.upb_minitable.h | 4 +- .../wrr_locality/v3/wrr_locality.upb.h | 5 +- .../v3/wrr_locality.upb_minitable.c | 9 +- .../v3/wrr_locality.upb_minitable.h | 4 +- .../transport_sockets/tls/v3/cert.upb.h | 3 +- .../tls/v3/cert.upb_minitable.c | 4 +- .../tls/v3/cert.upb_minitable.h | 3 +- .../transport_sockets/tls/v3/common.upb.h | 57 +- .../tls/v3/common.upb_minitable.c | 64 +- .../tls/v3/common.upb_minitable.h | 11 +- .../transport_sockets/tls/v3/secret.upb.h | 15 +- .../tls/v3/secret.upb_minitable.c | 25 +- .../tls/v3/secret.upb_minitable.h | 6 +- .../transport_sockets/tls/v3/tls.upb.h | 75 ++- .../tls/v3/tls.upb_minitable.c | 83 +-- .../tls/v3/tls.upb_minitable.h | 10 +- .../tls/v3/tls_spiffe_validator_config.upb.h | 10 +- ...ls_spiffe_validator_config.upb_minitable.c | 14 +- ...ls_spiffe_validator_config.upb_minitable.h | 5 +- .../http/v3/http_protocol_options.upb.h | 40 +- .../v3/http_protocol_options.upb_minitable.c | 50 +- .../v3/http_protocol_options.upb_minitable.h | 7 +- .../envoy/service/discovery/v3/ads.upb.h | 3 +- .../service/discovery/v3/ads.upb_minitable.c | 5 +- .../service/discovery/v3/ads.upb_minitable.h | 4 +- .../service/discovery/v3/discovery.upb.h | 84 ++- .../discovery/v3/discovery.upb_minitable.c | 90 +-- .../discovery/v3/discovery.upb_minitable.h | 17 +- .../envoy/service/load_stats/v3/lrs.upb.h | 12 +- .../service/load_stats/v3/lrs.upb_minitable.c | 16 +- .../service/load_stats/v3/lrs.upb_minitable.h | 5 +- .../envoy/service/status/v3/csds.upb.h | 43 +- .../service/status/v3/csds.upb_minitable.c | 47 +- .../service/status/v3/csds.upb_minitable.h | 8 +- .../upb-gen/envoy/type/http/v3/cookie.upb.h | 5 +- .../envoy/type/http/v3/cookie.upb_minitable.c | 9 +- .../envoy/type/http/v3/cookie.upb_minitable.h | 4 +- .../type/http/v3/path_transformation.upb.h | 12 +- .../v3/path_transformation.upb_minitable.c | 18 +- .../v3/path_transformation.upb_minitable.h | 7 +- .../envoy/type/matcher/v3/filter_state.upb.h | 5 +- .../matcher/v3/filter_state.upb_minitable.c | 9 +- .../matcher/v3/filter_state.upb_minitable.h | 4 +- .../envoy/type/matcher/v3/http_inputs.upb.h | 3 +- .../matcher/v3/http_inputs.upb_minitable.c | 9 +- .../matcher/v3/http_inputs.upb_minitable.h | 8 +- .../envoy/type/matcher/v3/metadata.upb.h | 10 +- .../type/matcher/v3/metadata.upb_minitable.c | 12 +- .../type/matcher/v3/metadata.upb_minitable.h | 5 +- .../upb-gen/envoy/type/matcher/v3/node.upb.h | 10 +- .../type/matcher/v3/node.upb_minitable.c | 11 +- .../type/matcher/v3/node.upb_minitable.h | 4 +- .../envoy/type/matcher/v3/number.upb.h | 5 +- .../type/matcher/v3/number.upb_minitable.c | 9 +- .../type/matcher/v3/number.upb_minitable.h | 4 +- .../upb-gen/envoy/type/matcher/v3/path.upb.h | 5 +- .../type/matcher/v3/path.upb_minitable.c | 9 +- .../type/matcher/v3/path.upb_minitable.h | 4 +- .../upb-gen/envoy/type/matcher/v3/regex.upb.h | 9 +- .../type/matcher/v3/regex.upb_minitable.c | 19 +- .../type/matcher/v3/regex.upb_minitable.h | 6 +- .../type/matcher/v3/status_code_input.upb.h | 3 +- .../v3/status_code_input.upb_minitable.c | 6 +- .../v3/status_code_input.upb_minitable.h | 5 +- .../envoy/type/matcher/v3/string.upb.h | 12 +- .../type/matcher/v3/string.upb_minitable.c | 16 +- .../type/matcher/v3/string.upb_minitable.h | 5 +- .../envoy/type/matcher/v3/struct.upb.h | 10 +- .../type/matcher/v3/struct.upb_minitable.c | 12 +- .../type/matcher/v3/struct.upb_minitable.h | 5 +- .../upb-gen/envoy/type/matcher/v3/value.upb.h | 20 +- .../type/matcher/v3/value.upb_minitable.c | 28 +- .../type/matcher/v3/value.upb_minitable.h | 7 +- .../envoy/type/metadata/v3/metadata.upb.h | 16 +- .../type/metadata/v3/metadata.upb_minitable.c | 25 +- .../type/metadata/v3/metadata.upb_minitable.h | 10 +- .../envoy/type/tracing/v3/custom_tag.upb.h | 15 +- .../tracing/v3/custom_tag.upb_minitable.c | 25 +- .../tracing/v3/custom_tag.upb_minitable.h | 8 +- .../upb-gen/envoy/type/v3/hash_policy.upb.h | 7 +- .../envoy/type/v3/hash_policy.upb_minitable.c | 13 +- .../envoy/type/v3/hash_policy.upb_minitable.h | 6 +- src/core/ext/upb-gen/envoy/type/v3/http.upb.h | 3 +- .../envoy/type/v3/http.upb_minitable.c | 4 +- .../envoy/type/v3/http.upb_minitable.h | 3 +- .../upb-gen/envoy/type/v3/http_status.upb.h | 3 +- .../envoy/type/v3/http_status.upb_minitable.c | 5 +- .../envoy/type/v3/http_status.upb_minitable.h | 4 +- .../ext/upb-gen/envoy/type/v3/percent.upb.h | 3 +- .../envoy/type/v3/percent.upb_minitable.c | 6 +- .../envoy/type/v3/percent.upb_minitable.h | 5 +- .../ext/upb-gen/envoy/type/v3/range.upb.h | 3 +- .../envoy/type/v3/range.upb_minitable.c | 7 +- .../envoy/type/v3/range.upb_minitable.h | 6 +- .../envoy/type/v3/ratelimit_strategy.upb.h | 7 +- .../v3/ratelimit_strategy.upb_minitable.c | 12 +- .../v3/ratelimit_strategy.upb_minitable.h | 5 +- .../envoy/type/v3/ratelimit_unit.upb.h | 3 +- .../type/v3/ratelimit_unit.upb_minitable.c | 4 +- .../type/v3/ratelimit_unit.upb_minitable.h | 3 +- .../envoy/type/v3/semantic_version.upb.h | 3 +- .../type/v3/semantic_version.upb_minitable.c | 5 +- .../type/v3/semantic_version.upb_minitable.h | 4 +- .../upb-gen/envoy/type/v3/token_bucket.upb.h | 7 +- .../type/v3/token_bucket.upb_minitable.c | 11 +- .../type/v3/token_bucket.upb_minitable.h | 4 +- .../ext/upb-gen/google/api/annotations.upb.h | 3 +- .../google/api/annotations.upb_minitable.c | 5 +- .../google/api/annotations.upb_minitable.h | 3 +- .../google/api/expr/v1alpha1/checked.upb.h | 85 ++- .../api/expr/v1alpha1/checked.upb_minitable.c | 97 +-- .../api/expr/v1alpha1/checked.upb_minitable.h | 16 +- .../google/api/expr/v1alpha1/syntax.upb.h | 83 ++- .../api/expr/v1alpha1/syntax.upb_minitable.c | 100 +-- .../api/expr/v1alpha1/syntax.upb_minitable.h | 19 +- src/core/ext/upb-gen/google/api/http.upb.h | 15 +- .../upb-gen/google/api/http.upb_minitable.c | 17 +- .../upb-gen/google/api/http.upb_minitable.h | 6 +- .../ext/upb-gen/google/api/httpbody.upb.h | 8 +- .../google/api/httpbody.upb_minitable.c | 9 +- .../google/api/httpbody.upb_minitable.h | 4 +- .../ext/upb-gen/google/protobuf/any.upb.h | 3 +- .../google/protobuf/any.upb_minitable.c | 5 +- .../google/protobuf/any.upb_minitable.h | 4 +- .../upb-gen/google/protobuf/descriptor.upb.h | 199 +++++- .../protobuf/descriptor.upb_minitable.c | 271 ++++---- .../protobuf/descriptor.upb_minitable.h | 36 +- .../upb-gen/google/protobuf/duration.upb.h | 3 +- .../google/protobuf/duration.upb_minitable.c | 5 +- .../google/protobuf/duration.upb_minitable.h | 4 +- .../ext/upb-gen/google/protobuf/empty.upb.h | 3 +- .../google/protobuf/empty.upb_minitable.c | 5 +- .../google/protobuf/empty.upb_minitable.h | 4 +- .../ext/upb-gen/google/protobuf/struct.upb.h | 24 +- .../google/protobuf/struct.upb_minitable.c | 26 +- .../google/protobuf/struct.upb_minitable.h | 7 +- .../upb-gen/google/protobuf/timestamp.upb.h | 3 +- .../google/protobuf/timestamp.upb_minitable.c | 5 +- .../google/protobuf/timestamp.upb_minitable.h | 4 +- .../upb-gen/google/protobuf/wrappers.upb.h | 3 +- .../google/protobuf/wrappers.upb_minitable.c | 13 +- .../google/protobuf/wrappers.upb_minitable.h | 12 +- src/core/ext/upb-gen/google/rpc/status.upb.h | 8 +- .../upb-gen/google/rpc/status.upb_minitable.c | 9 +- .../upb-gen/google/rpc/status.upb_minitable.h | 4 +- .../proto/trace/v1/trace_config.upb.h | 9 +- .../trace/v1/trace_config.upb_minitable.c | 16 +- .../trace/v1/trace_config.upb_minitable.h | 7 +- .../src/proto/grpc/gcp/altscontext.upb.h | 11 +- .../grpc/gcp/altscontext.upb_minitable.c | 12 +- .../grpc/gcp/altscontext.upb_minitable.h | 5 +- .../src/proto/grpc/gcp/handshaker.upb.h | 61 +- .../proto/grpc/gcp/handshaker.upb_minitable.c | 72 ++- .../proto/grpc/gcp/handshaker.upb_minitable.h | 15 +- .../grpc/gcp/transport_security_common.upb.h | 7 +- .../transport_security_common.upb_minitable.c | 12 +- .../transport_security_common.upb_minitable.h | 5 +- .../src/proto/grpc/health/v1/health.upb.h | 3 +- .../grpc/health/v1/health.upb_minitable.c | 6 +- .../grpc/health/v1/health.upb_minitable.h | 5 +- .../src/proto/grpc/lb/v1/load_balancer.upb.h | 27 +- .../grpc/lb/v1/load_balancer.upb_minitable.c | 41 +- .../grpc/lb/v1/load_balancer.upb_minitable.h | 12 +- .../src/proto/grpc/lookup/v1/rls.upb.h | 9 +- .../proto/grpc/lookup/v1/rls.upb_minitable.c | 11 +- .../proto/grpc/lookup/v1/rls.upb_minitable.h | 6 +- .../src/proto/grpc/lookup/v1/rls_config.upb.h | 55 +- .../grpc/lookup/v1/rls_config.upb_minitable.c | 47 +- .../grpc/lookup/v1/rls_config.upb_minitable.h | 12 +- .../upb-gen/udpa/annotations/migrate.upb.h | 3 +- .../udpa/annotations/migrate.upb_minitable.c | 24 +- .../udpa/annotations/migrate.upb_minitable.h | 6 +- .../upb-gen/udpa/annotations/security.upb.h | 3 +- .../udpa/annotations/security.upb_minitable.c | 14 +- .../udpa/annotations/security.upb_minitable.h | 4 +- .../upb-gen/udpa/annotations/sensitive.upb.h | 3 +- .../annotations/sensitive.upb_minitable.c | 5 +- .../annotations/sensitive.upb_minitable.h | 3 +- .../ext/upb-gen/udpa/annotations/status.upb.h | 3 +- .../udpa/annotations/status.upb_minitable.c | 14 +- .../udpa/annotations/status.upb_minitable.h | 4 +- .../upb-gen/udpa/annotations/versioning.upb.h | 3 +- .../annotations/versioning.upb_minitable.c | 14 +- .../annotations/versioning.upb_minitable.h | 4 +- src/core/ext/upb-gen/validate/validate.upb.h | 85 ++- .../upb-gen/validate/validate.upb_minitable.c | 189 +++--- .../upb-gen/validate/validate.upb_minitable.h | 26 +- .../upb-gen/xds/annotations/v3/migrate.upb.h | 3 +- .../annotations/v3/migrate.upb_minitable.c | 24 +- .../annotations/v3/migrate.upb_minitable.h | 6 +- .../upb-gen/xds/annotations/v3/security.upb.h | 3 +- .../annotations/v3/security.upb_minitable.c | 14 +- .../annotations/v3/security.upb_minitable.h | 4 +- .../xds/annotations/v3/sensitive.upb.h | 3 +- .../annotations/v3/sensitive.upb_minitable.c | 5 +- .../annotations/v3/sensitive.upb_minitable.h | 3 +- .../upb-gen/xds/annotations/v3/status.upb.h | 3 +- .../xds/annotations/v3/status.upb_minitable.c | 25 +- .../xds/annotations/v3/status.upb_minitable.h | 7 +- .../xds/annotations/v3/versioning.upb.h | 3 +- .../annotations/v3/versioning.upb_minitable.c | 14 +- .../annotations/v3/versioning.upb_minitable.h | 4 +- .../ext/upb-gen/xds/core/v3/authority.upb.h | 3 +- .../xds/core/v3/authority.upb_minitable.c | 5 +- .../xds/core/v3/authority.upb_minitable.h | 4 +- src/core/ext/upb-gen/xds/core/v3/cidr.upb.h | 5 +- .../upb-gen/xds/core/v3/cidr.upb_minitable.c | 9 +- .../upb-gen/xds/core/v3/cidr.upb_minitable.h | 4 +- .../xds/core/v3/collection_entry.upb.h | 9 +- .../core/v3/collection_entry.upb_minitable.c | 16 +- .../core/v3/collection_entry.upb_minitable.h | 5 +- .../upb-gen/xds/core/v3/context_params.upb.h | 9 +- .../core/v3/context_params.upb_minitable.c | 10 +- .../core/v3/context_params.upb_minitable.h | 5 +- .../ext/upb-gen/xds/core/v3/extension.upb.h | 5 +- .../xds/core/v3/extension.upb_minitable.c | 9 +- .../xds/core/v3/extension.upb_minitable.h | 4 +- .../ext/upb-gen/xds/core/v3/resource.upb.h | 7 +- .../xds/core/v3/resource.upb_minitable.c | 11 +- .../xds/core/v3/resource.upb_minitable.h | 4 +- .../xds/core/v3/resource_locator.upb.h | 12 +- .../core/v3/resource_locator.upb_minitable.c | 16 +- .../core/v3/resource_locator.upb_minitable.h | 5 +- .../upb-gen/xds/core/v3/resource_name.upb.h | 5 +- .../xds/core/v3/resource_name.upb_minitable.c | 9 +- .../xds/core/v3/resource_name.upb_minitable.h | 4 +- .../xds/data/orca/v3/orca_load_report.upb.h | 21 +- .../orca/v3/orca_load_report.upb_minitable.c | 16 +- .../orca/v3/orca_load_report.upb_minitable.h | 7 +- .../upb-gen/xds/service/orca/v3/orca.upb.h | 5 +- .../xds/service/orca/v3/orca.upb_minitable.c | 9 +- .../xds/service/orca/v3/orca.upb_minitable.h | 4 +- .../ext/upb-gen/xds/type/matcher/v3/cel.upb.h | 5 +- .../xds/type/matcher/v3/cel.upb_minitable.c | 9 +- .../xds/type/matcher/v3/cel.upb_minitable.h | 4 +- .../upb-gen/xds/type/matcher/v3/domain.upb.h | 10 +- .../type/matcher/v3/domain.upb_minitable.c | 14 +- .../type/matcher/v3/domain.upb_minitable.h | 5 +- .../xds/type/matcher/v3/http_inputs.upb.h | 3 +- .../matcher/v3/http_inputs.upb_minitable.c | 5 +- .../matcher/v3/http_inputs.upb_minitable.h | 4 +- .../ext/upb-gen/xds/type/matcher/v3/ip.upb.h | 15 +- .../xds/type/matcher/v3/ip.upb_minitable.c | 16 +- .../xds/type/matcher/v3/ip.upb_minitable.h | 5 +- .../upb-gen/xds/type/matcher/v3/matcher.upb.h | 61 +- .../type/matcher/v3/matcher.upb_minitable.c | 78 ++- .../type/matcher/v3/matcher.upb_minitable.h | 13 +- .../upb-gen/xds/type/matcher/v3/range.upb.h | 39 +- .../xds/type/matcher/v3/range.upb_minitable.c | 40 +- .../xds/type/matcher/v3/range.upb_minitable.h | 9 +- .../upb-gen/xds/type/matcher/v3/regex.upb.h | 5 +- .../xds/type/matcher/v3/regex.upb_minitable.c | 10 +- .../xds/type/matcher/v3/regex.upb_minitable.h | 5 +- .../upb-gen/xds/type/matcher/v3/string.upb.h | 10 +- .../type/matcher/v3/string.upb_minitable.c | 14 +- .../type/matcher/v3/string.upb_minitable.h | 5 +- src/core/ext/upb-gen/xds/type/v3/cel.upb.h | 11 +- .../upb-gen/xds/type/v3/cel.upb_minitable.c | 18 +- .../upb-gen/xds/type/v3/cel.upb_minitable.h | 5 +- src/core/ext/upb-gen/xds/type/v3/range.upb.h | 3 +- .../upb-gen/xds/type/v3/range.upb_minitable.c | 7 +- .../upb-gen/xds/type/v3/range.upb_minitable.h | 6 +- .../upb-gen/xds/type/v3/typed_struct.upb.h | 5 +- .../xds/type/v3/typed_struct.upb_minitable.c | 9 +- .../xds/type/v3/typed_struct.upb_minitable.h | 4 +- .../envoy/admin/v3/certs.upbdefs.c | 3 +- .../envoy/admin/v3/certs.upbdefs.h | 3 +- .../envoy/admin/v3/clusters.upbdefs.c | 3 +- .../envoy/admin/v3/clusters.upbdefs.h | 3 +- .../envoy/admin/v3/config_dump.upbdefs.c | 3 +- .../envoy/admin/v3/config_dump.upbdefs.h | 3 +- .../admin/v3/config_dump_shared.upbdefs.c | 3 +- .../admin/v3/config_dump_shared.upbdefs.h | 3 +- .../envoy/admin/v3/init_dump.upbdefs.c | 3 +- .../envoy/admin/v3/init_dump.upbdefs.h | 3 +- .../envoy/admin/v3/listeners.upbdefs.c | 3 +- .../envoy/admin/v3/listeners.upbdefs.h | 3 +- .../envoy/admin/v3/memory.upbdefs.c | 3 +- .../envoy/admin/v3/memory.upbdefs.h | 3 +- .../envoy/admin/v3/metrics.upbdefs.c | 3 +- .../envoy/admin/v3/metrics.upbdefs.h | 3 +- .../envoy/admin/v3/mutex_stats.upbdefs.c | 3 +- .../envoy/admin/v3/mutex_stats.upbdefs.h | 3 +- .../envoy/admin/v3/server_info.upbdefs.c | 3 +- .../envoy/admin/v3/server_info.upbdefs.h | 3 +- .../upbdefs-gen/envoy/admin/v3/tap.upbdefs.c | 3 +- .../upbdefs-gen/envoy/admin/v3/tap.upbdefs.h | 3 +- .../envoy/annotations/deprecation.upbdefs.c | 3 +- .../envoy/annotations/deprecation.upbdefs.h | 3 +- .../envoy/annotations/resource.upbdefs.c | 3 +- .../envoy/annotations/resource.upbdefs.h | 3 +- .../config/accesslog/v3/accesslog.upbdefs.c | 3 +- .../config/accesslog/v3/accesslog.upbdefs.h | 3 +- .../config/bootstrap/v3/bootstrap.upbdefs.c | 3 +- .../config/bootstrap/v3/bootstrap.upbdefs.h | 3 +- .../cluster/v3/circuit_breaker.upbdefs.c | 3 +- .../cluster/v3/circuit_breaker.upbdefs.h | 3 +- .../envoy/config/cluster/v3/cluster.upbdefs.c | 3 +- .../envoy/config/cluster/v3/cluster.upbdefs.h | 3 +- .../envoy/config/cluster/v3/filter.upbdefs.c | 3 +- .../envoy/config/cluster/v3/filter.upbdefs.h | 3 +- .../cluster/v3/outlier_detection.upbdefs.c | 3 +- .../cluster/v3/outlier_detection.upbdefs.h | 3 +- .../common/matcher/v3/matcher.upbdefs.c | 3 +- .../common/matcher/v3/matcher.upbdefs.h | 3 +- .../envoy/config/core/v3/address.upbdefs.c | 3 +- .../envoy/config/core/v3/address.upbdefs.h | 3 +- .../envoy/config/core/v3/backoff.upbdefs.c | 3 +- .../envoy/config/core/v3/backoff.upbdefs.h | 3 +- .../envoy/config/core/v3/base.upbdefs.c | 3 +- .../envoy/config/core/v3/base.upbdefs.h | 3 +- .../config/core/v3/config_source.upbdefs.c | 3 +- .../config/core/v3/config_source.upbdefs.h | 3 +- .../core/v3/event_service_config.upbdefs.c | 3 +- .../core/v3/event_service_config.upbdefs.h | 3 +- .../envoy/config/core/v3/extension.upbdefs.c | 3 +- .../envoy/config/core/v3/extension.upbdefs.h | 3 +- .../config/core/v3/grpc_method_list.upbdefs.c | 3 +- .../config/core/v3/grpc_method_list.upbdefs.h | 3 +- .../config/core/v3/grpc_service.upbdefs.c | 3 +- .../config/core/v3/grpc_service.upbdefs.h | 3 +- .../config/core/v3/health_check.upbdefs.c | 3 +- .../config/core/v3/health_check.upbdefs.h | 3 +- .../config/core/v3/http_service.upbdefs.c | 3 +- .../config/core/v3/http_service.upbdefs.h | 3 +- .../envoy/config/core/v3/http_uri.upbdefs.c | 3 +- .../envoy/config/core/v3/http_uri.upbdefs.h | 3 +- .../envoy/config/core/v3/protocol.upbdefs.c | 3 +- .../envoy/config/core/v3/protocol.upbdefs.h | 3 +- .../config/core/v3/proxy_protocol.upbdefs.c | 3 +- .../config/core/v3/proxy_protocol.upbdefs.h | 3 +- .../envoy/config/core/v3/resolver.upbdefs.c | 3 +- .../envoy/config/core/v3/resolver.upbdefs.h | 3 +- .../config/core/v3/socket_option.upbdefs.c | 3 +- .../config/core/v3/socket_option.upbdefs.h | 3 +- .../v3/substitution_format_string.upbdefs.c | 3 +- .../v3/substitution_format_string.upbdefs.h | 3 +- .../core/v3/udp_socket_config.upbdefs.c | 3 +- .../core/v3/udp_socket_config.upbdefs.h | 3 +- .../config/endpoint/v3/endpoint.upbdefs.c | 3 +- .../config/endpoint/v3/endpoint.upbdefs.h | 3 +- .../endpoint/v3/endpoint_components.upbdefs.c | 3 +- .../endpoint/v3/endpoint_components.upbdefs.h | 3 +- .../config/endpoint/v3/load_report.upbdefs.c | 3 +- .../config/endpoint/v3/load_report.upbdefs.h | 3 +- .../config/listener/v3/api_listener.upbdefs.c | 3 +- .../config/listener/v3/api_listener.upbdefs.h | 3 +- .../config/listener/v3/listener.upbdefs.c | 3 +- .../config/listener/v3/listener.upbdefs.h | 3 +- .../listener/v3/listener_components.upbdefs.c | 3 +- .../listener/v3/listener_components.upbdefs.h | 3 +- .../config/listener/v3/quic_config.upbdefs.c | 3 +- .../config/listener/v3/quic_config.upbdefs.h | 3 +- .../listener/v3/udp_listener_config.upbdefs.c | 3 +- .../listener/v3/udp_listener_config.upbdefs.h | 3 +- .../metrics/v3/metrics_service.upbdefs.c | 3 +- .../metrics/v3/metrics_service.upbdefs.h | 3 +- .../envoy/config/metrics/v3/stats.upbdefs.c | 3 +- .../envoy/config/metrics/v3/stats.upbdefs.h | 3 +- .../config/overload/v3/overload.upbdefs.c | 3 +- .../config/overload/v3/overload.upbdefs.h | 3 +- .../envoy/config/rbac/v3/rbac.upbdefs.c | 3 +- .../envoy/config/rbac/v3/rbac.upbdefs.h | 3 +- .../envoy/config/route/v3/route.upbdefs.c | 3 +- .../envoy/config/route/v3/route.upbdefs.h | 3 +- .../route/v3/route_components.upbdefs.c | 3 +- .../route/v3/route_components.upbdefs.h | 3 +- .../config/route/v3/scoped_route.upbdefs.c | 3 +- .../config/route/v3/scoped_route.upbdefs.h | 3 +- .../envoy/config/tap/v3/common.upbdefs.c | 3 +- .../envoy/config/tap/v3/common.upbdefs.h | 3 +- .../envoy/config/trace/v3/datadog.upbdefs.c | 3 +- .../envoy/config/trace/v3/datadog.upbdefs.h | 3 +- .../config/trace/v3/dynamic_ot.upbdefs.c | 3 +- .../config/trace/v3/dynamic_ot.upbdefs.h | 3 +- .../config/trace/v3/http_tracer.upbdefs.c | 3 +- .../config/trace/v3/http_tracer.upbdefs.h | 3 +- .../envoy/config/trace/v3/lightstep.upbdefs.c | 3 +- .../envoy/config/trace/v3/lightstep.upbdefs.h | 3 +- .../config/trace/v3/opencensus.upbdefs.c | 3 +- .../config/trace/v3/opencensus.upbdefs.h | 3 +- .../config/trace/v3/opentelemetry.upbdefs.c | 3 +- .../config/trace/v3/opentelemetry.upbdefs.h | 3 +- .../envoy/config/trace/v3/service.upbdefs.c | 3 +- .../envoy/config/trace/v3/service.upbdefs.h | 3 +- .../config/trace/v3/skywalking.upbdefs.c | 3 +- .../config/trace/v3/skywalking.upbdefs.h | 3 +- .../envoy/config/trace/v3/trace.upbdefs.c | 3 +- .../envoy/config/trace/v3/trace.upbdefs.h | 3 +- .../envoy/config/trace/v3/xray.upbdefs.c | 3 +- .../envoy/config/trace/v3/xray.upbdefs.h | 3 +- .../envoy/config/trace/v3/zipkin.upbdefs.c | 3 +- .../envoy/config/trace/v3/zipkin.upbdefs.h | 3 +- .../data/accesslog/v3/accesslog.upbdefs.c | 3 +- .../data/accesslog/v3/accesslog.upbdefs.h | 3 +- .../clusters/aggregate/v3/cluster.upbdefs.c | 3 +- .../clusters/aggregate/v3/cluster.upbdefs.h | 3 +- .../filters/common/fault/v3/fault.upbdefs.c | 3 +- .../filters/common/fault/v3/fault.upbdefs.h | 3 +- .../filters/http/fault/v3/fault.upbdefs.c | 3 +- .../filters/http/fault/v3/fault.upbdefs.h | 3 +- .../http/gcp_authn/v3/gcp_authn.upbdefs.c | 3 +- .../http/gcp_authn/v3/gcp_authn.upbdefs.h | 3 +- .../filters/http/rbac/v3/rbac.upbdefs.c | 3 +- .../filters/http/rbac/v3/rbac.upbdefs.h | 3 +- .../filters/http/router/v3/router.upbdefs.c | 3 +- .../filters/http/router/v3/router.upbdefs.h | 3 +- .../v3/stateful_session.upbdefs.c | 3 +- .../v3/stateful_session.upbdefs.h | 3 +- .../v3/http_connection_manager.upbdefs.c | 3 +- .../v3/http_connection_manager.upbdefs.h | 3 +- .../cookie/v3/cookie.upbdefs.c | 3 +- .../cookie/v3/cookie.upbdefs.h | 3 +- .../transport_sockets/tls/v3/cert.upbdefs.c | 3 +- .../transport_sockets/tls/v3/cert.upbdefs.h | 3 +- .../transport_sockets/tls/v3/common.upbdefs.c | 3 +- .../transport_sockets/tls/v3/common.upbdefs.h | 3 +- .../transport_sockets/tls/v3/secret.upbdefs.c | 3 +- .../transport_sockets/tls/v3/secret.upbdefs.h | 3 +- .../transport_sockets/tls/v3/tls.upbdefs.c | 3 +- .../transport_sockets/tls/v3/tls.upbdefs.h | 3 +- .../v3/tls_spiffe_validator_config.upbdefs.c | 3 +- .../v3/tls_spiffe_validator_config.upbdefs.h | 3 +- .../http/v3/http_protocol_options.upbdefs.c | 3 +- .../http/v3/http_protocol_options.upbdefs.h | 3 +- .../envoy/service/discovery/v3/ads.upbdefs.c | 3 +- .../envoy/service/discovery/v3/ads.upbdefs.h | 3 +- .../service/discovery/v3/discovery.upbdefs.c | 3 +- .../service/discovery/v3/discovery.upbdefs.h | 3 +- .../envoy/service/load_stats/v3/lrs.upbdefs.c | 3 +- .../envoy/service/load_stats/v3/lrs.upbdefs.h | 3 +- .../envoy/service/status/v3/csds.upbdefs.c | 3 +- .../envoy/service/status/v3/csds.upbdefs.h | 3 +- .../envoy/type/http/v3/cookie.upbdefs.c | 3 +- .../envoy/type/http/v3/cookie.upbdefs.h | 3 +- .../http/v3/path_transformation.upbdefs.c | 3 +- .../http/v3/path_transformation.upbdefs.h | 3 +- .../type/matcher/v3/filter_state.upbdefs.c | 3 +- .../type/matcher/v3/filter_state.upbdefs.h | 3 +- .../type/matcher/v3/http_inputs.upbdefs.c | 3 +- .../type/matcher/v3/http_inputs.upbdefs.h | 3 +- .../envoy/type/matcher/v3/metadata.upbdefs.c | 3 +- .../envoy/type/matcher/v3/metadata.upbdefs.h | 3 +- .../envoy/type/matcher/v3/node.upbdefs.c | 3 +- .../envoy/type/matcher/v3/node.upbdefs.h | 3 +- .../envoy/type/matcher/v3/number.upbdefs.c | 3 +- .../envoy/type/matcher/v3/number.upbdefs.h | 3 +- .../envoy/type/matcher/v3/path.upbdefs.c | 3 +- .../envoy/type/matcher/v3/path.upbdefs.h | 3 +- .../envoy/type/matcher/v3/regex.upbdefs.c | 3 +- .../envoy/type/matcher/v3/regex.upbdefs.h | 3 +- .../matcher/v3/status_code_input.upbdefs.c | 3 +- .../matcher/v3/status_code_input.upbdefs.h | 3 +- .../envoy/type/matcher/v3/string.upbdefs.c | 3 +- .../envoy/type/matcher/v3/string.upbdefs.h | 3 +- .../envoy/type/matcher/v3/struct.upbdefs.c | 3 +- .../envoy/type/matcher/v3/struct.upbdefs.h | 3 +- .../envoy/type/matcher/v3/value.upbdefs.c | 3 +- .../envoy/type/matcher/v3/value.upbdefs.h | 3 +- .../envoy/type/metadata/v3/metadata.upbdefs.c | 3 +- .../envoy/type/metadata/v3/metadata.upbdefs.h | 3 +- .../type/tracing/v3/custom_tag.upbdefs.c | 3 +- .../type/tracing/v3/custom_tag.upbdefs.h | 3 +- .../envoy/type/v3/hash_policy.upbdefs.c | 3 +- .../envoy/type/v3/hash_policy.upbdefs.h | 3 +- .../upbdefs-gen/envoy/type/v3/http.upbdefs.c | 3 +- .../upbdefs-gen/envoy/type/v3/http.upbdefs.h | 3 +- .../envoy/type/v3/http_status.upbdefs.c | 3 +- .../envoy/type/v3/http_status.upbdefs.h | 3 +- .../envoy/type/v3/percent.upbdefs.c | 3 +- .../envoy/type/v3/percent.upbdefs.h | 3 +- .../upbdefs-gen/envoy/type/v3/range.upbdefs.c | 3 +- .../upbdefs-gen/envoy/type/v3/range.upbdefs.h | 3 +- .../type/v3/ratelimit_strategy.upbdefs.c | 3 +- .../type/v3/ratelimit_strategy.upbdefs.h | 3 +- .../envoy/type/v3/ratelimit_unit.upbdefs.c | 3 +- .../envoy/type/v3/ratelimit_unit.upbdefs.h | 3 +- .../envoy/type/v3/semantic_version.upbdefs.c | 3 +- .../envoy/type/v3/semantic_version.upbdefs.h | 3 +- .../envoy/type/v3/token_bucket.upbdefs.c | 3 +- .../envoy/type/v3/token_bucket.upbdefs.h | 3 +- .../google/api/annotations.upbdefs.c | 3 +- .../google/api/annotations.upbdefs.h | 3 +- .../api/expr/v1alpha1/checked.upbdefs.c | 3 +- .../api/expr/v1alpha1/checked.upbdefs.h | 3 +- .../google/api/expr/v1alpha1/syntax.upbdefs.c | 3 +- .../google/api/expr/v1alpha1/syntax.upbdefs.h | 3 +- .../ext/upbdefs-gen/google/api/http.upbdefs.c | 3 +- .../ext/upbdefs-gen/google/api/http.upbdefs.h | 3 +- .../upbdefs-gen/google/api/httpbody.upbdefs.c | 3 +- .../upbdefs-gen/google/api/httpbody.upbdefs.h | 3 +- .../upbdefs-gen/google/protobuf/any.upbdefs.c | 3 +- .../upbdefs-gen/google/protobuf/any.upbdefs.h | 3 +- .../google/protobuf/descriptor.upbdefs.c | 15 +- .../google/protobuf/descriptor.upbdefs.h | 3 +- .../google/protobuf/duration.upbdefs.c | 3 +- .../google/protobuf/duration.upbdefs.h | 3 +- .../google/protobuf/empty.upbdefs.c | 3 +- .../google/protobuf/empty.upbdefs.h | 3 +- .../google/protobuf/struct.upbdefs.c | 3 +- .../google/protobuf/struct.upbdefs.h | 3 +- .../google/protobuf/timestamp.upbdefs.c | 3 +- .../google/protobuf/timestamp.upbdefs.h | 3 +- .../google/protobuf/wrappers.upbdefs.c | 3 +- .../google/protobuf/wrappers.upbdefs.h | 3 +- .../upbdefs-gen/google/rpc/status.upbdefs.c | 3 +- .../upbdefs-gen/google/rpc/status.upbdefs.h | 3 +- .../proto/trace/v1/trace_config.upbdefs.c | 3 +- .../proto/trace/v1/trace_config.upbdefs.h | 3 +- .../proto/grpc/lookup/v1/rls_config.upbdefs.c | 3 +- .../proto/grpc/lookup/v1/rls_config.upbdefs.h | 3 +- .../udpa/annotations/migrate.upbdefs.c | 3 +- .../udpa/annotations/migrate.upbdefs.h | 3 +- .../udpa/annotations/security.upbdefs.c | 3 +- .../udpa/annotations/security.upbdefs.h | 3 +- .../udpa/annotations/sensitive.upbdefs.c | 3 +- .../udpa/annotations/sensitive.upbdefs.h | 3 +- .../udpa/annotations/status.upbdefs.c | 3 +- .../udpa/annotations/status.upbdefs.h | 3 +- .../udpa/annotations/versioning.upbdefs.c | 3 +- .../udpa/annotations/versioning.upbdefs.h | 3 +- .../upbdefs-gen/validate/validate.upbdefs.c | 3 +- .../upbdefs-gen/validate/validate.upbdefs.h | 3 +- .../xds/annotations/v3/migrate.upbdefs.c | 3 +- .../xds/annotations/v3/migrate.upbdefs.h | 3 +- .../xds/annotations/v3/security.upbdefs.c | 3 +- .../xds/annotations/v3/security.upbdefs.h | 3 +- .../xds/annotations/v3/sensitive.upbdefs.c | 3 +- .../xds/annotations/v3/sensitive.upbdefs.h | 3 +- .../xds/annotations/v3/status.upbdefs.c | 3 +- .../xds/annotations/v3/status.upbdefs.h | 3 +- .../xds/annotations/v3/versioning.upbdefs.c | 3 +- .../xds/annotations/v3/versioning.upbdefs.h | 3 +- .../xds/core/v3/authority.upbdefs.c | 3 +- .../xds/core/v3/authority.upbdefs.h | 3 +- .../upbdefs-gen/xds/core/v3/cidr.upbdefs.c | 3 +- .../upbdefs-gen/xds/core/v3/cidr.upbdefs.h | 3 +- .../xds/core/v3/collection_entry.upbdefs.c | 3 +- .../xds/core/v3/collection_entry.upbdefs.h | 3 +- .../xds/core/v3/context_params.upbdefs.c | 3 +- .../xds/core/v3/context_params.upbdefs.h | 3 +- .../xds/core/v3/extension.upbdefs.c | 3 +- .../xds/core/v3/extension.upbdefs.h | 3 +- .../xds/core/v3/resource.upbdefs.c | 3 +- .../xds/core/v3/resource.upbdefs.h | 3 +- .../xds/core/v3/resource_locator.upbdefs.c | 3 +- .../xds/core/v3/resource_locator.upbdefs.h | 3 +- .../xds/core/v3/resource_name.upbdefs.c | 3 +- .../xds/core/v3/resource_name.upbdefs.h | 3 +- .../xds/type/matcher/v3/cel.upbdefs.c | 3 +- .../xds/type/matcher/v3/cel.upbdefs.h | 3 +- .../xds/type/matcher/v3/domain.upbdefs.c | 3 +- .../xds/type/matcher/v3/domain.upbdefs.h | 3 +- .../xds/type/matcher/v3/http_inputs.upbdefs.c | 3 +- .../xds/type/matcher/v3/http_inputs.upbdefs.h | 3 +- .../xds/type/matcher/v3/ip.upbdefs.c | 3 +- .../xds/type/matcher/v3/ip.upbdefs.h | 3 +- .../xds/type/matcher/v3/matcher.upbdefs.c | 3 +- .../xds/type/matcher/v3/matcher.upbdefs.h | 3 +- .../xds/type/matcher/v3/range.upbdefs.c | 3 +- .../xds/type/matcher/v3/range.upbdefs.h | 3 +- .../xds/type/matcher/v3/regex.upbdefs.c | 3 +- .../xds/type/matcher/v3/regex.upbdefs.h | 3 +- .../xds/type/matcher/v3/string.upbdefs.c | 3 +- .../xds/type/matcher/v3/string.upbdefs.h | 3 +- .../ext/upbdefs-gen/xds/type/v3/cel.upbdefs.c | 3 +- .../ext/upbdefs-gen/xds/type/v3/cel.upbdefs.h | 3 +- .../upbdefs-gen/xds/type/v3/range.upbdefs.c | 3 +- .../upbdefs-gen/xds/type/v3/range.upbdefs.h | 3 +- .../xds/type/v3/typed_struct.upbdefs.c | 3 +- .../xds/type/v3/typed_struct.upbdefs.h | 3 +- src/csharp/build/dependencies.props | 2 +- .../!ProtoCompiler-gRPCCppPlugin.podspec | 2 +- .../!ProtoCompiler-gRPCPlugin.podspec | 2 +- src/objective-c/!ProtoCompiler.podspec | 2 +- src/python/grpcio/grpc_core_dependencies.py | 2 + third_party/protobuf | 2 +- third_party/protobuf.10007.patch | 30 - third_party/protobuf.patch | 2 +- third_party/upb/upb/BUILD | 4 + third_party/upb/upb/README.md | 2 +- .../cmake/google/protobuf/descriptor.upb.h | 199 +++++- .../protobuf/descriptor.upb_minitable.c | 271 ++++---- .../protobuf/descriptor.upb_minitable.h | 36 +- .../upb/upb/io/zero_copy_stream_test.cc | 35 - third_party/upb/upb/json/decode.c | 23 +- third_party/upb/upb/json/encode.c | 4 +- third_party/upb/upb/lex/BUILD | 10 + third_party/upb/upb/lex/round_trip.c | 10 + third_party/upb/upb/lex/round_trip_test.cc | 35 + third_party/upb/upb/mem/arena.c | 13 +- third_party/upb/upb/mem/arena.h | 9 + third_party/upb/upb/mem/arena.hpp | 6 +- third_party/upb/upb/mem/arena_test.cc | 26 + third_party/upb/upb/message/BUILD | 42 ++ third_party/upb/upb/message/accessors.c | 6 +- third_party/upb/upb/message/accessors.h | 553 +++++----------- third_party/upb/upb/message/accessors_test.cc | 80 ++- third_party/upb/upb/message/compare.c | 67 +- third_party/upb/upb/message/copy.c | 18 +- third_party/upb/upb/message/copy_test.cc | 6 +- .../upb/upb/message/internal/accessors.h | 597 +++++++++++++++++- .../upb/upb/message/internal/extension.c | 1 + .../upb/upb/message/internal/iterator.c | 78 +++ .../upb/upb/message/internal/iterator.h | 35 + .../upb/upb/message/internal/message.c | 21 +- .../upb/upb/message/internal/message.h | 15 +- third_party/upb/upb/message/merge.c | 38 ++ third_party/upb/upb/message/merge.h | 26 + third_party/upb/upb/message/merge_test.cc | 79 +++ third_party/upb/upb/message/message.h | 16 +- third_party/upb/upb/message/promote.c | 18 +- third_party/upb/upb/message/value.h | 26 + third_party/upb/upb/mini_descriptor/decode.c | 9 +- .../mini_descriptor/internal/encode_test.cc | 12 +- third_party/upb/upb/mini_descriptor/link.c | 10 +- .../upb/upb/mini_table/extension_registry.c | 18 + .../upb/upb/mini_table/extension_registry.h | 17 + .../upb/upb/mini_table/internal/extension.h | 9 + .../upb/upb/mini_table/internal/message.c | 22 +- .../upb/upb/mini_table/internal/message.h | 60 +- third_party/upb/upb/mini_table/internal/sub.h | 5 + third_party/upb/upb/mini_table/message.h | 12 +- third_party/upb/upb/port/def.inc | 79 ++- third_party/upb/upb/port/undef.inc | 4 + .../cmake/google/protobuf/descriptor.upb.h | 199 +++++- .../protobuf/descriptor.upb_minitable.c | 271 ++++---- .../protobuf/descriptor.upb_minitable.h | 36 +- third_party/upb/upb/reflection/def.hpp | 8 + third_party/upb/upb/reflection/field_def.c | 13 +- third_party/upb/upb/reflection/field_def.h | 1 + .../internal/upb_edition_defaults.h | 2 +- third_party/upb/upb/reflection/message.c | 11 +- third_party/upb/upb/reflection/message.h | 4 +- .../stage0/google/protobuf/descriptor.upb.h | 3 +- third_party/upb/upb/test/BUILD | 2 +- third_party/upb/upb/text/BUILD | 76 ++- third_party/upb/upb/text/debug_string.c | 235 +++++++ third_party/upb/upb/text/debug_string.h | 42 ++ third_party/upb/upb/text/encode.c | 438 ++----------- third_party/upb/upb/text/encode.h | 12 +- third_party/upb/upb/text/encode_debug_test.cc | 63 ++ third_party/upb/upb/text/internal/encode.c | 180 ++++++ third_party/upb/upb/text/internal/encode.h | 240 +++++++ third_party/upb/upb/text/options.h | 22 + third_party/upb/upb/util/def_to_proto_test.cc | 11 + third_party/upb/upb/wire/decode.c | 110 ++-- third_party/upb/upb/wire/decode.h | 3 + third_party/upb/upb/wire/encode.c | 59 +- third_party/upb/upb/wire/encode.h | 3 + .../upb/wire/eps_copy_input_stream_test.cc | 2 +- .../upb/upb/wire/internal/decode_fast.c | 3 + third_party/utf8_range/CMakeLists.txt | 4 +- tools/distrib/python/grpc_version.py | 2 +- .../python/grpcio_tools/grpc_version.py | 2 +- .../python/grpcio_tools/protoc_lib_deps.py | 4 +- .../distrib/python/xds_protos/grpc_version.py | 2 +- tools/run_tests/sanity/check_submodules.sh | 2 +- 904 files changed, 12940 insertions(+), 4328 deletions(-) delete mode 100644 third_party/protobuf.10007.patch create mode 100644 third_party/upb/upb/lex/round_trip_test.cc create mode 100644 third_party/upb/upb/message/internal/iterator.c create mode 100644 third_party/upb/upb/message/internal/iterator.h create mode 100644 third_party/upb/upb/message/merge.c create mode 100644 third_party/upb/upb/message/merge.h create mode 100644 third_party/upb/upb/message/merge_test.cc create mode 100644 third_party/upb/upb/text/debug_string.c create mode 100644 third_party/upb/upb/text/debug_string.h create mode 100644 third_party/upb/upb/text/encode_debug_test.cc create mode 100644 third_party/upb/upb/text/internal/encode.c create mode 100644 third_party/upb/upb/text/internal/encode.h create mode 100644 third_party/upb/upb/text/options.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 586898b7ec1..8d2f36a6df8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3658,6 +3658,7 @@ add_library(upb_json_lib ${_gRPC_STATIC_WIN32} third_party/upb/upb/lex/strtod.c third_party/upb/upb/lex/unicode.c third_party/upb/upb/message/copy.c + third_party/upb/upb/message/merge.c third_party/upb/upb/reflection/def_pool.c third_party/upb/upb/reflection/def_type.c third_party/upb/upb/reflection/desc_state.c @@ -3912,6 +3913,7 @@ add_library(upb_textformat_lib ${_gRPC_STATIC_WIN32} third_party/upb/upb/lex/strtod.c third_party/upb/upb/lex/unicode.c third_party/upb/upb/message/copy.c + third_party/upb/upb/message/merge.c third_party/upb/upb/reflection/def_pool.c third_party/upb/upb/reflection/def_type.c third_party/upb/upb/reflection/desc_state.c @@ -3930,6 +3932,7 @@ add_library(upb_textformat_lib ${_gRPC_STATIC_WIN32} 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/text/internal/encode.c ) target_compile_features(upb_textformat_lib PUBLIC cxx_std_14) diff --git a/Makefile b/Makefile index 2496f2c9154..08ae5d181c1 100644 --- a/Makefile +++ b/Makefile @@ -1700,6 +1700,7 @@ LIBGRPC_SRC = \ third_party/upb/upb/message/internal/message.c \ third_party/upb/upb/message/map.c \ third_party/upb/upb/message/map_sorter.c \ + third_party/upb/upb/message/merge.c \ third_party/upb/upb/message/message.c \ third_party/upb/upb/mini_descriptor/build_enum.c \ third_party/upb/upb/mini_descriptor/decode.c \ @@ -1727,6 +1728,7 @@ LIBGRPC_SRC = \ 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/text/internal/encode.c \ third_party/upb/upb/wire/decode.c \ third_party/upb/upb/wire/encode.c \ third_party/upb/upb/wire/eps_copy_input_stream.c \ diff --git a/Package.swift b/Package.swift index 26ab8a93c4e..d9411aed0ec 100644 --- a/Package.swift +++ b/Package.swift @@ -2144,6 +2144,8 @@ let package = Package( "third_party/upb/upb/message/map.h", "third_party/upb/upb/message/map_gencode_util.h", "third_party/upb/upb/message/map_sorter.c", + "third_party/upb/upb/message/merge.c", + "third_party/upb/upb/message/merge.h", "third_party/upb/upb/message/message.c", "third_party/upb/upb/message/message.h", "third_party/upb/upb/message/tagged_ptr.h", @@ -2222,6 +2224,9 @@ let package = Package( "third_party/upb/upb/reflection/service_def.h", "third_party/upb/upb/text/encode.c", "third_party/upb/upb/text/encode.h", + "third_party/upb/upb/text/internal/encode.c", + "third_party/upb/upb/text/internal/encode.h", + "third_party/upb/upb/text/options.h", "third_party/upb/upb/wire/eps_copy_input_stream.c", "third_party/upb/upb/wire/eps_copy_input_stream.h", "third_party/upb/upb/wire/internal/reader.h", diff --git a/bazel/grpc_deps.bzl b/bazel/grpc_deps.bzl index e6fbf6304d8..138ef9ed8af 100644 --- a/bazel/grpc_deps.bzl +++ b/bazel/grpc_deps.bzl @@ -58,16 +58,15 @@ def grpc_deps(): if "com_google_protobuf" not in native.existing_rules(): http_archive( name = "com_google_protobuf", - sha256 = "3ed7131962a357b35b1d55238fcc6c6a177eae766ef3e25aa916157bc6e45819", - strip_prefix = "protobuf-63def39e881afa496502d9c410f4ea948e59490d", + sha256 = "8766fce06ef41d79cb6037d04be37df3d5c493d9da92517a7243640d6389f03c", + strip_prefix = "protobuf-10ef3f77683f77fb3c059bf47725c27b3ff41e63", urls = [ - # https://github.com/protocolbuffers/protobuf/commits/v27.2 - "https://storage.googleapis.com/grpc-bazel-mirror/github.com/protocolbuffers/protobuf/archive/63def39e881afa496502d9c410f4ea948e59490d.tar.gz", - "https://github.com/protocolbuffers/protobuf/archive/63def39e881afa496502d9c410f4ea948e59490d.tar.gz", + # https://github.com/protocolbuffers/protobuf/commits/v28.1 + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/protocolbuffers/protobuf/archive/10ef3f77683f77fb3c059bf47725c27b3ff41e63.tar.gz", + "https://github.com/protocolbuffers/protobuf/archive/10ef3f77683f77fb3c059bf47725c27b3ff41e63.tar.gz", ], patches = [ "@com_github_grpc_grpc//third_party:protobuf.patch", - "@com_github_grpc_grpc//third_party:protobuf.10007.patch", ], patch_args = ["-p1"], ) diff --git a/build_autogenerated.yaml b/build_autogenerated.yaml index 3391b4d9d7a..e56a980757b 100644 --- a/build_autogenerated.yaml +++ b/build_autogenerated.yaml @@ -3301,6 +3301,7 @@ libs: - third_party/upb/upb/lex/strtod.h - third_party/upb/upb/lex/unicode.h - third_party/upb/upb/message/copy.h + - third_party/upb/upb/message/merge.h - third_party/upb/upb/reflection/common.h - third_party/upb/upb/reflection/def.h - third_party/upb/upb/reflection/def.hpp @@ -3343,6 +3344,7 @@ libs: - third_party/upb/upb/lex/strtod.c - third_party/upb/upb/lex/unicode.c - third_party/upb/upb/message/copy.c + - third_party/upb/upb/message/merge.c - third_party/upb/upb/reflection/def_pool.c - third_party/upb/upb/reflection/def_type.c - third_party/upb/upb/reflection/desc_state.c @@ -3503,6 +3505,7 @@ libs: - third_party/upb/upb/lex/strtod.h - third_party/upb/upb/lex/unicode.h - third_party/upb/upb/message/copy.h + - third_party/upb/upb/message/merge.h - third_party/upb/upb/reflection/common.h - third_party/upb/upb/reflection/def.h - third_party/upb/upb/reflection/def.hpp @@ -3538,12 +3541,15 @@ libs: - third_party/upb/upb/reflection/oneof_def.h - third_party/upb/upb/reflection/service_def.h - third_party/upb/upb/text/encode.h + - third_party/upb/upb/text/internal/encode.h + - third_party/upb/upb/text/options.h src: - third_party/upb/upb/lex/atoi.c - third_party/upb/upb/lex/round_trip.c - third_party/upb/upb/lex/strtod.c - third_party/upb/upb/lex/unicode.c - third_party/upb/upb/message/copy.c + - third_party/upb/upb/message/merge.c - third_party/upb/upb/reflection/def_pool.c - third_party/upb/upb/reflection/def_type.c - third_party/upb/upb/reflection/desc_state.c @@ -3562,6 +3568,7 @@ libs: - 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/text/internal/encode.c deps: - upb_mini_descriptor_lib - upb_wire_lib diff --git a/build_handwritten.yaml b/build_handwritten.yaml index c7d5040889f..61e73166122 100644 --- a/build_handwritten.yaml +++ b/build_handwritten.yaml @@ -15,7 +15,7 @@ settings: core_version: 44.0.0 csharp_major_version: 2 g_stands_for: groovy - protobuf_version: 3.27.2 + protobuf_version: 3.28.1 version: 1.68.0-dev configs: asan: diff --git a/config.m4 b/config.m4 index dd953b0801b..6a870a7d474 100644 --- a/config.m4 +++ b/config.m4 @@ -1362,6 +1362,7 @@ if test "$PHP_GRPC" != "no"; then third_party/upb/upb/message/internal/message.c \ third_party/upb/upb/message/map.c \ third_party/upb/upb/message/map_sorter.c \ + third_party/upb/upb/message/merge.c \ third_party/upb/upb/message/message.c \ third_party/upb/upb/mini_descriptor/build_enum.c \ third_party/upb/upb/mini_descriptor/decode.c \ @@ -1389,6 +1390,7 @@ if test "$PHP_GRPC" != "no"; then 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/text/internal/encode.c \ third_party/upb/upb/wire/decode.c \ third_party/upb/upb/wire/encode.c \ third_party/upb/upb/wire/eps_copy_input_stream.c \ @@ -1712,6 +1714,7 @@ if test "$PHP_GRPC" != "no"; then PHP_ADD_BUILD_DIR($ext_builddir/third_party/upb/upb/reflection) PHP_ADD_BUILD_DIR($ext_builddir/third_party/upb/upb/reflection/internal) PHP_ADD_BUILD_DIR($ext_builddir/third_party/upb/upb/text) + PHP_ADD_BUILD_DIR($ext_builddir/third_party/upb/upb/text/internal) PHP_ADD_BUILD_DIR($ext_builddir/third_party/upb/upb/wire) PHP_ADD_BUILD_DIR($ext_builddir/third_party/upb/upb/wire/internal) PHP_ADD_BUILD_DIR($ext_builddir/third_party/utf8_range) diff --git a/config.w32 b/config.w32 index 5a8a5d1dd3d..05a181a2cb1 100644 --- a/config.w32 +++ b/config.w32 @@ -1327,6 +1327,7 @@ if (PHP_GRPC != "no") { "third_party\\upb\\upb\\message\\internal\\message.c " + "third_party\\upb\\upb\\message\\map.c " + "third_party\\upb\\upb\\message\\map_sorter.c " + + "third_party\\upb\\upb\\message\\merge.c " + "third_party\\upb\\upb\\message\\message.c " + "third_party\\upb\\upb\\mini_descriptor\\build_enum.c " + "third_party\\upb\\upb\\mini_descriptor\\decode.c " + @@ -1354,6 +1355,7 @@ if (PHP_GRPC != "no") { "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\\text\\internal\\encode.c " + "third_party\\upb\\upb\\wire\\decode.c " + "third_party\\upb\\upb\\wire\\encode.c " + "third_party\\upb\\upb\\wire\\eps_copy_input_stream.c " + @@ -1871,6 +1873,7 @@ if (PHP_GRPC != "no") { FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\upb\\upb\\reflection"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\upb\\upb\\reflection\\internal"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\upb\\upb\\text"); + FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\upb\\upb\\text\\internal"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\upb\\upb\\wire"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\upb\\upb\\wire\\internal"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\utf8_range"); diff --git a/examples/cpp/helloworld/cmake_externalproject/CMakeLists.txt b/examples/cpp/helloworld/cmake_externalproject/CMakeLists.txt index c87f26160b7..8c1218a053d 100644 --- a/examples/cpp/helloworld/cmake_externalproject/CMakeLists.txt +++ b/examples/cpp/helloworld/cmake_externalproject/CMakeLists.txt @@ -40,7 +40,7 @@ ExternalProject_Add(absl -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_CURRENT_BINARY_DIR}/absl ) -# Builds absl project from the git submodule. +# Builds utf8_range project from the git submodule. ExternalProject_Add(utf8_range PREFIX utf8_range SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../../../third_party/utf8_range" @@ -95,13 +95,6 @@ ExternalProject_Add(zlib -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_CURRENT_BINARY_DIR}/zlib ) -# the location where protobuf-config.cmake will be installed varies by platform -if (WIN32) - set(_FINDPACKAGE_PROTOBUF_CONFIG_DIR "${CMAKE_CURRENT_BINARY_DIR}/protobuf/cmake") -else() - set(_FINDPACKAGE_PROTOBUF_CONFIG_DIR "${CMAKE_CURRENT_BINARY_DIR}/protobuf/lib/cmake/protobuf") -endif() - # if OPENSSL_ROOT_DIR is set, propagate that hint path to the external projects with OpenSSL dependency. set(_CMAKE_ARGS_OPENSSL_ROOT_DIR "") if (OPENSSL_ROOT_DIR) @@ -119,7 +112,7 @@ ExternalProject_Add(grpc -DgRPC_BUILD_MSVC_MP_COUNT:STRING=-1 -Dutf8_range_DIR:STRING=${CMAKE_CURRENT_BINARY_DIR}/utf8_range/lib/cmake/utf8_range -DgRPC_PROTOBUF_PROVIDER:STRING=package - -DProtobuf_DIR:PATH=${_FINDPACKAGE_PROTOBUF_CONFIG_DIR} + -DProtobuf_DIR:PATH=${CMAKE_CURRENT_BINARY_DIR}/protobuf/lib/cmake/protobuf -DgRPC_RE2_PROVIDER:STRING=package -Dre2_DIR:STRING=${CMAKE_CURRENT_BINARY_DIR}/re2/lib/cmake/re2 -DgRPC_ZLIB_PROVIDER:STRING=package @@ -147,7 +140,7 @@ ExternalProject_Add(helloworld BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/helloworld" INSTALL_COMMAND "" CMAKE_CACHE_ARGS - -DProtobuf_DIR:PATH=${_FINDPACKAGE_PROTOBUF_CONFIG_DIR} + -DProtobuf_DIR:PATH=${CMAKE_CURRENT_BINARY_DIR}/protobuf/lib/cmake/protobuf -Dc-ares_DIR:PATH=${CMAKE_CURRENT_BINARY_DIR}/c-ares/lib/cmake/c-ares -Dre2_DIR:STRING=${CMAKE_CURRENT_BINARY_DIR}/re2/lib/cmake/re2 -Dutf8_range_DIR:STRING=${CMAKE_CURRENT_BINARY_DIR}/utf8_range/lib/cmake/utf8_range diff --git a/gRPC-C++.podspec b/gRPC-C++.podspec index 902195c9fd8..4862b8ee10e 100644 --- a/gRPC-C++.podspec +++ b/gRPC-C++.podspec @@ -1499,6 +1499,7 @@ Pod::Spec.new do |s| 'third_party/upb/upb/message/internal/types.h', 'third_party/upb/upb/message/map.h', 'third_party/upb/upb/message/map_gencode_util.h', + 'third_party/upb/upb/message/merge.h', 'third_party/upb/upb/message/message.h', 'third_party/upb/upb/message/tagged_ptr.h', 'third_party/upb/upb/message/value.h', @@ -1564,6 +1565,8 @@ Pod::Spec.new do |s| 'third_party/upb/upb/reflection/oneof_def.h', 'third_party/upb/upb/reflection/service_def.h', 'third_party/upb/upb/text/encode.h', + 'third_party/upb/upb/text/internal/encode.h', + 'third_party/upb/upb/text/options.h', 'third_party/upb/upb/wire/decode.h', 'third_party/upb/upb/wire/encode.h', 'third_party/upb/upb/wire/eps_copy_input_stream.h', @@ -2747,6 +2750,7 @@ Pod::Spec.new do |s| 'third_party/upb/upb/message/internal/types.h', 'third_party/upb/upb/message/map.h', 'third_party/upb/upb/message/map_gencode_util.h', + 'third_party/upb/upb/message/merge.h', 'third_party/upb/upb/message/message.h', 'third_party/upb/upb/message/tagged_ptr.h', 'third_party/upb/upb/message/value.h', @@ -2812,6 +2816,8 @@ Pod::Spec.new do |s| 'third_party/upb/upb/reflection/oneof_def.h', 'third_party/upb/upb/reflection/service_def.h', 'third_party/upb/upb/text/encode.h', + 'third_party/upb/upb/text/internal/encode.h', + 'third_party/upb/upb/text/options.h', 'third_party/upb/upb/wire/decode.h', 'third_party/upb/upb/wire/encode.h', 'third_party/upb/upb/wire/eps_copy_input_stream.h', diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec index 5ef2d92c5c1..f953ca34e73 100644 --- a/gRPC-Core.podspec +++ b/gRPC-Core.podspec @@ -2260,6 +2260,8 @@ Pod::Spec.new do |s| 'third_party/upb/upb/message/map.h', 'third_party/upb/upb/message/map_gencode_util.h', 'third_party/upb/upb/message/map_sorter.c', + 'third_party/upb/upb/message/merge.c', + 'third_party/upb/upb/message/merge.h', 'third_party/upb/upb/message/message.c', 'third_party/upb/upb/message/message.h', 'third_party/upb/upb/message/tagged_ptr.h', @@ -2352,6 +2354,9 @@ Pod::Spec.new do |s| 'third_party/upb/upb/reflection/service_def.h', 'third_party/upb/upb/text/encode.c', 'third_party/upb/upb/text/encode.h', + 'third_party/upb/upb/text/internal/encode.c', + 'third_party/upb/upb/text/internal/encode.h', + 'third_party/upb/upb/text/options.h', 'third_party/upb/upb/wire/decode.c', 'third_party/upb/upb/wire/decode.h', 'third_party/upb/upb/wire/encode.c', @@ -3519,6 +3524,7 @@ Pod::Spec.new do |s| 'third_party/upb/upb/message/internal/types.h', 'third_party/upb/upb/message/map.h', 'third_party/upb/upb/message/map_gencode_util.h', + 'third_party/upb/upb/message/merge.h', 'third_party/upb/upb/message/message.h', 'third_party/upb/upb/message/tagged_ptr.h', 'third_party/upb/upb/message/value.h', @@ -3584,6 +3590,8 @@ Pod::Spec.new do |s| 'third_party/upb/upb/reflection/oneof_def.h', 'third_party/upb/upb/reflection/service_def.h', 'third_party/upb/upb/text/encode.h', + 'third_party/upb/upb/text/internal/encode.h', + 'third_party/upb/upb/text/options.h', 'third_party/upb/upb/wire/decode.h', 'third_party/upb/upb/wire/encode.h', 'third_party/upb/upb/wire/eps_copy_input_stream.h', diff --git a/grpc.gemspec b/grpc.gemspec index ca3b9344c17..83b134b50fe 100644 --- a/grpc.gemspec +++ b/grpc.gemspec @@ -3189,6 +3189,8 @@ Gem::Specification.new do |s| s.files += %w( third_party/upb/upb/message/map.h ) s.files += %w( third_party/upb/upb/message/map_gencode_util.h ) s.files += %w( third_party/upb/upb/message/map_sorter.c ) + s.files += %w( third_party/upb/upb/message/merge.c ) + s.files += %w( third_party/upb/upb/message/merge.h ) s.files += %w( third_party/upb/upb/message/message.c ) s.files += %w( third_party/upb/upb/message/message.h ) s.files += %w( third_party/upb/upb/message/tagged_ptr.h ) @@ -3281,6 +3283,9 @@ Gem::Specification.new do |s| s.files += %w( third_party/upb/upb/reflection/service_def.h ) s.files += %w( third_party/upb/upb/text/encode.c ) s.files += %w( third_party/upb/upb/text/encode.h ) + s.files += %w( third_party/upb/upb/text/internal/encode.c ) + s.files += %w( third_party/upb/upb/text/internal/encode.h ) + s.files += %w( third_party/upb/upb/text/options.h ) s.files += %w( third_party/upb/upb/wire/decode.c ) s.files += %w( third_party/upb/upb/wire/decode.h ) s.files += %w( third_party/upb/upb/wire/encode.c ) diff --git a/package.xml b/package.xml index 7982ab53596..67c1e56e75a 100644 --- a/package.xml +++ b/package.xml @@ -3103,6 +3103,8 @@ + + @@ -3195,6 +3197,9 @@ + + + diff --git a/src/core/ext/upb-gen/envoy/admin/v3/certs.upb.h b/src/core/ext/upb-gen/envoy/admin/v3/certs.upb.h index 24c9c36d8d7..f2e222df85e 100644 --- a/src/core/ext/upb-gen/envoy/admin/v3/certs.upb.h +++ b/src/core/ext/upb-gen/envoy/admin/v3/certs.upb.h @@ -3,7 +3,8 @@ * envoy/admin/v3/certs.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_ADMIN_V3_CERTS_PROTO_UPB_H_ #define ENVOY_ADMIN_V3_CERTS_PROTO_UPB_H_ @@ -74,6 +75,7 @@ UPB_INLINE void envoy_admin_v3_Certificates_clear_certificates(envoy_admin_v3_Ce } UPB_INLINE const envoy_admin_v3_Certificate* const* envoy_admin_v3_Certificates_certificates(const envoy_admin_v3_Certificates* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__Certificate_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -85,6 +87,7 @@ UPB_INLINE const envoy_admin_v3_Certificate* const* envoy_admin_v3_Certificates_ } UPB_INLINE const upb_Array* _envoy_admin_v3_Certificates_certificates_upb_array(const envoy_admin_v3_Certificates* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__Certificate_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -93,6 +96,7 @@ UPB_INLINE const upb_Array* _envoy_admin_v3_Certificates_certificates_upb_array( } UPB_INLINE upb_Array* _envoy_admin_v3_Certificates_certificates_mutable_upb_array(envoy_admin_v3_Certificates* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__Certificate_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -103,6 +107,7 @@ UPB_INLINE upb_Array* _envoy_admin_v3_Certificates_certificates_mutable_upb_arra UPB_INLINE envoy_admin_v3_Certificate** envoy_admin_v3_Certificates_mutable_certificates(envoy_admin_v3_Certificates* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__Certificate_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -119,6 +124,7 @@ UPB_INLINE envoy_admin_v3_Certificate** envoy_admin_v3_Certificates_resize_certi } UPB_INLINE struct envoy_admin_v3_Certificate* envoy_admin_v3_Certificates_add_certificates(envoy_admin_v3_Certificates* msg, upb_Arena* arena) { upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__Certificate_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -174,6 +180,7 @@ UPB_INLINE void envoy_admin_v3_Certificate_clear_ca_cert(envoy_admin_v3_Certific } UPB_INLINE const envoy_admin_v3_CertificateDetails* const* envoy_admin_v3_Certificate_ca_cert(const envoy_admin_v3_Certificate* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__CertificateDetails_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -185,6 +192,7 @@ UPB_INLINE const envoy_admin_v3_CertificateDetails* const* envoy_admin_v3_Certif } UPB_INLINE const upb_Array* _envoy_admin_v3_Certificate_ca_cert_upb_array(const envoy_admin_v3_Certificate* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__CertificateDetails_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -193,6 +201,7 @@ UPB_INLINE const upb_Array* _envoy_admin_v3_Certificate_ca_cert_upb_array(const } UPB_INLINE upb_Array* _envoy_admin_v3_Certificate_ca_cert_mutable_upb_array(envoy_admin_v3_Certificate* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__CertificateDetails_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -206,6 +215,7 @@ UPB_INLINE void envoy_admin_v3_Certificate_clear_cert_chain(envoy_admin_v3_Certi } UPB_INLINE const envoy_admin_v3_CertificateDetails* const* envoy_admin_v3_Certificate_cert_chain(const envoy_admin_v3_Certificate* msg, size_t* size) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__CertificateDetails_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -217,6 +227,7 @@ UPB_INLINE const envoy_admin_v3_CertificateDetails* const* envoy_admin_v3_Certif } UPB_INLINE const upb_Array* _envoy_admin_v3_Certificate_cert_chain_upb_array(const envoy_admin_v3_Certificate* msg, size_t* size) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__CertificateDetails_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -225,6 +236,7 @@ UPB_INLINE const upb_Array* _envoy_admin_v3_Certificate_cert_chain_upb_array(con } UPB_INLINE upb_Array* _envoy_admin_v3_Certificate_cert_chain_mutable_upb_array(envoy_admin_v3_Certificate* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__CertificateDetails_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -235,6 +247,7 @@ UPB_INLINE upb_Array* _envoy_admin_v3_Certificate_cert_chain_mutable_upb_array(e UPB_INLINE envoy_admin_v3_CertificateDetails** envoy_admin_v3_Certificate_mutable_ca_cert(envoy_admin_v3_Certificate* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__CertificateDetails_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -251,6 +264,7 @@ UPB_INLINE envoy_admin_v3_CertificateDetails** envoy_admin_v3_Certificate_resize } UPB_INLINE struct envoy_admin_v3_CertificateDetails* envoy_admin_v3_Certificate_add_ca_cert(envoy_admin_v3_Certificate* msg, upb_Arena* arena) { upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__CertificateDetails_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -265,6 +279,7 @@ UPB_INLINE struct envoy_admin_v3_CertificateDetails* envoy_admin_v3_Certificate_ } UPB_INLINE envoy_admin_v3_CertificateDetails** envoy_admin_v3_Certificate_mutable_cert_chain(envoy_admin_v3_Certificate* msg, size_t* size) { upb_MiniTableField field = {2, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__CertificateDetails_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -281,6 +296,7 @@ UPB_INLINE envoy_admin_v3_CertificateDetails** envoy_admin_v3_Certificate_resize } UPB_INLINE struct envoy_admin_v3_CertificateDetails* envoy_admin_v3_Certificate_add_cert_chain(envoy_admin_v3_Certificate* msg, upb_Arena* arena) { upb_MiniTableField field = {2, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__CertificateDetails_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -360,6 +376,7 @@ UPB_INLINE void envoy_admin_v3_CertificateDetails_clear_subject_alt_names(envoy_ } UPB_INLINE const envoy_admin_v3_SubjectAlternateName* const* envoy_admin_v3_CertificateDetails_subject_alt_names(const envoy_admin_v3_CertificateDetails* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__SubjectAlternateName_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -371,6 +388,7 @@ UPB_INLINE const envoy_admin_v3_SubjectAlternateName* const* envoy_admin_v3_Cert } UPB_INLINE const upb_Array* _envoy_admin_v3_CertificateDetails_subject_alt_names_upb_array(const envoy_admin_v3_CertificateDetails* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__SubjectAlternateName_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -379,6 +397,7 @@ UPB_INLINE const upb_Array* _envoy_admin_v3_CertificateDetails_subject_alt_names } UPB_INLINE upb_Array* _envoy_admin_v3_CertificateDetails_subject_alt_names_mutable_upb_array(envoy_admin_v3_CertificateDetails* msg, size_t* size, upb_Arena* arena) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__SubjectAlternateName_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -406,6 +425,7 @@ UPB_INLINE const struct google_protobuf_Timestamp* envoy_admin_v3_CertificateDet const struct google_protobuf_Timestamp* default_val = NULL; const struct google_protobuf_Timestamp* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Timestamp_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -422,6 +442,7 @@ UPB_INLINE const struct google_protobuf_Timestamp* envoy_admin_v3_CertificateDet const struct google_protobuf_Timestamp* default_val = NULL; const struct google_protobuf_Timestamp* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Timestamp_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -438,6 +459,7 @@ UPB_INLINE const envoy_admin_v3_CertificateDetails_OcspDetails* envoy_admin_v3_C const envoy_admin_v3_CertificateDetails_OcspDetails* default_val = NULL; const envoy_admin_v3_CertificateDetails_OcspDetails* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__CertificateDetails__OcspDetails_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -457,6 +479,7 @@ UPB_INLINE void envoy_admin_v3_CertificateDetails_set_serial_number(envoy_admin_ } 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__SubjectAlternateName_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -473,6 +496,7 @@ UPB_INLINE envoy_admin_v3_SubjectAlternateName** envoy_admin_v3_CertificateDetai } UPB_INLINE struct envoy_admin_v3_SubjectAlternateName* envoy_admin_v3_CertificateDetails_add_subject_alt_names(envoy_admin_v3_CertificateDetails* msg, upb_Arena* arena) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__SubjectAlternateName_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -491,6 +515,7 @@ UPB_INLINE void envoy_admin_v3_CertificateDetails_set_days_until_expiration(envo } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Timestamp_msg_init); 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) { @@ -503,6 +528,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Timestamp_msg_init); 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) { @@ -515,6 +541,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__CertificateDetails__OcspDetails_msg_init); 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) { @@ -570,6 +597,7 @@ UPB_INLINE const struct google_protobuf_Timestamp* envoy_admin_v3_CertificateDet const struct google_protobuf_Timestamp* default_val = NULL; const struct google_protobuf_Timestamp* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Timestamp_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -586,6 +614,7 @@ UPB_INLINE const struct google_protobuf_Timestamp* envoy_admin_v3_CertificateDet const struct google_protobuf_Timestamp* default_val = NULL; const struct google_protobuf_Timestamp* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Timestamp_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -597,6 +626,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Timestamp_msg_init); 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) { @@ -609,6 +639,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Timestamp_msg_init); 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) { diff --git a/src/core/ext/upb-gen/envoy/admin/v3/certs.upb_minitable.c b/src/core/ext/upb-gen/envoy/admin/v3/certs.upb_minitable.c index f5ba742e8b4..945e299b318 100644 --- a/src/core/ext/upb-gen/envoy/admin/v3/certs.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/admin/v3/certs.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/admin/v3/certs.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -15,8 +16,9 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub envoy_admin_v3_Certificates_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__admin__v3__Certificate_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal envoy_admin_v3_Certificates_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__admin__v3__Certificate_msg_init_ptr}, }; static const upb_MiniTableField envoy_admin_v3_Certificates__fields[1] = { @@ -36,9 +38,10 @@ const upb_MiniTable envoy__admin__v3__Certificates_msg_init = { }) }; -static const upb_MiniTableSub envoy_admin_v3_Certificate_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &envoy__admin__v3__CertificateDetails_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__admin__v3__CertificateDetails_msg_init}, +const upb_MiniTable* envoy__admin__v3__Certificates_msg_init_ptr = &envoy__admin__v3__Certificates_msg_init; +static const upb_MiniTableSubInternal envoy_admin_v3_Certificate_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &envoy__admin__v3__CertificateDetails_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__admin__v3__CertificateDetails_msg_init_ptr}, }; static const upb_MiniTableField envoy_admin_v3_Certificate__fields[2] = { @@ -61,11 +64,12 @@ const upb_MiniTable envoy__admin__v3__Certificate_msg_init = { }) }; -static const upb_MiniTableSub envoy_admin_v3_CertificateDetails_submsgs[4] = { - {.UPB_PRIVATE(submsg) = &envoy__admin__v3__SubjectAlternateName_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__admin__v3__CertificateDetails__OcspDetails_msg_init}, +const upb_MiniTable* envoy__admin__v3__Certificate_msg_init_ptr = &envoy__admin__v3__Certificate_msg_init; +static const upb_MiniTableSubInternal envoy_admin_v3_CertificateDetails_submsgs[4] = { + {.UPB_PRIVATE(submsg) = &envoy__admin__v3__SubjectAlternateName_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__admin__v3__CertificateDetails__OcspDetails_msg_init_ptr}, }; static const upb_MiniTableField envoy_admin_v3_CertificateDetails__fields[7] = { @@ -97,9 +101,10 @@ const upb_MiniTable envoy__admin__v3__CertificateDetails_msg_init = { }) }; -static const upb_MiniTableSub envoy_admin_v3_CertificateDetails_OcspDetails_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init}, +const upb_MiniTable* envoy__admin__v3__CertificateDetails_msg_init_ptr = &envoy__admin__v3__CertificateDetails_msg_init; +static const upb_MiniTableSubInternal envoy_admin_v3_CertificateDetails_OcspDetails_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init_ptr}, }; static const upb_MiniTableField envoy_admin_v3_CertificateDetails_OcspDetails__fields[2] = { @@ -116,6 +121,7 @@ const upb_MiniTable envoy__admin__v3__CertificateDetails__OcspDetails_msg_init = #endif }; +const upb_MiniTable* envoy__admin__v3__CertificateDetails__OcspDetails_msg_init_ptr = &envoy__admin__v3__CertificateDetails__OcspDetails_msg_init; static const upb_MiniTableField envoy_admin_v3_SubjectAlternateName__fields[3] = { {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, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, @@ -137,6 +143,7 @@ const upb_MiniTable envoy__admin__v3__SubjectAlternateName_msg_init = { }) }; +const upb_MiniTable* envoy__admin__v3__SubjectAlternateName_msg_init_ptr = &envoy__admin__v3__SubjectAlternateName_msg_init; static const upb_MiniTable *messages_layout[5] = { &envoy__admin__v3__Certificates_msg_init, &envoy__admin__v3__Certificate_msg_init, diff --git a/src/core/ext/upb-gen/envoy/admin/v3/certs.upb_minitable.h b/src/core/ext/upb-gen/envoy/admin/v3/certs.upb_minitable.h index 3ce9de63aeb..7174dbbf9eb 100644 --- a/src/core/ext/upb-gen/envoy/admin/v3/certs.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/admin/v3/certs.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/admin/v3/certs.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_ADMIN_V3_CERTS_PROTO_UPB_MINITABLE_H_ #define ENVOY_ADMIN_V3_CERTS_PROTO_UPB_MINITABLE_H_ @@ -18,10 +19,15 @@ extern "C" { #endif extern const upb_MiniTable envoy__admin__v3__Certificates_msg_init; +extern const upb_MiniTable* envoy__admin__v3__Certificates_msg_init_ptr; extern const upb_MiniTable envoy__admin__v3__Certificate_msg_init; +extern const upb_MiniTable* envoy__admin__v3__Certificate_msg_init_ptr; extern const upb_MiniTable envoy__admin__v3__CertificateDetails_msg_init; +extern const upb_MiniTable* envoy__admin__v3__CertificateDetails_msg_init_ptr; extern const upb_MiniTable envoy__admin__v3__CertificateDetails__OcspDetails_msg_init; +extern const upb_MiniTable* envoy__admin__v3__CertificateDetails__OcspDetails_msg_init_ptr; extern const upb_MiniTable envoy__admin__v3__SubjectAlternateName_msg_init; +extern const upb_MiniTable* envoy__admin__v3__SubjectAlternateName_msg_init_ptr; extern const upb_MiniTableFile envoy_admin_v3_certs_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/admin/v3/clusters.upb.h b/src/core/ext/upb-gen/envoy/admin/v3/clusters.upb.h index 1978b8504d5..675ad836ed3 100644 --- a/src/core/ext/upb-gen/envoy/admin/v3/clusters.upb.h +++ b/src/core/ext/upb-gen/envoy/admin/v3/clusters.upb.h @@ -3,7 +3,8 @@ * envoy/admin/v3/clusters.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_ADMIN_V3_CLUSTERS_PROTO_UPB_H_ #define ENVOY_ADMIN_V3_CLUSTERS_PROTO_UPB_H_ @@ -82,6 +83,7 @@ UPB_INLINE void envoy_admin_v3_Clusters_clear_cluster_statuses(envoy_admin_v3_Cl } UPB_INLINE const envoy_admin_v3_ClusterStatus* const* envoy_admin_v3_Clusters_cluster_statuses(const envoy_admin_v3_Clusters* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__ClusterStatus_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -93,6 +95,7 @@ UPB_INLINE const envoy_admin_v3_ClusterStatus* const* envoy_admin_v3_Clusters_cl } UPB_INLINE const upb_Array* _envoy_admin_v3_Clusters_cluster_statuses_upb_array(const envoy_admin_v3_Clusters* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__ClusterStatus_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -101,6 +104,7 @@ UPB_INLINE const upb_Array* _envoy_admin_v3_Clusters_cluster_statuses_upb_array( } UPB_INLINE upb_Array* _envoy_admin_v3_Clusters_cluster_statuses_mutable_upb_array(envoy_admin_v3_Clusters* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__ClusterStatus_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -111,6 +115,7 @@ UPB_INLINE upb_Array* _envoy_admin_v3_Clusters_cluster_statuses_mutable_upb_arra UPB_INLINE envoy_admin_v3_ClusterStatus** envoy_admin_v3_Clusters_mutable_cluster_statuses(envoy_admin_v3_Clusters* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__ClusterStatus_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -127,6 +132,7 @@ UPB_INLINE envoy_admin_v3_ClusterStatus** envoy_admin_v3_Clusters_resize_cluster } UPB_INLINE struct envoy_admin_v3_ClusterStatus* envoy_admin_v3_Clusters_add_cluster_statuses(envoy_admin_v3_Clusters* msg, upb_Arena* arena) { upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__ClusterStatus_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -208,6 +214,7 @@ UPB_INLINE const struct envoy_type_v3_Percent* envoy_admin_v3_ClusterStatus_succ const struct envoy_type_v3_Percent* default_val = NULL; const struct envoy_type_v3_Percent* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__v3__Percent_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -222,6 +229,7 @@ UPB_INLINE void envoy_admin_v3_ClusterStatus_clear_host_statuses(envoy_admin_v3_ } UPB_INLINE const envoy_admin_v3_HostStatus* const* envoy_admin_v3_ClusterStatus_host_statuses(const envoy_admin_v3_ClusterStatus* msg, size_t* size) { const upb_MiniTableField field = {4, UPB_SIZE(16, 40), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__HostStatus_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -233,6 +241,7 @@ UPB_INLINE const envoy_admin_v3_HostStatus* const* envoy_admin_v3_ClusterStatus_ } UPB_INLINE const upb_Array* _envoy_admin_v3_ClusterStatus_host_statuses_upb_array(const envoy_admin_v3_ClusterStatus* msg, size_t* size) { const upb_MiniTableField field = {4, UPB_SIZE(16, 40), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__HostStatus_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -241,6 +250,7 @@ UPB_INLINE const upb_Array* _envoy_admin_v3_ClusterStatus_host_statuses_upb_arra } UPB_INLINE upb_Array* _envoy_admin_v3_ClusterStatus_host_statuses_mutable_upb_array(envoy_admin_v3_ClusterStatus* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {4, UPB_SIZE(16, 40), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__HostStatus_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -256,6 +266,7 @@ UPB_INLINE const struct envoy_type_v3_Percent* envoy_admin_v3_ClusterStatus_loca const struct envoy_type_v3_Percent* default_val = NULL; const struct envoy_type_v3_Percent* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__v3__Percent_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -272,6 +283,7 @@ UPB_INLINE const struct envoy_config_cluster_v3_CircuitBreakers* envoy_admin_v3_ const struct envoy_config_cluster_v3_CircuitBreakers* default_val = NULL; const struct envoy_config_cluster_v3_CircuitBreakers* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__cluster__v3__CircuitBreakers_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -315,6 +327,7 @@ UPB_INLINE void envoy_admin_v3_ClusterStatus_set_added_via_api(envoy_admin_v3_Cl } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__v3__Percent_msg_init); 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) { @@ -327,6 +340,7 @@ UPB_INLINE struct envoy_type_v3_Percent* envoy_admin_v3_ClusterStatus_mutable_su } UPB_INLINE envoy_admin_v3_HostStatus** envoy_admin_v3_ClusterStatus_mutable_host_statuses(envoy_admin_v3_ClusterStatus* msg, size_t* size) { upb_MiniTableField field = {4, UPB_SIZE(16, 40), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__HostStatus_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -343,6 +357,7 @@ UPB_INLINE envoy_admin_v3_HostStatus** envoy_admin_v3_ClusterStatus_resize_host_ } UPB_INLINE struct envoy_admin_v3_HostStatus* envoy_admin_v3_ClusterStatus_add_host_statuses(envoy_admin_v3_ClusterStatus* msg, upb_Arena* arena) { upb_MiniTableField field = {4, UPB_SIZE(16, 40), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__HostStatus_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -357,6 +372,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__v3__Percent_msg_init); 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) { @@ -369,6 +385,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__cluster__v3__CircuitBreakers_msg_init); 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) { @@ -432,6 +449,7 @@ UPB_INLINE const struct envoy_config_core_v3_Address* envoy_admin_v3_HostStatus_ const struct envoy_config_core_v3_Address* default_val = NULL; const struct envoy_config_core_v3_Address* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Address_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -446,6 +464,7 @@ UPB_INLINE void envoy_admin_v3_HostStatus_clear_stats(envoy_admin_v3_HostStatus* } UPB_INLINE const struct envoy_admin_v3_SimpleMetric* const* envoy_admin_v3_HostStatus_stats(const envoy_admin_v3_HostStatus* msg, size_t* size) { const upb_MiniTableField field = {2, UPB_SIZE(16, 32), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__SimpleMetric_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -457,6 +476,7 @@ UPB_INLINE const struct envoy_admin_v3_SimpleMetric* const* envoy_admin_v3_HostS } UPB_INLINE const upb_Array* _envoy_admin_v3_HostStatus_stats_upb_array(const envoy_admin_v3_HostStatus* msg, size_t* size) { const upb_MiniTableField field = {2, UPB_SIZE(16, 32), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__SimpleMetric_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -465,6 +485,7 @@ UPB_INLINE const upb_Array* _envoy_admin_v3_HostStatus_stats_upb_array(const env } UPB_INLINE upb_Array* _envoy_admin_v3_HostStatus_stats_mutable_upb_array(envoy_admin_v3_HostStatus* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {2, UPB_SIZE(16, 32), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__SimpleMetric_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -480,6 +501,7 @@ UPB_INLINE const envoy_admin_v3_HostHealthStatus* envoy_admin_v3_HostStatus_heal const envoy_admin_v3_HostHealthStatus* default_val = NULL; const envoy_admin_v3_HostHealthStatus* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__HostHealthStatus_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -496,6 +518,7 @@ UPB_INLINE const struct envoy_type_v3_Percent* envoy_admin_v3_HostStatus_success const struct envoy_type_v3_Percent* default_val = NULL; const struct envoy_type_v3_Percent* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__v3__Percent_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -548,6 +571,7 @@ UPB_INLINE const struct envoy_type_v3_Percent* envoy_admin_v3_HostStatus_local_o const struct envoy_type_v3_Percent* default_val = NULL; const struct envoy_type_v3_Percent* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__v3__Percent_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -564,6 +588,7 @@ UPB_INLINE const struct envoy_config_core_v3_Locality* envoy_admin_v3_HostStatus const struct envoy_config_core_v3_Locality* default_val = NULL; const struct envoy_config_core_v3_Locality* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Locality_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -575,6 +600,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Address_msg_init); 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) { @@ -587,6 +613,7 @@ UPB_INLINE struct envoy_config_core_v3_Address* envoy_admin_v3_HostStatus_mutabl } UPB_INLINE struct envoy_admin_v3_SimpleMetric** envoy_admin_v3_HostStatus_mutable_stats(envoy_admin_v3_HostStatus* msg, size_t* size) { upb_MiniTableField field = {2, UPB_SIZE(16, 32), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__SimpleMetric_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -603,6 +630,7 @@ UPB_INLINE struct envoy_admin_v3_SimpleMetric** envoy_admin_v3_HostStatus_resize } UPB_INLINE struct envoy_admin_v3_SimpleMetric* envoy_admin_v3_HostStatus_add_stats(envoy_admin_v3_HostStatus* msg, upb_Arena* arena) { upb_MiniTableField field = {2, UPB_SIZE(16, 32), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__SimpleMetric_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -617,6 +645,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__HostHealthStatus_msg_init); 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) { @@ -629,6 +658,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__v3__Percent_msg_init); 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) { @@ -653,6 +683,7 @@ UPB_INLINE void envoy_admin_v3_HostStatus_set_priority(envoy_admin_v3_HostStatus } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__v3__Percent_msg_init); 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) { @@ -665,6 +696,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Locality_msg_init); 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) { diff --git a/src/core/ext/upb-gen/envoy/admin/v3/clusters.upb_minitable.c b/src/core/ext/upb-gen/envoy/admin/v3/clusters.upb_minitable.c index 57e730c678a..7782060e992 100644 --- a/src/core/ext/upb-gen/envoy/admin/v3/clusters.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/admin/v3/clusters.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/admin/v3/clusters.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -20,8 +21,9 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub envoy_admin_v3_Clusters_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__admin__v3__ClusterStatus_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal envoy_admin_v3_Clusters_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__admin__v3__ClusterStatus_msg_init_ptr}, }; static const upb_MiniTableField envoy_admin_v3_Clusters__fields[1] = { @@ -41,11 +43,12 @@ const upb_MiniTable envoy__admin__v3__Clusters_msg_init = { }) }; -static const upb_MiniTableSub envoy_admin_v3_ClusterStatus_submsgs[4] = { - {.UPB_PRIVATE(submsg) = &envoy__type__v3__Percent_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__admin__v3__HostStatus_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__type__v3__Percent_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__cluster__v3__CircuitBreakers_msg_init}, +const upb_MiniTable* envoy__admin__v3__Clusters_msg_init_ptr = &envoy__admin__v3__Clusters_msg_init; +static const upb_MiniTableSubInternal envoy_admin_v3_ClusterStatus_submsgs[4] = { + {.UPB_PRIVATE(submsg) = &envoy__type__v3__Percent_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__admin__v3__HostStatus_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__type__v3__Percent_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__cluster__v3__CircuitBreakers_msg_init_ptr}, }; static const upb_MiniTableField envoy_admin_v3_ClusterStatus__fields[8] = { @@ -86,13 +89,14 @@ const upb_MiniTable envoy__admin__v3__ClusterStatus_msg_init = { }) }; -static const upb_MiniTableSub envoy_admin_v3_HostStatus_submsgs[6] = { - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Address_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__admin__v3__SimpleMetric_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__admin__v3__HostHealthStatus_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__type__v3__Percent_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__type__v3__Percent_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Locality_msg_init}, +const upb_MiniTable* envoy__admin__v3__ClusterStatus_msg_init_ptr = &envoy__admin__v3__ClusterStatus_msg_init; +static const upb_MiniTableSubInternal envoy_admin_v3_HostStatus_submsgs[6] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Address_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__admin__v3__SimpleMetric_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__admin__v3__HostHealthStatus_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__type__v3__Percent_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__type__v3__Percent_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Locality_msg_init_ptr}, }; static const upb_MiniTableField envoy_admin_v3_HostStatus__fields[9] = { @@ -126,6 +130,7 @@ const upb_MiniTable envoy__admin__v3__HostStatus_msg_init = { }) }; +const upb_MiniTable* envoy__admin__v3__HostStatus_msg_init_ptr = &envoy__admin__v3__HostStatus_msg_init; static const upb_MiniTableField envoy_admin_v3_HostHealthStatus__fields[8] = { {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)}, @@ -164,6 +169,7 @@ const upb_MiniTable envoy__admin__v3__HostHealthStatus_msg_init = { }) }; +const upb_MiniTable* envoy__admin__v3__HostHealthStatus_msg_init_ptr = &envoy__admin__v3__HostHealthStatus_msg_init; static const upb_MiniTable *messages_layout[4] = { &envoy__admin__v3__Clusters_msg_init, &envoy__admin__v3__ClusterStatus_msg_init, diff --git a/src/core/ext/upb-gen/envoy/admin/v3/clusters.upb_minitable.h b/src/core/ext/upb-gen/envoy/admin/v3/clusters.upb_minitable.h index 98704a715dd..be0925efba9 100644 --- a/src/core/ext/upb-gen/envoy/admin/v3/clusters.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/admin/v3/clusters.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/admin/v3/clusters.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_ADMIN_V3_CLUSTERS_PROTO_UPB_MINITABLE_H_ #define ENVOY_ADMIN_V3_CLUSTERS_PROTO_UPB_MINITABLE_H_ @@ -18,9 +19,13 @@ extern "C" { #endif extern const upb_MiniTable envoy__admin__v3__Clusters_msg_init; +extern const upb_MiniTable* envoy__admin__v3__Clusters_msg_init_ptr; extern const upb_MiniTable envoy__admin__v3__ClusterStatus_msg_init; +extern const upb_MiniTable* envoy__admin__v3__ClusterStatus_msg_init_ptr; extern const upb_MiniTable envoy__admin__v3__HostStatus_msg_init; +extern const upb_MiniTable* envoy__admin__v3__HostStatus_msg_init_ptr; extern const upb_MiniTable envoy__admin__v3__HostHealthStatus_msg_init; +extern const upb_MiniTable* envoy__admin__v3__HostHealthStatus_msg_init_ptr; extern const upb_MiniTableFile envoy_admin_v3_clusters_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/admin/v3/config_dump.upb.h b/src/core/ext/upb-gen/envoy/admin/v3/config_dump.upb.h index 3d6440983ac..becc1985eae 100644 --- a/src/core/ext/upb-gen/envoy/admin/v3/config_dump.upb.h +++ b/src/core/ext/upb-gen/envoy/admin/v3/config_dump.upb.h @@ -3,7 +3,8 @@ * envoy/admin/v3/config_dump.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_ADMIN_V3_CONFIG_DUMP_PROTO_UPB_H_ #define ENVOY_ADMIN_V3_CONFIG_DUMP_PROTO_UPB_H_ @@ -80,6 +81,7 @@ UPB_INLINE void envoy_admin_v3_ConfigDump_clear_configs(envoy_admin_v3_ConfigDum } UPB_INLINE const struct google_protobuf_Any* const* envoy_admin_v3_ConfigDump_configs(const envoy_admin_v3_ConfigDump* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -91,6 +93,7 @@ UPB_INLINE const struct google_protobuf_Any* const* envoy_admin_v3_ConfigDump_co } UPB_INLINE const upb_Array* _envoy_admin_v3_ConfigDump_configs_upb_array(const envoy_admin_v3_ConfigDump* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -99,6 +102,7 @@ UPB_INLINE const upb_Array* _envoy_admin_v3_ConfigDump_configs_upb_array(const e } UPB_INLINE upb_Array* _envoy_admin_v3_ConfigDump_configs_mutable_upb_array(envoy_admin_v3_ConfigDump* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -109,6 +113,7 @@ UPB_INLINE upb_Array* _envoy_admin_v3_ConfigDump_configs_mutable_upb_array(envoy UPB_INLINE struct google_protobuf_Any** envoy_admin_v3_ConfigDump_mutable_configs(envoy_admin_v3_ConfigDump* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -125,6 +130,7 @@ UPB_INLINE struct google_protobuf_Any** envoy_admin_v3_ConfigDump_resize_configs } UPB_INLINE struct google_protobuf_Any* envoy_admin_v3_ConfigDump_add_configs(envoy_admin_v3_ConfigDump* msg, upb_Arena* arena) { upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -182,6 +188,7 @@ UPB_INLINE const struct envoy_config_bootstrap_v3_Bootstrap* envoy_admin_v3_Boot const struct envoy_config_bootstrap_v3_Bootstrap* default_val = NULL; const struct envoy_config_bootstrap_v3_Bootstrap* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__bootstrap__v3__Bootstrap_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -198,6 +205,7 @@ UPB_INLINE const struct google_protobuf_Timestamp* envoy_admin_v3_BootstrapConfi const struct google_protobuf_Timestamp* default_val = NULL; const struct google_protobuf_Timestamp* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Timestamp_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -209,6 +217,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__bootstrap__v3__Bootstrap_msg_init); 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) { @@ -221,6 +230,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Timestamp_msg_init); 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) { @@ -274,6 +284,7 @@ UPB_INLINE void envoy_admin_v3_SecretsConfigDump_clear_static_secrets(envoy_admi } UPB_INLINE const envoy_admin_v3_SecretsConfigDump_StaticSecret* const* envoy_admin_v3_SecretsConfigDump_static_secrets(const envoy_admin_v3_SecretsConfigDump* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__SecretsConfigDump__StaticSecret_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -285,6 +296,7 @@ UPB_INLINE const envoy_admin_v3_SecretsConfigDump_StaticSecret* const* envoy_adm } UPB_INLINE const upb_Array* _envoy_admin_v3_SecretsConfigDump_static_secrets_upb_array(const envoy_admin_v3_SecretsConfigDump* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__SecretsConfigDump__StaticSecret_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -293,6 +305,7 @@ UPB_INLINE const upb_Array* _envoy_admin_v3_SecretsConfigDump_static_secrets_upb } UPB_INLINE upb_Array* _envoy_admin_v3_SecretsConfigDump_static_secrets_mutable_upb_array(envoy_admin_v3_SecretsConfigDump* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__SecretsConfigDump__StaticSecret_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -306,6 +319,7 @@ UPB_INLINE void envoy_admin_v3_SecretsConfigDump_clear_dynamic_active_secrets(en } UPB_INLINE const envoy_admin_v3_SecretsConfigDump_DynamicSecret* const* envoy_admin_v3_SecretsConfigDump_dynamic_active_secrets(const envoy_admin_v3_SecretsConfigDump* msg, size_t* size) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__SecretsConfigDump__DynamicSecret_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -317,6 +331,7 @@ UPB_INLINE const envoy_admin_v3_SecretsConfigDump_DynamicSecret* const* envoy_ad } UPB_INLINE const upb_Array* _envoy_admin_v3_SecretsConfigDump_dynamic_active_secrets_upb_array(const envoy_admin_v3_SecretsConfigDump* msg, size_t* size) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__SecretsConfigDump__DynamicSecret_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -325,6 +340,7 @@ UPB_INLINE const upb_Array* _envoy_admin_v3_SecretsConfigDump_dynamic_active_sec } UPB_INLINE upb_Array* _envoy_admin_v3_SecretsConfigDump_dynamic_active_secrets_mutable_upb_array(envoy_admin_v3_SecretsConfigDump* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__SecretsConfigDump__DynamicSecret_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -338,6 +354,7 @@ UPB_INLINE void envoy_admin_v3_SecretsConfigDump_clear_dynamic_warming_secrets(e } UPB_INLINE const envoy_admin_v3_SecretsConfigDump_DynamicSecret* const* envoy_admin_v3_SecretsConfigDump_dynamic_warming_secrets(const envoy_admin_v3_SecretsConfigDump* msg, size_t* size) { const upb_MiniTableField field = {3, UPB_SIZE(16, 24), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__SecretsConfigDump__DynamicSecret_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -349,6 +366,7 @@ UPB_INLINE const envoy_admin_v3_SecretsConfigDump_DynamicSecret* const* envoy_ad } UPB_INLINE const upb_Array* _envoy_admin_v3_SecretsConfigDump_dynamic_warming_secrets_upb_array(const envoy_admin_v3_SecretsConfigDump* msg, size_t* size) { const upb_MiniTableField field = {3, UPB_SIZE(16, 24), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__SecretsConfigDump__DynamicSecret_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -357,6 +375,7 @@ UPB_INLINE const upb_Array* _envoy_admin_v3_SecretsConfigDump_dynamic_warming_se } UPB_INLINE upb_Array* _envoy_admin_v3_SecretsConfigDump_dynamic_warming_secrets_mutable_upb_array(envoy_admin_v3_SecretsConfigDump* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {3, UPB_SIZE(16, 24), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__SecretsConfigDump__DynamicSecret_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -367,6 +386,7 @@ UPB_INLINE upb_Array* _envoy_admin_v3_SecretsConfigDump_dynamic_warming_secrets_ UPB_INLINE envoy_admin_v3_SecretsConfigDump_StaticSecret** envoy_admin_v3_SecretsConfigDump_mutable_static_secrets(envoy_admin_v3_SecretsConfigDump* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__SecretsConfigDump__StaticSecret_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -383,6 +403,7 @@ UPB_INLINE envoy_admin_v3_SecretsConfigDump_StaticSecret** envoy_admin_v3_Secret } UPB_INLINE struct envoy_admin_v3_SecretsConfigDump_StaticSecret* envoy_admin_v3_SecretsConfigDump_add_static_secrets(envoy_admin_v3_SecretsConfigDump* msg, upb_Arena* arena) { upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__SecretsConfigDump__StaticSecret_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -397,6 +418,7 @@ UPB_INLINE struct envoy_admin_v3_SecretsConfigDump_StaticSecret* envoy_admin_v3_ } UPB_INLINE envoy_admin_v3_SecretsConfigDump_DynamicSecret** envoy_admin_v3_SecretsConfigDump_mutable_dynamic_active_secrets(envoy_admin_v3_SecretsConfigDump* msg, size_t* size) { upb_MiniTableField field = {2, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__SecretsConfigDump__DynamicSecret_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -413,6 +435,7 @@ UPB_INLINE envoy_admin_v3_SecretsConfigDump_DynamicSecret** envoy_admin_v3_Secre } UPB_INLINE struct envoy_admin_v3_SecretsConfigDump_DynamicSecret* envoy_admin_v3_SecretsConfigDump_add_dynamic_active_secrets(envoy_admin_v3_SecretsConfigDump* msg, upb_Arena* arena) { upb_MiniTableField field = {2, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__SecretsConfigDump__DynamicSecret_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -427,6 +450,7 @@ UPB_INLINE struct envoy_admin_v3_SecretsConfigDump_DynamicSecret* envoy_admin_v3 } UPB_INLINE envoy_admin_v3_SecretsConfigDump_DynamicSecret** envoy_admin_v3_SecretsConfigDump_mutable_dynamic_warming_secrets(envoy_admin_v3_SecretsConfigDump* msg, size_t* size) { upb_MiniTableField field = {3, UPB_SIZE(16, 24), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__SecretsConfigDump__DynamicSecret_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -443,6 +467,7 @@ UPB_INLINE envoy_admin_v3_SecretsConfigDump_DynamicSecret** envoy_admin_v3_Secre } UPB_INLINE struct envoy_admin_v3_SecretsConfigDump_DynamicSecret* envoy_admin_v3_SecretsConfigDump_add_dynamic_warming_secrets(envoy_admin_v3_SecretsConfigDump* msg, upb_Arena* arena) { upb_MiniTableField field = {3, UPB_SIZE(16, 24), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__SecretsConfigDump__DynamicSecret_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -524,6 +549,7 @@ UPB_INLINE const struct google_protobuf_Timestamp* envoy_admin_v3_SecretsConfigD const struct google_protobuf_Timestamp* default_val = NULL; const struct google_protobuf_Timestamp* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Timestamp_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -540,6 +566,7 @@ UPB_INLINE const struct google_protobuf_Any* envoy_admin_v3_SecretsConfigDump_Dy const struct google_protobuf_Any* default_val = NULL; const struct google_protobuf_Any* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -556,6 +583,7 @@ UPB_INLINE const struct envoy_admin_v3_UpdateFailureState* envoy_admin_v3_Secret const struct envoy_admin_v3_UpdateFailureState* default_val = NULL; const struct envoy_admin_v3_UpdateFailureState* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__UpdateFailureState_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -587,6 +615,7 @@ UPB_INLINE void envoy_admin_v3_SecretsConfigDump_DynamicSecret_set_version_info( } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Timestamp_msg_init); 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) { @@ -599,6 +628,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); 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) { @@ -611,6 +641,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__UpdateFailureState_msg_init); 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) { @@ -682,6 +713,7 @@ UPB_INLINE const struct google_protobuf_Timestamp* envoy_admin_v3_SecretsConfigD const struct google_protobuf_Timestamp* default_val = NULL; const struct google_protobuf_Timestamp* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Timestamp_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -698,6 +730,7 @@ UPB_INLINE const struct google_protobuf_Any* envoy_admin_v3_SecretsConfigDump_St const struct google_protobuf_Any* default_val = NULL; const struct google_protobuf_Any* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -713,6 +746,7 @@ UPB_INLINE void envoy_admin_v3_SecretsConfigDump_StaticSecret_set_name(envoy_adm } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Timestamp_msg_init); 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) { @@ -725,6 +759,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); 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) { diff --git a/src/core/ext/upb-gen/envoy/admin/v3/config_dump.upb_minitable.c b/src/core/ext/upb-gen/envoy/admin/v3/config_dump.upb_minitable.c index 10dc05057ec..3a446cc8454 100644 --- a/src/core/ext/upb-gen/envoy/admin/v3/config_dump.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/admin/v3/config_dump.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/admin/v3/config_dump.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -18,8 +19,9 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub envoy_admin_v3_ConfigDump_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal envoy_admin_v3_ConfigDump_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, }; static const upb_MiniTableField envoy_admin_v3_ConfigDump__fields[1] = { @@ -39,9 +41,10 @@ const upb_MiniTable envoy__admin__v3__ConfigDump_msg_init = { }) }; -static const upb_MiniTableSub envoy_admin_v3_BootstrapConfigDump_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &envoy__config__bootstrap__v3__Bootstrap_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init}, +const upb_MiniTable* envoy__admin__v3__ConfigDump_msg_init_ptr = &envoy__admin__v3__ConfigDump_msg_init; +static const upb_MiniTableSubInternal envoy_admin_v3_BootstrapConfigDump_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &envoy__config__bootstrap__v3__Bootstrap_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init_ptr}, }; static const upb_MiniTableField envoy_admin_v3_BootstrapConfigDump__fields[2] = { @@ -58,10 +61,11 @@ const upb_MiniTable envoy__admin__v3__BootstrapConfigDump_msg_init = { #endif }; -static const upb_MiniTableSub envoy_admin_v3_SecretsConfigDump_submsgs[3] = { - {.UPB_PRIVATE(submsg) = &envoy__admin__v3__SecretsConfigDump__StaticSecret_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__admin__v3__SecretsConfigDump__DynamicSecret_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__admin__v3__SecretsConfigDump__DynamicSecret_msg_init}, +const upb_MiniTable* envoy__admin__v3__BootstrapConfigDump_msg_init_ptr = &envoy__admin__v3__BootstrapConfigDump_msg_init; +static const upb_MiniTableSubInternal envoy_admin_v3_SecretsConfigDump_submsgs[3] = { + {.UPB_PRIVATE(submsg) = &envoy__admin__v3__SecretsConfigDump__StaticSecret_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__admin__v3__SecretsConfigDump__DynamicSecret_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__admin__v3__SecretsConfigDump__DynamicSecret_msg_init_ptr}, }; static const upb_MiniTableField envoy_admin_v3_SecretsConfigDump__fields[3] = { @@ -85,10 +89,11 @@ const upb_MiniTable envoy__admin__v3__SecretsConfigDump_msg_init = { }) }; -static const upb_MiniTableSub envoy_admin_v3_SecretsConfigDump_DynamicSecret_submsgs[3] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__admin__v3__UpdateFailureState_msg_init}, +const upb_MiniTable* envoy__admin__v3__SecretsConfigDump_msg_init_ptr = &envoy__admin__v3__SecretsConfigDump_msg_init; +static const upb_MiniTableSubInternal envoy_admin_v3_SecretsConfigDump_DynamicSecret_submsgs[3] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__admin__v3__UpdateFailureState_msg_init_ptr}, }; static const upb_MiniTableField envoy_admin_v3_SecretsConfigDump_DynamicSecret__fields[6] = { @@ -119,9 +124,10 @@ const upb_MiniTable envoy__admin__v3__SecretsConfigDump__DynamicSecret_msg_init }) }; -static const upb_MiniTableSub envoy_admin_v3_SecretsConfigDump_StaticSecret_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init}, +const upb_MiniTable* envoy__admin__v3__SecretsConfigDump__DynamicSecret_msg_init_ptr = &envoy__admin__v3__SecretsConfigDump__DynamicSecret_msg_init; +static const upb_MiniTableSubInternal envoy_admin_v3_SecretsConfigDump_StaticSecret_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, }; static const upb_MiniTableField envoy_admin_v3_SecretsConfigDump_StaticSecret__fields[3] = { @@ -143,6 +149,7 @@ const upb_MiniTable envoy__admin__v3__SecretsConfigDump__StaticSecret_msg_init = }) }; +const upb_MiniTable* envoy__admin__v3__SecretsConfigDump__StaticSecret_msg_init_ptr = &envoy__admin__v3__SecretsConfigDump__StaticSecret_msg_init; static const upb_MiniTable *messages_layout[5] = { &envoy__admin__v3__ConfigDump_msg_init, &envoy__admin__v3__BootstrapConfigDump_msg_init, diff --git a/src/core/ext/upb-gen/envoy/admin/v3/config_dump.upb_minitable.h b/src/core/ext/upb-gen/envoy/admin/v3/config_dump.upb_minitable.h index 6aaafb8bf1d..4a92db9585f 100644 --- a/src/core/ext/upb-gen/envoy/admin/v3/config_dump.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/admin/v3/config_dump.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/admin/v3/config_dump.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_ADMIN_V3_CONFIG_DUMP_PROTO_UPB_MINITABLE_H_ #define ENVOY_ADMIN_V3_CONFIG_DUMP_PROTO_UPB_MINITABLE_H_ @@ -18,10 +19,15 @@ extern "C" { #endif extern const upb_MiniTable envoy__admin__v3__ConfigDump_msg_init; +extern const upb_MiniTable* envoy__admin__v3__ConfigDump_msg_init_ptr; extern const upb_MiniTable envoy__admin__v3__BootstrapConfigDump_msg_init; +extern const upb_MiniTable* envoy__admin__v3__BootstrapConfigDump_msg_init_ptr; extern const upb_MiniTable envoy__admin__v3__SecretsConfigDump_msg_init; +extern const upb_MiniTable* envoy__admin__v3__SecretsConfigDump_msg_init_ptr; extern const upb_MiniTable envoy__admin__v3__SecretsConfigDump__DynamicSecret_msg_init; +extern const upb_MiniTable* envoy__admin__v3__SecretsConfigDump__DynamicSecret_msg_init_ptr; extern const upb_MiniTable envoy__admin__v3__SecretsConfigDump__StaticSecret_msg_init; +extern const upb_MiniTable* envoy__admin__v3__SecretsConfigDump__StaticSecret_msg_init_ptr; extern const upb_MiniTableFile envoy_admin_v3_config_dump_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/admin/v3/config_dump_shared.upb.h b/src/core/ext/upb-gen/envoy/admin/v3/config_dump_shared.upb.h index 74114bc69bd..925854c0fd2 100644 --- a/src/core/ext/upb-gen/envoy/admin/v3/config_dump_shared.upb.h +++ b/src/core/ext/upb-gen/envoy/admin/v3/config_dump_shared.upb.h @@ -3,7 +3,8 @@ * envoy/admin/v3/config_dump_shared.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_ADMIN_V3_CONFIG_DUMP_SHARED_PROTO_UPB_H_ #define ENVOY_ADMIN_V3_CONFIG_DUMP_SHARED_PROTO_UPB_H_ @@ -100,6 +101,7 @@ UPB_INLINE const struct google_protobuf_Any* envoy_admin_v3_UpdateFailureState_f const struct google_protobuf_Any* default_val = NULL; const struct google_protobuf_Any* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -116,6 +118,7 @@ UPB_INLINE const struct google_protobuf_Timestamp* envoy_admin_v3_UpdateFailureS const struct google_protobuf_Timestamp* default_val = NULL; const struct google_protobuf_Timestamp* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Timestamp_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -151,6 +154,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); 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) { @@ -163,6 +167,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Timestamp_msg_init); 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) { @@ -236,6 +241,7 @@ UPB_INLINE void envoy_admin_v3_ListenersConfigDump_clear_static_listeners(envoy_ } UPB_INLINE const envoy_admin_v3_ListenersConfigDump_StaticListener* const* envoy_admin_v3_ListenersConfigDump_static_listeners(const envoy_admin_v3_ListenersConfigDump* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__ListenersConfigDump__StaticListener_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -247,6 +253,7 @@ UPB_INLINE const envoy_admin_v3_ListenersConfigDump_StaticListener* const* envoy } UPB_INLINE const upb_Array* _envoy_admin_v3_ListenersConfigDump_static_listeners_upb_array(const envoy_admin_v3_ListenersConfigDump* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__ListenersConfigDump__StaticListener_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -255,6 +262,7 @@ UPB_INLINE const upb_Array* _envoy_admin_v3_ListenersConfigDump_static_listeners } UPB_INLINE upb_Array* _envoy_admin_v3_ListenersConfigDump_static_listeners_mutable_upb_array(envoy_admin_v3_ListenersConfigDump* msg, size_t* size, upb_Arena* arena) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__ListenersConfigDump__StaticListener_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -268,6 +276,7 @@ UPB_INLINE void envoy_admin_v3_ListenersConfigDump_clear_dynamic_listeners(envoy } UPB_INLINE const envoy_admin_v3_ListenersConfigDump_DynamicListener* const* envoy_admin_v3_ListenersConfigDump_dynamic_listeners(const envoy_admin_v3_ListenersConfigDump* msg, size_t* size) { const upb_MiniTableField field = {3, UPB_SIZE(12, 32), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__ListenersConfigDump__DynamicListener_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -279,6 +288,7 @@ UPB_INLINE const envoy_admin_v3_ListenersConfigDump_DynamicListener* const* envo } UPB_INLINE const upb_Array* _envoy_admin_v3_ListenersConfigDump_dynamic_listeners_upb_array(const envoy_admin_v3_ListenersConfigDump* msg, size_t* size) { const upb_MiniTableField field = {3, UPB_SIZE(12, 32), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__ListenersConfigDump__DynamicListener_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -287,6 +297,7 @@ UPB_INLINE const upb_Array* _envoy_admin_v3_ListenersConfigDump_dynamic_listener } UPB_INLINE upb_Array* _envoy_admin_v3_ListenersConfigDump_dynamic_listeners_mutable_upb_array(envoy_admin_v3_ListenersConfigDump* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {3, UPB_SIZE(12, 32), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__ListenersConfigDump__DynamicListener_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -301,6 +312,7 @@ UPB_INLINE void envoy_admin_v3_ListenersConfigDump_set_version_info(envoy_admin_ } 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__ListenersConfigDump__StaticListener_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -317,6 +329,7 @@ UPB_INLINE envoy_admin_v3_ListenersConfigDump_StaticListener** envoy_admin_v3_Li } UPB_INLINE struct envoy_admin_v3_ListenersConfigDump_StaticListener* envoy_admin_v3_ListenersConfigDump_add_static_listeners(envoy_admin_v3_ListenersConfigDump* msg, upb_Arena* arena) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__ListenersConfigDump__StaticListener_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -331,6 +344,7 @@ UPB_INLINE struct envoy_admin_v3_ListenersConfigDump_StaticListener* envoy_admin } UPB_INLINE envoy_admin_v3_ListenersConfigDump_DynamicListener** envoy_admin_v3_ListenersConfigDump_mutable_dynamic_listeners(envoy_admin_v3_ListenersConfigDump* msg, size_t* size) { upb_MiniTableField field = {3, UPB_SIZE(12, 32), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__ListenersConfigDump__DynamicListener_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -347,6 +361,7 @@ UPB_INLINE envoy_admin_v3_ListenersConfigDump_DynamicListener** envoy_admin_v3_L } UPB_INLINE struct envoy_admin_v3_ListenersConfigDump_DynamicListener* envoy_admin_v3_ListenersConfigDump_add_dynamic_listeners(envoy_admin_v3_ListenersConfigDump* msg, upb_Arena* arena) { upb_MiniTableField field = {3, UPB_SIZE(12, 32), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__ListenersConfigDump__DynamicListener_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -404,6 +419,7 @@ UPB_INLINE const struct google_protobuf_Any* envoy_admin_v3_ListenersConfigDump_ const struct google_protobuf_Any* default_val = NULL; const struct google_protobuf_Any* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -420,6 +436,7 @@ UPB_INLINE const struct google_protobuf_Timestamp* envoy_admin_v3_ListenersConfi const struct google_protobuf_Timestamp* default_val = NULL; const struct google_protobuf_Timestamp* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Timestamp_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -431,6 +448,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); 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) { @@ -443,6 +461,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Timestamp_msg_init); 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) { @@ -510,6 +529,7 @@ UPB_INLINE const struct google_protobuf_Any* envoy_admin_v3_ListenersConfigDump_ const struct google_protobuf_Any* default_val = NULL; const struct google_protobuf_Any* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -526,6 +546,7 @@ UPB_INLINE const struct google_protobuf_Timestamp* envoy_admin_v3_ListenersConfi const struct google_protobuf_Timestamp* default_val = NULL; const struct google_protobuf_Timestamp* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Timestamp_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -541,6 +562,7 @@ UPB_INLINE void envoy_admin_v3_ListenersConfigDump_DynamicListenerState_set_vers } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); 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) { @@ -553,6 +575,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Timestamp_msg_init); 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) { @@ -620,6 +643,7 @@ UPB_INLINE const envoy_admin_v3_ListenersConfigDump_DynamicListenerState* envoy_ const envoy_admin_v3_ListenersConfigDump_DynamicListenerState* default_val = NULL; const envoy_admin_v3_ListenersConfigDump_DynamicListenerState* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__ListenersConfigDump__DynamicListenerState_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -636,6 +660,7 @@ UPB_INLINE const envoy_admin_v3_ListenersConfigDump_DynamicListenerState* envoy_ const envoy_admin_v3_ListenersConfigDump_DynamicListenerState* default_val = NULL; const envoy_admin_v3_ListenersConfigDump_DynamicListenerState* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__ListenersConfigDump__DynamicListenerState_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -652,6 +677,7 @@ UPB_INLINE const envoy_admin_v3_ListenersConfigDump_DynamicListenerState* envoy_ const envoy_admin_v3_ListenersConfigDump_DynamicListenerState* default_val = NULL; const envoy_admin_v3_ListenersConfigDump_DynamicListenerState* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__ListenersConfigDump__DynamicListenerState_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -668,6 +694,7 @@ UPB_INLINE const envoy_admin_v3_UpdateFailureState* envoy_admin_v3_ListenersConf const envoy_admin_v3_UpdateFailureState* default_val = NULL; const envoy_admin_v3_UpdateFailureState* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__UpdateFailureState_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -695,6 +722,7 @@ UPB_INLINE void envoy_admin_v3_ListenersConfigDump_DynamicListener_set_name(envo } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__ListenersConfigDump__DynamicListenerState_msg_init); 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) { @@ -707,6 +735,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__ListenersConfigDump__DynamicListenerState_msg_init); 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) { @@ -719,6 +748,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__ListenersConfigDump__DynamicListenerState_msg_init); 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) { @@ -731,6 +761,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__UpdateFailureState_msg_init); 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) { @@ -800,6 +831,7 @@ UPB_INLINE void envoy_admin_v3_ClustersConfigDump_clear_static_clusters(envoy_ad } UPB_INLINE const envoy_admin_v3_ClustersConfigDump_StaticCluster* const* envoy_admin_v3_ClustersConfigDump_static_clusters(const envoy_admin_v3_ClustersConfigDump* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__ClustersConfigDump__StaticCluster_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -811,6 +843,7 @@ UPB_INLINE const envoy_admin_v3_ClustersConfigDump_StaticCluster* const* envoy_a } UPB_INLINE const upb_Array* _envoy_admin_v3_ClustersConfigDump_static_clusters_upb_array(const envoy_admin_v3_ClustersConfigDump* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__ClustersConfigDump__StaticCluster_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -819,6 +852,7 @@ UPB_INLINE const upb_Array* _envoy_admin_v3_ClustersConfigDump_static_clusters_u } UPB_INLINE upb_Array* _envoy_admin_v3_ClustersConfigDump_static_clusters_mutable_upb_array(envoy_admin_v3_ClustersConfigDump* msg, size_t* size, upb_Arena* arena) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__ClustersConfigDump__StaticCluster_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -832,6 +866,7 @@ UPB_INLINE void envoy_admin_v3_ClustersConfigDump_clear_dynamic_active_clusters( } UPB_INLINE const envoy_admin_v3_ClustersConfigDump_DynamicCluster* const* envoy_admin_v3_ClustersConfigDump_dynamic_active_clusters(const envoy_admin_v3_ClustersConfigDump* msg, size_t* size) { const upb_MiniTableField field = {3, UPB_SIZE(12, 32), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__ClustersConfigDump__DynamicCluster_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -843,6 +878,7 @@ UPB_INLINE const envoy_admin_v3_ClustersConfigDump_DynamicCluster* const* envoy_ } UPB_INLINE const upb_Array* _envoy_admin_v3_ClustersConfigDump_dynamic_active_clusters_upb_array(const envoy_admin_v3_ClustersConfigDump* msg, size_t* size) { const upb_MiniTableField field = {3, UPB_SIZE(12, 32), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__ClustersConfigDump__DynamicCluster_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -851,6 +887,7 @@ UPB_INLINE const upb_Array* _envoy_admin_v3_ClustersConfigDump_dynamic_active_cl } UPB_INLINE upb_Array* _envoy_admin_v3_ClustersConfigDump_dynamic_active_clusters_mutable_upb_array(envoy_admin_v3_ClustersConfigDump* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {3, UPB_SIZE(12, 32), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__ClustersConfigDump__DynamicCluster_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -864,6 +901,7 @@ UPB_INLINE void envoy_admin_v3_ClustersConfigDump_clear_dynamic_warming_clusters } UPB_INLINE const envoy_admin_v3_ClustersConfigDump_DynamicCluster* const* envoy_admin_v3_ClustersConfigDump_dynamic_warming_clusters(const envoy_admin_v3_ClustersConfigDump* msg, size_t* size) { const upb_MiniTableField field = {4, UPB_SIZE(16, 40), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__ClustersConfigDump__DynamicCluster_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -875,6 +913,7 @@ UPB_INLINE const envoy_admin_v3_ClustersConfigDump_DynamicCluster* const* envoy_ } UPB_INLINE const upb_Array* _envoy_admin_v3_ClustersConfigDump_dynamic_warming_clusters_upb_array(const envoy_admin_v3_ClustersConfigDump* msg, size_t* size) { const upb_MiniTableField field = {4, UPB_SIZE(16, 40), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__ClustersConfigDump__DynamicCluster_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -883,6 +922,7 @@ UPB_INLINE const upb_Array* _envoy_admin_v3_ClustersConfigDump_dynamic_warming_c } UPB_INLINE upb_Array* _envoy_admin_v3_ClustersConfigDump_dynamic_warming_clusters_mutable_upb_array(envoy_admin_v3_ClustersConfigDump* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {4, UPB_SIZE(16, 40), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__ClustersConfigDump__DynamicCluster_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -897,6 +937,7 @@ UPB_INLINE void envoy_admin_v3_ClustersConfigDump_set_version_info(envoy_admin_v } 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__ClustersConfigDump__StaticCluster_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -913,6 +954,7 @@ UPB_INLINE envoy_admin_v3_ClustersConfigDump_StaticCluster** envoy_admin_v3_Clus } UPB_INLINE struct envoy_admin_v3_ClustersConfigDump_StaticCluster* envoy_admin_v3_ClustersConfigDump_add_static_clusters(envoy_admin_v3_ClustersConfigDump* msg, upb_Arena* arena) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__ClustersConfigDump__StaticCluster_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -927,6 +969,7 @@ UPB_INLINE struct envoy_admin_v3_ClustersConfigDump_StaticCluster* envoy_admin_v } UPB_INLINE envoy_admin_v3_ClustersConfigDump_DynamicCluster** envoy_admin_v3_ClustersConfigDump_mutable_dynamic_active_clusters(envoy_admin_v3_ClustersConfigDump* msg, size_t* size) { upb_MiniTableField field = {3, UPB_SIZE(12, 32), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__ClustersConfigDump__DynamicCluster_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -943,6 +986,7 @@ UPB_INLINE envoy_admin_v3_ClustersConfigDump_DynamicCluster** envoy_admin_v3_Clu } UPB_INLINE struct envoy_admin_v3_ClustersConfigDump_DynamicCluster* envoy_admin_v3_ClustersConfigDump_add_dynamic_active_clusters(envoy_admin_v3_ClustersConfigDump* msg, upb_Arena* arena) { upb_MiniTableField field = {3, UPB_SIZE(12, 32), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__ClustersConfigDump__DynamicCluster_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -957,6 +1001,7 @@ UPB_INLINE struct envoy_admin_v3_ClustersConfigDump_DynamicCluster* envoy_admin_ } UPB_INLINE envoy_admin_v3_ClustersConfigDump_DynamicCluster** envoy_admin_v3_ClustersConfigDump_mutable_dynamic_warming_clusters(envoy_admin_v3_ClustersConfigDump* msg, size_t* size) { upb_MiniTableField field = {4, UPB_SIZE(16, 40), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__ClustersConfigDump__DynamicCluster_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -973,6 +1018,7 @@ UPB_INLINE envoy_admin_v3_ClustersConfigDump_DynamicCluster** envoy_admin_v3_Clu } UPB_INLINE struct envoy_admin_v3_ClustersConfigDump_DynamicCluster* envoy_admin_v3_ClustersConfigDump_add_dynamic_warming_clusters(envoy_admin_v3_ClustersConfigDump* msg, upb_Arena* arena) { upb_MiniTableField field = {4, UPB_SIZE(16, 40), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__ClustersConfigDump__DynamicCluster_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -1030,6 +1076,7 @@ UPB_INLINE const struct google_protobuf_Any* envoy_admin_v3_ClustersConfigDump_S const struct google_protobuf_Any* default_val = NULL; const struct google_protobuf_Any* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1046,6 +1093,7 @@ UPB_INLINE const struct google_protobuf_Timestamp* envoy_admin_v3_ClustersConfig const struct google_protobuf_Timestamp* default_val = NULL; const struct google_protobuf_Timestamp* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Timestamp_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1057,6 +1105,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); 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) { @@ -1069,6 +1118,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Timestamp_msg_init); 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) { @@ -1136,6 +1186,7 @@ UPB_INLINE const struct google_protobuf_Any* envoy_admin_v3_ClustersConfigDump_D const struct google_protobuf_Any* default_val = NULL; const struct google_protobuf_Any* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1152,6 +1203,7 @@ UPB_INLINE const struct google_protobuf_Timestamp* envoy_admin_v3_ClustersConfig const struct google_protobuf_Timestamp* default_val = NULL; const struct google_protobuf_Timestamp* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Timestamp_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1168,6 +1220,7 @@ UPB_INLINE const envoy_admin_v3_UpdateFailureState* envoy_admin_v3_ClustersConfi const envoy_admin_v3_UpdateFailureState* default_val = NULL; const envoy_admin_v3_UpdateFailureState* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__UpdateFailureState_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1195,6 +1248,7 @@ UPB_INLINE void envoy_admin_v3_ClustersConfigDump_DynamicCluster_set_version_inf } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); 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) { @@ -1207,6 +1261,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Timestamp_msg_init); 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) { @@ -1219,6 +1274,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__UpdateFailureState_msg_init); 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) { @@ -1276,6 +1332,7 @@ UPB_INLINE void envoy_admin_v3_RoutesConfigDump_clear_static_route_configs(envoy } UPB_INLINE const envoy_admin_v3_RoutesConfigDump_StaticRouteConfig* const* envoy_admin_v3_RoutesConfigDump_static_route_configs(const envoy_admin_v3_RoutesConfigDump* msg, size_t* size) { const upb_MiniTableField field = {2, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__RoutesConfigDump__StaticRouteConfig_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1287,6 +1344,7 @@ UPB_INLINE const envoy_admin_v3_RoutesConfigDump_StaticRouteConfig* const* envoy } UPB_INLINE const upb_Array* _envoy_admin_v3_RoutesConfigDump_static_route_configs_upb_array(const envoy_admin_v3_RoutesConfigDump* msg, size_t* size) { const upb_MiniTableField field = {2, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__RoutesConfigDump__StaticRouteConfig_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -1295,6 +1353,7 @@ UPB_INLINE const upb_Array* _envoy_admin_v3_RoutesConfigDump_static_route_config } UPB_INLINE upb_Array* _envoy_admin_v3_RoutesConfigDump_static_route_configs_mutable_upb_array(envoy_admin_v3_RoutesConfigDump* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {2, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__RoutesConfigDump__StaticRouteConfig_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -1308,6 +1367,7 @@ UPB_INLINE void envoy_admin_v3_RoutesConfigDump_clear_dynamic_route_configs(envo } UPB_INLINE const envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig* const* envoy_admin_v3_RoutesConfigDump_dynamic_route_configs(const envoy_admin_v3_RoutesConfigDump* msg, size_t* size) { const upb_MiniTableField field = {3, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__RoutesConfigDump__DynamicRouteConfig_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1319,6 +1379,7 @@ UPB_INLINE const envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig* const* envo } UPB_INLINE const upb_Array* _envoy_admin_v3_RoutesConfigDump_dynamic_route_configs_upb_array(const envoy_admin_v3_RoutesConfigDump* msg, size_t* size) { const upb_MiniTableField field = {3, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__RoutesConfigDump__DynamicRouteConfig_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -1327,6 +1388,7 @@ UPB_INLINE const upb_Array* _envoy_admin_v3_RoutesConfigDump_dynamic_route_confi } UPB_INLINE upb_Array* _envoy_admin_v3_RoutesConfigDump_dynamic_route_configs_mutable_upb_array(envoy_admin_v3_RoutesConfigDump* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {3, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__RoutesConfigDump__DynamicRouteConfig_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -1337,6 +1399,7 @@ UPB_INLINE upb_Array* _envoy_admin_v3_RoutesConfigDump_dynamic_route_configs_mut UPB_INLINE envoy_admin_v3_RoutesConfigDump_StaticRouteConfig** envoy_admin_v3_RoutesConfigDump_mutable_static_route_configs(envoy_admin_v3_RoutesConfigDump* msg, size_t* size) { upb_MiniTableField field = {2, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__RoutesConfigDump__StaticRouteConfig_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1353,6 +1416,7 @@ UPB_INLINE envoy_admin_v3_RoutesConfigDump_StaticRouteConfig** envoy_admin_v3_Ro } UPB_INLINE struct envoy_admin_v3_RoutesConfigDump_StaticRouteConfig* envoy_admin_v3_RoutesConfigDump_add_static_route_configs(envoy_admin_v3_RoutesConfigDump* msg, upb_Arena* arena) { upb_MiniTableField field = {2, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__RoutesConfigDump__StaticRouteConfig_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -1367,6 +1431,7 @@ UPB_INLINE struct envoy_admin_v3_RoutesConfigDump_StaticRouteConfig* envoy_admin } UPB_INLINE envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig** envoy_admin_v3_RoutesConfigDump_mutable_dynamic_route_configs(envoy_admin_v3_RoutesConfigDump* msg, size_t* size) { upb_MiniTableField field = {3, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__RoutesConfigDump__DynamicRouteConfig_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1383,6 +1448,7 @@ UPB_INLINE envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig** envoy_admin_v3_R } UPB_INLINE struct envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig* envoy_admin_v3_RoutesConfigDump_add_dynamic_route_configs(envoy_admin_v3_RoutesConfigDump* msg, upb_Arena* arena) { upb_MiniTableField field = {3, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__RoutesConfigDump__DynamicRouteConfig_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -1440,6 +1506,7 @@ UPB_INLINE const struct google_protobuf_Any* envoy_admin_v3_RoutesConfigDump_Sta const struct google_protobuf_Any* default_val = NULL; const struct google_protobuf_Any* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1456,6 +1523,7 @@ UPB_INLINE const struct google_protobuf_Timestamp* envoy_admin_v3_RoutesConfigDu const struct google_protobuf_Timestamp* default_val = NULL; const struct google_protobuf_Timestamp* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Timestamp_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1467,6 +1535,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); 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) { @@ -1479,6 +1548,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Timestamp_msg_init); 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) { @@ -1546,6 +1616,7 @@ UPB_INLINE const struct google_protobuf_Any* envoy_admin_v3_RoutesConfigDump_Dyn const struct google_protobuf_Any* default_val = NULL; const struct google_protobuf_Any* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1562,6 +1633,7 @@ UPB_INLINE const struct google_protobuf_Timestamp* envoy_admin_v3_RoutesConfigDu const struct google_protobuf_Timestamp* default_val = NULL; const struct google_protobuf_Timestamp* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Timestamp_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1578,6 +1650,7 @@ UPB_INLINE const envoy_admin_v3_UpdateFailureState* envoy_admin_v3_RoutesConfigD const envoy_admin_v3_UpdateFailureState* default_val = NULL; const envoy_admin_v3_UpdateFailureState* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__UpdateFailureState_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1605,6 +1678,7 @@ UPB_INLINE void envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_set_version_i } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); 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) { @@ -1617,6 +1691,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Timestamp_msg_init); 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) { @@ -1629,6 +1704,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__UpdateFailureState_msg_init); 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) { @@ -1686,6 +1762,7 @@ UPB_INLINE void envoy_admin_v3_ScopedRoutesConfigDump_clear_inline_scoped_route_ } UPB_INLINE const envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs* const* envoy_admin_v3_ScopedRoutesConfigDump_inline_scoped_route_configs(const envoy_admin_v3_ScopedRoutesConfigDump* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__ScopedRoutesConfigDump__InlineScopedRouteConfigs_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1697,6 +1774,7 @@ UPB_INLINE const envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs* } UPB_INLINE const upb_Array* _envoy_admin_v3_ScopedRoutesConfigDump_inline_scoped_route_configs_upb_array(const envoy_admin_v3_ScopedRoutesConfigDump* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__ScopedRoutesConfigDump__InlineScopedRouteConfigs_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -1705,6 +1783,7 @@ UPB_INLINE const upb_Array* _envoy_admin_v3_ScopedRoutesConfigDump_inline_scoped } UPB_INLINE upb_Array* _envoy_admin_v3_ScopedRoutesConfigDump_inline_scoped_route_configs_mutable_upb_array(envoy_admin_v3_ScopedRoutesConfigDump* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__ScopedRoutesConfigDump__InlineScopedRouteConfigs_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -1718,6 +1797,7 @@ UPB_INLINE void envoy_admin_v3_ScopedRoutesConfigDump_clear_dynamic_scoped_route } UPB_INLINE const envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs* const* envoy_admin_v3_ScopedRoutesConfigDump_dynamic_scoped_route_configs(const envoy_admin_v3_ScopedRoutesConfigDump* msg, size_t* size) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__ScopedRoutesConfigDump__DynamicScopedRouteConfigs_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1729,6 +1809,7 @@ UPB_INLINE const envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs } UPB_INLINE const upb_Array* _envoy_admin_v3_ScopedRoutesConfigDump_dynamic_scoped_route_configs_upb_array(const envoy_admin_v3_ScopedRoutesConfigDump* msg, size_t* size) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__ScopedRoutesConfigDump__DynamicScopedRouteConfigs_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -1737,6 +1818,7 @@ UPB_INLINE const upb_Array* _envoy_admin_v3_ScopedRoutesConfigDump_dynamic_scope } UPB_INLINE upb_Array* _envoy_admin_v3_ScopedRoutesConfigDump_dynamic_scoped_route_configs_mutable_upb_array(envoy_admin_v3_ScopedRoutesConfigDump* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__ScopedRoutesConfigDump__DynamicScopedRouteConfigs_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -1747,6 +1829,7 @@ UPB_INLINE upb_Array* _envoy_admin_v3_ScopedRoutesConfigDump_dynamic_scoped_rout UPB_INLINE envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs** envoy_admin_v3_ScopedRoutesConfigDump_mutable_inline_scoped_route_configs(envoy_admin_v3_ScopedRoutesConfigDump* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__ScopedRoutesConfigDump__InlineScopedRouteConfigs_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1763,6 +1846,7 @@ UPB_INLINE envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs** envo } UPB_INLINE struct envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs* envoy_admin_v3_ScopedRoutesConfigDump_add_inline_scoped_route_configs(envoy_admin_v3_ScopedRoutesConfigDump* msg, upb_Arena* arena) { upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__ScopedRoutesConfigDump__InlineScopedRouteConfigs_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -1777,6 +1861,7 @@ UPB_INLINE struct envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs } UPB_INLINE envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs** envoy_admin_v3_ScopedRoutesConfigDump_mutable_dynamic_scoped_route_configs(envoy_admin_v3_ScopedRoutesConfigDump* msg, size_t* size) { upb_MiniTableField field = {2, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__ScopedRoutesConfigDump__DynamicScopedRouteConfigs_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1793,6 +1878,7 @@ UPB_INLINE envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs** env } UPB_INLINE struct envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs* envoy_admin_v3_ScopedRoutesConfigDump_add_dynamic_scoped_route_configs(envoy_admin_v3_ScopedRoutesConfigDump* msg, upb_Arena* arena) { upb_MiniTableField field = {2, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__ScopedRoutesConfigDump__DynamicScopedRouteConfigs_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -1860,6 +1946,7 @@ UPB_INLINE void envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_c } UPB_INLINE const struct google_protobuf_Any* const* envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_scoped_route_configs(const envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1871,6 +1958,7 @@ UPB_INLINE const struct google_protobuf_Any* const* envoy_admin_v3_ScopedRoutesC } UPB_INLINE const upb_Array* _envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_scoped_route_configs_upb_array(const envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -1879,6 +1967,7 @@ UPB_INLINE const upb_Array* _envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedR } UPB_INLINE upb_Array* _envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_scoped_route_configs_mutable_upb_array(envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs* msg, size_t* size, upb_Arena* arena) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -1894,6 +1983,7 @@ UPB_INLINE const struct google_protobuf_Timestamp* envoy_admin_v3_ScopedRoutesCo const struct google_protobuf_Timestamp* default_val = NULL; const struct google_protobuf_Timestamp* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Timestamp_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1909,6 +1999,7 @@ UPB_INLINE void envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_s } 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1925,6 +2016,7 @@ UPB_INLINE struct google_protobuf_Any** envoy_admin_v3_ScopedRoutesConfigDump_In } UPB_INLINE struct google_protobuf_Any* envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_add_scoped_route_configs(envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs* msg, upb_Arena* arena) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -1939,6 +2031,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Timestamp_msg_init); 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) { @@ -2016,6 +2109,7 @@ UPB_INLINE void envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_ } UPB_INLINE const struct google_protobuf_Any* const* envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_scoped_route_configs(const envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -2027,6 +2121,7 @@ UPB_INLINE const struct google_protobuf_Any* const* envoy_admin_v3_ScopedRoutesC } UPB_INLINE const upb_Array* _envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_scoped_route_configs_upb_array(const envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -2035,6 +2130,7 @@ UPB_INLINE const upb_Array* _envoy_admin_v3_ScopedRoutesConfigDump_DynamicScoped } UPB_INLINE upb_Array* _envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_scoped_route_configs_mutable_upb_array(envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs* msg, size_t* size, upb_Arena* arena) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -2050,6 +2146,7 @@ UPB_INLINE const struct google_protobuf_Timestamp* envoy_admin_v3_ScopedRoutesCo const struct google_protobuf_Timestamp* default_val = NULL; const struct google_protobuf_Timestamp* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Timestamp_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -2066,6 +2163,7 @@ UPB_INLINE const envoy_admin_v3_UpdateFailureState* envoy_admin_v3_ScopedRoutesC const envoy_admin_v3_UpdateFailureState* default_val = NULL; const envoy_admin_v3_UpdateFailureState* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__UpdateFailureState_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -2097,6 +2195,7 @@ UPB_INLINE void envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_ } 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -2113,6 +2212,7 @@ UPB_INLINE struct google_protobuf_Any** envoy_admin_v3_ScopedRoutesConfigDump_Dy } UPB_INLINE struct google_protobuf_Any* envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_add_scoped_route_configs(envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs* msg, upb_Arena* arena) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -2127,6 +2227,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Timestamp_msg_init); 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) { @@ -2139,6 +2240,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__UpdateFailureState_msg_init); 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) { @@ -2196,6 +2298,7 @@ UPB_INLINE void envoy_admin_v3_EndpointsConfigDump_clear_static_endpoint_configs } UPB_INLINE const envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig* const* envoy_admin_v3_EndpointsConfigDump_static_endpoint_configs(const envoy_admin_v3_EndpointsConfigDump* msg, size_t* size) { const upb_MiniTableField field = {2, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__EndpointsConfigDump__StaticEndpointConfig_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -2207,6 +2310,7 @@ UPB_INLINE const envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig* const* } UPB_INLINE const upb_Array* _envoy_admin_v3_EndpointsConfigDump_static_endpoint_configs_upb_array(const envoy_admin_v3_EndpointsConfigDump* msg, size_t* size) { const upb_MiniTableField field = {2, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__EndpointsConfigDump__StaticEndpointConfig_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -2215,6 +2319,7 @@ UPB_INLINE const upb_Array* _envoy_admin_v3_EndpointsConfigDump_static_endpoint_ } UPB_INLINE upb_Array* _envoy_admin_v3_EndpointsConfigDump_static_endpoint_configs_mutable_upb_array(envoy_admin_v3_EndpointsConfigDump* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {2, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__EndpointsConfigDump__StaticEndpointConfig_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -2228,6 +2333,7 @@ UPB_INLINE void envoy_admin_v3_EndpointsConfigDump_clear_dynamic_endpoint_config } UPB_INLINE const envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig* const* envoy_admin_v3_EndpointsConfigDump_dynamic_endpoint_configs(const envoy_admin_v3_EndpointsConfigDump* msg, size_t* size) { const upb_MiniTableField field = {3, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__EndpointsConfigDump__DynamicEndpointConfig_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -2239,6 +2345,7 @@ UPB_INLINE const envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig* const } UPB_INLINE const upb_Array* _envoy_admin_v3_EndpointsConfigDump_dynamic_endpoint_configs_upb_array(const envoy_admin_v3_EndpointsConfigDump* msg, size_t* size) { const upb_MiniTableField field = {3, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__EndpointsConfigDump__DynamicEndpointConfig_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -2247,6 +2354,7 @@ UPB_INLINE const upb_Array* _envoy_admin_v3_EndpointsConfigDump_dynamic_endpoint } UPB_INLINE upb_Array* _envoy_admin_v3_EndpointsConfigDump_dynamic_endpoint_configs_mutable_upb_array(envoy_admin_v3_EndpointsConfigDump* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {3, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__EndpointsConfigDump__DynamicEndpointConfig_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -2257,6 +2365,7 @@ UPB_INLINE upb_Array* _envoy_admin_v3_EndpointsConfigDump_dynamic_endpoint_confi UPB_INLINE envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig** envoy_admin_v3_EndpointsConfigDump_mutable_static_endpoint_configs(envoy_admin_v3_EndpointsConfigDump* msg, size_t* size) { upb_MiniTableField field = {2, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__EndpointsConfigDump__StaticEndpointConfig_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -2273,6 +2382,7 @@ UPB_INLINE envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig** envoy_admin } UPB_INLINE struct envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig* envoy_admin_v3_EndpointsConfigDump_add_static_endpoint_configs(envoy_admin_v3_EndpointsConfigDump* msg, upb_Arena* arena) { upb_MiniTableField field = {2, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__EndpointsConfigDump__StaticEndpointConfig_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -2287,6 +2397,7 @@ UPB_INLINE struct envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig* envoy } UPB_INLINE envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig** envoy_admin_v3_EndpointsConfigDump_mutable_dynamic_endpoint_configs(envoy_admin_v3_EndpointsConfigDump* msg, size_t* size) { upb_MiniTableField field = {3, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__EndpointsConfigDump__DynamicEndpointConfig_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -2303,6 +2414,7 @@ UPB_INLINE envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig** envoy_admi } UPB_INLINE struct envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig* envoy_admin_v3_EndpointsConfigDump_add_dynamic_endpoint_configs(envoy_admin_v3_EndpointsConfigDump* msg, upb_Arena* arena) { upb_MiniTableField field = {3, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__EndpointsConfigDump__DynamicEndpointConfig_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -2360,6 +2472,7 @@ UPB_INLINE const struct google_protobuf_Any* envoy_admin_v3_EndpointsConfigDump_ const struct google_protobuf_Any* default_val = NULL; const struct google_protobuf_Any* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -2376,6 +2489,7 @@ UPB_INLINE const struct google_protobuf_Timestamp* envoy_admin_v3_EndpointsConfi const struct google_protobuf_Timestamp* default_val = NULL; const struct google_protobuf_Timestamp* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Timestamp_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -2387,6 +2501,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); 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) { @@ -2399,6 +2514,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Timestamp_msg_init); 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) { @@ -2466,6 +2582,7 @@ UPB_INLINE const struct google_protobuf_Any* envoy_admin_v3_EndpointsConfigDump_ const struct google_protobuf_Any* default_val = NULL; const struct google_protobuf_Any* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -2482,6 +2599,7 @@ UPB_INLINE const struct google_protobuf_Timestamp* envoy_admin_v3_EndpointsConfi const struct google_protobuf_Timestamp* default_val = NULL; const struct google_protobuf_Timestamp* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Timestamp_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -2498,6 +2616,7 @@ UPB_INLINE const envoy_admin_v3_UpdateFailureState* envoy_admin_v3_EndpointsConf const envoy_admin_v3_UpdateFailureState* default_val = NULL; const envoy_admin_v3_UpdateFailureState* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__UpdateFailureState_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -2525,6 +2644,7 @@ UPB_INLINE void envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_set_ver } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); 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) { @@ -2537,6 +2657,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Timestamp_msg_init); 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) { @@ -2549,6 +2670,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__UpdateFailureState_msg_init); 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) { @@ -2606,6 +2728,7 @@ UPB_INLINE void envoy_admin_v3_EcdsConfigDump_clear_ecds_filters(envoy_admin_v3_ } UPB_INLINE const envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig* const* envoy_admin_v3_EcdsConfigDump_ecds_filters(const envoy_admin_v3_EcdsConfigDump* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__EcdsConfigDump__EcdsFilterConfig_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -2617,6 +2740,7 @@ UPB_INLINE const envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig* const* envoy_ad } UPB_INLINE const upb_Array* _envoy_admin_v3_EcdsConfigDump_ecds_filters_upb_array(const envoy_admin_v3_EcdsConfigDump* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__EcdsConfigDump__EcdsFilterConfig_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -2625,6 +2749,7 @@ UPB_INLINE const upb_Array* _envoy_admin_v3_EcdsConfigDump_ecds_filters_upb_arra } UPB_INLINE upb_Array* _envoy_admin_v3_EcdsConfigDump_ecds_filters_mutable_upb_array(envoy_admin_v3_EcdsConfigDump* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__EcdsConfigDump__EcdsFilterConfig_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -2635,6 +2760,7 @@ UPB_INLINE upb_Array* _envoy_admin_v3_EcdsConfigDump_ecds_filters_mutable_upb_ar UPB_INLINE envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig** envoy_admin_v3_EcdsConfigDump_mutable_ecds_filters(envoy_admin_v3_EcdsConfigDump* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__EcdsConfigDump__EcdsFilterConfig_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -2651,6 +2777,7 @@ UPB_INLINE envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig** envoy_admin_v3_EcdsC } UPB_INLINE struct envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig* envoy_admin_v3_EcdsConfigDump_add_ecds_filters(envoy_admin_v3_EcdsConfigDump* msg, upb_Arena* arena) { upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__EcdsConfigDump__EcdsFilterConfig_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -2720,6 +2847,7 @@ UPB_INLINE const struct google_protobuf_Any* envoy_admin_v3_EcdsConfigDump_EcdsF const struct google_protobuf_Any* default_val = NULL; const struct google_protobuf_Any* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -2736,6 +2864,7 @@ UPB_INLINE const struct google_protobuf_Timestamp* envoy_admin_v3_EcdsConfigDump const struct google_protobuf_Timestamp* default_val = NULL; const struct google_protobuf_Timestamp* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Timestamp_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -2752,6 +2881,7 @@ UPB_INLINE const envoy_admin_v3_UpdateFailureState* envoy_admin_v3_EcdsConfigDum const envoy_admin_v3_UpdateFailureState* default_val = NULL; const envoy_admin_v3_UpdateFailureState* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__UpdateFailureState_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -2779,6 +2909,7 @@ UPB_INLINE void envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig_set_version_info( } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); 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) { @@ -2791,6 +2922,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Timestamp_msg_init); 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) { @@ -2803,6 +2935,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__UpdateFailureState_msg_init); 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) { diff --git a/src/core/ext/upb-gen/envoy/admin/v3/config_dump_shared.upb_minitable.c b/src/core/ext/upb-gen/envoy/admin/v3/config_dump_shared.upb_minitable.c index 9b6d0f47f2e..e53741de3d3 100644 --- a/src/core/ext/upb-gen/envoy/admin/v3/config_dump_shared.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/admin/v3/config_dump_shared.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/admin/v3/config_dump_shared.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -16,9 +17,10 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub envoy_admin_v3_UpdateFailureState_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal envoy_admin_v3_UpdateFailureState_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init_ptr}, }; static const upb_MiniTableField envoy_admin_v3_UpdateFailureState__fields[4] = { @@ -47,9 +49,10 @@ const upb_MiniTable envoy__admin__v3__UpdateFailureState_msg_init = { }) }; -static const upb_MiniTableSub envoy_admin_v3_ListenersConfigDump_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &envoy__admin__v3__ListenersConfigDump__StaticListener_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__admin__v3__ListenersConfigDump__DynamicListener_msg_init}, +const upb_MiniTable* envoy__admin__v3__UpdateFailureState_msg_init_ptr = &envoy__admin__v3__UpdateFailureState_msg_init; +static const upb_MiniTableSubInternal envoy_admin_v3_ListenersConfigDump_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &envoy__admin__v3__ListenersConfigDump__StaticListener_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__admin__v3__ListenersConfigDump__DynamicListener_msg_init_ptr}, }; static const upb_MiniTableField envoy_admin_v3_ListenersConfigDump__fields[3] = { @@ -73,9 +76,10 @@ const upb_MiniTable envoy__admin__v3__ListenersConfigDump_msg_init = { }) }; -static const upb_MiniTableSub envoy_admin_v3_ListenersConfigDump_StaticListener_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init}, +const upb_MiniTable* envoy__admin__v3__ListenersConfigDump_msg_init_ptr = &envoy__admin__v3__ListenersConfigDump_msg_init; +static const upb_MiniTableSubInternal envoy_admin_v3_ListenersConfigDump_StaticListener_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init_ptr}, }; static const upb_MiniTableField envoy_admin_v3_ListenersConfigDump_StaticListener__fields[2] = { @@ -92,9 +96,10 @@ const upb_MiniTable envoy__admin__v3__ListenersConfigDump__StaticListener_msg_in #endif }; -static const upb_MiniTableSub envoy_admin_v3_ListenersConfigDump_DynamicListenerState_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init}, +const upb_MiniTable* envoy__admin__v3__ListenersConfigDump__StaticListener_msg_init_ptr = &envoy__admin__v3__ListenersConfigDump__StaticListener_msg_init; +static const upb_MiniTableSubInternal envoy_admin_v3_ListenersConfigDump_DynamicListenerState_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init_ptr}, }; static const upb_MiniTableField envoy_admin_v3_ListenersConfigDump_DynamicListenerState__fields[3] = { @@ -116,11 +121,12 @@ const upb_MiniTable envoy__admin__v3__ListenersConfigDump__DynamicListenerState_ }) }; -static const upb_MiniTableSub envoy_admin_v3_ListenersConfigDump_DynamicListener_submsgs[4] = { - {.UPB_PRIVATE(submsg) = &envoy__admin__v3__ListenersConfigDump__DynamicListenerState_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__admin__v3__ListenersConfigDump__DynamicListenerState_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__admin__v3__ListenersConfigDump__DynamicListenerState_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__admin__v3__UpdateFailureState_msg_init}, +const upb_MiniTable* envoy__admin__v3__ListenersConfigDump__DynamicListenerState_msg_init_ptr = &envoy__admin__v3__ListenersConfigDump__DynamicListenerState_msg_init; +static const upb_MiniTableSubInternal envoy_admin_v3_ListenersConfigDump_DynamicListener_submsgs[4] = { + {.UPB_PRIVATE(submsg) = &envoy__admin__v3__ListenersConfigDump__DynamicListenerState_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__admin__v3__ListenersConfigDump__DynamicListenerState_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__admin__v3__ListenersConfigDump__DynamicListenerState_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__admin__v3__UpdateFailureState_msg_init_ptr}, }; static const upb_MiniTableField envoy_admin_v3_ListenersConfigDump_DynamicListener__fields[6] = { @@ -151,10 +157,11 @@ const upb_MiniTable envoy__admin__v3__ListenersConfigDump__DynamicListener_msg_i }) }; -static const upb_MiniTableSub envoy_admin_v3_ClustersConfigDump_submsgs[3] = { - {.UPB_PRIVATE(submsg) = &envoy__admin__v3__ClustersConfigDump__StaticCluster_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__admin__v3__ClustersConfigDump__DynamicCluster_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__admin__v3__ClustersConfigDump__DynamicCluster_msg_init}, +const upb_MiniTable* envoy__admin__v3__ListenersConfigDump__DynamicListener_msg_init_ptr = &envoy__admin__v3__ListenersConfigDump__DynamicListener_msg_init; +static const upb_MiniTableSubInternal envoy_admin_v3_ClustersConfigDump_submsgs[3] = { + {.UPB_PRIVATE(submsg) = &envoy__admin__v3__ClustersConfigDump__StaticCluster_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__admin__v3__ClustersConfigDump__DynamicCluster_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__admin__v3__ClustersConfigDump__DynamicCluster_msg_init_ptr}, }; static const upb_MiniTableField envoy_admin_v3_ClustersConfigDump__fields[4] = { @@ -183,9 +190,10 @@ const upb_MiniTable envoy__admin__v3__ClustersConfigDump_msg_init = { }) }; -static const upb_MiniTableSub envoy_admin_v3_ClustersConfigDump_StaticCluster_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init}, +const upb_MiniTable* envoy__admin__v3__ClustersConfigDump_msg_init_ptr = &envoy__admin__v3__ClustersConfigDump_msg_init; +static const upb_MiniTableSubInternal envoy_admin_v3_ClustersConfigDump_StaticCluster_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init_ptr}, }; static const upb_MiniTableField envoy_admin_v3_ClustersConfigDump_StaticCluster__fields[2] = { @@ -202,10 +210,11 @@ const upb_MiniTable envoy__admin__v3__ClustersConfigDump__StaticCluster_msg_init #endif }; -static const upb_MiniTableSub envoy_admin_v3_ClustersConfigDump_DynamicCluster_submsgs[3] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__admin__v3__UpdateFailureState_msg_init}, +const upb_MiniTable* envoy__admin__v3__ClustersConfigDump__StaticCluster_msg_init_ptr = &envoy__admin__v3__ClustersConfigDump__StaticCluster_msg_init; +static const upb_MiniTableSubInternal envoy_admin_v3_ClustersConfigDump_DynamicCluster_submsgs[3] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__admin__v3__UpdateFailureState_msg_init_ptr}, }; static const upb_MiniTableField envoy_admin_v3_ClustersConfigDump_DynamicCluster__fields[5] = { @@ -235,9 +244,10 @@ const upb_MiniTable envoy__admin__v3__ClustersConfigDump__DynamicCluster_msg_ini }) }; -static const upb_MiniTableSub envoy_admin_v3_RoutesConfigDump_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &envoy__admin__v3__RoutesConfigDump__StaticRouteConfig_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__admin__v3__RoutesConfigDump__DynamicRouteConfig_msg_init}, +const upb_MiniTable* envoy__admin__v3__ClustersConfigDump__DynamicCluster_msg_init_ptr = &envoy__admin__v3__ClustersConfigDump__DynamicCluster_msg_init; +static const upb_MiniTableSubInternal envoy_admin_v3_RoutesConfigDump_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &envoy__admin__v3__RoutesConfigDump__StaticRouteConfig_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__admin__v3__RoutesConfigDump__DynamicRouteConfig_msg_init_ptr}, }; static const upb_MiniTableField envoy_admin_v3_RoutesConfigDump__fields[2] = { @@ -260,9 +270,10 @@ const upb_MiniTable envoy__admin__v3__RoutesConfigDump_msg_init = { }) }; -static const upb_MiniTableSub envoy_admin_v3_RoutesConfigDump_StaticRouteConfig_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init}, +const upb_MiniTable* envoy__admin__v3__RoutesConfigDump_msg_init_ptr = &envoy__admin__v3__RoutesConfigDump_msg_init; +static const upb_MiniTableSubInternal envoy_admin_v3_RoutesConfigDump_StaticRouteConfig_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init_ptr}, }; static const upb_MiniTableField envoy_admin_v3_RoutesConfigDump_StaticRouteConfig__fields[2] = { @@ -279,10 +290,11 @@ const upb_MiniTable envoy__admin__v3__RoutesConfigDump__StaticRouteConfig_msg_in #endif }; -static const upb_MiniTableSub envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_submsgs[3] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__admin__v3__UpdateFailureState_msg_init}, +const upb_MiniTable* envoy__admin__v3__RoutesConfigDump__StaticRouteConfig_msg_init_ptr = &envoy__admin__v3__RoutesConfigDump__StaticRouteConfig_msg_init; +static const upb_MiniTableSubInternal envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_submsgs[3] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__admin__v3__UpdateFailureState_msg_init_ptr}, }; static const upb_MiniTableField envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig__fields[5] = { @@ -312,9 +324,10 @@ const upb_MiniTable envoy__admin__v3__RoutesConfigDump__DynamicRouteConfig_msg_i }) }; -static const upb_MiniTableSub envoy_admin_v3_ScopedRoutesConfigDump_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &envoy__admin__v3__ScopedRoutesConfigDump__InlineScopedRouteConfigs_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__admin__v3__ScopedRoutesConfigDump__DynamicScopedRouteConfigs_msg_init}, +const upb_MiniTable* envoy__admin__v3__RoutesConfigDump__DynamicRouteConfig_msg_init_ptr = &envoy__admin__v3__RoutesConfigDump__DynamicRouteConfig_msg_init; +static const upb_MiniTableSubInternal envoy_admin_v3_ScopedRoutesConfigDump_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &envoy__admin__v3__ScopedRoutesConfigDump__InlineScopedRouteConfigs_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__admin__v3__ScopedRoutesConfigDump__DynamicScopedRouteConfigs_msg_init_ptr}, }; static const upb_MiniTableField envoy_admin_v3_ScopedRoutesConfigDump__fields[2] = { @@ -337,9 +350,10 @@ const upb_MiniTable envoy__admin__v3__ScopedRoutesConfigDump_msg_init = { }) }; -static const upb_MiniTableSub envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init}, +const upb_MiniTable* envoy__admin__v3__ScopedRoutesConfigDump_msg_init_ptr = &envoy__admin__v3__ScopedRoutesConfigDump_msg_init; +static const upb_MiniTableSubInternal envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init_ptr}, }; static const upb_MiniTableField envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs__fields[3] = { @@ -363,10 +377,11 @@ const upb_MiniTable envoy__admin__v3__ScopedRoutesConfigDump__InlineScopedRouteC }) }; -static const upb_MiniTableSub envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_submsgs[3] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__admin__v3__UpdateFailureState_msg_init}, +const upb_MiniTable* envoy__admin__v3__ScopedRoutesConfigDump__InlineScopedRouteConfigs_msg_init_ptr = &envoy__admin__v3__ScopedRoutesConfigDump__InlineScopedRouteConfigs_msg_init; +static const upb_MiniTableSubInternal envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_submsgs[3] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__admin__v3__UpdateFailureState_msg_init_ptr}, }; static const upb_MiniTableField envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs__fields[6] = { @@ -397,9 +412,10 @@ const upb_MiniTable envoy__admin__v3__ScopedRoutesConfigDump__DynamicScopedRoute }) }; -static const upb_MiniTableSub envoy_admin_v3_EndpointsConfigDump_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &envoy__admin__v3__EndpointsConfigDump__StaticEndpointConfig_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__admin__v3__EndpointsConfigDump__DynamicEndpointConfig_msg_init}, +const upb_MiniTable* envoy__admin__v3__ScopedRoutesConfigDump__DynamicScopedRouteConfigs_msg_init_ptr = &envoy__admin__v3__ScopedRoutesConfigDump__DynamicScopedRouteConfigs_msg_init; +static const upb_MiniTableSubInternal envoy_admin_v3_EndpointsConfigDump_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &envoy__admin__v3__EndpointsConfigDump__StaticEndpointConfig_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__admin__v3__EndpointsConfigDump__DynamicEndpointConfig_msg_init_ptr}, }; static const upb_MiniTableField envoy_admin_v3_EndpointsConfigDump__fields[2] = { @@ -422,9 +438,10 @@ const upb_MiniTable envoy__admin__v3__EndpointsConfigDump_msg_init = { }) }; -static const upb_MiniTableSub envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init}, +const upb_MiniTable* envoy__admin__v3__EndpointsConfigDump_msg_init_ptr = &envoy__admin__v3__EndpointsConfigDump_msg_init; +static const upb_MiniTableSubInternal envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init_ptr}, }; static const upb_MiniTableField envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig__fields[2] = { @@ -441,10 +458,11 @@ const upb_MiniTable envoy__admin__v3__EndpointsConfigDump__StaticEndpointConfig_ #endif }; -static const upb_MiniTableSub envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_submsgs[3] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__admin__v3__UpdateFailureState_msg_init}, +const upb_MiniTable* envoy__admin__v3__EndpointsConfigDump__StaticEndpointConfig_msg_init_ptr = &envoy__admin__v3__EndpointsConfigDump__StaticEndpointConfig_msg_init; +static const upb_MiniTableSubInternal envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_submsgs[3] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__admin__v3__UpdateFailureState_msg_init_ptr}, }; static const upb_MiniTableField envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig__fields[5] = { @@ -474,8 +492,9 @@ const upb_MiniTable envoy__admin__v3__EndpointsConfigDump__DynamicEndpointConfig }) }; -static const upb_MiniTableSub envoy_admin_v3_EcdsConfigDump_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__admin__v3__EcdsConfigDump__EcdsFilterConfig_msg_init}, +const upb_MiniTable* envoy__admin__v3__EndpointsConfigDump__DynamicEndpointConfig_msg_init_ptr = &envoy__admin__v3__EndpointsConfigDump__DynamicEndpointConfig_msg_init; +static const upb_MiniTableSubInternal envoy_admin_v3_EcdsConfigDump_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__admin__v3__EcdsConfigDump__EcdsFilterConfig_msg_init_ptr}, }; static const upb_MiniTableField envoy_admin_v3_EcdsConfigDump__fields[1] = { @@ -495,10 +514,11 @@ const upb_MiniTable envoy__admin__v3__EcdsConfigDump_msg_init = { }) }; -static const upb_MiniTableSub envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig_submsgs[3] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__admin__v3__UpdateFailureState_msg_init}, +const upb_MiniTable* envoy__admin__v3__EcdsConfigDump_msg_init_ptr = &envoy__admin__v3__EcdsConfigDump_msg_init; +static const upb_MiniTableSubInternal envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig_submsgs[3] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__admin__v3__UpdateFailureState_msg_init_ptr}, }; static const upb_MiniTableField envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig__fields[5] = { @@ -528,6 +548,7 @@ const upb_MiniTable envoy__admin__v3__EcdsConfigDump__EcdsFilterConfig_msg_init }) }; +const upb_MiniTable* envoy__admin__v3__EcdsConfigDump__EcdsFilterConfig_msg_init_ptr = &envoy__admin__v3__EcdsConfigDump__EcdsFilterConfig_msg_init; static const upb_MiniTable *messages_layout[19] = { &envoy__admin__v3__UpdateFailureState_msg_init, &envoy__admin__v3__ListenersConfigDump_msg_init, diff --git a/src/core/ext/upb-gen/envoy/admin/v3/config_dump_shared.upb_minitable.h b/src/core/ext/upb-gen/envoy/admin/v3/config_dump_shared.upb_minitable.h index 343ceaff9a0..fc75e9d4a18 100644 --- a/src/core/ext/upb-gen/envoy/admin/v3/config_dump_shared.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/admin/v3/config_dump_shared.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/admin/v3/config_dump_shared.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_ADMIN_V3_CONFIG_DUMP_SHARED_PROTO_UPB_MINITABLE_H_ #define ENVOY_ADMIN_V3_CONFIG_DUMP_SHARED_PROTO_UPB_MINITABLE_H_ @@ -18,24 +19,43 @@ extern "C" { #endif extern const upb_MiniTable envoy__admin__v3__UpdateFailureState_msg_init; +extern const upb_MiniTable* envoy__admin__v3__UpdateFailureState_msg_init_ptr; extern const upb_MiniTable envoy__admin__v3__ListenersConfigDump_msg_init; +extern const upb_MiniTable* envoy__admin__v3__ListenersConfigDump_msg_init_ptr; extern const upb_MiniTable envoy__admin__v3__ListenersConfigDump__StaticListener_msg_init; +extern const upb_MiniTable* envoy__admin__v3__ListenersConfigDump__StaticListener_msg_init_ptr; extern const upb_MiniTable envoy__admin__v3__ListenersConfigDump__DynamicListenerState_msg_init; +extern const upb_MiniTable* envoy__admin__v3__ListenersConfigDump__DynamicListenerState_msg_init_ptr; extern const upb_MiniTable envoy__admin__v3__ListenersConfigDump__DynamicListener_msg_init; +extern const upb_MiniTable* envoy__admin__v3__ListenersConfigDump__DynamicListener_msg_init_ptr; extern const upb_MiniTable envoy__admin__v3__ClustersConfigDump_msg_init; +extern const upb_MiniTable* envoy__admin__v3__ClustersConfigDump_msg_init_ptr; extern const upb_MiniTable envoy__admin__v3__ClustersConfigDump__StaticCluster_msg_init; +extern const upb_MiniTable* envoy__admin__v3__ClustersConfigDump__StaticCluster_msg_init_ptr; extern const upb_MiniTable envoy__admin__v3__ClustersConfigDump__DynamicCluster_msg_init; +extern const upb_MiniTable* envoy__admin__v3__ClustersConfigDump__DynamicCluster_msg_init_ptr; extern const upb_MiniTable envoy__admin__v3__RoutesConfigDump_msg_init; +extern const upb_MiniTable* envoy__admin__v3__RoutesConfigDump_msg_init_ptr; extern const upb_MiniTable envoy__admin__v3__RoutesConfigDump__StaticRouteConfig_msg_init; +extern const upb_MiniTable* envoy__admin__v3__RoutesConfigDump__StaticRouteConfig_msg_init_ptr; extern const upb_MiniTable envoy__admin__v3__RoutesConfigDump__DynamicRouteConfig_msg_init; +extern const upb_MiniTable* envoy__admin__v3__RoutesConfigDump__DynamicRouteConfig_msg_init_ptr; extern const upb_MiniTable envoy__admin__v3__ScopedRoutesConfigDump_msg_init; +extern const upb_MiniTable* envoy__admin__v3__ScopedRoutesConfigDump_msg_init_ptr; extern const upb_MiniTable envoy__admin__v3__ScopedRoutesConfigDump__InlineScopedRouteConfigs_msg_init; +extern const upb_MiniTable* envoy__admin__v3__ScopedRoutesConfigDump__InlineScopedRouteConfigs_msg_init_ptr; extern const upb_MiniTable envoy__admin__v3__ScopedRoutesConfigDump__DynamicScopedRouteConfigs_msg_init; +extern const upb_MiniTable* envoy__admin__v3__ScopedRoutesConfigDump__DynamicScopedRouteConfigs_msg_init_ptr; extern const upb_MiniTable envoy__admin__v3__EndpointsConfigDump_msg_init; +extern const upb_MiniTable* envoy__admin__v3__EndpointsConfigDump_msg_init_ptr; extern const upb_MiniTable envoy__admin__v3__EndpointsConfigDump__StaticEndpointConfig_msg_init; +extern const upb_MiniTable* envoy__admin__v3__EndpointsConfigDump__StaticEndpointConfig_msg_init_ptr; extern const upb_MiniTable envoy__admin__v3__EndpointsConfigDump__DynamicEndpointConfig_msg_init; +extern const upb_MiniTable* envoy__admin__v3__EndpointsConfigDump__DynamicEndpointConfig_msg_init_ptr; extern const upb_MiniTable envoy__admin__v3__EcdsConfigDump_msg_init; +extern const upb_MiniTable* envoy__admin__v3__EcdsConfigDump_msg_init_ptr; extern const upb_MiniTable envoy__admin__v3__EcdsConfigDump__EcdsFilterConfig_msg_init; +extern const upb_MiniTable* envoy__admin__v3__EcdsConfigDump__EcdsFilterConfig_msg_init_ptr; extern const upb_MiniTableFile envoy_admin_v3_config_dump_shared_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/admin/v3/init_dump.upb.h b/src/core/ext/upb-gen/envoy/admin/v3/init_dump.upb.h index 8cebc1fc44d..6b8e432f54b 100644 --- a/src/core/ext/upb-gen/envoy/admin/v3/init_dump.upb.h +++ b/src/core/ext/upb-gen/envoy/admin/v3/init_dump.upb.h @@ -3,7 +3,8 @@ * envoy/admin/v3/init_dump.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_ADMIN_V3_INIT_DUMP_PROTO_UPB_H_ #define ENVOY_ADMIN_V3_INIT_DUMP_PROTO_UPB_H_ @@ -68,6 +69,7 @@ UPB_INLINE void envoy_admin_v3_UnreadyTargetsDumps_clear_unready_targets_dumps(e } UPB_INLINE const envoy_admin_v3_UnreadyTargetsDumps_UnreadyTargetsDump* const* envoy_admin_v3_UnreadyTargetsDumps_unready_targets_dumps(const envoy_admin_v3_UnreadyTargetsDumps* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__UnreadyTargetsDumps__UnreadyTargetsDump_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -79,6 +81,7 @@ UPB_INLINE const envoy_admin_v3_UnreadyTargetsDumps_UnreadyTargetsDump* const* e } UPB_INLINE const upb_Array* _envoy_admin_v3_UnreadyTargetsDumps_unready_targets_dumps_upb_array(const envoy_admin_v3_UnreadyTargetsDumps* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__UnreadyTargetsDumps__UnreadyTargetsDump_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -87,6 +90,7 @@ UPB_INLINE const upb_Array* _envoy_admin_v3_UnreadyTargetsDumps_unready_targets_ } UPB_INLINE upb_Array* _envoy_admin_v3_UnreadyTargetsDumps_unready_targets_dumps_mutable_upb_array(envoy_admin_v3_UnreadyTargetsDumps* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__UnreadyTargetsDumps__UnreadyTargetsDump_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -97,6 +101,7 @@ UPB_INLINE upb_Array* _envoy_admin_v3_UnreadyTargetsDumps_unready_targets_dumps_ UPB_INLINE envoy_admin_v3_UnreadyTargetsDumps_UnreadyTargetsDump** envoy_admin_v3_UnreadyTargetsDumps_mutable_unready_targets_dumps(envoy_admin_v3_UnreadyTargetsDumps* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__UnreadyTargetsDumps__UnreadyTargetsDump_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -113,6 +118,7 @@ UPB_INLINE envoy_admin_v3_UnreadyTargetsDumps_UnreadyTargetsDump** envoy_admin_v } UPB_INLINE struct envoy_admin_v3_UnreadyTargetsDumps_UnreadyTargetsDump* envoy_admin_v3_UnreadyTargetsDumps_add_unready_targets_dumps(envoy_admin_v3_UnreadyTargetsDumps* msg, upb_Arena* arena) { upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__UnreadyTargetsDumps__UnreadyTargetsDump_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( diff --git a/src/core/ext/upb-gen/envoy/admin/v3/init_dump.upb_minitable.c b/src/core/ext/upb-gen/envoy/admin/v3/init_dump.upb_minitable.c index 5eeb6def2ec..296372af068 100644 --- a/src/core/ext/upb-gen/envoy/admin/v3/init_dump.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/admin/v3/init_dump.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/admin/v3/init_dump.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -13,8 +14,9 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub envoy_admin_v3_UnreadyTargetsDumps_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__admin__v3__UnreadyTargetsDumps__UnreadyTargetsDump_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal envoy_admin_v3_UnreadyTargetsDumps_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__admin__v3__UnreadyTargetsDumps__UnreadyTargetsDump_msg_init_ptr}, }; static const upb_MiniTableField envoy_admin_v3_UnreadyTargetsDumps__fields[1] = { @@ -34,6 +36,7 @@ const upb_MiniTable envoy__admin__v3__UnreadyTargetsDumps_msg_init = { }) }; +const upb_MiniTable* envoy__admin__v3__UnreadyTargetsDumps_msg_init_ptr = &envoy__admin__v3__UnreadyTargetsDumps_msg_init; static const upb_MiniTableField envoy_admin_v3_UnreadyTargetsDumps_UnreadyTargetsDump__fields[2] = { {1, UPB_SIZE(12, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, {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)}, @@ -54,6 +57,7 @@ const upb_MiniTable envoy__admin__v3__UnreadyTargetsDumps__UnreadyTargetsDump_ms }) }; +const upb_MiniTable* envoy__admin__v3__UnreadyTargetsDumps__UnreadyTargetsDump_msg_init_ptr = &envoy__admin__v3__UnreadyTargetsDumps__UnreadyTargetsDump_msg_init; static const upb_MiniTable *messages_layout[2] = { &envoy__admin__v3__UnreadyTargetsDumps_msg_init, &envoy__admin__v3__UnreadyTargetsDumps__UnreadyTargetsDump_msg_init, diff --git a/src/core/ext/upb-gen/envoy/admin/v3/init_dump.upb_minitable.h b/src/core/ext/upb-gen/envoy/admin/v3/init_dump.upb_minitable.h index 1715119fd51..afd3edd461e 100644 --- a/src/core/ext/upb-gen/envoy/admin/v3/init_dump.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/admin/v3/init_dump.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/admin/v3/init_dump.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_ADMIN_V3_INIT_DUMP_PROTO_UPB_MINITABLE_H_ #define ENVOY_ADMIN_V3_INIT_DUMP_PROTO_UPB_MINITABLE_H_ @@ -18,7 +19,9 @@ extern "C" { #endif extern const upb_MiniTable envoy__admin__v3__UnreadyTargetsDumps_msg_init; +extern const upb_MiniTable* envoy__admin__v3__UnreadyTargetsDumps_msg_init_ptr; extern const upb_MiniTable envoy__admin__v3__UnreadyTargetsDumps__UnreadyTargetsDump_msg_init; +extern const upb_MiniTable* envoy__admin__v3__UnreadyTargetsDumps__UnreadyTargetsDump_msg_init_ptr; extern const upb_MiniTableFile envoy_admin_v3_init_dump_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/admin/v3/listeners.upb.h b/src/core/ext/upb-gen/envoy/admin/v3/listeners.upb.h index 59f1c051f45..885a8d3d2a2 100644 --- a/src/core/ext/upb-gen/envoy/admin/v3/listeners.upb.h +++ b/src/core/ext/upb-gen/envoy/admin/v3/listeners.upb.h @@ -3,7 +3,8 @@ * envoy/admin/v3/listeners.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_ADMIN_V3_LISTENERS_PROTO_UPB_H_ #define ENVOY_ADMIN_V3_LISTENERS_PROTO_UPB_H_ @@ -71,6 +72,7 @@ UPB_INLINE void envoy_admin_v3_Listeners_clear_listener_statuses(envoy_admin_v3_ } UPB_INLINE const envoy_admin_v3_ListenerStatus* const* envoy_admin_v3_Listeners_listener_statuses(const envoy_admin_v3_Listeners* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__ListenerStatus_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -82,6 +84,7 @@ UPB_INLINE const envoy_admin_v3_ListenerStatus* const* envoy_admin_v3_Listeners_ } UPB_INLINE const upb_Array* _envoy_admin_v3_Listeners_listener_statuses_upb_array(const envoy_admin_v3_Listeners* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__ListenerStatus_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -90,6 +93,7 @@ UPB_INLINE const upb_Array* _envoy_admin_v3_Listeners_listener_statuses_upb_arra } UPB_INLINE upb_Array* _envoy_admin_v3_Listeners_listener_statuses_mutable_upb_array(envoy_admin_v3_Listeners* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__ListenerStatus_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -100,6 +104,7 @@ UPB_INLINE upb_Array* _envoy_admin_v3_Listeners_listener_statuses_mutable_upb_ar UPB_INLINE envoy_admin_v3_ListenerStatus** envoy_admin_v3_Listeners_mutable_listener_statuses(envoy_admin_v3_Listeners* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__ListenerStatus_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -116,6 +121,7 @@ UPB_INLINE envoy_admin_v3_ListenerStatus** envoy_admin_v3_Listeners_resize_liste } UPB_INLINE struct envoy_admin_v3_ListenerStatus* envoy_admin_v3_Listeners_add_listener_statuses(envoy_admin_v3_Listeners* msg, upb_Arena* arena) { upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__ListenerStatus_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -185,6 +191,7 @@ UPB_INLINE const struct envoy_config_core_v3_Address* envoy_admin_v3_ListenerSta const struct envoy_config_core_v3_Address* default_val = NULL; const struct envoy_config_core_v3_Address* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Address_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -199,6 +206,7 @@ UPB_INLINE void envoy_admin_v3_ListenerStatus_clear_additional_local_addresses(e } UPB_INLINE const struct envoy_config_core_v3_Address* const* envoy_admin_v3_ListenerStatus_additional_local_addresses(const envoy_admin_v3_ListenerStatus* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Address_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -210,6 +218,7 @@ UPB_INLINE const struct envoy_config_core_v3_Address* const* envoy_admin_v3_List } UPB_INLINE const upb_Array* _envoy_admin_v3_ListenerStatus_additional_local_addresses_upb_array(const envoy_admin_v3_ListenerStatus* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Address_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -218,6 +227,7 @@ UPB_INLINE const upb_Array* _envoy_admin_v3_ListenerStatus_additional_local_addr } UPB_INLINE upb_Array* _envoy_admin_v3_ListenerStatus_additional_local_addresses_mutable_upb_array(envoy_admin_v3_ListenerStatus* msg, size_t* size, upb_Arena* arena) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Address_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -232,6 +242,7 @@ UPB_INLINE void envoy_admin_v3_ListenerStatus_set_name(envoy_admin_v3_ListenerSt } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Address_msg_init); 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) { @@ -244,6 +255,7 @@ UPB_INLINE struct envoy_config_core_v3_Address* envoy_admin_v3_ListenerStatus_mu } UPB_INLINE struct envoy_config_core_v3_Address** envoy_admin_v3_ListenerStatus_mutable_additional_local_addresses(envoy_admin_v3_ListenerStatus* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Address_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -260,6 +272,7 @@ UPB_INLINE struct envoy_config_core_v3_Address** envoy_admin_v3_ListenerStatus_r } UPB_INLINE struct envoy_config_core_v3_Address* envoy_admin_v3_ListenerStatus_add_additional_local_addresses(envoy_admin_v3_ListenerStatus* msg, upb_Arena* arena) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Address_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( diff --git a/src/core/ext/upb-gen/envoy/admin/v3/listeners.upb_minitable.c b/src/core/ext/upb-gen/envoy/admin/v3/listeners.upb_minitable.c index f6eaa9d79e9..1d62eedf113 100644 --- a/src/core/ext/upb-gen/envoy/admin/v3/listeners.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/admin/v3/listeners.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/admin/v3/listeners.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -15,8 +16,9 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub envoy_admin_v3_Listeners_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__admin__v3__ListenerStatus_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal envoy_admin_v3_Listeners_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__admin__v3__ListenerStatus_msg_init_ptr}, }; static const upb_MiniTableField envoy_admin_v3_Listeners__fields[1] = { @@ -36,9 +38,10 @@ const upb_MiniTable envoy__admin__v3__Listeners_msg_init = { }) }; -static const upb_MiniTableSub envoy_admin_v3_ListenerStatus_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Address_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Address_msg_init}, +const upb_MiniTable* envoy__admin__v3__Listeners_msg_init_ptr = &envoy__admin__v3__Listeners_msg_init; +static const upb_MiniTableSubInternal envoy_admin_v3_ListenerStatus_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Address_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Address_msg_init_ptr}, }; static const upb_MiniTableField envoy_admin_v3_ListenerStatus__fields[3] = { @@ -62,6 +65,7 @@ const upb_MiniTable envoy__admin__v3__ListenerStatus_msg_init = { }) }; +const upb_MiniTable* envoy__admin__v3__ListenerStatus_msg_init_ptr = &envoy__admin__v3__ListenerStatus_msg_init; static const upb_MiniTable *messages_layout[2] = { &envoy__admin__v3__Listeners_msg_init, &envoy__admin__v3__ListenerStatus_msg_init, diff --git a/src/core/ext/upb-gen/envoy/admin/v3/listeners.upb_minitable.h b/src/core/ext/upb-gen/envoy/admin/v3/listeners.upb_minitable.h index 8b1ce1f95dc..998a4b864e9 100644 --- a/src/core/ext/upb-gen/envoy/admin/v3/listeners.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/admin/v3/listeners.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/admin/v3/listeners.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_ADMIN_V3_LISTENERS_PROTO_UPB_MINITABLE_H_ #define ENVOY_ADMIN_V3_LISTENERS_PROTO_UPB_MINITABLE_H_ @@ -18,7 +19,9 @@ extern "C" { #endif extern const upb_MiniTable envoy__admin__v3__Listeners_msg_init; +extern const upb_MiniTable* envoy__admin__v3__Listeners_msg_init_ptr; extern const upb_MiniTable envoy__admin__v3__ListenerStatus_msg_init; +extern const upb_MiniTable* envoy__admin__v3__ListenerStatus_msg_init_ptr; extern const upb_MiniTableFile envoy_admin_v3_listeners_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/admin/v3/memory.upb.h b/src/core/ext/upb-gen/envoy/admin/v3/memory.upb.h index 3cbf0f06a2b..b7f76250e76 100644 --- a/src/core/ext/upb-gen/envoy/admin/v3/memory.upb.h +++ b/src/core/ext/upb-gen/envoy/admin/v3/memory.upb.h @@ -3,7 +3,8 @@ * envoy/admin/v3/memory.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_ADMIN_V3_MEMORY_PROTO_UPB_H_ #define ENVOY_ADMIN_V3_MEMORY_PROTO_UPB_H_ diff --git a/src/core/ext/upb-gen/envoy/admin/v3/memory.upb_minitable.c b/src/core/ext/upb-gen/envoy/admin/v3/memory.upb_minitable.c index fd5e62e5eaa..1e171cf41f2 100644 --- a/src/core/ext/upb-gen/envoy/admin/v3/memory.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/admin/v3/memory.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/admin/v3/memory.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -14,6 +15,7 @@ // Must be last. #include "upb/port/def.inc" +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); static const upb_MiniTableField envoy_admin_v3_Memory__fields[6] = { {1, 8, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, {2, 16, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, @@ -42,6 +44,7 @@ const upb_MiniTable envoy__admin__v3__Memory_msg_init = { }) }; +const upb_MiniTable* envoy__admin__v3__Memory_msg_init_ptr = &envoy__admin__v3__Memory_msg_init; static const upb_MiniTable *messages_layout[1] = { &envoy__admin__v3__Memory_msg_init, }; diff --git a/src/core/ext/upb-gen/envoy/admin/v3/memory.upb_minitable.h b/src/core/ext/upb-gen/envoy/admin/v3/memory.upb_minitable.h index d159b6804c3..9a6048ddb24 100644 --- a/src/core/ext/upb-gen/envoy/admin/v3/memory.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/admin/v3/memory.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/admin/v3/memory.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_ADMIN_V3_MEMORY_PROTO_UPB_MINITABLE_H_ #define ENVOY_ADMIN_V3_MEMORY_PROTO_UPB_MINITABLE_H_ @@ -18,6 +19,7 @@ extern "C" { #endif extern const upb_MiniTable envoy__admin__v3__Memory_msg_init; +extern const upb_MiniTable* envoy__admin__v3__Memory_msg_init_ptr; extern const upb_MiniTableFile envoy_admin_v3_memory_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/admin/v3/metrics.upb.h b/src/core/ext/upb-gen/envoy/admin/v3/metrics.upb.h index bd205011ceb..1fac77166b7 100644 --- a/src/core/ext/upb-gen/envoy/admin/v3/metrics.upb.h +++ b/src/core/ext/upb-gen/envoy/admin/v3/metrics.upb.h @@ -3,7 +3,8 @@ * envoy/admin/v3/metrics.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_ADMIN_V3_METRICS_PROTO_UPB_H_ #define ENVOY_ADMIN_V3_METRICS_PROTO_UPB_H_ diff --git a/src/core/ext/upb-gen/envoy/admin/v3/metrics.upb_minitable.c b/src/core/ext/upb-gen/envoy/admin/v3/metrics.upb_minitable.c index 0afd8543742..05a239ee3af 100644 --- a/src/core/ext/upb-gen/envoy/admin/v3/metrics.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/admin/v3/metrics.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/admin/v3/metrics.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -14,6 +15,7 @@ // Must be last. #include "upb/port/def.inc" +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); static const upb_MiniTableField envoy_admin_v3_SimpleMetric__fields[3] = { {1, 8, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, {2, 16, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, @@ -35,6 +37,7 @@ const upb_MiniTable envoy__admin__v3__SimpleMetric_msg_init = { }) }; +const upb_MiniTable* envoy__admin__v3__SimpleMetric_msg_init_ptr = &envoy__admin__v3__SimpleMetric_msg_init; static const upb_MiniTable *messages_layout[1] = { &envoy__admin__v3__SimpleMetric_msg_init, }; diff --git a/src/core/ext/upb-gen/envoy/admin/v3/metrics.upb_minitable.h b/src/core/ext/upb-gen/envoy/admin/v3/metrics.upb_minitable.h index 10fcf59a89b..750f80aa6c9 100644 --- a/src/core/ext/upb-gen/envoy/admin/v3/metrics.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/admin/v3/metrics.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/admin/v3/metrics.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_ADMIN_V3_METRICS_PROTO_UPB_MINITABLE_H_ #define ENVOY_ADMIN_V3_METRICS_PROTO_UPB_MINITABLE_H_ @@ -18,6 +19,7 @@ extern "C" { #endif extern const upb_MiniTable envoy__admin__v3__SimpleMetric_msg_init; +extern const upb_MiniTable* envoy__admin__v3__SimpleMetric_msg_init_ptr; extern const upb_MiniTableFile envoy_admin_v3_metrics_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/admin/v3/mutex_stats.upb.h b/src/core/ext/upb-gen/envoy/admin/v3/mutex_stats.upb.h index 1461a202475..7f1ea08c32e 100644 --- a/src/core/ext/upb-gen/envoy/admin/v3/mutex_stats.upb.h +++ b/src/core/ext/upb-gen/envoy/admin/v3/mutex_stats.upb.h @@ -3,7 +3,8 @@ * envoy/admin/v3/mutex_stats.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_ADMIN_V3_MUTEX_STATS_PROTO_UPB_H_ #define ENVOY_ADMIN_V3_MUTEX_STATS_PROTO_UPB_H_ diff --git a/src/core/ext/upb-gen/envoy/admin/v3/mutex_stats.upb_minitable.c b/src/core/ext/upb-gen/envoy/admin/v3/mutex_stats.upb_minitable.c index 264eb93fba7..68d2571128f 100644 --- a/src/core/ext/upb-gen/envoy/admin/v3/mutex_stats.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/admin/v3/mutex_stats.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/admin/v3/mutex_stats.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -14,6 +15,7 @@ // Must be last. #include "upb/port/def.inc" +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); static const upb_MiniTableField envoy_admin_v3_MutexStats__fields[3] = { {1, 8, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, {2, 16, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, @@ -35,6 +37,7 @@ const upb_MiniTable envoy__admin__v3__MutexStats_msg_init = { }) }; +const upb_MiniTable* envoy__admin__v3__MutexStats_msg_init_ptr = &envoy__admin__v3__MutexStats_msg_init; static const upb_MiniTable *messages_layout[1] = { &envoy__admin__v3__MutexStats_msg_init, }; diff --git a/src/core/ext/upb-gen/envoy/admin/v3/mutex_stats.upb_minitable.h b/src/core/ext/upb-gen/envoy/admin/v3/mutex_stats.upb_minitable.h index ba8367f875d..44518b846d5 100644 --- a/src/core/ext/upb-gen/envoy/admin/v3/mutex_stats.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/admin/v3/mutex_stats.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/admin/v3/mutex_stats.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_ADMIN_V3_MUTEX_STATS_PROTO_UPB_MINITABLE_H_ #define ENVOY_ADMIN_V3_MUTEX_STATS_PROTO_UPB_MINITABLE_H_ @@ -18,6 +19,7 @@ extern "C" { #endif extern const upb_MiniTable envoy__admin__v3__MutexStats_msg_init; +extern const upb_MiniTable* envoy__admin__v3__MutexStats_msg_init_ptr; extern const upb_MiniTableFile envoy_admin_v3_mutex_stats_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/admin/v3/server_info.upb.h b/src/core/ext/upb-gen/envoy/admin/v3/server_info.upb.h index a7e7a7cad77..288d9b6dd85 100644 --- a/src/core/ext/upb-gen/envoy/admin/v3/server_info.upb.h +++ b/src/core/ext/upb-gen/envoy/admin/v3/server_info.upb.h @@ -3,7 +3,8 @@ * envoy/admin/v3/server_info.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_ADMIN_V3_SERVER_INFO_PROTO_UPB_H_ #define ENVOY_ADMIN_V3_SERVER_INFO_PROTO_UPB_H_ @@ -122,6 +123,7 @@ UPB_INLINE const struct google_protobuf_Duration* envoy_admin_v3_ServerInfo_upti const struct google_protobuf_Duration* default_val = NULL; const struct google_protobuf_Duration* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -138,6 +140,7 @@ UPB_INLINE const struct google_protobuf_Duration* envoy_admin_v3_ServerInfo_upti const struct google_protobuf_Duration* default_val = NULL; const struct google_protobuf_Duration* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -166,6 +169,7 @@ UPB_INLINE const envoy_admin_v3_CommandLineOptions* envoy_admin_v3_ServerInfo_co const envoy_admin_v3_CommandLineOptions* default_val = NULL; const envoy_admin_v3_CommandLineOptions* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__CommandLineOptions_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -182,6 +186,7 @@ UPB_INLINE const struct envoy_config_core_v3_Node* envoy_admin_v3_ServerInfo_nod const struct envoy_config_core_v3_Node* default_val = NULL; const struct envoy_config_core_v3_Node* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Node_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -201,6 +206,7 @@ UPB_INLINE void envoy_admin_v3_ServerInfo_set_state(envoy_admin_v3_ServerInfo *m } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { @@ -213,6 +219,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { @@ -229,6 +236,7 @@ UPB_INLINE void envoy_admin_v3_ServerInfo_set_hot_restart_version(envoy_admin_v3 } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__CommandLineOptions_msg_init); 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) { @@ -241,6 +249,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Node_msg_init); 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) { @@ -464,6 +473,7 @@ UPB_INLINE const struct google_protobuf_Duration* envoy_admin_v3_CommandLineOpti const struct google_protobuf_Duration* default_val = NULL; const struct google_protobuf_Duration* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -480,6 +490,7 @@ UPB_INLINE const struct google_protobuf_Duration* envoy_admin_v3_CommandLineOpti const struct google_protobuf_Duration* default_val = NULL; const struct google_protobuf_Duration* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -496,6 +507,7 @@ UPB_INLINE const struct google_protobuf_Duration* envoy_admin_v3_CommandLineOpti const struct google_protobuf_Duration* default_val = NULL; const struct google_protobuf_Duration* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -831,6 +843,7 @@ UPB_INLINE void envoy_admin_v3_CommandLineOptions_set_service_zone(envoy_admin_v } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { @@ -843,6 +856,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { @@ -855,6 +869,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { diff --git a/src/core/ext/upb-gen/envoy/admin/v3/server_info.upb_minitable.c b/src/core/ext/upb-gen/envoy/admin/v3/server_info.upb_minitable.c index 1bd4fa1ae76..831d87e0f4f 100644 --- a/src/core/ext/upb-gen/envoy/admin/v3/server_info.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/admin/v3/server_info.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/admin/v3/server_info.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -16,11 +17,12 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub envoy_admin_v3_ServerInfo_submsgs[4] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__admin__v3__CommandLineOptions_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Node_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal envoy_admin_v3_ServerInfo_submsgs[4] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__admin__v3__CommandLineOptions_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Node_msg_init_ptr}, }; static const upb_MiniTableField envoy_admin_v3_ServerInfo__fields[7] = { @@ -52,10 +54,11 @@ const upb_MiniTable envoy__admin__v3__ServerInfo_msg_init = { }) }; -static const upb_MiniTableSub envoy_admin_v3_CommandLineOptions_submsgs[3] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, +const upb_MiniTable* envoy__admin__v3__ServerInfo_msg_init_ptr = &envoy__admin__v3__ServerInfo_msg_init; +static const upb_MiniTableSubInternal envoy_admin_v3_CommandLineOptions_submsgs[3] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, }; static const upb_MiniTableField envoy_admin_v3_CommandLineOptions__fields[36] = { @@ -140,6 +143,7 @@ const upb_MiniTable envoy__admin__v3__CommandLineOptions_msg_init = { }) }; +const upb_MiniTable* envoy__admin__v3__CommandLineOptions_msg_init_ptr = &envoy__admin__v3__CommandLineOptions_msg_init; static const upb_MiniTable *messages_layout[2] = { &envoy__admin__v3__ServerInfo_msg_init, &envoy__admin__v3__CommandLineOptions_msg_init, diff --git a/src/core/ext/upb-gen/envoy/admin/v3/server_info.upb_minitable.h b/src/core/ext/upb-gen/envoy/admin/v3/server_info.upb_minitable.h index 56229607e30..66fa34fc538 100644 --- a/src/core/ext/upb-gen/envoy/admin/v3/server_info.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/admin/v3/server_info.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/admin/v3/server_info.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_ADMIN_V3_SERVER_INFO_PROTO_UPB_MINITABLE_H_ #define ENVOY_ADMIN_V3_SERVER_INFO_PROTO_UPB_MINITABLE_H_ @@ -18,7 +19,9 @@ extern "C" { #endif extern const upb_MiniTable envoy__admin__v3__ServerInfo_msg_init; +extern const upb_MiniTable* envoy__admin__v3__ServerInfo_msg_init_ptr; extern const upb_MiniTable envoy__admin__v3__CommandLineOptions_msg_init; +extern const upb_MiniTable* envoy__admin__v3__CommandLineOptions_msg_init_ptr; extern const upb_MiniTableFile envoy_admin_v3_server_info_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/admin/v3/tap.upb.h b/src/core/ext/upb-gen/envoy/admin/v3/tap.upb.h index d262247f6f7..763012d156d 100644 --- a/src/core/ext/upb-gen/envoy/admin/v3/tap.upb.h +++ b/src/core/ext/upb-gen/envoy/admin/v3/tap.upb.h @@ -3,7 +3,8 @@ * envoy/admin/v3/tap.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_ADMIN_V3_TAP_PROTO_UPB_H_ #define ENVOY_ADMIN_V3_TAP_PROTO_UPB_H_ @@ -85,6 +86,7 @@ UPB_INLINE const struct envoy_config_tap_v3_TapConfig* envoy_admin_v3_TapRequest const struct envoy_config_tap_v3_TapConfig* default_val = NULL; const struct envoy_config_tap_v3_TapConfig* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__tap__v3__TapConfig_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -100,6 +102,7 @@ UPB_INLINE void envoy_admin_v3_TapRequest_set_config_id(envoy_admin_v3_TapReques } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__tap__v3__TapConfig_msg_init); 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) { diff --git a/src/core/ext/upb-gen/envoy/admin/v3/tap.upb_minitable.c b/src/core/ext/upb-gen/envoy/admin/v3/tap.upb_minitable.c index 9f7117f0663..80e4e0894e2 100644 --- a/src/core/ext/upb-gen/envoy/admin/v3/tap.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/admin/v3/tap.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/admin/v3/tap.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -16,8 +17,9 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub envoy_admin_v3_TapRequest_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__config__tap__v3__TapConfig_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal envoy_admin_v3_TapRequest_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__config__tap__v3__TapConfig_msg_init_ptr}, }; static const upb_MiniTableField envoy_admin_v3_TapRequest__fields[2] = { @@ -38,6 +40,7 @@ const upb_MiniTable envoy__admin__v3__TapRequest_msg_init = { }) }; +const upb_MiniTable* envoy__admin__v3__TapRequest_msg_init_ptr = &envoy__admin__v3__TapRequest_msg_init; static const upb_MiniTable *messages_layout[1] = { &envoy__admin__v3__TapRequest_msg_init, }; diff --git a/src/core/ext/upb-gen/envoy/admin/v3/tap.upb_minitable.h b/src/core/ext/upb-gen/envoy/admin/v3/tap.upb_minitable.h index d80367838d4..0bd49aa2af7 100644 --- a/src/core/ext/upb-gen/envoy/admin/v3/tap.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/admin/v3/tap.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/admin/v3/tap.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_ADMIN_V3_TAP_PROTO_UPB_MINITABLE_H_ #define ENVOY_ADMIN_V3_TAP_PROTO_UPB_MINITABLE_H_ @@ -18,6 +19,7 @@ extern "C" { #endif extern const upb_MiniTable envoy__admin__v3__TapRequest_msg_init; +extern const upb_MiniTable* envoy__admin__v3__TapRequest_msg_init_ptr; extern const upb_MiniTableFile envoy_admin_v3_tap_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/annotations/deprecation.upb.h b/src/core/ext/upb-gen/envoy/annotations/deprecation.upb.h index afaadfcff91..83f8f0a064d 100644 --- a/src/core/ext/upb-gen/envoy/annotations/deprecation.upb.h +++ b/src/core/ext/upb-gen/envoy/annotations/deprecation.upb.h @@ -3,7 +3,8 @@ * envoy/annotations/deprecation.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_ANNOTATIONS_DEPRECATION_PROTO_UPB_H_ #define ENVOY_ANNOTATIONS_DEPRECATION_PROTO_UPB_H_ diff --git a/src/core/ext/upb-gen/envoy/annotations/deprecation.upb_minitable.c b/src/core/ext/upb-gen/envoy/annotations/deprecation.upb_minitable.c index b2fd166d222..0a1de0fe3ca 100644 --- a/src/core/ext/upb-gen/envoy/annotations/deprecation.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/annotations/deprecation.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/annotations/deprecation.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -13,24 +14,29 @@ // Must be last. #include "upb/port/def.inc" +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +UPB_LINKARR_APPEND(upb_AllExts) const upb_MiniTableExtension envoy_annotations_disallowed_by_default_ext = { {189503207, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, &google__protobuf__FieldOptions_msg_init, {.UPB_PRIVATE(submsg) = NULL}, }; +UPB_LINKARR_APPEND(upb_AllExts) const upb_MiniTableExtension envoy_annotations_deprecated_at_minor_version_ext = { {157299826, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, &google__protobuf__FieldOptions_msg_init, {.UPB_PRIVATE(submsg) = NULL}, }; +UPB_LINKARR_APPEND(upb_AllExts) const upb_MiniTableExtension envoy_annotations_disallowed_by_default_enum_ext = { {70100853, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, &google__protobuf__EnumValueOptions_msg_init, {.UPB_PRIVATE(submsg) = NULL}, }; +UPB_LINKARR_APPEND(upb_AllExts) const upb_MiniTableExtension envoy_annotations_deprecated_at_minor_version_enum_ext = { {181198657, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, &google__protobuf__EnumValueOptions_msg_init, diff --git a/src/core/ext/upb-gen/envoy/annotations/deprecation.upb_minitable.h b/src/core/ext/upb-gen/envoy/annotations/deprecation.upb_minitable.h index f74c3758583..47d7324f0e3 100644 --- a/src/core/ext/upb-gen/envoy/annotations/deprecation.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/annotations/deprecation.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/annotations/deprecation.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_ANNOTATIONS_DEPRECATION_PROTO_UPB_MINITABLE_H_ #define ENVOY_ANNOTATIONS_DEPRECATION_PROTO_UPB_MINITABLE_H_ diff --git a/src/core/ext/upb-gen/envoy/annotations/resource.upb.h b/src/core/ext/upb-gen/envoy/annotations/resource.upb.h index fd843799add..82103469658 100644 --- a/src/core/ext/upb-gen/envoy/annotations/resource.upb.h +++ b/src/core/ext/upb-gen/envoy/annotations/resource.upb.h @@ -3,7 +3,8 @@ * envoy/annotations/resource.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_ANNOTATIONS_RESOURCE_PROTO_UPB_H_ #define ENVOY_ANNOTATIONS_RESOURCE_PROTO_UPB_H_ diff --git a/src/core/ext/upb-gen/envoy/annotations/resource.upb_minitable.c b/src/core/ext/upb-gen/envoy/annotations/resource.upb_minitable.c index eaf425bb7e3..56bbdca4841 100644 --- a/src/core/ext/upb-gen/envoy/annotations/resource.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/annotations/resource.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/annotations/resource.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -13,6 +14,7 @@ // Must be last. #include "upb/port/def.inc" +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); static const upb_MiniTableField envoy_annotations_ResourceAnnotation__fields[1] = { {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, }; @@ -30,16 +32,18 @@ const upb_MiniTable envoy__annotations__ResourceAnnotation_msg_init = { }) }; -static const upb_MiniTable *messages_layout[1] = { - &envoy__annotations__ResourceAnnotation_msg_init, -}; - +const upb_MiniTable* envoy__annotations__ResourceAnnotation_msg_init_ptr = &envoy__annotations__ResourceAnnotation_msg_init; +UPB_LINKARR_APPEND(upb_AllExts) const upb_MiniTableExtension envoy_annotations_resource_ext = { {265073217, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, &google__protobuf__ServiceOptions_msg_init, {.UPB_PRIVATE(submsg) = &envoy__annotations__ResourceAnnotation_msg_init}, }; +static const upb_MiniTable *messages_layout[1] = { + &envoy__annotations__ResourceAnnotation_msg_init, +}; + static const upb_MiniTableExtension *extensions_layout[1] = { &envoy_annotations_resource_ext, diff --git a/src/core/ext/upb-gen/envoy/annotations/resource.upb_minitable.h b/src/core/ext/upb-gen/envoy/annotations/resource.upb_minitable.h index 03b2f147104..b9a0330670b 100644 --- a/src/core/ext/upb-gen/envoy/annotations/resource.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/annotations/resource.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/annotations/resource.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_ANNOTATIONS_RESOURCE_PROTO_UPB_MINITABLE_H_ #define ENVOY_ANNOTATIONS_RESOURCE_PROTO_UPB_MINITABLE_H_ @@ -18,6 +19,7 @@ extern "C" { #endif extern const upb_MiniTable envoy__annotations__ResourceAnnotation_msg_init; +extern const upb_MiniTable* envoy__annotations__ResourceAnnotation_msg_init_ptr; extern const upb_MiniTableExtension envoy_annotations_resource_ext; extern const upb_MiniTableFile envoy_annotations_resource_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/config/accesslog/v3/accesslog.upb.h b/src/core/ext/upb-gen/envoy/config/accesslog/v3/accesslog.upb.h index fbc51acdb74..1c9e6d5e446 100644 --- a/src/core/ext/upb-gen/envoy/config/accesslog/v3/accesslog.upb.h +++ b/src/core/ext/upb-gen/envoy/config/accesslog/v3/accesslog.upb.h @@ -3,7 +3,8 @@ * envoy/config/accesslog/v3/accesslog.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_ACCESSLOG_V3_ACCESSLOG_PROTO_UPB_H_ #define ENVOY_CONFIG_ACCESSLOG_V3_ACCESSLOG_PROTO_UPB_H_ @@ -146,6 +147,7 @@ UPB_INLINE const envoy_config_accesslog_v3_AccessLogFilter* envoy_config_accessl const envoy_config_accesslog_v3_AccessLogFilter* default_val = NULL; const envoy_config_accesslog_v3_AccessLogFilter* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__accesslog__v3__AccessLogFilter_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -162,6 +164,7 @@ UPB_INLINE const struct google_protobuf_Any* envoy_config_accesslog_v3_AccessLog const struct google_protobuf_Any* default_val = NULL; const struct google_protobuf_Any* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -177,6 +180,7 @@ UPB_INLINE void envoy_config_accesslog_v3_AccessLog_set_name(envoy_config_access } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__accesslog__v3__AccessLogFilter_msg_init); 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) { @@ -189,6 +193,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); 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) { @@ -265,6 +270,7 @@ UPB_INLINE const envoy_config_accesslog_v3_StatusCodeFilter* envoy_config_access const envoy_config_accesslog_v3_StatusCodeFilter* default_val = NULL; const envoy_config_accesslog_v3_StatusCodeFilter* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__accesslog__v3__StatusCodeFilter_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -281,6 +287,7 @@ UPB_INLINE const envoy_config_accesslog_v3_DurationFilter* envoy_config_accesslo const envoy_config_accesslog_v3_DurationFilter* default_val = NULL; const envoy_config_accesslog_v3_DurationFilter* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__accesslog__v3__DurationFilter_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -297,6 +304,7 @@ UPB_INLINE const envoy_config_accesslog_v3_NotHealthCheckFilter* envoy_config_ac const envoy_config_accesslog_v3_NotHealthCheckFilter* default_val = NULL; const envoy_config_accesslog_v3_NotHealthCheckFilter* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__accesslog__v3__NotHealthCheckFilter_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -313,6 +321,7 @@ UPB_INLINE const envoy_config_accesslog_v3_TraceableFilter* envoy_config_accessl const envoy_config_accesslog_v3_TraceableFilter* default_val = NULL; const envoy_config_accesslog_v3_TraceableFilter* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__accesslog__v3__TraceableFilter_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -329,6 +338,7 @@ UPB_INLINE const envoy_config_accesslog_v3_RuntimeFilter* envoy_config_accesslog const envoy_config_accesslog_v3_RuntimeFilter* default_val = NULL; const envoy_config_accesslog_v3_RuntimeFilter* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__accesslog__v3__RuntimeFilter_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -345,6 +355,7 @@ UPB_INLINE const envoy_config_accesslog_v3_AndFilter* envoy_config_accesslog_v3_ const envoy_config_accesslog_v3_AndFilter* default_val = NULL; const envoy_config_accesslog_v3_AndFilter* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__accesslog__v3__AndFilter_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -361,6 +372,7 @@ UPB_INLINE const envoy_config_accesslog_v3_OrFilter* envoy_config_accesslog_v3_A const envoy_config_accesslog_v3_OrFilter* default_val = NULL; const envoy_config_accesslog_v3_OrFilter* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__accesslog__v3__OrFilter_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -377,6 +389,7 @@ UPB_INLINE const envoy_config_accesslog_v3_HeaderFilter* envoy_config_accesslog_ const envoy_config_accesslog_v3_HeaderFilter* default_val = NULL; const envoy_config_accesslog_v3_HeaderFilter* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__accesslog__v3__HeaderFilter_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -393,6 +406,7 @@ UPB_INLINE const envoy_config_accesslog_v3_ResponseFlagFilter* envoy_config_acce const envoy_config_accesslog_v3_ResponseFlagFilter* default_val = NULL; const envoy_config_accesslog_v3_ResponseFlagFilter* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__accesslog__v3__ResponseFlagFilter_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -409,6 +423,7 @@ UPB_INLINE const envoy_config_accesslog_v3_GrpcStatusFilter* envoy_config_access const envoy_config_accesslog_v3_GrpcStatusFilter* default_val = NULL; const envoy_config_accesslog_v3_GrpcStatusFilter* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__accesslog__v3__GrpcStatusFilter_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -425,6 +440,7 @@ UPB_INLINE const envoy_config_accesslog_v3_ExtensionFilter* envoy_config_accessl const envoy_config_accesslog_v3_ExtensionFilter* default_val = NULL; const envoy_config_accesslog_v3_ExtensionFilter* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__accesslog__v3__ExtensionFilter_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -441,6 +457,7 @@ UPB_INLINE const envoy_config_accesslog_v3_MetadataFilter* envoy_config_accesslo const envoy_config_accesslog_v3_MetadataFilter* default_val = NULL; const envoy_config_accesslog_v3_MetadataFilter* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__accesslog__v3__MetadataFilter_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -457,6 +474,7 @@ UPB_INLINE const envoy_config_accesslog_v3_LogTypeFilter* envoy_config_accesslog const envoy_config_accesslog_v3_LogTypeFilter* default_val = NULL; const envoy_config_accesslog_v3_LogTypeFilter* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__accesslog__v3__LogTypeFilter_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -468,6 +486,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__accesslog__v3__StatusCodeFilter_msg_init); 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) { @@ -480,6 +499,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__accesslog__v3__DurationFilter_msg_init); 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) { @@ -492,6 +512,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__accesslog__v3__NotHealthCheckFilter_msg_init); 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) { @@ -504,6 +525,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__accesslog__v3__TraceableFilter_msg_init); 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) { @@ -516,6 +538,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__accesslog__v3__RuntimeFilter_msg_init); 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) { @@ -528,6 +551,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__accesslog__v3__AndFilter_msg_init); 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) { @@ -540,6 +564,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__accesslog__v3__OrFilter_msg_init); 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) { @@ -552,6 +577,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__accesslog__v3__HeaderFilter_msg_init); 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) { @@ -564,6 +590,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__accesslog__v3__ResponseFlagFilter_msg_init); 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) { @@ -576,6 +603,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__accesslog__v3__GrpcStatusFilter_msg_init); 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) { @@ -588,6 +616,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__accesslog__v3__ExtensionFilter_msg_init); 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) { @@ -600,6 +629,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__accesslog__v3__MetadataFilter_msg_init); 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) { @@ -612,6 +642,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__accesslog__v3__LogTypeFilter_msg_init); 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) { @@ -679,6 +710,7 @@ UPB_INLINE const struct envoy_config_core_v3_RuntimeUInt32* envoy_config_accessl const struct envoy_config_core_v3_RuntimeUInt32* default_val = NULL; const struct envoy_config_core_v3_RuntimeUInt32* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__RuntimeUInt32_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -694,6 +726,7 @@ UPB_INLINE void envoy_config_accesslog_v3_ComparisonFilter_set_op(envoy_config_a } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__RuntimeUInt32_msg_init); 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) { @@ -749,6 +782,7 @@ UPB_INLINE const envoy_config_accesslog_v3_ComparisonFilter* envoy_config_access const envoy_config_accesslog_v3_ComparisonFilter* default_val = NULL; const envoy_config_accesslog_v3_ComparisonFilter* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__accesslog__v3__ComparisonFilter_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -760,6 +794,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__accesslog__v3__ComparisonFilter_msg_init); 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) { @@ -815,6 +850,7 @@ UPB_INLINE const envoy_config_accesslog_v3_ComparisonFilter* envoy_config_access const envoy_config_accesslog_v3_ComparisonFilter* default_val = NULL; const envoy_config_accesslog_v3_ComparisonFilter* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__accesslog__v3__ComparisonFilter_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -826,6 +862,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__accesslog__v3__ComparisonFilter_msg_init); 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) { @@ -969,6 +1006,7 @@ UPB_INLINE const struct envoy_type_v3_FractionalPercent* envoy_config_accesslog_ const struct envoy_type_v3_FractionalPercent* default_val = NULL; const struct envoy_type_v3_FractionalPercent* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__v3__FractionalPercent_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -996,6 +1034,7 @@ UPB_INLINE void envoy_config_accesslog_v3_RuntimeFilter_set_runtime_key(envoy_co } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__v3__FractionalPercent_msg_init); 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) { @@ -1053,6 +1092,7 @@ UPB_INLINE void envoy_config_accesslog_v3_AndFilter_clear_filters(envoy_config_a } UPB_INLINE const envoy_config_accesslog_v3_AccessLogFilter* const* envoy_config_accesslog_v3_AndFilter_filters(const envoy_config_accesslog_v3_AndFilter* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__accesslog__v3__AccessLogFilter_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1064,6 +1104,7 @@ UPB_INLINE const envoy_config_accesslog_v3_AccessLogFilter* const* envoy_config_ } UPB_INLINE const upb_Array* _envoy_config_accesslog_v3_AndFilter_filters_upb_array(const envoy_config_accesslog_v3_AndFilter* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__accesslog__v3__AccessLogFilter_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -1072,6 +1113,7 @@ UPB_INLINE const upb_Array* _envoy_config_accesslog_v3_AndFilter_filters_upb_arr } UPB_INLINE upb_Array* _envoy_config_accesslog_v3_AndFilter_filters_mutable_upb_array(envoy_config_accesslog_v3_AndFilter* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__accesslog__v3__AccessLogFilter_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -1082,6 +1124,7 @@ UPB_INLINE upb_Array* _envoy_config_accesslog_v3_AndFilter_filters_mutable_upb_a UPB_INLINE envoy_config_accesslog_v3_AccessLogFilter** envoy_config_accesslog_v3_AndFilter_mutable_filters(envoy_config_accesslog_v3_AndFilter* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__accesslog__v3__AccessLogFilter_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1098,6 +1141,7 @@ UPB_INLINE envoy_config_accesslog_v3_AccessLogFilter** envoy_config_accesslog_v3 } UPB_INLINE struct envoy_config_accesslog_v3_AccessLogFilter* envoy_config_accesslog_v3_AndFilter_add_filters(envoy_config_accesslog_v3_AndFilter* msg, upb_Arena* arena) { upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__accesslog__v3__AccessLogFilter_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -1153,6 +1197,7 @@ UPB_INLINE void envoy_config_accesslog_v3_OrFilter_clear_filters(envoy_config_ac } UPB_INLINE const envoy_config_accesslog_v3_AccessLogFilter* const* envoy_config_accesslog_v3_OrFilter_filters(const envoy_config_accesslog_v3_OrFilter* msg, size_t* size) { const upb_MiniTableField field = {2, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__accesslog__v3__AccessLogFilter_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1164,6 +1209,7 @@ UPB_INLINE const envoy_config_accesslog_v3_AccessLogFilter* const* envoy_config_ } UPB_INLINE const upb_Array* _envoy_config_accesslog_v3_OrFilter_filters_upb_array(const envoy_config_accesslog_v3_OrFilter* msg, size_t* size) { const upb_MiniTableField field = {2, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__accesslog__v3__AccessLogFilter_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -1172,6 +1218,7 @@ UPB_INLINE const upb_Array* _envoy_config_accesslog_v3_OrFilter_filters_upb_arra } UPB_INLINE upb_Array* _envoy_config_accesslog_v3_OrFilter_filters_mutable_upb_array(envoy_config_accesslog_v3_OrFilter* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {2, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__accesslog__v3__AccessLogFilter_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -1182,6 +1229,7 @@ UPB_INLINE upb_Array* _envoy_config_accesslog_v3_OrFilter_filters_mutable_upb_ar UPB_INLINE envoy_config_accesslog_v3_AccessLogFilter** envoy_config_accesslog_v3_OrFilter_mutable_filters(envoy_config_accesslog_v3_OrFilter* msg, size_t* size) { upb_MiniTableField field = {2, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__accesslog__v3__AccessLogFilter_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1198,6 +1246,7 @@ UPB_INLINE envoy_config_accesslog_v3_AccessLogFilter** envoy_config_accesslog_v3 } UPB_INLINE struct envoy_config_accesslog_v3_AccessLogFilter* envoy_config_accesslog_v3_OrFilter_add_filters(envoy_config_accesslog_v3_OrFilter* msg, upb_Arena* arena) { upb_MiniTableField field = {2, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__accesslog__v3__AccessLogFilter_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -1255,6 +1304,7 @@ UPB_INLINE const struct envoy_config_route_v3_HeaderMatcher* envoy_config_access const struct envoy_config_route_v3_HeaderMatcher* default_val = NULL; const struct envoy_config_route_v3_HeaderMatcher* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__HeaderMatcher_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1266,6 +1316,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__HeaderMatcher_msg_init); 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) { @@ -1533,6 +1584,7 @@ UPB_INLINE const struct envoy_type_matcher_v3_MetadataMatcher* envoy_config_acce const struct envoy_type_matcher_v3_MetadataMatcher* default_val = NULL; const struct envoy_type_matcher_v3_MetadataMatcher* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__MetadataMatcher_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1549,6 +1601,7 @@ UPB_INLINE const struct google_protobuf_BoolValue* envoy_config_accesslog_v3_Met const struct google_protobuf_BoolValue* default_val = NULL; const struct google_protobuf_BoolValue* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1560,6 +1613,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__MetadataMatcher_msg_init); 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) { @@ -1572,6 +1626,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); 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) { @@ -1762,6 +1817,7 @@ UPB_INLINE const struct google_protobuf_Any* envoy_config_accesslog_v3_Extension const struct google_protobuf_Any* default_val = NULL; const struct google_protobuf_Any* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1777,6 +1833,7 @@ UPB_INLINE void envoy_config_accesslog_v3_ExtensionFilter_set_name(envoy_config_ } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); 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) { diff --git a/src/core/ext/upb-gen/envoy/config/accesslog/v3/accesslog.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/accesslog/v3/accesslog.upb_minitable.c index 12abdcaae90..807f8ade0dc 100644 --- a/src/core/ext/upb-gen/envoy/config/accesslog/v3/accesslog.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/config/accesslog/v3/accesslog.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/config/accesslog/v3/accesslog.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -22,9 +23,10 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub envoy_config_accesslog_v3_AccessLog_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &envoy__config__accesslog__v3__AccessLogFilter_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal envoy_config_accesslog_v3_AccessLog_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &envoy__config__accesslog__v3__AccessLogFilter_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_accesslog_v3_AccessLog__fields[3] = { @@ -52,20 +54,21 @@ const upb_MiniTable envoy__config__accesslog__v3__AccessLog_msg_init = { }) }; -static const upb_MiniTableSub envoy_config_accesslog_v3_AccessLogFilter_submsgs[13] = { - {.UPB_PRIVATE(submsg) = &envoy__config__accesslog__v3__StatusCodeFilter_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__accesslog__v3__DurationFilter_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__accesslog__v3__NotHealthCheckFilter_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__accesslog__v3__TraceableFilter_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__accesslog__v3__RuntimeFilter_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__accesslog__v3__AndFilter_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__accesslog__v3__OrFilter_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__accesslog__v3__HeaderFilter_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__accesslog__v3__ResponseFlagFilter_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__accesslog__v3__GrpcStatusFilter_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__accesslog__v3__ExtensionFilter_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__accesslog__v3__MetadataFilter_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__accesslog__v3__LogTypeFilter_msg_init}, +const upb_MiniTable* envoy__config__accesslog__v3__AccessLog_msg_init_ptr = &envoy__config__accesslog__v3__AccessLog_msg_init; +static const upb_MiniTableSubInternal envoy_config_accesslog_v3_AccessLogFilter_submsgs[13] = { + {.UPB_PRIVATE(submsg) = &envoy__config__accesslog__v3__StatusCodeFilter_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__accesslog__v3__DurationFilter_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__accesslog__v3__NotHealthCheckFilter_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__accesslog__v3__TraceableFilter_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__accesslog__v3__RuntimeFilter_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__accesslog__v3__AndFilter_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__accesslog__v3__OrFilter_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__accesslog__v3__HeaderFilter_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__accesslog__v3__ResponseFlagFilter_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__accesslog__v3__GrpcStatusFilter_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__accesslog__v3__ExtensionFilter_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__accesslog__v3__MetadataFilter_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__accesslog__v3__LogTypeFilter_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_accesslog_v3_AccessLogFilter__fields[13] = { @@ -111,8 +114,9 @@ const upb_MiniTable envoy__config__accesslog__v3__AccessLogFilter_msg_init = { }) }; -static const upb_MiniTableSub envoy_config_accesslog_v3_ComparisonFilter_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__RuntimeUInt32_msg_init}, +const upb_MiniTable* envoy__config__accesslog__v3__AccessLogFilter_msg_init_ptr = &envoy__config__accesslog__v3__AccessLogFilter_msg_init; +static const upb_MiniTableSubInternal envoy_config_accesslog_v3_ComparisonFilter_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__RuntimeUInt32_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_accesslog_v3_ComparisonFilter__fields[2] = { @@ -133,8 +137,9 @@ const upb_MiniTable envoy__config__accesslog__v3__ComparisonFilter_msg_init = { }) }; -static const upb_MiniTableSub envoy_config_accesslog_v3_StatusCodeFilter_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__config__accesslog__v3__ComparisonFilter_msg_init}, +const upb_MiniTable* envoy__config__accesslog__v3__ComparisonFilter_msg_init_ptr = &envoy__config__accesslog__v3__ComparisonFilter_msg_init; +static const upb_MiniTableSubInternal envoy_config_accesslog_v3_StatusCodeFilter_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__config__accesslog__v3__ComparisonFilter_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_accesslog_v3_StatusCodeFilter__fields[1] = { @@ -150,8 +155,9 @@ const upb_MiniTable envoy__config__accesslog__v3__StatusCodeFilter_msg_init = { #endif }; -static const upb_MiniTableSub envoy_config_accesslog_v3_DurationFilter_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__config__accesslog__v3__ComparisonFilter_msg_init}, +const upb_MiniTable* envoy__config__accesslog__v3__StatusCodeFilter_msg_init_ptr = &envoy__config__accesslog__v3__StatusCodeFilter_msg_init; +static const upb_MiniTableSubInternal envoy_config_accesslog_v3_DurationFilter_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__config__accesslog__v3__ComparisonFilter_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_accesslog_v3_DurationFilter__fields[1] = { @@ -167,6 +173,7 @@ const upb_MiniTable envoy__config__accesslog__v3__DurationFilter_msg_init = { #endif }; +const upb_MiniTable* envoy__config__accesslog__v3__DurationFilter_msg_init_ptr = &envoy__config__accesslog__v3__DurationFilter_msg_init; const upb_MiniTable envoy__config__accesslog__v3__NotHealthCheckFilter_msg_init = { NULL, NULL, @@ -176,6 +183,7 @@ const upb_MiniTable envoy__config__accesslog__v3__NotHealthCheckFilter_msg_init #endif }; +const upb_MiniTable* envoy__config__accesslog__v3__NotHealthCheckFilter_msg_init_ptr = &envoy__config__accesslog__v3__NotHealthCheckFilter_msg_init; const upb_MiniTable envoy__config__accesslog__v3__TraceableFilter_msg_init = { NULL, NULL, @@ -185,8 +193,9 @@ const upb_MiniTable envoy__config__accesslog__v3__TraceableFilter_msg_init = { #endif }; -static const upb_MiniTableSub envoy_config_accesslog_v3_RuntimeFilter_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__type__v3__FractionalPercent_msg_init}, +const upb_MiniTable* envoy__config__accesslog__v3__TraceableFilter_msg_init_ptr = &envoy__config__accesslog__v3__TraceableFilter_msg_init; +static const upb_MiniTableSubInternal envoy_config_accesslog_v3_RuntimeFilter_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__type__v3__FractionalPercent_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_accesslog_v3_RuntimeFilter__fields[3] = { @@ -210,8 +219,9 @@ const upb_MiniTable envoy__config__accesslog__v3__RuntimeFilter_msg_init = { }) }; -static const upb_MiniTableSub envoy_config_accesslog_v3_AndFilter_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__config__accesslog__v3__AccessLogFilter_msg_init}, +const upb_MiniTable* envoy__config__accesslog__v3__RuntimeFilter_msg_init_ptr = &envoy__config__accesslog__v3__RuntimeFilter_msg_init; +static const upb_MiniTableSubInternal envoy_config_accesslog_v3_AndFilter_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__config__accesslog__v3__AccessLogFilter_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_accesslog_v3_AndFilter__fields[1] = { @@ -231,8 +241,9 @@ const upb_MiniTable envoy__config__accesslog__v3__AndFilter_msg_init = { }) }; -static const upb_MiniTableSub envoy_config_accesslog_v3_OrFilter_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__config__accesslog__v3__AccessLogFilter_msg_init}, +const upb_MiniTable* envoy__config__accesslog__v3__AndFilter_msg_init_ptr = &envoy__config__accesslog__v3__AndFilter_msg_init; +static const upb_MiniTableSubInternal envoy_config_accesslog_v3_OrFilter_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__config__accesslog__v3__AccessLogFilter_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_accesslog_v3_OrFilter__fields[1] = { @@ -254,8 +265,9 @@ const upb_MiniTable envoy__config__accesslog__v3__OrFilter_msg_init = { }) }; -static const upb_MiniTableSub envoy_config_accesslog_v3_HeaderFilter_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__HeaderMatcher_msg_init}, +const upb_MiniTable* envoy__config__accesslog__v3__OrFilter_msg_init_ptr = &envoy__config__accesslog__v3__OrFilter_msg_init; +static const upb_MiniTableSubInternal envoy_config_accesslog_v3_HeaderFilter_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__HeaderMatcher_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_accesslog_v3_HeaderFilter__fields[1] = { @@ -271,6 +283,7 @@ const upb_MiniTable envoy__config__accesslog__v3__HeaderFilter_msg_init = { #endif }; +const upb_MiniTable* envoy__config__accesslog__v3__HeaderFilter_msg_init_ptr = &envoy__config__accesslog__v3__HeaderFilter_msg_init; static const upb_MiniTableField envoy_config_accesslog_v3_ResponseFlagFilter__fields[1] = { {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, }; @@ -288,6 +301,7 @@ const upb_MiniTable envoy__config__accesslog__v3__ResponseFlagFilter_msg_init = }) }; +const upb_MiniTable* envoy__config__accesslog__v3__ResponseFlagFilter_msg_init_ptr = &envoy__config__accesslog__v3__ResponseFlagFilter_msg_init; static const upb_MiniTableField envoy_config_accesslog_v3_GrpcStatusFilter__fields[2] = { {1, UPB_SIZE(8, 16), 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)}, {2, UPB_SIZE(12, 8), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, @@ -308,9 +322,10 @@ const upb_MiniTable envoy__config__accesslog__v3__GrpcStatusFilter_msg_init = { }) }; -static const upb_MiniTableSub envoy_config_accesslog_v3_MetadataFilter_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__MetadataMatcher_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init}, +const upb_MiniTable* envoy__config__accesslog__v3__GrpcStatusFilter_msg_init_ptr = &envoy__config__accesslog__v3__GrpcStatusFilter_msg_init; +static const upb_MiniTableSubInternal envoy_config_accesslog_v3_MetadataFilter_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__MetadataMatcher_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_accesslog_v3_MetadataFilter__fields[2] = { @@ -327,6 +342,7 @@ const upb_MiniTable envoy__config__accesslog__v3__MetadataFilter_msg_init = { #endif }; +const upb_MiniTable* envoy__config__accesslog__v3__MetadataFilter_msg_init_ptr = &envoy__config__accesslog__v3__MetadataFilter_msg_init; static const upb_MiniTableField envoy_config_accesslog_v3_LogTypeFilter__fields[2] = { {1, UPB_SIZE(8, 16), 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)}, {2, UPB_SIZE(12, 8), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, @@ -347,8 +363,9 @@ const upb_MiniTable envoy__config__accesslog__v3__LogTypeFilter_msg_init = { }) }; -static const upb_MiniTableSub envoy_config_accesslog_v3_ExtensionFilter_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init}, +const upb_MiniTable* envoy__config__accesslog__v3__LogTypeFilter_msg_init_ptr = &envoy__config__accesslog__v3__LogTypeFilter_msg_init; +static const upb_MiniTableSubInternal envoy_config_accesslog_v3_ExtensionFilter_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_accesslog_v3_ExtensionFilter__fields[2] = { @@ -371,6 +388,7 @@ const upb_MiniTable envoy__config__accesslog__v3__ExtensionFilter_msg_init = { }) }; +const upb_MiniTable* envoy__config__accesslog__v3__ExtensionFilter_msg_init_ptr = &envoy__config__accesslog__v3__ExtensionFilter_msg_init; static const upb_MiniTable *messages_layout[16] = { &envoy__config__accesslog__v3__AccessLog_msg_init, &envoy__config__accesslog__v3__AccessLogFilter_msg_init, diff --git a/src/core/ext/upb-gen/envoy/config/accesslog/v3/accesslog.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/accesslog/v3/accesslog.upb_minitable.h index acb89b662f0..cce74f27d39 100644 --- a/src/core/ext/upb-gen/envoy/config/accesslog/v3/accesslog.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/config/accesslog/v3/accesslog.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/config/accesslog/v3/accesslog.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_ACCESSLOG_V3_ACCESSLOG_PROTO_UPB_MINITABLE_H_ #define ENVOY_CONFIG_ACCESSLOG_V3_ACCESSLOG_PROTO_UPB_MINITABLE_H_ @@ -18,21 +19,37 @@ extern "C" { #endif extern const upb_MiniTable envoy__config__accesslog__v3__AccessLog_msg_init; +extern const upb_MiniTable* envoy__config__accesslog__v3__AccessLog_msg_init_ptr; extern const upb_MiniTable envoy__config__accesslog__v3__AccessLogFilter_msg_init; +extern const upb_MiniTable* envoy__config__accesslog__v3__AccessLogFilter_msg_init_ptr; extern const upb_MiniTable envoy__config__accesslog__v3__ComparisonFilter_msg_init; +extern const upb_MiniTable* envoy__config__accesslog__v3__ComparisonFilter_msg_init_ptr; extern const upb_MiniTable envoy__config__accesslog__v3__StatusCodeFilter_msg_init; +extern const upb_MiniTable* envoy__config__accesslog__v3__StatusCodeFilter_msg_init_ptr; extern const upb_MiniTable envoy__config__accesslog__v3__DurationFilter_msg_init; +extern const upb_MiniTable* envoy__config__accesslog__v3__DurationFilter_msg_init_ptr; extern const upb_MiniTable envoy__config__accesslog__v3__NotHealthCheckFilter_msg_init; +extern const upb_MiniTable* envoy__config__accesslog__v3__NotHealthCheckFilter_msg_init_ptr; extern const upb_MiniTable envoy__config__accesslog__v3__TraceableFilter_msg_init; +extern const upb_MiniTable* envoy__config__accesslog__v3__TraceableFilter_msg_init_ptr; extern const upb_MiniTable envoy__config__accesslog__v3__RuntimeFilter_msg_init; +extern const upb_MiniTable* envoy__config__accesslog__v3__RuntimeFilter_msg_init_ptr; extern const upb_MiniTable envoy__config__accesslog__v3__AndFilter_msg_init; +extern const upb_MiniTable* envoy__config__accesslog__v3__AndFilter_msg_init_ptr; extern const upb_MiniTable envoy__config__accesslog__v3__OrFilter_msg_init; +extern const upb_MiniTable* envoy__config__accesslog__v3__OrFilter_msg_init_ptr; extern const upb_MiniTable envoy__config__accesslog__v3__HeaderFilter_msg_init; +extern const upb_MiniTable* envoy__config__accesslog__v3__HeaderFilter_msg_init_ptr; extern const upb_MiniTable envoy__config__accesslog__v3__ResponseFlagFilter_msg_init; +extern const upb_MiniTable* envoy__config__accesslog__v3__ResponseFlagFilter_msg_init_ptr; extern const upb_MiniTable envoy__config__accesslog__v3__GrpcStatusFilter_msg_init; +extern const upb_MiniTable* envoy__config__accesslog__v3__GrpcStatusFilter_msg_init_ptr; extern const upb_MiniTable envoy__config__accesslog__v3__MetadataFilter_msg_init; +extern const upb_MiniTable* envoy__config__accesslog__v3__MetadataFilter_msg_init_ptr; extern const upb_MiniTable envoy__config__accesslog__v3__LogTypeFilter_msg_init; +extern const upb_MiniTable* envoy__config__accesslog__v3__LogTypeFilter_msg_init_ptr; extern const upb_MiniTable envoy__config__accesslog__v3__ExtensionFilter_msg_init; +extern const upb_MiniTable* envoy__config__accesslog__v3__ExtensionFilter_msg_init_ptr; extern const upb_MiniTableFile envoy_config_accesslog_v3_accesslog_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/config/bootstrap/v3/bootstrap.upb.h b/src/core/ext/upb-gen/envoy/config/bootstrap/v3/bootstrap.upb.h index dab21d32bc0..dc32c481dd0 100644 --- a/src/core/ext/upb-gen/envoy/config/bootstrap/v3/bootstrap.upb.h +++ b/src/core/ext/upb-gen/envoy/config/bootstrap/v3/bootstrap.upb.h @@ -3,7 +3,8 @@ * envoy/config/bootstrap/v3/bootstrap.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_BOOTSTRAP_V3_BOOTSTRAP_PROTO_UPB_H_ #define ENVOY_CONFIG_BOOTSTRAP_V3_BOOTSTRAP_PROTO_UPB_H_ @@ -159,6 +160,7 @@ UPB_INLINE const struct envoy_config_core_v3_Node* envoy_config_bootstrap_v3_Boo 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(16, 24), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Node_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -175,6 +177,7 @@ UPB_INLINE const envoy_config_bootstrap_v3_Bootstrap_StaticResources* envoy_conf 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(20, 32), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__bootstrap__v3__Bootstrap__StaticResources_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -191,6 +194,7 @@ UPB_INLINE const envoy_config_bootstrap_v3_Bootstrap_DynamicResources* envoy_con 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(24, 40), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__bootstrap__v3__Bootstrap__DynamicResources_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -207,6 +211,7 @@ UPB_INLINE const envoy_config_bootstrap_v3_ClusterManager* envoy_config_bootstra const envoy_config_bootstrap_v3_ClusterManager* default_val = NULL; const envoy_config_bootstrap_v3_ClusterManager* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__bootstrap__v3__ClusterManager_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -233,6 +238,7 @@ UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_clear_stats_sinks(envoy_conf } 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(32, 72), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__metrics__v3__StatsSink_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -244,6 +250,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(32, 72), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__metrics__v3__StatsSink_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -252,6 +259,7 @@ UPB_INLINE const upb_Array* _envoy_config_bootstrap_v3_Bootstrap_stats_sinks_upb } 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(32, 72), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__metrics__v3__StatsSink_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -267,6 +275,7 @@ UPB_INLINE const struct google_protobuf_Duration* envoy_config_bootstrap_v3_Boot const struct google_protobuf_Duration* default_val = NULL; const struct google_protobuf_Duration* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -283,6 +292,7 @@ UPB_INLINE const envoy_config_bootstrap_v3_Watchdog* envoy_config_bootstrap_v3_B const envoy_config_bootstrap_v3_Watchdog* default_val = NULL; const envoy_config_bootstrap_v3_Watchdog* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__bootstrap__v3__Watchdog_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -299,6 +309,7 @@ UPB_INLINE const struct envoy_config_trace_v3_Tracing* envoy_config_bootstrap_v3 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(44, 96), 70, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__trace__v3__Tracing_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -315,6 +326,7 @@ UPB_INLINE const envoy_config_bootstrap_v3_Admin* envoy_config_bootstrap_v3_Boot const envoy_config_bootstrap_v3_Admin* default_val = NULL; const envoy_config_bootstrap_v3_Admin* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__bootstrap__v3__Admin_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -331,6 +343,7 @@ UPB_INLINE const struct envoy_config_metrics_v3_StatsConfig* envoy_config_bootst 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(52, 112), 72, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__metrics__v3__StatsConfig_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -347,6 +360,7 @@ UPB_INLINE const struct envoy_config_core_v3_ApiConfigSource* envoy_config_boots 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(56, 120), 73, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__ApiConfigSource_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -363,6 +377,7 @@ UPB_INLINE const struct envoy_config_overload_v3_OverloadManager* envoy_config_b 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(60, 128), 74, 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__overload__v3__OverloadManager_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -391,6 +406,7 @@ UPB_INLINE const envoy_config_bootstrap_v3_LayeredRuntime* envoy_config_bootstra const envoy_config_bootstrap_v3_LayeredRuntime* default_val = NULL; const envoy_config_bootstrap_v3_LayeredRuntime* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__bootstrap__v3__LayeredRuntime_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -419,6 +435,7 @@ UPB_INLINE const struct google_protobuf_UInt64Value* envoy_config_bootstrap_v3_B const struct google_protobuf_UInt64Value* default_val = NULL; const struct google_protobuf_UInt64Value* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt64Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -445,6 +462,7 @@ UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_clear_bootstrap_extensions(e } 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(80, 168), 0, 14, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -456,6 +474,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(80, 168), 0, 14, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -464,6 +483,7 @@ UPB_INLINE const upb_Array* _envoy_config_bootstrap_v3_Bootstrap_bootstrap_exten } 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(80, 168), 0, 14, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -477,6 +497,7 @@ UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_clear_config_sources(envoy_c } 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(84, 176), 0, 15, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__ConfigSource_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -488,6 +509,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(84, 176), 0, 15, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__ConfigSource_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -496,6 +518,7 @@ UPB_INLINE const upb_Array* _envoy_config_bootstrap_v3_Bootstrap_config_sources_ } 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(84, 176), 0, 15, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__ConfigSource_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -511,6 +534,7 @@ UPB_INLINE const struct envoy_config_core_v3_ConfigSource* envoy_config_bootstra 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(88, 184), 77, 16, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__ConfigSource_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -542,22 +566,30 @@ UPB_INLINE size_t envoy_config_bootstrap_v3_Bootstrap_certificate_provider_insta } 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(92, 208), 0, 17, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__bootstrap__v3__Bootstrap__CertificateProviderInstancesEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); 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(92, 208), 0, 17, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__bootstrap__v3__Bootstrap__CertificateProviderInstancesEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); 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(92, 208), 0, 17, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__bootstrap__v3__Bootstrap__CertificateProviderInstancesEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); 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(92, 208), 0, 17, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__bootstrap__v3__Bootstrap__CertificateProviderInstancesEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); 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) { @@ -600,6 +632,7 @@ UPB_INLINE const envoy_config_bootstrap_v3_Watchdogs* envoy_config_bootstrap_v3_ const envoy_config_bootstrap_v3_Watchdogs* default_val = NULL; const envoy_config_bootstrap_v3_Watchdogs* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__bootstrap__v3__Watchdogs_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -614,6 +647,7 @@ UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_clear_fatal_actions(envoy_co } 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(104, 232), 0, 19, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__bootstrap__v3__FatalAction_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -625,6 +659,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(104, 232), 0, 19, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__bootstrap__v3__FatalAction_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -633,6 +668,7 @@ UPB_INLINE const upb_Array* _envoy_config_bootstrap_v3_Bootstrap_fatal_actions_u } 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(104, 232), 0, 19, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__bootstrap__v3__FatalAction_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -664,6 +700,7 @@ UPB_INLINE const struct envoy_config_core_v3_DnsResolutionConfig* envoy_config_b 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(112, 240), 79, 20, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__DnsResolutionConfig_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -680,6 +717,7 @@ UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_ 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(116, 248), 80, 21, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -694,6 +732,7 @@ UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_clear_inline_headers(envoy_c } 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(120, 256), 0, 22, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__bootstrap__v3__CustomInlineHeader_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -705,6 +744,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(120, 256), 0, 22, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__bootstrap__v3__CustomInlineHeader_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -713,6 +753,7 @@ UPB_INLINE const upb_Array* _envoy_config_bootstrap_v3_Bootstrap_inline_headers_ } 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(120, 256), 0, 22, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__bootstrap__v3__CustomInlineHeader_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -740,6 +781,7 @@ UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_ 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(124, 280), 81, 23, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -756,6 +798,7 @@ UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_ 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(128, 288), 82, 24, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -772,6 +815,7 @@ UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_ 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(132, 296), 83, 25, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -788,6 +832,7 @@ UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_ 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(136, 304), 84, 26, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -804,6 +849,7 @@ UPB_INLINE const envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig* envoy 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(140, 312), 85, 27, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__bootstrap__v3__Bootstrap__ApplicationLogConfig_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -820,6 +866,7 @@ UPB_INLINE const envoy_config_bootstrap_v3_Bootstrap_DeferredStatOptions* envoy_ 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(144, 320), 86, 28, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__bootstrap__v3__Bootstrap__DeferredStatOptions_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -836,6 +883,7 @@ UPB_INLINE const envoy_config_bootstrap_v3_Bootstrap_GrpcAsyncClientManagerConfi 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(148, 328), 87, 29, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__bootstrap__v3__Bootstrap__GrpcAsyncClientManagerConfig_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -852,6 +900,7 @@ UPB_INLINE const envoy_config_bootstrap_v3_MemoryAllocatorManager* envoy_config_ 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__bootstrap__v3__MemoryAllocatorManager_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -863,6 +912,7 @@ UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_has_memory_allocator_manager 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(16, 24), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Node_msg_init); 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) { @@ -875,6 +925,7 @@ UPB_INLINE struct envoy_config_core_v3_Node* envoy_config_bootstrap_v3_Bootstrap } 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(20, 32), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__bootstrap__v3__Bootstrap__StaticResources_msg_init); 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) { @@ -887,6 +938,7 @@ UPB_INLINE struct envoy_config_bootstrap_v3_Bootstrap_StaticResources* envoy_con } 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(24, 40), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__bootstrap__v3__Bootstrap__DynamicResources_msg_init); 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) { @@ -899,6 +951,7 @@ UPB_INLINE struct envoy_config_bootstrap_v3_Bootstrap_DynamicResources* envoy_co } 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(28, 48), 67, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__bootstrap__v3__ClusterManager_msg_init); 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) { @@ -915,6 +968,7 @@ UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_set_flags_path(envoy_config_ } 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(32, 72), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__metrics__v3__StatsSink_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -931,6 +985,7 @@ 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_add_stats_sinks(envoy_config_bootstrap_v3_Bootstrap* msg, upb_Arena* arena) { 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__metrics__v3__StatsSink_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -945,6 +1000,7 @@ UPB_INLINE struct envoy_config_metrics_v3_StatsSink* envoy_config_bootstrap_v3_B } 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(36, 80), 68, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { @@ -957,6 +1013,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_bootstrap_v3_Bootstrap_ } 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(40, 88), 69, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__bootstrap__v3__Watchdog_msg_init); 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) { @@ -969,6 +1026,7 @@ UPB_INLINE struct envoy_config_bootstrap_v3_Watchdog* envoy_config_bootstrap_v3_ } 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(44, 96), 70, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__trace__v3__Tracing_msg_init); 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) { @@ -981,6 +1039,7 @@ UPB_INLINE struct envoy_config_trace_v3_Tracing* envoy_config_bootstrap_v3_Boots } 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(48, 104), 71, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__bootstrap__v3__Admin_msg_init); 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) { @@ -993,6 +1052,7 @@ UPB_INLINE struct envoy_config_bootstrap_v3_Admin* envoy_config_bootstrap_v3_Boo } 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(52, 112), 72, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__metrics__v3__StatsConfig_msg_init); 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) { @@ -1005,6 +1065,7 @@ UPB_INLINE struct envoy_config_metrics_v3_StatsConfig* envoy_config_bootstrap_v3 } 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(56, 120), 73, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__ApiConfigSource_msg_init); 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) { @@ -1017,6 +1078,7 @@ UPB_INLINE struct envoy_config_core_v3_ApiConfigSource* envoy_config_bootstrap_v } 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(60, 128), 74, 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__overload__v3__OverloadManager_msg_init); 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) { @@ -1033,6 +1095,7 @@ UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_set_enable_dispatcher_stats( } 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(68, 136), 75, 12, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__bootstrap__v3__LayeredRuntime_msg_init); 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) { @@ -1049,6 +1112,7 @@ UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_set_header_prefix(envoy_conf } 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(72, 160), 76, 13, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt64Value_msg_init); 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) { @@ -1065,6 +1129,7 @@ UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_set_use_tcp_for_dns_lookups( } 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(80, 168), 0, 14, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1081,6 +1146,7 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig** envoy_config_boots } 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(80, 168), 0, 14, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -1095,6 +1161,7 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_bootst } 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(84, 176), 0, 15, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__ConfigSource_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1111,6 +1178,7 @@ 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_add_config_sources(envoy_config_bootstrap_v3_Bootstrap* msg, upb_Arena* arena) { 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__ConfigSource_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -1125,6 +1193,7 @@ UPB_INLINE struct envoy_config_core_v3_ConfigSource* envoy_config_bootstrap_v3_B } 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(88, 184), 77, 16, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__ConfigSource_msg_init); 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) { @@ -1147,6 +1216,8 @@ UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_certificate_provider_instanc } 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(92, 208), 0, 17, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__bootstrap__v3__Bootstrap__CertificateProviderInstancesEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); 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) != @@ -1160,6 +1231,8 @@ UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_certificate_provider_instanc } 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(92, 208), 0, 17, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__bootstrap__v3__Bootstrap__CertificateProviderInstancesEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); 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); @@ -1194,6 +1267,7 @@ UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_add_node_context_params(envo } 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(100, 224), 78, 18, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__bootstrap__v3__Watchdogs_msg_init); 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) { @@ -1206,6 +1280,7 @@ UPB_INLINE struct envoy_config_bootstrap_v3_Watchdogs* envoy_config_bootstrap_v3 } 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(104, 232), 0, 19, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__bootstrap__v3__FatalAction_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1222,6 +1297,7 @@ UPB_INLINE envoy_config_bootstrap_v3_FatalAction** envoy_config_bootstrap_v3_Boo } 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(104, 232), 0, 19, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__bootstrap__v3__FatalAction_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -1240,6 +1316,7 @@ UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_set_stats_flush_on_admin(env } 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(112, 240), 79, 20, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__DnsResolutionConfig_msg_init); 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) { @@ -1252,6 +1329,7 @@ UPB_INLINE struct envoy_config_core_v3_DnsResolutionConfig* envoy_config_bootstr } 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(116, 248), 80, 21, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); 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) { @@ -1264,6 +1342,7 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_bootst } 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(120, 256), 0, 22, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__bootstrap__v3__CustomInlineHeader_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1280,6 +1359,7 @@ UPB_INLINE envoy_config_bootstrap_v3_CustomInlineHeader** envoy_config_bootstrap } 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(120, 256), 0, 22, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__bootstrap__v3__CustomInlineHeader_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -1298,6 +1378,7 @@ UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_set_perf_tracing_file_path(e } 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(124, 280), 81, 23, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); 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) { @@ -1310,6 +1391,7 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_bootst } 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(128, 288), 82, 24, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); 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) { @@ -1322,6 +1404,7 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_bootst } 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(132, 296), 83, 25, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); 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) { @@ -1334,6 +1417,7 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_bootst } 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(136, 304), 84, 26, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); 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) { @@ -1346,6 +1430,7 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_bootst } 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(140, 312), 85, 27, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__bootstrap__v3__Bootstrap__ApplicationLogConfig_msg_init); 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) { @@ -1358,6 +1443,7 @@ UPB_INLINE struct envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig* envo } 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(144, 320), 86, 28, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__bootstrap__v3__Bootstrap__DeferredStatOptions_msg_init); 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) { @@ -1370,6 +1456,7 @@ UPB_INLINE struct envoy_config_bootstrap_v3_Bootstrap_DeferredStatOptions* envoy } 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(148, 328), 87, 29, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__bootstrap__v3__Bootstrap__GrpcAsyncClientManagerConfig_msg_init); 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) { @@ -1382,6 +1469,7 @@ UPB_INLINE struct envoy_config_bootstrap_v3_Bootstrap_GrpcAsyncClientManagerConf } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__bootstrap__v3__MemoryAllocatorManager_msg_init); 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) { @@ -1435,6 +1523,7 @@ UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_StaticResources_clear_listen } UPB_INLINE const struct envoy_config_listener_v3_Listener* const* envoy_config_bootstrap_v3_Bootstrap_StaticResources_listeners(const envoy_config_bootstrap_v3_Bootstrap_StaticResources* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__listener__v3__Listener_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1446,6 +1535,7 @@ UPB_INLINE const struct envoy_config_listener_v3_Listener* const* envoy_config_b } UPB_INLINE const upb_Array* _envoy_config_bootstrap_v3_Bootstrap_StaticResources_listeners_upb_array(const envoy_config_bootstrap_v3_Bootstrap_StaticResources* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__listener__v3__Listener_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -1454,6 +1544,7 @@ UPB_INLINE const upb_Array* _envoy_config_bootstrap_v3_Bootstrap_StaticResources } UPB_INLINE upb_Array* _envoy_config_bootstrap_v3_Bootstrap_StaticResources_listeners_mutable_upb_array(envoy_config_bootstrap_v3_Bootstrap_StaticResources* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__listener__v3__Listener_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -1467,6 +1558,7 @@ UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_StaticResources_clear_cluste } UPB_INLINE const struct envoy_config_cluster_v3_Cluster* const* envoy_config_bootstrap_v3_Bootstrap_StaticResources_clusters(const envoy_config_bootstrap_v3_Bootstrap_StaticResources* msg, size_t* size) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__cluster__v3__Cluster_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1478,6 +1570,7 @@ UPB_INLINE const struct envoy_config_cluster_v3_Cluster* const* envoy_config_boo } UPB_INLINE const upb_Array* _envoy_config_bootstrap_v3_Bootstrap_StaticResources_clusters_upb_array(const envoy_config_bootstrap_v3_Bootstrap_StaticResources* msg, size_t* size) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__cluster__v3__Cluster_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -1486,6 +1579,7 @@ UPB_INLINE const upb_Array* _envoy_config_bootstrap_v3_Bootstrap_StaticResources } UPB_INLINE upb_Array* _envoy_config_bootstrap_v3_Bootstrap_StaticResources_clusters_mutable_upb_array(envoy_config_bootstrap_v3_Bootstrap_StaticResources* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__cluster__v3__Cluster_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -1499,6 +1593,7 @@ UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_StaticResources_clear_secret } UPB_INLINE const struct envoy_extensions_transport_sockets_tls_v3_Secret* const* envoy_config_bootstrap_v3_Bootstrap_StaticResources_secrets(const envoy_config_bootstrap_v3_Bootstrap_StaticResources* msg, size_t* size) { const upb_MiniTableField field = {3, UPB_SIZE(16, 24), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__transport_0sockets__tls__v3__Secret_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1510,6 +1605,7 @@ UPB_INLINE const struct envoy_extensions_transport_sockets_tls_v3_Secret* const* } UPB_INLINE const upb_Array* _envoy_config_bootstrap_v3_Bootstrap_StaticResources_secrets_upb_array(const envoy_config_bootstrap_v3_Bootstrap_StaticResources* msg, size_t* size) { const upb_MiniTableField field = {3, UPB_SIZE(16, 24), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__transport_0sockets__tls__v3__Secret_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -1518,6 +1614,7 @@ UPB_INLINE const upb_Array* _envoy_config_bootstrap_v3_Bootstrap_StaticResources } UPB_INLINE upb_Array* _envoy_config_bootstrap_v3_Bootstrap_StaticResources_secrets_mutable_upb_array(envoy_config_bootstrap_v3_Bootstrap_StaticResources* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {3, UPB_SIZE(16, 24), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__transport_0sockets__tls__v3__Secret_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -1528,6 +1625,7 @@ UPB_INLINE upb_Array* _envoy_config_bootstrap_v3_Bootstrap_StaticResources_secre UPB_INLINE struct envoy_config_listener_v3_Listener** envoy_config_bootstrap_v3_Bootstrap_StaticResources_mutable_listeners(envoy_config_bootstrap_v3_Bootstrap_StaticResources* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__listener__v3__Listener_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1544,6 +1642,7 @@ UPB_INLINE struct envoy_config_listener_v3_Listener** envoy_config_bootstrap_v3_ } UPB_INLINE struct envoy_config_listener_v3_Listener* envoy_config_bootstrap_v3_Bootstrap_StaticResources_add_listeners(envoy_config_bootstrap_v3_Bootstrap_StaticResources* msg, upb_Arena* arena) { upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__listener__v3__Listener_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -1558,6 +1657,7 @@ UPB_INLINE struct envoy_config_listener_v3_Listener* envoy_config_bootstrap_v3_B } UPB_INLINE struct envoy_config_cluster_v3_Cluster** envoy_config_bootstrap_v3_Bootstrap_StaticResources_mutable_clusters(envoy_config_bootstrap_v3_Bootstrap_StaticResources* msg, size_t* size) { upb_MiniTableField field = {2, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__cluster__v3__Cluster_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1574,6 +1674,7 @@ UPB_INLINE struct envoy_config_cluster_v3_Cluster** envoy_config_bootstrap_v3_Bo } UPB_INLINE struct envoy_config_cluster_v3_Cluster* envoy_config_bootstrap_v3_Bootstrap_StaticResources_add_clusters(envoy_config_bootstrap_v3_Bootstrap_StaticResources* msg, upb_Arena* arena) { upb_MiniTableField field = {2, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__cluster__v3__Cluster_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -1588,6 +1689,7 @@ UPB_INLINE struct envoy_config_cluster_v3_Cluster* envoy_config_bootstrap_v3_Boo } UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_Secret** envoy_config_bootstrap_v3_Bootstrap_StaticResources_mutable_secrets(envoy_config_bootstrap_v3_Bootstrap_StaticResources* msg, size_t* size) { upb_MiniTableField field = {3, UPB_SIZE(16, 24), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__transport_0sockets__tls__v3__Secret_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1604,6 +1706,7 @@ UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_Secret** envoy_confi } UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_Secret* envoy_config_bootstrap_v3_Bootstrap_StaticResources_add_secrets(envoy_config_bootstrap_v3_Bootstrap_StaticResources* msg, upb_Arena* arena) { upb_MiniTableField field = {3, UPB_SIZE(16, 24), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__transport_0sockets__tls__v3__Secret_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -1661,6 +1764,7 @@ UPB_INLINE const struct envoy_config_core_v3_ConfigSource* envoy_config_bootstra const struct envoy_config_core_v3_ConfigSource* default_val = NULL; const struct envoy_config_core_v3_ConfigSource* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__ConfigSource_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1677,6 +1781,7 @@ UPB_INLINE const struct envoy_config_core_v3_ConfigSource* envoy_config_bootstra const struct envoy_config_core_v3_ConfigSource* default_val = NULL; const struct envoy_config_core_v3_ConfigSource* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__ConfigSource_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1693,6 +1798,7 @@ UPB_INLINE const struct envoy_config_core_v3_ApiConfigSource* envoy_config_boots const struct envoy_config_core_v3_ApiConfigSource* default_val = NULL; const struct envoy_config_core_v3_ApiConfigSource* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__ApiConfigSource_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1728,6 +1834,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__ConfigSource_msg_init); 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) { @@ -1740,6 +1847,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__ConfigSource_msg_init); 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) { @@ -1752,6 +1860,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__ApiConfigSource_msg_init); 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) { @@ -1815,6 +1924,7 @@ UPB_INLINE const envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_LogFor const envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_LogFormat* default_val = NULL; const envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_LogFormat* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__bootstrap__v3__Bootstrap__ApplicationLogConfig__LogFormat_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1826,6 +1936,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__bootstrap__v3__Bootstrap__ApplicationLogConfig__LogFormat_msg_init); 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) { @@ -1891,6 +2002,7 @@ UPB_INLINE const struct google_protobuf_Struct* envoy_config_bootstrap_v3_Bootst const struct google_protobuf_Struct* default_val = NULL; const struct google_protobuf_Struct* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Struct_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1918,6 +2030,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Struct_msg_init); 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) { @@ -2031,6 +2144,7 @@ UPB_INLINE const struct google_protobuf_Duration* envoy_config_bootstrap_v3_Boot 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -2042,6 +2156,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { @@ -2142,6 +2257,7 @@ UPB_INLINE const struct envoy_config_core_v3_Address* envoy_config_bootstrap_v3_ const struct envoy_config_core_v3_Address* default_val = NULL; const struct envoy_config_core_v3_Address* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Address_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -2156,6 +2272,7 @@ UPB_INLINE void envoy_config_bootstrap_v3_Admin_clear_socket_options(envoy_confi } UPB_INLINE const struct envoy_config_core_v3_SocketOption* const* envoy_config_bootstrap_v3_Admin_socket_options(const envoy_config_bootstrap_v3_Admin* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__SocketOption_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -2167,6 +2284,7 @@ UPB_INLINE const struct envoy_config_core_v3_SocketOption* const* envoy_config_b } UPB_INLINE const upb_Array* _envoy_config_bootstrap_v3_Admin_socket_options_upb_array(const envoy_config_bootstrap_v3_Admin* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__SocketOption_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -2175,6 +2293,7 @@ UPB_INLINE const upb_Array* _envoy_config_bootstrap_v3_Admin_socket_options_upb_ } UPB_INLINE upb_Array* _envoy_config_bootstrap_v3_Admin_socket_options_mutable_upb_array(envoy_config_bootstrap_v3_Admin* msg, size_t* size, upb_Arena* arena) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__SocketOption_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -2188,6 +2307,7 @@ UPB_INLINE void envoy_config_bootstrap_v3_Admin_clear_access_log(envoy_config_bo } UPB_INLINE const struct envoy_config_accesslog_v3_AccessLog* const* envoy_config_bootstrap_v3_Admin_access_log(const envoy_config_bootstrap_v3_Admin* msg, size_t* size) { const upb_MiniTableField field = {5, UPB_SIZE(20, 64), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__accesslog__v3__AccessLog_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -2199,6 +2319,7 @@ UPB_INLINE const struct envoy_config_accesslog_v3_AccessLog* const* envoy_config } UPB_INLINE const upb_Array* _envoy_config_bootstrap_v3_Admin_access_log_upb_array(const envoy_config_bootstrap_v3_Admin* msg, size_t* size) { const upb_MiniTableField field = {5, UPB_SIZE(20, 64), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__accesslog__v3__AccessLog_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -2207,6 +2328,7 @@ UPB_INLINE const upb_Array* _envoy_config_bootstrap_v3_Admin_access_log_upb_arra } UPB_INLINE upb_Array* _envoy_config_bootstrap_v3_Admin_access_log_mutable_upb_array(envoy_config_bootstrap_v3_Admin* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {5, UPB_SIZE(20, 64), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__accesslog__v3__AccessLog_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -2237,6 +2359,7 @@ UPB_INLINE void envoy_config_bootstrap_v3_Admin_set_profile_path(envoy_config_bo } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Address_msg_init); 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) { @@ -2249,6 +2372,7 @@ UPB_INLINE struct envoy_config_core_v3_Address* envoy_config_bootstrap_v3_Admin_ } UPB_INLINE struct envoy_config_core_v3_SocketOption** envoy_config_bootstrap_v3_Admin_mutable_socket_options(envoy_config_bootstrap_v3_Admin* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__SocketOption_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -2265,6 +2389,7 @@ UPB_INLINE struct envoy_config_core_v3_SocketOption** envoy_config_bootstrap_v3_ } UPB_INLINE struct envoy_config_core_v3_SocketOption* envoy_config_bootstrap_v3_Admin_add_socket_options(envoy_config_bootstrap_v3_Admin* msg, upb_Arena* arena) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__SocketOption_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -2279,6 +2404,7 @@ UPB_INLINE struct envoy_config_core_v3_SocketOption* envoy_config_bootstrap_v3_A } UPB_INLINE struct envoy_config_accesslog_v3_AccessLog** envoy_config_bootstrap_v3_Admin_mutable_access_log(envoy_config_bootstrap_v3_Admin* msg, size_t* size) { upb_MiniTableField field = {5, UPB_SIZE(20, 64), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__accesslog__v3__AccessLog_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -2295,6 +2421,7 @@ UPB_INLINE struct envoy_config_accesslog_v3_AccessLog** envoy_config_bootstrap_v } UPB_INLINE struct envoy_config_accesslog_v3_AccessLog* envoy_config_bootstrap_v3_Admin_add_access_log(envoy_config_bootstrap_v3_Admin* msg, upb_Arena* arena) { upb_MiniTableField field = {5, UPB_SIZE(20, 64), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__accesslog__v3__AccessLog_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -2368,6 +2495,7 @@ UPB_INLINE const envoy_config_bootstrap_v3_ClusterManager_OutlierDetection* envo const envoy_config_bootstrap_v3_ClusterManager_OutlierDetection* default_val = NULL; const envoy_config_bootstrap_v3_ClusterManager_OutlierDetection* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__bootstrap__v3__ClusterManager__OutlierDetection_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -2384,6 +2512,7 @@ UPB_INLINE const struct envoy_config_core_v3_BindConfig* envoy_config_bootstrap_ const struct envoy_config_core_v3_BindConfig* default_val = NULL; const struct envoy_config_core_v3_BindConfig* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__BindConfig_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -2400,6 +2529,7 @@ UPB_INLINE const struct envoy_config_core_v3_ApiConfigSource* envoy_config_boots const struct envoy_config_core_v3_ApiConfigSource* default_val = NULL; const struct envoy_config_core_v3_ApiConfigSource* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__ApiConfigSource_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -2427,6 +2557,7 @@ UPB_INLINE void envoy_config_bootstrap_v3_ClusterManager_set_local_cluster_name( } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__bootstrap__v3__ClusterManager__OutlierDetection_msg_init); 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) { @@ -2439,6 +2570,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__BindConfig_msg_init); 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) { @@ -2451,6 +2583,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__ApiConfigSource_msg_init); 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) { @@ -2522,6 +2655,7 @@ UPB_INLINE const struct envoy_config_core_v3_EventServiceConfig* envoy_config_bo const struct envoy_config_core_v3_EventServiceConfig* default_val = NULL; const struct envoy_config_core_v3_EventServiceConfig* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__EventServiceConfig_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -2537,6 +2671,7 @@ UPB_INLINE void envoy_config_bootstrap_v3_ClusterManager_OutlierDetection_set_ev } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__EventServiceConfig_msg_init); 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) { @@ -2592,6 +2727,7 @@ UPB_INLINE const envoy_config_bootstrap_v3_Watchdog* envoy_config_bootstrap_v3_W const envoy_config_bootstrap_v3_Watchdog* default_val = NULL; const envoy_config_bootstrap_v3_Watchdog* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__bootstrap__v3__Watchdog_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -2608,6 +2744,7 @@ UPB_INLINE const envoy_config_bootstrap_v3_Watchdog* envoy_config_bootstrap_v3_W const envoy_config_bootstrap_v3_Watchdog* default_val = NULL; const envoy_config_bootstrap_v3_Watchdog* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__bootstrap__v3__Watchdog_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -2619,6 +2756,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__bootstrap__v3__Watchdog_msg_init); 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) { @@ -2631,6 +2769,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__bootstrap__v3__Watchdog_msg_init); 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) { @@ -2686,6 +2825,7 @@ UPB_INLINE const struct google_protobuf_Duration* envoy_config_bootstrap_v3_Watc 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -2702,6 +2842,7 @@ UPB_INLINE const struct google_protobuf_Duration* envoy_config_bootstrap_v3_Watc const struct google_protobuf_Duration* default_val = NULL; const struct google_protobuf_Duration* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -2718,6 +2859,7 @@ UPB_INLINE const struct google_protobuf_Duration* envoy_config_bootstrap_v3_Watc const struct google_protobuf_Duration* default_val = NULL; const struct google_protobuf_Duration* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -2734,6 +2876,7 @@ UPB_INLINE const struct google_protobuf_Duration* envoy_config_bootstrap_v3_Watc const struct google_protobuf_Duration* default_val = NULL; const struct google_protobuf_Duration* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -2750,6 +2893,7 @@ UPB_INLINE const struct envoy_type_v3_Percent* envoy_config_bootstrap_v3_Watchdo const struct envoy_type_v3_Percent* default_val = NULL; const struct envoy_type_v3_Percent* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__v3__Percent_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -2766,6 +2910,7 @@ UPB_INLINE const struct google_protobuf_Duration* envoy_config_bootstrap_v3_Watc const struct google_protobuf_Duration* default_val = NULL; const struct google_protobuf_Duration* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -2780,6 +2925,7 @@ UPB_INLINE void envoy_config_bootstrap_v3_Watchdog_clear_actions(envoy_config_bo } UPB_INLINE const envoy_config_bootstrap_v3_Watchdog_WatchdogAction* const* envoy_config_bootstrap_v3_Watchdog_actions(const envoy_config_bootstrap_v3_Watchdog* msg, size_t* size) { const upb_MiniTableField field = {7, UPB_SIZE(36, 64), 0, 6, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__bootstrap__v3__Watchdog__WatchdogAction_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -2791,6 +2937,7 @@ UPB_INLINE const envoy_config_bootstrap_v3_Watchdog_WatchdogAction* const* envoy } UPB_INLINE const upb_Array* _envoy_config_bootstrap_v3_Watchdog_actions_upb_array(const envoy_config_bootstrap_v3_Watchdog* msg, size_t* size) { const upb_MiniTableField field = {7, UPB_SIZE(36, 64), 0, 6, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__bootstrap__v3__Watchdog__WatchdogAction_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -2799,6 +2946,7 @@ UPB_INLINE const upb_Array* _envoy_config_bootstrap_v3_Watchdog_actions_upb_arra } UPB_INLINE upb_Array* _envoy_config_bootstrap_v3_Watchdog_actions_mutable_upb_array(envoy_config_bootstrap_v3_Watchdog* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {7, UPB_SIZE(36, 64), 0, 6, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__bootstrap__v3__Watchdog__WatchdogAction_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -2809,6 +2957,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { @@ -2821,6 +2970,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { @@ -2833,6 +2983,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { @@ -2845,6 +2996,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { @@ -2857,6 +3009,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__v3__Percent_msg_init); 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) { @@ -2869,6 +3022,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { @@ -2881,6 +3035,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_bootstrap_v3_Watchdog_m } UPB_INLINE envoy_config_bootstrap_v3_Watchdog_WatchdogAction** envoy_config_bootstrap_v3_Watchdog_mutable_actions(envoy_config_bootstrap_v3_Watchdog* msg, size_t* size) { upb_MiniTableField field = {7, UPB_SIZE(36, 64), 0, 6, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__bootstrap__v3__Watchdog__WatchdogAction_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -2897,6 +3052,7 @@ UPB_INLINE envoy_config_bootstrap_v3_Watchdog_WatchdogAction** envoy_config_boot } UPB_INLINE struct envoy_config_bootstrap_v3_Watchdog_WatchdogAction* envoy_config_bootstrap_v3_Watchdog_add_actions(envoy_config_bootstrap_v3_Watchdog* msg, upb_Arena* arena) { upb_MiniTableField field = {7, UPB_SIZE(36, 64), 0, 6, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__bootstrap__v3__Watchdog__WatchdogAction_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -2954,6 +3110,7 @@ UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_ const struct envoy_config_core_v3_TypedExtensionConfig* default_val = NULL; const struct envoy_config_core_v3_TypedExtensionConfig* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -2977,6 +3134,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); 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) { @@ -3036,6 +3194,7 @@ UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_ const struct envoy_config_core_v3_TypedExtensionConfig* default_val = NULL; const struct envoy_config_core_v3_TypedExtensionConfig* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -3047,6 +3206,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); 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) { @@ -3138,6 +3298,7 @@ UPB_INLINE const struct google_protobuf_Struct* envoy_config_bootstrap_v3_Runtim const struct google_protobuf_Struct* default_val = NULL; const struct google_protobuf_Struct* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Struct_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -3161,6 +3322,7 @@ UPB_INLINE void envoy_config_bootstrap_v3_Runtime_set_override_subdirectory(envo } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Struct_msg_init); 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) { @@ -3240,6 +3402,7 @@ UPB_INLINE const struct google_protobuf_Struct* envoy_config_bootstrap_v3_Runtim const struct google_protobuf_Struct* default_val = NULL; const struct google_protobuf_Struct* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Struct_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -3256,6 +3419,7 @@ UPB_INLINE const envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer* envoy_config_ const envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer* default_val = NULL; const envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__bootstrap__v3__RuntimeLayer__DiskLayer_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -3272,6 +3436,7 @@ UPB_INLINE const envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer* envoy_config const envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer* default_val = NULL; const envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__bootstrap__v3__RuntimeLayer__AdminLayer_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -3288,6 +3453,7 @@ UPB_INLINE const envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer* envoy_config_ const envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer* default_val = NULL; const envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__bootstrap__v3__RuntimeLayer__RtdsLayer_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -3303,6 +3469,7 @@ UPB_INLINE void envoy_config_bootstrap_v3_RuntimeLayer_set_name(envoy_config_boo } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Struct_msg_init); 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) { @@ -3315,6 +3482,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__bootstrap__v3__RuntimeLayer__DiskLayer_msg_init); 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) { @@ -3327,6 +3495,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__bootstrap__v3__RuntimeLayer__AdminLayer_msg_init); 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) { @@ -3339,6 +3508,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__bootstrap__v3__RuntimeLayer__RtdsLayer_msg_init); 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) { @@ -3530,6 +3700,7 @@ UPB_INLINE const struct envoy_config_core_v3_ConfigSource* envoy_config_bootstra const struct envoy_config_core_v3_ConfigSource* default_val = NULL; const struct envoy_config_core_v3_ConfigSource* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__ConfigSource_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -3545,6 +3716,7 @@ UPB_INLINE void envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer_set_name(envoy_ } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__ConfigSource_msg_init); 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) { @@ -3598,6 +3770,7 @@ UPB_INLINE void envoy_config_bootstrap_v3_LayeredRuntime_clear_layers(envoy_conf } UPB_INLINE const envoy_config_bootstrap_v3_RuntimeLayer* const* envoy_config_bootstrap_v3_LayeredRuntime_layers(const envoy_config_bootstrap_v3_LayeredRuntime* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__bootstrap__v3__RuntimeLayer_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -3609,6 +3782,7 @@ UPB_INLINE const envoy_config_bootstrap_v3_RuntimeLayer* const* envoy_config_boo } UPB_INLINE const upb_Array* _envoy_config_bootstrap_v3_LayeredRuntime_layers_upb_array(const envoy_config_bootstrap_v3_LayeredRuntime* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__bootstrap__v3__RuntimeLayer_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -3617,6 +3791,7 @@ UPB_INLINE const upb_Array* _envoy_config_bootstrap_v3_LayeredRuntime_layers_upb } UPB_INLINE upb_Array* _envoy_config_bootstrap_v3_LayeredRuntime_layers_mutable_upb_array(envoy_config_bootstrap_v3_LayeredRuntime* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__bootstrap__v3__RuntimeLayer_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -3627,6 +3802,7 @@ UPB_INLINE upb_Array* _envoy_config_bootstrap_v3_LayeredRuntime_layers_mutable_u UPB_INLINE envoy_config_bootstrap_v3_RuntimeLayer** envoy_config_bootstrap_v3_LayeredRuntime_mutable_layers(envoy_config_bootstrap_v3_LayeredRuntime* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__bootstrap__v3__RuntimeLayer_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -3643,6 +3819,7 @@ UPB_INLINE envoy_config_bootstrap_v3_RuntimeLayer** envoy_config_bootstrap_v3_La } UPB_INLINE struct envoy_config_bootstrap_v3_RuntimeLayer* envoy_config_bootstrap_v3_LayeredRuntime_add_layers(envoy_config_bootstrap_v3_LayeredRuntime* msg, upb_Arena* arena) { upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__bootstrap__v3__RuntimeLayer_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -3782,6 +3959,7 @@ UPB_INLINE const struct google_protobuf_Duration* envoy_config_bootstrap_v3_Memo 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -3797,6 +3975,7 @@ UPB_INLINE void envoy_config_bootstrap_v3_MemoryAllocatorManager_set_bytes_to_re } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { diff --git a/src/core/ext/upb-gen/envoy/config/bootstrap/v3/bootstrap.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/bootstrap/v3/bootstrap.upb_minitable.c index d0a5dd51815..563353a2119 100644 --- a/src/core/ext/upb-gen/envoy/config/bootstrap/v3/bootstrap.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/config/bootstrap/v3/bootstrap.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/config/bootstrap/v3/bootstrap.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -36,38 +37,39 @@ // Must be last. #include "upb/port/def.inc" -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}, - {.UPB_PRIVATE(submsg) = &envoy__config__bootstrap__v3__ClusterManager_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__metrics__v3__StatsSink_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__bootstrap__v3__Watchdog_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__trace__v3__Tracing_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__bootstrap__v3__Admin_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__metrics__v3__StatsConfig_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ApiConfigSource_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__overload__v3__OverloadManager_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__bootstrap__v3__LayeredRuntime_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__UInt64Value_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ConfigSource_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ConfigSource_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__bootstrap__v3__Bootstrap__CertificateProviderInstancesEntry_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__bootstrap__v3__Watchdogs_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__bootstrap__v3__FatalAction_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__DnsResolutionConfig_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__bootstrap__v3__CustomInlineHeader_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) = &envoy__config__core__v3__TypedExtensionConfig_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init}, - {.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}, - {.UPB_PRIVATE(submsg) = &envoy__config__bootstrap__v3__MemoryAllocatorManager_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal envoy_config_bootstrap_v3_Bootstrap_submsgs[31] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Node_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__bootstrap__v3__Bootstrap__StaticResources_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__bootstrap__v3__Bootstrap__DynamicResources_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__bootstrap__v3__ClusterManager_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__metrics__v3__StatsSink_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__bootstrap__v3__Watchdog_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__trace__v3__Tracing_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__bootstrap__v3__Admin_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__metrics__v3__StatsConfig_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ApiConfigSource_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__overload__v3__OverloadManager_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__bootstrap__v3__LayeredRuntime_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt64Value_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ConfigSource_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ConfigSource_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__bootstrap__v3__Bootstrap__CertificateProviderInstancesEntry_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__bootstrap__v3__Watchdogs_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__bootstrap__v3__FatalAction_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__DnsResolutionConfig_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__bootstrap__v3__CustomInlineHeader_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__bootstrap__v3__Bootstrap__ApplicationLogConfig_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__bootstrap__v3__Bootstrap__DeferredStatOptions_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__bootstrap__v3__Bootstrap__GrpcAsyncClientManagerConfig_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__bootstrap__v3__MemoryAllocatorManager_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_bootstrap_v3_Bootstrap__fields[39] = { @@ -155,10 +157,11 @@ const upb_MiniTable envoy__config__bootstrap__v3__Bootstrap_msg_init = { }) }; -static const upb_MiniTableSub envoy_config_bootstrap_v3_Bootstrap_StaticResources_submsgs[3] = { - {.UPB_PRIVATE(submsg) = &envoy__config__listener__v3__Listener_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__cluster__v3__Cluster_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__extensions__transport_0sockets__tls__v3__Secret_msg_init}, +const upb_MiniTable* envoy__config__bootstrap__v3__Bootstrap_msg_init_ptr = &envoy__config__bootstrap__v3__Bootstrap_msg_init; +static const upb_MiniTableSubInternal envoy_config_bootstrap_v3_Bootstrap_StaticResources_submsgs[3] = { + {.UPB_PRIVATE(submsg) = &envoy__config__listener__v3__Listener_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__cluster__v3__Cluster_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__extensions__transport_0sockets__tls__v3__Secret_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_bootstrap_v3_Bootstrap_StaticResources__fields[3] = { @@ -182,10 +185,11 @@ const upb_MiniTable envoy__config__bootstrap__v3__Bootstrap__StaticResources_msg }) }; -static const upb_MiniTableSub envoy_config_bootstrap_v3_Bootstrap_DynamicResources_submsgs[3] = { - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ConfigSource_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ConfigSource_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ApiConfigSource_msg_init}, +const upb_MiniTable* envoy__config__bootstrap__v3__Bootstrap__StaticResources_msg_init_ptr = &envoy__config__bootstrap__v3__Bootstrap__StaticResources_msg_init; +static const upb_MiniTableSubInternal envoy_config_bootstrap_v3_Bootstrap_DynamicResources_submsgs[3] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ConfigSource_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ConfigSource_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ApiConfigSource_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_bootstrap_v3_Bootstrap_DynamicResources__fields[5] = { @@ -215,8 +219,9 @@ const upb_MiniTable envoy__config__bootstrap__v3__Bootstrap__DynamicResources_ms }) }; -static const upb_MiniTableSub envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__config__bootstrap__v3__Bootstrap__ApplicationLogConfig__LogFormat_msg_init}, +const upb_MiniTable* envoy__config__bootstrap__v3__Bootstrap__DynamicResources_msg_init_ptr = &envoy__config__bootstrap__v3__Bootstrap__DynamicResources_msg_init; +static const upb_MiniTableSubInternal envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__config__bootstrap__v3__Bootstrap__ApplicationLogConfig__LogFormat_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig__fields[1] = { @@ -232,8 +237,9 @@ const upb_MiniTable envoy__config__bootstrap__v3__Bootstrap__ApplicationLogConfi #endif }; -static const upb_MiniTableSub envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_LogFormat_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__Struct_msg_init}, +const upb_MiniTable* envoy__config__bootstrap__v3__Bootstrap__ApplicationLogConfig_msg_init_ptr = &envoy__config__bootstrap__v3__Bootstrap__ApplicationLogConfig_msg_init; +static const upb_MiniTableSubInternal envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_LogFormat_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Struct_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_LogFormat__fields[2] = { @@ -256,6 +262,7 @@ const upb_MiniTable envoy__config__bootstrap__v3__Bootstrap__ApplicationLogConfi }) }; +const upb_MiniTable* envoy__config__bootstrap__v3__Bootstrap__ApplicationLogConfig__LogFormat_msg_init_ptr = &envoy__config__bootstrap__v3__Bootstrap__ApplicationLogConfig__LogFormat_msg_init; static const upb_MiniTableField envoy_config_bootstrap_v3_Bootstrap_DeferredStatOptions__fields[1] = { {1, 8, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, }; @@ -273,8 +280,9 @@ const upb_MiniTable envoy__config__bootstrap__v3__Bootstrap__DeferredStatOptions }) }; -static const upb_MiniTableSub envoy_config_bootstrap_v3_Bootstrap_GrpcAsyncClientManagerConfig_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, +const upb_MiniTable* envoy__config__bootstrap__v3__Bootstrap__DeferredStatOptions_msg_init_ptr = &envoy__config__bootstrap__v3__Bootstrap__DeferredStatOptions_msg_init; +static const upb_MiniTableSubInternal envoy_config_bootstrap_v3_Bootstrap_GrpcAsyncClientManagerConfig_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_bootstrap_v3_Bootstrap_GrpcAsyncClientManagerConfig__fields[1] = { @@ -290,8 +298,9 @@ const upb_MiniTable envoy__config__bootstrap__v3__Bootstrap__GrpcAsyncClientMana #endif }; -static const upb_MiniTableSub envoy_config_bootstrap_v3_Bootstrap_CertificateProviderInstancesEntry_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init}, +const upb_MiniTable* envoy__config__bootstrap__v3__Bootstrap__GrpcAsyncClientManagerConfig_msg_init_ptr = &envoy__config__bootstrap__v3__Bootstrap__GrpcAsyncClientManagerConfig_msg_init; +static const upb_MiniTableSubInternal envoy_config_bootstrap_v3_Bootstrap_CertificateProviderInstancesEntry_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_bootstrap_v3_Bootstrap_CertificateProviderInstancesEntry__fields[2] = { @@ -312,10 +321,11 @@ const upb_MiniTable envoy__config__bootstrap__v3__Bootstrap__CertificateProvider }) }; -static const upb_MiniTableSub envoy_config_bootstrap_v3_Admin_submsgs[3] = { - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Address_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__SocketOption_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__accesslog__v3__AccessLog_msg_init}, +const upb_MiniTable* envoy__config__bootstrap__v3__Bootstrap__CertificateProviderInstancesEntry_msg_init_ptr = &envoy__config__bootstrap__v3__Bootstrap__CertificateProviderInstancesEntry_msg_init; +static const upb_MiniTableSubInternal envoy_config_bootstrap_v3_Admin_submsgs[3] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Address_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__SocketOption_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__accesslog__v3__AccessLog_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_bootstrap_v3_Admin__fields[6] = { @@ -346,10 +356,11 @@ const upb_MiniTable envoy__config__bootstrap__v3__Admin_msg_init = { }) }; -static const upb_MiniTableSub envoy_config_bootstrap_v3_ClusterManager_submsgs[3] = { - {.UPB_PRIVATE(submsg) = &envoy__config__bootstrap__v3__ClusterManager__OutlierDetection_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__BindConfig_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ApiConfigSource_msg_init}, +const upb_MiniTable* envoy__config__bootstrap__v3__Admin_msg_init_ptr = &envoy__config__bootstrap__v3__Admin_msg_init; +static const upb_MiniTableSubInternal envoy_config_bootstrap_v3_ClusterManager_submsgs[3] = { + {.UPB_PRIVATE(submsg) = &envoy__config__bootstrap__v3__ClusterManager__OutlierDetection_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__BindConfig_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ApiConfigSource_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_bootstrap_v3_ClusterManager__fields[5] = { @@ -379,8 +390,9 @@ const upb_MiniTable envoy__config__bootstrap__v3__ClusterManager_msg_init = { }) }; -static const upb_MiniTableSub envoy_config_bootstrap_v3_ClusterManager_OutlierDetection_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__EventServiceConfig_msg_init}, +const upb_MiniTable* envoy__config__bootstrap__v3__ClusterManager_msg_init_ptr = &envoy__config__bootstrap__v3__ClusterManager_msg_init; +static const upb_MiniTableSubInternal envoy_config_bootstrap_v3_ClusterManager_OutlierDetection_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__EventServiceConfig_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_bootstrap_v3_ClusterManager_OutlierDetection__fields[2] = { @@ -401,9 +413,10 @@ const upb_MiniTable envoy__config__bootstrap__v3__ClusterManager__OutlierDetecti }) }; -static const upb_MiniTableSub envoy_config_bootstrap_v3_Watchdogs_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &envoy__config__bootstrap__v3__Watchdog_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__bootstrap__v3__Watchdog_msg_init}, +const upb_MiniTable* envoy__config__bootstrap__v3__ClusterManager__OutlierDetection_msg_init_ptr = &envoy__config__bootstrap__v3__ClusterManager__OutlierDetection_msg_init; +static const upb_MiniTableSubInternal envoy_config_bootstrap_v3_Watchdogs_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &envoy__config__bootstrap__v3__Watchdog_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__bootstrap__v3__Watchdog_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_bootstrap_v3_Watchdogs__fields[2] = { @@ -420,14 +433,15 @@ const upb_MiniTable envoy__config__bootstrap__v3__Watchdogs_msg_init = { #endif }; -static const upb_MiniTableSub envoy_config_bootstrap_v3_Watchdog_submsgs[7] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__type__v3__Percent_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__bootstrap__v3__Watchdog__WatchdogAction_msg_init}, +const upb_MiniTable* envoy__config__bootstrap__v3__Watchdogs_msg_init_ptr = &envoy__config__bootstrap__v3__Watchdogs_msg_init; +static const upb_MiniTableSubInternal envoy_config_bootstrap_v3_Watchdog_submsgs[7] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__type__v3__Percent_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__bootstrap__v3__Watchdog__WatchdogAction_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_bootstrap_v3_Watchdog__fields[7] = { @@ -459,8 +473,9 @@ const upb_MiniTable envoy__config__bootstrap__v3__Watchdog_msg_init = { }) }; -static const upb_MiniTableSub envoy_config_bootstrap_v3_Watchdog_WatchdogAction_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init}, +const upb_MiniTable* envoy__config__bootstrap__v3__Watchdog_msg_init_ptr = &envoy__config__bootstrap__v3__Watchdog_msg_init; +static const upb_MiniTableSubInternal envoy_config_bootstrap_v3_Watchdog_WatchdogAction_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_bootstrap_v3_Watchdog_WatchdogAction__fields[2] = { @@ -483,8 +498,9 @@ const upb_MiniTable envoy__config__bootstrap__v3__Watchdog__WatchdogAction_msg_i }) }; -static const upb_MiniTableSub envoy_config_bootstrap_v3_FatalAction_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init}, +const upb_MiniTable* envoy__config__bootstrap__v3__Watchdog__WatchdogAction_msg_init_ptr = &envoy__config__bootstrap__v3__Watchdog__WatchdogAction_msg_init; +static const upb_MiniTableSubInternal envoy_config_bootstrap_v3_FatalAction_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_bootstrap_v3_FatalAction__fields[1] = { @@ -500,8 +516,9 @@ const upb_MiniTable envoy__config__bootstrap__v3__FatalAction_msg_init = { #endif }; -static const upb_MiniTableSub envoy_config_bootstrap_v3_Runtime_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__Struct_msg_init}, +const upb_MiniTable* envoy__config__bootstrap__v3__FatalAction_msg_init_ptr = &envoy__config__bootstrap__v3__FatalAction_msg_init; +static const upb_MiniTableSubInternal envoy_config_bootstrap_v3_Runtime_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Struct_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_bootstrap_v3_Runtime__fields[4] = { @@ -526,11 +543,12 @@ const upb_MiniTable envoy__config__bootstrap__v3__Runtime_msg_init = { }) }; -static const upb_MiniTableSub envoy_config_bootstrap_v3_RuntimeLayer_submsgs[4] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__Struct_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__bootstrap__v3__RuntimeLayer__DiskLayer_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__bootstrap__v3__RuntimeLayer__AdminLayer_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__bootstrap__v3__RuntimeLayer__RtdsLayer_msg_init}, +const upb_MiniTable* envoy__config__bootstrap__v3__Runtime_msg_init_ptr = &envoy__config__bootstrap__v3__Runtime_msg_init; +static const upb_MiniTableSubInternal envoy_config_bootstrap_v3_RuntimeLayer_submsgs[4] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Struct_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__bootstrap__v3__RuntimeLayer__DiskLayer_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__bootstrap__v3__RuntimeLayer__AdminLayer_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__bootstrap__v3__RuntimeLayer__RtdsLayer_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_bootstrap_v3_RuntimeLayer__fields[5] = { @@ -560,6 +578,7 @@ const upb_MiniTable envoy__config__bootstrap__v3__RuntimeLayer_msg_init = { }) }; +const upb_MiniTable* envoy__config__bootstrap__v3__RuntimeLayer_msg_init_ptr = &envoy__config__bootstrap__v3__RuntimeLayer_msg_init; static const upb_MiniTableField envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer__fields[3] = { {1, UPB_SIZE(12, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, {2, 8, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, @@ -581,6 +600,7 @@ const upb_MiniTable envoy__config__bootstrap__v3__RuntimeLayer__DiskLayer_msg_in }) }; +const upb_MiniTable* envoy__config__bootstrap__v3__RuntimeLayer__DiskLayer_msg_init_ptr = &envoy__config__bootstrap__v3__RuntimeLayer__DiskLayer_msg_init; const upb_MiniTable envoy__config__bootstrap__v3__RuntimeLayer__AdminLayer_msg_init = { NULL, NULL, @@ -590,8 +610,9 @@ const upb_MiniTable envoy__config__bootstrap__v3__RuntimeLayer__AdminLayer_msg_i #endif }; -static const upb_MiniTableSub envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ConfigSource_msg_init}, +const upb_MiniTable* envoy__config__bootstrap__v3__RuntimeLayer__AdminLayer_msg_init_ptr = &envoy__config__bootstrap__v3__RuntimeLayer__AdminLayer_msg_init; +static const upb_MiniTableSubInternal envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ConfigSource_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer__fields[2] = { @@ -612,8 +633,9 @@ const upb_MiniTable envoy__config__bootstrap__v3__RuntimeLayer__RtdsLayer_msg_in }) }; -static const upb_MiniTableSub envoy_config_bootstrap_v3_LayeredRuntime_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__config__bootstrap__v3__RuntimeLayer_msg_init}, +const upb_MiniTable* envoy__config__bootstrap__v3__RuntimeLayer__RtdsLayer_msg_init_ptr = &envoy__config__bootstrap__v3__RuntimeLayer__RtdsLayer_msg_init; +static const upb_MiniTableSubInternal envoy_config_bootstrap_v3_LayeredRuntime_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__config__bootstrap__v3__RuntimeLayer_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_bootstrap_v3_LayeredRuntime__fields[1] = { @@ -633,6 +655,7 @@ const upb_MiniTable envoy__config__bootstrap__v3__LayeredRuntime_msg_init = { }) }; +const upb_MiniTable* envoy__config__bootstrap__v3__LayeredRuntime_msg_init_ptr = &envoy__config__bootstrap__v3__LayeredRuntime_msg_init; static const upb_MiniTableField envoy_config_bootstrap_v3_CustomInlineHeader__fields[2] = { {1, UPB_SIZE(12, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, {2, 8, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, @@ -653,8 +676,9 @@ const upb_MiniTable envoy__config__bootstrap__v3__CustomInlineHeader_msg_init = }) }; -static const upb_MiniTableSub envoy_config_bootstrap_v3_MemoryAllocatorManager_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, +const upb_MiniTable* envoy__config__bootstrap__v3__CustomInlineHeader_msg_init_ptr = &envoy__config__bootstrap__v3__CustomInlineHeader_msg_init; +static const upb_MiniTableSubInternal envoy_config_bootstrap_v3_MemoryAllocatorManager_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_bootstrap_v3_MemoryAllocatorManager__fields[2] = { @@ -675,6 +699,7 @@ const upb_MiniTable envoy__config__bootstrap__v3__MemoryAllocatorManager_msg_ini }) }; +const upb_MiniTable* envoy__config__bootstrap__v3__MemoryAllocatorManager_msg_init_ptr = &envoy__config__bootstrap__v3__MemoryAllocatorManager_msg_init; static const upb_MiniTable *messages_layout[23] = { &envoy__config__bootstrap__v3__Bootstrap_msg_init, &envoy__config__bootstrap__v3__Bootstrap__StaticResources_msg_init, diff --git a/src/core/ext/upb-gen/envoy/config/bootstrap/v3/bootstrap.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/bootstrap/v3/bootstrap.upb_minitable.h index dbfa51694cb..fc0333a3126 100644 --- a/src/core/ext/upb-gen/envoy/config/bootstrap/v3/bootstrap.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/config/bootstrap/v3/bootstrap.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/config/bootstrap/v3/bootstrap.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_BOOTSTRAP_V3_BOOTSTRAP_PROTO_UPB_MINITABLE_H_ #define ENVOY_CONFIG_BOOTSTRAP_V3_BOOTSTRAP_PROTO_UPB_MINITABLE_H_ @@ -18,28 +19,51 @@ extern "C" { #endif extern const upb_MiniTable envoy__config__bootstrap__v3__Bootstrap_msg_init; +extern const upb_MiniTable* envoy__config__bootstrap__v3__Bootstrap_msg_init_ptr; extern const upb_MiniTable envoy__config__bootstrap__v3__Bootstrap__StaticResources_msg_init; +extern const upb_MiniTable* envoy__config__bootstrap__v3__Bootstrap__StaticResources_msg_init_ptr; extern const upb_MiniTable envoy__config__bootstrap__v3__Bootstrap__DynamicResources_msg_init; +extern const upb_MiniTable* envoy__config__bootstrap__v3__Bootstrap__DynamicResources_msg_init_ptr; extern const upb_MiniTable envoy__config__bootstrap__v3__Bootstrap__ApplicationLogConfig_msg_init; +extern const upb_MiniTable* envoy__config__bootstrap__v3__Bootstrap__ApplicationLogConfig_msg_init_ptr; extern const upb_MiniTable envoy__config__bootstrap__v3__Bootstrap__ApplicationLogConfig__LogFormat_msg_init; +extern const upb_MiniTable* envoy__config__bootstrap__v3__Bootstrap__ApplicationLogConfig__LogFormat_msg_init_ptr; extern const upb_MiniTable envoy__config__bootstrap__v3__Bootstrap__DeferredStatOptions_msg_init; +extern const upb_MiniTable* envoy__config__bootstrap__v3__Bootstrap__DeferredStatOptions_msg_init_ptr; extern const upb_MiniTable envoy__config__bootstrap__v3__Bootstrap__GrpcAsyncClientManagerConfig_msg_init; +extern const upb_MiniTable* envoy__config__bootstrap__v3__Bootstrap__GrpcAsyncClientManagerConfig_msg_init_ptr; extern const upb_MiniTable envoy__config__bootstrap__v3__Bootstrap__CertificateProviderInstancesEntry_msg_init; +extern const upb_MiniTable* envoy__config__bootstrap__v3__Bootstrap__CertificateProviderInstancesEntry_msg_init_ptr; extern const upb_MiniTable envoy__config__bootstrap__v3__Admin_msg_init; +extern const upb_MiniTable* envoy__config__bootstrap__v3__Admin_msg_init_ptr; extern const upb_MiniTable envoy__config__bootstrap__v3__ClusterManager_msg_init; +extern const upb_MiniTable* envoy__config__bootstrap__v3__ClusterManager_msg_init_ptr; extern const upb_MiniTable envoy__config__bootstrap__v3__ClusterManager__OutlierDetection_msg_init; +extern const upb_MiniTable* envoy__config__bootstrap__v3__ClusterManager__OutlierDetection_msg_init_ptr; extern const upb_MiniTable envoy__config__bootstrap__v3__Watchdogs_msg_init; +extern const upb_MiniTable* envoy__config__bootstrap__v3__Watchdogs_msg_init_ptr; extern const upb_MiniTable envoy__config__bootstrap__v3__Watchdog_msg_init; +extern const upb_MiniTable* envoy__config__bootstrap__v3__Watchdog_msg_init_ptr; extern const upb_MiniTable envoy__config__bootstrap__v3__Watchdog__WatchdogAction_msg_init; +extern const upb_MiniTable* envoy__config__bootstrap__v3__Watchdog__WatchdogAction_msg_init_ptr; extern const upb_MiniTable envoy__config__bootstrap__v3__FatalAction_msg_init; +extern const upb_MiniTable* envoy__config__bootstrap__v3__FatalAction_msg_init_ptr; extern const upb_MiniTable envoy__config__bootstrap__v3__Runtime_msg_init; +extern const upb_MiniTable* envoy__config__bootstrap__v3__Runtime_msg_init_ptr; extern const upb_MiniTable envoy__config__bootstrap__v3__RuntimeLayer_msg_init; +extern const upb_MiniTable* envoy__config__bootstrap__v3__RuntimeLayer_msg_init_ptr; extern const upb_MiniTable envoy__config__bootstrap__v3__RuntimeLayer__DiskLayer_msg_init; +extern const upb_MiniTable* envoy__config__bootstrap__v3__RuntimeLayer__DiskLayer_msg_init_ptr; extern const upb_MiniTable envoy__config__bootstrap__v3__RuntimeLayer__AdminLayer_msg_init; +extern const upb_MiniTable* envoy__config__bootstrap__v3__RuntimeLayer__AdminLayer_msg_init_ptr; extern const upb_MiniTable envoy__config__bootstrap__v3__RuntimeLayer__RtdsLayer_msg_init; +extern const upb_MiniTable* envoy__config__bootstrap__v3__RuntimeLayer__RtdsLayer_msg_init_ptr; extern const upb_MiniTable envoy__config__bootstrap__v3__LayeredRuntime_msg_init; +extern const upb_MiniTable* envoy__config__bootstrap__v3__LayeredRuntime_msg_init_ptr; extern const upb_MiniTable envoy__config__bootstrap__v3__CustomInlineHeader_msg_init; +extern const upb_MiniTable* envoy__config__bootstrap__v3__CustomInlineHeader_msg_init_ptr; extern const upb_MiniTable envoy__config__bootstrap__v3__MemoryAllocatorManager_msg_init; +extern const upb_MiniTable* envoy__config__bootstrap__v3__MemoryAllocatorManager_msg_init_ptr; extern const upb_MiniTableFile envoy_config_bootstrap_v3_bootstrap_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/config/cluster/v3/circuit_breaker.upb.h b/src/core/ext/upb-gen/envoy/config/cluster/v3/circuit_breaker.upb.h index 76cfcddac0d..f2a34376735 100644 --- a/src/core/ext/upb-gen/envoy/config/cluster/v3/circuit_breaker.upb.h +++ b/src/core/ext/upb-gen/envoy/config/cluster/v3/circuit_breaker.upb.h @@ -3,7 +3,8 @@ * envoy/config/cluster/v3/circuit_breaker.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_CLUSTER_V3_CIRCUIT_BREAKER_PROTO_UPB_H_ #define ENVOY_CONFIG_CLUSTER_V3_CIRCUIT_BREAKER_PROTO_UPB_H_ @@ -76,6 +77,7 @@ UPB_INLINE void envoy_config_cluster_v3_CircuitBreakers_clear_thresholds(envoy_c } UPB_INLINE const envoy_config_cluster_v3_CircuitBreakers_Thresholds* const* envoy_config_cluster_v3_CircuitBreakers_thresholds(const envoy_config_cluster_v3_CircuitBreakers* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__cluster__v3__CircuitBreakers__Thresholds_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -87,6 +89,7 @@ UPB_INLINE const envoy_config_cluster_v3_CircuitBreakers_Thresholds* const* envo } UPB_INLINE const upb_Array* _envoy_config_cluster_v3_CircuitBreakers_thresholds_upb_array(const envoy_config_cluster_v3_CircuitBreakers* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__cluster__v3__CircuitBreakers__Thresholds_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -95,6 +98,7 @@ UPB_INLINE const upb_Array* _envoy_config_cluster_v3_CircuitBreakers_thresholds_ } UPB_INLINE upb_Array* _envoy_config_cluster_v3_CircuitBreakers_thresholds_mutable_upb_array(envoy_config_cluster_v3_CircuitBreakers* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__cluster__v3__CircuitBreakers__Thresholds_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -108,6 +112,7 @@ UPB_INLINE void envoy_config_cluster_v3_CircuitBreakers_clear_per_host_threshold } UPB_INLINE const envoy_config_cluster_v3_CircuitBreakers_Thresholds* const* envoy_config_cluster_v3_CircuitBreakers_per_host_thresholds(const envoy_config_cluster_v3_CircuitBreakers* msg, size_t* size) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__cluster__v3__CircuitBreakers__Thresholds_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -119,6 +124,7 @@ UPB_INLINE const envoy_config_cluster_v3_CircuitBreakers_Thresholds* const* envo } UPB_INLINE const upb_Array* _envoy_config_cluster_v3_CircuitBreakers_per_host_thresholds_upb_array(const envoy_config_cluster_v3_CircuitBreakers* msg, size_t* size) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__cluster__v3__CircuitBreakers__Thresholds_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -127,6 +133,7 @@ UPB_INLINE const upb_Array* _envoy_config_cluster_v3_CircuitBreakers_per_host_th } UPB_INLINE upb_Array* _envoy_config_cluster_v3_CircuitBreakers_per_host_thresholds_mutable_upb_array(envoy_config_cluster_v3_CircuitBreakers* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__cluster__v3__CircuitBreakers__Thresholds_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -137,6 +144,7 @@ UPB_INLINE upb_Array* _envoy_config_cluster_v3_CircuitBreakers_per_host_threshol UPB_INLINE envoy_config_cluster_v3_CircuitBreakers_Thresholds** envoy_config_cluster_v3_CircuitBreakers_mutable_thresholds(envoy_config_cluster_v3_CircuitBreakers* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__cluster__v3__CircuitBreakers__Thresholds_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -153,6 +161,7 @@ UPB_INLINE envoy_config_cluster_v3_CircuitBreakers_Thresholds** envoy_config_clu } UPB_INLINE struct envoy_config_cluster_v3_CircuitBreakers_Thresholds* envoy_config_cluster_v3_CircuitBreakers_add_thresholds(envoy_config_cluster_v3_CircuitBreakers* msg, upb_Arena* arena) { upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__cluster__v3__CircuitBreakers__Thresholds_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -167,6 +176,7 @@ UPB_INLINE struct envoy_config_cluster_v3_CircuitBreakers_Thresholds* envoy_conf } UPB_INLINE envoy_config_cluster_v3_CircuitBreakers_Thresholds** envoy_config_cluster_v3_CircuitBreakers_mutable_per_host_thresholds(envoy_config_cluster_v3_CircuitBreakers* msg, size_t* size) { upb_MiniTableField field = {2, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__cluster__v3__CircuitBreakers__Thresholds_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -183,6 +193,7 @@ UPB_INLINE envoy_config_cluster_v3_CircuitBreakers_Thresholds** envoy_config_clu } UPB_INLINE struct envoy_config_cluster_v3_CircuitBreakers_Thresholds* envoy_config_cluster_v3_CircuitBreakers_add_per_host_thresholds(envoy_config_cluster_v3_CircuitBreakers* msg, upb_Arena* arena) { upb_MiniTableField field = {2, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__cluster__v3__CircuitBreakers__Thresholds_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -252,6 +263,7 @@ UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_cluster_v3_Cir const struct google_protobuf_UInt32Value* default_val = NULL; const struct google_protobuf_UInt32Value* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -268,6 +280,7 @@ UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_cluster_v3_Cir const struct google_protobuf_UInt32Value* default_val = NULL; const struct google_protobuf_UInt32Value* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -284,6 +297,7 @@ UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_cluster_v3_Cir const struct google_protobuf_UInt32Value* default_val = NULL; const struct google_protobuf_UInt32Value* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -300,6 +314,7 @@ UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_cluster_v3_Cir const struct google_protobuf_UInt32Value* default_val = NULL; const struct google_protobuf_UInt32Value* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -328,6 +343,7 @@ UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_cluster_v3_Cir const struct google_protobuf_UInt32Value* default_val = NULL; const struct google_protobuf_UInt32Value* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -344,6 +360,7 @@ UPB_INLINE const envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget* const envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget* default_val = NULL; const envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__cluster__v3__CircuitBreakers__Thresholds__RetryBudget_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -359,6 +376,7 @@ UPB_INLINE void envoy_config_cluster_v3_CircuitBreakers_Thresholds_set_priority( } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); 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) { @@ -371,6 +389,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); 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) { @@ -383,6 +402,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); 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) { @@ -395,6 +415,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); 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) { @@ -411,6 +432,7 @@ UPB_INLINE void envoy_config_cluster_v3_CircuitBreakers_Thresholds_set_track_rem } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); 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) { @@ -423,6 +445,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__cluster__v3__CircuitBreakers__Thresholds__RetryBudget_msg_init); 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) { @@ -478,6 +501,7 @@ UPB_INLINE const struct envoy_type_v3_Percent* envoy_config_cluster_v3_CircuitBr const struct envoy_type_v3_Percent* default_val = NULL; const struct envoy_type_v3_Percent* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__v3__Percent_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -494,6 +518,7 @@ UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_cluster_v3_Cir const struct google_protobuf_UInt32Value* default_val = NULL; const struct google_protobuf_UInt32Value* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -505,6 +530,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__v3__Percent_msg_init); 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) { @@ -517,6 +543,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); 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) { diff --git a/src/core/ext/upb-gen/envoy/config/cluster/v3/circuit_breaker.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/cluster/v3/circuit_breaker.upb_minitable.c index 8cca6f747ff..5fa07fe8bef 100644 --- a/src/core/ext/upb-gen/envoy/config/cluster/v3/circuit_breaker.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/config/cluster/v3/circuit_breaker.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/config/cluster/v3/circuit_breaker.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -18,9 +19,10 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub envoy_config_cluster_v3_CircuitBreakers_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &envoy__config__cluster__v3__CircuitBreakers__Thresholds_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__cluster__v3__CircuitBreakers__Thresholds_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal envoy_config_cluster_v3_CircuitBreakers_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &envoy__config__cluster__v3__CircuitBreakers__Thresholds_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__cluster__v3__CircuitBreakers__Thresholds_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_cluster_v3_CircuitBreakers__fields[2] = { @@ -43,13 +45,14 @@ const upb_MiniTable envoy__config__cluster__v3__CircuitBreakers_msg_init = { }) }; -static const upb_MiniTableSub envoy_config_cluster_v3_CircuitBreakers_Thresholds_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) = &google__protobuf__UInt32Value_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__cluster__v3__CircuitBreakers__Thresholds__RetryBudget_msg_init}, +const upb_MiniTable* envoy__config__cluster__v3__CircuitBreakers_msg_init_ptr = &envoy__config__cluster__v3__CircuitBreakers_msg_init; +static const upb_MiniTableSubInternal envoy_config_cluster_v3_CircuitBreakers_Thresholds_submsgs[6] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__cluster__v3__CircuitBreakers__Thresholds__RetryBudget_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_cluster_v3_CircuitBreakers_Thresholds__fields[8] = { @@ -82,9 +85,10 @@ const upb_MiniTable envoy__config__cluster__v3__CircuitBreakers__Thresholds_msg_ }) }; -static const upb_MiniTableSub envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &envoy__type__v3__Percent_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init}, +const upb_MiniTable* envoy__config__cluster__v3__CircuitBreakers__Thresholds_msg_init_ptr = &envoy__config__cluster__v3__CircuitBreakers__Thresholds_msg_init; +static const upb_MiniTableSubInternal envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &envoy__type__v3__Percent_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget__fields[2] = { @@ -101,6 +105,7 @@ const upb_MiniTable envoy__config__cluster__v3__CircuitBreakers__Thresholds__Ret #endif }; +const upb_MiniTable* envoy__config__cluster__v3__CircuitBreakers__Thresholds__RetryBudget_msg_init_ptr = &envoy__config__cluster__v3__CircuitBreakers__Thresholds__RetryBudget_msg_init; static const upb_MiniTable *messages_layout[3] = { &envoy__config__cluster__v3__CircuitBreakers_msg_init, &envoy__config__cluster__v3__CircuitBreakers__Thresholds_msg_init, diff --git a/src/core/ext/upb-gen/envoy/config/cluster/v3/circuit_breaker.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/cluster/v3/circuit_breaker.upb_minitable.h index a83799879b1..7b95c84f895 100644 --- a/src/core/ext/upb-gen/envoy/config/cluster/v3/circuit_breaker.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/config/cluster/v3/circuit_breaker.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/config/cluster/v3/circuit_breaker.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_CLUSTER_V3_CIRCUIT_BREAKER_PROTO_UPB_MINITABLE_H_ #define ENVOY_CONFIG_CLUSTER_V3_CIRCUIT_BREAKER_PROTO_UPB_MINITABLE_H_ @@ -18,8 +19,11 @@ extern "C" { #endif extern const upb_MiniTable envoy__config__cluster__v3__CircuitBreakers_msg_init; +extern const upb_MiniTable* envoy__config__cluster__v3__CircuitBreakers_msg_init_ptr; extern const upb_MiniTable envoy__config__cluster__v3__CircuitBreakers__Thresholds_msg_init; +extern const upb_MiniTable* envoy__config__cluster__v3__CircuitBreakers__Thresholds_msg_init_ptr; extern const upb_MiniTable envoy__config__cluster__v3__CircuitBreakers__Thresholds__RetryBudget_msg_init; +extern const upb_MiniTable* envoy__config__cluster__v3__CircuitBreakers__Thresholds__RetryBudget_msg_init_ptr; extern const upb_MiniTableFile envoy_config_cluster_v3_circuit_breaker_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/config/cluster/v3/cluster.upb.h b/src/core/ext/upb-gen/envoy/config/cluster/v3/cluster.upb.h index fbf094cd6c0..df151184d33 100644 --- a/src/core/ext/upb-gen/envoy/config/cluster/v3/cluster.upb.h +++ b/src/core/ext/upb-gen/envoy/config/cluster/v3/cluster.upb.h @@ -3,7 +3,8 @@ * envoy/config/cluster/v3/cluster.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_CLUSTER_V3_CLUSTER_PROTO_UPB_H_ #define ENVOY_CONFIG_CLUSTER_V3_CLUSTER_PROTO_UPB_H_ @@ -206,6 +207,7 @@ UPB_INLINE const struct xds_core_v3_CollectionEntry* envoy_config_cluster_v3_Clu const struct xds_core_v3_CollectionEntry* default_val = NULL; const struct xds_core_v3_CollectionEntry* 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_PRIVATE(_upb_MiniTable_StrongReference)(&xds__core__v3__CollectionEntry_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -217,6 +219,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_PRIVATE(_upb_MiniTable_StrongReference)(&xds__core__v3__CollectionEntry_msg_init); 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) { @@ -323,6 +326,7 @@ UPB_INLINE const envoy_config_cluster_v3_Cluster_EdsClusterConfig* envoy_config_ const envoy_config_cluster_v3_Cluster_EdsClusterConfig* default_val = NULL; const envoy_config_cluster_v3_Cluster_EdsClusterConfig* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__cluster__v3__Cluster__EdsClusterConfig_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -339,6 +343,7 @@ UPB_INLINE const struct google_protobuf_Duration* envoy_config_cluster_v3_Cluste const struct google_protobuf_Duration* default_val = NULL; const struct google_protobuf_Duration* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -355,6 +360,7 @@ UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_cluster_v3_Clu const struct google_protobuf_UInt32Value* default_val = NULL; const struct google_protobuf_UInt32Value* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -381,6 +387,7 @@ UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_health_checks(envoy_config } UPB_INLINE const struct envoy_config_core_v3_HealthCheck* const* envoy_config_cluster_v3_Cluster_health_checks(const envoy_config_cluster_v3_Cluster* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HealthCheck_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -392,6 +399,7 @@ UPB_INLINE const struct envoy_config_core_v3_HealthCheck* const* envoy_config_cl } UPB_INLINE const upb_Array* _envoy_config_cluster_v3_Cluster_health_checks_upb_array(const envoy_config_cluster_v3_Cluster* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HealthCheck_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -400,6 +408,7 @@ UPB_INLINE const upb_Array* _envoy_config_cluster_v3_Cluster_health_checks_upb_a } UPB_INLINE upb_Array* _envoy_config_cluster_v3_Cluster_health_checks_mutable_upb_array(envoy_config_cluster_v3_Cluster* msg, size_t* size, upb_Arena* arena) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HealthCheck_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -415,6 +424,7 @@ UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_cluster_v3_Clu const struct google_protobuf_UInt32Value* default_val = NULL; const struct google_protobuf_UInt32Value* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -431,6 +441,7 @@ UPB_INLINE const struct envoy_config_cluster_v3_CircuitBreakers* envoy_config_cl const struct envoy_config_cluster_v3_CircuitBreakers* default_val = NULL; const struct envoy_config_cluster_v3_CircuitBreakers* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__cluster__v3__CircuitBreakers_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -447,6 +458,7 @@ UPB_INLINE const struct envoy_config_core_v3_Http1ProtocolOptions* envoy_config_ const struct envoy_config_core_v3_Http1ProtocolOptions* default_val = NULL; const struct envoy_config_core_v3_Http1ProtocolOptions* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Http1ProtocolOptions_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -463,6 +475,7 @@ UPB_INLINE const struct envoy_config_core_v3_Http2ProtocolOptions* envoy_config_ const struct envoy_config_core_v3_Http2ProtocolOptions* default_val = NULL; const struct envoy_config_core_v3_Http2ProtocolOptions* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Http2ProtocolOptions_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -479,6 +492,7 @@ UPB_INLINE const struct google_protobuf_Duration* envoy_config_cluster_v3_Cluste const struct google_protobuf_Duration* default_val = NULL; const struct google_protobuf_Duration* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -505,6 +519,7 @@ UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_dns_resolvers(envoy_config } UPB_INLINE const struct envoy_config_core_v3_Address* const* envoy_config_cluster_v3_Cluster_dns_resolvers(const envoy_config_cluster_v3_Cluster* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Address_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -516,6 +531,7 @@ UPB_INLINE const struct envoy_config_core_v3_Address* const* envoy_config_cluste } UPB_INLINE const upb_Array* _envoy_config_cluster_v3_Cluster_dns_resolvers_upb_array(const envoy_config_cluster_v3_Cluster* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Address_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -524,6 +540,7 @@ UPB_INLINE const upb_Array* _envoy_config_cluster_v3_Cluster_dns_resolvers_upb_a } UPB_INLINE upb_Array* _envoy_config_cluster_v3_Cluster_dns_resolvers_mutable_upb_array(envoy_config_cluster_v3_Cluster* msg, size_t* size, upb_Arena* arena) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Address_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -539,6 +556,7 @@ UPB_INLINE const struct envoy_config_cluster_v3_OutlierDetection* envoy_config_c const struct envoy_config_cluster_v3_OutlierDetection* default_val = NULL; const struct envoy_config_cluster_v3_OutlierDetection* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__cluster__v3__OutlierDetection_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -555,6 +573,7 @@ UPB_INLINE const struct google_protobuf_Duration* envoy_config_cluster_v3_Cluste const struct google_protobuf_Duration* default_val = NULL; const struct google_protobuf_Duration* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -571,6 +590,7 @@ UPB_INLINE const struct envoy_config_core_v3_BindConfig* envoy_config_cluster_v3 const struct envoy_config_core_v3_BindConfig* default_val = NULL; const struct envoy_config_core_v3_BindConfig* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__BindConfig_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -587,6 +607,7 @@ UPB_INLINE const envoy_config_cluster_v3_Cluster_LbSubsetConfig* envoy_config_cl const envoy_config_cluster_v3_Cluster_LbSubsetConfig* default_val = NULL; const envoy_config_cluster_v3_Cluster_LbSubsetConfig* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__cluster__v3__Cluster__LbSubsetConfig_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -603,6 +624,7 @@ UPB_INLINE const envoy_config_cluster_v3_Cluster_RingHashLbConfig* envoy_config_ 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(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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__cluster__v3__Cluster__RingHashLbConfig_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -619,6 +641,7 @@ UPB_INLINE const struct envoy_config_core_v3_TransportSocket* envoy_config_clust const struct envoy_config_core_v3_TransportSocket* default_val = NULL; const struct envoy_config_core_v3_TransportSocket* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TransportSocket_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -635,6 +658,7 @@ UPB_INLINE const struct envoy_config_core_v3_Metadata* envoy_config_cluster_v3_C const struct envoy_config_core_v3_Metadata* default_val = NULL; const struct envoy_config_core_v3_Metadata* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Metadata_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -663,6 +687,7 @@ UPB_INLINE const envoy_config_cluster_v3_Cluster_CommonLbConfig* envoy_config_cl const envoy_config_cluster_v3_Cluster_CommonLbConfig* default_val = NULL; const envoy_config_cluster_v3_Cluster_CommonLbConfig* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__cluster__v3__Cluster__CommonLbConfig_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -691,6 +716,7 @@ UPB_INLINE const struct envoy_config_core_v3_HttpProtocolOptions* envoy_config_c const struct envoy_config_core_v3_HttpProtocolOptions* default_val = NULL; const struct envoy_config_core_v3_HttpProtocolOptions* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HttpProtocolOptions_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -707,6 +733,7 @@ UPB_INLINE const envoy_config_cluster_v3_UpstreamConnectionOptions* envoy_config const envoy_config_cluster_v3_UpstreamConnectionOptions* default_val = NULL; const envoy_config_cluster_v3_UpstreamConnectionOptions* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__cluster__v3__UpstreamConnectionOptions_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -747,6 +774,7 @@ UPB_INLINE const struct envoy_config_endpoint_v3_ClusterLoadAssignment* envoy_co const struct envoy_config_endpoint_v3_ClusterLoadAssignment* default_val = NULL; const struct envoy_config_endpoint_v3_ClusterLoadAssignment* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__endpoint__v3__ClusterLoadAssignment_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -763,6 +791,7 @@ UPB_INLINE const envoy_config_cluster_v3_Cluster_OriginalDstLbConfig* envoy_conf 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(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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__cluster__v3__Cluster__OriginalDstLbConfig_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -782,22 +811,30 @@ UPB_INLINE size_t envoy_config_cluster_v3_Cluster_typed_extension_protocol_optio } UPB_INLINE bool envoy_config_cluster_v3_Cluster_typed_extension_protocol_options_get(const envoy_config_cluster_v3_Cluster* msg, upb_StringView key, struct google_protobuf_Any** val) { const upb_MiniTableField field = {36, UPB_SIZE(108, 232), 0, 22, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__cluster__v3__Cluster__TypedExtensionProtocolOptionsEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); 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_cluster_v3_Cluster_TypedExtensionProtocolOptionsEntry* envoy_config_cluster_v3_Cluster_typed_extension_protocol_options_next(const envoy_config_cluster_v3_Cluster* msg, size_t* iter) { const upb_MiniTableField field = {36, UPB_SIZE(108, 232), 0, 22, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__cluster__v3__Cluster__TypedExtensionProtocolOptionsEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); const upb_Map* map = upb_Message_GetMap(UPB_UPCAST(msg), &field); if (!map) return NULL; return (const envoy_config_cluster_v3_Cluster_TypedExtensionProtocolOptionsEntry*)_upb_map_next(map, iter); } UPB_INLINE const upb_Map* _envoy_config_cluster_v3_Cluster_typed_extension_protocol_options_upb_map(envoy_config_cluster_v3_Cluster* msg) { const upb_MiniTableField field = {36, UPB_SIZE(108, 232), 0, 22, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__cluster__v3__Cluster__TypedExtensionProtocolOptionsEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); return upb_Message_GetMap(UPB_UPCAST(msg), &field); } UPB_INLINE upb_Map* _envoy_config_cluster_v3_Cluster_typed_extension_protocol_options_mutable_upb_map(envoy_config_cluster_v3_Cluster* msg, upb_Arena* a) { const upb_MiniTableField field = {36, UPB_SIZE(108, 232), 0, 22, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__cluster__v3__Cluster__TypedExtensionProtocolOptionsEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); 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) { @@ -808,6 +845,7 @@ UPB_INLINE const envoy_config_cluster_v3_Cluster_LeastRequestLbConfig* envoy_con 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(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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__cluster__v3__Cluster__LeastRequestLbConfig_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -824,6 +862,7 @@ UPB_INLINE const envoy_config_cluster_v3_Cluster_CustomClusterType* envoy_config 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(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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__cluster__v3__Cluster__CustomClusterType_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -850,6 +889,7 @@ UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_filters(envoy_config_clust } UPB_INLINE const struct envoy_config_cluster_v3_Filter* const* envoy_config_cluster_v3_Cluster_filters(const envoy_config_cluster_v3_Cluster* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__cluster__v3__Filter_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -861,6 +901,7 @@ UPB_INLINE const struct envoy_config_cluster_v3_Filter* const* envoy_config_clus } UPB_INLINE const upb_Array* _envoy_config_cluster_v3_Cluster_filters_upb_array(const envoy_config_cluster_v3_Cluster* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__cluster__v3__Filter_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -869,6 +910,7 @@ UPB_INLINE const upb_Array* _envoy_config_cluster_v3_Cluster_filters_upb_array(c } UPB_INLINE upb_Array* _envoy_config_cluster_v3_Cluster_filters_mutable_upb_array(envoy_config_cluster_v3_Cluster* msg, size_t* size, upb_Arena* arena) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__cluster__v3__Filter_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -884,6 +926,7 @@ UPB_INLINE const envoy_config_cluster_v3_LoadBalancingPolicy* envoy_config_clust const envoy_config_cluster_v3_LoadBalancingPolicy* default_val = NULL; const envoy_config_cluster_v3_LoadBalancingPolicy* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__cluster__v3__LoadBalancingPolicy_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -900,6 +943,7 @@ UPB_INLINE const struct envoy_config_core_v3_ConfigSource* envoy_config_cluster_ const struct envoy_config_core_v3_ConfigSource* default_val = NULL; const struct envoy_config_core_v3_ConfigSource* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__ConfigSource_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -914,6 +958,7 @@ UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_transport_socket_matches(e } UPB_INLINE const envoy_config_cluster_v3_Cluster_TransportSocketMatch* const* envoy_config_cluster_v3_Cluster_transport_socket_matches(const envoy_config_cluster_v3_Cluster* msg, size_t* size) { const upb_MiniTableField field = {43, UPB_SIZE(132, 264), 0, 28, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__cluster__v3__Cluster__TransportSocketMatch_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -925,6 +970,7 @@ UPB_INLINE const envoy_config_cluster_v3_Cluster_TransportSocketMatch* const* en } UPB_INLINE const upb_Array* _envoy_config_cluster_v3_Cluster_transport_socket_matches_upb_array(const envoy_config_cluster_v3_Cluster* msg, size_t* size) { const upb_MiniTableField field = {43, UPB_SIZE(132, 264), 0, 28, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__cluster__v3__Cluster__TransportSocketMatch_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -933,6 +979,7 @@ UPB_INLINE const upb_Array* _envoy_config_cluster_v3_Cluster_transport_socket_ma } UPB_INLINE upb_Array* _envoy_config_cluster_v3_Cluster_transport_socket_matches_mutable_upb_array(envoy_config_cluster_v3_Cluster* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {43, UPB_SIZE(132, 264), 0, 28, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__cluster__v3__Cluster__TransportSocketMatch_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -948,6 +995,7 @@ UPB_INLINE const envoy_config_cluster_v3_Cluster_RefreshRate* envoy_config_clust const envoy_config_cluster_v3_Cluster_RefreshRate* default_val = NULL; const envoy_config_cluster_v3_Cluster_RefreshRate* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__cluster__v3__Cluster__RefreshRate_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -976,6 +1024,7 @@ UPB_INLINE const struct envoy_config_core_v3_UpstreamHttpProtocolOptions* envoy_ const struct envoy_config_core_v3_UpstreamHttpProtocolOptions* default_val = NULL; const struct envoy_config_core_v3_UpstreamHttpProtocolOptions* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__UpstreamHttpProtocolOptions_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1004,6 +1053,7 @@ UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_ const struct envoy_config_core_v3_TypedExtensionConfig* default_val = NULL; const struct envoy_config_core_v3_TypedExtensionConfig* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1020,6 +1070,7 @@ UPB_INLINE const envoy_config_cluster_v3_TrackClusterStats* envoy_config_cluster const envoy_config_cluster_v3_TrackClusterStats* default_val = NULL; const envoy_config_cluster_v3_TrackClusterStats* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__cluster__v3__TrackClusterStats_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1036,6 +1087,7 @@ UPB_INLINE const envoy_config_cluster_v3_Cluster_PreconnectPolicy* envoy_config_ const envoy_config_cluster_v3_Cluster_PreconnectPolicy* default_val = NULL; const envoy_config_cluster_v3_Cluster_PreconnectPolicy* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__cluster__v3__Cluster__PreconnectPolicy_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1064,6 +1116,7 @@ UPB_INLINE const envoy_config_cluster_v3_Cluster_MaglevLbConfig* envoy_config_cl 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(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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__cluster__v3__Cluster__MaglevLbConfig_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1080,6 +1133,7 @@ UPB_INLINE const struct envoy_config_core_v3_DnsResolutionConfig* envoy_config_c const struct envoy_config_core_v3_DnsResolutionConfig* default_val = NULL; const struct envoy_config_core_v3_DnsResolutionConfig* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__DnsResolutionConfig_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1096,6 +1150,7 @@ UPB_INLINE const struct google_protobuf_BoolValue* envoy_config_cluster_v3_Clust const struct google_protobuf_BoolValue* default_val = NULL; const struct google_protobuf_BoolValue* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1112,6 +1167,7 @@ UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_ const struct envoy_config_core_v3_TypedExtensionConfig* default_val = NULL; const struct envoy_config_core_v3_TypedExtensionConfig* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1128,6 +1184,7 @@ UPB_INLINE const envoy_config_cluster_v3_Cluster_RoundRobinLbConfig* envoy_confi 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(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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__cluster__v3__Cluster__RoundRobinLbConfig_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1179,6 +1236,7 @@ UPB_INLINE void envoy_config_cluster_v3_Cluster_set_type(envoy_config_cluster_v3 } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__cluster__v3__Cluster__EdsClusterConfig_msg_init); 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) { @@ -1191,6 +1249,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { @@ -1203,6 +1262,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); 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) { @@ -1219,6 +1279,7 @@ UPB_INLINE void envoy_config_cluster_v3_Cluster_set_lb_policy(envoy_config_clust } 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HealthCheck_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1235,6 +1296,7 @@ UPB_INLINE struct envoy_config_core_v3_HealthCheck** envoy_config_cluster_v3_Clu } UPB_INLINE struct envoy_config_core_v3_HealthCheck* envoy_config_cluster_v3_Cluster_add_health_checks(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HealthCheck_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -1249,6 +1311,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); 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) { @@ -1261,6 +1324,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__cluster__v3__CircuitBreakers_msg_init); 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) { @@ -1273,6 +1337,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Http1ProtocolOptions_msg_init); 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) { @@ -1285,6 +1350,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Http2ProtocolOptions_msg_init); 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) { @@ -1297,6 +1363,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { @@ -1313,6 +1380,7 @@ UPB_INLINE void envoy_config_cluster_v3_Cluster_set_dns_lookup_family(envoy_conf } 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Address_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1329,6 +1397,7 @@ UPB_INLINE struct envoy_config_core_v3_Address** envoy_config_cluster_v3_Cluster } UPB_INLINE struct envoy_config_core_v3_Address* envoy_config_cluster_v3_Cluster_add_dns_resolvers(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Address_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -1343,6 +1412,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__cluster__v3__OutlierDetection_msg_init); 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) { @@ -1355,6 +1425,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { @@ -1367,6 +1438,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__BindConfig_msg_init); 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) { @@ -1379,6 +1451,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__cluster__v3__Cluster__LbSubsetConfig_msg_init); 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) { @@ -1391,6 +1464,7 @@ UPB_INLINE struct envoy_config_cluster_v3_Cluster_LbSubsetConfig* envoy_config_c } 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(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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__cluster__v3__Cluster__RingHashLbConfig_msg_init); 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) { @@ -1403,6 +1477,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TransportSocket_msg_init); 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) { @@ -1415,6 +1490,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Metadata_msg_init); 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) { @@ -1431,6 +1507,7 @@ UPB_INLINE void envoy_config_cluster_v3_Cluster_set_protocol_selection(envoy_con } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__cluster__v3__Cluster__CommonLbConfig_msg_init); 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) { @@ -1447,6 +1524,7 @@ UPB_INLINE void envoy_config_cluster_v3_Cluster_set_alt_stat_name(envoy_config_c } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HttpProtocolOptions_msg_init); 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) { @@ -1459,6 +1537,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__cluster__v3__UpstreamConnectionOptions_msg_init); 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) { @@ -1479,6 +1558,7 @@ UPB_INLINE void envoy_config_cluster_v3_Cluster_set_ignore_health_on_host_remova } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__endpoint__v3__ClusterLoadAssignment_msg_init); 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) { @@ -1491,6 +1571,7 @@ UPB_INLINE struct envoy_config_endpoint_v3_ClusterLoadAssignment* envoy_config_c } 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(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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__cluster__v3__Cluster__OriginalDstLbConfig_msg_init); 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) { @@ -1509,6 +1590,8 @@ UPB_INLINE void envoy_config_cluster_v3_Cluster_typed_extension_protocol_options } UPB_INLINE bool envoy_config_cluster_v3_Cluster_typed_extension_protocol_options_set(envoy_config_cluster_v3_Cluster* msg, upb_StringView key, struct google_protobuf_Any* val, upb_Arena* a) { const upb_MiniTableField field = {36, UPB_SIZE(108, 232), 0, 22, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__cluster__v3__Cluster__TypedExtensionProtocolOptionsEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); 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) != @@ -1522,12 +1605,15 @@ UPB_INLINE bool envoy_config_cluster_v3_Cluster_typed_extension_protocol_options } UPB_INLINE envoy_config_cluster_v3_Cluster_TypedExtensionProtocolOptionsEntry* envoy_config_cluster_v3_Cluster_typed_extension_protocol_options_nextmutable(envoy_config_cluster_v3_Cluster* msg, size_t* iter) { const upb_MiniTableField field = {36, UPB_SIZE(108, 232), 0, 22, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__cluster__v3__Cluster__TypedExtensionProtocolOptionsEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); upb_Map* map = (upb_Map*)upb_Message_GetMap(UPB_UPCAST(msg), &field); if (!map) return NULL; 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(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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__cluster__v3__Cluster__LeastRequestLbConfig_msg_init); 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) { @@ -1540,6 +1626,7 @@ UPB_INLINE struct envoy_config_cluster_v3_Cluster_LeastRequestLbConfig* envoy_co } 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(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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__cluster__v3__Cluster__CustomClusterType_msg_init); 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) { @@ -1556,6 +1643,7 @@ UPB_INLINE void envoy_config_cluster_v3_Cluster_set_respect_dns_ttl(envoy_config } 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__cluster__v3__Filter_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1572,6 +1660,7 @@ UPB_INLINE struct envoy_config_cluster_v3_Filter** envoy_config_cluster_v3_Clust } UPB_INLINE struct envoy_config_cluster_v3_Filter* envoy_config_cluster_v3_Cluster_add_filters(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__cluster__v3__Filter_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -1586,6 +1675,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__cluster__v3__LoadBalancingPolicy_msg_init); 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) { @@ -1598,6 +1688,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__ConfigSource_msg_init); 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) { @@ -1610,6 +1701,7 @@ UPB_INLINE struct envoy_config_core_v3_ConfigSource* envoy_config_cluster_v3_Clu } UPB_INLINE envoy_config_cluster_v3_Cluster_TransportSocketMatch** envoy_config_cluster_v3_Cluster_mutable_transport_socket_matches(envoy_config_cluster_v3_Cluster* msg, size_t* size) { upb_MiniTableField field = {43, UPB_SIZE(132, 264), 0, 28, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__cluster__v3__Cluster__TransportSocketMatch_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1626,6 +1718,7 @@ UPB_INLINE envoy_config_cluster_v3_Cluster_TransportSocketMatch** envoy_config_c } UPB_INLINE struct envoy_config_cluster_v3_Cluster_TransportSocketMatch* envoy_config_cluster_v3_Cluster_add_transport_socket_matches(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) { upb_MiniTableField field = {43, UPB_SIZE(132, 264), 0, 28, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__cluster__v3__Cluster__TransportSocketMatch_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -1640,6 +1733,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__cluster__v3__Cluster__RefreshRate_msg_init); 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) { @@ -1656,6 +1750,7 @@ UPB_INLINE void envoy_config_cluster_v3_Cluster_set_use_tcp_for_dns_lookups(envo } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__UpstreamHttpProtocolOptions_msg_init); 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) { @@ -1672,6 +1767,7 @@ UPB_INLINE void envoy_config_cluster_v3_Cluster_set_track_timeout_budgets(envoy_ } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); 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) { @@ -1684,6 +1780,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__cluster__v3__TrackClusterStats_msg_init); 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) { @@ -1696,6 +1793,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__cluster__v3__Cluster__PreconnectPolicy_msg_init); 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) { @@ -1712,6 +1810,7 @@ UPB_INLINE void envoy_config_cluster_v3_Cluster_set_connection_pool_per_downstre } 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(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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__cluster__v3__Cluster__MaglevLbConfig_msg_init); 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) { @@ -1724,6 +1823,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__DnsResolutionConfig_msg_init); 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) { @@ -1736,6 +1836,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); 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) { @@ -1748,6 +1849,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); 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) { @@ -1760,6 +1862,7 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_cluste } 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(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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__cluster__v3__Cluster__RoundRobinLbConfig_msg_init); 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) { @@ -1855,6 +1958,7 @@ UPB_INLINE const struct google_protobuf_Struct* envoy_config_cluster_v3_Cluster_ const struct google_protobuf_Struct* default_val = NULL; const struct google_protobuf_Struct* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Struct_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1871,6 +1975,7 @@ UPB_INLINE const struct envoy_config_core_v3_TransportSocket* envoy_config_clust const struct envoy_config_core_v3_TransportSocket* default_val = NULL; const struct envoy_config_core_v3_TransportSocket* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TransportSocket_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1886,6 +1991,7 @@ UPB_INLINE void envoy_config_cluster_v3_Cluster_TransportSocketMatch_set_name(en } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Struct_msg_init); 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) { @@ -1898,6 +2004,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TransportSocket_msg_init); 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) { @@ -1965,6 +2072,7 @@ UPB_INLINE const struct google_protobuf_Any* envoy_config_cluster_v3_Cluster_Cus const struct google_protobuf_Any* default_val = NULL; const struct google_protobuf_Any* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1980,6 +2088,7 @@ UPB_INLINE void envoy_config_cluster_v3_Cluster_CustomClusterType_set_name(envoy } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); 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) { @@ -2035,6 +2144,7 @@ UPB_INLINE const struct envoy_config_core_v3_ConfigSource* envoy_config_cluster_ const struct envoy_config_core_v3_ConfigSource* default_val = NULL; const struct envoy_config_core_v3_ConfigSource* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__ConfigSource_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -2058,6 +2168,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__ConfigSource_msg_init); 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) { @@ -2129,6 +2240,7 @@ UPB_INLINE const struct google_protobuf_Struct* envoy_config_cluster_v3_Cluster_ const struct google_protobuf_Struct* default_val = NULL; const struct google_protobuf_Struct* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Struct_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -2143,6 +2255,7 @@ UPB_INLINE void envoy_config_cluster_v3_Cluster_LbSubsetConfig_clear_subset_sele } UPB_INLINE const envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector* const* envoy_config_cluster_v3_Cluster_LbSubsetConfig_subset_selectors(const envoy_config_cluster_v3_Cluster_LbSubsetConfig* msg, size_t* size) { const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__cluster__v3__Cluster__LbSubsetConfig__LbSubsetSelector_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -2154,6 +2267,7 @@ UPB_INLINE const envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector } UPB_INLINE const upb_Array* _envoy_config_cluster_v3_Cluster_LbSubsetConfig_subset_selectors_upb_array(const envoy_config_cluster_v3_Cluster_LbSubsetConfig* msg, size_t* size) { const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__cluster__v3__Cluster__LbSubsetConfig__LbSubsetSelector_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -2162,6 +2276,7 @@ UPB_INLINE const upb_Array* _envoy_config_cluster_v3_Cluster_LbSubsetConfig_subs } UPB_INLINE upb_Array* _envoy_config_cluster_v3_Cluster_LbSubsetConfig_subset_selectors_mutable_upb_array(envoy_config_cluster_v3_Cluster_LbSubsetConfig* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__cluster__v3__Cluster__LbSubsetConfig__LbSubsetSelector_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -2236,6 +2351,7 @@ UPB_INLINE void envoy_config_cluster_v3_Cluster_LbSubsetConfig_set_fallback_poli } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Struct_msg_init); 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) { @@ -2248,6 +2364,7 @@ UPB_INLINE struct google_protobuf_Struct* envoy_config_cluster_v3_Cluster_LbSubs } UPB_INLINE envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector** envoy_config_cluster_v3_Cluster_LbSubsetConfig_mutable_subset_selectors(envoy_config_cluster_v3_Cluster_LbSubsetConfig* msg, size_t* size) { upb_MiniTableField field = {3, UPB_SIZE(20, 32), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__cluster__v3__Cluster__LbSubsetConfig__LbSubsetSelector_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -2264,6 +2381,7 @@ UPB_INLINE envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector** env } UPB_INLINE struct envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector* envoy_config_cluster_v3_Cluster_LbSubsetConfig_add_subset_selectors(envoy_config_cluster_v3_Cluster_LbSubsetConfig* msg, upb_Arena* arena) { upb_MiniTableField field = {3, UPB_SIZE(20, 32), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__cluster__v3__Cluster__LbSubsetConfig__LbSubsetSelector_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -2531,6 +2649,7 @@ UPB_INLINE const struct google_protobuf_Duration* envoy_config_cluster_v3_Cluste 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -2547,6 +2666,7 @@ UPB_INLINE const struct envoy_config_core_v3_RuntimeDouble* envoy_config_cluster const struct envoy_config_core_v3_RuntimeDouble* default_val = NULL; const struct envoy_config_core_v3_RuntimeDouble* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__RuntimeDouble_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -2563,6 +2683,7 @@ UPB_INLINE const struct envoy_type_v3_Percent* envoy_config_cluster_v3_Cluster_S const struct envoy_type_v3_Percent* default_val = NULL; const struct envoy_type_v3_Percent* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__v3__Percent_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -2574,6 +2695,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { @@ -2586,6 +2708,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__RuntimeDouble_msg_init); 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) { @@ -2598,6 +2721,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__v3__Percent_msg_init); 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) { @@ -2653,6 +2777,7 @@ UPB_INLINE const envoy_config_cluster_v3_Cluster_SlowStartConfig* envoy_config_c const envoy_config_cluster_v3_Cluster_SlowStartConfig* default_val = NULL; const envoy_config_cluster_v3_Cluster_SlowStartConfig* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__cluster__v3__Cluster__SlowStartConfig_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -2664,6 +2789,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__cluster__v3__Cluster__SlowStartConfig_msg_init); 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) { @@ -2719,6 +2845,7 @@ UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_cluster_v3_Clu const struct google_protobuf_UInt32Value* default_val = NULL; const struct google_protobuf_UInt32Value* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -2735,6 +2862,7 @@ UPB_INLINE const struct envoy_config_core_v3_RuntimeDouble* envoy_config_cluster const struct envoy_config_core_v3_RuntimeDouble* default_val = NULL; const struct envoy_config_core_v3_RuntimeDouble* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__RuntimeDouble_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -2751,6 +2879,7 @@ UPB_INLINE const envoy_config_cluster_v3_Cluster_SlowStartConfig* envoy_config_c const envoy_config_cluster_v3_Cluster_SlowStartConfig* default_val = NULL; const envoy_config_cluster_v3_Cluster_SlowStartConfig* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__cluster__v3__Cluster__SlowStartConfig_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -2762,6 +2891,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); 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) { @@ -2774,6 +2904,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__RuntimeDouble_msg_init); 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) { @@ -2786,6 +2917,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__cluster__v3__Cluster__SlowStartConfig_msg_init); 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) { @@ -2841,6 +2973,7 @@ UPB_INLINE const struct google_protobuf_UInt64Value* envoy_config_cluster_v3_Clu 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt64Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -2869,6 +3002,7 @@ UPB_INLINE const struct google_protobuf_UInt64Value* envoy_config_cluster_v3_Clu const struct google_protobuf_UInt64Value* default_val = NULL; const struct google_protobuf_UInt64Value* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt64Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -2880,6 +3014,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt64Value_msg_init); 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) { @@ -2896,6 +3031,7 @@ UPB_INLINE void envoy_config_cluster_v3_Cluster_RingHashLbConfig_set_hash_functi } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt64Value_msg_init); 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) { @@ -2951,6 +3087,7 @@ UPB_INLINE const struct google_protobuf_UInt64Value* envoy_config_cluster_v3_Clu 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt64Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -2962,6 +3099,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt64Value_msg_init); 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) { @@ -3041,6 +3179,7 @@ UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_cluster_v3_Clu const struct google_protobuf_UInt32Value* default_val = NULL; const struct google_protobuf_UInt32Value* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -3057,6 +3196,7 @@ UPB_INLINE const struct envoy_type_metadata_v3_MetadataKey* envoy_config_cluster const struct envoy_type_metadata_v3_MetadataKey* default_val = NULL; const struct envoy_type_metadata_v3_MetadataKey* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__metadata__v3__MetadataKey_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -3076,6 +3216,7 @@ UPB_INLINE void envoy_config_cluster_v3_Cluster_OriginalDstLbConfig_set_http_hea } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); 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) { @@ -3088,6 +3229,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__metadata__v3__MetadataKey_msg_init); 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) { @@ -3153,6 +3295,7 @@ UPB_INLINE const struct envoy_type_v3_Percent* envoy_config_cluster_v3_Cluster_C const struct envoy_type_v3_Percent* default_val = NULL; const struct envoy_type_v3_Percent* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__v3__Percent_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -3169,6 +3312,7 @@ UPB_INLINE const envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfi const envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig* default_val = NULL; const envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__cluster__v3__Cluster__CommonLbConfig__ZoneAwareLbConfig_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -3185,6 +3329,7 @@ UPB_INLINE const envoy_config_cluster_v3_Cluster_CommonLbConfig_LocalityWeighted const envoy_config_cluster_v3_Cluster_CommonLbConfig_LocalityWeightedLbConfig* default_val = NULL; const envoy_config_cluster_v3_Cluster_CommonLbConfig_LocalityWeightedLbConfig* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__cluster__v3__Cluster__CommonLbConfig__LocalityWeightedLbConfig_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -3201,6 +3346,7 @@ UPB_INLINE const struct google_protobuf_Duration* envoy_config_cluster_v3_Cluste const struct google_protobuf_Duration* default_val = NULL; const struct google_protobuf_Duration* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -3241,6 +3387,7 @@ UPB_INLINE const envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashin const envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig* default_val = NULL; const envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__cluster__v3__Cluster__CommonLbConfig__ConsistentHashingLbConfig_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -3257,6 +3404,7 @@ UPB_INLINE const struct envoy_config_core_v3_HealthStatusSet* envoy_config_clust const struct envoy_config_core_v3_HealthStatusSet* default_val = NULL; const struct envoy_config_core_v3_HealthStatusSet* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HealthStatusSet_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -3268,6 +3416,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__v3__Percent_msg_init); 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) { @@ -3280,6 +3429,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__cluster__v3__Cluster__CommonLbConfig__ZoneAwareLbConfig_msg_init); 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) { @@ -3292,6 +3442,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__cluster__v3__Cluster__CommonLbConfig__LocalityWeightedLbConfig_msg_init); 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) { @@ -3304,6 +3455,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { @@ -3324,6 +3476,7 @@ UPB_INLINE void envoy_config_cluster_v3_Cluster_CommonLbConfig_set_close_connect } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__cluster__v3__Cluster__CommonLbConfig__ConsistentHashingLbConfig_msg_init); 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) { @@ -3336,6 +3489,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HealthStatusSet_msg_init); 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) { @@ -3391,6 +3545,7 @@ UPB_INLINE const struct envoy_type_v3_Percent* envoy_config_cluster_v3_Cluster_C const struct envoy_type_v3_Percent* default_val = NULL; const struct envoy_type_v3_Percent* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__v3__Percent_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -3407,6 +3562,7 @@ UPB_INLINE const struct google_protobuf_UInt64Value* envoy_config_cluster_v3_Clu const struct google_protobuf_UInt64Value* default_val = NULL; const struct google_protobuf_UInt64Value* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt64Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -3430,6 +3586,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__v3__Percent_msg_init); 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) { @@ -3442,6 +3599,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt64Value_msg_init); 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) { @@ -3551,6 +3709,7 @@ UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_cluster_v3_Clu const struct google_protobuf_UInt32Value* default_val = NULL; const struct google_protobuf_UInt32Value* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -3566,6 +3725,7 @@ UPB_INLINE void envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashing } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); 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) { @@ -3621,6 +3781,7 @@ UPB_INLINE const struct google_protobuf_Duration* envoy_config_cluster_v3_Cluste 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -3637,6 +3798,7 @@ UPB_INLINE const struct google_protobuf_Duration* envoy_config_cluster_v3_Cluste const struct google_protobuf_Duration* default_val = NULL; const struct google_protobuf_Duration* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -3648,6 +3810,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { @@ -3660,6 +3823,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { @@ -3715,6 +3879,7 @@ UPB_INLINE const struct google_protobuf_DoubleValue* envoy_config_cluster_v3_Clu const struct google_protobuf_DoubleValue* default_val = NULL; const struct google_protobuf_DoubleValue* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__DoubleValue_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -3731,6 +3896,7 @@ UPB_INLINE const struct google_protobuf_DoubleValue* envoy_config_cluster_v3_Clu const struct google_protobuf_DoubleValue* default_val = NULL; const struct google_protobuf_DoubleValue* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__DoubleValue_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -3742,6 +3908,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__DoubleValue_msg_init); 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) { @@ -3754,6 +3921,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__DoubleValue_msg_init); 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) { @@ -3828,6 +3996,7 @@ UPB_INLINE void envoy_config_cluster_v3_LoadBalancingPolicy_clear_policies(envoy } UPB_INLINE const envoy_config_cluster_v3_LoadBalancingPolicy_Policy* const* envoy_config_cluster_v3_LoadBalancingPolicy_policies(const envoy_config_cluster_v3_LoadBalancingPolicy* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__cluster__v3__LoadBalancingPolicy__Policy_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -3839,6 +4008,7 @@ UPB_INLINE const envoy_config_cluster_v3_LoadBalancingPolicy_Policy* const* envo } UPB_INLINE const upb_Array* _envoy_config_cluster_v3_LoadBalancingPolicy_policies_upb_array(const envoy_config_cluster_v3_LoadBalancingPolicy* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__cluster__v3__LoadBalancingPolicy__Policy_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -3847,6 +4017,7 @@ UPB_INLINE const upb_Array* _envoy_config_cluster_v3_LoadBalancingPolicy_policie } UPB_INLINE upb_Array* _envoy_config_cluster_v3_LoadBalancingPolicy_policies_mutable_upb_array(envoy_config_cluster_v3_LoadBalancingPolicy* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__cluster__v3__LoadBalancingPolicy__Policy_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -3857,6 +4028,7 @@ UPB_INLINE upb_Array* _envoy_config_cluster_v3_LoadBalancingPolicy_policies_muta UPB_INLINE envoy_config_cluster_v3_LoadBalancingPolicy_Policy** envoy_config_cluster_v3_LoadBalancingPolicy_mutable_policies(envoy_config_cluster_v3_LoadBalancingPolicy* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__cluster__v3__LoadBalancingPolicy__Policy_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -3873,6 +4045,7 @@ UPB_INLINE envoy_config_cluster_v3_LoadBalancingPolicy_Policy** envoy_config_clu } UPB_INLINE struct envoy_config_cluster_v3_LoadBalancingPolicy_Policy* envoy_config_cluster_v3_LoadBalancingPolicy_add_policies(envoy_config_cluster_v3_LoadBalancingPolicy* msg, upb_Arena* arena) { upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__cluster__v3__LoadBalancingPolicy__Policy_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -3930,6 +4103,7 @@ UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_ const struct envoy_config_core_v3_TypedExtensionConfig* default_val = NULL; const struct envoy_config_core_v3_TypedExtensionConfig* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -3941,6 +4115,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); 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) { @@ -3996,6 +4171,7 @@ UPB_INLINE const struct envoy_config_core_v3_TcpKeepalive* envoy_config_cluster_ const struct envoy_config_core_v3_TcpKeepalive* default_val = NULL; const struct envoy_config_core_v3_TcpKeepalive* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TcpKeepalive_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -4024,6 +4200,7 @@ UPB_INLINE const envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballs 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__cluster__v3__UpstreamConnectionOptions__HappyEyeballsConfig_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -4035,6 +4212,7 @@ UPB_INLINE bool envoy_config_cluster_v3_UpstreamConnectionOptions_has_happy_eyeb 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TcpKeepalive_msg_init); 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) { @@ -4051,6 +4229,7 @@ UPB_INLINE void envoy_config_cluster_v3_UpstreamConnectionOptions_set_set_local_ } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__cluster__v3__UpstreamConnectionOptions__HappyEyeballsConfig_msg_init); 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) { @@ -4118,6 +4297,7 @@ UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_cluster_v3_Ups 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -4133,6 +4313,7 @@ UPB_INLINE void envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsC } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); 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) { diff --git a/src/core/ext/upb-gen/envoy/config/cluster/v3/cluster.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/cluster/v3/cluster.upb_minitable.c index f3ab3dda433..f6b9ba6d2e6 100644 --- a/src/core/ext/upb-gen/envoy/config/cluster/v3/cluster.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/config/cluster/v3/cluster.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/config/cluster/v3/cluster.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -36,8 +37,9 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub envoy_config_cluster_v3_ClusterCollection_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &xds__core__v3__CollectionEntry_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal envoy_config_cluster_v3_ClusterCollection_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &xds__core__v3__CollectionEntry_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_cluster_v3_ClusterCollection__fields[1] = { @@ -53,46 +55,47 @@ const upb_MiniTable envoy__config__cluster__v3__ClusterCollection_msg_init = { #endif }; -static const upb_MiniTableSub envoy_config_cluster_v3_Cluster_submsgs[39] = { - {.UPB_PRIVATE(submsg) = &envoy__config__cluster__v3__Cluster__EdsClusterConfig_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HealthCheck_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__cluster__v3__CircuitBreakers_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Http1ProtocolOptions_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Http2ProtocolOptions_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Address_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__cluster__v3__OutlierDetection_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__BindConfig_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__cluster__v3__Cluster__LbSubsetConfig_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__cluster__v3__Cluster__RingHashLbConfig_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TransportSocket_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Metadata_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__cluster__v3__Cluster__CommonLbConfig_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HttpProtocolOptions_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__cluster__v3__UpstreamConnectionOptions_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__endpoint__v3__ClusterLoadAssignment_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__cluster__v3__Cluster__OriginalDstLbConfig_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__cluster__v3__Cluster__TypedExtensionProtocolOptionsEntry_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__cluster__v3__Cluster__LeastRequestLbConfig_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__cluster__v3__Cluster__CustomClusterType_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__cluster__v3__Filter_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__cluster__v3__LoadBalancingPolicy_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ConfigSource_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__cluster__v3__Cluster__TransportSocketMatch_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__cluster__v3__Cluster__RefreshRate_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__UpstreamHttpProtocolOptions_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__cluster__v3__TrackClusterStats_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__cluster__v3__Cluster__PreconnectPolicy_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__cluster__v3__Cluster__MaglevLbConfig_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__DnsResolutionConfig_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__cluster__v3__Cluster__RoundRobinLbConfig_msg_init}, +const upb_MiniTable* envoy__config__cluster__v3__ClusterCollection_msg_init_ptr = &envoy__config__cluster__v3__ClusterCollection_msg_init; +static const upb_MiniTableSubInternal envoy_config_cluster_v3_Cluster_submsgs[39] = { + {.UPB_PRIVATE(submsg) = &envoy__config__cluster__v3__Cluster__EdsClusterConfig_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HealthCheck_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__cluster__v3__CircuitBreakers_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Http1ProtocolOptions_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Http2ProtocolOptions_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Address_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__cluster__v3__OutlierDetection_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__BindConfig_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__cluster__v3__Cluster__LbSubsetConfig_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__cluster__v3__Cluster__RingHashLbConfig_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TransportSocket_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Metadata_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__cluster__v3__Cluster__CommonLbConfig_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HttpProtocolOptions_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__cluster__v3__UpstreamConnectionOptions_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__endpoint__v3__ClusterLoadAssignment_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__cluster__v3__Cluster__OriginalDstLbConfig_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__cluster__v3__Cluster__TypedExtensionProtocolOptionsEntry_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__cluster__v3__Cluster__LeastRequestLbConfig_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__cluster__v3__Cluster__CustomClusterType_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__cluster__v3__Filter_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__cluster__v3__LoadBalancingPolicy_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ConfigSource_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__cluster__v3__Cluster__TransportSocketMatch_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__cluster__v3__Cluster__RefreshRate_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__UpstreamHttpProtocolOptions_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__cluster__v3__TrackClusterStats_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__cluster__v3__Cluster__PreconnectPolicy_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__cluster__v3__Cluster__MaglevLbConfig_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__DnsResolutionConfig_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__cluster__v3__Cluster__RoundRobinLbConfig_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_cluster_v3_Cluster__fields[52] = { @@ -193,9 +196,10 @@ const upb_MiniTable envoy__config__cluster__v3__Cluster_msg_init = { }) }; -static const upb_MiniTableSub envoy_config_cluster_v3_Cluster_TransportSocketMatch_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__Struct_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TransportSocket_msg_init}, +const upb_MiniTable* envoy__config__cluster__v3__Cluster_msg_init_ptr = &envoy__config__cluster__v3__Cluster_msg_init; +static const upb_MiniTableSubInternal envoy_config_cluster_v3_Cluster_TransportSocketMatch_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Struct_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TransportSocket_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_cluster_v3_Cluster_TransportSocketMatch__fields[3] = { @@ -217,8 +221,9 @@ const upb_MiniTable envoy__config__cluster__v3__Cluster__TransportSocketMatch_ms }) }; -static const upb_MiniTableSub envoy_config_cluster_v3_Cluster_CustomClusterType_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init}, +const upb_MiniTable* envoy__config__cluster__v3__Cluster__TransportSocketMatch_msg_init_ptr = &envoy__config__cluster__v3__Cluster__TransportSocketMatch_msg_init; +static const upb_MiniTableSubInternal envoy_config_cluster_v3_Cluster_CustomClusterType_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_cluster_v3_Cluster_CustomClusterType__fields[2] = { @@ -239,8 +244,9 @@ const upb_MiniTable envoy__config__cluster__v3__Cluster__CustomClusterType_msg_i }) }; -static const upb_MiniTableSub envoy_config_cluster_v3_Cluster_EdsClusterConfig_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ConfigSource_msg_init}, +const upb_MiniTable* envoy__config__cluster__v3__Cluster__CustomClusterType_msg_init_ptr = &envoy__config__cluster__v3__Cluster__CustomClusterType_msg_init; +static const upb_MiniTableSubInternal envoy_config_cluster_v3_Cluster_EdsClusterConfig_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ConfigSource_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_cluster_v3_Cluster_EdsClusterConfig__fields[2] = { @@ -263,9 +269,10 @@ const upb_MiniTable envoy__config__cluster__v3__Cluster__EdsClusterConfig_msg_in }) }; -static const upb_MiniTableSub envoy_config_cluster_v3_Cluster_LbSubsetConfig_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__Struct_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__cluster__v3__Cluster__LbSubsetConfig__LbSubsetSelector_msg_init}, +const upb_MiniTable* envoy__config__cluster__v3__Cluster__EdsClusterConfig_msg_init_ptr = &envoy__config__cluster__v3__Cluster__EdsClusterConfig_msg_init; +static const upb_MiniTableSubInternal envoy_config_cluster_v3_Cluster_LbSubsetConfig_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Struct_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__cluster__v3__Cluster__LbSubsetConfig__LbSubsetSelector_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_cluster_v3_Cluster_LbSubsetConfig__fields[8] = { @@ -306,6 +313,7 @@ const upb_MiniTable envoy__config__cluster__v3__Cluster__LbSubsetConfig_msg_init }) }; +const upb_MiniTable* envoy__config__cluster__v3__Cluster__LbSubsetConfig_msg_init_ptr = &envoy__config__cluster__v3__Cluster__LbSubsetConfig_msg_init; static const upb_MiniTableField envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector__fields[4] = { {1, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {2, UPB_SIZE(12, 8), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, @@ -332,10 +340,11 @@ const upb_MiniTable envoy__config__cluster__v3__Cluster__LbSubsetConfig__LbSubse }) }; -static const upb_MiniTableSub envoy_config_cluster_v3_Cluster_SlowStartConfig_submsgs[3] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__RuntimeDouble_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__type__v3__Percent_msg_init}, +const upb_MiniTable* envoy__config__cluster__v3__Cluster__LbSubsetConfig__LbSubsetSelector_msg_init_ptr = &envoy__config__cluster__v3__Cluster__LbSubsetConfig__LbSubsetSelector_msg_init; +static const upb_MiniTableSubInternal envoy_config_cluster_v3_Cluster_SlowStartConfig_submsgs[3] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__RuntimeDouble_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__type__v3__Percent_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_cluster_v3_Cluster_SlowStartConfig__fields[3] = { @@ -353,8 +362,9 @@ const upb_MiniTable envoy__config__cluster__v3__Cluster__SlowStartConfig_msg_ini #endif }; -static const upb_MiniTableSub envoy_config_cluster_v3_Cluster_RoundRobinLbConfig_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__config__cluster__v3__Cluster__SlowStartConfig_msg_init}, +const upb_MiniTable* envoy__config__cluster__v3__Cluster__SlowStartConfig_msg_init_ptr = &envoy__config__cluster__v3__Cluster__SlowStartConfig_msg_init; +static const upb_MiniTableSubInternal envoy_config_cluster_v3_Cluster_RoundRobinLbConfig_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__config__cluster__v3__Cluster__SlowStartConfig_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_cluster_v3_Cluster_RoundRobinLbConfig__fields[1] = { @@ -370,10 +380,11 @@ const upb_MiniTable envoy__config__cluster__v3__Cluster__RoundRobinLbConfig_msg_ #endif }; -static const upb_MiniTableSub envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_submsgs[3] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__RuntimeDouble_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__cluster__v3__Cluster__SlowStartConfig_msg_init}, +const upb_MiniTable* envoy__config__cluster__v3__Cluster__RoundRobinLbConfig_msg_init_ptr = &envoy__config__cluster__v3__Cluster__RoundRobinLbConfig_msg_init; +static const upb_MiniTableSubInternal envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_submsgs[3] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__RuntimeDouble_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__cluster__v3__Cluster__SlowStartConfig_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_cluster_v3_Cluster_LeastRequestLbConfig__fields[3] = { @@ -391,9 +402,10 @@ const upb_MiniTable envoy__config__cluster__v3__Cluster__LeastRequestLbConfig_ms #endif }; -static const upb_MiniTableSub envoy_config_cluster_v3_Cluster_RingHashLbConfig_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__UInt64Value_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__UInt64Value_msg_init}, +const upb_MiniTable* envoy__config__cluster__v3__Cluster__LeastRequestLbConfig_msg_init_ptr = &envoy__config__cluster__v3__Cluster__LeastRequestLbConfig_msg_init; +static const upb_MiniTableSubInternal envoy_config_cluster_v3_Cluster_RingHashLbConfig_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt64Value_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt64Value_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_cluster_v3_Cluster_RingHashLbConfig__fields[3] = { @@ -417,8 +429,9 @@ const upb_MiniTable envoy__config__cluster__v3__Cluster__RingHashLbConfig_msg_in }) }; -static const upb_MiniTableSub envoy_config_cluster_v3_Cluster_MaglevLbConfig_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__UInt64Value_msg_init}, +const upb_MiniTable* envoy__config__cluster__v3__Cluster__RingHashLbConfig_msg_init_ptr = &envoy__config__cluster__v3__Cluster__RingHashLbConfig_msg_init; +static const upb_MiniTableSubInternal envoy_config_cluster_v3_Cluster_MaglevLbConfig_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt64Value_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_cluster_v3_Cluster_MaglevLbConfig__fields[1] = { @@ -434,9 +447,10 @@ const upb_MiniTable envoy__config__cluster__v3__Cluster__MaglevLbConfig_msg_init #endif }; -static const upb_MiniTableSub envoy_config_cluster_v3_Cluster_OriginalDstLbConfig_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__type__metadata__v3__MetadataKey_msg_init}, +const upb_MiniTable* envoy__config__cluster__v3__Cluster__MaglevLbConfig_msg_init_ptr = &envoy__config__cluster__v3__Cluster__MaglevLbConfig_msg_init; +static const upb_MiniTableSubInternal envoy_config_cluster_v3_Cluster_OriginalDstLbConfig_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__type__metadata__v3__MetadataKey_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_cluster_v3_Cluster_OriginalDstLbConfig__fields[4] = { @@ -461,13 +475,14 @@ const upb_MiniTable envoy__config__cluster__v3__Cluster__OriginalDstLbConfig_msg }) }; -static const upb_MiniTableSub envoy_config_cluster_v3_Cluster_CommonLbConfig_submsgs[6] = { - {.UPB_PRIVATE(submsg) = &envoy__type__v3__Percent_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__cluster__v3__Cluster__CommonLbConfig__ZoneAwareLbConfig_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__cluster__v3__Cluster__CommonLbConfig__LocalityWeightedLbConfig_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__cluster__v3__Cluster__CommonLbConfig__ConsistentHashingLbConfig_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HealthStatusSet_msg_init}, +const upb_MiniTable* envoy__config__cluster__v3__Cluster__OriginalDstLbConfig_msg_init_ptr = &envoy__config__cluster__v3__Cluster__OriginalDstLbConfig_msg_init; +static const upb_MiniTableSubInternal envoy_config_cluster_v3_Cluster_CommonLbConfig_submsgs[6] = { + {.UPB_PRIVATE(submsg) = &envoy__type__v3__Percent_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__cluster__v3__Cluster__CommonLbConfig__ZoneAwareLbConfig_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__cluster__v3__Cluster__CommonLbConfig__LocalityWeightedLbConfig_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__cluster__v3__Cluster__CommonLbConfig__ConsistentHashingLbConfig_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HealthStatusSet_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_cluster_v3_Cluster_CommonLbConfig__fields[8] = { @@ -500,9 +515,10 @@ const upb_MiniTable envoy__config__cluster__v3__Cluster__CommonLbConfig_msg_init }) }; -static const upb_MiniTableSub envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &envoy__type__v3__Percent_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__UInt64Value_msg_init}, +const upb_MiniTable* envoy__config__cluster__v3__Cluster__CommonLbConfig_msg_init_ptr = &envoy__config__cluster__v3__Cluster__CommonLbConfig_msg_init; +static const upb_MiniTableSubInternal envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &envoy__type__v3__Percent_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt64Value_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig__fields[3] = { @@ -526,6 +542,7 @@ const upb_MiniTable envoy__config__cluster__v3__Cluster__CommonLbConfig__ZoneAwa }) }; +const upb_MiniTable* envoy__config__cluster__v3__Cluster__CommonLbConfig__ZoneAwareLbConfig_msg_init_ptr = &envoy__config__cluster__v3__Cluster__CommonLbConfig__ZoneAwareLbConfig_msg_init; const upb_MiniTable envoy__config__cluster__v3__Cluster__CommonLbConfig__LocalityWeightedLbConfig_msg_init = { NULL, NULL, @@ -535,8 +552,9 @@ const upb_MiniTable envoy__config__cluster__v3__Cluster__CommonLbConfig__Localit #endif }; -static const upb_MiniTableSub envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init}, +const upb_MiniTable* envoy__config__cluster__v3__Cluster__CommonLbConfig__LocalityWeightedLbConfig_msg_init_ptr = &envoy__config__cluster__v3__Cluster__CommonLbConfig__LocalityWeightedLbConfig_msg_init; +static const upb_MiniTableSubInternal envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig__fields[2] = { @@ -557,9 +575,10 @@ const upb_MiniTable envoy__config__cluster__v3__Cluster__CommonLbConfig__Consist }) }; -static const upb_MiniTableSub envoy_config_cluster_v3_Cluster_RefreshRate_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, +const upb_MiniTable* envoy__config__cluster__v3__Cluster__CommonLbConfig__ConsistentHashingLbConfig_msg_init_ptr = &envoy__config__cluster__v3__Cluster__CommonLbConfig__ConsistentHashingLbConfig_msg_init; +static const upb_MiniTableSubInternal envoy_config_cluster_v3_Cluster_RefreshRate_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_cluster_v3_Cluster_RefreshRate__fields[2] = { @@ -576,9 +595,10 @@ const upb_MiniTable envoy__config__cluster__v3__Cluster__RefreshRate_msg_init = #endif }; -static const upb_MiniTableSub envoy_config_cluster_v3_Cluster_PreconnectPolicy_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__DoubleValue_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__DoubleValue_msg_init}, +const upb_MiniTable* envoy__config__cluster__v3__Cluster__RefreshRate_msg_init_ptr = &envoy__config__cluster__v3__Cluster__RefreshRate_msg_init; +static const upb_MiniTableSubInternal envoy_config_cluster_v3_Cluster_PreconnectPolicy_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__DoubleValue_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__DoubleValue_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_cluster_v3_Cluster_PreconnectPolicy__fields[2] = { @@ -595,8 +615,9 @@ const upb_MiniTable envoy__config__cluster__v3__Cluster__PreconnectPolicy_msg_in #endif }; -static const upb_MiniTableSub envoy_config_cluster_v3_Cluster_TypedExtensionProtocolOptionsEntry_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init}, +const upb_MiniTable* envoy__config__cluster__v3__Cluster__PreconnectPolicy_msg_init_ptr = &envoy__config__cluster__v3__Cluster__PreconnectPolicy_msg_init; +static const upb_MiniTableSubInternal envoy_config_cluster_v3_Cluster_TypedExtensionProtocolOptionsEntry_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_cluster_v3_Cluster_TypedExtensionProtocolOptionsEntry__fields[2] = { @@ -617,8 +638,9 @@ const upb_MiniTable envoy__config__cluster__v3__Cluster__TypedExtensionProtocolO }) }; -static const upb_MiniTableSub envoy_config_cluster_v3_LoadBalancingPolicy_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__config__cluster__v3__LoadBalancingPolicy__Policy_msg_init}, +const upb_MiniTable* envoy__config__cluster__v3__Cluster__TypedExtensionProtocolOptionsEntry_msg_init_ptr = &envoy__config__cluster__v3__Cluster__TypedExtensionProtocolOptionsEntry_msg_init; +static const upb_MiniTableSubInternal envoy_config_cluster_v3_LoadBalancingPolicy_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__config__cluster__v3__LoadBalancingPolicy__Policy_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_cluster_v3_LoadBalancingPolicy__fields[1] = { @@ -638,8 +660,9 @@ const upb_MiniTable envoy__config__cluster__v3__LoadBalancingPolicy_msg_init = { }) }; -static const upb_MiniTableSub envoy_config_cluster_v3_LoadBalancingPolicy_Policy_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init}, +const upb_MiniTable* envoy__config__cluster__v3__LoadBalancingPolicy_msg_init_ptr = &envoy__config__cluster__v3__LoadBalancingPolicy_msg_init; +static const upb_MiniTableSubInternal envoy_config_cluster_v3_LoadBalancingPolicy_Policy_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_cluster_v3_LoadBalancingPolicy_Policy__fields[1] = { @@ -655,9 +678,10 @@ const upb_MiniTable envoy__config__cluster__v3__LoadBalancingPolicy__Policy_msg_ #endif }; -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}, +const upb_MiniTable* envoy__config__cluster__v3__LoadBalancingPolicy__Policy_msg_init_ptr = &envoy__config__cluster__v3__LoadBalancingPolicy__Policy_msg_init; +static const upb_MiniTableSubInternal envoy_config_cluster_v3_UpstreamConnectionOptions_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TcpKeepalive_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__cluster__v3__UpstreamConnectionOptions__HappyEyeballsConfig_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_cluster_v3_UpstreamConnectionOptions__fields[3] = { @@ -681,8 +705,9 @@ 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}, +const upb_MiniTable* envoy__config__cluster__v3__UpstreamConnectionOptions_msg_init_ptr = &envoy__config__cluster__v3__UpstreamConnectionOptions_msg_init; +static const upb_MiniTableSubInternal envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsConfig_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsConfig__fields[2] = { @@ -703,6 +728,7 @@ const upb_MiniTable envoy__config__cluster__v3__UpstreamConnectionOptions__Happy }) }; +const upb_MiniTable* envoy__config__cluster__v3__UpstreamConnectionOptions__HappyEyeballsConfig_msg_init_ptr = &envoy__config__cluster__v3__UpstreamConnectionOptions__HappyEyeballsConfig_msg_init; 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)}, @@ -724,6 +750,7 @@ const upb_MiniTable envoy__config__cluster__v3__TrackClusterStats_msg_init = { }) }; +const upb_MiniTable* envoy__config__cluster__v3__TrackClusterStats_msg_init_ptr = &envoy__config__cluster__v3__TrackClusterStats_msg_init; static const upb_MiniTable *messages_layout[25] = { &envoy__config__cluster__v3__ClusterCollection_msg_init, &envoy__config__cluster__v3__Cluster_msg_init, diff --git a/src/core/ext/upb-gen/envoy/config/cluster/v3/cluster.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/cluster/v3/cluster.upb_minitable.h index 2227e30e569..f25cea5126d 100644 --- a/src/core/ext/upb-gen/envoy/config/cluster/v3/cluster.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/config/cluster/v3/cluster.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/config/cluster/v3/cluster.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_CLUSTER_V3_CLUSTER_PROTO_UPB_MINITABLE_H_ #define ENVOY_CONFIG_CLUSTER_V3_CLUSTER_PROTO_UPB_MINITABLE_H_ @@ -18,30 +19,55 @@ extern "C" { #endif extern const upb_MiniTable envoy__config__cluster__v3__ClusterCollection_msg_init; +extern const upb_MiniTable* envoy__config__cluster__v3__ClusterCollection_msg_init_ptr; extern const upb_MiniTable envoy__config__cluster__v3__Cluster_msg_init; +extern const upb_MiniTable* envoy__config__cluster__v3__Cluster_msg_init_ptr; extern const upb_MiniTable envoy__config__cluster__v3__Cluster__TransportSocketMatch_msg_init; +extern const upb_MiniTable* envoy__config__cluster__v3__Cluster__TransportSocketMatch_msg_init_ptr; extern const upb_MiniTable envoy__config__cluster__v3__Cluster__CustomClusterType_msg_init; +extern const upb_MiniTable* envoy__config__cluster__v3__Cluster__CustomClusterType_msg_init_ptr; extern const upb_MiniTable envoy__config__cluster__v3__Cluster__EdsClusterConfig_msg_init; +extern const upb_MiniTable* envoy__config__cluster__v3__Cluster__EdsClusterConfig_msg_init_ptr; extern const upb_MiniTable envoy__config__cluster__v3__Cluster__LbSubsetConfig_msg_init; +extern const upb_MiniTable* envoy__config__cluster__v3__Cluster__LbSubsetConfig_msg_init_ptr; extern const upb_MiniTable envoy__config__cluster__v3__Cluster__LbSubsetConfig__LbSubsetSelector_msg_init; +extern const upb_MiniTable* envoy__config__cluster__v3__Cluster__LbSubsetConfig__LbSubsetSelector_msg_init_ptr; extern const upb_MiniTable envoy__config__cluster__v3__Cluster__SlowStartConfig_msg_init; +extern const upb_MiniTable* envoy__config__cluster__v3__Cluster__SlowStartConfig_msg_init_ptr; extern const upb_MiniTable envoy__config__cluster__v3__Cluster__RoundRobinLbConfig_msg_init; +extern const upb_MiniTable* envoy__config__cluster__v3__Cluster__RoundRobinLbConfig_msg_init_ptr; extern const upb_MiniTable envoy__config__cluster__v3__Cluster__LeastRequestLbConfig_msg_init; +extern const upb_MiniTable* envoy__config__cluster__v3__Cluster__LeastRequestLbConfig_msg_init_ptr; extern const upb_MiniTable envoy__config__cluster__v3__Cluster__RingHashLbConfig_msg_init; +extern const upb_MiniTable* envoy__config__cluster__v3__Cluster__RingHashLbConfig_msg_init_ptr; extern const upb_MiniTable envoy__config__cluster__v3__Cluster__MaglevLbConfig_msg_init; +extern const upb_MiniTable* envoy__config__cluster__v3__Cluster__MaglevLbConfig_msg_init_ptr; extern const upb_MiniTable envoy__config__cluster__v3__Cluster__OriginalDstLbConfig_msg_init; +extern const upb_MiniTable* envoy__config__cluster__v3__Cluster__OriginalDstLbConfig_msg_init_ptr; extern const upb_MiniTable envoy__config__cluster__v3__Cluster__CommonLbConfig_msg_init; +extern const upb_MiniTable* envoy__config__cluster__v3__Cluster__CommonLbConfig_msg_init_ptr; extern const upb_MiniTable envoy__config__cluster__v3__Cluster__CommonLbConfig__ZoneAwareLbConfig_msg_init; +extern const upb_MiniTable* envoy__config__cluster__v3__Cluster__CommonLbConfig__ZoneAwareLbConfig_msg_init_ptr; extern const upb_MiniTable envoy__config__cluster__v3__Cluster__CommonLbConfig__LocalityWeightedLbConfig_msg_init; +extern const upb_MiniTable* envoy__config__cluster__v3__Cluster__CommonLbConfig__LocalityWeightedLbConfig_msg_init_ptr; extern const upb_MiniTable envoy__config__cluster__v3__Cluster__CommonLbConfig__ConsistentHashingLbConfig_msg_init; +extern const upb_MiniTable* envoy__config__cluster__v3__Cluster__CommonLbConfig__ConsistentHashingLbConfig_msg_init_ptr; extern const upb_MiniTable envoy__config__cluster__v3__Cluster__RefreshRate_msg_init; +extern const upb_MiniTable* envoy__config__cluster__v3__Cluster__RefreshRate_msg_init_ptr; extern const upb_MiniTable envoy__config__cluster__v3__Cluster__PreconnectPolicy_msg_init; +extern const upb_MiniTable* envoy__config__cluster__v3__Cluster__PreconnectPolicy_msg_init_ptr; extern const upb_MiniTable envoy__config__cluster__v3__Cluster__TypedExtensionProtocolOptionsEntry_msg_init; +extern const upb_MiniTable* envoy__config__cluster__v3__Cluster__TypedExtensionProtocolOptionsEntry_msg_init_ptr; extern const upb_MiniTable envoy__config__cluster__v3__LoadBalancingPolicy_msg_init; +extern const upb_MiniTable* envoy__config__cluster__v3__LoadBalancingPolicy_msg_init_ptr; extern const upb_MiniTable envoy__config__cluster__v3__LoadBalancingPolicy__Policy_msg_init; +extern const upb_MiniTable* envoy__config__cluster__v3__LoadBalancingPolicy__Policy_msg_init_ptr; extern const upb_MiniTable envoy__config__cluster__v3__UpstreamConnectionOptions_msg_init; +extern const upb_MiniTable* envoy__config__cluster__v3__UpstreamConnectionOptions_msg_init_ptr; extern const upb_MiniTable envoy__config__cluster__v3__UpstreamConnectionOptions__HappyEyeballsConfig_msg_init; +extern const upb_MiniTable* envoy__config__cluster__v3__UpstreamConnectionOptions__HappyEyeballsConfig_msg_init_ptr; extern const upb_MiniTable envoy__config__cluster__v3__TrackClusterStats_msg_init; +extern const upb_MiniTable* envoy__config__cluster__v3__TrackClusterStats_msg_init_ptr; extern const upb_MiniTableFile envoy_config_cluster_v3_cluster_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/config/cluster/v3/filter.upb.h b/src/core/ext/upb-gen/envoy/config/cluster/v3/filter.upb.h index fef044bb2e8..3f9f2e61bea 100644 --- a/src/core/ext/upb-gen/envoy/config/cluster/v3/filter.upb.h +++ b/src/core/ext/upb-gen/envoy/config/cluster/v3/filter.upb.h @@ -3,7 +3,8 @@ * envoy/config/cluster/v3/filter.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_CLUSTER_V3_FILTER_PROTO_UPB_H_ #define ENVOY_CONFIG_CLUSTER_V3_FILTER_PROTO_UPB_H_ @@ -87,6 +88,7 @@ UPB_INLINE const struct google_protobuf_Any* envoy_config_cluster_v3_Filter_type const struct google_protobuf_Any* default_val = NULL; const struct google_protobuf_Any* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -103,6 +105,7 @@ UPB_INLINE const struct envoy_config_core_v3_ExtensionConfigSource* envoy_config const struct envoy_config_core_v3_ExtensionConfigSource* default_val = NULL; const struct envoy_config_core_v3_ExtensionConfigSource* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__ExtensionConfigSource_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -118,6 +121,7 @@ UPB_INLINE void envoy_config_cluster_v3_Filter_set_name(envoy_config_cluster_v3_ } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); 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) { @@ -130,6 +134,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__ExtensionConfigSource_msg_init); 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) { diff --git a/src/core/ext/upb-gen/envoy/config/cluster/v3/filter.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/cluster/v3/filter.upb_minitable.c index 097a3c17a87..461ee53b89a 100644 --- a/src/core/ext/upb-gen/envoy/config/cluster/v3/filter.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/config/cluster/v3/filter.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/config/cluster/v3/filter.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -17,9 +18,10 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub envoy_config_cluster_v3_Filter_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ExtensionConfigSource_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal envoy_config_cluster_v3_Filter_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ExtensionConfigSource_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_cluster_v3_Filter__fields[3] = { @@ -41,6 +43,7 @@ const upb_MiniTable envoy__config__cluster__v3__Filter_msg_init = { }) }; +const upb_MiniTable* envoy__config__cluster__v3__Filter_msg_init_ptr = &envoy__config__cluster__v3__Filter_msg_init; static const upb_MiniTable *messages_layout[1] = { &envoy__config__cluster__v3__Filter_msg_init, }; diff --git a/src/core/ext/upb-gen/envoy/config/cluster/v3/filter.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/cluster/v3/filter.upb_minitable.h index 16fdf2a776e..b55f7b8707b 100644 --- a/src/core/ext/upb-gen/envoy/config/cluster/v3/filter.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/config/cluster/v3/filter.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/config/cluster/v3/filter.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_CLUSTER_V3_FILTER_PROTO_UPB_MINITABLE_H_ #define ENVOY_CONFIG_CLUSTER_V3_FILTER_PROTO_UPB_MINITABLE_H_ @@ -18,6 +19,7 @@ extern "C" { #endif extern const upb_MiniTable envoy__config__cluster__v3__Filter_msg_init; +extern const upb_MiniTable* envoy__config__cluster__v3__Filter_msg_init_ptr; extern const upb_MiniTableFile envoy_config_cluster_v3_filter_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/config/cluster/v3/outlier_detection.upb.h b/src/core/ext/upb-gen/envoy/config/cluster/v3/outlier_detection.upb.h index ac14f9b4c55..45626ff00ab 100644 --- a/src/core/ext/upb-gen/envoy/config/cluster/v3/outlier_detection.upb.h +++ b/src/core/ext/upb-gen/envoy/config/cluster/v3/outlier_detection.upb.h @@ -3,7 +3,8 @@ * envoy/config/cluster/v3/outlier_detection.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_CLUSTER_V3_OUTLIER_DETECTION_PROTO_UPB_H_ #define ENVOY_CONFIG_CLUSTER_V3_OUTLIER_DETECTION_PROTO_UPB_H_ @@ -78,6 +79,7 @@ UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_cluster_v3_Out const struct google_protobuf_UInt32Value* default_val = NULL; const struct google_protobuf_UInt32Value* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -94,6 +96,7 @@ UPB_INLINE const struct google_protobuf_Duration* envoy_config_cluster_v3_Outlie const struct google_protobuf_Duration* default_val = NULL; const struct google_protobuf_Duration* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -110,6 +113,7 @@ UPB_INLINE const struct google_protobuf_Duration* envoy_config_cluster_v3_Outlie const struct google_protobuf_Duration* default_val = NULL; const struct google_protobuf_Duration* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -126,6 +130,7 @@ UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_cluster_v3_Out const struct google_protobuf_UInt32Value* default_val = NULL; const struct google_protobuf_UInt32Value* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -142,6 +147,7 @@ UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_cluster_v3_Out const struct google_protobuf_UInt32Value* default_val = NULL; const struct google_protobuf_UInt32Value* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -158,6 +164,7 @@ UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_cluster_v3_Out const struct google_protobuf_UInt32Value* default_val = NULL; const struct google_protobuf_UInt32Value* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -174,6 +181,7 @@ UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_cluster_v3_Out const struct google_protobuf_UInt32Value* default_val = NULL; const struct google_protobuf_UInt32Value* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -190,6 +198,7 @@ UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_cluster_v3_Out const struct google_protobuf_UInt32Value* default_val = NULL; const struct google_protobuf_UInt32Value* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -206,6 +215,7 @@ UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_cluster_v3_Out const struct google_protobuf_UInt32Value* default_val = NULL; const struct google_protobuf_UInt32Value* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -222,6 +232,7 @@ UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_cluster_v3_Out const struct google_protobuf_UInt32Value* default_val = NULL; const struct google_protobuf_UInt32Value* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -238,6 +249,7 @@ UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_cluster_v3_Out const struct google_protobuf_UInt32Value* default_val = NULL; const struct google_protobuf_UInt32Value* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -266,6 +278,7 @@ UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_cluster_v3_Out const struct google_protobuf_UInt32Value* default_val = NULL; const struct google_protobuf_UInt32Value* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -282,6 +295,7 @@ UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_cluster_v3_Out const struct google_protobuf_UInt32Value* default_val = NULL; const struct google_protobuf_UInt32Value* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -298,6 +312,7 @@ UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_cluster_v3_Out const struct google_protobuf_UInt32Value* default_val = NULL; const struct google_protobuf_UInt32Value* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -314,6 +329,7 @@ UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_cluster_v3_Out const struct google_protobuf_UInt32Value* default_val = NULL; const struct google_protobuf_UInt32Value* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -330,6 +346,7 @@ UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_cluster_v3_Out const struct google_protobuf_UInt32Value* default_val = NULL; const struct google_protobuf_UInt32Value* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -346,6 +363,7 @@ UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_cluster_v3_Out const struct google_protobuf_UInt32Value* default_val = NULL; const struct google_protobuf_UInt32Value* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -362,6 +380,7 @@ UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_cluster_v3_Out const struct google_protobuf_UInt32Value* default_val = NULL; const struct google_protobuf_UInt32Value* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -378,6 +397,7 @@ UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_cluster_v3_Out const struct google_protobuf_UInt32Value* default_val = NULL; const struct google_protobuf_UInt32Value* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -394,6 +414,7 @@ UPB_INLINE const struct google_protobuf_Duration* envoy_config_cluster_v3_Outlie const struct google_protobuf_Duration* default_val = NULL; const struct google_protobuf_Duration* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -410,6 +431,7 @@ UPB_INLINE const struct google_protobuf_Duration* envoy_config_cluster_v3_Outlie const struct google_protobuf_Duration* default_val = NULL; const struct google_protobuf_Duration* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -426,6 +448,7 @@ UPB_INLINE const struct google_protobuf_BoolValue* envoy_config_cluster_v3_Outli const struct google_protobuf_BoolValue* default_val = NULL; const struct google_protobuf_BoolValue* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -440,6 +463,7 @@ UPB_INLINE void envoy_config_cluster_v3_OutlierDetection_clear_monitors(envoy_co } 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -451,6 +475,7 @@ UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* const* envoy_ } 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -459,6 +484,7 @@ UPB_INLINE const upb_Array* _envoy_config_cluster_v3_OutlierDetection_monitors_u } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -474,6 +500,7 @@ UPB_INLINE const struct google_protobuf_BoolValue* envoy_config_cluster_v3_Outli 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -485,6 +512,7 @@ UPB_INLINE bool envoy_config_cluster_v3_OutlierDetection_has_always_eject_one_ho 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); 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) { @@ -497,6 +525,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { @@ -509,6 +538,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { @@ -521,6 +551,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); 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) { @@ -533,6 +564,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); 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) { @@ -545,6 +577,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); 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) { @@ -557,6 +590,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); 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) { @@ -569,6 +603,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); 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) { @@ -581,6 +616,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); 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) { @@ -593,6 +629,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); 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) { @@ -605,6 +642,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); 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) { @@ -621,6 +659,7 @@ UPB_INLINE void envoy_config_cluster_v3_OutlierDetection_set_split_external_loca } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); 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) { @@ -633,6 +672,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); 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) { @@ -645,6 +685,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); 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) { @@ -657,6 +698,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); 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) { @@ -669,6 +711,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); 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) { @@ -681,6 +724,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); 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) { @@ -693,6 +737,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); 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) { @@ -705,6 +750,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); 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) { @@ -717,6 +763,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { @@ -729,6 +776,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { @@ -741,6 +789,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); 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) { @@ -753,6 +802,7 @@ UPB_INLINE struct google_protobuf_BoolValue* envoy_config_cluster_v3_OutlierDete } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -769,6 +819,7 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig** envoy_config_clust } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -783,6 +834,7 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_cluste } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); 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) { diff --git a/src/core/ext/upb-gen/envoy/config/cluster/v3/outlier_detection.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/cluster/v3/outlier_detection.upb_minitable.c index 8c8d43f17d6..93855c1c6b4 100644 --- a/src/core/ext/upb-gen/envoy/config/cluster/v3/outlier_detection.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/config/cluster/v3/outlier_detection.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/config/cluster/v3/outlier_detection.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -18,31 +19,32 @@ // Must be last. #include "upb/port/def.inc" -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}, - {.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) = &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) = &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) = &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) = &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}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal envoy_config_cluster_v3_OutlierDetection_submsgs[24] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_cluster_v3_OutlierDetection__fields[25] = { @@ -116,6 +118,7 @@ const upb_MiniTable envoy__config__cluster__v3__OutlierDetection_msg_init = { }) }; +const upb_MiniTable* envoy__config__cluster__v3__OutlierDetection_msg_init_ptr = &envoy__config__cluster__v3__OutlierDetection_msg_init; static const upb_MiniTable *messages_layout[1] = { &envoy__config__cluster__v3__OutlierDetection_msg_init, }; diff --git a/src/core/ext/upb-gen/envoy/config/cluster/v3/outlier_detection.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/cluster/v3/outlier_detection.upb_minitable.h index 5586fc781d7..722d1a24155 100644 --- a/src/core/ext/upb-gen/envoy/config/cluster/v3/outlier_detection.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/config/cluster/v3/outlier_detection.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/config/cluster/v3/outlier_detection.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_CLUSTER_V3_OUTLIER_DETECTION_PROTO_UPB_MINITABLE_H_ #define ENVOY_CONFIG_CLUSTER_V3_OUTLIER_DETECTION_PROTO_UPB_MINITABLE_H_ @@ -18,6 +19,7 @@ extern "C" { #endif extern const upb_MiniTable envoy__config__cluster__v3__OutlierDetection_msg_init; +extern const upb_MiniTable* envoy__config__cluster__v3__OutlierDetection_msg_init_ptr; extern const upb_MiniTableFile envoy_config_cluster_v3_outlier_detection_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/config/common/matcher/v3/matcher.upb.h b/src/core/ext/upb-gen/envoy/config/common/matcher/v3/matcher.upb.h index 5a8d513a154..11416680b07 100644 --- a/src/core/ext/upb-gen/envoy/config/common/matcher/v3/matcher.upb.h +++ b/src/core/ext/upb-gen/envoy/config/common/matcher/v3/matcher.upb.h @@ -3,7 +3,8 @@ * envoy/config/common/matcher/v3/matcher.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_COMMON_MATCHER_V3_MATCHER_PROTO_UPB_H_ #define ENVOY_CONFIG_COMMON_MATCHER_V3_MATCHER_PROTO_UPB_H_ @@ -100,6 +101,7 @@ UPB_INLINE const envoy_config_common_matcher_v3_Matcher_MatcherList* envoy_confi const envoy_config_common_matcher_v3_Matcher_MatcherList* default_val = NULL; const envoy_config_common_matcher_v3_Matcher_MatcherList* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__common__matcher__v3__Matcher__MatcherList_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -116,6 +118,7 @@ UPB_INLINE const envoy_config_common_matcher_v3_Matcher_MatcherTree* envoy_confi const envoy_config_common_matcher_v3_Matcher_MatcherTree* default_val = NULL; const envoy_config_common_matcher_v3_Matcher_MatcherTree* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__common__matcher__v3__Matcher__MatcherTree_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -132,6 +135,7 @@ UPB_INLINE const envoy_config_common_matcher_v3_Matcher_OnMatch* envoy_config_co const envoy_config_common_matcher_v3_Matcher_OnMatch* default_val = NULL; const envoy_config_common_matcher_v3_Matcher_OnMatch* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__common__matcher__v3__Matcher__OnMatch_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -143,6 +147,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__common__matcher__v3__Matcher__MatcherList_msg_init); 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) { @@ -155,6 +160,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__common__matcher__v3__Matcher__MatcherTree_msg_init); 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) { @@ -167,6 +173,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__common__matcher__v3__Matcher__OnMatch_msg_init); 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) { @@ -232,6 +239,7 @@ UPB_INLINE const envoy_config_common_matcher_v3_Matcher* envoy_config_common_mat const envoy_config_common_matcher_v3_Matcher* default_val = NULL; const envoy_config_common_matcher_v3_Matcher* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__common__matcher__v3__Matcher_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -248,6 +256,7 @@ UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_ const struct envoy_config_core_v3_TypedExtensionConfig* default_val = NULL; const struct envoy_config_core_v3_TypedExtensionConfig* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -259,6 +268,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__common__matcher__v3__Matcher_msg_init); 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) { @@ -271,6 +281,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); 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) { @@ -324,6 +335,7 @@ UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherList_clear_matcher } UPB_INLINE const envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher* const* envoy_config_common_matcher_v3_Matcher_MatcherList_matchers(const envoy_config_common_matcher_v3_Matcher_MatcherList* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__common__matcher__v3__Matcher__MatcherList__FieldMatcher_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -335,6 +347,7 @@ UPB_INLINE const envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher } UPB_INLINE const upb_Array* _envoy_config_common_matcher_v3_Matcher_MatcherList_matchers_upb_array(const envoy_config_common_matcher_v3_Matcher_MatcherList* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__common__matcher__v3__Matcher__MatcherList__FieldMatcher_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -343,6 +356,7 @@ UPB_INLINE const upb_Array* _envoy_config_common_matcher_v3_Matcher_MatcherList_ } UPB_INLINE upb_Array* _envoy_config_common_matcher_v3_Matcher_MatcherList_matchers_mutable_upb_array(envoy_config_common_matcher_v3_Matcher_MatcherList* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__common__matcher__v3__Matcher__MatcherList__FieldMatcher_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -353,6 +367,7 @@ UPB_INLINE upb_Array* _envoy_config_common_matcher_v3_Matcher_MatcherList_matche UPB_INLINE envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher** envoy_config_common_matcher_v3_Matcher_MatcherList_mutable_matchers(envoy_config_common_matcher_v3_Matcher_MatcherList* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__common__matcher__v3__Matcher__MatcherList__FieldMatcher_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -369,6 +384,7 @@ UPB_INLINE envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher** env } UPB_INLINE struct envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher* envoy_config_common_matcher_v3_Matcher_MatcherList_add_matchers(envoy_config_common_matcher_v3_Matcher_MatcherList* msg, upb_Arena* arena) { upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__common__matcher__v3__Matcher__MatcherList__FieldMatcher_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -438,6 +454,7 @@ UPB_INLINE const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_Si const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* default_val = NULL; const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate__SinglePredicate_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -454,6 +471,7 @@ UPB_INLINE const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_Pr const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* default_val = NULL; const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate__PredicateList_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -470,6 +488,7 @@ UPB_INLINE const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_Pr const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* default_val = NULL; const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate__PredicateList_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -486,6 +505,7 @@ UPB_INLINE const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* e const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* default_val = NULL; const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -497,6 +517,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate__SinglePredicate_msg_init); 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) { @@ -509,6 +530,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate__PredicateList_msg_init); 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) { @@ -521,6 +543,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate__PredicateList_msg_init); 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) { @@ -533,6 +556,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate_msg_init); 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) { @@ -598,6 +622,7 @@ UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_ const struct envoy_config_core_v3_TypedExtensionConfig* default_val = NULL; const struct envoy_config_core_v3_TypedExtensionConfig* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -614,6 +639,7 @@ UPB_INLINE const struct envoy_type_matcher_v3_StringMatcher* envoy_config_common const struct envoy_type_matcher_v3_StringMatcher* default_val = NULL; const struct envoy_type_matcher_v3_StringMatcher* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__StringMatcher_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -630,6 +656,7 @@ UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_ const struct envoy_config_core_v3_TypedExtensionConfig* default_val = NULL; const struct envoy_config_core_v3_TypedExtensionConfig* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -641,6 +668,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); 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) { @@ -653,6 +681,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__StringMatcher_msg_init); 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) { @@ -665,6 +694,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); 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) { @@ -718,6 +748,7 @@ UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_Pre } UPB_INLINE const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* const* envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_predicate(const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -729,6 +760,7 @@ UPB_INLINE const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* c } UPB_INLINE const upb_Array* _envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_predicate_upb_array(const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -737,6 +769,7 @@ UPB_INLINE const upb_Array* _envoy_config_common_matcher_v3_Matcher_MatcherList_ } UPB_INLINE upb_Array* _envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_predicate_mutable_upb_array(envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -747,6 +780,7 @@ UPB_INLINE upb_Array* _envoy_config_common_matcher_v3_Matcher_MatcherList_Predic UPB_INLINE envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate** envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_mutable_predicate(envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -763,6 +797,7 @@ UPB_INLINE envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate** envoy_ } UPB_INLINE struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_add_predicate(envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* msg, upb_Arena* arena) { upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -820,6 +855,7 @@ UPB_INLINE const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* e const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* default_val = NULL; const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -836,6 +872,7 @@ UPB_INLINE const envoy_config_common_matcher_v3_Matcher_OnMatch* envoy_config_co const envoy_config_common_matcher_v3_Matcher_OnMatch* default_val = NULL; const envoy_config_common_matcher_v3_Matcher_OnMatch* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__common__matcher__v3__Matcher__OnMatch_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -847,6 +884,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate_msg_init); 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) { @@ -859,6 +897,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__common__matcher__v3__Matcher__OnMatch_msg_init); 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) { @@ -925,6 +964,7 @@ UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_ const struct envoy_config_core_v3_TypedExtensionConfig* default_val = NULL; const struct envoy_config_core_v3_TypedExtensionConfig* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -941,6 +981,7 @@ UPB_INLINE const envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap* en const envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap* default_val = NULL; const envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__common__matcher__v3__Matcher__MatcherTree__MatchMap_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -957,6 +998,7 @@ UPB_INLINE const envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap* en const envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap* default_val = NULL; const envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__common__matcher__v3__Matcher__MatcherTree__MatchMap_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -973,6 +1015,7 @@ UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_ const struct envoy_config_core_v3_TypedExtensionConfig* default_val = NULL; const struct envoy_config_core_v3_TypedExtensionConfig* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -984,6 +1027,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); 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) { @@ -996,6 +1040,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__common__matcher__v3__Matcher__MatcherTree__MatchMap_msg_init); 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) { @@ -1008,6 +1053,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__common__matcher__v3__Matcher__MatcherTree__MatchMap_msg_init); 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) { @@ -1020,6 +1066,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); 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) { @@ -1078,22 +1125,30 @@ UPB_INLINE size_t envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_ma } UPB_INLINE bool envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_map_get(const envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap* msg, upb_StringView key, envoy_config_common_matcher_v3_Matcher_OnMatch** val) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__common__matcher__v3__Matcher__MatcherTree__MatchMap__MapEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__common__matcher__v3__Matcher__OnMatch_msg_init); 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_common_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry* envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_map_next(const envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap* msg, size_t* iter) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__common__matcher__v3__Matcher__MatcherTree__MatchMap__MapEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__common__matcher__v3__Matcher__OnMatch_msg_init); const upb_Map* map = upb_Message_GetMap(UPB_UPCAST(msg), &field); if (!map) return NULL; return (const envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry*)_upb_map_next(map, iter); } UPB_INLINE const upb_Map* _envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_map_upb_map(envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap* msg) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__common__matcher__v3__Matcher__MatcherTree__MatchMap__MapEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__common__matcher__v3__Matcher__OnMatch_msg_init); return upb_Message_GetMap(UPB_UPCAST(msg), &field); } UPB_INLINE upb_Map* _envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_map_mutable_upb_map(envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap* msg, upb_Arena* a) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__common__matcher__v3__Matcher__MatcherTree__MatchMap__MapEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__common__matcher__v3__Matcher__OnMatch_msg_init); return _upb_Message_GetOrCreateMutableMap(UPB_UPCAST(msg), &field, 0, sizeof(envoy_config_common_matcher_v3_Matcher_OnMatch*), a); } @@ -1105,6 +1160,8 @@ UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_map_ } UPB_INLINE bool envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_map_set(envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap* msg, upb_StringView key, envoy_config_common_matcher_v3_Matcher_OnMatch* val, upb_Arena* a) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__common__matcher__v3__Matcher__MatcherTree__MatchMap__MapEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__common__matcher__v3__Matcher__OnMatch_msg_init); 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) != @@ -1118,6 +1175,8 @@ UPB_INLINE bool envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_map_ } UPB_INLINE envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry* envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_map_nextmutable(envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap* msg, size_t* iter) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__common__matcher__v3__Matcher__MatcherTree__MatchMap__MapEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__common__matcher__v3__Matcher__OnMatch_msg_init); upb_Map* map = (upb_Map*)upb_Message_GetMap(UPB_UPCAST(msg), &field); if (!map) return NULL; return (envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry*)_upb_map_next(map, iter); @@ -1206,6 +1265,7 @@ UPB_INLINE const envoy_config_common_matcher_v3_MatchPredicate_MatchSet* envoy_c const envoy_config_common_matcher_v3_MatchPredicate_MatchSet* default_val = NULL; const envoy_config_common_matcher_v3_MatchPredicate_MatchSet* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__common__matcher__v3__MatchPredicate__MatchSet_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1222,6 +1282,7 @@ UPB_INLINE const envoy_config_common_matcher_v3_MatchPredicate_MatchSet* envoy_c const envoy_config_common_matcher_v3_MatchPredicate_MatchSet* default_val = NULL; const envoy_config_common_matcher_v3_MatchPredicate_MatchSet* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__common__matcher__v3__MatchPredicate__MatchSet_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1238,6 +1299,7 @@ UPB_INLINE const envoy_config_common_matcher_v3_MatchPredicate* envoy_config_com const envoy_config_common_matcher_v3_MatchPredicate* default_val = NULL; const envoy_config_common_matcher_v3_MatchPredicate* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__common__matcher__v3__MatchPredicate_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1270,6 +1332,7 @@ UPB_INLINE const envoy_config_common_matcher_v3_HttpHeadersMatch* envoy_config_c const envoy_config_common_matcher_v3_HttpHeadersMatch* default_val = NULL; const envoy_config_common_matcher_v3_HttpHeadersMatch* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__common__matcher__v3__HttpHeadersMatch_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1286,6 +1349,7 @@ UPB_INLINE const envoy_config_common_matcher_v3_HttpHeadersMatch* envoy_config_c const envoy_config_common_matcher_v3_HttpHeadersMatch* default_val = NULL; const envoy_config_common_matcher_v3_HttpHeadersMatch* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__common__matcher__v3__HttpHeadersMatch_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1302,6 +1366,7 @@ UPB_INLINE const envoy_config_common_matcher_v3_HttpHeadersMatch* envoy_config_c const envoy_config_common_matcher_v3_HttpHeadersMatch* default_val = NULL; const envoy_config_common_matcher_v3_HttpHeadersMatch* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__common__matcher__v3__HttpHeadersMatch_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1318,6 +1383,7 @@ UPB_INLINE const envoy_config_common_matcher_v3_HttpHeadersMatch* envoy_config_c const envoy_config_common_matcher_v3_HttpHeadersMatch* default_val = NULL; const envoy_config_common_matcher_v3_HttpHeadersMatch* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__common__matcher__v3__HttpHeadersMatch_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1334,6 +1400,7 @@ UPB_INLINE const envoy_config_common_matcher_v3_HttpGenericBodyMatch* envoy_conf const envoy_config_common_matcher_v3_HttpGenericBodyMatch* default_val = NULL; const envoy_config_common_matcher_v3_HttpGenericBodyMatch* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__common__matcher__v3__HttpGenericBodyMatch_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1350,6 +1417,7 @@ UPB_INLINE const envoy_config_common_matcher_v3_HttpGenericBodyMatch* envoy_conf const envoy_config_common_matcher_v3_HttpGenericBodyMatch* default_val = NULL; const envoy_config_common_matcher_v3_HttpGenericBodyMatch* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__common__matcher__v3__HttpGenericBodyMatch_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1361,6 +1429,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__common__matcher__v3__MatchPredicate__MatchSet_msg_init); 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) { @@ -1373,6 +1442,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__common__matcher__v3__MatchPredicate__MatchSet_msg_init); 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) { @@ -1385,6 +1455,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__common__matcher__v3__MatchPredicate_msg_init); 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) { @@ -1401,6 +1472,7 @@ UPB_INLINE void envoy_config_common_matcher_v3_MatchPredicate_set_any_match(envo } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__common__matcher__v3__HttpHeadersMatch_msg_init); 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) { @@ -1413,6 +1485,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__common__matcher__v3__HttpHeadersMatch_msg_init); 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) { @@ -1425,6 +1498,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__common__matcher__v3__HttpHeadersMatch_msg_init); 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) { @@ -1437,6 +1511,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__common__matcher__v3__HttpHeadersMatch_msg_init); 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) { @@ -1449,6 +1524,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__common__matcher__v3__HttpGenericBodyMatch_msg_init); 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) { @@ -1461,6 +1537,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__common__matcher__v3__HttpGenericBodyMatch_msg_init); 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) { @@ -1514,6 +1591,7 @@ UPB_INLINE void envoy_config_common_matcher_v3_MatchPredicate_MatchSet_clear_rul } UPB_INLINE const envoy_config_common_matcher_v3_MatchPredicate* const* envoy_config_common_matcher_v3_MatchPredicate_MatchSet_rules(const envoy_config_common_matcher_v3_MatchPredicate_MatchSet* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__common__matcher__v3__MatchPredicate_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1525,6 +1603,7 @@ UPB_INLINE const envoy_config_common_matcher_v3_MatchPredicate* const* envoy_con } UPB_INLINE const upb_Array* _envoy_config_common_matcher_v3_MatchPredicate_MatchSet_rules_upb_array(const envoy_config_common_matcher_v3_MatchPredicate_MatchSet* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__common__matcher__v3__MatchPredicate_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -1533,6 +1612,7 @@ UPB_INLINE const upb_Array* _envoy_config_common_matcher_v3_MatchPredicate_Match } UPB_INLINE upb_Array* _envoy_config_common_matcher_v3_MatchPredicate_MatchSet_rules_mutable_upb_array(envoy_config_common_matcher_v3_MatchPredicate_MatchSet* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__common__matcher__v3__MatchPredicate_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -1543,6 +1623,7 @@ UPB_INLINE upb_Array* _envoy_config_common_matcher_v3_MatchPredicate_MatchSet_ru UPB_INLINE envoy_config_common_matcher_v3_MatchPredicate** envoy_config_common_matcher_v3_MatchPredicate_MatchSet_mutable_rules(envoy_config_common_matcher_v3_MatchPredicate_MatchSet* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__common__matcher__v3__MatchPredicate_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1559,6 +1640,7 @@ UPB_INLINE envoy_config_common_matcher_v3_MatchPredicate** envoy_config_common_m } UPB_INLINE struct envoy_config_common_matcher_v3_MatchPredicate* envoy_config_common_matcher_v3_MatchPredicate_MatchSet_add_rules(envoy_config_common_matcher_v3_MatchPredicate_MatchSet* msg, upb_Arena* arena) { upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__common__matcher__v3__MatchPredicate_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -1614,6 +1696,7 @@ UPB_INLINE void envoy_config_common_matcher_v3_HttpHeadersMatch_clear_headers(en } UPB_INLINE const struct envoy_config_route_v3_HeaderMatcher* const* envoy_config_common_matcher_v3_HttpHeadersMatch_headers(const envoy_config_common_matcher_v3_HttpHeadersMatch* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__HeaderMatcher_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1625,6 +1708,7 @@ UPB_INLINE const struct envoy_config_route_v3_HeaderMatcher* const* envoy_config } UPB_INLINE const upb_Array* _envoy_config_common_matcher_v3_HttpHeadersMatch_headers_upb_array(const envoy_config_common_matcher_v3_HttpHeadersMatch* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__HeaderMatcher_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -1633,6 +1717,7 @@ UPB_INLINE const upb_Array* _envoy_config_common_matcher_v3_HttpHeadersMatch_hea } UPB_INLINE upb_Array* _envoy_config_common_matcher_v3_HttpHeadersMatch_headers_mutable_upb_array(envoy_config_common_matcher_v3_HttpHeadersMatch* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__HeaderMatcher_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -1643,6 +1728,7 @@ UPB_INLINE upb_Array* _envoy_config_common_matcher_v3_HttpHeadersMatch_headers_m UPB_INLINE struct envoy_config_route_v3_HeaderMatcher** envoy_config_common_matcher_v3_HttpHeadersMatch_mutable_headers(envoy_config_common_matcher_v3_HttpHeadersMatch* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__HeaderMatcher_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1659,6 +1745,7 @@ UPB_INLINE struct envoy_config_route_v3_HeaderMatcher** envoy_config_common_matc } UPB_INLINE struct envoy_config_route_v3_HeaderMatcher* envoy_config_common_matcher_v3_HttpHeadersMatch_add_headers(envoy_config_common_matcher_v3_HttpHeadersMatch* msg, upb_Arena* arena) { upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__HeaderMatcher_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -1726,6 +1813,7 @@ UPB_INLINE void envoy_config_common_matcher_v3_HttpGenericBodyMatch_clear_patter } UPB_INLINE const envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch* const* envoy_config_common_matcher_v3_HttpGenericBodyMatch_patterns(const envoy_config_common_matcher_v3_HttpGenericBodyMatch* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__common__matcher__v3__HttpGenericBodyMatch__GenericTextMatch_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1737,6 +1825,7 @@ UPB_INLINE const envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericText } UPB_INLINE const upb_Array* _envoy_config_common_matcher_v3_HttpGenericBodyMatch_patterns_upb_array(const envoy_config_common_matcher_v3_HttpGenericBodyMatch* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__common__matcher__v3__HttpGenericBodyMatch__GenericTextMatch_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -1745,6 +1834,7 @@ UPB_INLINE const upb_Array* _envoy_config_common_matcher_v3_HttpGenericBodyMatch } UPB_INLINE upb_Array* _envoy_config_common_matcher_v3_HttpGenericBodyMatch_patterns_mutable_upb_array(envoy_config_common_matcher_v3_HttpGenericBodyMatch* msg, size_t* size, upb_Arena* arena) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__common__matcher__v3__HttpGenericBodyMatch__GenericTextMatch_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -1759,6 +1849,7 @@ UPB_INLINE void envoy_config_common_matcher_v3_HttpGenericBodyMatch_set_bytes_li } 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__common__matcher__v3__HttpGenericBodyMatch__GenericTextMatch_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1775,6 +1866,7 @@ UPB_INLINE envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch* } UPB_INLINE struct envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch* envoy_config_common_matcher_v3_HttpGenericBodyMatch_add_patterns(envoy_config_common_matcher_v3_HttpGenericBodyMatch* msg, upb_Arena* arena) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__common__matcher__v3__HttpGenericBodyMatch__GenericTextMatch_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( diff --git a/src/core/ext/upb-gen/envoy/config/common/matcher/v3/matcher.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/common/matcher/v3/matcher.upb_minitable.c index e7c5e693ea0..37517131a07 100644 --- a/src/core/ext/upb-gen/envoy/config/common/matcher/v3/matcher.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/config/common/matcher/v3/matcher.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/config/common/matcher/v3/matcher.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -17,10 +18,11 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub envoy_config_common_matcher_v3_Matcher_submsgs[3] = { - {.UPB_PRIVATE(submsg) = &envoy__config__common__matcher__v3__Matcher__MatcherList_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__common__matcher__v3__Matcher__MatcherTree_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__common__matcher__v3__Matcher__OnMatch_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal envoy_config_common_matcher_v3_Matcher_submsgs[3] = { + {.UPB_PRIVATE(submsg) = &envoy__config__common__matcher__v3__Matcher__MatcherList_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__common__matcher__v3__Matcher__MatcherTree_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__common__matcher__v3__Matcher__OnMatch_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_common_matcher_v3_Matcher__fields[3] = { @@ -44,9 +46,10 @@ const upb_MiniTable envoy__config__common__matcher__v3__Matcher_msg_init = { }) }; -static const upb_MiniTableSub envoy_config_common_matcher_v3_Matcher_OnMatch_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &envoy__config__common__matcher__v3__Matcher_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init}, +const upb_MiniTable* envoy__config__common__matcher__v3__Matcher_msg_init_ptr = &envoy__config__common__matcher__v3__Matcher_msg_init; +static const upb_MiniTableSubInternal envoy_config_common_matcher_v3_Matcher_OnMatch_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &envoy__config__common__matcher__v3__Matcher_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_common_matcher_v3_Matcher_OnMatch__fields[2] = { @@ -69,8 +72,9 @@ const upb_MiniTable envoy__config__common__matcher__v3__Matcher__OnMatch_msg_ini }) }; -static const upb_MiniTableSub envoy_config_common_matcher_v3_Matcher_MatcherList_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__config__common__matcher__v3__Matcher__MatcherList__FieldMatcher_msg_init}, +const upb_MiniTable* envoy__config__common__matcher__v3__Matcher__OnMatch_msg_init_ptr = &envoy__config__common__matcher__v3__Matcher__OnMatch_msg_init; +static const upb_MiniTableSubInternal envoy_config_common_matcher_v3_Matcher_MatcherList_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__config__common__matcher__v3__Matcher__MatcherList__FieldMatcher_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_common_matcher_v3_Matcher_MatcherList__fields[1] = { @@ -90,11 +94,12 @@ const upb_MiniTable envoy__config__common__matcher__v3__Matcher__MatcherList_msg }) }; -static const upb_MiniTableSub envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_submsgs[4] = { - {.UPB_PRIVATE(submsg) = &envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate__SinglePredicate_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate__PredicateList_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate__PredicateList_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate_msg_init}, +const upb_MiniTable* envoy__config__common__matcher__v3__Matcher__MatcherList_msg_init_ptr = &envoy__config__common__matcher__v3__Matcher__MatcherList_msg_init; +static const upb_MiniTableSubInternal envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_submsgs[4] = { + {.UPB_PRIVATE(submsg) = &envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate__SinglePredicate_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate__PredicateList_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate__PredicateList_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate__fields[4] = { @@ -123,10 +128,11 @@ const upb_MiniTable envoy__config__common__matcher__v3__Matcher__MatcherList__Pr }) }; -static const upb_MiniTableSub envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_submsgs[3] = { - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__StringMatcher_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init}, +const upb_MiniTable* envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate_msg_init_ptr = &envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate_msg_init; +static const upb_MiniTableSubInternal envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_submsgs[3] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__StringMatcher_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate__fields[3] = { @@ -150,8 +156,9 @@ const upb_MiniTable envoy__config__common__matcher__v3__Matcher__MatcherList__Pr }) }; -static const upb_MiniTableSub envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate_msg_init}, +const upb_MiniTable* envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate__SinglePredicate_msg_init_ptr = &envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate__SinglePredicate_msg_init; +static const upb_MiniTableSubInternal envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList__fields[1] = { @@ -171,9 +178,10 @@ const upb_MiniTable envoy__config__common__matcher__v3__Matcher__MatcherList__Pr }) }; -static const upb_MiniTableSub envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__common__matcher__v3__Matcher__OnMatch_msg_init}, +const upb_MiniTable* envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate__PredicateList_msg_init_ptr = &envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate__PredicateList_msg_init; +static const upb_MiniTableSubInternal envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__common__matcher__v3__Matcher__OnMatch_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher__fields[2] = { @@ -190,11 +198,12 @@ const upb_MiniTable envoy__config__common__matcher__v3__Matcher__MatcherList__Fi #endif }; -static const upb_MiniTableSub envoy_config_common_matcher_v3_Matcher_MatcherTree_submsgs[4] = { - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__common__matcher__v3__Matcher__MatcherTree__MatchMap_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__common__matcher__v3__Matcher__MatcherTree__MatchMap_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init}, +const upb_MiniTable* envoy__config__common__matcher__v3__Matcher__MatcherList__FieldMatcher_msg_init_ptr = &envoy__config__common__matcher__v3__Matcher__MatcherList__FieldMatcher_msg_init; +static const upb_MiniTableSubInternal envoy_config_common_matcher_v3_Matcher_MatcherTree_submsgs[4] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__common__matcher__v3__Matcher__MatcherTree__MatchMap_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__common__matcher__v3__Matcher__MatcherTree__MatchMap_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_common_matcher_v3_Matcher_MatcherTree__fields[4] = { @@ -223,8 +232,9 @@ const upb_MiniTable envoy__config__common__matcher__v3__Matcher__MatcherTree_msg }) }; -static const upb_MiniTableSub envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__config__common__matcher__v3__Matcher__MatcherTree__MatchMap__MapEntry_msg_init}, +const upb_MiniTable* envoy__config__common__matcher__v3__Matcher__MatcherTree_msg_init_ptr = &envoy__config__common__matcher__v3__Matcher__MatcherTree_msg_init; +static const upb_MiniTableSubInternal envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__config__common__matcher__v3__Matcher__MatcherTree__MatchMap__MapEntry_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap__fields[1] = { @@ -240,8 +250,9 @@ const upb_MiniTable envoy__config__common__matcher__v3__Matcher__MatcherTree__Ma #endif }; -static const upb_MiniTableSub envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__config__common__matcher__v3__Matcher__OnMatch_msg_init}, +const upb_MiniTable* envoy__config__common__matcher__v3__Matcher__MatcherTree__MatchMap_msg_init_ptr = &envoy__config__common__matcher__v3__Matcher__MatcherTree__MatchMap_msg_init; +static const upb_MiniTableSubInternal envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__config__common__matcher__v3__Matcher__OnMatch_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry__fields[2] = { @@ -262,16 +273,17 @@ const upb_MiniTable envoy__config__common__matcher__v3__Matcher__MatcherTree__Ma }) }; -static const upb_MiniTableSub envoy_config_common_matcher_v3_MatchPredicate_submsgs[9] = { - {.UPB_PRIVATE(submsg) = &envoy__config__common__matcher__v3__MatchPredicate__MatchSet_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__common__matcher__v3__MatchPredicate__MatchSet_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__common__matcher__v3__MatchPredicate_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__common__matcher__v3__HttpHeadersMatch_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__common__matcher__v3__HttpHeadersMatch_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__common__matcher__v3__HttpHeadersMatch_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__common__matcher__v3__HttpHeadersMatch_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__common__matcher__v3__HttpGenericBodyMatch_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__common__matcher__v3__HttpGenericBodyMatch_msg_init}, +const upb_MiniTable* envoy__config__common__matcher__v3__Matcher__MatcherTree__MatchMap__MapEntry_msg_init_ptr = &envoy__config__common__matcher__v3__Matcher__MatcherTree__MatchMap__MapEntry_msg_init; +static const upb_MiniTableSubInternal envoy_config_common_matcher_v3_MatchPredicate_submsgs[9] = { + {.UPB_PRIVATE(submsg) = &envoy__config__common__matcher__v3__MatchPredicate__MatchSet_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__common__matcher__v3__MatchPredicate__MatchSet_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__common__matcher__v3__MatchPredicate_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__common__matcher__v3__HttpHeadersMatch_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__common__matcher__v3__HttpHeadersMatch_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__common__matcher__v3__HttpHeadersMatch_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__common__matcher__v3__HttpHeadersMatch_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__common__matcher__v3__HttpGenericBodyMatch_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__common__matcher__v3__HttpGenericBodyMatch_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_common_matcher_v3_MatchPredicate__fields[10] = { @@ -314,8 +326,9 @@ const upb_MiniTable envoy__config__common__matcher__v3__MatchPredicate_msg_init }) }; -static const upb_MiniTableSub envoy_config_common_matcher_v3_MatchPredicate_MatchSet_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__config__common__matcher__v3__MatchPredicate_msg_init}, +const upb_MiniTable* envoy__config__common__matcher__v3__MatchPredicate_msg_init_ptr = &envoy__config__common__matcher__v3__MatchPredicate_msg_init; +static const upb_MiniTableSubInternal envoy_config_common_matcher_v3_MatchPredicate_MatchSet_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__config__common__matcher__v3__MatchPredicate_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_common_matcher_v3_MatchPredicate_MatchSet__fields[1] = { @@ -335,8 +348,9 @@ const upb_MiniTable envoy__config__common__matcher__v3__MatchPredicate__MatchSet }) }; -static const upb_MiniTableSub envoy_config_common_matcher_v3_HttpHeadersMatch_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__HeaderMatcher_msg_init}, +const upb_MiniTable* envoy__config__common__matcher__v3__MatchPredicate__MatchSet_msg_init_ptr = &envoy__config__common__matcher__v3__MatchPredicate__MatchSet_msg_init; +static const upb_MiniTableSubInternal envoy_config_common_matcher_v3_HttpHeadersMatch_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__HeaderMatcher_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_common_matcher_v3_HttpHeadersMatch__fields[1] = { @@ -356,8 +370,9 @@ const upb_MiniTable envoy__config__common__matcher__v3__HttpHeadersMatch_msg_ini }) }; -static const upb_MiniTableSub envoy_config_common_matcher_v3_HttpGenericBodyMatch_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__config__common__matcher__v3__HttpGenericBodyMatch__GenericTextMatch_msg_init}, +const upb_MiniTable* envoy__config__common__matcher__v3__HttpHeadersMatch_msg_init_ptr = &envoy__config__common__matcher__v3__HttpHeadersMatch_msg_init; +static const upb_MiniTableSubInternal envoy_config_common_matcher_v3_HttpGenericBodyMatch_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__config__common__matcher__v3__HttpGenericBodyMatch__GenericTextMatch_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_common_matcher_v3_HttpGenericBodyMatch__fields[2] = { @@ -380,6 +395,7 @@ const upb_MiniTable envoy__config__common__matcher__v3__HttpGenericBodyMatch_msg }) }; +const upb_MiniTable* envoy__config__common__matcher__v3__HttpGenericBodyMatch_msg_init_ptr = &envoy__config__common__matcher__v3__HttpGenericBodyMatch_msg_init; static const upb_MiniTableField envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch__fields[2] = { {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)}, @@ -400,6 +416,7 @@ const upb_MiniTable envoy__config__common__matcher__v3__HttpGenericBodyMatch__Ge }) }; +const upb_MiniTable* envoy__config__common__matcher__v3__HttpGenericBodyMatch__GenericTextMatch_msg_init_ptr = &envoy__config__common__matcher__v3__HttpGenericBodyMatch__GenericTextMatch_msg_init; static const upb_MiniTable *messages_layout[15] = { &envoy__config__common__matcher__v3__Matcher_msg_init, &envoy__config__common__matcher__v3__Matcher__OnMatch_msg_init, diff --git a/src/core/ext/upb-gen/envoy/config/common/matcher/v3/matcher.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/common/matcher/v3/matcher.upb_minitable.h index 820a3e84f95..00db11a07eb 100644 --- a/src/core/ext/upb-gen/envoy/config/common/matcher/v3/matcher.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/config/common/matcher/v3/matcher.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/config/common/matcher/v3/matcher.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_COMMON_MATCHER_V3_MATCHER_PROTO_UPB_MINITABLE_H_ #define ENVOY_CONFIG_COMMON_MATCHER_V3_MATCHER_PROTO_UPB_MINITABLE_H_ @@ -18,20 +19,35 @@ extern "C" { #endif extern const upb_MiniTable envoy__config__common__matcher__v3__Matcher_msg_init; +extern const upb_MiniTable* envoy__config__common__matcher__v3__Matcher_msg_init_ptr; extern const upb_MiniTable envoy__config__common__matcher__v3__Matcher__OnMatch_msg_init; +extern const upb_MiniTable* envoy__config__common__matcher__v3__Matcher__OnMatch_msg_init_ptr; extern const upb_MiniTable envoy__config__common__matcher__v3__Matcher__MatcherList_msg_init; +extern const upb_MiniTable* envoy__config__common__matcher__v3__Matcher__MatcherList_msg_init_ptr; extern const upb_MiniTable envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate_msg_init; +extern const upb_MiniTable* envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate_msg_init_ptr; extern const upb_MiniTable envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate__SinglePredicate_msg_init; +extern const upb_MiniTable* envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate__SinglePredicate_msg_init_ptr; extern const upb_MiniTable envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate__PredicateList_msg_init; +extern const upb_MiniTable* envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate__PredicateList_msg_init_ptr; extern const upb_MiniTable envoy__config__common__matcher__v3__Matcher__MatcherList__FieldMatcher_msg_init; +extern const upb_MiniTable* envoy__config__common__matcher__v3__Matcher__MatcherList__FieldMatcher_msg_init_ptr; extern const upb_MiniTable envoy__config__common__matcher__v3__Matcher__MatcherTree_msg_init; +extern const upb_MiniTable* envoy__config__common__matcher__v3__Matcher__MatcherTree_msg_init_ptr; extern const upb_MiniTable envoy__config__common__matcher__v3__Matcher__MatcherTree__MatchMap_msg_init; +extern const upb_MiniTable* envoy__config__common__matcher__v3__Matcher__MatcherTree__MatchMap_msg_init_ptr; extern const upb_MiniTable envoy__config__common__matcher__v3__Matcher__MatcherTree__MatchMap__MapEntry_msg_init; +extern const upb_MiniTable* envoy__config__common__matcher__v3__Matcher__MatcherTree__MatchMap__MapEntry_msg_init_ptr; extern const upb_MiniTable envoy__config__common__matcher__v3__MatchPredicate_msg_init; +extern const upb_MiniTable* envoy__config__common__matcher__v3__MatchPredicate_msg_init_ptr; extern const upb_MiniTable envoy__config__common__matcher__v3__MatchPredicate__MatchSet_msg_init; +extern const upb_MiniTable* envoy__config__common__matcher__v3__MatchPredicate__MatchSet_msg_init_ptr; extern const upb_MiniTable envoy__config__common__matcher__v3__HttpHeadersMatch_msg_init; +extern const upb_MiniTable* envoy__config__common__matcher__v3__HttpHeadersMatch_msg_init_ptr; extern const upb_MiniTable envoy__config__common__matcher__v3__HttpGenericBodyMatch_msg_init; +extern const upb_MiniTable* envoy__config__common__matcher__v3__HttpGenericBodyMatch_msg_init_ptr; extern const upb_MiniTable envoy__config__common__matcher__v3__HttpGenericBodyMatch__GenericTextMatch_msg_init; +extern const upb_MiniTable* envoy__config__common__matcher__v3__HttpGenericBodyMatch__GenericTextMatch_msg_init_ptr; extern const upb_MiniTableFile envoy_config_common_matcher_v3_matcher_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/address.upb.h b/src/core/ext/upb-gen/envoy/config/core/v3/address.upb.h index 0c40c126178..c22a2f0b816 100644 --- a/src/core/ext/upb-gen/envoy/config/core/v3/address.upb.h +++ b/src/core/ext/upb-gen/envoy/config/core/v3/address.upb.h @@ -3,7 +3,8 @@ * envoy/config/core/v3/address.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_CORE_V3_ADDRESS_PROTO_UPB_H_ #define ENVOY_CONFIG_CORE_V3_ADDRESS_PROTO_UPB_H_ @@ -397,6 +398,7 @@ UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_core_v3_TcpKee const struct google_protobuf_UInt32Value* default_val = NULL; const struct google_protobuf_UInt32Value* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -413,6 +415,7 @@ UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_core_v3_TcpKee const struct google_protobuf_UInt32Value* default_val = NULL; const struct google_protobuf_UInt32Value* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -429,6 +432,7 @@ UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_core_v3_TcpKee const struct google_protobuf_UInt32Value* default_val = NULL; const struct google_protobuf_UInt32Value* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -440,6 +444,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); 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) { @@ -452,6 +457,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); 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) { @@ -464,6 +470,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); 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) { @@ -519,6 +526,7 @@ UPB_INLINE const envoy_config_core_v3_SocketAddress* envoy_config_core_v3_ExtraS const envoy_config_core_v3_SocketAddress* default_val = NULL; const envoy_config_core_v3_SocketAddress* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__SocketAddress_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -535,6 +543,7 @@ UPB_INLINE const struct envoy_config_core_v3_SocketOptionsOverride* envoy_config const struct envoy_config_core_v3_SocketOptionsOverride* default_val = NULL; const struct envoy_config_core_v3_SocketOptionsOverride* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__SocketOptionsOverride_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -546,6 +555,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__SocketAddress_msg_init); 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) { @@ -558,6 +568,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__SocketOptionsOverride_msg_init); 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) { @@ -613,6 +624,7 @@ UPB_INLINE const envoy_config_core_v3_SocketAddress* envoy_config_core_v3_BindCo const envoy_config_core_v3_SocketAddress* default_val = NULL; const envoy_config_core_v3_SocketAddress* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__SocketAddress_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -629,6 +641,7 @@ UPB_INLINE const struct google_protobuf_BoolValue* envoy_config_core_v3_BindConf const struct google_protobuf_BoolValue* default_val = NULL; const struct google_protobuf_BoolValue* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -643,6 +656,7 @@ UPB_INLINE void envoy_config_core_v3_BindConfig_clear_socket_options(envoy_confi } UPB_INLINE const struct envoy_config_core_v3_SocketOption* const* envoy_config_core_v3_BindConfig_socket_options(const envoy_config_core_v3_BindConfig* msg, size_t* size) { const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__SocketOption_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -654,6 +668,7 @@ UPB_INLINE const struct envoy_config_core_v3_SocketOption* const* envoy_config_c } UPB_INLINE const upb_Array* _envoy_config_core_v3_BindConfig_socket_options_upb_array(const envoy_config_core_v3_BindConfig* msg, size_t* size) { const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__SocketOption_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -662,6 +677,7 @@ UPB_INLINE const upb_Array* _envoy_config_core_v3_BindConfig_socket_options_upb_ } UPB_INLINE upb_Array* _envoy_config_core_v3_BindConfig_socket_options_mutable_upb_array(envoy_config_core_v3_BindConfig* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__SocketOption_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -675,6 +691,7 @@ UPB_INLINE void envoy_config_core_v3_BindConfig_clear_additional_source_addresse } UPB_INLINE const envoy_config_core_v3_SocketAddress* const* envoy_config_core_v3_BindConfig_additional_source_addresses(const envoy_config_core_v3_BindConfig* msg, size_t* size) { const upb_MiniTableField field = {4, UPB_SIZE(24, 40), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__SocketAddress_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -686,6 +703,7 @@ UPB_INLINE const envoy_config_core_v3_SocketAddress* const* envoy_config_core_v3 } UPB_INLINE const upb_Array* _envoy_config_core_v3_BindConfig_additional_source_addresses_upb_array(const envoy_config_core_v3_BindConfig* msg, size_t* size) { const upb_MiniTableField field = {4, UPB_SIZE(24, 40), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__SocketAddress_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -694,6 +712,7 @@ UPB_INLINE const upb_Array* _envoy_config_core_v3_BindConfig_additional_source_a } UPB_INLINE upb_Array* _envoy_config_core_v3_BindConfig_additional_source_addresses_mutable_upb_array(envoy_config_core_v3_BindConfig* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {4, UPB_SIZE(24, 40), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__SocketAddress_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -707,6 +726,7 @@ UPB_INLINE void envoy_config_core_v3_BindConfig_clear_extra_source_addresses(env } UPB_INLINE const envoy_config_core_v3_ExtraSourceAddress* const* envoy_config_core_v3_BindConfig_extra_source_addresses(const envoy_config_core_v3_BindConfig* msg, size_t* size) { const upb_MiniTableField field = {5, UPB_SIZE(28, 48), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__ExtraSourceAddress_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -718,6 +738,7 @@ UPB_INLINE const envoy_config_core_v3_ExtraSourceAddress* const* envoy_config_co } UPB_INLINE const upb_Array* _envoy_config_core_v3_BindConfig_extra_source_addresses_upb_array(const envoy_config_core_v3_BindConfig* msg, size_t* size) { const upb_MiniTableField field = {5, UPB_SIZE(28, 48), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__ExtraSourceAddress_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -726,6 +747,7 @@ UPB_INLINE const upb_Array* _envoy_config_core_v3_BindConfig_extra_source_addres } UPB_INLINE upb_Array* _envoy_config_core_v3_BindConfig_extra_source_addresses_mutable_upb_array(envoy_config_core_v3_BindConfig* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {5, UPB_SIZE(28, 48), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__ExtraSourceAddress_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -741,6 +763,7 @@ UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_ const struct envoy_config_core_v3_TypedExtensionConfig* default_val = NULL; const struct envoy_config_core_v3_TypedExtensionConfig* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -752,6 +775,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__SocketAddress_msg_init); 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) { @@ -764,6 +788,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); 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) { @@ -776,6 +801,7 @@ UPB_INLINE struct google_protobuf_BoolValue* envoy_config_core_v3_BindConfig_mut } UPB_INLINE struct envoy_config_core_v3_SocketOption** envoy_config_core_v3_BindConfig_mutable_socket_options(envoy_config_core_v3_BindConfig* msg, size_t* size) { upb_MiniTableField field = {3, UPB_SIZE(20, 32), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__SocketOption_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -792,6 +818,7 @@ UPB_INLINE struct envoy_config_core_v3_SocketOption** envoy_config_core_v3_BindC } UPB_INLINE struct envoy_config_core_v3_SocketOption* envoy_config_core_v3_BindConfig_add_socket_options(envoy_config_core_v3_BindConfig* msg, upb_Arena* arena) { upb_MiniTableField field = {3, UPB_SIZE(20, 32), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__SocketOption_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -806,6 +833,7 @@ UPB_INLINE struct envoy_config_core_v3_SocketOption* envoy_config_core_v3_BindCo } UPB_INLINE envoy_config_core_v3_SocketAddress** envoy_config_core_v3_BindConfig_mutable_additional_source_addresses(envoy_config_core_v3_BindConfig* msg, size_t* size) { upb_MiniTableField field = {4, UPB_SIZE(24, 40), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__SocketAddress_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -822,6 +850,7 @@ UPB_INLINE envoy_config_core_v3_SocketAddress** envoy_config_core_v3_BindConfig_ } UPB_INLINE struct envoy_config_core_v3_SocketAddress* envoy_config_core_v3_BindConfig_add_additional_source_addresses(envoy_config_core_v3_BindConfig* msg, upb_Arena* arena) { upb_MiniTableField field = {4, UPB_SIZE(24, 40), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__SocketAddress_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -836,6 +865,7 @@ UPB_INLINE struct envoy_config_core_v3_SocketAddress* envoy_config_core_v3_BindC } UPB_INLINE envoy_config_core_v3_ExtraSourceAddress** envoy_config_core_v3_BindConfig_mutable_extra_source_addresses(envoy_config_core_v3_BindConfig* msg, size_t* size) { upb_MiniTableField field = {5, UPB_SIZE(28, 48), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__ExtraSourceAddress_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -852,6 +882,7 @@ UPB_INLINE envoy_config_core_v3_ExtraSourceAddress** envoy_config_core_v3_BindCo } UPB_INLINE struct envoy_config_core_v3_ExtraSourceAddress* envoy_config_core_v3_BindConfig_add_extra_source_addresses(envoy_config_core_v3_BindConfig* msg, upb_Arena* arena) { upb_MiniTableField field = {5, UPB_SIZE(28, 48), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__ExtraSourceAddress_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -866,6 +897,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); 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) { @@ -932,6 +964,7 @@ UPB_INLINE const envoy_config_core_v3_SocketAddress* envoy_config_core_v3_Addres const envoy_config_core_v3_SocketAddress* default_val = NULL; const envoy_config_core_v3_SocketAddress* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__SocketAddress_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -948,6 +981,7 @@ UPB_INLINE const envoy_config_core_v3_Pipe* envoy_config_core_v3_Address_pipe(co const envoy_config_core_v3_Pipe* default_val = NULL; const envoy_config_core_v3_Pipe* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Pipe_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -964,6 +998,7 @@ UPB_INLINE const envoy_config_core_v3_EnvoyInternalAddress* envoy_config_core_v3 const envoy_config_core_v3_EnvoyInternalAddress* default_val = NULL; const envoy_config_core_v3_EnvoyInternalAddress* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__EnvoyInternalAddress_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -975,6 +1010,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__SocketAddress_msg_init); 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) { @@ -987,6 +1023,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Pipe_msg_init); 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) { @@ -999,6 +1036,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__EnvoyInternalAddress_msg_init); 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) { @@ -1066,6 +1104,7 @@ UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_core_v3_CidrRa const struct google_protobuf_UInt32Value* default_val = NULL; const struct google_protobuf_UInt32Value* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1081,6 +1120,7 @@ UPB_INLINE void envoy_config_core_v3_CidrRange_set_address_prefix(envoy_config_c } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); 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) { diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/address.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/core/v3/address.upb_minitable.c index 339a591cde8..132a33c671a 100644 --- a/src/core/ext/upb-gen/envoy/config/core/v3/address.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/config/core/v3/address.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/config/core/v3/address.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -19,6 +20,7 @@ // Must be last. #include "upb/port/def.inc" +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); static const upb_MiniTableField envoy_config_core_v3_Pipe__fields[2] = { {1, UPB_SIZE(12, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, {2, 8, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, @@ -39,6 +41,7 @@ const upb_MiniTable envoy__config__core__v3__Pipe_msg_init = { }) }; +const upb_MiniTable* envoy__config__core__v3__Pipe_msg_init_ptr = &envoy__config__core__v3__Pipe_msg_init; static const upb_MiniTableField envoy_config_core_v3_EnvoyInternalAddress__fields[2] = { {1, UPB_SIZE(12, 16), -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, {2, UPB_SIZE(20, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, @@ -59,6 +62,7 @@ const upb_MiniTable envoy__config__core__v3__EnvoyInternalAddress_msg_init = { }) }; +const upb_MiniTable* envoy__config__core__v3__EnvoyInternalAddress_msg_init_ptr = &envoy__config__core__v3__EnvoyInternalAddress_msg_init; static const upb_MiniTableField envoy_config_core_v3_SocketAddress__fields[6] = { {1, 8, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, {2, UPB_SIZE(28, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, @@ -87,10 +91,11 @@ const upb_MiniTable envoy__config__core__v3__SocketAddress_msg_init = { }) }; -static const upb_MiniTableSub envoy_config_core_v3_TcpKeepalive_submsgs[3] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init}, +const upb_MiniTable* envoy__config__core__v3__SocketAddress_msg_init_ptr = &envoy__config__core__v3__SocketAddress_msg_init; +static const upb_MiniTableSubInternal envoy_config_core_v3_TcpKeepalive_submsgs[3] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_core_v3_TcpKeepalive__fields[3] = { @@ -108,9 +113,10 @@ const upb_MiniTable envoy__config__core__v3__TcpKeepalive_msg_init = { #endif }; -static const upb_MiniTableSub envoy_config_core_v3_ExtraSourceAddress_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__SocketAddress_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__SocketOptionsOverride_msg_init}, +const upb_MiniTable* envoy__config__core__v3__TcpKeepalive_msg_init_ptr = &envoy__config__core__v3__TcpKeepalive_msg_init; +static const upb_MiniTableSubInternal envoy_config_core_v3_ExtraSourceAddress_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__SocketAddress_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__SocketOptionsOverride_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_core_v3_ExtraSourceAddress__fields[2] = { @@ -127,13 +133,14 @@ const upb_MiniTable envoy__config__core__v3__ExtraSourceAddress_msg_init = { #endif }; -static const upb_MiniTableSub envoy_config_core_v3_BindConfig_submsgs[6] = { - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__SocketAddress_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__SocketOption_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__SocketAddress_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ExtraSourceAddress_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init}, +const upb_MiniTable* envoy__config__core__v3__ExtraSourceAddress_msg_init_ptr = &envoy__config__core__v3__ExtraSourceAddress_msg_init; +static const upb_MiniTableSubInternal envoy_config_core_v3_BindConfig_submsgs[6] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__SocketAddress_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__SocketOption_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__SocketAddress_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ExtraSourceAddress_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_core_v3_BindConfig__fields[6] = { @@ -164,10 +171,11 @@ const upb_MiniTable envoy__config__core__v3__BindConfig_msg_init = { }) }; -static const upb_MiniTableSub envoy_config_core_v3_Address_submsgs[3] = { - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__SocketAddress_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Pipe_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__EnvoyInternalAddress_msg_init}, +const upb_MiniTable* envoy__config__core__v3__BindConfig_msg_init_ptr = &envoy__config__core__v3__BindConfig_msg_init; +static const upb_MiniTableSubInternal envoy_config_core_v3_Address_submsgs[3] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__SocketAddress_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Pipe_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__EnvoyInternalAddress_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_core_v3_Address__fields[3] = { @@ -191,8 +199,9 @@ const upb_MiniTable envoy__config__core__v3__Address_msg_init = { }) }; -static const upb_MiniTableSub envoy_config_core_v3_CidrRange_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init}, +const upb_MiniTable* envoy__config__core__v3__Address_msg_init_ptr = &envoy__config__core__v3__Address_msg_init; +static const upb_MiniTableSubInternal envoy_config_core_v3_CidrRange_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_core_v3_CidrRange__fields[2] = { @@ -213,6 +222,7 @@ const upb_MiniTable envoy__config__core__v3__CidrRange_msg_init = { }) }; +const upb_MiniTable* envoy__config__core__v3__CidrRange_msg_init_ptr = &envoy__config__core__v3__CidrRange_msg_init; static const upb_MiniTable *messages_layout[8] = { &envoy__config__core__v3__Pipe_msg_init, &envoy__config__core__v3__EnvoyInternalAddress_msg_init, diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/address.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/core/v3/address.upb_minitable.h index b0ffba30e22..268dbaf0d4e 100644 --- a/src/core/ext/upb-gen/envoy/config/core/v3/address.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/config/core/v3/address.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/config/core/v3/address.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_CORE_V3_ADDRESS_PROTO_UPB_MINITABLE_H_ #define ENVOY_CONFIG_CORE_V3_ADDRESS_PROTO_UPB_MINITABLE_H_ @@ -18,13 +19,21 @@ extern "C" { #endif extern const upb_MiniTable envoy__config__core__v3__Pipe_msg_init; +extern const upb_MiniTable* envoy__config__core__v3__Pipe_msg_init_ptr; extern const upb_MiniTable envoy__config__core__v3__EnvoyInternalAddress_msg_init; +extern const upb_MiniTable* envoy__config__core__v3__EnvoyInternalAddress_msg_init_ptr; extern const upb_MiniTable envoy__config__core__v3__SocketAddress_msg_init; +extern const upb_MiniTable* envoy__config__core__v3__SocketAddress_msg_init_ptr; extern const upb_MiniTable envoy__config__core__v3__TcpKeepalive_msg_init; +extern const upb_MiniTable* envoy__config__core__v3__TcpKeepalive_msg_init_ptr; extern const upb_MiniTable envoy__config__core__v3__ExtraSourceAddress_msg_init; +extern const upb_MiniTable* envoy__config__core__v3__ExtraSourceAddress_msg_init_ptr; extern const upb_MiniTable envoy__config__core__v3__BindConfig_msg_init; +extern const upb_MiniTable* envoy__config__core__v3__BindConfig_msg_init_ptr; extern const upb_MiniTable envoy__config__core__v3__Address_msg_init; +extern const upb_MiniTable* envoy__config__core__v3__Address_msg_init_ptr; extern const upb_MiniTable envoy__config__core__v3__CidrRange_msg_init; +extern const upb_MiniTable* envoy__config__core__v3__CidrRange_msg_init_ptr; extern const upb_MiniTableFile envoy_config_core_v3_address_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/backoff.upb.h b/src/core/ext/upb-gen/envoy/config/core/v3/backoff.upb.h index 0fc5ece5108..067eff56a49 100644 --- a/src/core/ext/upb-gen/envoy/config/core/v3/backoff.upb.h +++ b/src/core/ext/upb-gen/envoy/config/core/v3/backoff.upb.h @@ -3,7 +3,8 @@ * envoy/config/core/v3/backoff.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_CORE_V3_BACKOFF_PROTO_UPB_H_ #define ENVOY_CONFIG_CORE_V3_BACKOFF_PROTO_UPB_H_ @@ -73,6 +74,7 @@ UPB_INLINE const struct google_protobuf_Duration* envoy_config_core_v3_BackoffSt 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -89,6 +91,7 @@ UPB_INLINE const struct google_protobuf_Duration* envoy_config_core_v3_BackoffSt const struct google_protobuf_Duration* default_val = NULL; const struct google_protobuf_Duration* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -100,6 +103,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { @@ -112,6 +116,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/backoff.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/core/v3/backoff.upb_minitable.c index 4805979eadf..75410131108 100644 --- a/src/core/ext/upb-gen/envoy/config/core/v3/backoff.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/config/core/v3/backoff.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/config/core/v3/backoff.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -16,9 +17,10 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub envoy_config_core_v3_BackoffStrategy_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal envoy_config_core_v3_BackoffStrategy_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_core_v3_BackoffStrategy__fields[2] = { @@ -35,6 +37,7 @@ const upb_MiniTable envoy__config__core__v3__BackoffStrategy_msg_init = { #endif }; +const upb_MiniTable* envoy__config__core__v3__BackoffStrategy_msg_init_ptr = &envoy__config__core__v3__BackoffStrategy_msg_init; static const upb_MiniTable *messages_layout[1] = { &envoy__config__core__v3__BackoffStrategy_msg_init, }; diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/backoff.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/core/v3/backoff.upb_minitable.h index 405ad98b76b..ab12e8dcc7b 100644 --- a/src/core/ext/upb-gen/envoy/config/core/v3/backoff.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/config/core/v3/backoff.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/config/core/v3/backoff.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_CORE_V3_BACKOFF_PROTO_UPB_MINITABLE_H_ #define ENVOY_CONFIG_CORE_V3_BACKOFF_PROTO_UPB_MINITABLE_H_ @@ -18,6 +19,7 @@ extern "C" { #endif extern const upb_MiniTable envoy__config__core__v3__BackoffStrategy_msg_init; +extern const upb_MiniTable* envoy__config__core__v3__BackoffStrategy_msg_init_ptr; extern const upb_MiniTableFile envoy_config_core_v3_backoff_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/base.upb.h b/src/core/ext/upb-gen/envoy/config/core/v3/base.upb.h index 0ea85ae0c47..c5ef155ddb7 100644 --- a/src/core/ext/upb-gen/envoy/config/core/v3/base.upb.h +++ b/src/core/ext/upb-gen/envoy/config/core/v3/base.upb.h @@ -3,7 +3,8 @@ * envoy/config/core/v3/base.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_CORE_V3_BASE_PROTO_UPB_H_ #define ENVOY_CONFIG_CORE_V3_BASE_PROTO_UPB_H_ @@ -245,6 +246,7 @@ UPB_INLINE const struct envoy_type_v3_SemanticVersion* envoy_config_core_v3_Buil const struct envoy_type_v3_SemanticVersion* default_val = NULL; const struct envoy_type_v3_SemanticVersion* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__v3__SemanticVersion_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -261,6 +263,7 @@ UPB_INLINE const struct google_protobuf_Struct* envoy_config_core_v3_BuildVersio const struct google_protobuf_Struct* default_val = NULL; const struct google_protobuf_Struct* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Struct_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -272,6 +275,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__v3__SemanticVersion_msg_init); 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) { @@ -284,6 +288,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Struct_msg_init); 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) { @@ -375,6 +380,7 @@ UPB_INLINE const envoy_config_core_v3_BuildVersion* envoy_config_core_v3_Extensi const envoy_config_core_v3_BuildVersion* default_val = NULL; const envoy_config_core_v3_BuildVersion* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__BuildVersion_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -442,6 +448,7 @@ UPB_INLINE void envoy_config_core_v3_Extension_set_type_descriptor(envoy_config_ } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__BuildVersion_msg_init); 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) { @@ -563,6 +570,7 @@ UPB_INLINE const struct google_protobuf_Struct* envoy_config_core_v3_Node_metada const struct google_protobuf_Struct* default_val = NULL; const struct google_protobuf_Struct* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Struct_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -579,6 +587,7 @@ UPB_INLINE const envoy_config_core_v3_Locality* envoy_config_core_v3_Node_locali const envoy_config_core_v3_Locality* default_val = NULL; const envoy_config_core_v3_Locality* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Locality_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -623,6 +632,7 @@ UPB_INLINE const envoy_config_core_v3_BuildVersion* envoy_config_core_v3_Node_us const envoy_config_core_v3_BuildVersion* default_val = NULL; const envoy_config_core_v3_BuildVersion* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__BuildVersion_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -637,6 +647,7 @@ UPB_INLINE void envoy_config_core_v3_Node_clear_extensions(envoy_config_core_v3_ } UPB_INLINE const envoy_config_core_v3_Extension* const* envoy_config_core_v3_Node_extensions(const envoy_config_core_v3_Node* msg, size_t* size) { const upb_MiniTableField field = {9, UPB_SIZE(24, 96), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Extension_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -648,6 +659,7 @@ UPB_INLINE const envoy_config_core_v3_Extension* const* envoy_config_core_v3_Nod } UPB_INLINE const upb_Array* _envoy_config_core_v3_Node_extensions_upb_array(const envoy_config_core_v3_Node* msg, size_t* size) { const upb_MiniTableField field = {9, UPB_SIZE(24, 96), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Extension_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -656,6 +668,7 @@ UPB_INLINE const upb_Array* _envoy_config_core_v3_Node_extensions_upb_array(cons } UPB_INLINE upb_Array* _envoy_config_core_v3_Node_extensions_mutable_upb_array(envoy_config_core_v3_Node* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {9, UPB_SIZE(24, 96), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Extension_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -701,6 +714,7 @@ UPB_INLINE void envoy_config_core_v3_Node_clear_listening_addresses(envoy_config } UPB_INLINE const struct envoy_config_core_v3_Address* const* envoy_config_core_v3_Node_listening_addresses(const envoy_config_core_v3_Node* msg, size_t* size) { const upb_MiniTableField field = {11, UPB_SIZE(32, 112), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Address_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -712,6 +726,7 @@ UPB_INLINE const struct envoy_config_core_v3_Address* const* envoy_config_core_v } UPB_INLINE const upb_Array* _envoy_config_core_v3_Node_listening_addresses_upb_array(const envoy_config_core_v3_Node* msg, size_t* size) { const upb_MiniTableField field = {11, UPB_SIZE(32, 112), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Address_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -720,6 +735,7 @@ UPB_INLINE const upb_Array* _envoy_config_core_v3_Node_listening_addresses_upb_a } UPB_INLINE upb_Array* _envoy_config_core_v3_Node_listening_addresses_mutable_upb_array(envoy_config_core_v3_Node* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {11, UPB_SIZE(32, 112), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Address_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -738,22 +754,30 @@ UPB_INLINE size_t envoy_config_core_v3_Node_dynamic_parameters_size(const envoy_ } UPB_INLINE bool envoy_config_core_v3_Node_dynamic_parameters_get(const envoy_config_core_v3_Node* msg, upb_StringView key, struct xds_core_v3_ContextParams** val) { const upb_MiniTableField field = {12, UPB_SIZE(36, 120), 0, 5, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Node__DynamicParametersEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__core__v3__ContextParams_msg_init); 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_core_v3_Node_DynamicParametersEntry* envoy_config_core_v3_Node_dynamic_parameters_next(const envoy_config_core_v3_Node* msg, size_t* iter) { const upb_MiniTableField field = {12, UPB_SIZE(36, 120), 0, 5, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Node__DynamicParametersEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__core__v3__ContextParams_msg_init); const upb_Map* map = upb_Message_GetMap(UPB_UPCAST(msg), &field); if (!map) return NULL; return (const envoy_config_core_v3_Node_DynamicParametersEntry*)_upb_map_next(map, iter); } UPB_INLINE const upb_Map* _envoy_config_core_v3_Node_dynamic_parameters_upb_map(envoy_config_core_v3_Node* msg) { const upb_MiniTableField field = {12, UPB_SIZE(36, 120), 0, 5, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Node__DynamicParametersEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__core__v3__ContextParams_msg_init); return upb_Message_GetMap(UPB_UPCAST(msg), &field); } UPB_INLINE upb_Map* _envoy_config_core_v3_Node_dynamic_parameters_mutable_upb_map(envoy_config_core_v3_Node* msg, upb_Arena* a) { const upb_MiniTableField field = {12, UPB_SIZE(36, 120), 0, 5, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Node__DynamicParametersEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__core__v3__ContextParams_msg_init); return _upb_Message_GetOrCreateMutableMap(UPB_UPCAST(msg), &field, 0, sizeof(struct xds_core_v3_ContextParams*), a); } @@ -767,6 +791,7 @@ UPB_INLINE void envoy_config_core_v3_Node_set_cluster(envoy_config_core_v3_Node } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Struct_msg_init); 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) { @@ -779,6 +804,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Locality_msg_init); 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) { @@ -799,6 +825,7 @@ UPB_INLINE void envoy_config_core_v3_Node_set_user_agent_version(envoy_config_co } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__BuildVersion_msg_init); 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) { @@ -811,6 +838,7 @@ UPB_INLINE struct envoy_config_core_v3_BuildVersion* envoy_config_core_v3_Node_m } UPB_INLINE envoy_config_core_v3_Extension** envoy_config_core_v3_Node_mutable_extensions(envoy_config_core_v3_Node* msg, size_t* size) { upb_MiniTableField field = {9, UPB_SIZE(24, 96), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Extension_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -827,6 +855,7 @@ UPB_INLINE envoy_config_core_v3_Extension** envoy_config_core_v3_Node_resize_ext } UPB_INLINE struct envoy_config_core_v3_Extension* envoy_config_core_v3_Node_add_extensions(envoy_config_core_v3_Node* msg, upb_Arena* arena) { upb_MiniTableField field = {9, UPB_SIZE(24, 96), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Extension_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -869,6 +898,7 @@ UPB_INLINE bool envoy_config_core_v3_Node_add_client_features(envoy_config_core_ } UPB_INLINE struct envoy_config_core_v3_Address** envoy_config_core_v3_Node_mutable_listening_addresses(envoy_config_core_v3_Node* msg, size_t* size) { upb_MiniTableField field = {11, UPB_SIZE(32, 112), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Address_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -885,6 +915,7 @@ UPB_INLINE struct envoy_config_core_v3_Address** envoy_config_core_v3_Node_resiz } UPB_INLINE struct envoy_config_core_v3_Address* envoy_config_core_v3_Node_add_listening_addresses(envoy_config_core_v3_Node* msg, upb_Arena* arena) { upb_MiniTableField field = {11, UPB_SIZE(32, 112), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Address_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -905,6 +936,8 @@ UPB_INLINE void envoy_config_core_v3_Node_dynamic_parameters_clear(envoy_config_ } UPB_INLINE bool envoy_config_core_v3_Node_dynamic_parameters_set(envoy_config_core_v3_Node* msg, upb_StringView key, struct xds_core_v3_ContextParams* val, upb_Arena* a) { const upb_MiniTableField field = {12, UPB_SIZE(36, 120), 0, 5, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Node__DynamicParametersEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__core__v3__ContextParams_msg_init); 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) != @@ -918,6 +951,8 @@ UPB_INLINE bool envoy_config_core_v3_Node_dynamic_parameters_delete(envoy_config } UPB_INLINE envoy_config_core_v3_Node_DynamicParametersEntry* envoy_config_core_v3_Node_dynamic_parameters_nextmutable(envoy_config_core_v3_Node* msg, size_t* iter) { const upb_MiniTableField field = {12, UPB_SIZE(36, 120), 0, 5, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Node__DynamicParametersEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__core__v3__ContextParams_msg_init); upb_Map* map = (upb_Map*)upb_Message_GetMap(UPB_UPCAST(msg), &field); if (!map) return NULL; return (envoy_config_core_v3_Node_DynamicParametersEntry*)_upb_map_next(map, iter); @@ -991,22 +1026,30 @@ UPB_INLINE size_t envoy_config_core_v3_Metadata_filter_metadata_size(const envoy } UPB_INLINE bool envoy_config_core_v3_Metadata_filter_metadata_get(const envoy_config_core_v3_Metadata* msg, upb_StringView key, struct google_protobuf_Struct** val) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Metadata__FilterMetadataEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Struct_msg_init); 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_core_v3_Metadata_FilterMetadataEntry* envoy_config_core_v3_Metadata_filter_metadata_next(const envoy_config_core_v3_Metadata* msg, size_t* iter) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Metadata__FilterMetadataEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Struct_msg_init); const upb_Map* map = upb_Message_GetMap(UPB_UPCAST(msg), &field); if (!map) return NULL; return (const envoy_config_core_v3_Metadata_FilterMetadataEntry*)_upb_map_next(map, iter); } UPB_INLINE const upb_Map* _envoy_config_core_v3_Metadata_filter_metadata_upb_map(envoy_config_core_v3_Metadata* msg) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Metadata__FilterMetadataEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Struct_msg_init); return upb_Message_GetMap(UPB_UPCAST(msg), &field); } UPB_INLINE upb_Map* _envoy_config_core_v3_Metadata_filter_metadata_mutable_upb_map(envoy_config_core_v3_Metadata* msg, upb_Arena* a) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Metadata__FilterMetadataEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Struct_msg_init); return _upb_Message_GetOrCreateMutableMap(UPB_UPCAST(msg), &field, 0, sizeof(struct google_protobuf_Struct*), a); } UPB_INLINE void envoy_config_core_v3_Metadata_clear_typed_filter_metadata(envoy_config_core_v3_Metadata* msg) { @@ -1020,22 +1063,30 @@ UPB_INLINE size_t envoy_config_core_v3_Metadata_typed_filter_metadata_size(const } UPB_INLINE bool envoy_config_core_v3_Metadata_typed_filter_metadata_get(const envoy_config_core_v3_Metadata* msg, upb_StringView key, struct google_protobuf_Any** val) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Metadata__TypedFilterMetadataEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); 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_core_v3_Metadata_TypedFilterMetadataEntry* envoy_config_core_v3_Metadata_typed_filter_metadata_next(const envoy_config_core_v3_Metadata* msg, size_t* iter) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Metadata__TypedFilterMetadataEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); const upb_Map* map = upb_Message_GetMap(UPB_UPCAST(msg), &field); if (!map) return NULL; return (const envoy_config_core_v3_Metadata_TypedFilterMetadataEntry*)_upb_map_next(map, iter); } UPB_INLINE const upb_Map* _envoy_config_core_v3_Metadata_typed_filter_metadata_upb_map(envoy_config_core_v3_Metadata* msg) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Metadata__TypedFilterMetadataEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); return upb_Message_GetMap(UPB_UPCAST(msg), &field); } UPB_INLINE upb_Map* _envoy_config_core_v3_Metadata_typed_filter_metadata_mutable_upb_map(envoy_config_core_v3_Metadata* msg, upb_Arena* a) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Metadata__TypedFilterMetadataEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); return _upb_Message_GetOrCreateMutableMap(UPB_UPCAST(msg), &field, 0, sizeof(struct google_protobuf_Any*), a); } @@ -1047,6 +1098,8 @@ UPB_INLINE void envoy_config_core_v3_Metadata_filter_metadata_clear(envoy_config } UPB_INLINE bool envoy_config_core_v3_Metadata_filter_metadata_set(envoy_config_core_v3_Metadata* msg, upb_StringView key, struct google_protobuf_Struct* val, upb_Arena* a) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Metadata__FilterMetadataEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Struct_msg_init); 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) != @@ -1060,6 +1113,8 @@ UPB_INLINE bool envoy_config_core_v3_Metadata_filter_metadata_delete(envoy_confi } UPB_INLINE envoy_config_core_v3_Metadata_FilterMetadataEntry* envoy_config_core_v3_Metadata_filter_metadata_nextmutable(envoy_config_core_v3_Metadata* msg, size_t* iter) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Metadata__FilterMetadataEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Struct_msg_init); upb_Map* map = (upb_Map*)upb_Message_GetMap(UPB_UPCAST(msg), &field); if (!map) return NULL; return (envoy_config_core_v3_Metadata_FilterMetadataEntry*)_upb_map_next(map, iter); @@ -1072,6 +1127,8 @@ UPB_INLINE void envoy_config_core_v3_Metadata_typed_filter_metadata_clear(envoy_ } UPB_INLINE bool envoy_config_core_v3_Metadata_typed_filter_metadata_set(envoy_config_core_v3_Metadata* msg, upb_StringView key, struct google_protobuf_Any* val, upb_Arena* a) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Metadata__TypedFilterMetadataEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); 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) != @@ -1085,6 +1142,8 @@ UPB_INLINE bool envoy_config_core_v3_Metadata_typed_filter_metadata_delete(envoy } UPB_INLINE envoy_config_core_v3_Metadata_TypedFilterMetadataEntry* envoy_config_core_v3_Metadata_typed_filter_metadata_nextmutable(envoy_config_core_v3_Metadata* msg, size_t* iter) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Metadata__TypedFilterMetadataEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); upb_Map* map = (upb_Map*)upb_Message_GetMap(UPB_UPCAST(msg), &field); if (!map) return NULL; return (envoy_config_core_v3_Metadata_TypedFilterMetadataEntry*)_upb_map_next(map, iter); @@ -1246,6 +1305,7 @@ UPB_INLINE const struct envoy_type_v3_Percent* envoy_config_core_v3_RuntimePerce const struct envoy_type_v3_Percent* default_val = NULL; const struct envoy_type_v3_Percent* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__v3__Percent_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1269,6 +1329,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__v3__Percent_msg_init); 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) { @@ -1398,6 +1459,7 @@ UPB_INLINE const struct google_protobuf_BoolValue* envoy_config_core_v3_RuntimeF const struct google_protobuf_BoolValue* default_val = NULL; const struct google_protobuf_BoolValue* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1421,6 +1483,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); 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) { @@ -1550,6 +1613,7 @@ UPB_INLINE const envoy_config_core_v3_KeyValue* envoy_config_core_v3_KeyValueApp 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__KeyValue_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1573,6 +1637,7 @@ UPB_INLINE int32_t envoy_config_core_v3_KeyValueAppend_action(const envoy_config 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__KeyValue_msg_init); 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) { @@ -1632,6 +1697,7 @@ UPB_INLINE const envoy_config_core_v3_KeyValueAppend* envoy_config_core_v3_KeyVa 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__KeyValueAppend_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1655,6 +1721,7 @@ UPB_INLINE upb_StringView envoy_config_core_v3_KeyValueMutation_remove(const env 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__KeyValueAppend_msg_init); 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) { @@ -1870,6 +1937,7 @@ UPB_INLINE const envoy_config_core_v3_HeaderValue* envoy_config_core_v3_HeaderVa const envoy_config_core_v3_HeaderValue* default_val = NULL; const envoy_config_core_v3_HeaderValue* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HeaderValue_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1886,6 +1954,7 @@ UPB_INLINE const struct google_protobuf_BoolValue* envoy_config_core_v3_HeaderVa const struct google_protobuf_BoolValue* default_val = NULL; const struct google_protobuf_BoolValue* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1921,6 +1990,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HeaderValue_msg_init); 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) { @@ -1933,6 +2003,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); 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) { @@ -1994,6 +2065,7 @@ UPB_INLINE void envoy_config_core_v3_HeaderMap_clear_headers(envoy_config_core_v } UPB_INLINE const envoy_config_core_v3_HeaderValue* const* envoy_config_core_v3_HeaderMap_headers(const envoy_config_core_v3_HeaderMap* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HeaderValue_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -2005,6 +2077,7 @@ UPB_INLINE const envoy_config_core_v3_HeaderValue* const* envoy_config_core_v3_H } UPB_INLINE const upb_Array* _envoy_config_core_v3_HeaderMap_headers_upb_array(const envoy_config_core_v3_HeaderMap* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HeaderValue_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -2013,6 +2086,7 @@ UPB_INLINE const upb_Array* _envoy_config_core_v3_HeaderMap_headers_upb_array(co } UPB_INLINE upb_Array* _envoy_config_core_v3_HeaderMap_headers_mutable_upb_array(envoy_config_core_v3_HeaderMap* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HeaderValue_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -2023,6 +2097,7 @@ UPB_INLINE upb_Array* _envoy_config_core_v3_HeaderMap_headers_mutable_upb_array( UPB_INLINE envoy_config_core_v3_HeaderValue** envoy_config_core_v3_HeaderMap_mutable_headers(envoy_config_core_v3_HeaderMap* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HeaderValue_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -2039,6 +2114,7 @@ UPB_INLINE envoy_config_core_v3_HeaderValue** envoy_config_core_v3_HeaderMap_res } UPB_INLINE struct envoy_config_core_v3_HeaderValue* envoy_config_core_v3_HeaderMap_add_headers(envoy_config_core_v3_HeaderMap* msg, upb_Arena* arena) { upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HeaderValue_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -2226,6 +2302,7 @@ UPB_INLINE const envoy_config_core_v3_WatchedDirectory* envoy_config_core_v3_Dat 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__WatchedDirectory_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -2253,6 +2330,7 @@ UPB_INLINE void envoy_config_core_v3_DataSource_set_environment_variable(envoy_c } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__WatchedDirectory_msg_init); 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) { @@ -2308,6 +2386,7 @@ UPB_INLINE const struct envoy_config_core_v3_BackoffStrategy* envoy_config_core_ const struct envoy_config_core_v3_BackoffStrategy* default_val = NULL; const struct envoy_config_core_v3_BackoffStrategy* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__BackoffStrategy_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -2324,6 +2403,7 @@ UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_core_v3_RetryP const struct google_protobuf_UInt32Value* default_val = NULL; const struct google_protobuf_UInt32Value* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -2352,6 +2432,7 @@ UPB_INLINE const envoy_config_core_v3_RetryPolicy_RetryPriority* envoy_config_co 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__RetryPolicy__RetryPriority_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -2366,6 +2447,7 @@ UPB_INLINE void envoy_config_core_v3_RetryPolicy_clear_retry_host_predicate(envo } 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__RetryPolicy__RetryHostPredicate_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -2377,6 +2459,7 @@ UPB_INLINE const envoy_config_core_v3_RetryPolicy_RetryHostPredicate* const* env } 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__RetryPolicy__RetryHostPredicate_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -2385,6 +2468,7 @@ UPB_INLINE const upb_Array* _envoy_config_core_v3_RetryPolicy_retry_host_predica } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__RetryPolicy__RetryHostPredicate_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -2407,6 +2491,7 @@ UPB_INLINE int64_t envoy_config_core_v3_RetryPolicy_host_selection_retry_max_att 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__BackoffStrategy_msg_init); 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) { @@ -2419,6 +2504,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); 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) { @@ -2435,6 +2521,7 @@ UPB_INLINE void envoy_config_core_v3_RetryPolicy_set_retry_on(envoy_config_core_ } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__RetryPolicy__RetryPriority_msg_init); 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) { @@ -2447,6 +2534,7 @@ UPB_INLINE struct envoy_config_core_v3_RetryPolicy_RetryPriority* envoy_config_c } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__RetryPolicy__RetryHostPredicate_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -2463,6 +2551,7 @@ UPB_INLINE envoy_config_core_v3_RetryPolicy_RetryHostPredicate** envoy_config_co } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__RetryPolicy__RetryHostPredicate_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -2545,6 +2634,7 @@ UPB_INLINE const struct google_protobuf_Any* envoy_config_core_v3_RetryPolicy_Re 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -2560,6 +2650,7 @@ UPB_INLINE void envoy_config_core_v3_RetryPolicy_RetryPriority_set_name(envoy_co } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); 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) { @@ -2636,6 +2727,7 @@ UPB_INLINE const struct google_protobuf_Any* envoy_config_core_v3_RetryPolicy_Re 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -2651,6 +2743,7 @@ UPB_INLINE void envoy_config_core_v3_RetryPolicy_RetryHostPredicate_set_name(env } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); 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) { @@ -2706,6 +2799,7 @@ UPB_INLINE const struct envoy_config_core_v3_HttpUri* envoy_config_core_v3_Remot 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HttpUri_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -2734,6 +2828,7 @@ UPB_INLINE const envoy_config_core_v3_RetryPolicy* envoy_config_core_v3_RemoteDa const envoy_config_core_v3_RetryPolicy* default_val = NULL; const envoy_config_core_v3_RetryPolicy* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__RetryPolicy_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -2745,6 +2840,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HttpUri_msg_init); 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) { @@ -2761,6 +2857,7 @@ UPB_INLINE void envoy_config_core_v3_RemoteDataSource_set_sha256(envoy_config_co } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__RetryPolicy_msg_init); 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) { @@ -2826,6 +2923,7 @@ UPB_INLINE const envoy_config_core_v3_DataSource* envoy_config_core_v3_AsyncData const envoy_config_core_v3_DataSource* default_val = NULL; const envoy_config_core_v3_DataSource* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__DataSource_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -2842,6 +2940,7 @@ UPB_INLINE const envoy_config_core_v3_RemoteDataSource* envoy_config_core_v3_Asy const envoy_config_core_v3_RemoteDataSource* default_val = NULL; const envoy_config_core_v3_RemoteDataSource* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__RemoteDataSource_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -2853,6 +2952,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__DataSource_msg_init); 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) { @@ -2865,6 +2965,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__RemoteDataSource_msg_init); 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) { @@ -2941,6 +3042,7 @@ UPB_INLINE const struct google_protobuf_Any* envoy_config_core_v3_TransportSocke const struct google_protobuf_Any* default_val = NULL; const struct google_protobuf_Any* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -2956,6 +3058,7 @@ UPB_INLINE void envoy_config_core_v3_TransportSocket_set_name(envoy_config_core_ } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); 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) { @@ -3011,6 +3114,7 @@ UPB_INLINE const struct envoy_type_v3_FractionalPercent* envoy_config_core_v3_Ru const struct envoy_type_v3_FractionalPercent* default_val = NULL; const struct envoy_type_v3_FractionalPercent* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__v3__FractionalPercent_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -3034,6 +3138,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__v3__FractionalPercent_msg_init); 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) { diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/base.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/core/v3/base.upb_minitable.c index 5a71016b20a..cfd0274e7d4 100644 --- a/src/core/ext/upb-gen/envoy/config/core/v3/base.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/config/core/v3/base.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/config/core/v3/base.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -26,6 +27,7 @@ // Must be last. #include "upb/port/def.inc" +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); static const upb_MiniTableField envoy_config_core_v3_Locality__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)}, @@ -47,9 +49,10 @@ const upb_MiniTable envoy__config__core__v3__Locality_msg_init = { }) }; -static const upb_MiniTableSub envoy_config_core_v3_BuildVersion_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &envoy__type__v3__SemanticVersion_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Struct_msg_init}, +const upb_MiniTable* envoy__config__core__v3__Locality_msg_init_ptr = &envoy__config__core__v3__Locality_msg_init; +static const upb_MiniTableSubInternal envoy_config_core_v3_BuildVersion_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &envoy__type__v3__SemanticVersion_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Struct_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_core_v3_BuildVersion__fields[2] = { @@ -66,8 +69,9 @@ const upb_MiniTable envoy__config__core__v3__BuildVersion_msg_init = { #endif }; -static const upb_MiniTableSub envoy_config_core_v3_Extension_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__BuildVersion_msg_init}, +const upb_MiniTable* envoy__config__core__v3__BuildVersion_msg_init_ptr = &envoy__config__core__v3__BuildVersion_msg_init; +static const upb_MiniTableSubInternal envoy_config_core_v3_Extension_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__BuildVersion_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_core_v3_Extension__fields[6] = { @@ -98,13 +102,14 @@ const upb_MiniTable envoy__config__core__v3__Extension_msg_init = { }) }; -static const upb_MiniTableSub envoy_config_core_v3_Node_submsgs[6] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__Struct_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Locality_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__BuildVersion_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Extension_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Address_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Node__DynamicParametersEntry_msg_init}, +const upb_MiniTable* envoy__config__core__v3__Extension_msg_init_ptr = &envoy__config__core__v3__Extension_msg_init; +static const upb_MiniTableSubInternal envoy_config_core_v3_Node_submsgs[6] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Struct_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Locality_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__BuildVersion_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Extension_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Address_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Node__DynamicParametersEntry_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_core_v3_Node__fields[11] = { @@ -148,8 +153,9 @@ const upb_MiniTable envoy__config__core__v3__Node_msg_init = { }) }; -static const upb_MiniTableSub envoy_config_core_v3_Node_DynamicParametersEntry_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &xds__core__v3__ContextParams_msg_init}, +const upb_MiniTable* envoy__config__core__v3__Node_msg_init_ptr = &envoy__config__core__v3__Node_msg_init; +static const upb_MiniTableSubInternal envoy_config_core_v3_Node_DynamicParametersEntry_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &xds__core__v3__ContextParams_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_core_v3_Node_DynamicParametersEntry__fields[2] = { @@ -170,9 +176,10 @@ const upb_MiniTable envoy__config__core__v3__Node__DynamicParametersEntry_msg_in }) }; -static const upb_MiniTableSub envoy_config_core_v3_Metadata_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Metadata__FilterMetadataEntry_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Metadata__TypedFilterMetadataEntry_msg_init}, +const upb_MiniTable* envoy__config__core__v3__Node__DynamicParametersEntry_msg_init_ptr = &envoy__config__core__v3__Node__DynamicParametersEntry_msg_init; +static const upb_MiniTableSubInternal envoy_config_core_v3_Metadata_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Metadata__FilterMetadataEntry_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Metadata__TypedFilterMetadataEntry_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_core_v3_Metadata__fields[2] = { @@ -189,8 +196,9 @@ const upb_MiniTable envoy__config__core__v3__Metadata_msg_init = { #endif }; -static const upb_MiniTableSub envoy_config_core_v3_Metadata_FilterMetadataEntry_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__Struct_msg_init}, +const upb_MiniTable* envoy__config__core__v3__Metadata_msg_init_ptr = &envoy__config__core__v3__Metadata_msg_init; +static const upb_MiniTableSubInternal envoy_config_core_v3_Metadata_FilterMetadataEntry_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Struct_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_core_v3_Metadata_FilterMetadataEntry__fields[2] = { @@ -211,8 +219,9 @@ const upb_MiniTable envoy__config__core__v3__Metadata__FilterMetadataEntry_msg_i }) }; -static const upb_MiniTableSub envoy_config_core_v3_Metadata_TypedFilterMetadataEntry_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init}, +const upb_MiniTable* envoy__config__core__v3__Metadata__FilterMetadataEntry_msg_init_ptr = &envoy__config__core__v3__Metadata__FilterMetadataEntry_msg_init; +static const upb_MiniTableSubInternal envoy_config_core_v3_Metadata_TypedFilterMetadataEntry_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_core_v3_Metadata_TypedFilterMetadataEntry__fields[2] = { @@ -233,6 +242,7 @@ const upb_MiniTable envoy__config__core__v3__Metadata__TypedFilterMetadataEntry_ }) }; +const upb_MiniTable* envoy__config__core__v3__Metadata__TypedFilterMetadataEntry_msg_init_ptr = &envoy__config__core__v3__Metadata__TypedFilterMetadataEntry_msg_init; static const upb_MiniTableField envoy_config_core_v3_RuntimeUInt32__fields[2] = { {2, 8, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, {3, UPB_SIZE(12, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, @@ -253,8 +263,9 @@ const upb_MiniTable envoy__config__core__v3__RuntimeUInt32_msg_init = { }) }; -static const upb_MiniTableSub envoy_config_core_v3_RuntimePercent_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__type__v3__Percent_msg_init}, +const upb_MiniTable* envoy__config__core__v3__RuntimeUInt32_msg_init_ptr = &envoy__config__core__v3__RuntimeUInt32_msg_init; +static const upb_MiniTableSubInternal envoy_config_core_v3_RuntimePercent_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__type__v3__Percent_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_core_v3_RuntimePercent__fields[2] = { @@ -277,6 +288,7 @@ const upb_MiniTable envoy__config__core__v3__RuntimePercent_msg_init = { }) }; +const upb_MiniTable* envoy__config__core__v3__RuntimePercent_msg_init_ptr = &envoy__config__core__v3__RuntimePercent_msg_init; static const upb_MiniTableField envoy_config_core_v3_RuntimeDouble__fields[2] = { {1, 8, 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, {2, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, @@ -297,8 +309,9 @@ const upb_MiniTable envoy__config__core__v3__RuntimeDouble_msg_init = { }) }; -static const upb_MiniTableSub envoy_config_core_v3_RuntimeFeatureFlag_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init}, +const upb_MiniTable* envoy__config__core__v3__RuntimeDouble_msg_init_ptr = &envoy__config__core__v3__RuntimeDouble_msg_init; +static const upb_MiniTableSubInternal envoy_config_core_v3_RuntimeFeatureFlag_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_core_v3_RuntimeFeatureFlag__fields[2] = { @@ -321,6 +334,7 @@ const upb_MiniTable envoy__config__core__v3__RuntimeFeatureFlag_msg_init = { }) }; +const upb_MiniTable* envoy__config__core__v3__RuntimeFeatureFlag_msg_init_ptr = &envoy__config__core__v3__RuntimeFeatureFlag_msg_init; 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)}, @@ -341,8 +355,9 @@ const upb_MiniTable envoy__config__core__v3__KeyValue_msg_init = { }) }; -static const upb_MiniTableSub envoy_config_core_v3_KeyValueAppend_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__KeyValue_msg_init}, +const upb_MiniTable* envoy__config__core__v3__KeyValue_msg_init_ptr = &envoy__config__core__v3__KeyValue_msg_init; +static const upb_MiniTableSubInternal envoy_config_core_v3_KeyValueAppend_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__KeyValue_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_core_v3_KeyValueAppend__fields[2] = { @@ -365,8 +380,9 @@ const upb_MiniTable envoy__config__core__v3__KeyValueAppend_msg_init = { }) }; -static const upb_MiniTableSub envoy_config_core_v3_KeyValueMutation_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__KeyValueAppend_msg_init}, +const upb_MiniTable* envoy__config__core__v3__KeyValueAppend_msg_init_ptr = &envoy__config__core__v3__KeyValueAppend_msg_init; +static const upb_MiniTableSubInternal envoy_config_core_v3_KeyValueMutation_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__KeyValueAppend_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_core_v3_KeyValueMutation__fields[2] = { @@ -389,6 +405,7 @@ const upb_MiniTable envoy__config__core__v3__KeyValueMutation_msg_init = { }) }; +const upb_MiniTable* envoy__config__core__v3__KeyValueMutation_msg_init_ptr = &envoy__config__core__v3__KeyValueMutation_msg_init; static const upb_MiniTableField envoy_config_core_v3_QueryParameter__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)}, @@ -409,6 +426,7 @@ const upb_MiniTable envoy__config__core__v3__QueryParameter_msg_init = { }) }; +const upb_MiniTable* envoy__config__core__v3__QueryParameter_msg_init_ptr = &envoy__config__core__v3__QueryParameter_msg_init; static const upb_MiniTableField envoy_config_core_v3_HeaderValue__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)}, @@ -430,9 +448,10 @@ const upb_MiniTable envoy__config__core__v3__HeaderValue_msg_init = { }) }; -static const upb_MiniTableSub envoy_config_core_v3_HeaderValueOption_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HeaderValue_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init}, +const upb_MiniTable* envoy__config__core__v3__HeaderValue_msg_init_ptr = &envoy__config__core__v3__HeaderValue_msg_init; +static const upb_MiniTableSubInternal envoy_config_core_v3_HeaderValueOption_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HeaderValue_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_core_v3_HeaderValueOption__fields[4] = { @@ -461,8 +480,9 @@ const upb_MiniTable envoy__config__core__v3__HeaderValueOption_msg_init = { }) }; -static const upb_MiniTableSub envoy_config_core_v3_HeaderMap_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HeaderValue_msg_init}, +const upb_MiniTable* envoy__config__core__v3__HeaderValueOption_msg_init_ptr = &envoy__config__core__v3__HeaderValueOption_msg_init; +static const upb_MiniTableSubInternal envoy_config_core_v3_HeaderMap_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HeaderValue_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_core_v3_HeaderMap__fields[1] = { @@ -482,6 +502,7 @@ const upb_MiniTable envoy__config__core__v3__HeaderMap_msg_init = { }) }; +const upb_MiniTable* envoy__config__core__v3__HeaderMap_msg_init_ptr = &envoy__config__core__v3__HeaderMap_msg_init; static const upb_MiniTableField envoy_config_core_v3_WatchedDirectory__fields[1] = { {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, }; @@ -499,8 +520,9 @@ const upb_MiniTable envoy__config__core__v3__WatchedDirectory_msg_init = { }) }; -static const upb_MiniTableSub envoy_config_core_v3_DataSource_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__WatchedDirectory_msg_init}, +const upb_MiniTable* envoy__config__core__v3__WatchedDirectory_msg_init_ptr = &envoy__config__core__v3__WatchedDirectory_msg_init; +static const upb_MiniTableSubInternal envoy_config_core_v3_DataSource_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__WatchedDirectory_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_core_v3_DataSource__fields[5] = { @@ -530,11 +552,12 @@ const upb_MiniTable envoy__config__core__v3__DataSource_msg_init = { }) }; -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}, +const upb_MiniTable* envoy__config__core__v3__DataSource_msg_init_ptr = &envoy__config__core__v3__DataSource_msg_init; +static const upb_MiniTableSubInternal envoy_config_core_v3_RetryPolicy_submsgs[4] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__BackoffStrategy_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__RetryPolicy__RetryPriority_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__RetryPolicy__RetryHostPredicate_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_core_v3_RetryPolicy__fields[6] = { @@ -565,8 +588,9 @@ const upb_MiniTable envoy__config__core__v3__RetryPolicy_msg_init = { }) }; -static const upb_MiniTableSub envoy_config_core_v3_RetryPolicy_RetryPriority_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init}, +const upb_MiniTable* envoy__config__core__v3__RetryPolicy_msg_init_ptr = &envoy__config__core__v3__RetryPolicy_msg_init; +static const upb_MiniTableSubInternal envoy_config_core_v3_RetryPolicy_RetryPriority_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_core_v3_RetryPolicy_RetryPriority__fields[2] = { @@ -589,8 +613,9 @@ const upb_MiniTable envoy__config__core__v3__RetryPolicy__RetryPriority_msg_init }) }; -static const upb_MiniTableSub envoy_config_core_v3_RetryPolicy_RetryHostPredicate_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init}, +const upb_MiniTable* envoy__config__core__v3__RetryPolicy__RetryPriority_msg_init_ptr = &envoy__config__core__v3__RetryPolicy__RetryPriority_msg_init; +static const upb_MiniTableSubInternal envoy_config_core_v3_RetryPolicy_RetryHostPredicate_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_core_v3_RetryPolicy_RetryHostPredicate__fields[2] = { @@ -613,9 +638,10 @@ const upb_MiniTable envoy__config__core__v3__RetryPolicy__RetryHostPredicate_msg }) }; -static const upb_MiniTableSub envoy_config_core_v3_RemoteDataSource_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HttpUri_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__RetryPolicy_msg_init}, +const upb_MiniTable* envoy__config__core__v3__RetryPolicy__RetryHostPredicate_msg_init_ptr = &envoy__config__core__v3__RetryPolicy__RetryHostPredicate_msg_init; +static const upb_MiniTableSubInternal envoy_config_core_v3_RemoteDataSource_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HttpUri_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__RetryPolicy_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_core_v3_RemoteDataSource__fields[3] = { @@ -639,9 +665,10 @@ const upb_MiniTable envoy__config__core__v3__RemoteDataSource_msg_init = { }) }; -static const upb_MiniTableSub envoy_config_core_v3_AsyncDataSource_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__DataSource_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__RemoteDataSource_msg_init}, +const upb_MiniTable* envoy__config__core__v3__RemoteDataSource_msg_init_ptr = &envoy__config__core__v3__RemoteDataSource_msg_init; +static const upb_MiniTableSubInternal envoy_config_core_v3_AsyncDataSource_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__DataSource_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__RemoteDataSource_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_core_v3_AsyncDataSource__fields[2] = { @@ -664,8 +691,9 @@ const upb_MiniTable envoy__config__core__v3__AsyncDataSource_msg_init = { }) }; -static const upb_MiniTableSub envoy_config_core_v3_TransportSocket_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init}, +const upb_MiniTable* envoy__config__core__v3__AsyncDataSource_msg_init_ptr = &envoy__config__core__v3__AsyncDataSource_msg_init; +static const upb_MiniTableSubInternal envoy_config_core_v3_TransportSocket_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_core_v3_TransportSocket__fields[2] = { @@ -688,8 +716,9 @@ const upb_MiniTable envoy__config__core__v3__TransportSocket_msg_init = { }) }; -static const upb_MiniTableSub envoy_config_core_v3_RuntimeFractionalPercent_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__type__v3__FractionalPercent_msg_init}, +const upb_MiniTable* envoy__config__core__v3__TransportSocket_msg_init_ptr = &envoy__config__core__v3__TransportSocket_msg_init; +static const upb_MiniTableSubInternal envoy_config_core_v3_RuntimeFractionalPercent_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__type__v3__FractionalPercent_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_core_v3_RuntimeFractionalPercent__fields[2] = { @@ -712,6 +741,7 @@ const upb_MiniTable envoy__config__core__v3__RuntimeFractionalPercent_msg_init = }) }; +const upb_MiniTable* envoy__config__core__v3__RuntimeFractionalPercent_msg_init_ptr = &envoy__config__core__v3__RuntimeFractionalPercent_msg_init; static const upb_MiniTableField envoy_config_core_v3_ControlPlane__fields[1] = { {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, }; @@ -729,6 +759,7 @@ const upb_MiniTable envoy__config__core__v3__ControlPlane_msg_init = { }) }; +const upb_MiniTable* envoy__config__core__v3__ControlPlane_msg_init_ptr = &envoy__config__core__v3__ControlPlane_msg_init; static const upb_MiniTable *messages_layout[29] = { &envoy__config__core__v3__Locality_msg_init, &envoy__config__core__v3__BuildVersion_msg_init, diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/base.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/core/v3/base.upb_minitable.h index aa613f8aa03..351591b593c 100644 --- a/src/core/ext/upb-gen/envoy/config/core/v3/base.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/config/core/v3/base.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/config/core/v3/base.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_CORE_V3_BASE_PROTO_UPB_MINITABLE_H_ #define ENVOY_CONFIG_CORE_V3_BASE_PROTO_UPB_MINITABLE_H_ @@ -18,34 +19,63 @@ extern "C" { #endif extern const upb_MiniTable envoy__config__core__v3__Locality_msg_init; +extern const upb_MiniTable* envoy__config__core__v3__Locality_msg_init_ptr; extern const upb_MiniTable envoy__config__core__v3__BuildVersion_msg_init; +extern const upb_MiniTable* envoy__config__core__v3__BuildVersion_msg_init_ptr; extern const upb_MiniTable envoy__config__core__v3__Extension_msg_init; +extern const upb_MiniTable* envoy__config__core__v3__Extension_msg_init_ptr; extern const upb_MiniTable envoy__config__core__v3__Node_msg_init; +extern const upb_MiniTable* envoy__config__core__v3__Node_msg_init_ptr; extern const upb_MiniTable envoy__config__core__v3__Node__DynamicParametersEntry_msg_init; +extern const upb_MiniTable* envoy__config__core__v3__Node__DynamicParametersEntry_msg_init_ptr; extern const upb_MiniTable envoy__config__core__v3__Metadata_msg_init; +extern const upb_MiniTable* envoy__config__core__v3__Metadata_msg_init_ptr; extern const upb_MiniTable envoy__config__core__v3__Metadata__FilterMetadataEntry_msg_init; +extern const upb_MiniTable* envoy__config__core__v3__Metadata__FilterMetadataEntry_msg_init_ptr; extern const upb_MiniTable envoy__config__core__v3__Metadata__TypedFilterMetadataEntry_msg_init; +extern const upb_MiniTable* envoy__config__core__v3__Metadata__TypedFilterMetadataEntry_msg_init_ptr; extern const upb_MiniTable envoy__config__core__v3__RuntimeUInt32_msg_init; +extern const upb_MiniTable* envoy__config__core__v3__RuntimeUInt32_msg_init_ptr; extern const upb_MiniTable envoy__config__core__v3__RuntimePercent_msg_init; +extern const upb_MiniTable* envoy__config__core__v3__RuntimePercent_msg_init_ptr; extern const upb_MiniTable envoy__config__core__v3__RuntimeDouble_msg_init; +extern const upb_MiniTable* envoy__config__core__v3__RuntimeDouble_msg_init_ptr; extern const upb_MiniTable envoy__config__core__v3__RuntimeFeatureFlag_msg_init; +extern const upb_MiniTable* envoy__config__core__v3__RuntimeFeatureFlag_msg_init_ptr; extern const upb_MiniTable envoy__config__core__v3__KeyValue_msg_init; +extern const upb_MiniTable* envoy__config__core__v3__KeyValue_msg_init_ptr; extern const upb_MiniTable envoy__config__core__v3__KeyValueAppend_msg_init; +extern const upb_MiniTable* envoy__config__core__v3__KeyValueAppend_msg_init_ptr; extern const upb_MiniTable envoy__config__core__v3__KeyValueMutation_msg_init; +extern const upb_MiniTable* envoy__config__core__v3__KeyValueMutation_msg_init_ptr; extern const upb_MiniTable envoy__config__core__v3__QueryParameter_msg_init; +extern const upb_MiniTable* envoy__config__core__v3__QueryParameter_msg_init_ptr; extern const upb_MiniTable envoy__config__core__v3__HeaderValue_msg_init; +extern const upb_MiniTable* envoy__config__core__v3__HeaderValue_msg_init_ptr; extern const upb_MiniTable envoy__config__core__v3__HeaderValueOption_msg_init; +extern const upb_MiniTable* envoy__config__core__v3__HeaderValueOption_msg_init_ptr; extern const upb_MiniTable envoy__config__core__v3__HeaderMap_msg_init; +extern const upb_MiniTable* envoy__config__core__v3__HeaderMap_msg_init_ptr; extern const upb_MiniTable envoy__config__core__v3__WatchedDirectory_msg_init; +extern const upb_MiniTable* envoy__config__core__v3__WatchedDirectory_msg_init_ptr; extern const upb_MiniTable envoy__config__core__v3__DataSource_msg_init; +extern const upb_MiniTable* envoy__config__core__v3__DataSource_msg_init_ptr; extern const upb_MiniTable envoy__config__core__v3__RetryPolicy_msg_init; +extern const upb_MiniTable* envoy__config__core__v3__RetryPolicy_msg_init_ptr; extern const upb_MiniTable envoy__config__core__v3__RetryPolicy__RetryPriority_msg_init; +extern const upb_MiniTable* envoy__config__core__v3__RetryPolicy__RetryPriority_msg_init_ptr; extern const upb_MiniTable envoy__config__core__v3__RetryPolicy__RetryHostPredicate_msg_init; +extern const upb_MiniTable* envoy__config__core__v3__RetryPolicy__RetryHostPredicate_msg_init_ptr; extern const upb_MiniTable envoy__config__core__v3__RemoteDataSource_msg_init; +extern const upb_MiniTable* envoy__config__core__v3__RemoteDataSource_msg_init_ptr; extern const upb_MiniTable envoy__config__core__v3__AsyncDataSource_msg_init; +extern const upb_MiniTable* envoy__config__core__v3__AsyncDataSource_msg_init_ptr; extern const upb_MiniTable envoy__config__core__v3__TransportSocket_msg_init; +extern const upb_MiniTable* envoy__config__core__v3__TransportSocket_msg_init_ptr; extern const upb_MiniTable envoy__config__core__v3__RuntimeFractionalPercent_msg_init; +extern const upb_MiniTable* envoy__config__core__v3__RuntimeFractionalPercent_msg_init_ptr; extern const upb_MiniTable envoy__config__core__v3__ControlPlane_msg_init; +extern const upb_MiniTable* envoy__config__core__v3__ControlPlane_msg_init_ptr; extern const upb_MiniTableFile envoy_config_core_v3_base_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/config_source.upb.h b/src/core/ext/upb-gen/envoy/config/core/v3/config_source.upb.h index 4b5f4faa0a2..3aff493e6d7 100644 --- a/src/core/ext/upb-gen/envoy/config/core/v3/config_source.upb.h +++ b/src/core/ext/upb-gen/envoy/config/core/v3/config_source.upb.h @@ -3,7 +3,8 @@ * envoy/config/core/v3/config_source.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_CORE_V3_CONFIG_SOURCE_PROTO_UPB_H_ #define ENVOY_CONFIG_CORE_V3_CONFIG_SOURCE_PROTO_UPB_H_ @@ -152,6 +153,7 @@ UPB_INLINE const struct google_protobuf_Duration* envoy_config_core_v3_ApiConfig const struct google_protobuf_Duration* default_val = NULL; const struct google_protobuf_Duration* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -166,6 +168,7 @@ UPB_INLINE void envoy_config_core_v3_ApiConfigSource_clear_grpc_services(envoy_c } UPB_INLINE const struct envoy_config_core_v3_GrpcService* const* envoy_config_core_v3_ApiConfigSource_grpc_services(const envoy_config_core_v3_ApiConfigSource* msg, size_t* size) { const upb_MiniTableField field = {4, UPB_SIZE(24, 40), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__GrpcService_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -177,6 +180,7 @@ UPB_INLINE const struct envoy_config_core_v3_GrpcService* const* envoy_config_co } UPB_INLINE const upb_Array* _envoy_config_core_v3_ApiConfigSource_grpc_services_upb_array(const envoy_config_core_v3_ApiConfigSource* msg, size_t* size) { const upb_MiniTableField field = {4, UPB_SIZE(24, 40), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__GrpcService_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -185,6 +189,7 @@ UPB_INLINE const upb_Array* _envoy_config_core_v3_ApiConfigSource_grpc_services_ } UPB_INLINE upb_Array* _envoy_config_core_v3_ApiConfigSource_grpc_services_mutable_upb_array(envoy_config_core_v3_ApiConfigSource* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {4, UPB_SIZE(24, 40), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__GrpcService_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -200,6 +205,7 @@ UPB_INLINE const struct google_protobuf_Duration* envoy_config_core_v3_ApiConfig const struct google_protobuf_Duration* default_val = NULL; const struct google_protobuf_Duration* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -216,6 +222,7 @@ UPB_INLINE const envoy_config_core_v3_RateLimitSettings* envoy_config_core_v3_Ap const envoy_config_core_v3_RateLimitSettings* default_val = NULL; const envoy_config_core_v3_RateLimitSettings* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__RateLimitSettings_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -254,6 +261,7 @@ UPB_INLINE void envoy_config_core_v3_ApiConfigSource_clear_config_validators(env } UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* const* envoy_config_core_v3_ApiConfigSource_config_validators(const envoy_config_core_v3_ApiConfigSource* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -265,6 +273,7 @@ UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* const* envoy_ } UPB_INLINE const upb_Array* _envoy_config_core_v3_ApiConfigSource_config_validators_upb_array(const envoy_config_core_v3_ApiConfigSource* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -273,6 +282,7 @@ UPB_INLINE const upb_Array* _envoy_config_core_v3_ApiConfigSource_config_validat } UPB_INLINE upb_Array* _envoy_config_core_v3_ApiConfigSource_config_validators_mutable_upb_array(envoy_config_core_v3_ApiConfigSource* msg, size_t* size, upb_Arena* arena) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -315,6 +325,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { @@ -327,6 +338,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_ApiConfigSource } UPB_INLINE struct envoy_config_core_v3_GrpcService** envoy_config_core_v3_ApiConfigSource_mutable_grpc_services(envoy_config_core_v3_ApiConfigSource* msg, size_t* size) { upb_MiniTableField field = {4, UPB_SIZE(24, 40), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__GrpcService_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -343,6 +355,7 @@ UPB_INLINE struct envoy_config_core_v3_GrpcService** envoy_config_core_v3_ApiCon } UPB_INLINE struct envoy_config_core_v3_GrpcService* envoy_config_core_v3_ApiConfigSource_add_grpc_services(envoy_config_core_v3_ApiConfigSource* msg, upb_Arena* arena) { upb_MiniTableField field = {4, UPB_SIZE(24, 40), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__GrpcService_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -357,6 +370,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { @@ -369,6 +383,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__RateLimitSettings_msg_init); 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) { @@ -389,6 +404,7 @@ UPB_INLINE void envoy_config_core_v3_ApiConfigSource_set_transport_api_version(e } 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -405,6 +421,7 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig** envoy_config_core_ } UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_core_v3_ApiConfigSource_add_config_validators(envoy_config_core_v3_ApiConfigSource* msg, upb_Arena* arena) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -554,6 +571,7 @@ UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_core_v3_RateLi const struct google_protobuf_UInt32Value* default_val = NULL; const struct google_protobuf_UInt32Value* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -570,6 +588,7 @@ UPB_INLINE const struct google_protobuf_DoubleValue* envoy_config_core_v3_RateLi const struct google_protobuf_DoubleValue* default_val = NULL; const struct google_protobuf_DoubleValue* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__DoubleValue_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -581,6 +600,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); 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) { @@ -593,6 +613,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__DoubleValue_msg_init); 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) { @@ -660,6 +681,7 @@ UPB_INLINE const struct envoy_config_core_v3_WatchedDirectory* envoy_config_core const struct envoy_config_core_v3_WatchedDirectory* default_val = NULL; const struct envoy_config_core_v3_WatchedDirectory* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__WatchedDirectory_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -675,6 +697,7 @@ UPB_INLINE void envoy_config_core_v3_PathConfigSource_set_path(envoy_config_core } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__WatchedDirectory_msg_init); 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) { @@ -759,6 +782,7 @@ UPB_INLINE const envoy_config_core_v3_ApiConfigSource* envoy_config_core_v3_Conf const envoy_config_core_v3_ApiConfigSource* default_val = NULL; const envoy_config_core_v3_ApiConfigSource* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__ApiConfigSource_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -775,6 +799,7 @@ UPB_INLINE const envoy_config_core_v3_AggregatedConfigSource* envoy_config_core_ const envoy_config_core_v3_AggregatedConfigSource* default_val = NULL; const envoy_config_core_v3_AggregatedConfigSource* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__AggregatedConfigSource_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -791,6 +816,7 @@ UPB_INLINE const struct google_protobuf_Duration* envoy_config_core_v3_ConfigSou const struct google_protobuf_Duration* default_val = NULL; const struct google_protobuf_Duration* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -807,6 +833,7 @@ UPB_INLINE const envoy_config_core_v3_SelfConfigSource* envoy_config_core_v3_Con const envoy_config_core_v3_SelfConfigSource* default_val = NULL; const envoy_config_core_v3_SelfConfigSource* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__SelfConfigSource_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -833,6 +860,7 @@ UPB_INLINE void envoy_config_core_v3_ConfigSource_clear_authorities(envoy_config } UPB_INLINE const struct xds_core_v3_Authority* const* envoy_config_core_v3_ConfigSource_authorities(const envoy_config_core_v3_ConfigSource* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__core__v3__Authority_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -844,6 +872,7 @@ UPB_INLINE const struct xds_core_v3_Authority* const* envoy_config_core_v3_Confi } UPB_INLINE const upb_Array* _envoy_config_core_v3_ConfigSource_authorities_upb_array(const envoy_config_core_v3_ConfigSource* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__core__v3__Authority_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -852,6 +881,7 @@ UPB_INLINE const upb_Array* _envoy_config_core_v3_ConfigSource_authorities_upb_a } UPB_INLINE upb_Array* _envoy_config_core_v3_ConfigSource_authorities_mutable_upb_array(envoy_config_core_v3_ConfigSource* msg, size_t* size, upb_Arena* arena) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__core__v3__Authority_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -867,6 +897,7 @@ UPB_INLINE const envoy_config_core_v3_PathConfigSource* envoy_config_core_v3_Con const envoy_config_core_v3_PathConfigSource* default_val = NULL; const envoy_config_core_v3_PathConfigSource* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__PathConfigSource_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -882,6 +913,7 @@ UPB_INLINE void envoy_config_core_v3_ConfigSource_set_path(envoy_config_core_v3_ } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__ApiConfigSource_msg_init); 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) { @@ -894,6 +926,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__AggregatedConfigSource_msg_init); 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) { @@ -906,6 +939,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { @@ -918,6 +952,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__SelfConfigSource_msg_init); 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) { @@ -934,6 +969,7 @@ UPB_INLINE void envoy_config_core_v3_ConfigSource_set_resource_api_version(envoy } 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__core__v3__Authority_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -950,6 +986,7 @@ UPB_INLINE struct xds_core_v3_Authority** envoy_config_core_v3_ConfigSource_resi } UPB_INLINE struct xds_core_v3_Authority* envoy_config_core_v3_ConfigSource_add_authorities(envoy_config_core_v3_ConfigSource* msg, upb_Arena* arena) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__core__v3__Authority_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -964,6 +1001,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__PathConfigSource_msg_init); 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) { @@ -1019,6 +1057,7 @@ UPB_INLINE const envoy_config_core_v3_ConfigSource* envoy_config_core_v3_Extensi const envoy_config_core_v3_ConfigSource* default_val = NULL; const envoy_config_core_v3_ConfigSource* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__ConfigSource_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1035,6 +1074,7 @@ UPB_INLINE const struct google_protobuf_Any* envoy_config_core_v3_ExtensionConfi const struct google_protobuf_Any* default_val = NULL; const struct google_protobuf_Any* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1090,6 +1130,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__ConfigSource_msg_init); 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) { @@ -1102,6 +1143,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); 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) { diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/config_source.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/core/v3/config_source.upb_minitable.c index 079e87514b8..5b1c268dfee 100644 --- a/src/core/ext/upb-gen/envoy/config/core/v3/config_source.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/config/core/v3/config_source.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/config/core/v3/config_source.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -23,12 +24,13 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub envoy_config_core_v3_ApiConfigSource_submsgs[5] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__GrpcService_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__RateLimitSettings_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal envoy_config_core_v3_ApiConfigSource_submsgs[5] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__GrpcService_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__RateLimitSettings_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_core_v3_ApiConfigSource__fields[9] = { @@ -70,6 +72,7 @@ const upb_MiniTable envoy__config__core__v3__ApiConfigSource_msg_init = { }) }; +const upb_MiniTable* envoy__config__core__v3__ApiConfigSource_msg_init_ptr = &envoy__config__core__v3__ApiConfigSource_msg_init; const upb_MiniTable envoy__config__core__v3__AggregatedConfigSource_msg_init = { NULL, NULL, @@ -79,6 +82,7 @@ const upb_MiniTable envoy__config__core__v3__AggregatedConfigSource_msg_init = { #endif }; +const upb_MiniTable* envoy__config__core__v3__AggregatedConfigSource_msg_init_ptr = &envoy__config__core__v3__AggregatedConfigSource_msg_init; static const upb_MiniTableField envoy_config_core_v3_SelfConfigSource__fields[1] = { {1, 8, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, }; @@ -96,9 +100,10 @@ const upb_MiniTable envoy__config__core__v3__SelfConfigSource_msg_init = { }) }; -static const upb_MiniTableSub envoy_config_core_v3_RateLimitSettings_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__DoubleValue_msg_init}, +const upb_MiniTable* envoy__config__core__v3__SelfConfigSource_msg_init_ptr = &envoy__config__core__v3__SelfConfigSource_msg_init; +static const upb_MiniTableSubInternal envoy_config_core_v3_RateLimitSettings_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__DoubleValue_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_core_v3_RateLimitSettings__fields[2] = { @@ -115,8 +120,9 @@ const upb_MiniTable envoy__config__core__v3__RateLimitSettings_msg_init = { #endif }; -static const upb_MiniTableSub envoy_config_core_v3_PathConfigSource_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__WatchedDirectory_msg_init}, +const upb_MiniTable* envoy__config__core__v3__RateLimitSettings_msg_init_ptr = &envoy__config__core__v3__RateLimitSettings_msg_init; +static const upb_MiniTableSubInternal envoy_config_core_v3_PathConfigSource_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__WatchedDirectory_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_core_v3_PathConfigSource__fields[2] = { @@ -137,13 +143,14 @@ const upb_MiniTable envoy__config__core__v3__PathConfigSource_msg_init = { }) }; -static const upb_MiniTableSub envoy_config_core_v3_ConfigSource_submsgs[6] = { - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ApiConfigSource_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__AggregatedConfigSource_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__SelfConfigSource_msg_init}, - {.UPB_PRIVATE(submsg) = &xds__core__v3__Authority_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__PathConfigSource_msg_init}, +const upb_MiniTable* envoy__config__core__v3__PathConfigSource_msg_init_ptr = &envoy__config__core__v3__PathConfigSource_msg_init; +static const upb_MiniTableSubInternal envoy_config_core_v3_ConfigSource_submsgs[6] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ApiConfigSource_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__AggregatedConfigSource_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__SelfConfigSource_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &xds__core__v3__Authority_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__PathConfigSource_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_core_v3_ConfigSource__fields[8] = { @@ -184,9 +191,10 @@ const upb_MiniTable envoy__config__core__v3__ConfigSource_msg_init = { }) }; -static const upb_MiniTableSub envoy_config_core_v3_ExtensionConfigSource_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ConfigSource_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init}, +const upb_MiniTable* envoy__config__core__v3__ConfigSource_msg_init_ptr = &envoy__config__core__v3__ConfigSource_msg_init; +static const upb_MiniTableSubInternal envoy_config_core_v3_ExtensionConfigSource_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ConfigSource_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_core_v3_ExtensionConfigSource__fields[4] = { @@ -215,6 +223,7 @@ const upb_MiniTable envoy__config__core__v3__ExtensionConfigSource_msg_init = { }) }; +const upb_MiniTable* envoy__config__core__v3__ExtensionConfigSource_msg_init_ptr = &envoy__config__core__v3__ExtensionConfigSource_msg_init; static const upb_MiniTable *messages_layout[7] = { &envoy__config__core__v3__ApiConfigSource_msg_init, &envoy__config__core__v3__AggregatedConfigSource_msg_init, diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/config_source.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/core/v3/config_source.upb_minitable.h index f06e548a4e2..7120bc2b0bc 100644 --- a/src/core/ext/upb-gen/envoy/config/core/v3/config_source.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/config/core/v3/config_source.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/config/core/v3/config_source.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_CORE_V3_CONFIG_SOURCE_PROTO_UPB_MINITABLE_H_ #define ENVOY_CONFIG_CORE_V3_CONFIG_SOURCE_PROTO_UPB_MINITABLE_H_ @@ -18,12 +19,19 @@ extern "C" { #endif extern const upb_MiniTable envoy__config__core__v3__ApiConfigSource_msg_init; +extern const upb_MiniTable* envoy__config__core__v3__ApiConfigSource_msg_init_ptr; extern const upb_MiniTable envoy__config__core__v3__AggregatedConfigSource_msg_init; +extern const upb_MiniTable* envoy__config__core__v3__AggregatedConfigSource_msg_init_ptr; extern const upb_MiniTable envoy__config__core__v3__SelfConfigSource_msg_init; +extern const upb_MiniTable* envoy__config__core__v3__SelfConfigSource_msg_init_ptr; extern const upb_MiniTable envoy__config__core__v3__RateLimitSettings_msg_init; +extern const upb_MiniTable* envoy__config__core__v3__RateLimitSettings_msg_init_ptr; extern const upb_MiniTable envoy__config__core__v3__PathConfigSource_msg_init; +extern const upb_MiniTable* envoy__config__core__v3__PathConfigSource_msg_init_ptr; extern const upb_MiniTable envoy__config__core__v3__ConfigSource_msg_init; +extern const upb_MiniTable* envoy__config__core__v3__ConfigSource_msg_init_ptr; extern const upb_MiniTable envoy__config__core__v3__ExtensionConfigSource_msg_init; +extern const upb_MiniTable* envoy__config__core__v3__ExtensionConfigSource_msg_init_ptr; extern const upb_MiniTableFile envoy_config_core_v3_config_source_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/event_service_config.upb.h b/src/core/ext/upb-gen/envoy/config/core/v3/event_service_config.upb.h index 75df840700d..7150ab1cbcf 100644 --- a/src/core/ext/upb-gen/envoy/config/core/v3/event_service_config.upb.h +++ b/src/core/ext/upb-gen/envoy/config/core/v3/event_service_config.upb.h @@ -3,7 +3,8 @@ * envoy/config/core/v3/event_service_config.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_CORE_V3_EVENT_SERVICE_CONFIG_PROTO_UPB_H_ #define ENVOY_CONFIG_CORE_V3_EVENT_SERVICE_CONFIG_PROTO_UPB_H_ @@ -82,6 +83,7 @@ UPB_INLINE const struct envoy_config_core_v3_GrpcService* envoy_config_core_v3_E const struct envoy_config_core_v3_GrpcService* default_val = NULL; const struct envoy_config_core_v3_GrpcService* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__GrpcService_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -93,6 +95,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__GrpcService_msg_init); 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) { diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/event_service_config.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/core/v3/event_service_config.upb_minitable.c index 7447b9d9912..f330f518622 100644 --- a/src/core/ext/upb-gen/envoy/config/core/v3/event_service_config.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/config/core/v3/event_service_config.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/config/core/v3/event_service_config.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -16,8 +17,9 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub envoy_config_core_v3_EventServiceConfig_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__GrpcService_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal envoy_config_core_v3_EventServiceConfig_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__GrpcService_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_core_v3_EventServiceConfig__fields[1] = { @@ -37,6 +39,7 @@ const upb_MiniTable envoy__config__core__v3__EventServiceConfig_msg_init = { }) }; +const upb_MiniTable* envoy__config__core__v3__EventServiceConfig_msg_init_ptr = &envoy__config__core__v3__EventServiceConfig_msg_init; static const upb_MiniTable *messages_layout[1] = { &envoy__config__core__v3__EventServiceConfig_msg_init, }; diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/event_service_config.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/core/v3/event_service_config.upb_minitable.h index b5d0866cefd..22382467579 100644 --- a/src/core/ext/upb-gen/envoy/config/core/v3/event_service_config.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/config/core/v3/event_service_config.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/config/core/v3/event_service_config.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_CORE_V3_EVENT_SERVICE_CONFIG_PROTO_UPB_MINITABLE_H_ #define ENVOY_CONFIG_CORE_V3_EVENT_SERVICE_CONFIG_PROTO_UPB_MINITABLE_H_ @@ -18,6 +19,7 @@ extern "C" { #endif extern const upb_MiniTable envoy__config__core__v3__EventServiceConfig_msg_init; +extern const upb_MiniTable* envoy__config__core__v3__EventServiceConfig_msg_init_ptr; extern const upb_MiniTableFile envoy_config_core_v3_event_service_config_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/extension.upb.h b/src/core/ext/upb-gen/envoy/config/core/v3/extension.upb.h index 27331c9f62f..7d8fce0d877 100644 --- a/src/core/ext/upb-gen/envoy/config/core/v3/extension.upb.h +++ b/src/core/ext/upb-gen/envoy/config/core/v3/extension.upb.h @@ -3,7 +3,8 @@ * envoy/config/core/v3/extension.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_CORE_V3_EXTENSION_PROTO_UPB_H_ #define ENVOY_CONFIG_CORE_V3_EXTENSION_PROTO_UPB_H_ @@ -84,6 +85,7 @@ UPB_INLINE const struct google_protobuf_Any* envoy_config_core_v3_TypedExtension const struct google_protobuf_Any* default_val = NULL; const struct google_protobuf_Any* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -99,6 +101,7 @@ UPB_INLINE void envoy_config_core_v3_TypedExtensionConfig_set_name(envoy_config_ } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); 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) { diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/extension.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/core/v3/extension.upb_minitable.c index 25fa2c135ff..a04338ed016 100644 --- a/src/core/ext/upb-gen/envoy/config/core/v3/extension.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/config/core/v3/extension.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/config/core/v3/extension.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -15,8 +16,9 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub envoy_config_core_v3_TypedExtensionConfig_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal envoy_config_core_v3_TypedExtensionConfig_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_core_v3_TypedExtensionConfig__fields[2] = { @@ -37,6 +39,7 @@ const upb_MiniTable envoy__config__core__v3__TypedExtensionConfig_msg_init = { }) }; +const upb_MiniTable* envoy__config__core__v3__TypedExtensionConfig_msg_init_ptr = &envoy__config__core__v3__TypedExtensionConfig_msg_init; static const upb_MiniTable *messages_layout[1] = { &envoy__config__core__v3__TypedExtensionConfig_msg_init, }; diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/extension.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/core/v3/extension.upb_minitable.h index fd3d7b76d39..a4bc7941b96 100644 --- a/src/core/ext/upb-gen/envoy/config/core/v3/extension.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/config/core/v3/extension.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/config/core/v3/extension.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_CORE_V3_EXTENSION_PROTO_UPB_MINITABLE_H_ #define ENVOY_CONFIG_CORE_V3_EXTENSION_PROTO_UPB_MINITABLE_H_ @@ -18,6 +19,7 @@ extern "C" { #endif extern const upb_MiniTable envoy__config__core__v3__TypedExtensionConfig_msg_init; +extern const upb_MiniTable* envoy__config__core__v3__TypedExtensionConfig_msg_init_ptr; extern const upb_MiniTableFile envoy_config_core_v3_extension_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/grpc_method_list.upb.h b/src/core/ext/upb-gen/envoy/config/core/v3/grpc_method_list.upb.h index 6ced698c815..d451c4fb9ea 100644 --- a/src/core/ext/upb-gen/envoy/config/core/v3/grpc_method_list.upb.h +++ b/src/core/ext/upb-gen/envoy/config/core/v3/grpc_method_list.upb.h @@ -3,7 +3,8 @@ * envoy/config/core/v3/grpc_method_list.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_CORE_V3_GRPC_METHOD_LIST_PROTO_UPB_H_ #define ENVOY_CONFIG_CORE_V3_GRPC_METHOD_LIST_PROTO_UPB_H_ @@ -70,6 +71,7 @@ UPB_INLINE void envoy_config_core_v3_GrpcMethodList_clear_services(envoy_config_ } UPB_INLINE const envoy_config_core_v3_GrpcMethodList_Service* const* envoy_config_core_v3_GrpcMethodList_services(const envoy_config_core_v3_GrpcMethodList* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__GrpcMethodList__Service_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -81,6 +83,7 @@ UPB_INLINE const envoy_config_core_v3_GrpcMethodList_Service* const* envoy_confi } UPB_INLINE const upb_Array* _envoy_config_core_v3_GrpcMethodList_services_upb_array(const envoy_config_core_v3_GrpcMethodList* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__GrpcMethodList__Service_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -89,6 +92,7 @@ UPB_INLINE const upb_Array* _envoy_config_core_v3_GrpcMethodList_services_upb_ar } UPB_INLINE upb_Array* _envoy_config_core_v3_GrpcMethodList_services_mutable_upb_array(envoy_config_core_v3_GrpcMethodList* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__GrpcMethodList__Service_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -99,6 +103,7 @@ UPB_INLINE upb_Array* _envoy_config_core_v3_GrpcMethodList_services_mutable_upb_ UPB_INLINE envoy_config_core_v3_GrpcMethodList_Service** envoy_config_core_v3_GrpcMethodList_mutable_services(envoy_config_core_v3_GrpcMethodList* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__GrpcMethodList__Service_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -115,6 +120,7 @@ UPB_INLINE envoy_config_core_v3_GrpcMethodList_Service** envoy_config_core_v3_Gr } UPB_INLINE struct envoy_config_core_v3_GrpcMethodList_Service* envoy_config_core_v3_GrpcMethodList_add_services(envoy_config_core_v3_GrpcMethodList* msg, upb_Arena* arena) { upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__GrpcMethodList__Service_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/grpc_method_list.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/core/v3/grpc_method_list.upb_minitable.c index 266ad8a027c..f4a0f16207f 100644 --- a/src/core/ext/upb-gen/envoy/config/core/v3/grpc_method_list.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/config/core/v3/grpc_method_list.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/config/core/v3/grpc_method_list.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -15,8 +16,9 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub envoy_config_core_v3_GrpcMethodList_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__GrpcMethodList__Service_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal envoy_config_core_v3_GrpcMethodList_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__GrpcMethodList__Service_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_core_v3_GrpcMethodList__fields[1] = { @@ -36,6 +38,7 @@ const upb_MiniTable envoy__config__core__v3__GrpcMethodList_msg_init = { }) }; +const upb_MiniTable* envoy__config__core__v3__GrpcMethodList_msg_init_ptr = &envoy__config__core__v3__GrpcMethodList_msg_init; static const upb_MiniTableField envoy_config_core_v3_GrpcMethodList_Service__fields[2] = { {1, UPB_SIZE(12, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, {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)}, @@ -56,6 +59,7 @@ const upb_MiniTable envoy__config__core__v3__GrpcMethodList__Service_msg_init = }) }; +const upb_MiniTable* envoy__config__core__v3__GrpcMethodList__Service_msg_init_ptr = &envoy__config__core__v3__GrpcMethodList__Service_msg_init; static const upb_MiniTable *messages_layout[2] = { &envoy__config__core__v3__GrpcMethodList_msg_init, &envoy__config__core__v3__GrpcMethodList__Service_msg_init, diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/grpc_method_list.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/core/v3/grpc_method_list.upb_minitable.h index 7721c3f5b14..ab03aa92b88 100644 --- a/src/core/ext/upb-gen/envoy/config/core/v3/grpc_method_list.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/config/core/v3/grpc_method_list.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/config/core/v3/grpc_method_list.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_CORE_V3_GRPC_METHOD_LIST_PROTO_UPB_MINITABLE_H_ #define ENVOY_CONFIG_CORE_V3_GRPC_METHOD_LIST_PROTO_UPB_MINITABLE_H_ @@ -18,7 +19,9 @@ extern "C" { #endif extern const upb_MiniTable envoy__config__core__v3__GrpcMethodList_msg_init; +extern const upb_MiniTable* envoy__config__core__v3__GrpcMethodList_msg_init_ptr; extern const upb_MiniTable envoy__config__core__v3__GrpcMethodList__Service_msg_init; +extern const upb_MiniTable* envoy__config__core__v3__GrpcMethodList__Service_msg_init_ptr; extern const upb_MiniTableFile envoy_config_core_v3_grpc_method_list_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/grpc_service.upb.h b/src/core/ext/upb-gen/envoy/config/core/v3/grpc_service.upb.h index c77f0b5286c..d4ab962746d 100644 --- a/src/core/ext/upb-gen/envoy/config/core/v3/grpc_service.upb.h +++ b/src/core/ext/upb-gen/envoy/config/core/v3/grpc_service.upb.h @@ -3,7 +3,8 @@ * envoy/config/core/v3/grpc_service.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_CORE_V3_GRPC_SERVICE_PROTO_UPB_H_ #define ENVOY_CONFIG_CORE_V3_GRPC_SERVICE_PROTO_UPB_H_ @@ -109,6 +110,7 @@ UPB_INLINE const envoy_config_core_v3_GrpcService_EnvoyGrpc* envoy_config_core_v 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(28, 40), -13, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__GrpcService__EnvoyGrpc_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -125,6 +127,7 @@ UPB_INLINE const envoy_config_core_v3_GrpcService_GoogleGrpc* envoy_config_core_ 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(28, 40), -13, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__GrpcService__GoogleGrpc_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -141,6 +144,7 @@ UPB_INLINE const struct google_protobuf_Duration* envoy_config_core_v3_GrpcServi const struct google_protobuf_Duration* default_val = NULL; const struct google_protobuf_Duration* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -155,6 +159,7 @@ UPB_INLINE void envoy_config_core_v3_GrpcService_clear_initial_metadata(envoy_co } UPB_INLINE const struct envoy_config_core_v3_HeaderValue* const* envoy_config_core_v3_GrpcService_initial_metadata(const envoy_config_core_v3_GrpcService* msg, size_t* size) { const upb_MiniTableField field = {5, UPB_SIZE(20, 24), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HeaderValue_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -166,6 +171,7 @@ UPB_INLINE const struct envoy_config_core_v3_HeaderValue* const* envoy_config_co } UPB_INLINE const upb_Array* _envoy_config_core_v3_GrpcService_initial_metadata_upb_array(const envoy_config_core_v3_GrpcService* msg, size_t* size) { const upb_MiniTableField field = {5, UPB_SIZE(20, 24), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HeaderValue_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -174,6 +180,7 @@ UPB_INLINE const upb_Array* _envoy_config_core_v3_GrpcService_initial_metadata_u } UPB_INLINE upb_Array* _envoy_config_core_v3_GrpcService_initial_metadata_mutable_upb_array(envoy_config_core_v3_GrpcService* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {5, UPB_SIZE(20, 24), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HeaderValue_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -189,6 +196,7 @@ UPB_INLINE const struct envoy_config_core_v3_RetryPolicy* envoy_config_core_v3_G 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__RetryPolicy_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -200,6 +208,7 @@ UPB_INLINE bool envoy_config_core_v3_GrpcService_has_retry_policy(const envoy_co 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(28, 40), -13, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__GrpcService__EnvoyGrpc_msg_init); 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) { @@ -212,6 +221,7 @@ UPB_INLINE struct envoy_config_core_v3_GrpcService_EnvoyGrpc* envoy_config_core_ } 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(28, 40), -13, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__GrpcService__GoogleGrpc_msg_init); 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) { @@ -224,6 +234,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { @@ -236,6 +247,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_GrpcService_mut } UPB_INLINE struct envoy_config_core_v3_HeaderValue** envoy_config_core_v3_GrpcService_mutable_initial_metadata(envoy_config_core_v3_GrpcService* msg, size_t* size) { upb_MiniTableField field = {5, UPB_SIZE(20, 24), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HeaderValue_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -252,6 +264,7 @@ UPB_INLINE struct envoy_config_core_v3_HeaderValue** envoy_config_core_v3_GrpcSe } UPB_INLINE struct envoy_config_core_v3_HeaderValue* envoy_config_core_v3_GrpcService_add_initial_metadata(envoy_config_core_v3_GrpcService* msg, upb_Arena* arena) { upb_MiniTableField field = {5, UPB_SIZE(20, 24), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HeaderValue_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -266,6 +279,7 @@ UPB_INLINE struct envoy_config_core_v3_HeaderValue* envoy_config_core_v3_GrpcSer } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__RetryPolicy_msg_init); 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) { @@ -345,6 +359,7 @@ UPB_INLINE const struct envoy_config_core_v3_RetryPolicy* envoy_config_core_v3_G const struct envoy_config_core_v3_RetryPolicy* default_val = NULL; const struct envoy_config_core_v3_RetryPolicy* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__RetryPolicy_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -361,6 +376,7 @@ UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_core_v3_GrpcSe 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -392,6 +408,7 @@ UPB_INLINE void envoy_config_core_v3_GrpcService_EnvoyGrpc_set_authority(envoy_c } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__RetryPolicy_msg_init); 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) { @@ -404,6 +421,7 @@ UPB_INLINE struct envoy_config_core_v3_RetryPolicy* envoy_config_core_v3_GrpcSer } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); 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) { @@ -475,6 +493,7 @@ UPB_INLINE const envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials* const envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials* default_val = NULL; const envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelCredentials_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -489,6 +508,7 @@ UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_clear_call_credentia } UPB_INLINE const envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials* const* envoy_config_core_v3_GrpcService_GoogleGrpc_call_credentials(const envoy_config_core_v3_GrpcService_GoogleGrpc* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -500,6 +520,7 @@ UPB_INLINE const envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials* co } UPB_INLINE const upb_Array* _envoy_config_core_v3_GrpcService_GoogleGrpc_call_credentials_upb_array(const envoy_config_core_v3_GrpcService_GoogleGrpc* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -508,6 +529,7 @@ UPB_INLINE const upb_Array* _envoy_config_core_v3_GrpcService_GoogleGrpc_call_cr } UPB_INLINE upb_Array* _envoy_config_core_v3_GrpcService_GoogleGrpc_call_credentials_mutable_upb_array(envoy_config_core_v3_GrpcService_GoogleGrpc* msg, size_t* size, upb_Arena* arena) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -547,6 +569,7 @@ UPB_INLINE const struct google_protobuf_Struct* envoy_config_core_v3_GrpcService const struct google_protobuf_Struct* default_val = NULL; const struct google_protobuf_Struct* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Struct_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -563,6 +586,7 @@ UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_core_v3_GrpcSe const struct google_protobuf_UInt32Value* default_val = NULL; const struct google_protobuf_UInt32Value* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -579,6 +603,7 @@ UPB_INLINE const envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs* envoy_ const envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs* default_val = NULL; const envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelArgs_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -594,6 +619,7 @@ UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_set_target_uri(envoy } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelCredentials_msg_init); 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) { @@ -606,6 +632,7 @@ UPB_INLINE struct envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials } UPB_INLINE envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials** envoy_config_core_v3_GrpcService_GoogleGrpc_mutable_call_credentials(envoy_config_core_v3_GrpcService_GoogleGrpc* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -622,6 +649,7 @@ UPB_INLINE envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials** envoy_c } UPB_INLINE struct envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials* envoy_config_core_v3_GrpcService_GoogleGrpc_add_call_credentials(envoy_config_core_v3_GrpcService_GoogleGrpc* msg, upb_Arena* arena) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -644,6 +672,7 @@ UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_set_credentials_fact } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Struct_msg_init); 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) { @@ -656,6 +685,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); 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) { @@ -668,6 +698,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelArgs_msg_init); 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) { @@ -723,6 +754,7 @@ UPB_INLINE const struct envoy_config_core_v3_DataSource* envoy_config_core_v3_Gr const struct envoy_config_core_v3_DataSource* default_val = NULL; const struct envoy_config_core_v3_DataSource* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__DataSource_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -739,6 +771,7 @@ UPB_INLINE const struct envoy_config_core_v3_DataSource* envoy_config_core_v3_Gr const struct envoy_config_core_v3_DataSource* default_val = NULL; const struct envoy_config_core_v3_DataSource* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__DataSource_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -755,6 +788,7 @@ UPB_INLINE const struct envoy_config_core_v3_DataSource* envoy_config_core_v3_Gr const struct envoy_config_core_v3_DataSource* default_val = NULL; const struct envoy_config_core_v3_DataSource* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__DataSource_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -766,6 +800,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__DataSource_msg_init); 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) { @@ -778,6 +813,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__DataSource_msg_init); 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) { @@ -790,6 +826,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__DataSource_msg_init); 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) { @@ -894,6 +931,7 @@ UPB_INLINE const envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials* env const envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials* default_val = NULL; const envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__GrpcService__GoogleGrpc__SslCredentials_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -910,6 +948,7 @@ UPB_INLINE const struct google_protobuf_Empty* envoy_config_core_v3_GrpcService_ const struct google_protobuf_Empty* default_val = NULL; const struct google_protobuf_Empty* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Empty_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -926,6 +965,7 @@ UPB_INLINE const envoy_config_core_v3_GrpcService_GoogleGrpc_GoogleLocalCredenti const envoy_config_core_v3_GrpcService_GoogleGrpc_GoogleLocalCredentials* default_val = NULL; const envoy_config_core_v3_GrpcService_GoogleGrpc_GoogleLocalCredentials* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__GrpcService__GoogleGrpc__GoogleLocalCredentials_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -937,6 +977,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__GrpcService__GoogleGrpc__SslCredentials_msg_init); 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) { @@ -949,6 +990,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Empty_msg_init); 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) { @@ -961,6 +1003,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__GrpcService__GoogleGrpc__GoogleLocalCredentials_msg_init); 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) { @@ -1047,6 +1090,7 @@ UPB_INLINE const struct google_protobuf_Empty* envoy_config_core_v3_GrpcService_ const struct google_protobuf_Empty* default_val = NULL; const struct google_protobuf_Empty* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Empty_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1079,6 +1123,7 @@ UPB_INLINE const envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_Ser const envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_ServiceAccountJWTAccessCredentials* default_val = NULL; const envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_ServiceAccountJWTAccessCredentials* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials__ServiceAccountJWTAccessCredentials_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1095,6 +1140,7 @@ UPB_INLINE const envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_Goo const envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_GoogleIAMCredentials* default_val = NULL; const envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_GoogleIAMCredentials* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials__GoogleIAMCredentials_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1111,6 +1157,7 @@ UPB_INLINE const envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_Met const envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin* default_val = NULL; const envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials__MetadataCredentialsFromPlugin_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1127,6 +1174,7 @@ UPB_INLINE const envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_Sts const envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsService* default_val = NULL; const envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsService* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials__StsService_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1142,6 +1190,7 @@ UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_set_ } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Empty_msg_init); 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) { @@ -1158,6 +1207,7 @@ UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_set_ } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials__ServiceAccountJWTAccessCredentials_msg_init); 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) { @@ -1170,6 +1220,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials__GoogleIAMCredentials_msg_init); 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) { @@ -1182,6 +1233,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials__MetadataCredentialsFromPlugin_msg_init); 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) { @@ -1194,6 +1246,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials__StsService_msg_init); 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) { @@ -1410,6 +1463,7 @@ UPB_INLINE const struct google_protobuf_Any* envoy_config_core_v3_GrpcService_Go const struct google_protobuf_Any* default_val = NULL; const struct google_protobuf_Any* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1425,6 +1479,7 @@ UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_Meta } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); 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) { @@ -1665,22 +1720,30 @@ UPB_INLINE size_t envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_args_s } UPB_INLINE bool envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_args_get(const envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs* msg, upb_StringView key, envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_Value** val) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelArgs__ArgsEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelArgs__Value_msg_init); 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_core_v3_GrpcService_GoogleGrpc_ChannelArgs_ArgsEntry* envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_args_next(const envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs* msg, size_t* iter) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelArgs__ArgsEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelArgs__Value_msg_init); const upb_Map* map = upb_Message_GetMap(UPB_UPCAST(msg), &field); if (!map) return NULL; return (const envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_ArgsEntry*)_upb_map_next(map, iter); } UPB_INLINE const upb_Map* _envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_args_upb_map(envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs* msg) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelArgs__ArgsEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelArgs__Value_msg_init); return upb_Message_GetMap(UPB_UPCAST(msg), &field); } UPB_INLINE upb_Map* _envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_args_mutable_upb_map(envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs* msg, upb_Arena* a) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelArgs__ArgsEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelArgs__Value_msg_init); return _upb_Message_GetOrCreateMutableMap(UPB_UPCAST(msg), &field, 0, sizeof(envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_Value*), a); } @@ -1692,6 +1755,8 @@ UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_args_cle } UPB_INLINE bool envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_args_set(envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs* msg, upb_StringView key, envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_Value* val, upb_Arena* a) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelArgs__ArgsEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelArgs__Value_msg_init); 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) != @@ -1705,6 +1770,8 @@ UPB_INLINE bool envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_args_del } UPB_INLINE envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_ArgsEntry* envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_args_nextmutable(envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs* msg, size_t* iter) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelArgs__ArgsEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelArgs__Value_msg_init); upb_Map* map = (upb_Map*)upb_Message_GetMap(UPB_UPCAST(msg), &field); if (!map) return NULL; return (envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_ArgsEntry*)_upb_map_next(map, iter); diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/grpc_service.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/core/v3/grpc_service.upb_minitable.c index c26c29c47a2..0141f1f2a8f 100644 --- a/src/core/ext/upb-gen/envoy/config/core/v3/grpc_service.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/config/core/v3/grpc_service.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/config/core/v3/grpc_service.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -22,12 +23,13 @@ // Must be last. #include "upb/port/def.inc" -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}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal envoy_config_core_v3_GrpcService_submsgs[5] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__GrpcService__EnvoyGrpc_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__GrpcService__GoogleGrpc_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HeaderValue_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__RetryPolicy_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_core_v3_GrpcService__fields[5] = { @@ -57,9 +59,10 @@ const upb_MiniTable envoy__config__core__v3__GrpcService_msg_init = { }) }; -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}, +const upb_MiniTable* envoy__config__core__v3__GrpcService_msg_init_ptr = &envoy__config__core__v3__GrpcService_msg_init; +static const upb_MiniTableSubInternal envoy_config_core_v3_GrpcService_EnvoyGrpc_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__RetryPolicy_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_core_v3_GrpcService_EnvoyGrpc__fields[5] = { @@ -89,12 +92,13 @@ const upb_MiniTable envoy__config__core__v3__GrpcService__EnvoyGrpc_msg_init = { }) }; -static const upb_MiniTableSub envoy_config_core_v3_GrpcService_GoogleGrpc_submsgs[5] = { - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelCredentials_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Struct_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelArgs_msg_init}, +const upb_MiniTable* envoy__config__core__v3__GrpcService__EnvoyGrpc_msg_init_ptr = &envoy__config__core__v3__GrpcService__EnvoyGrpc_msg_init; +static const upb_MiniTableSubInternal envoy_config_core_v3_GrpcService_GoogleGrpc_submsgs[5] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelCredentials_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Struct_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelArgs_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_core_v3_GrpcService_GoogleGrpc__fields[8] = { @@ -127,10 +131,11 @@ const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc_msg_init = }) }; -static const upb_MiniTableSub envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials_submsgs[3] = { - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__DataSource_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__DataSource_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__DataSource_msg_init}, +const upb_MiniTable* envoy__config__core__v3__GrpcService__GoogleGrpc_msg_init_ptr = &envoy__config__core__v3__GrpcService__GoogleGrpc_msg_init; +static const upb_MiniTableSubInternal envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials_submsgs[3] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__DataSource_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__DataSource_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__DataSource_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials__fields[3] = { @@ -148,6 +153,7 @@ const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc__SslCredent #endif }; +const upb_MiniTable* envoy__config__core__v3__GrpcService__GoogleGrpc__SslCredentials_msg_init_ptr = &envoy__config__core__v3__GrpcService__GoogleGrpc__SslCredentials_msg_init; const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc__GoogleLocalCredentials_msg_init = { NULL, NULL, @@ -157,10 +163,11 @@ const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc__GoogleLoca #endif }; -static const upb_MiniTableSub envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials_submsgs[3] = { - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__GrpcService__GoogleGrpc__SslCredentials_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Empty_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__GrpcService__GoogleGrpc__GoogleLocalCredentials_msg_init}, +const upb_MiniTable* envoy__config__core__v3__GrpcService__GoogleGrpc__GoogleLocalCredentials_msg_init_ptr = &envoy__config__core__v3__GrpcService__GoogleGrpc__GoogleLocalCredentials_msg_init; +static const upb_MiniTableSubInternal envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials_submsgs[3] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__GrpcService__GoogleGrpc__SslCredentials_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Empty_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__GrpcService__GoogleGrpc__GoogleLocalCredentials_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials__fields[3] = { @@ -184,12 +191,13 @@ const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelCre }) }; -static const upb_MiniTableSub envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_submsgs[5] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__Empty_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials__ServiceAccountJWTAccessCredentials_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials__GoogleIAMCredentials_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials__MetadataCredentialsFromPlugin_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials__StsService_msg_init}, +const upb_MiniTable* envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelCredentials_msg_init_ptr = &envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelCredentials_msg_init; +static const upb_MiniTableSubInternal envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_submsgs[5] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Empty_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials__ServiceAccountJWTAccessCredentials_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials__GoogleIAMCredentials_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials__MetadataCredentialsFromPlugin_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials__StsService_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials__fields[7] = { @@ -221,6 +229,7 @@ const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc__CallCreden }) }; +const upb_MiniTable* envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials_msg_init_ptr = &envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials_msg_init; static const upb_MiniTableField envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_ServiceAccountJWTAccessCredentials__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, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, @@ -241,6 +250,7 @@ const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc__CallCreden }) }; +const upb_MiniTable* envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials__ServiceAccountJWTAccessCredentials_msg_init_ptr = &envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials__ServiceAccountJWTAccessCredentials_msg_init; static const upb_MiniTableField envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_GoogleIAMCredentials__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)}, @@ -261,8 +271,9 @@ const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc__CallCreden }) }; -static const upb_MiniTableSub envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init}, +const upb_MiniTable* envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials__GoogleIAMCredentials_msg_init_ptr = &envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials__GoogleIAMCredentials_msg_init; +static const upb_MiniTableSubInternal envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin__fields[2] = { @@ -285,6 +296,7 @@ const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc__CallCreden }) }; +const upb_MiniTable* envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials__MetadataCredentialsFromPlugin_msg_init_ptr = &envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials__MetadataCredentialsFromPlugin_msg_init; static const upb_MiniTableField envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsService__fields[9] = { {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)}, @@ -324,8 +336,9 @@ const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc__CallCreden }) }; -static const upb_MiniTableSub envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelArgs__ArgsEntry_msg_init}, +const upb_MiniTable* envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials__StsService_msg_init_ptr = &envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials__StsService_msg_init; +static const upb_MiniTableSubInternal envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelArgs__ArgsEntry_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs__fields[1] = { @@ -341,6 +354,7 @@ const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelArg #endif }; +const upb_MiniTable* envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelArgs_msg_init_ptr = &envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelArgs_msg_init; static const upb_MiniTableField envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_Value__fields[2] = { {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, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, @@ -361,8 +375,9 @@ const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelArg }) }; -static const upb_MiniTableSub envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_ArgsEntry_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelArgs__Value_msg_init}, +const upb_MiniTable* envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelArgs__Value_msg_init_ptr = &envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelArgs__Value_msg_init; +static const upb_MiniTableSubInternal envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_ArgsEntry_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelArgs__Value_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_ArgsEntry__fields[2] = { @@ -383,6 +398,7 @@ const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelArg }) }; +const upb_MiniTable* envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelArgs__ArgsEntry_msg_init_ptr = &envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelArgs__ArgsEntry_msg_init; static const upb_MiniTable *messages_layout[14] = { &envoy__config__core__v3__GrpcService_msg_init, &envoy__config__core__v3__GrpcService__EnvoyGrpc_msg_init, diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/grpc_service.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/core/v3/grpc_service.upb_minitable.h index a29a44a33e7..eaf8ab0e689 100644 --- a/src/core/ext/upb-gen/envoy/config/core/v3/grpc_service.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/config/core/v3/grpc_service.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/config/core/v3/grpc_service.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_CORE_V3_GRPC_SERVICE_PROTO_UPB_MINITABLE_H_ #define ENVOY_CONFIG_CORE_V3_GRPC_SERVICE_PROTO_UPB_MINITABLE_H_ @@ -18,19 +19,33 @@ extern "C" { #endif extern const upb_MiniTable envoy__config__core__v3__GrpcService_msg_init; +extern const upb_MiniTable* envoy__config__core__v3__GrpcService_msg_init_ptr; extern const upb_MiniTable envoy__config__core__v3__GrpcService__EnvoyGrpc_msg_init; +extern const upb_MiniTable* envoy__config__core__v3__GrpcService__EnvoyGrpc_msg_init_ptr; extern const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc_msg_init; +extern const upb_MiniTable* envoy__config__core__v3__GrpcService__GoogleGrpc_msg_init_ptr; extern const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc__SslCredentials_msg_init; +extern const upb_MiniTable* envoy__config__core__v3__GrpcService__GoogleGrpc__SslCredentials_msg_init_ptr; extern const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc__GoogleLocalCredentials_msg_init; +extern const upb_MiniTable* envoy__config__core__v3__GrpcService__GoogleGrpc__GoogleLocalCredentials_msg_init_ptr; extern const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelCredentials_msg_init; +extern const upb_MiniTable* envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelCredentials_msg_init_ptr; extern const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials_msg_init; +extern const upb_MiniTable* envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials_msg_init_ptr; extern const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials__ServiceAccountJWTAccessCredentials_msg_init; +extern const upb_MiniTable* envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials__ServiceAccountJWTAccessCredentials_msg_init_ptr; extern const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials__GoogleIAMCredentials_msg_init; +extern const upb_MiniTable* envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials__GoogleIAMCredentials_msg_init_ptr; extern const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials__MetadataCredentialsFromPlugin_msg_init; +extern const upb_MiniTable* envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials__MetadataCredentialsFromPlugin_msg_init_ptr; extern const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials__StsService_msg_init; +extern const upb_MiniTable* envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials__StsService_msg_init_ptr; extern const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelArgs_msg_init; +extern const upb_MiniTable* envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelArgs_msg_init_ptr; extern const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelArgs__Value_msg_init; +extern const upb_MiniTable* envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelArgs__Value_msg_init_ptr; extern const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelArgs__ArgsEntry_msg_init; +extern const upb_MiniTable* envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelArgs__ArgsEntry_msg_init_ptr; extern const upb_MiniTableFile envoy_config_core_v3_grpc_service_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/health_check.upb.h b/src/core/ext/upb-gen/envoy/config/core/v3/health_check.upb.h index a43753f21b1..709a6fb749e 100644 --- a/src/core/ext/upb-gen/envoy/config/core/v3/health_check.upb.h +++ b/src/core/ext/upb-gen/envoy/config/core/v3/health_check.upb.h @@ -3,7 +3,8 @@ * envoy/config/core/v3/health_check.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_CORE_V3_HEALTH_CHECK_PROTO_UPB_H_ #define ENVOY_CONFIG_CORE_V3_HEALTH_CHECK_PROTO_UPB_H_ @@ -222,6 +223,7 @@ UPB_INLINE const struct google_protobuf_Duration* envoy_config_core_v3_HealthChe const struct google_protobuf_Duration* default_val = NULL; const struct google_protobuf_Duration* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -238,6 +240,7 @@ UPB_INLINE const struct google_protobuf_Duration* envoy_config_core_v3_HealthChe const struct google_protobuf_Duration* default_val = NULL; const struct google_protobuf_Duration* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -254,6 +257,7 @@ UPB_INLINE const struct google_protobuf_Duration* envoy_config_core_v3_HealthChe const struct google_protobuf_Duration* default_val = NULL; const struct google_protobuf_Duration* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -270,6 +274,7 @@ UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_core_v3_Health const struct google_protobuf_UInt32Value* default_val = NULL; const struct google_protobuf_UInt32Value* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -286,6 +291,7 @@ UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_core_v3_Health const struct google_protobuf_UInt32Value* default_val = NULL; const struct google_protobuf_UInt32Value* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -302,6 +308,7 @@ UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_core_v3_Health const struct google_protobuf_UInt32Value* default_val = NULL; const struct google_protobuf_UInt32Value* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -318,6 +325,7 @@ UPB_INLINE const struct google_protobuf_BoolValue* envoy_config_core_v3_HealthCh const struct google_protobuf_BoolValue* default_val = NULL; const struct google_protobuf_BoolValue* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -334,6 +342,7 @@ UPB_INLINE const envoy_config_core_v3_HealthCheck_HttpHealthCheck* envoy_config_ 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(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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HealthCheck__HttpHealthCheck_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -350,6 +359,7 @@ UPB_INLINE const envoy_config_core_v3_HealthCheck_TcpHealthCheck* envoy_config_c 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(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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HealthCheck__TcpHealthCheck_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -366,6 +376,7 @@ UPB_INLINE const envoy_config_core_v3_HealthCheck_GrpcHealthCheck* envoy_config_ 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(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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HealthCheck__GrpcHealthCheck_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -382,6 +393,7 @@ UPB_INLINE const struct google_protobuf_Duration* envoy_config_core_v3_HealthChe const struct google_protobuf_Duration* default_val = NULL; const struct google_protobuf_Duration* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -398,6 +410,7 @@ UPB_INLINE const envoy_config_core_v3_HealthCheck_CustomHealthCheck* envoy_confi 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(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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HealthCheck__CustomHealthCheck_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -414,6 +427,7 @@ UPB_INLINE const struct google_protobuf_Duration* envoy_config_core_v3_HealthChe const struct google_protobuf_Duration* default_val = NULL; const struct google_protobuf_Duration* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -430,6 +444,7 @@ UPB_INLINE const struct google_protobuf_Duration* envoy_config_core_v3_HealthChe const struct google_protobuf_Duration* default_val = NULL; const struct google_protobuf_Duration* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -446,6 +461,7 @@ UPB_INLINE const struct google_protobuf_Duration* envoy_config_core_v3_HealthChe const struct google_protobuf_Duration* default_val = NULL; const struct google_protobuf_Duration* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -498,6 +514,7 @@ UPB_INLINE const struct google_protobuf_Duration* envoy_config_core_v3_HealthChe const struct google_protobuf_Duration* default_val = NULL; const struct google_protobuf_Duration* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -514,6 +531,7 @@ UPB_INLINE const envoy_config_core_v3_HealthCheck_TlsOptions* envoy_config_core_ const envoy_config_core_v3_HealthCheck_TlsOptions* default_val = NULL; const envoy_config_core_v3_HealthCheck_TlsOptions* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HealthCheck__TlsOptions_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -530,6 +548,7 @@ UPB_INLINE const struct envoy_config_core_v3_EventServiceConfig* envoy_config_co const struct envoy_config_core_v3_EventServiceConfig* default_val = NULL; const struct envoy_config_core_v3_EventServiceConfig* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__EventServiceConfig_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -546,6 +565,7 @@ UPB_INLINE const struct google_protobuf_Struct* envoy_config_core_v3_HealthCheck const struct google_protobuf_Struct* default_val = NULL; const struct google_protobuf_Struct* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Struct_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -562,6 +582,7 @@ UPB_INLINE const struct google_protobuf_Duration* envoy_config_core_v3_HealthChe const struct google_protobuf_Duration* default_val = NULL; const struct google_protobuf_Duration* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -576,6 +597,7 @@ UPB_INLINE void envoy_config_core_v3_HealthCheck_clear_event_logger(envoy_config } UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* const* envoy_config_core_v3_HealthCheck_event_logger(const envoy_config_core_v3_HealthCheck* msg, size_t* size) { const upb_MiniTableField field = {25, UPB_SIZE(88, 168), 0, 20, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -587,6 +609,7 @@ UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* const* envoy_ } UPB_INLINE const upb_Array* _envoy_config_core_v3_HealthCheck_event_logger_upb_array(const envoy_config_core_v3_HealthCheck* msg, size_t* size) { const upb_MiniTableField field = {25, UPB_SIZE(88, 168), 0, 20, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -595,6 +618,7 @@ UPB_INLINE const upb_Array* _envoy_config_core_v3_HealthCheck_event_logger_upb_a } UPB_INLINE upb_Array* _envoy_config_core_v3_HealthCheck_event_logger_mutable_upb_array(envoy_config_core_v3_HealthCheck* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {25, UPB_SIZE(88, 168), 0, 20, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -617,6 +641,7 @@ UPB_INLINE bool envoy_config_core_v3_HealthCheck_always_log_health_check_success 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { @@ -629,6 +654,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { @@ -641,6 +667,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { @@ -653,6 +680,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); 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) { @@ -665,6 +693,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); 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) { @@ -677,6 +706,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); 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) { @@ -689,6 +719,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); 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) { @@ -701,6 +732,7 @@ UPB_INLINE struct google_protobuf_BoolValue* envoy_config_core_v3_HealthCheck_mu } 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(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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HealthCheck__HttpHealthCheck_msg_init); 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) { @@ -713,6 +745,7 @@ UPB_INLINE struct envoy_config_core_v3_HealthCheck_HttpHealthCheck* envoy_config } 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(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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HealthCheck__TcpHealthCheck_msg_init); 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) { @@ -725,6 +758,7 @@ UPB_INLINE struct envoy_config_core_v3_HealthCheck_TcpHealthCheck* envoy_config_ } 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(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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HealthCheck__GrpcHealthCheck_msg_init); 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) { @@ -737,6 +771,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { @@ -749,6 +784,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_HealthCheck_mut } 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(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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HealthCheck__CustomHealthCheck_msg_init); 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) { @@ -761,6 +797,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { @@ -773,6 +810,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { @@ -785,6 +823,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { @@ -809,6 +848,7 @@ UPB_INLINE void envoy_config_core_v3_HealthCheck_set_always_log_health_check_fai } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { @@ -821,6 +861,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HealthCheck__TlsOptions_msg_init); 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) { @@ -833,6 +874,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__EventServiceConfig_msg_init); 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) { @@ -845,6 +887,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Struct_msg_init); 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) { @@ -857,6 +900,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { @@ -869,6 +913,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_HealthCheck_mut } UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig** envoy_config_core_v3_HealthCheck_mutable_event_logger(envoy_config_core_v3_HealthCheck* msg, size_t* size) { upb_MiniTableField field = {25, UPB_SIZE(88, 168), 0, 20, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -885,6 +930,7 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig** envoy_config_core_ } UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_core_v3_HealthCheck_add_event_logger(envoy_config_core_v3_HealthCheck* msg, upb_Arena* arena) { upb_MiniTableField field = {25, UPB_SIZE(88, 168), 0, 20, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -1058,6 +1104,7 @@ UPB_INLINE const envoy_config_core_v3_HealthCheck_Payload* envoy_config_core_v3_ const envoy_config_core_v3_HealthCheck_Payload* default_val = NULL; const envoy_config_core_v3_HealthCheck_Payload* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HealthCheck__Payload_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1072,6 +1119,7 @@ UPB_INLINE void envoy_config_core_v3_HealthCheck_HttpHealthCheck_clear_receive(e } UPB_INLINE const envoy_config_core_v3_HealthCheck_Payload* const* envoy_config_core_v3_HealthCheck_HttpHealthCheck_receive(const envoy_config_core_v3_HealthCheck_HttpHealthCheck* msg, size_t* size) { const upb_MiniTableField field = {4, UPB_SIZE(16, 64), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HealthCheck__Payload_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1083,6 +1131,7 @@ UPB_INLINE const envoy_config_core_v3_HealthCheck_Payload* const* envoy_config_c } UPB_INLINE const upb_Array* _envoy_config_core_v3_HealthCheck_HttpHealthCheck_receive_upb_array(const envoy_config_core_v3_HealthCheck_HttpHealthCheck* msg, size_t* size) { const upb_MiniTableField field = {4, UPB_SIZE(16, 64), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HealthCheck__Payload_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -1091,6 +1140,7 @@ UPB_INLINE const upb_Array* _envoy_config_core_v3_HealthCheck_HttpHealthCheck_re } UPB_INLINE upb_Array* _envoy_config_core_v3_HealthCheck_HttpHealthCheck_receive_mutable_upb_array(envoy_config_core_v3_HealthCheck_HttpHealthCheck* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {4, UPB_SIZE(16, 64), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HealthCheck__Payload_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -1104,6 +1154,7 @@ UPB_INLINE void envoy_config_core_v3_HealthCheck_HttpHealthCheck_clear_request_h } UPB_INLINE const struct envoy_config_core_v3_HeaderValueOption* const* envoy_config_core_v3_HealthCheck_HttpHealthCheck_request_headers_to_add(const envoy_config_core_v3_HealthCheck_HttpHealthCheck* msg, size_t* size) { const upb_MiniTableField field = {6, UPB_SIZE(20, 72), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HeaderValueOption_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1115,6 +1166,7 @@ UPB_INLINE const struct envoy_config_core_v3_HeaderValueOption* const* envoy_con } UPB_INLINE const upb_Array* _envoy_config_core_v3_HealthCheck_HttpHealthCheck_request_headers_to_add_upb_array(const envoy_config_core_v3_HealthCheck_HttpHealthCheck* msg, size_t* size) { const upb_MiniTableField field = {6, UPB_SIZE(20, 72), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HeaderValueOption_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -1123,6 +1175,7 @@ UPB_INLINE const upb_Array* _envoy_config_core_v3_HealthCheck_HttpHealthCheck_re } UPB_INLINE upb_Array* _envoy_config_core_v3_HealthCheck_HttpHealthCheck_request_headers_to_add_mutable_upb_array(envoy_config_core_v3_HealthCheck_HttpHealthCheck* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {6, UPB_SIZE(20, 72), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HeaderValueOption_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -1168,6 +1221,7 @@ UPB_INLINE void envoy_config_core_v3_HealthCheck_HttpHealthCheck_clear_expected_ } UPB_INLINE const struct envoy_type_v3_Int64Range* const* envoy_config_core_v3_HealthCheck_HttpHealthCheck_expected_statuses(const envoy_config_core_v3_HealthCheck_HttpHealthCheck* msg, size_t* size) { const upb_MiniTableField field = {9, UPB_SIZE(28, 88), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__v3__Int64Range_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1179,6 +1233,7 @@ UPB_INLINE const struct envoy_type_v3_Int64Range* const* envoy_config_core_v3_He } UPB_INLINE const upb_Array* _envoy_config_core_v3_HealthCheck_HttpHealthCheck_expected_statuses_upb_array(const envoy_config_core_v3_HealthCheck_HttpHealthCheck* msg, size_t* size) { const upb_MiniTableField field = {9, UPB_SIZE(28, 88), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__v3__Int64Range_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -1187,6 +1242,7 @@ UPB_INLINE const upb_Array* _envoy_config_core_v3_HealthCheck_HttpHealthCheck_ex } UPB_INLINE upb_Array* _envoy_config_core_v3_HealthCheck_HttpHealthCheck_expected_statuses_mutable_upb_array(envoy_config_core_v3_HealthCheck_HttpHealthCheck* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {9, UPB_SIZE(28, 88), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__v3__Int64Range_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -1214,6 +1270,7 @@ UPB_INLINE const struct envoy_type_matcher_v3_StringMatcher* envoy_config_core_v const struct envoy_type_matcher_v3_StringMatcher* default_val = NULL; const struct envoy_type_matcher_v3_StringMatcher* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__StringMatcher_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1228,6 +1285,7 @@ UPB_INLINE void envoy_config_core_v3_HealthCheck_HttpHealthCheck_clear_retriable } UPB_INLINE const struct envoy_type_v3_Int64Range* const* envoy_config_core_v3_HealthCheck_HttpHealthCheck_retriable_statuses(const envoy_config_core_v3_HealthCheck_HttpHealthCheck* msg, size_t* size) { const upb_MiniTableField field = {12, UPB_SIZE(40, 104), 0, 5, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__v3__Int64Range_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1239,6 +1297,7 @@ UPB_INLINE const struct envoy_type_v3_Int64Range* const* envoy_config_core_v3_He } UPB_INLINE const upb_Array* _envoy_config_core_v3_HealthCheck_HttpHealthCheck_retriable_statuses_upb_array(const envoy_config_core_v3_HealthCheck_HttpHealthCheck* msg, size_t* size) { const upb_MiniTableField field = {12, UPB_SIZE(40, 104), 0, 5, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__v3__Int64Range_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -1247,6 +1306,7 @@ UPB_INLINE const upb_Array* _envoy_config_core_v3_HealthCheck_HttpHealthCheck_re } UPB_INLINE upb_Array* _envoy_config_core_v3_HealthCheck_HttpHealthCheck_retriable_statuses_mutable_upb_array(envoy_config_core_v3_HealthCheck_HttpHealthCheck* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {12, UPB_SIZE(40, 104), 0, 5, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__v3__Int64Range_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -1274,6 +1334,7 @@ UPB_INLINE const struct google_protobuf_UInt64Value* envoy_config_core_v3_Health const struct google_protobuf_UInt64Value* default_val = NULL; const struct google_protobuf_UInt64Value* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt64Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1293,6 +1354,7 @@ UPB_INLINE void envoy_config_core_v3_HealthCheck_HttpHealthCheck_set_path(envoy_ } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HealthCheck__Payload_msg_init); 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) { @@ -1305,6 +1367,7 @@ UPB_INLINE struct envoy_config_core_v3_HealthCheck_Payload* envoy_config_core_v3 } UPB_INLINE envoy_config_core_v3_HealthCheck_Payload** envoy_config_core_v3_HealthCheck_HttpHealthCheck_mutable_receive(envoy_config_core_v3_HealthCheck_HttpHealthCheck* msg, size_t* size) { upb_MiniTableField field = {4, UPB_SIZE(16, 64), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HealthCheck__Payload_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1321,6 +1384,7 @@ UPB_INLINE envoy_config_core_v3_HealthCheck_Payload** envoy_config_core_v3_Healt } UPB_INLINE struct envoy_config_core_v3_HealthCheck_Payload* envoy_config_core_v3_HealthCheck_HttpHealthCheck_add_receive(envoy_config_core_v3_HealthCheck_HttpHealthCheck* msg, upb_Arena* arena) { upb_MiniTableField field = {4, UPB_SIZE(16, 64), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HealthCheck__Payload_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -1335,6 +1399,7 @@ UPB_INLINE struct envoy_config_core_v3_HealthCheck_Payload* envoy_config_core_v3 } UPB_INLINE struct envoy_config_core_v3_HeaderValueOption** envoy_config_core_v3_HealthCheck_HttpHealthCheck_mutable_request_headers_to_add(envoy_config_core_v3_HealthCheck_HttpHealthCheck* msg, size_t* size) { upb_MiniTableField field = {6, UPB_SIZE(20, 72), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HeaderValueOption_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1351,6 +1416,7 @@ UPB_INLINE struct envoy_config_core_v3_HeaderValueOption** envoy_config_core_v3_ } UPB_INLINE struct envoy_config_core_v3_HeaderValueOption* envoy_config_core_v3_HealthCheck_HttpHealthCheck_add_request_headers_to_add(envoy_config_core_v3_HealthCheck_HttpHealthCheck* msg, upb_Arena* arena) { upb_MiniTableField field = {6, UPB_SIZE(20, 72), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HeaderValueOption_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -1393,6 +1459,7 @@ UPB_INLINE bool envoy_config_core_v3_HealthCheck_HttpHealthCheck_add_request_hea } UPB_INLINE struct envoy_type_v3_Int64Range** envoy_config_core_v3_HealthCheck_HttpHealthCheck_mutable_expected_statuses(envoy_config_core_v3_HealthCheck_HttpHealthCheck* msg, size_t* size) { upb_MiniTableField field = {9, UPB_SIZE(28, 88), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__v3__Int64Range_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1409,6 +1476,7 @@ UPB_INLINE struct envoy_type_v3_Int64Range** envoy_config_core_v3_HealthCheck_Ht } UPB_INLINE struct envoy_type_v3_Int64Range* envoy_config_core_v3_HealthCheck_HttpHealthCheck_add_expected_statuses(envoy_config_core_v3_HealthCheck_HttpHealthCheck* msg, upb_Arena* arena) { upb_MiniTableField field = {9, UPB_SIZE(28, 88), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__v3__Int64Range_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -1427,6 +1495,7 @@ UPB_INLINE void envoy_config_core_v3_HealthCheck_HttpHealthCheck_set_codec_clien } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__StringMatcher_msg_init); 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) { @@ -1439,6 +1508,7 @@ UPB_INLINE struct envoy_type_matcher_v3_StringMatcher* envoy_config_core_v3_Heal } UPB_INLINE struct envoy_type_v3_Int64Range** envoy_config_core_v3_HealthCheck_HttpHealthCheck_mutable_retriable_statuses(envoy_config_core_v3_HealthCheck_HttpHealthCheck* msg, size_t* size) { upb_MiniTableField field = {12, UPB_SIZE(40, 104), 0, 5, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__v3__Int64Range_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1455,6 +1525,7 @@ UPB_INLINE struct envoy_type_v3_Int64Range** envoy_config_core_v3_HealthCheck_Ht } UPB_INLINE struct envoy_type_v3_Int64Range* envoy_config_core_v3_HealthCheck_HttpHealthCheck_add_retriable_statuses(envoy_config_core_v3_HealthCheck_HttpHealthCheck* msg, upb_Arena* arena) { upb_MiniTableField field = {12, UPB_SIZE(40, 104), 0, 5, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__v3__Int64Range_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -1473,6 +1544,7 @@ UPB_INLINE void envoy_config_core_v3_HealthCheck_HttpHealthCheck_set_method(envo } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt64Value_msg_init); 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) { @@ -1528,6 +1600,7 @@ UPB_INLINE const envoy_config_core_v3_HealthCheck_Payload* envoy_config_core_v3_ const envoy_config_core_v3_HealthCheck_Payload* default_val = NULL; const envoy_config_core_v3_HealthCheck_Payload* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HealthCheck__Payload_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1542,6 +1615,7 @@ UPB_INLINE void envoy_config_core_v3_HealthCheck_TcpHealthCheck_clear_receive(en } UPB_INLINE const envoy_config_core_v3_HealthCheck_Payload* const* envoy_config_core_v3_HealthCheck_TcpHealthCheck_receive(const envoy_config_core_v3_HealthCheck_TcpHealthCheck* msg, size_t* size) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HealthCheck__Payload_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1553,6 +1627,7 @@ UPB_INLINE const envoy_config_core_v3_HealthCheck_Payload* const* envoy_config_c } UPB_INLINE const upb_Array* _envoy_config_core_v3_HealthCheck_TcpHealthCheck_receive_upb_array(const envoy_config_core_v3_HealthCheck_TcpHealthCheck* msg, size_t* size) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HealthCheck__Payload_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -1561,6 +1636,7 @@ UPB_INLINE const upb_Array* _envoy_config_core_v3_HealthCheck_TcpHealthCheck_rec } UPB_INLINE upb_Array* _envoy_config_core_v3_HealthCheck_TcpHealthCheck_receive_mutable_upb_array(envoy_config_core_v3_HealthCheck_TcpHealthCheck* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HealthCheck__Payload_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -1576,6 +1652,7 @@ UPB_INLINE const struct envoy_config_core_v3_ProxyProtocolConfig* envoy_config_c 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__ProxyProtocolConfig_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1587,6 +1664,7 @@ UPB_INLINE bool envoy_config_core_v3_HealthCheck_TcpHealthCheck_has_proxy_protoc 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HealthCheck__Payload_msg_init); 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) { @@ -1599,6 +1677,7 @@ UPB_INLINE struct envoy_config_core_v3_HealthCheck_Payload* envoy_config_core_v3 } UPB_INLINE envoy_config_core_v3_HealthCheck_Payload** envoy_config_core_v3_HealthCheck_TcpHealthCheck_mutable_receive(envoy_config_core_v3_HealthCheck_TcpHealthCheck* msg, size_t* size) { upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HealthCheck__Payload_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1615,6 +1694,7 @@ UPB_INLINE envoy_config_core_v3_HealthCheck_Payload** envoy_config_core_v3_Healt } UPB_INLINE struct envoy_config_core_v3_HealthCheck_Payload* envoy_config_core_v3_HealthCheck_TcpHealthCheck_add_receive(envoy_config_core_v3_HealthCheck_TcpHealthCheck* msg, upb_Arena* arena) { upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HealthCheck__Payload_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -1629,6 +1709,7 @@ UPB_INLINE struct envoy_config_core_v3_HealthCheck_Payload* envoy_config_core_v3 } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__ProxyProtocolConfig_msg_init); 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) { @@ -1760,6 +1841,7 @@ UPB_INLINE void envoy_config_core_v3_HealthCheck_GrpcHealthCheck_clear_initial_m } UPB_INLINE const struct envoy_config_core_v3_HeaderValueOption* const* envoy_config_core_v3_HealthCheck_GrpcHealthCheck_initial_metadata(const envoy_config_core_v3_HealthCheck_GrpcHealthCheck* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HeaderValueOption_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1771,6 +1853,7 @@ UPB_INLINE const struct envoy_config_core_v3_HeaderValueOption* const* envoy_con } UPB_INLINE const upb_Array* _envoy_config_core_v3_HealthCheck_GrpcHealthCheck_initial_metadata_upb_array(const envoy_config_core_v3_HealthCheck_GrpcHealthCheck* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HeaderValueOption_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -1779,6 +1862,7 @@ UPB_INLINE const upb_Array* _envoy_config_core_v3_HealthCheck_GrpcHealthCheck_in } UPB_INLINE upb_Array* _envoy_config_core_v3_HealthCheck_GrpcHealthCheck_initial_metadata_mutable_upb_array(envoy_config_core_v3_HealthCheck_GrpcHealthCheck* msg, size_t* size, upb_Arena* arena) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HeaderValueOption_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -1797,6 +1881,7 @@ UPB_INLINE void envoy_config_core_v3_HealthCheck_GrpcHealthCheck_set_authority(e } 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HeaderValueOption_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1813,6 +1898,7 @@ UPB_INLINE struct envoy_config_core_v3_HeaderValueOption** envoy_config_core_v3_ } UPB_INLINE struct envoy_config_core_v3_HeaderValueOption* envoy_config_core_v3_HealthCheck_GrpcHealthCheck_add_initial_metadata(envoy_config_core_v3_HealthCheck_GrpcHealthCheck* msg, upb_Arena* arena) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HeaderValueOption_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -1891,6 +1977,7 @@ UPB_INLINE const struct google_protobuf_Any* envoy_config_core_v3_HealthCheck_Cu const struct google_protobuf_Any* default_val = NULL; const struct google_protobuf_Any* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1906,6 +1993,7 @@ UPB_INLINE void envoy_config_core_v3_HealthCheck_CustomHealthCheck_set_name(envo } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); 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) { diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/health_check.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/core/v3/health_check.upb_minitable.c index 5c1b33c1f29..93be2c354ce 100644 --- a/src/core/ext/upb-gen/envoy/config/core/v3/health_check.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/config/core/v3/health_check.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/config/core/v3/health_check.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -27,6 +28,7 @@ // Must be last. #include "upb/port/def.inc" +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); static const upb_MiniTableField envoy_config_core_v3_HealthStatusSet__fields[1] = { {1, 8, 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)}, }; @@ -44,28 +46,29 @@ const upb_MiniTable envoy__config__core__v3__HealthStatusSet_msg_init = { }) }; -static const upb_MiniTableSub envoy_config_core_v3_HealthCheck_submsgs[21] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_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) = &google__protobuf__BoolValue_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HealthCheck__HttpHealthCheck_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HealthCheck__TcpHealthCheck_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HealthCheck__GrpcHealthCheck_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HealthCheck__CustomHealthCheck_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HealthCheck__TlsOptions_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__EventServiceConfig_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Struct_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init}, +const upb_MiniTable* envoy__config__core__v3__HealthStatusSet_msg_init_ptr = &envoy__config__core__v3__HealthStatusSet_msg_init; +static const upb_MiniTableSubInternal envoy_config_core_v3_HealthCheck_submsgs[21] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HealthCheck__HttpHealthCheck_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HealthCheck__TcpHealthCheck_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HealthCheck__GrpcHealthCheck_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HealthCheck__CustomHealthCheck_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HealthCheck__TlsOptions_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__EventServiceConfig_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Struct_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_core_v3_HealthCheck__fields[25] = { @@ -139,6 +142,7 @@ const upb_MiniTable envoy__config__core__v3__HealthCheck_msg_init = { }) }; +const upb_MiniTable* envoy__config__core__v3__HealthCheck_msg_init_ptr = &envoy__config__core__v3__HealthCheck_msg_init; static const upb_MiniTableField envoy_config_core_v3_HealthCheck_Payload__fields[2] = { {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)}, @@ -159,14 +163,15 @@ const upb_MiniTable envoy__config__core__v3__HealthCheck__Payload_msg_init = { }) }; -static const upb_MiniTableSub envoy_config_core_v3_HealthCheck_HttpHealthCheck_submsgs[7] = { - {.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__HeaderValueOption_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__type__v3__Int64Range_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__StringMatcher_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__type__v3__Int64Range_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__UInt64Value_msg_init}, +const upb_MiniTable* envoy__config__core__v3__HealthCheck__Payload_msg_init_ptr = &envoy__config__core__v3__HealthCheck__Payload_msg_init; +static const upb_MiniTableSubInternal envoy_config_core_v3_HealthCheck_HttpHealthCheck_submsgs[7] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HealthCheck__Payload_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HealthCheck__Payload_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HeaderValueOption_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__type__v3__Int64Range_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__StringMatcher_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__type__v3__Int64Range_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt64Value_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_core_v3_HealthCheck_HttpHealthCheck__fields[12] = { @@ -211,10 +216,11 @@ const upb_MiniTable envoy__config__core__v3__HealthCheck__HttpHealthCheck_msg_in }) }; -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}, +const upb_MiniTable* envoy__config__core__v3__HealthCheck__HttpHealthCheck_msg_init_ptr = &envoy__config__core__v3__HealthCheck__HttpHealthCheck_msg_init; +static const upb_MiniTableSubInternal envoy_config_core_v3_HealthCheck_TcpHealthCheck_submsgs[3] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HealthCheck__Payload_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HealthCheck__Payload_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ProxyProtocolConfig_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_core_v3_HealthCheck_TcpHealthCheck__fields[3] = { @@ -238,6 +244,7 @@ const upb_MiniTable envoy__config__core__v3__HealthCheck__TcpHealthCheck_msg_ini }) }; +const upb_MiniTable* envoy__config__core__v3__HealthCheck__TcpHealthCheck_msg_init_ptr = &envoy__config__core__v3__HealthCheck__TcpHealthCheck_msg_init; static const upb_MiniTableField envoy_config_core_v3_HealthCheck_RedisHealthCheck__fields[1] = { {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, }; @@ -255,8 +262,9 @@ const upb_MiniTable envoy__config__core__v3__HealthCheck__RedisHealthCheck_msg_i }) }; -static const upb_MiniTableSub envoy_config_core_v3_HealthCheck_GrpcHealthCheck_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HeaderValueOption_msg_init}, +const upb_MiniTable* envoy__config__core__v3__HealthCheck__RedisHealthCheck_msg_init_ptr = &envoy__config__core__v3__HealthCheck__RedisHealthCheck_msg_init; +static const upb_MiniTableSubInternal envoy_config_core_v3_HealthCheck_GrpcHealthCheck_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HeaderValueOption_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_core_v3_HealthCheck_GrpcHealthCheck__fields[3] = { @@ -280,8 +288,9 @@ const upb_MiniTable envoy__config__core__v3__HealthCheck__GrpcHealthCheck_msg_in }) }; -static const upb_MiniTableSub envoy_config_core_v3_HealthCheck_CustomHealthCheck_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init}, +const upb_MiniTable* envoy__config__core__v3__HealthCheck__GrpcHealthCheck_msg_init_ptr = &envoy__config__core__v3__HealthCheck__GrpcHealthCheck_msg_init; +static const upb_MiniTableSubInternal envoy_config_core_v3_HealthCheck_CustomHealthCheck_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_core_v3_HealthCheck_CustomHealthCheck__fields[2] = { @@ -304,6 +313,7 @@ const upb_MiniTable envoy__config__core__v3__HealthCheck__CustomHealthCheck_msg_ }) }; +const upb_MiniTable* envoy__config__core__v3__HealthCheck__CustomHealthCheck_msg_init_ptr = &envoy__config__core__v3__HealthCheck__CustomHealthCheck_msg_init; static const upb_MiniTableField envoy_config_core_v3_HealthCheck_TlsOptions__fields[1] = { {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, }; @@ -321,6 +331,7 @@ const upb_MiniTable envoy__config__core__v3__HealthCheck__TlsOptions_msg_init = }) }; +const upb_MiniTable* envoy__config__core__v3__HealthCheck__TlsOptions_msg_init_ptr = &envoy__config__core__v3__HealthCheck__TlsOptions_msg_init; static const upb_MiniTable *messages_layout[9] = { &envoy__config__core__v3__HealthStatusSet_msg_init, &envoy__config__core__v3__HealthCheck_msg_init, diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/health_check.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/core/v3/health_check.upb_minitable.h index bd761e1e57a..9078b1706b6 100644 --- a/src/core/ext/upb-gen/envoy/config/core/v3/health_check.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/config/core/v3/health_check.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/config/core/v3/health_check.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_CORE_V3_HEALTH_CHECK_PROTO_UPB_MINITABLE_H_ #define ENVOY_CONFIG_CORE_V3_HEALTH_CHECK_PROTO_UPB_MINITABLE_H_ @@ -18,14 +19,23 @@ extern "C" { #endif extern const upb_MiniTable envoy__config__core__v3__HealthStatusSet_msg_init; +extern const upb_MiniTable* envoy__config__core__v3__HealthStatusSet_msg_init_ptr; extern const upb_MiniTable envoy__config__core__v3__HealthCheck_msg_init; +extern const upb_MiniTable* envoy__config__core__v3__HealthCheck_msg_init_ptr; extern const upb_MiniTable envoy__config__core__v3__HealthCheck__Payload_msg_init; +extern const upb_MiniTable* envoy__config__core__v3__HealthCheck__Payload_msg_init_ptr; extern const upb_MiniTable envoy__config__core__v3__HealthCheck__HttpHealthCheck_msg_init; +extern const upb_MiniTable* envoy__config__core__v3__HealthCheck__HttpHealthCheck_msg_init_ptr; extern const upb_MiniTable envoy__config__core__v3__HealthCheck__TcpHealthCheck_msg_init; +extern const upb_MiniTable* envoy__config__core__v3__HealthCheck__TcpHealthCheck_msg_init_ptr; extern const upb_MiniTable envoy__config__core__v3__HealthCheck__RedisHealthCheck_msg_init; +extern const upb_MiniTable* envoy__config__core__v3__HealthCheck__RedisHealthCheck_msg_init_ptr; extern const upb_MiniTable envoy__config__core__v3__HealthCheck__GrpcHealthCheck_msg_init; +extern const upb_MiniTable* envoy__config__core__v3__HealthCheck__GrpcHealthCheck_msg_init_ptr; extern const upb_MiniTable envoy__config__core__v3__HealthCheck__CustomHealthCheck_msg_init; +extern const upb_MiniTable* envoy__config__core__v3__HealthCheck__CustomHealthCheck_msg_init_ptr; extern const upb_MiniTable envoy__config__core__v3__HealthCheck__TlsOptions_msg_init; +extern const upb_MiniTable* envoy__config__core__v3__HealthCheck__TlsOptions_msg_init_ptr; extern const upb_MiniTableFile envoy_config_core_v3_health_check_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/http_service.upb.h b/src/core/ext/upb-gen/envoy/config/core/v3/http_service.upb.h index c3c668f96ab..7c72d09e893 100644 --- a/src/core/ext/upb-gen/envoy/config/core/v3/http_service.upb.h +++ b/src/core/ext/upb-gen/envoy/config/core/v3/http_service.upb.h @@ -3,7 +3,8 @@ * envoy/config/core/v3/http_service.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_CORE_V3_HTTP_SERVICE_PROTO_UPB_H_ #define ENVOY_CONFIG_CORE_V3_HTTP_SERVICE_PROTO_UPB_H_ @@ -74,6 +75,7 @@ UPB_INLINE const struct envoy_config_core_v3_HttpUri* envoy_config_core_v3_HttpS 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HttpUri_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -88,6 +90,7 @@ UPB_INLINE void envoy_config_core_v3_HttpService_clear_request_headers_to_add(en } UPB_INLINE const struct envoy_config_core_v3_HeaderValueOption* const* envoy_config_core_v3_HttpService_request_headers_to_add(const envoy_config_core_v3_HttpService* msg, size_t* size) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HeaderValueOption_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -99,6 +102,7 @@ UPB_INLINE const struct envoy_config_core_v3_HeaderValueOption* const* envoy_con } UPB_INLINE const upb_Array* _envoy_config_core_v3_HttpService_request_headers_to_add_upb_array(const envoy_config_core_v3_HttpService* msg, size_t* size) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HeaderValueOption_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -107,6 +111,7 @@ UPB_INLINE const upb_Array* _envoy_config_core_v3_HttpService_request_headers_to } UPB_INLINE upb_Array* _envoy_config_core_v3_HttpService_request_headers_to_add_mutable_upb_array(envoy_config_core_v3_HttpService* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HeaderValueOption_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -117,6 +122,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HttpUri_msg_init); 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) { @@ -129,6 +135,7 @@ UPB_INLINE struct envoy_config_core_v3_HttpUri* envoy_config_core_v3_HttpService } UPB_INLINE struct envoy_config_core_v3_HeaderValueOption** envoy_config_core_v3_HttpService_mutable_request_headers_to_add(envoy_config_core_v3_HttpService* msg, size_t* size) { upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HeaderValueOption_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -145,6 +152,7 @@ UPB_INLINE struct envoy_config_core_v3_HeaderValueOption** envoy_config_core_v3_ } UPB_INLINE struct envoy_config_core_v3_HeaderValueOption* envoy_config_core_v3_HttpService_add_request_headers_to_add(envoy_config_core_v3_HttpService* msg, upb_Arena* arena) { upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HeaderValueOption_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/http_service.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/core/v3/http_service.upb_minitable.c index 90cd14f86c8..eefb3f86299 100644 --- a/src/core/ext/upb-gen/envoy/config/core/v3/http_service.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/config/core/v3/http_service.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/config/core/v3/http_service.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -16,9 +17,10 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub envoy_config_core_v3_HttpService_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HttpUri_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HeaderValueOption_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal envoy_config_core_v3_HttpService_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HttpUri_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HeaderValueOption_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_core_v3_HttpService__fields[2] = { @@ -41,6 +43,7 @@ const upb_MiniTable envoy__config__core__v3__HttpService_msg_init = { }) }; +const upb_MiniTable* envoy__config__core__v3__HttpService_msg_init_ptr = &envoy__config__core__v3__HttpService_msg_init; static const upb_MiniTable *messages_layout[1] = { &envoy__config__core__v3__HttpService_msg_init, }; diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/http_service.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/core/v3/http_service.upb_minitable.h index 8ddd131f8cc..46ae377eaf5 100644 --- a/src/core/ext/upb-gen/envoy/config/core/v3/http_service.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/config/core/v3/http_service.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/config/core/v3/http_service.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_CORE_V3_HTTP_SERVICE_PROTO_UPB_MINITABLE_H_ #define ENVOY_CONFIG_CORE_V3_HTTP_SERVICE_PROTO_UPB_MINITABLE_H_ @@ -18,6 +19,7 @@ extern "C" { #endif extern const upb_MiniTable envoy__config__core__v3__HttpService_msg_init; +extern const upb_MiniTable* envoy__config__core__v3__HttpService_msg_init_ptr; extern const upb_MiniTableFile envoy_config_core_v3_http_service_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/http_uri.upb.h b/src/core/ext/upb-gen/envoy/config/core/v3/http_uri.upb.h index 06f281871ac..fa9e97e0e1d 100644 --- a/src/core/ext/upb-gen/envoy/config/core/v3/http_uri.upb.h +++ b/src/core/ext/upb-gen/envoy/config/core/v3/http_uri.upb.h @@ -3,7 +3,8 @@ * envoy/config/core/v3/http_uri.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_CORE_V3_HTTP_URI_PROTO_UPB_H_ #define ENVOY_CONFIG_CORE_V3_HTTP_URI_PROTO_UPB_H_ @@ -110,6 +111,7 @@ UPB_INLINE const struct google_protobuf_Duration* envoy_config_core_v3_HttpUri_t const struct google_protobuf_Duration* default_val = NULL; const struct google_protobuf_Duration* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -129,6 +131,7 @@ UPB_INLINE void envoy_config_core_v3_HttpUri_set_cluster(envoy_config_core_v3_Ht } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/http_uri.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/core/v3/http_uri.upb_minitable.c index 9af4b82ff10..b517bd29193 100644 --- a/src/core/ext/upb-gen/envoy/config/core/v3/http_uri.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/config/core/v3/http_uri.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/config/core/v3/http_uri.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -16,8 +17,9 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub envoy_config_core_v3_HttpUri_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal envoy_config_core_v3_HttpUri_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_core_v3_HttpUri__fields[3] = { @@ -41,6 +43,7 @@ const upb_MiniTable envoy__config__core__v3__HttpUri_msg_init = { }) }; +const upb_MiniTable* envoy__config__core__v3__HttpUri_msg_init_ptr = &envoy__config__core__v3__HttpUri_msg_init; static const upb_MiniTable *messages_layout[1] = { &envoy__config__core__v3__HttpUri_msg_init, }; diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/http_uri.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/core/v3/http_uri.upb_minitable.h index a25910b22b7..143e570eadb 100644 --- a/src/core/ext/upb-gen/envoy/config/core/v3/http_uri.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/config/core/v3/http_uri.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/config/core/v3/http_uri.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_CORE_V3_HTTP_URI_PROTO_UPB_MINITABLE_H_ #define ENVOY_CONFIG_CORE_V3_HTTP_URI_PROTO_UPB_MINITABLE_H_ @@ -18,6 +19,7 @@ extern "C" { #endif extern const upb_MiniTable envoy__config__core__v3__HttpUri_msg_init; +extern const upb_MiniTable* envoy__config__core__v3__HttpUri_msg_init_ptr; extern const upb_MiniTableFile envoy_config_core_v3_http_uri_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/protocol.upb.h b/src/core/ext/upb-gen/envoy/config/core/v3/protocol.upb.h index a64136a0ee3..e3cdb760137 100644 --- a/src/core/ext/upb-gen/envoy/config/core/v3/protocol.upb.h +++ b/src/core/ext/upb-gen/envoy/config/core/v3/protocol.upb.h @@ -3,7 +3,8 @@ * envoy/config/core/v3/protocol.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_CORE_V3_PROTOCOL_PROTO_UPB_H_ #define ENVOY_CONFIG_CORE_V3_PROTOCOL_PROTO_UPB_H_ @@ -141,6 +142,7 @@ UPB_INLINE const struct google_protobuf_Duration* envoy_config_core_v3_QuicKeepA 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -157,6 +159,7 @@ UPB_INLINE const struct google_protobuf_Duration* envoy_config_core_v3_QuicKeepA const struct google_protobuf_Duration* default_val = NULL; const struct google_protobuf_Duration* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -168,6 +171,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { @@ -180,6 +184,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { @@ -235,6 +240,7 @@ UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_core_v3_QuicPr const struct google_protobuf_UInt32Value* default_val = NULL; const struct google_protobuf_UInt32Value* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -251,6 +257,7 @@ UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_core_v3_QuicPr const struct google_protobuf_UInt32Value* default_val = NULL; const struct google_protobuf_UInt32Value* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -267,6 +274,7 @@ UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_core_v3_QuicPr const struct google_protobuf_UInt32Value* default_val = NULL; const struct google_protobuf_UInt32Value* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -283,6 +291,7 @@ UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_core_v3_QuicPr const struct google_protobuf_UInt32Value* default_val = NULL; const struct google_protobuf_UInt32Value* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -299,6 +308,7 @@ UPB_INLINE const envoy_config_core_v3_QuicKeepAliveSettings* envoy_config_core_v const envoy_config_core_v3_QuicKeepAliveSettings* default_val = NULL; const envoy_config_core_v3_QuicKeepAliveSettings* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__QuicKeepAliveSettings_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -339,6 +349,7 @@ UPB_INLINE const struct google_protobuf_Duration* envoy_config_core_v3_QuicProto 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -350,6 +361,7 @@ UPB_INLINE bool envoy_config_core_v3_QuicProtocolOptions_has_idle_network_timeou 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); 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) { @@ -362,6 +374,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); 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) { @@ -374,6 +387,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); 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) { @@ -386,6 +400,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); 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) { @@ -398,6 +413,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__QuicKeepAliveSettings_msg_init); 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) { @@ -418,6 +434,7 @@ UPB_INLINE void envoy_config_core_v3_QuicProtocolOptions_set_client_connection_o } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { @@ -571,6 +588,7 @@ UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_core_v3_Altern const struct google_protobuf_UInt32Value* default_val = NULL; const struct google_protobuf_UInt32Value* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -587,6 +605,7 @@ UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_ const struct envoy_config_core_v3_TypedExtensionConfig* default_val = NULL; const struct envoy_config_core_v3_TypedExtensionConfig* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -601,6 +620,7 @@ UPB_INLINE void envoy_config_core_v3_AlternateProtocolsCacheOptions_clear_prepop } UPB_INLINE const envoy_config_core_v3_AlternateProtocolsCacheOptions_AlternateProtocolsCacheEntry* const* envoy_config_core_v3_AlternateProtocolsCacheOptions_prepopulated_entries(const envoy_config_core_v3_AlternateProtocolsCacheOptions* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__AlternateProtocolsCacheOptions__AlternateProtocolsCacheEntry_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -612,6 +632,7 @@ UPB_INLINE const envoy_config_core_v3_AlternateProtocolsCacheOptions_AlternatePr } UPB_INLINE const upb_Array* _envoy_config_core_v3_AlternateProtocolsCacheOptions_prepopulated_entries_upb_array(const envoy_config_core_v3_AlternateProtocolsCacheOptions* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__AlternateProtocolsCacheOptions__AlternateProtocolsCacheEntry_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -620,6 +641,7 @@ UPB_INLINE const upb_Array* _envoy_config_core_v3_AlternateProtocolsCacheOptions } UPB_INLINE upb_Array* _envoy_config_core_v3_AlternateProtocolsCacheOptions_prepopulated_entries_mutable_upb_array(envoy_config_core_v3_AlternateProtocolsCacheOptions* msg, size_t* size, upb_Arena* arena) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__AlternateProtocolsCacheOptions__AlternateProtocolsCacheEntry_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -666,6 +688,7 @@ UPB_INLINE void envoy_config_core_v3_AlternateProtocolsCacheOptions_set_name(env } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); 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) { @@ -678,6 +701,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); 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) { @@ -690,6 +714,7 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_core_v } UPB_INLINE envoy_config_core_v3_AlternateProtocolsCacheOptions_AlternateProtocolsCacheEntry** envoy_config_core_v3_AlternateProtocolsCacheOptions_mutable_prepopulated_entries(envoy_config_core_v3_AlternateProtocolsCacheOptions* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__AlternateProtocolsCacheOptions__AlternateProtocolsCacheEntry_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -706,6 +731,7 @@ UPB_INLINE envoy_config_core_v3_AlternateProtocolsCacheOptions_AlternateProtocol } UPB_INLINE struct envoy_config_core_v3_AlternateProtocolsCacheOptions_AlternateProtocolsCacheEntry* envoy_config_core_v3_AlternateProtocolsCacheOptions_add_prepopulated_entries(envoy_config_core_v3_AlternateProtocolsCacheOptions* msg, upb_Arena* arena) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__AlternateProtocolsCacheOptions__AlternateProtocolsCacheEntry_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -861,6 +887,7 @@ UPB_INLINE const struct google_protobuf_Duration* envoy_config_core_v3_HttpProto 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -877,6 +904,7 @@ UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_core_v3_HttpPr const struct google_protobuf_UInt32Value* default_val = NULL; const struct google_protobuf_UInt32Value* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -893,6 +921,7 @@ UPB_INLINE const struct google_protobuf_Duration* envoy_config_core_v3_HttpProto const struct google_protobuf_Duration* default_val = NULL; const struct google_protobuf_Duration* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -909,6 +938,7 @@ UPB_INLINE const struct google_protobuf_Duration* envoy_config_core_v3_HttpProto const struct google_protobuf_Duration* default_val = NULL; const struct google_protobuf_Duration* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -937,6 +967,7 @@ UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_core_v3_HttpPr const struct google_protobuf_UInt32Value* default_val = NULL; const struct google_protobuf_UInt32Value* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -948,6 +979,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { @@ -960,6 +992,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); 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) { @@ -972,6 +1005,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { @@ -984,6 +1018,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { @@ -1000,6 +1035,7 @@ UPB_INLINE void envoy_config_core_v3_HttpProtocolOptions_set_headers_with_unders } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); 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) { @@ -1055,6 +1091,7 @@ UPB_INLINE const struct google_protobuf_BoolValue* envoy_config_core_v3_Http1Pro const struct google_protobuf_BoolValue* default_val = NULL; const struct google_protobuf_BoolValue* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1095,6 +1132,7 @@ UPB_INLINE const envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat* envo const envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat* default_val = NULL; const envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Http1ProtocolOptions__HeaderKeyFormat_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1135,6 +1173,7 @@ UPB_INLINE const struct google_protobuf_BoolValue* envoy_config_core_v3_Http1Pro const struct google_protobuf_BoolValue* default_val = NULL; const struct google_protobuf_BoolValue* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1163,6 +1202,7 @@ UPB_INLINE const struct google_protobuf_BoolValue* envoy_config_core_v3_Http1Pro const struct google_protobuf_BoolValue* default_val = NULL; const struct google_protobuf_BoolValue* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1186,6 +1226,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); 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) { @@ -1206,6 +1247,7 @@ UPB_INLINE void envoy_config_core_v3_Http1ProtocolOptions_set_default_host_for_h } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Http1ProtocolOptions__HeaderKeyFormat_msg_init); 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) { @@ -1226,6 +1268,7 @@ UPB_INLINE void envoy_config_core_v3_Http1ProtocolOptions_set_allow_chunked_leng } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); 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) { @@ -1242,6 +1285,7 @@ UPB_INLINE void envoy_config_core_v3_Http1ProtocolOptions_set_send_fully_qualifi } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); 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) { @@ -1311,6 +1355,7 @@ UPB_INLINE const envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_Prope const envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_ProperCaseWords* default_val = NULL; const envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_ProperCaseWords* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Http1ProtocolOptions__HeaderKeyFormat__ProperCaseWords_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1327,6 +1372,7 @@ UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_ const struct envoy_config_core_v3_TypedExtensionConfig* default_val = NULL; const struct envoy_config_core_v3_TypedExtensionConfig* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1338,6 +1384,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Http1ProtocolOptions__HeaderKeyFormat__ProperCaseWords_msg_init); 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) { @@ -1350,6 +1397,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); 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) { @@ -1443,6 +1491,7 @@ UPB_INLINE const struct google_protobuf_Duration* envoy_config_core_v3_Keepalive 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1459,6 +1508,7 @@ UPB_INLINE const struct google_protobuf_Duration* envoy_config_core_v3_Keepalive const struct google_protobuf_Duration* default_val = NULL; const struct google_protobuf_Duration* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1475,6 +1525,7 @@ UPB_INLINE const struct envoy_type_v3_Percent* envoy_config_core_v3_KeepaliveSet const struct envoy_type_v3_Percent* default_val = NULL; const struct envoy_type_v3_Percent* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__v3__Percent_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1491,6 +1542,7 @@ UPB_INLINE const struct google_protobuf_Duration* envoy_config_core_v3_Keepalive const struct google_protobuf_Duration* default_val = NULL; const struct google_protobuf_Duration* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1502,6 +1554,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { @@ -1514,6 +1567,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { @@ -1526,6 +1580,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__v3__Percent_msg_init); 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) { @@ -1538,6 +1593,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { @@ -1593,6 +1649,7 @@ UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_core_v3_Http2P const struct google_protobuf_UInt32Value* default_val = NULL; const struct google_protobuf_UInt32Value* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1609,6 +1666,7 @@ UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_core_v3_Http2P const struct google_protobuf_UInt32Value* default_val = NULL; const struct google_protobuf_UInt32Value* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1625,6 +1683,7 @@ UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_core_v3_Http2P const struct google_protobuf_UInt32Value* default_val = NULL; const struct google_protobuf_UInt32Value* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1641,6 +1700,7 @@ UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_core_v3_Http2P const struct google_protobuf_UInt32Value* default_val = NULL; const struct google_protobuf_UInt32Value* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1681,6 +1741,7 @@ UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_core_v3_Http2P const struct google_protobuf_UInt32Value* default_val = NULL; const struct google_protobuf_UInt32Value* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1697,6 +1758,7 @@ UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_core_v3_Http2P const struct google_protobuf_UInt32Value* default_val = NULL; const struct google_protobuf_UInt32Value* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1713,6 +1775,7 @@ UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_core_v3_Http2P const struct google_protobuf_UInt32Value* default_val = NULL; const struct google_protobuf_UInt32Value* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1729,6 +1792,7 @@ UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_core_v3_Http2P const struct google_protobuf_UInt32Value* default_val = NULL; const struct google_protobuf_UInt32Value* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1745,6 +1809,7 @@ UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_core_v3_Http2P const struct google_protobuf_UInt32Value* default_val = NULL; const struct google_protobuf_UInt32Value* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1771,6 +1836,7 @@ UPB_INLINE void envoy_config_core_v3_Http2ProtocolOptions_clear_custom_settings_ } UPB_INLINE const envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter* const* envoy_config_core_v3_Http2ProtocolOptions_custom_settings_parameters(const envoy_config_core_v3_Http2ProtocolOptions* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Http2ProtocolOptions__SettingsParameter_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1782,6 +1848,7 @@ UPB_INLINE const envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter* co } UPB_INLINE const upb_Array* _envoy_config_core_v3_Http2ProtocolOptions_custom_settings_parameters_upb_array(const envoy_config_core_v3_Http2ProtocolOptions* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Http2ProtocolOptions__SettingsParameter_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -1790,6 +1857,7 @@ UPB_INLINE const upb_Array* _envoy_config_core_v3_Http2ProtocolOptions_custom_se } UPB_INLINE upb_Array* _envoy_config_core_v3_Http2ProtocolOptions_custom_settings_parameters_mutable_upb_array(envoy_config_core_v3_Http2ProtocolOptions* msg, size_t* size, upb_Arena* arena) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Http2ProtocolOptions__SettingsParameter_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -1805,6 +1873,7 @@ UPB_INLINE const struct google_protobuf_BoolValue* envoy_config_core_v3_Http2Pro const struct google_protobuf_BoolValue* default_val = NULL; const struct google_protobuf_BoolValue* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1821,6 +1890,7 @@ UPB_INLINE const envoy_config_core_v3_KeepaliveSettings* envoy_config_core_v3_Ht const envoy_config_core_v3_KeepaliveSettings* default_val = NULL; const envoy_config_core_v3_KeepaliveSettings* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__KeepaliveSettings_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1837,6 +1907,7 @@ UPB_INLINE const struct google_protobuf_BoolValue* envoy_config_core_v3_Http2Pro const struct google_protobuf_BoolValue* default_val = NULL; const struct google_protobuf_BoolValue* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1848,6 +1919,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); 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) { @@ -1860,6 +1932,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); 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) { @@ -1872,6 +1945,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); 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) { @@ -1884,6 +1958,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); 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) { @@ -1904,6 +1979,7 @@ UPB_INLINE void envoy_config_core_v3_Http2ProtocolOptions_set_allow_metadata(env } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); 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) { @@ -1916,6 +1992,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); 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) { @@ -1928,6 +2005,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); 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) { @@ -1940,6 +2018,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); 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) { @@ -1952,6 +2031,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); 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) { @@ -1968,6 +2048,7 @@ UPB_INLINE void envoy_config_core_v3_Http2ProtocolOptions_set_stream_error_on_in } 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Http2ProtocolOptions__SettingsParameter_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1984,6 +2065,7 @@ UPB_INLINE envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter** envoy_c } UPB_INLINE struct envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter* envoy_config_core_v3_Http2ProtocolOptions_add_custom_settings_parameters(envoy_config_core_v3_Http2ProtocolOptions* msg, upb_Arena* arena) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Http2ProtocolOptions__SettingsParameter_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -1998,6 +2080,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); 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) { @@ -2010,6 +2093,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__KeepaliveSettings_msg_init); 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) { @@ -2022,6 +2106,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); 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) { @@ -2077,6 +2162,7 @@ UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_core_v3_Http2P const struct google_protobuf_UInt32Value* default_val = NULL; const struct google_protobuf_UInt32Value* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -2093,6 +2179,7 @@ UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_core_v3_Http2P const struct google_protobuf_UInt32Value* default_val = NULL; const struct google_protobuf_UInt32Value* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -2104,6 +2191,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); 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) { @@ -2116,6 +2204,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); 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) { @@ -2171,6 +2260,7 @@ UPB_INLINE const envoy_config_core_v3_Http2ProtocolOptions* envoy_config_core_v3 const envoy_config_core_v3_Http2ProtocolOptions* default_val = NULL; const envoy_config_core_v3_Http2ProtocolOptions* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Http2ProtocolOptions_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -2182,6 +2272,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Http2ProtocolOptions_msg_init); 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) { @@ -2237,6 +2328,7 @@ UPB_INLINE const envoy_config_core_v3_QuicProtocolOptions* envoy_config_core_v3_ const envoy_config_core_v3_QuicProtocolOptions* default_val = NULL; const envoy_config_core_v3_QuicProtocolOptions* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__QuicProtocolOptions_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -2253,6 +2345,7 @@ UPB_INLINE const struct google_protobuf_BoolValue* envoy_config_core_v3_Http3Pro const struct google_protobuf_BoolValue* default_val = NULL; const struct google_protobuf_BoolValue* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -2288,6 +2381,7 @@ UPB_INLINE bool envoy_config_core_v3_Http3ProtocolOptions_allow_metadata(const e 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__QuicProtocolOptions_msg_init); 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) { @@ -2300,6 +2394,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); 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) { diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/protocol.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/core/v3/protocol.upb_minitable.c index 2ddb41826e1..8b7df6696dd 100644 --- a/src/core/ext/upb-gen/envoy/config/core/v3/protocol.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/config/core/v3/protocol.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/config/core/v3/protocol.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -21,6 +22,7 @@ // Must be last. #include "upb/port/def.inc" +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); const upb_MiniTable envoy__config__core__v3__TcpProtocolOptions_msg_init = { NULL, NULL, @@ -30,9 +32,10 @@ const upb_MiniTable envoy__config__core__v3__TcpProtocolOptions_msg_init = { #endif }; -static const upb_MiniTableSub envoy_config_core_v3_QuicKeepAliveSettings_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, +const upb_MiniTable* envoy__config__core__v3__TcpProtocolOptions_msg_init_ptr = &envoy__config__core__v3__TcpProtocolOptions_msg_init; +static const upb_MiniTableSubInternal envoy_config_core_v3_QuicKeepAliveSettings_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_core_v3_QuicKeepAliveSettings__fields[2] = { @@ -49,13 +52,14 @@ const upb_MiniTable envoy__config__core__v3__QuicKeepAliveSettings_msg_init = { #endif }; -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}, +const upb_MiniTable* envoy__config__core__v3__QuicKeepAliveSettings_msg_init_ptr = &envoy__config__core__v3__QuicKeepAliveSettings_msg_init; +static const upb_MiniTableSubInternal envoy_config_core_v3_QuicProtocolOptions_submsgs[6] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__QuicKeepAliveSettings_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_core_v3_QuicProtocolOptions__fields[8] = { @@ -88,6 +92,7 @@ const upb_MiniTable envoy__config__core__v3__QuicProtocolOptions_msg_init = { }) }; +const upb_MiniTable* envoy__config__core__v3__QuicProtocolOptions_msg_init_ptr = &envoy__config__core__v3__QuicProtocolOptions_msg_init; static const upb_MiniTableField envoy_config_core_v3_UpstreamHttpProtocolOptions__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)}, @@ -109,10 +114,11 @@ const upb_MiniTable envoy__config__core__v3__UpstreamHttpProtocolOptions_msg_ini }) }; -static const upb_MiniTableSub envoy_config_core_v3_AlternateProtocolsCacheOptions_submsgs[3] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__AlternateProtocolsCacheOptions__AlternateProtocolsCacheEntry_msg_init}, +const upb_MiniTable* envoy__config__core__v3__UpstreamHttpProtocolOptions_msg_init_ptr = &envoy__config__core__v3__UpstreamHttpProtocolOptions_msg_init; +static const upb_MiniTableSubInternal envoy_config_core_v3_AlternateProtocolsCacheOptions_submsgs[3] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__AlternateProtocolsCacheOptions__AlternateProtocolsCacheEntry_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_core_v3_AlternateProtocolsCacheOptions__fields[5] = { @@ -142,6 +148,7 @@ const upb_MiniTable envoy__config__core__v3__AlternateProtocolsCacheOptions_msg_ }) }; +const upb_MiniTable* envoy__config__core__v3__AlternateProtocolsCacheOptions_msg_init_ptr = &envoy__config__core__v3__AlternateProtocolsCacheOptions_msg_init; static const upb_MiniTableField envoy_config_core_v3_AlternateProtocolsCacheOptions_AlternateProtocolsCacheEntry__fields[2] = { {1, UPB_SIZE(12, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, {2, 8, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, @@ -162,12 +169,13 @@ const upb_MiniTable envoy__config__core__v3__AlternateProtocolsCacheOptions__Alt }) }; -static const upb_MiniTableSub envoy_config_core_v3_HttpProtocolOptions_submsgs[5] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init}, +const upb_MiniTable* envoy__config__core__v3__AlternateProtocolsCacheOptions__AlternateProtocolsCacheEntry_msg_init_ptr = &envoy__config__core__v3__AlternateProtocolsCacheOptions__AlternateProtocolsCacheEntry_msg_init; +static const upb_MiniTableSubInternal envoy_config_core_v3_HttpProtocolOptions_submsgs[5] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_core_v3_HttpProtocolOptions__fields[6] = { @@ -198,11 +206,12 @@ const upb_MiniTable envoy__config__core__v3__HttpProtocolOptions_msg_init = { }) }; -static const upb_MiniTableSub envoy_config_core_v3_Http1ProtocolOptions_submsgs[4] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Http1ProtocolOptions__HeaderKeyFormat_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init}, +const upb_MiniTable* envoy__config__core__v3__HttpProtocolOptions_msg_init_ptr = &envoy__config__core__v3__HttpProtocolOptions_msg_init; +static const upb_MiniTableSubInternal envoy_config_core_v3_Http1ProtocolOptions_submsgs[4] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Http1ProtocolOptions__HeaderKeyFormat_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_core_v3_Http1ProtocolOptions__fields[10] = { @@ -245,9 +254,10 @@ const upb_MiniTable envoy__config__core__v3__Http1ProtocolOptions_msg_init = { }) }; -static const upb_MiniTableSub envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Http1ProtocolOptions__HeaderKeyFormat__ProperCaseWords_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init}, +const upb_MiniTable* envoy__config__core__v3__Http1ProtocolOptions_msg_init_ptr = &envoy__config__core__v3__Http1ProtocolOptions_msg_init; +static const upb_MiniTableSubInternal envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Http1ProtocolOptions__HeaderKeyFormat__ProperCaseWords_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat__fields[2] = { @@ -282,6 +292,7 @@ const upb_MiniTable envoy__config__core__v3__Http1ProtocolOptions__HeaderKeyForm }) }; +const upb_MiniTable* envoy__config__core__v3__Http1ProtocolOptions__HeaderKeyFormat_msg_init_ptr = &envoy__config__core__v3__Http1ProtocolOptions__HeaderKeyFormat_msg_init; const upb_MiniTable envoy__config__core__v3__Http1ProtocolOptions__HeaderKeyFormat__ProperCaseWords_msg_init = { NULL, NULL, @@ -291,11 +302,12 @@ const upb_MiniTable envoy__config__core__v3__Http1ProtocolOptions__HeaderKeyForm #endif }; -static const upb_MiniTableSub envoy_config_core_v3_KeepaliveSettings_submsgs[4] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__type__v3__Percent_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, +const upb_MiniTable* envoy__config__core__v3__Http1ProtocolOptions__HeaderKeyFormat__ProperCaseWords_msg_init_ptr = &envoy__config__core__v3__Http1ProtocolOptions__HeaderKeyFormat__ProperCaseWords_msg_init; +static const upb_MiniTableSubInternal envoy_config_core_v3_KeepaliveSettings_submsgs[4] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__type__v3__Percent_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_core_v3_KeepaliveSettings__fields[4] = { @@ -314,20 +326,21 @@ const upb_MiniTable envoy__config__core__v3__KeepaliveSettings_msg_init = { #endif }; -static const upb_MiniTableSub envoy_config_core_v3_Http2ProtocolOptions_submsgs[13] = { - {.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) = &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) = &google__protobuf__UInt32Value_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Http2ProtocolOptions__SettingsParameter_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__KeepaliveSettings_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init}, +const upb_MiniTable* envoy__config__core__v3__KeepaliveSettings_msg_init_ptr = &envoy__config__core__v3__KeepaliveSettings_msg_init; +static const upb_MiniTableSubInternal envoy_config_core_v3_Http2ProtocolOptions_submsgs[13] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Http2ProtocolOptions__SettingsParameter_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__KeepaliveSettings_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_core_v3_Http2ProtocolOptions__fields[16] = { @@ -376,9 +389,10 @@ const upb_MiniTable envoy__config__core__v3__Http2ProtocolOptions_msg_init = { }) }; -static const upb_MiniTableSub envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init}, +const upb_MiniTable* envoy__config__core__v3__Http2ProtocolOptions_msg_init_ptr = &envoy__config__core__v3__Http2ProtocolOptions_msg_init; +static const upb_MiniTableSubInternal envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter__fields[2] = { @@ -395,8 +409,9 @@ const upb_MiniTable envoy__config__core__v3__Http2ProtocolOptions__SettingsParam #endif }; -static const upb_MiniTableSub envoy_config_core_v3_GrpcProtocolOptions_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Http2ProtocolOptions_msg_init}, +const upb_MiniTable* envoy__config__core__v3__Http2ProtocolOptions__SettingsParameter_msg_init_ptr = &envoy__config__core__v3__Http2ProtocolOptions__SettingsParameter_msg_init; +static const upb_MiniTableSubInternal envoy_config_core_v3_GrpcProtocolOptions_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Http2ProtocolOptions_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_core_v3_GrpcProtocolOptions__fields[1] = { @@ -412,9 +427,10 @@ const upb_MiniTable envoy__config__core__v3__GrpcProtocolOptions_msg_init = { #endif }; -static const upb_MiniTableSub envoy_config_core_v3_Http3ProtocolOptions_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__QuicProtocolOptions_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init}, +const upb_MiniTable* envoy__config__core__v3__GrpcProtocolOptions_msg_init_ptr = &envoy__config__core__v3__GrpcProtocolOptions_msg_init; +static const upb_MiniTableSubInternal envoy_config_core_v3_Http3ProtocolOptions_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__QuicProtocolOptions_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_core_v3_Http3ProtocolOptions__fields[4] = { @@ -443,6 +459,7 @@ const upb_MiniTable envoy__config__core__v3__Http3ProtocolOptions_msg_init = { }) }; +const upb_MiniTable* envoy__config__core__v3__Http3ProtocolOptions_msg_init_ptr = &envoy__config__core__v3__Http3ProtocolOptions_msg_init; 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)}, @@ -463,6 +480,7 @@ const upb_MiniTable envoy__config__core__v3__SchemeHeaderTransformation_msg_init }) }; +const upb_MiniTable* envoy__config__core__v3__SchemeHeaderTransformation_msg_init_ptr = &envoy__config__core__v3__SchemeHeaderTransformation_msg_init; static const upb_MiniTable *messages_layout[16] = { &envoy__config__core__v3__TcpProtocolOptions_msg_init, &envoy__config__core__v3__QuicKeepAliveSettings_msg_init, diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/protocol.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/core/v3/protocol.upb_minitable.h index 2d5f775a602..81ce39069fa 100644 --- a/src/core/ext/upb-gen/envoy/config/core/v3/protocol.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/config/core/v3/protocol.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/config/core/v3/protocol.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_CORE_V3_PROTOCOL_PROTO_UPB_MINITABLE_H_ #define ENVOY_CONFIG_CORE_V3_PROTOCOL_PROTO_UPB_MINITABLE_H_ @@ -18,21 +19,37 @@ extern "C" { #endif extern const upb_MiniTable envoy__config__core__v3__TcpProtocolOptions_msg_init; +extern const upb_MiniTable* envoy__config__core__v3__TcpProtocolOptions_msg_init_ptr; extern const upb_MiniTable envoy__config__core__v3__QuicKeepAliveSettings_msg_init; +extern const upb_MiniTable* envoy__config__core__v3__QuicKeepAliveSettings_msg_init_ptr; extern const upb_MiniTable envoy__config__core__v3__QuicProtocolOptions_msg_init; +extern const upb_MiniTable* envoy__config__core__v3__QuicProtocolOptions_msg_init_ptr; extern const upb_MiniTable envoy__config__core__v3__UpstreamHttpProtocolOptions_msg_init; +extern const upb_MiniTable* envoy__config__core__v3__UpstreamHttpProtocolOptions_msg_init_ptr; extern const upb_MiniTable envoy__config__core__v3__AlternateProtocolsCacheOptions_msg_init; +extern const upb_MiniTable* envoy__config__core__v3__AlternateProtocolsCacheOptions_msg_init_ptr; extern const upb_MiniTable envoy__config__core__v3__AlternateProtocolsCacheOptions__AlternateProtocolsCacheEntry_msg_init; +extern const upb_MiniTable* envoy__config__core__v3__AlternateProtocolsCacheOptions__AlternateProtocolsCacheEntry_msg_init_ptr; extern const upb_MiniTable envoy__config__core__v3__HttpProtocolOptions_msg_init; +extern const upb_MiniTable* envoy__config__core__v3__HttpProtocolOptions_msg_init_ptr; extern const upb_MiniTable envoy__config__core__v3__Http1ProtocolOptions_msg_init; +extern const upb_MiniTable* envoy__config__core__v3__Http1ProtocolOptions_msg_init_ptr; extern const upb_MiniTable envoy__config__core__v3__Http1ProtocolOptions__HeaderKeyFormat_msg_init; +extern const upb_MiniTable* envoy__config__core__v3__Http1ProtocolOptions__HeaderKeyFormat_msg_init_ptr; extern const upb_MiniTable envoy__config__core__v3__Http1ProtocolOptions__HeaderKeyFormat__ProperCaseWords_msg_init; +extern const upb_MiniTable* envoy__config__core__v3__Http1ProtocolOptions__HeaderKeyFormat__ProperCaseWords_msg_init_ptr; extern const upb_MiniTable envoy__config__core__v3__KeepaliveSettings_msg_init; +extern const upb_MiniTable* envoy__config__core__v3__KeepaliveSettings_msg_init_ptr; extern const upb_MiniTable envoy__config__core__v3__Http2ProtocolOptions_msg_init; +extern const upb_MiniTable* envoy__config__core__v3__Http2ProtocolOptions_msg_init_ptr; extern const upb_MiniTable envoy__config__core__v3__Http2ProtocolOptions__SettingsParameter_msg_init; +extern const upb_MiniTable* envoy__config__core__v3__Http2ProtocolOptions__SettingsParameter_msg_init_ptr; extern const upb_MiniTable envoy__config__core__v3__GrpcProtocolOptions_msg_init; +extern const upb_MiniTable* envoy__config__core__v3__GrpcProtocolOptions_msg_init_ptr; extern const upb_MiniTable envoy__config__core__v3__Http3ProtocolOptions_msg_init; +extern const upb_MiniTable* envoy__config__core__v3__Http3ProtocolOptions_msg_init_ptr; extern const upb_MiniTable envoy__config__core__v3__SchemeHeaderTransformation_msg_init; +extern const upb_MiniTable* envoy__config__core__v3__SchemeHeaderTransformation_msg_init_ptr; extern const upb_MiniTableFile envoy_config_core_v3_protocol_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/proxy_protocol.upb.h b/src/core/ext/upb-gen/envoy/config/core/v3/proxy_protocol.upb.h index 2fb901534fb..69bfb167094 100644 --- a/src/core/ext/upb-gen/envoy/config/core/v3/proxy_protocol.upb.h +++ b/src/core/ext/upb-gen/envoy/config/core/v3/proxy_protocol.upb.h @@ -3,7 +3,8 @@ * envoy/config/core/v3/proxy_protocol.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_CORE_V3_PROXY_PROTOCOL_PROTO_UPB_H_ #define ENVOY_CONFIG_CORE_V3_PROXY_PROTOCOL_PROTO_UPB_H_ @@ -207,6 +208,7 @@ UPB_INLINE const envoy_config_core_v3_ProxyProtocolPassThroughTLVs* envoy_config const envoy_config_core_v3_ProxyProtocolPassThroughTLVs* default_val = NULL; const envoy_config_core_v3_ProxyProtocolPassThroughTLVs* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__ProxyProtocolPassThroughTLVs_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -222,6 +224,7 @@ UPB_INLINE void envoy_config_core_v3_ProxyProtocolConfig_set_version(envoy_confi } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__ProxyProtocolPassThroughTLVs_msg_init); 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) { diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/proxy_protocol.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/core/v3/proxy_protocol.upb_minitable.c index cb906093364..518271704af 100644 --- a/src/core/ext/upb-gen/envoy/config/core/v3/proxy_protocol.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/config/core/v3/proxy_protocol.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/config/core/v3/proxy_protocol.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -14,6 +15,7 @@ // Must be last. #include "upb/port/def.inc" +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); static const upb_MiniTableField envoy_config_core_v3_ProxyProtocolPassThroughTLVs__fields[2] = { {1, 8, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, {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)}, @@ -34,8 +36,9 @@ const upb_MiniTable envoy__config__core__v3__ProxyProtocolPassThroughTLVs_msg_in }) }; -static const upb_MiniTableSub envoy_config_core_v3_ProxyProtocolConfig_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ProxyProtocolPassThroughTLVs_msg_init}, +const upb_MiniTable* envoy__config__core__v3__ProxyProtocolPassThroughTLVs_msg_init_ptr = &envoy__config__core__v3__ProxyProtocolPassThroughTLVs_msg_init; +static const upb_MiniTableSubInternal envoy_config_core_v3_ProxyProtocolConfig_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ProxyProtocolPassThroughTLVs_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_core_v3_ProxyProtocolConfig__fields[2] = { @@ -56,6 +59,7 @@ const upb_MiniTable envoy__config__core__v3__ProxyProtocolConfig_msg_init = { }) }; +const upb_MiniTable* envoy__config__core__v3__ProxyProtocolConfig_msg_init_ptr = &envoy__config__core__v3__ProxyProtocolConfig_msg_init; static const upb_MiniTable *messages_layout[2] = { &envoy__config__core__v3__ProxyProtocolPassThroughTLVs_msg_init, &envoy__config__core__v3__ProxyProtocolConfig_msg_init, diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/proxy_protocol.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/core/v3/proxy_protocol.upb_minitable.h index 2df5f85f6ea..a0a769b6f08 100644 --- a/src/core/ext/upb-gen/envoy/config/core/v3/proxy_protocol.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/config/core/v3/proxy_protocol.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/config/core/v3/proxy_protocol.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_CORE_V3_PROXY_PROTOCOL_PROTO_UPB_MINITABLE_H_ #define ENVOY_CONFIG_CORE_V3_PROXY_PROTOCOL_PROTO_UPB_MINITABLE_H_ @@ -18,7 +19,9 @@ extern "C" { #endif extern const upb_MiniTable envoy__config__core__v3__ProxyProtocolPassThroughTLVs_msg_init; +extern const upb_MiniTable* envoy__config__core__v3__ProxyProtocolPassThroughTLVs_msg_init_ptr; extern const upb_MiniTable envoy__config__core__v3__ProxyProtocolConfig_msg_init; +extern const upb_MiniTable* envoy__config__core__v3__ProxyProtocolConfig_msg_init_ptr; extern const upb_MiniTableFile envoy_config_core_v3_proxy_protocol_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/resolver.upb.h b/src/core/ext/upb-gen/envoy/config/core/v3/resolver.upb.h index db6fc0bcc4d..9b745f5d108 100644 --- a/src/core/ext/upb-gen/envoy/config/core/v3/resolver.upb.h +++ b/src/core/ext/upb-gen/envoy/config/core/v3/resolver.upb.h @@ -3,7 +3,8 @@ * envoy/config/core/v3/resolver.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_CORE_V3_RESOLVER_PROTO_UPB_H_ #define ENVOY_CONFIG_CORE_V3_RESOLVER_PROTO_UPB_H_ @@ -141,6 +142,7 @@ UPB_INLINE void envoy_config_core_v3_DnsResolutionConfig_clear_resolvers(envoy_c } UPB_INLINE const struct envoy_config_core_v3_Address* const* envoy_config_core_v3_DnsResolutionConfig_resolvers(const envoy_config_core_v3_DnsResolutionConfig* msg, size_t* size) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Address_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -152,6 +154,7 @@ UPB_INLINE const struct envoy_config_core_v3_Address* const* envoy_config_core_v } UPB_INLINE const upb_Array* _envoy_config_core_v3_DnsResolutionConfig_resolvers_upb_array(const envoy_config_core_v3_DnsResolutionConfig* msg, size_t* size) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Address_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -160,6 +163,7 @@ UPB_INLINE const upb_Array* _envoy_config_core_v3_DnsResolutionConfig_resolvers_ } UPB_INLINE upb_Array* _envoy_config_core_v3_DnsResolutionConfig_resolvers_mutable_upb_array(envoy_config_core_v3_DnsResolutionConfig* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Address_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -175,6 +179,7 @@ UPB_INLINE const envoy_config_core_v3_DnsResolverOptions* envoy_config_core_v3_D const envoy_config_core_v3_DnsResolverOptions* default_val = NULL; const envoy_config_core_v3_DnsResolverOptions* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__DnsResolverOptions_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -186,6 +191,7 @@ UPB_INLINE bool envoy_config_core_v3_DnsResolutionConfig_has_dns_resolver_option UPB_INLINE struct envoy_config_core_v3_Address** envoy_config_core_v3_DnsResolutionConfig_mutable_resolvers(envoy_config_core_v3_DnsResolutionConfig* msg, size_t* size) { upb_MiniTableField field = {1, UPB_SIZE(12, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Address_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -202,6 +208,7 @@ UPB_INLINE struct envoy_config_core_v3_Address** envoy_config_core_v3_DnsResolut } UPB_INLINE struct envoy_config_core_v3_Address* envoy_config_core_v3_DnsResolutionConfig_add_resolvers(envoy_config_core_v3_DnsResolutionConfig* msg, upb_Arena* arena) { upb_MiniTableField field = {1, UPB_SIZE(12, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Address_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -216,6 +223,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__DnsResolverOptions_msg_init); 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) { diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/resolver.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/core/v3/resolver.upb_minitable.c index d40f74c5445..d51a4993058 100644 --- a/src/core/ext/upb-gen/envoy/config/core/v3/resolver.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/config/core/v3/resolver.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/config/core/v3/resolver.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -15,6 +16,7 @@ // Must be last. #include "upb/port/def.inc" +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); static const upb_MiniTableField envoy_config_core_v3_DnsResolverOptions__fields[2] = { {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)}, @@ -35,9 +37,10 @@ const upb_MiniTable envoy__config__core__v3__DnsResolverOptions_msg_init = { }) }; -static const upb_MiniTableSub envoy_config_core_v3_DnsResolutionConfig_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Address_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__DnsResolverOptions_msg_init}, +const upb_MiniTable* envoy__config__core__v3__DnsResolverOptions_msg_init_ptr = &envoy__config__core__v3__DnsResolverOptions_msg_init; +static const upb_MiniTableSubInternal envoy_config_core_v3_DnsResolutionConfig_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Address_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__DnsResolverOptions_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_core_v3_DnsResolutionConfig__fields[2] = { @@ -58,6 +61,7 @@ const upb_MiniTable envoy__config__core__v3__DnsResolutionConfig_msg_init = { }) }; +const upb_MiniTable* envoy__config__core__v3__DnsResolutionConfig_msg_init_ptr = &envoy__config__core__v3__DnsResolutionConfig_msg_init; static const upb_MiniTable *messages_layout[2] = { &envoy__config__core__v3__DnsResolverOptions_msg_init, &envoy__config__core__v3__DnsResolutionConfig_msg_init, diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/resolver.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/core/v3/resolver.upb_minitable.h index 0f70a2a9bc9..11224a9955b 100644 --- a/src/core/ext/upb-gen/envoy/config/core/v3/resolver.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/config/core/v3/resolver.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/config/core/v3/resolver.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_CORE_V3_RESOLVER_PROTO_UPB_MINITABLE_H_ #define ENVOY_CONFIG_CORE_V3_RESOLVER_PROTO_UPB_MINITABLE_H_ @@ -18,7 +19,9 @@ extern "C" { #endif extern const upb_MiniTable envoy__config__core__v3__DnsResolverOptions_msg_init; +extern const upb_MiniTable* envoy__config__core__v3__DnsResolverOptions_msg_init_ptr; extern const upb_MiniTable envoy__config__core__v3__DnsResolutionConfig_msg_init; +extern const upb_MiniTable* envoy__config__core__v3__DnsResolutionConfig_msg_init_ptr; extern const upb_MiniTableFile envoy_config_core_v3_resolver_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/socket_option.upb.h b/src/core/ext/upb-gen/envoy/config/core/v3/socket_option.upb.h index 36fea88752d..de96ce4954a 100644 --- a/src/core/ext/upb-gen/envoy/config/core/v3/socket_option.upb.h +++ b/src/core/ext/upb-gen/envoy/config/core/v3/socket_option.upb.h @@ -3,7 +3,8 @@ * envoy/config/core/v3/socket_option.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_CORE_V3_SOCKET_OPTION_PROTO_UPB_H_ #define ENVOY_CONFIG_CORE_V3_SOCKET_OPTION_PROTO_UPB_H_ @@ -228,6 +229,7 @@ UPB_INLINE void envoy_config_core_v3_SocketOptionsOverride_clear_socket_options( } UPB_INLINE const envoy_config_core_v3_SocketOption* const* envoy_config_core_v3_SocketOptionsOverride_socket_options(const envoy_config_core_v3_SocketOptionsOverride* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__SocketOption_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -239,6 +241,7 @@ UPB_INLINE const envoy_config_core_v3_SocketOption* const* envoy_config_core_v3_ } UPB_INLINE const upb_Array* _envoy_config_core_v3_SocketOptionsOverride_socket_options_upb_array(const envoy_config_core_v3_SocketOptionsOverride* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__SocketOption_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -247,6 +250,7 @@ UPB_INLINE const upb_Array* _envoy_config_core_v3_SocketOptionsOverride_socket_o } UPB_INLINE upb_Array* _envoy_config_core_v3_SocketOptionsOverride_socket_options_mutable_upb_array(envoy_config_core_v3_SocketOptionsOverride* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__SocketOption_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -257,6 +261,7 @@ UPB_INLINE upb_Array* _envoy_config_core_v3_SocketOptionsOverride_socket_options UPB_INLINE envoy_config_core_v3_SocketOption** envoy_config_core_v3_SocketOptionsOverride_mutable_socket_options(envoy_config_core_v3_SocketOptionsOverride* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__SocketOption_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -273,6 +278,7 @@ UPB_INLINE envoy_config_core_v3_SocketOption** envoy_config_core_v3_SocketOption } UPB_INLINE struct envoy_config_core_v3_SocketOption* envoy_config_core_v3_SocketOptionsOverride_add_socket_options(envoy_config_core_v3_SocketOptionsOverride* msg, upb_Arena* arena) { upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__SocketOption_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/socket_option.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/core/v3/socket_option.upb_minitable.c index 7217e7d8ef8..8b75d1e6aa1 100644 --- a/src/core/ext/upb-gen/envoy/config/core/v3/socket_option.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/config/core/v3/socket_option.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/config/core/v3/socket_option.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -15,6 +16,7 @@ // Must be last. #include "upb/port/def.inc" +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); static const upb_MiniTableField envoy_config_core_v3_SocketOption__fields[6] = { {1, UPB_SIZE(16, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, {2, UPB_SIZE(24, 48), 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, @@ -43,8 +45,9 @@ const upb_MiniTable envoy__config__core__v3__SocketOption_msg_init = { }) }; -static const upb_MiniTableSub envoy_config_core_v3_SocketOptionsOverride_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__SocketOption_msg_init}, +const upb_MiniTable* envoy__config__core__v3__SocketOption_msg_init_ptr = &envoy__config__core__v3__SocketOption_msg_init; +static const upb_MiniTableSubInternal envoy_config_core_v3_SocketOptionsOverride_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__SocketOption_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_core_v3_SocketOptionsOverride__fields[1] = { @@ -64,6 +67,7 @@ const upb_MiniTable envoy__config__core__v3__SocketOptionsOverride_msg_init = { }) }; +const upb_MiniTable* envoy__config__core__v3__SocketOptionsOverride_msg_init_ptr = &envoy__config__core__v3__SocketOptionsOverride_msg_init; static const upb_MiniTable *messages_layout[2] = { &envoy__config__core__v3__SocketOption_msg_init, &envoy__config__core__v3__SocketOptionsOverride_msg_init, diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/socket_option.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/core/v3/socket_option.upb_minitable.h index 6a1f2b1b755..c65b232123b 100644 --- a/src/core/ext/upb-gen/envoy/config/core/v3/socket_option.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/config/core/v3/socket_option.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/config/core/v3/socket_option.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_CORE_V3_SOCKET_OPTION_PROTO_UPB_MINITABLE_H_ #define ENVOY_CONFIG_CORE_V3_SOCKET_OPTION_PROTO_UPB_MINITABLE_H_ @@ -18,7 +19,9 @@ extern "C" { #endif extern const upb_MiniTable envoy__config__core__v3__SocketOption_msg_init; +extern const upb_MiniTable* envoy__config__core__v3__SocketOption_msg_init_ptr; extern const upb_MiniTable envoy__config__core__v3__SocketOptionsOverride_msg_init; +extern const upb_MiniTable* envoy__config__core__v3__SocketOptionsOverride_msg_init_ptr; extern const upb_MiniTableFile envoy_config_core_v3_socket_option_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/substitution_format_string.upb.h b/src/core/ext/upb-gen/envoy/config/core/v3/substitution_format_string.upb.h index 0b20dfa98f0..0442752ab6d 100644 --- a/src/core/ext/upb-gen/envoy/config/core/v3/substitution_format_string.upb.h +++ b/src/core/ext/upb-gen/envoy/config/core/v3/substitution_format_string.upb.h @@ -3,7 +3,8 @@ * envoy/config/core/v3/substitution_format_string.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_CORE_V3_SUBSTITUTION_FORMAT_STRING_PROTO_UPB_H_ #define ENVOY_CONFIG_CORE_V3_SUBSTITUTION_FORMAT_STRING_PROTO_UPB_H_ @@ -159,6 +160,7 @@ UPB_INLINE const struct google_protobuf_Struct* envoy_config_core_v3_Substitutio const struct google_protobuf_Struct* default_val = NULL; const struct google_protobuf_Struct* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Struct_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -199,6 +201,7 @@ UPB_INLINE const struct envoy_config_core_v3_DataSource* envoy_config_core_v3_Su const struct envoy_config_core_v3_DataSource* default_val = NULL; const struct envoy_config_core_v3_DataSource* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__DataSource_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -213,6 +216,7 @@ UPB_INLINE void envoy_config_core_v3_SubstitutionFormatString_clear_formatters(e } UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* const* envoy_config_core_v3_SubstitutionFormatString_formatters(const envoy_config_core_v3_SubstitutionFormatString* msg, size_t* size) { const upb_MiniTableField field = {6, UPB_SIZE(16, 48), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -224,6 +228,7 @@ UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* const* envoy_ } UPB_INLINE const upb_Array* _envoy_config_core_v3_SubstitutionFormatString_formatters_upb_array(const envoy_config_core_v3_SubstitutionFormatString* msg, size_t* size) { const upb_MiniTableField field = {6, UPB_SIZE(16, 48), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -232,6 +237,7 @@ UPB_INLINE const upb_Array* _envoy_config_core_v3_SubstitutionFormatString_forma } UPB_INLINE upb_Array* _envoy_config_core_v3_SubstitutionFormatString_formatters_mutable_upb_array(envoy_config_core_v3_SubstitutionFormatString* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {6, UPB_SIZE(16, 48), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -247,6 +253,7 @@ UPB_INLINE const envoy_config_core_v3_JsonFormatOptions* envoy_config_core_v3_Su const envoy_config_core_v3_JsonFormatOptions* default_val = NULL; const envoy_config_core_v3_JsonFormatOptions* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__JsonFormatOptions_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -262,6 +269,7 @@ UPB_INLINE void envoy_config_core_v3_SubstitutionFormatString_set_text_format(en } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Struct_msg_init); 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) { @@ -282,6 +290,7 @@ UPB_INLINE void envoy_config_core_v3_SubstitutionFormatString_set_content_type(e } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__DataSource_msg_init); 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) { @@ -294,6 +303,7 @@ UPB_INLINE struct envoy_config_core_v3_DataSource* envoy_config_core_v3_Substitu } UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig** envoy_config_core_v3_SubstitutionFormatString_mutable_formatters(envoy_config_core_v3_SubstitutionFormatString* msg, size_t* size) { upb_MiniTableField field = {6, UPB_SIZE(16, 48), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -310,6 +320,7 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig** envoy_config_core_ } UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_core_v3_SubstitutionFormatString_add_formatters(envoy_config_core_v3_SubstitutionFormatString* msg, upb_Arena* arena) { upb_MiniTableField field = {6, UPB_SIZE(16, 48), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -324,6 +335,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__JsonFormatOptions_msg_init); 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) { diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/substitution_format_string.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/core/v3/substitution_format_string.upb_minitable.c index b8d3b0e3058..ce65701fd06 100644 --- a/src/core/ext/upb-gen/envoy/config/core/v3/substitution_format_string.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/config/core/v3/substitution_format_string.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/config/core/v3/substitution_format_string.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -18,6 +19,7 @@ // Must be last. #include "upb/port/def.inc" +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); static const upb_MiniTableField envoy_config_core_v3_JsonFormatOptions__fields[1] = { {1, 8, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, }; @@ -35,11 +37,12 @@ const upb_MiniTable envoy__config__core__v3__JsonFormatOptions_msg_init = { }) }; -static const upb_MiniTableSub envoy_config_core_v3_SubstitutionFormatString_submsgs[4] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__Struct_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__DataSource_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__JsonFormatOptions_msg_init}, +const upb_MiniTable* envoy__config__core__v3__JsonFormatOptions_msg_init_ptr = &envoy__config__core__v3__JsonFormatOptions_msg_init; +static const upb_MiniTableSubInternal envoy_config_core_v3_SubstitutionFormatString_submsgs[4] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Struct_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__DataSource_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__JsonFormatOptions_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_core_v3_SubstitutionFormatString__fields[7] = { @@ -71,6 +74,7 @@ const upb_MiniTable envoy__config__core__v3__SubstitutionFormatString_msg_init = }) }; +const upb_MiniTable* envoy__config__core__v3__SubstitutionFormatString_msg_init_ptr = &envoy__config__core__v3__SubstitutionFormatString_msg_init; static const upb_MiniTable *messages_layout[2] = { &envoy__config__core__v3__JsonFormatOptions_msg_init, &envoy__config__core__v3__SubstitutionFormatString_msg_init, diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/substitution_format_string.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/core/v3/substitution_format_string.upb_minitable.h index 04acf5a3285..a18cc1b1e04 100644 --- a/src/core/ext/upb-gen/envoy/config/core/v3/substitution_format_string.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/config/core/v3/substitution_format_string.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/config/core/v3/substitution_format_string.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_CORE_V3_SUBSTITUTION_FORMAT_STRING_PROTO_UPB_MINITABLE_H_ #define ENVOY_CONFIG_CORE_V3_SUBSTITUTION_FORMAT_STRING_PROTO_UPB_MINITABLE_H_ @@ -18,7 +19,9 @@ extern "C" { #endif extern const upb_MiniTable envoy__config__core__v3__JsonFormatOptions_msg_init; +extern const upb_MiniTable* envoy__config__core__v3__JsonFormatOptions_msg_init_ptr; extern const upb_MiniTable envoy__config__core__v3__SubstitutionFormatString_msg_init; +extern const upb_MiniTable* envoy__config__core__v3__SubstitutionFormatString_msg_init_ptr; extern const upb_MiniTableFile envoy_config_core_v3_substitution_format_string_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/udp_socket_config.upb.h b/src/core/ext/upb-gen/envoy/config/core/v3/udp_socket_config.upb.h index 5e6e5f45f11..1de84f71b53 100644 --- a/src/core/ext/upb-gen/envoy/config/core/v3/udp_socket_config.upb.h +++ b/src/core/ext/upb-gen/envoy/config/core/v3/udp_socket_config.upb.h @@ -3,7 +3,8 @@ * envoy/config/core/v3/udp_socket_config.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_CORE_V3_UDP_SOCKET_CONFIG_PROTO_UPB_H_ #define ENVOY_CONFIG_CORE_V3_UDP_SOCKET_CONFIG_PROTO_UPB_H_ @@ -73,6 +74,7 @@ UPB_INLINE const struct google_protobuf_UInt64Value* envoy_config_core_v3_UdpSoc 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt64Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -89,6 +91,7 @@ UPB_INLINE const struct google_protobuf_BoolValue* envoy_config_core_v3_UdpSocke const struct google_protobuf_BoolValue* default_val = NULL; const struct google_protobuf_BoolValue* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -100,6 +103,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt64Value_msg_init); 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) { @@ -112,6 +116,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); 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) { diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/udp_socket_config.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/core/v3/udp_socket_config.upb_minitable.c index 43067151f92..9867e78b4f5 100644 --- a/src/core/ext/upb-gen/envoy/config/core/v3/udp_socket_config.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/config/core/v3/udp_socket_config.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/config/core/v3/udp_socket_config.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -15,9 +16,10 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub envoy_config_core_v3_UdpSocketConfig_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__UInt64Value_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal envoy_config_core_v3_UdpSocketConfig_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt64Value_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_core_v3_UdpSocketConfig__fields[2] = { @@ -34,6 +36,7 @@ const upb_MiniTable envoy__config__core__v3__UdpSocketConfig_msg_init = { #endif }; +const upb_MiniTable* envoy__config__core__v3__UdpSocketConfig_msg_init_ptr = &envoy__config__core__v3__UdpSocketConfig_msg_init; static const upb_MiniTable *messages_layout[1] = { &envoy__config__core__v3__UdpSocketConfig_msg_init, }; diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/udp_socket_config.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/core/v3/udp_socket_config.upb_minitable.h index 070c9d3f418..670fee212a5 100644 --- a/src/core/ext/upb-gen/envoy/config/core/v3/udp_socket_config.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/config/core/v3/udp_socket_config.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/config/core/v3/udp_socket_config.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_CORE_V3_UDP_SOCKET_CONFIG_PROTO_UPB_MINITABLE_H_ #define ENVOY_CONFIG_CORE_V3_UDP_SOCKET_CONFIG_PROTO_UPB_MINITABLE_H_ @@ -18,6 +19,7 @@ extern "C" { #endif extern const upb_MiniTable envoy__config__core__v3__UdpSocketConfig_msg_init; +extern const upb_MiniTable* envoy__config__core__v3__UdpSocketConfig_msg_init_ptr; extern const upb_MiniTableFile envoy_config_core_v3_udp_socket_config_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint.upb.h b/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint.upb.h index 9a1c5025ed8..47b95a2bfd9 100644 --- a/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint.upb.h +++ b/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint.upb.h @@ -3,7 +3,8 @@ * envoy/config/endpoint/v3/endpoint.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_PROTO_UPB_H_ #define ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_PROTO_UPB_H_ @@ -93,6 +94,7 @@ UPB_INLINE void envoy_config_endpoint_v3_ClusterLoadAssignment_clear_endpoints(e } UPB_INLINE const struct envoy_config_endpoint_v3_LocalityLbEndpoints* const* envoy_config_endpoint_v3_ClusterLoadAssignment_endpoints(const envoy_config_endpoint_v3_ClusterLoadAssignment* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__endpoint__v3__LocalityLbEndpoints_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -104,6 +106,7 @@ UPB_INLINE const struct envoy_config_endpoint_v3_LocalityLbEndpoints* const* env } UPB_INLINE const upb_Array* _envoy_config_endpoint_v3_ClusterLoadAssignment_endpoints_upb_array(const envoy_config_endpoint_v3_ClusterLoadAssignment* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__endpoint__v3__LocalityLbEndpoints_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -112,6 +115,7 @@ UPB_INLINE const upb_Array* _envoy_config_endpoint_v3_ClusterLoadAssignment_endp } UPB_INLINE upb_Array* _envoy_config_endpoint_v3_ClusterLoadAssignment_endpoints_mutable_upb_array(envoy_config_endpoint_v3_ClusterLoadAssignment* msg, size_t* size, upb_Arena* arena) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__endpoint__v3__LocalityLbEndpoints_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -127,6 +131,7 @@ UPB_INLINE const envoy_config_endpoint_v3_ClusterLoadAssignment_Policy* envoy_co const envoy_config_endpoint_v3_ClusterLoadAssignment_Policy* default_val = NULL; const envoy_config_endpoint_v3_ClusterLoadAssignment_Policy* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__endpoint__v3__ClusterLoadAssignment__Policy_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -146,22 +151,30 @@ UPB_INLINE size_t envoy_config_endpoint_v3_ClusterLoadAssignment_named_endpoints } UPB_INLINE bool envoy_config_endpoint_v3_ClusterLoadAssignment_named_endpoints_get(const envoy_config_endpoint_v3_ClusterLoadAssignment* msg, upb_StringView key, struct envoy_config_endpoint_v3_Endpoint** val) { const upb_MiniTableField field = {5, UPB_SIZE(20, 48), 0, 2, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__endpoint__v3__ClusterLoadAssignment__NamedEndpointsEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__endpoint__v3__Endpoint_msg_init); 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_endpoint_v3_ClusterLoadAssignment_NamedEndpointsEntry* envoy_config_endpoint_v3_ClusterLoadAssignment_named_endpoints_next(const envoy_config_endpoint_v3_ClusterLoadAssignment* msg, size_t* iter) { const upb_MiniTableField field = {5, UPB_SIZE(20, 48), 0, 2, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__endpoint__v3__ClusterLoadAssignment__NamedEndpointsEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__endpoint__v3__Endpoint_msg_init); const upb_Map* map = upb_Message_GetMap(UPB_UPCAST(msg), &field); if (!map) return NULL; return (const envoy_config_endpoint_v3_ClusterLoadAssignment_NamedEndpointsEntry*)_upb_map_next(map, iter); } UPB_INLINE const upb_Map* _envoy_config_endpoint_v3_ClusterLoadAssignment_named_endpoints_upb_map(envoy_config_endpoint_v3_ClusterLoadAssignment* msg) { const upb_MiniTableField field = {5, UPB_SIZE(20, 48), 0, 2, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__endpoint__v3__ClusterLoadAssignment__NamedEndpointsEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__endpoint__v3__Endpoint_msg_init); return upb_Message_GetMap(UPB_UPCAST(msg), &field); } UPB_INLINE upb_Map* _envoy_config_endpoint_v3_ClusterLoadAssignment_named_endpoints_mutable_upb_map(envoy_config_endpoint_v3_ClusterLoadAssignment* msg, upb_Arena* a) { const upb_MiniTableField field = {5, UPB_SIZE(20, 48), 0, 2, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__endpoint__v3__ClusterLoadAssignment__NamedEndpointsEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__endpoint__v3__Endpoint_msg_init); return _upb_Message_GetOrCreateMutableMap(UPB_UPCAST(msg), &field, 0, sizeof(struct envoy_config_endpoint_v3_Endpoint*), a); } @@ -171,6 +184,7 @@ UPB_INLINE void envoy_config_endpoint_v3_ClusterLoadAssignment_set_cluster_name( } 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__endpoint__v3__LocalityLbEndpoints_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -187,6 +201,7 @@ UPB_INLINE struct envoy_config_endpoint_v3_LocalityLbEndpoints** envoy_config_en } UPB_INLINE struct envoy_config_endpoint_v3_LocalityLbEndpoints* envoy_config_endpoint_v3_ClusterLoadAssignment_add_endpoints(envoy_config_endpoint_v3_ClusterLoadAssignment* msg, upb_Arena* arena) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__endpoint__v3__LocalityLbEndpoints_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -201,6 +216,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__endpoint__v3__ClusterLoadAssignment__Policy_msg_init); 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) { @@ -219,6 +235,8 @@ UPB_INLINE void envoy_config_endpoint_v3_ClusterLoadAssignment_named_endpoints_c } UPB_INLINE bool envoy_config_endpoint_v3_ClusterLoadAssignment_named_endpoints_set(envoy_config_endpoint_v3_ClusterLoadAssignment* msg, upb_StringView key, struct envoy_config_endpoint_v3_Endpoint* val, upb_Arena* a) { const upb_MiniTableField field = {5, UPB_SIZE(20, 48), 0, 2, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__endpoint__v3__ClusterLoadAssignment__NamedEndpointsEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__endpoint__v3__Endpoint_msg_init); 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) != @@ -232,6 +250,8 @@ UPB_INLINE bool envoy_config_endpoint_v3_ClusterLoadAssignment_named_endpoints_d } UPB_INLINE envoy_config_endpoint_v3_ClusterLoadAssignment_NamedEndpointsEntry* envoy_config_endpoint_v3_ClusterLoadAssignment_named_endpoints_nextmutable(envoy_config_endpoint_v3_ClusterLoadAssignment* msg, size_t* iter) { const upb_MiniTableField field = {5, UPB_SIZE(20, 48), 0, 2, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__endpoint__v3__ClusterLoadAssignment__NamedEndpointsEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__endpoint__v3__Endpoint_msg_init); upb_Map* map = (upb_Map*)upb_Message_GetMap(UPB_UPCAST(msg), &field); if (!map) return NULL; return (envoy_config_endpoint_v3_ClusterLoadAssignment_NamedEndpointsEntry*)_upb_map_next(map, iter); @@ -279,6 +299,7 @@ UPB_INLINE void envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_clear_drop } UPB_INLINE const envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload* const* envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_drop_overloads(const envoy_config_endpoint_v3_ClusterLoadAssignment_Policy* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__endpoint__v3__ClusterLoadAssignment__Policy__DropOverload_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -290,6 +311,7 @@ UPB_INLINE const envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverl } UPB_INLINE const upb_Array* _envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_drop_overloads_upb_array(const envoy_config_endpoint_v3_ClusterLoadAssignment_Policy* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__endpoint__v3__ClusterLoadAssignment__Policy__DropOverload_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -298,6 +320,7 @@ UPB_INLINE const upb_Array* _envoy_config_endpoint_v3_ClusterLoadAssignment_Poli } UPB_INLINE upb_Array* _envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_drop_overloads_mutable_upb_array(envoy_config_endpoint_v3_ClusterLoadAssignment_Policy* msg, size_t* size, upb_Arena* arena) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__endpoint__v3__ClusterLoadAssignment__Policy__DropOverload_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -313,6 +336,7 @@ UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_endpoint_v3_Cl const struct google_protobuf_UInt32Value* default_val = NULL; const struct google_protobuf_UInt32Value* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -329,6 +353,7 @@ UPB_INLINE const struct google_protobuf_Duration* envoy_config_endpoint_v3_Clust const struct google_protobuf_Duration* default_val = NULL; const struct google_protobuf_Duration* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -352,6 +377,7 @@ UPB_INLINE bool envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_weighted_p UPB_INLINE envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload** envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_mutable_drop_overloads(envoy_config_endpoint_v3_ClusterLoadAssignment_Policy* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__endpoint__v3__ClusterLoadAssignment__Policy__DropOverload_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -368,6 +394,7 @@ UPB_INLINE envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload** } UPB_INLINE struct envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload* envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_add_drop_overloads(envoy_config_endpoint_v3_ClusterLoadAssignment_Policy* msg, upb_Arena* arena) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__endpoint__v3__ClusterLoadAssignment__Policy__DropOverload_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -382,6 +409,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); 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) { @@ -394,6 +422,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { @@ -465,6 +494,7 @@ UPB_INLINE const struct envoy_type_v3_FractionalPercent* envoy_config_endpoint_v const struct envoy_type_v3_FractionalPercent* default_val = NULL; const struct envoy_type_v3_FractionalPercent* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__v3__FractionalPercent_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -480,6 +510,7 @@ UPB_INLINE void envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverlo } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__v3__FractionalPercent_msg_init); 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) { diff --git a/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint.upb_minitable.c index 1d55450ee83..efdce57ee23 100644 --- a/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/config/endpoint/v3/endpoint.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -19,10 +20,11 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub envoy_config_endpoint_v3_ClusterLoadAssignment_submsgs[3] = { - {.UPB_PRIVATE(submsg) = &envoy__config__endpoint__v3__LocalityLbEndpoints_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__endpoint__v3__ClusterLoadAssignment__Policy_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__endpoint__v3__ClusterLoadAssignment__NamedEndpointsEntry_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal envoy_config_endpoint_v3_ClusterLoadAssignment_submsgs[3] = { + {.UPB_PRIVATE(submsg) = &envoy__config__endpoint__v3__LocalityLbEndpoints_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__endpoint__v3__ClusterLoadAssignment__Policy_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__endpoint__v3__ClusterLoadAssignment__NamedEndpointsEntry_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_endpoint_v3_ClusterLoadAssignment__fields[4] = { @@ -47,10 +49,11 @@ const upb_MiniTable envoy__config__endpoint__v3__ClusterLoadAssignment_msg_init }) }; -static const upb_MiniTableSub envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_submsgs[3] = { - {.UPB_PRIVATE(submsg) = &envoy__config__endpoint__v3__ClusterLoadAssignment__Policy__DropOverload_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, +const upb_MiniTable* envoy__config__endpoint__v3__ClusterLoadAssignment_msg_init_ptr = &envoy__config__endpoint__v3__ClusterLoadAssignment_msg_init; +static const upb_MiniTableSubInternal envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_submsgs[3] = { + {.UPB_PRIVATE(submsg) = &envoy__config__endpoint__v3__ClusterLoadAssignment__Policy__DropOverload_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_endpoint_v3_ClusterLoadAssignment_Policy__fields[4] = { @@ -79,8 +82,9 @@ const upb_MiniTable envoy__config__endpoint__v3__ClusterLoadAssignment__Policy_m }) }; -static const upb_MiniTableSub envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__type__v3__FractionalPercent_msg_init}, +const upb_MiniTable* envoy__config__endpoint__v3__ClusterLoadAssignment__Policy_msg_init_ptr = &envoy__config__endpoint__v3__ClusterLoadAssignment__Policy_msg_init; +static const upb_MiniTableSubInternal envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__type__v3__FractionalPercent_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload__fields[2] = { @@ -101,8 +105,9 @@ const upb_MiniTable envoy__config__endpoint__v3__ClusterLoadAssignment__Policy__ }) }; -static const upb_MiniTableSub envoy_config_endpoint_v3_ClusterLoadAssignment_NamedEndpointsEntry_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__config__endpoint__v3__Endpoint_msg_init}, +const upb_MiniTable* envoy__config__endpoint__v3__ClusterLoadAssignment__Policy__DropOverload_msg_init_ptr = &envoy__config__endpoint__v3__ClusterLoadAssignment__Policy__DropOverload_msg_init; +static const upb_MiniTableSubInternal envoy_config_endpoint_v3_ClusterLoadAssignment_NamedEndpointsEntry_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__config__endpoint__v3__Endpoint_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_endpoint_v3_ClusterLoadAssignment_NamedEndpointsEntry__fields[2] = { @@ -123,6 +128,7 @@ const upb_MiniTable envoy__config__endpoint__v3__ClusterLoadAssignment__NamedEnd }) }; +const upb_MiniTable* envoy__config__endpoint__v3__ClusterLoadAssignment__NamedEndpointsEntry_msg_init_ptr = &envoy__config__endpoint__v3__ClusterLoadAssignment__NamedEndpointsEntry_msg_init; static const upb_MiniTable *messages_layout[4] = { &envoy__config__endpoint__v3__ClusterLoadAssignment_msg_init, &envoy__config__endpoint__v3__ClusterLoadAssignment__Policy_msg_init, diff --git a/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint.upb_minitable.h index 0205f63b97a..dfeb1d9f684 100644 --- a/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/config/endpoint/v3/endpoint.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_PROTO_UPB_MINITABLE_H_ #define ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_PROTO_UPB_MINITABLE_H_ @@ -18,9 +19,13 @@ extern "C" { #endif extern const upb_MiniTable envoy__config__endpoint__v3__ClusterLoadAssignment_msg_init; +extern const upb_MiniTable* envoy__config__endpoint__v3__ClusterLoadAssignment_msg_init_ptr; extern const upb_MiniTable envoy__config__endpoint__v3__ClusterLoadAssignment__Policy_msg_init; +extern const upb_MiniTable* envoy__config__endpoint__v3__ClusterLoadAssignment__Policy_msg_init_ptr; extern const upb_MiniTable envoy__config__endpoint__v3__ClusterLoadAssignment__Policy__DropOverload_msg_init; +extern const upb_MiniTable* envoy__config__endpoint__v3__ClusterLoadAssignment__Policy__DropOverload_msg_init_ptr; extern const upb_MiniTable envoy__config__endpoint__v3__ClusterLoadAssignment__NamedEndpointsEntry_msg_init; +extern const upb_MiniTable* envoy__config__endpoint__v3__ClusterLoadAssignment__NamedEndpointsEntry_msg_init_ptr; extern const upb_MiniTableFile envoy_config_endpoint_v3_endpoint_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint_components.upb.h b/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint_components.upb.h index 55c49b4cbaa..787315ed415 100644 --- a/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint_components.upb.h +++ b/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint_components.upb.h @@ -3,7 +3,8 @@ * envoy/config/endpoint/v3/endpoint_components.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_COMPONENTS_PROTO_UPB_H_ #define ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_COMPONENTS_PROTO_UPB_H_ @@ -87,6 +88,7 @@ UPB_INLINE const struct envoy_config_core_v3_Address* envoy_config_endpoint_v3_E const struct envoy_config_core_v3_Address* default_val = NULL; const struct envoy_config_core_v3_Address* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Address_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -103,6 +105,7 @@ UPB_INLINE const envoy_config_endpoint_v3_Endpoint_HealthCheckConfig* envoy_conf const envoy_config_endpoint_v3_Endpoint_HealthCheckConfig* default_val = NULL; const envoy_config_endpoint_v3_Endpoint_HealthCheckConfig* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__endpoint__v3__Endpoint__HealthCheckConfig_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -129,6 +132,7 @@ UPB_INLINE void envoy_config_endpoint_v3_Endpoint_clear_additional_addresses(env } UPB_INLINE const envoy_config_endpoint_v3_Endpoint_AdditionalAddress* const* envoy_config_endpoint_v3_Endpoint_additional_addresses(const envoy_config_endpoint_v3_Endpoint* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__endpoint__v3__Endpoint__AdditionalAddress_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -140,6 +144,7 @@ UPB_INLINE const envoy_config_endpoint_v3_Endpoint_AdditionalAddress* const* env } UPB_INLINE const upb_Array* _envoy_config_endpoint_v3_Endpoint_additional_addresses_upb_array(const envoy_config_endpoint_v3_Endpoint* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__endpoint__v3__Endpoint__AdditionalAddress_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -148,6 +153,7 @@ UPB_INLINE const upb_Array* _envoy_config_endpoint_v3_Endpoint_additional_addres } UPB_INLINE upb_Array* _envoy_config_endpoint_v3_Endpoint_additional_addresses_mutable_upb_array(envoy_config_endpoint_v3_Endpoint* msg, size_t* size, upb_Arena* arena) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__endpoint__v3__Endpoint__AdditionalAddress_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -158,6 +164,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Address_msg_init); 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) { @@ -170,6 +177,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__endpoint__v3__Endpoint__HealthCheckConfig_msg_init); 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) { @@ -186,6 +194,7 @@ UPB_INLINE void envoy_config_endpoint_v3_Endpoint_set_hostname(envoy_config_endp } 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__endpoint__v3__Endpoint__AdditionalAddress_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -202,6 +211,7 @@ UPB_INLINE envoy_config_endpoint_v3_Endpoint_AdditionalAddress** envoy_config_en } UPB_INLINE struct envoy_config_endpoint_v3_Endpoint_AdditionalAddress* envoy_config_endpoint_v3_Endpoint_add_additional_addresses(envoy_config_endpoint_v3_Endpoint* msg, upb_Arena* arena) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__endpoint__v3__Endpoint__AdditionalAddress_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -283,6 +293,7 @@ UPB_INLINE const struct envoy_config_core_v3_Address* envoy_config_endpoint_v3_E const struct envoy_config_core_v3_Address* default_val = NULL; const struct envoy_config_core_v3_Address* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Address_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -314,6 +325,7 @@ UPB_INLINE void envoy_config_endpoint_v3_Endpoint_HealthCheckConfig_set_hostname } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Address_msg_init); 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) { @@ -373,6 +385,7 @@ UPB_INLINE const struct envoy_config_core_v3_Address* envoy_config_endpoint_v3_E const struct envoy_config_core_v3_Address* default_val = NULL; const struct envoy_config_core_v3_Address* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Address_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -384,6 +397,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Address_msg_init); 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) { @@ -449,6 +463,7 @@ UPB_INLINE const envoy_config_endpoint_v3_Endpoint* envoy_config_endpoint_v3_LbE const envoy_config_endpoint_v3_Endpoint* default_val = NULL; const envoy_config_endpoint_v3_Endpoint* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__endpoint__v3__Endpoint_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -477,6 +492,7 @@ UPB_INLINE const struct envoy_config_core_v3_Metadata* envoy_config_endpoint_v3_ const struct envoy_config_core_v3_Metadata* default_val = NULL; const struct envoy_config_core_v3_Metadata* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Metadata_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -493,6 +509,7 @@ UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_endpoint_v3_Lb const struct google_protobuf_UInt32Value* default_val = NULL; const struct google_protobuf_UInt32Value* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -520,6 +537,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__endpoint__v3__Endpoint_msg_init); 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) { @@ -536,6 +554,7 @@ UPB_INLINE void envoy_config_endpoint_v3_LbEndpoint_set_health_status(envoy_conf } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Metadata_msg_init); 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) { @@ -548,6 +567,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); 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) { @@ -607,6 +627,7 @@ UPB_INLINE const struct envoy_config_core_v3_ConfigSource* envoy_config_endpoint const struct envoy_config_core_v3_ConfigSource* default_val = NULL; const struct envoy_config_core_v3_ConfigSource* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__ConfigSource_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -630,6 +651,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__ConfigSource_msg_init); 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) { @@ -699,6 +721,7 @@ UPB_INLINE const struct envoy_config_core_v3_Locality* envoy_config_endpoint_v3_ const struct envoy_config_core_v3_Locality* default_val = NULL; const struct envoy_config_core_v3_Locality* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Locality_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -713,6 +736,7 @@ UPB_INLINE void envoy_config_endpoint_v3_LocalityLbEndpoints_clear_lb_endpoints( } UPB_INLINE const envoy_config_endpoint_v3_LbEndpoint* const* envoy_config_endpoint_v3_LocalityLbEndpoints_lb_endpoints(const envoy_config_endpoint_v3_LocalityLbEndpoints* msg, size_t* size) { const upb_MiniTableField field = {2, UPB_SIZE(16, 32), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__endpoint__v3__LbEndpoint_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -724,6 +748,7 @@ UPB_INLINE const envoy_config_endpoint_v3_LbEndpoint* const* envoy_config_endpoi } UPB_INLINE const upb_Array* _envoy_config_endpoint_v3_LocalityLbEndpoints_lb_endpoints_upb_array(const envoy_config_endpoint_v3_LocalityLbEndpoints* msg, size_t* size) { const upb_MiniTableField field = {2, UPB_SIZE(16, 32), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__endpoint__v3__LbEndpoint_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -732,6 +757,7 @@ UPB_INLINE const upb_Array* _envoy_config_endpoint_v3_LocalityLbEndpoints_lb_end } UPB_INLINE upb_Array* _envoy_config_endpoint_v3_LocalityLbEndpoints_lb_endpoints_mutable_upb_array(envoy_config_endpoint_v3_LocalityLbEndpoints* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {2, UPB_SIZE(16, 32), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__endpoint__v3__LbEndpoint_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -747,6 +773,7 @@ UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_endpoint_v3_Lo const struct google_protobuf_UInt32Value* default_val = NULL; const struct google_protobuf_UInt32Value* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -775,6 +802,7 @@ UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_endpoint_v3_Lo const struct google_protobuf_UInt32Value* default_val = NULL; const struct google_protobuf_UInt32Value* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -791,6 +819,7 @@ UPB_INLINE const envoy_config_endpoint_v3_LocalityLbEndpoints_LbEndpointList* en 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(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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__endpoint__v3__LocalityLbEndpoints__LbEndpointList_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -807,6 +836,7 @@ UPB_INLINE const envoy_config_endpoint_v3_LedsClusterLocalityConfig* envoy_confi const envoy_config_endpoint_v3_LedsClusterLocalityConfig* default_val = NULL; const envoy_config_endpoint_v3_LedsClusterLocalityConfig* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__endpoint__v3__LedsClusterLocalityConfig_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -823,6 +853,7 @@ UPB_INLINE const struct envoy_config_core_v3_Metadata* envoy_config_endpoint_v3_ 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Metadata_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -834,6 +865,7 @@ UPB_INLINE bool envoy_config_endpoint_v3_LocalityLbEndpoints_has_metadata(const 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Locality_msg_init); 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) { @@ -846,6 +878,7 @@ UPB_INLINE struct envoy_config_core_v3_Locality* envoy_config_endpoint_v3_Locali } UPB_INLINE envoy_config_endpoint_v3_LbEndpoint** envoy_config_endpoint_v3_LocalityLbEndpoints_mutable_lb_endpoints(envoy_config_endpoint_v3_LocalityLbEndpoints* msg, size_t* size) { upb_MiniTableField field = {2, UPB_SIZE(16, 32), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__endpoint__v3__LbEndpoint_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -862,6 +895,7 @@ UPB_INLINE envoy_config_endpoint_v3_LbEndpoint** envoy_config_endpoint_v3_Locali } UPB_INLINE struct envoy_config_endpoint_v3_LbEndpoint* envoy_config_endpoint_v3_LocalityLbEndpoints_add_lb_endpoints(envoy_config_endpoint_v3_LocalityLbEndpoints* msg, upb_Arena* arena) { upb_MiniTableField field = {2, UPB_SIZE(16, 32), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__endpoint__v3__LbEndpoint_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -876,6 +910,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); 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) { @@ -892,6 +927,7 @@ UPB_INLINE void envoy_config_endpoint_v3_LocalityLbEndpoints_set_priority(envoy_ } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); 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) { @@ -904,6 +940,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_endpoint_v3_Locality } 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(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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__endpoint__v3__LocalityLbEndpoints__LbEndpointList_msg_init); 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) { @@ -916,6 +953,7 @@ UPB_INLINE struct envoy_config_endpoint_v3_LocalityLbEndpoints_LbEndpointList* e } 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(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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__endpoint__v3__LedsClusterLocalityConfig_msg_init); 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) { @@ -928,6 +966,7 @@ UPB_INLINE struct envoy_config_endpoint_v3_LedsClusterLocalityConfig* envoy_conf } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Metadata_msg_init); 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) { @@ -981,6 +1020,7 @@ UPB_INLINE void envoy_config_endpoint_v3_LocalityLbEndpoints_LbEndpointList_clea } UPB_INLINE const envoy_config_endpoint_v3_LbEndpoint* const* envoy_config_endpoint_v3_LocalityLbEndpoints_LbEndpointList_lb_endpoints(const envoy_config_endpoint_v3_LocalityLbEndpoints_LbEndpointList* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__endpoint__v3__LbEndpoint_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -992,6 +1032,7 @@ UPB_INLINE const envoy_config_endpoint_v3_LbEndpoint* const* envoy_config_endpoi } UPB_INLINE const upb_Array* _envoy_config_endpoint_v3_LocalityLbEndpoints_LbEndpointList_lb_endpoints_upb_array(const envoy_config_endpoint_v3_LocalityLbEndpoints_LbEndpointList* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__endpoint__v3__LbEndpoint_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -1000,6 +1041,7 @@ UPB_INLINE const upb_Array* _envoy_config_endpoint_v3_LocalityLbEndpoints_LbEndp } UPB_INLINE upb_Array* _envoy_config_endpoint_v3_LocalityLbEndpoints_LbEndpointList_lb_endpoints_mutable_upb_array(envoy_config_endpoint_v3_LocalityLbEndpoints_LbEndpointList* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__endpoint__v3__LbEndpoint_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -1010,6 +1052,7 @@ UPB_INLINE upb_Array* _envoy_config_endpoint_v3_LocalityLbEndpoints_LbEndpointLi UPB_INLINE envoy_config_endpoint_v3_LbEndpoint** envoy_config_endpoint_v3_LocalityLbEndpoints_LbEndpointList_mutable_lb_endpoints(envoy_config_endpoint_v3_LocalityLbEndpoints_LbEndpointList* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__endpoint__v3__LbEndpoint_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1026,6 +1069,7 @@ UPB_INLINE envoy_config_endpoint_v3_LbEndpoint** envoy_config_endpoint_v3_Locali } UPB_INLINE struct envoy_config_endpoint_v3_LbEndpoint* envoy_config_endpoint_v3_LocalityLbEndpoints_LbEndpointList_add_lb_endpoints(envoy_config_endpoint_v3_LocalityLbEndpoints_LbEndpointList* msg, upb_Arena* arena) { upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__endpoint__v3__LbEndpoint_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( diff --git a/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint_components.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint_components.upb_minitable.c index 0a794b14187..ee22570993b 100644 --- a/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint_components.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint_components.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/config/endpoint/v3/endpoint_components.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -20,10 +21,11 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub envoy_config_endpoint_v3_Endpoint_submsgs[3] = { - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Address_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__endpoint__v3__Endpoint__HealthCheckConfig_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__endpoint__v3__Endpoint__AdditionalAddress_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal envoy_config_endpoint_v3_Endpoint_submsgs[3] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Address_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__endpoint__v3__Endpoint__HealthCheckConfig_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__endpoint__v3__Endpoint__AdditionalAddress_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_endpoint_v3_Endpoint__fields[4] = { @@ -52,8 +54,9 @@ const upb_MiniTable envoy__config__endpoint__v3__Endpoint_msg_init = { }) }; -static const upb_MiniTableSub envoy_config_endpoint_v3_Endpoint_HealthCheckConfig_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Address_msg_init}, +const upb_MiniTable* envoy__config__endpoint__v3__Endpoint_msg_init_ptr = &envoy__config__endpoint__v3__Endpoint_msg_init; +static const upb_MiniTableSubInternal envoy_config_endpoint_v3_Endpoint_HealthCheckConfig_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Address_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_endpoint_v3_Endpoint_HealthCheckConfig__fields[4] = { @@ -82,8 +85,9 @@ const upb_MiniTable envoy__config__endpoint__v3__Endpoint__HealthCheckConfig_msg }) }; -static const upb_MiniTableSub envoy_config_endpoint_v3_Endpoint_AdditionalAddress_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Address_msg_init}, +const upb_MiniTable* envoy__config__endpoint__v3__Endpoint__HealthCheckConfig_msg_init_ptr = &envoy__config__endpoint__v3__Endpoint__HealthCheckConfig_msg_init; +static const upb_MiniTableSubInternal envoy_config_endpoint_v3_Endpoint_AdditionalAddress_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Address_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_endpoint_v3_Endpoint_AdditionalAddress__fields[1] = { @@ -99,10 +103,11 @@ const upb_MiniTable envoy__config__endpoint__v3__Endpoint__AdditionalAddress_msg #endif }; -static const upb_MiniTableSub envoy_config_endpoint_v3_LbEndpoint_submsgs[3] = { - {.UPB_PRIVATE(submsg) = &envoy__config__endpoint__v3__Endpoint_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Metadata_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init}, +const upb_MiniTable* envoy__config__endpoint__v3__Endpoint__AdditionalAddress_msg_init_ptr = &envoy__config__endpoint__v3__Endpoint__AdditionalAddress_msg_init; +static const upb_MiniTableSubInternal envoy_config_endpoint_v3_LbEndpoint_submsgs[3] = { + {.UPB_PRIVATE(submsg) = &envoy__config__endpoint__v3__Endpoint_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Metadata_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_endpoint_v3_LbEndpoint__fields[5] = { @@ -132,8 +137,9 @@ const upb_MiniTable envoy__config__endpoint__v3__LbEndpoint_msg_init = { }) }; -static const upb_MiniTableSub envoy_config_endpoint_v3_LedsClusterLocalityConfig_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ConfigSource_msg_init}, +const upb_MiniTable* envoy__config__endpoint__v3__LbEndpoint_msg_init_ptr = &envoy__config__endpoint__v3__LbEndpoint_msg_init; +static const upb_MiniTableSubInternal envoy_config_endpoint_v3_LedsClusterLocalityConfig_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ConfigSource_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_endpoint_v3_LedsClusterLocalityConfig__fields[2] = { @@ -156,14 +162,15 @@ const upb_MiniTable envoy__config__endpoint__v3__LedsClusterLocalityConfig_msg_i }) }; -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}, +const upb_MiniTable* envoy__config__endpoint__v3__LedsClusterLocalityConfig_msg_init_ptr = &envoy__config__endpoint__v3__LedsClusterLocalityConfig_msg_init; +static const upb_MiniTableSubInternal envoy_config_endpoint_v3_LocalityLbEndpoints_submsgs[7] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Locality_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__endpoint__v3__LbEndpoint_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__endpoint__v3__LocalityLbEndpoints__LbEndpointList_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__endpoint__v3__LedsClusterLocalityConfig_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Metadata_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_endpoint_v3_LocalityLbEndpoints__fields[8] = { @@ -204,8 +211,9 @@ const upb_MiniTable envoy__config__endpoint__v3__LocalityLbEndpoints_msg_init = }) }; -static const upb_MiniTableSub envoy_config_endpoint_v3_LocalityLbEndpoints_LbEndpointList_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__config__endpoint__v3__LbEndpoint_msg_init}, +const upb_MiniTable* envoy__config__endpoint__v3__LocalityLbEndpoints_msg_init_ptr = &envoy__config__endpoint__v3__LocalityLbEndpoints_msg_init; +static const upb_MiniTableSubInternal envoy_config_endpoint_v3_LocalityLbEndpoints_LbEndpointList_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__config__endpoint__v3__LbEndpoint_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_endpoint_v3_LocalityLbEndpoints_LbEndpointList__fields[1] = { @@ -225,6 +233,7 @@ const upb_MiniTable envoy__config__endpoint__v3__LocalityLbEndpoints__LbEndpoint }) }; +const upb_MiniTable* envoy__config__endpoint__v3__LocalityLbEndpoints__LbEndpointList_msg_init_ptr = &envoy__config__endpoint__v3__LocalityLbEndpoints__LbEndpointList_msg_init; static const upb_MiniTable *messages_layout[7] = { &envoy__config__endpoint__v3__Endpoint_msg_init, &envoy__config__endpoint__v3__Endpoint__HealthCheckConfig_msg_init, diff --git a/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint_components.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint_components.upb_minitable.h index ae90403d70c..4b1b2f66335 100644 --- a/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint_components.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint_components.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/config/endpoint/v3/endpoint_components.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_COMPONENTS_PROTO_UPB_MINITABLE_H_ #define ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_COMPONENTS_PROTO_UPB_MINITABLE_H_ @@ -18,12 +19,19 @@ extern "C" { #endif extern const upb_MiniTable envoy__config__endpoint__v3__Endpoint_msg_init; +extern const upb_MiniTable* envoy__config__endpoint__v3__Endpoint_msg_init_ptr; extern const upb_MiniTable envoy__config__endpoint__v3__Endpoint__HealthCheckConfig_msg_init; +extern const upb_MiniTable* envoy__config__endpoint__v3__Endpoint__HealthCheckConfig_msg_init_ptr; extern const upb_MiniTable envoy__config__endpoint__v3__Endpoint__AdditionalAddress_msg_init; +extern const upb_MiniTable* envoy__config__endpoint__v3__Endpoint__AdditionalAddress_msg_init_ptr; extern const upb_MiniTable envoy__config__endpoint__v3__LbEndpoint_msg_init; +extern const upb_MiniTable* envoy__config__endpoint__v3__LbEndpoint_msg_init_ptr; extern const upb_MiniTable envoy__config__endpoint__v3__LedsClusterLocalityConfig_msg_init; +extern const upb_MiniTable* envoy__config__endpoint__v3__LedsClusterLocalityConfig_msg_init_ptr; extern const upb_MiniTable envoy__config__endpoint__v3__LocalityLbEndpoints_msg_init; +extern const upb_MiniTable* envoy__config__endpoint__v3__LocalityLbEndpoints_msg_init_ptr; extern const upb_MiniTable envoy__config__endpoint__v3__LocalityLbEndpoints__LbEndpointList_msg_init; +extern const upb_MiniTable* envoy__config__endpoint__v3__LocalityLbEndpoints__LbEndpointList_msg_init_ptr; extern const upb_MiniTableFile envoy_config_endpoint_v3_endpoint_components_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/config/endpoint/v3/load_report.upb.h b/src/core/ext/upb-gen/envoy/config/endpoint/v3/load_report.upb.h index 75d43e45e8d..5594fea3230 100644 --- a/src/core/ext/upb-gen/envoy/config/endpoint/v3/load_report.upb.h +++ b/src/core/ext/upb-gen/envoy/config/endpoint/v3/load_report.upb.h @@ -3,7 +3,8 @@ * envoy/config/endpoint/v3/load_report.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_ENDPOINT_V3_LOAD_REPORT_PROTO_UPB_H_ #define ENVOY_CONFIG_ENDPOINT_V3_LOAD_REPORT_PROTO_UPB_H_ @@ -85,6 +86,7 @@ UPB_INLINE const struct envoy_config_core_v3_Locality* envoy_config_endpoint_v3_ const struct envoy_config_core_v3_Locality* default_val = NULL; const struct envoy_config_core_v3_Locality* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Locality_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -135,6 +137,7 @@ UPB_INLINE void envoy_config_endpoint_v3_UpstreamLocalityStats_clear_load_metric } UPB_INLINE const envoy_config_endpoint_v3_EndpointLoadMetricStats* const* envoy_config_endpoint_v3_UpstreamLocalityStats_load_metric_stats(const envoy_config_endpoint_v3_UpstreamLocalityStats* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__endpoint__v3__EndpointLoadMetricStats_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -146,6 +149,7 @@ UPB_INLINE const envoy_config_endpoint_v3_EndpointLoadMetricStats* const* envoy_ } UPB_INLINE const upb_Array* _envoy_config_endpoint_v3_UpstreamLocalityStats_load_metric_stats_upb_array(const envoy_config_endpoint_v3_UpstreamLocalityStats* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__endpoint__v3__EndpointLoadMetricStats_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -154,6 +158,7 @@ UPB_INLINE const upb_Array* _envoy_config_endpoint_v3_UpstreamLocalityStats_load } UPB_INLINE upb_Array* _envoy_config_endpoint_v3_UpstreamLocalityStats_load_metric_stats_mutable_upb_array(envoy_config_endpoint_v3_UpstreamLocalityStats* msg, size_t* size, upb_Arena* arena) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__endpoint__v3__EndpointLoadMetricStats_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -179,6 +184,7 @@ UPB_INLINE void envoy_config_endpoint_v3_UpstreamLocalityStats_clear_upstream_en } UPB_INLINE const envoy_config_endpoint_v3_UpstreamEndpointStats* const* envoy_config_endpoint_v3_UpstreamLocalityStats_upstream_endpoint_stats(const envoy_config_endpoint_v3_UpstreamLocalityStats* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__endpoint__v3__UpstreamEndpointStats_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -190,6 +196,7 @@ UPB_INLINE const envoy_config_endpoint_v3_UpstreamEndpointStats* const* envoy_co } UPB_INLINE const upb_Array* _envoy_config_endpoint_v3_UpstreamLocalityStats_upstream_endpoint_stats_upb_array(const envoy_config_endpoint_v3_UpstreamLocalityStats* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__endpoint__v3__UpstreamEndpointStats_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -198,6 +205,7 @@ UPB_INLINE const upb_Array* _envoy_config_endpoint_v3_UpstreamLocalityStats_upst } UPB_INLINE upb_Array* _envoy_config_endpoint_v3_UpstreamLocalityStats_upstream_endpoint_stats_mutable_upb_array(envoy_config_endpoint_v3_UpstreamLocalityStats* msg, size_t* size, upb_Arena* arena) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__endpoint__v3__UpstreamEndpointStats_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -261,6 +269,7 @@ UPB_INLINE const envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats* envoy_ 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__endpoint__v3__UnnamedEndpointLoadMetricStats_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -277,6 +286,7 @@ UPB_INLINE const envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats* envoy_ 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__endpoint__v3__UnnamedEndpointLoadMetricStats_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -293,6 +303,7 @@ UPB_INLINE const envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats* envoy_ 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__endpoint__v3__UnnamedEndpointLoadMetricStats_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -304,6 +315,7 @@ UPB_INLINE bool envoy_config_endpoint_v3_UpstreamLocalityStats_has_application_u 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Locality_msg_init); 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) { @@ -328,6 +340,7 @@ UPB_INLINE void envoy_config_endpoint_v3_UpstreamLocalityStats_set_total_error_r } 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__endpoint__v3__EndpointLoadMetricStats_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -344,6 +357,7 @@ UPB_INLINE envoy_config_endpoint_v3_EndpointLoadMetricStats** envoy_config_endpo } UPB_INLINE struct envoy_config_endpoint_v3_EndpointLoadMetricStats* envoy_config_endpoint_v3_UpstreamLocalityStats_add_load_metric_stats(envoy_config_endpoint_v3_UpstreamLocalityStats* msg, upb_Arena* arena) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__endpoint__v3__EndpointLoadMetricStats_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -362,6 +376,7 @@ UPB_INLINE void envoy_config_endpoint_v3_UpstreamLocalityStats_set_priority(envo } 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__endpoint__v3__UpstreamEndpointStats_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -378,6 +393,7 @@ UPB_INLINE envoy_config_endpoint_v3_UpstreamEndpointStats** envoy_config_endpoin } UPB_INLINE struct envoy_config_endpoint_v3_UpstreamEndpointStats* envoy_config_endpoint_v3_UpstreamLocalityStats_add_upstream_endpoint_stats(envoy_config_endpoint_v3_UpstreamLocalityStats* msg, upb_Arena* arena) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__endpoint__v3__UpstreamEndpointStats_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -408,6 +424,7 @@ UPB_INLINE void envoy_config_endpoint_v3_UpstreamLocalityStats_set_total_fail_co } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__endpoint__v3__UnnamedEndpointLoadMetricStats_msg_init); 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) { @@ -420,6 +437,7 @@ UPB_INLINE struct envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats* envoy } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__endpoint__v3__UnnamedEndpointLoadMetricStats_msg_init); 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) { @@ -432,6 +450,7 @@ UPB_INLINE struct envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats* envoy } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__endpoint__v3__UnnamedEndpointLoadMetricStats_msg_init); 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) { @@ -487,6 +506,7 @@ UPB_INLINE const struct envoy_config_core_v3_Address* envoy_config_endpoint_v3_U const struct envoy_config_core_v3_Address* default_val = NULL; const struct envoy_config_core_v3_Address* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Address_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -537,6 +557,7 @@ UPB_INLINE void envoy_config_endpoint_v3_UpstreamEndpointStats_clear_load_metric } UPB_INLINE const envoy_config_endpoint_v3_EndpointLoadMetricStats* const* envoy_config_endpoint_v3_UpstreamEndpointStats_load_metric_stats(const envoy_config_endpoint_v3_UpstreamEndpointStats* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__endpoint__v3__EndpointLoadMetricStats_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -548,6 +569,7 @@ UPB_INLINE const envoy_config_endpoint_v3_EndpointLoadMetricStats* const* envoy_ } UPB_INLINE const upb_Array* _envoy_config_endpoint_v3_UpstreamEndpointStats_load_metric_stats_upb_array(const envoy_config_endpoint_v3_UpstreamEndpointStats* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__endpoint__v3__EndpointLoadMetricStats_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -556,6 +578,7 @@ UPB_INLINE const upb_Array* _envoy_config_endpoint_v3_UpstreamEndpointStats_load } UPB_INLINE upb_Array* _envoy_config_endpoint_v3_UpstreamEndpointStats_load_metric_stats_mutable_upb_array(envoy_config_endpoint_v3_UpstreamEndpointStats* msg, size_t* size, upb_Arena* arena) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__endpoint__v3__EndpointLoadMetricStats_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -571,6 +594,7 @@ UPB_INLINE const struct google_protobuf_Struct* envoy_config_endpoint_v3_Upstrea const struct google_protobuf_Struct* default_val = NULL; const struct google_protobuf_Struct* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Struct_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -594,6 +618,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Address_msg_init); 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) { @@ -618,6 +643,7 @@ UPB_INLINE void envoy_config_endpoint_v3_UpstreamEndpointStats_set_total_error_r } 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__endpoint__v3__EndpointLoadMetricStats_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -634,6 +660,7 @@ UPB_INLINE envoy_config_endpoint_v3_EndpointLoadMetricStats** envoy_config_endpo } UPB_INLINE struct envoy_config_endpoint_v3_EndpointLoadMetricStats* envoy_config_endpoint_v3_UpstreamEndpointStats_add_load_metric_stats(envoy_config_endpoint_v3_UpstreamEndpointStats* msg, upb_Arena* arena) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__endpoint__v3__EndpointLoadMetricStats_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -648,6 +675,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Struct_msg_init); 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) { @@ -873,6 +901,7 @@ UPB_INLINE void envoy_config_endpoint_v3_ClusterStats_clear_upstream_locality_st } UPB_INLINE const envoy_config_endpoint_v3_UpstreamLocalityStats* const* envoy_config_endpoint_v3_ClusterStats_upstream_locality_stats(const envoy_config_endpoint_v3_ClusterStats* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__endpoint__v3__UpstreamLocalityStats_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -884,6 +913,7 @@ UPB_INLINE const envoy_config_endpoint_v3_UpstreamLocalityStats* const* envoy_co } UPB_INLINE const upb_Array* _envoy_config_endpoint_v3_ClusterStats_upstream_locality_stats_upb_array(const envoy_config_endpoint_v3_ClusterStats* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__endpoint__v3__UpstreamLocalityStats_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -892,6 +922,7 @@ UPB_INLINE const upb_Array* _envoy_config_endpoint_v3_ClusterStats_upstream_loca } UPB_INLINE upb_Array* _envoy_config_endpoint_v3_ClusterStats_upstream_locality_stats_mutable_upb_array(envoy_config_endpoint_v3_ClusterStats* msg, size_t* size, upb_Arena* arena) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__endpoint__v3__UpstreamLocalityStats_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -919,6 +950,7 @@ UPB_INLINE const struct google_protobuf_Duration* envoy_config_endpoint_v3_Clust const struct google_protobuf_Duration* default_val = NULL; const struct google_protobuf_Duration* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -933,6 +965,7 @@ UPB_INLINE void envoy_config_endpoint_v3_ClusterStats_clear_dropped_requests(env } UPB_INLINE const envoy_config_endpoint_v3_ClusterStats_DroppedRequests* const* envoy_config_endpoint_v3_ClusterStats_dropped_requests(const envoy_config_endpoint_v3_ClusterStats* msg, size_t* size) { const upb_MiniTableField field = {5, UPB_SIZE(20, 56), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__endpoint__v3__ClusterStats__DroppedRequests_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -944,6 +977,7 @@ UPB_INLINE const envoy_config_endpoint_v3_ClusterStats_DroppedRequests* const* e } UPB_INLINE const upb_Array* _envoy_config_endpoint_v3_ClusterStats_dropped_requests_upb_array(const envoy_config_endpoint_v3_ClusterStats* msg, size_t* size) { const upb_MiniTableField field = {5, UPB_SIZE(20, 56), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__endpoint__v3__ClusterStats__DroppedRequests_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -952,6 +986,7 @@ UPB_INLINE const upb_Array* _envoy_config_endpoint_v3_ClusterStats_dropped_reque } UPB_INLINE upb_Array* _envoy_config_endpoint_v3_ClusterStats_dropped_requests_mutable_upb_array(envoy_config_endpoint_v3_ClusterStats* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {5, UPB_SIZE(20, 56), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__endpoint__v3__ClusterStats__DroppedRequests_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -978,6 +1013,7 @@ UPB_INLINE void envoy_config_endpoint_v3_ClusterStats_set_cluster_name(envoy_con } 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__endpoint__v3__UpstreamLocalityStats_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -994,6 +1030,7 @@ UPB_INLINE envoy_config_endpoint_v3_UpstreamLocalityStats** envoy_config_endpoin } UPB_INLINE struct envoy_config_endpoint_v3_UpstreamLocalityStats* envoy_config_endpoint_v3_ClusterStats_add_upstream_locality_stats(envoy_config_endpoint_v3_ClusterStats* msg, upb_Arena* arena) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__endpoint__v3__UpstreamLocalityStats_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -1012,6 +1049,7 @@ UPB_INLINE void envoy_config_endpoint_v3_ClusterStats_set_total_dropped_requests } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { @@ -1024,6 +1062,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_endpoint_v3_ClusterStat } UPB_INLINE envoy_config_endpoint_v3_ClusterStats_DroppedRequests** envoy_config_endpoint_v3_ClusterStats_mutable_dropped_requests(envoy_config_endpoint_v3_ClusterStats* msg, size_t* size) { upb_MiniTableField field = {5, UPB_SIZE(20, 56), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__endpoint__v3__ClusterStats__DroppedRequests_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1040,6 +1079,7 @@ UPB_INLINE envoy_config_endpoint_v3_ClusterStats_DroppedRequests** envoy_config_ } UPB_INLINE struct envoy_config_endpoint_v3_ClusterStats_DroppedRequests* envoy_config_endpoint_v3_ClusterStats_add_dropped_requests(envoy_config_endpoint_v3_ClusterStats* msg, upb_Arena* arena) { upb_MiniTableField field = {5, UPB_SIZE(20, 56), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__endpoint__v3__ClusterStats__DroppedRequests_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( diff --git a/src/core/ext/upb-gen/envoy/config/endpoint/v3/load_report.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/endpoint/v3/load_report.upb_minitable.c index 366f1fd6788..71df180686c 100644 --- a/src/core/ext/upb-gen/envoy/config/endpoint/v3/load_report.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/config/endpoint/v3/load_report.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/config/endpoint/v3/load_report.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -20,13 +21,14 @@ // Must be last. #include "upb/port/def.inc" -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}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal envoy_config_endpoint_v3_UpstreamLocalityStats_submsgs[6] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Locality_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__endpoint__v3__EndpointLoadMetricStats_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__endpoint__v3__UpstreamEndpointStats_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__endpoint__v3__UnnamedEndpointLoadMetricStats_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__endpoint__v3__UnnamedEndpointLoadMetricStats_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__endpoint__v3__UnnamedEndpointLoadMetricStats_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_endpoint_v3_UpstreamLocalityStats__fields[14] = { @@ -73,10 +75,11 @@ const upb_MiniTable envoy__config__endpoint__v3__UpstreamLocalityStats_msg_init }) }; -static const upb_MiniTableSub envoy_config_endpoint_v3_UpstreamEndpointStats_submsgs[3] = { - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Address_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__endpoint__v3__EndpointLoadMetricStats_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Struct_msg_init}, +const upb_MiniTable* envoy__config__endpoint__v3__UpstreamLocalityStats_msg_init_ptr = &envoy__config__endpoint__v3__UpstreamLocalityStats_msg_init; +static const upb_MiniTableSubInternal envoy_config_endpoint_v3_UpstreamEndpointStats_submsgs[3] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Address_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__endpoint__v3__EndpointLoadMetricStats_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Struct_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_endpoint_v3_UpstreamEndpointStats__fields[7] = { @@ -108,6 +111,7 @@ const upb_MiniTable envoy__config__endpoint__v3__UpstreamEndpointStats_msg_init }) }; +const upb_MiniTable* envoy__config__endpoint__v3__UpstreamEndpointStats_msg_init_ptr = &envoy__config__endpoint__v3__UpstreamEndpointStats_msg_init; static const upb_MiniTableField envoy_config_endpoint_v3_EndpointLoadMetricStats__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, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, @@ -129,6 +133,7 @@ const upb_MiniTable envoy__config__endpoint__v3__EndpointLoadMetricStats_msg_ini }) }; +const upb_MiniTable* envoy__config__endpoint__v3__EndpointLoadMetricStats_msg_init_ptr = &envoy__config__endpoint__v3__EndpointLoadMetricStats_msg_init; 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)}, @@ -149,10 +154,11 @@ const upb_MiniTable envoy__config__endpoint__v3__UnnamedEndpointLoadMetricStats_ }) }; -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}, - {.UPB_PRIVATE(submsg) = &envoy__config__endpoint__v3__ClusterStats__DroppedRequests_msg_init}, +const upb_MiniTable* envoy__config__endpoint__v3__UnnamedEndpointLoadMetricStats_msg_init_ptr = &envoy__config__endpoint__v3__UnnamedEndpointLoadMetricStats_msg_init; +static const upb_MiniTableSubInternal envoy_config_endpoint_v3_ClusterStats_submsgs[3] = { + {.UPB_PRIVATE(submsg) = &envoy__config__endpoint__v3__UpstreamLocalityStats_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__endpoint__v3__ClusterStats__DroppedRequests_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_endpoint_v3_ClusterStats__fields[6] = { @@ -183,6 +189,7 @@ const upb_MiniTable envoy__config__endpoint__v3__ClusterStats_msg_init = { }) }; +const upb_MiniTable* envoy__config__endpoint__v3__ClusterStats_msg_init_ptr = &envoy__config__endpoint__v3__ClusterStats_msg_init; static const upb_MiniTableField envoy_config_endpoint_v3_ClusterStats_DroppedRequests__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, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, @@ -203,6 +210,7 @@ const upb_MiniTable envoy__config__endpoint__v3__ClusterStats__DroppedRequests_m }) }; +const upb_MiniTable* envoy__config__endpoint__v3__ClusterStats__DroppedRequests_msg_init_ptr = &envoy__config__endpoint__v3__ClusterStats__DroppedRequests_msg_init; static const upb_MiniTable *messages_layout[6] = { &envoy__config__endpoint__v3__UpstreamLocalityStats_msg_init, &envoy__config__endpoint__v3__UpstreamEndpointStats_msg_init, diff --git a/src/core/ext/upb-gen/envoy/config/endpoint/v3/load_report.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/endpoint/v3/load_report.upb_minitable.h index 001a307d7a6..2cd4049e32b 100644 --- a/src/core/ext/upb-gen/envoy/config/endpoint/v3/load_report.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/config/endpoint/v3/load_report.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/config/endpoint/v3/load_report.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_ENDPOINT_V3_LOAD_REPORT_PROTO_UPB_MINITABLE_H_ #define ENVOY_CONFIG_ENDPOINT_V3_LOAD_REPORT_PROTO_UPB_MINITABLE_H_ @@ -18,11 +19,17 @@ extern "C" { #endif extern const upb_MiniTable envoy__config__endpoint__v3__UpstreamLocalityStats_msg_init; +extern const upb_MiniTable* envoy__config__endpoint__v3__UpstreamLocalityStats_msg_init_ptr; extern const upb_MiniTable envoy__config__endpoint__v3__UpstreamEndpointStats_msg_init; +extern const upb_MiniTable* envoy__config__endpoint__v3__UpstreamEndpointStats_msg_init_ptr; extern const upb_MiniTable envoy__config__endpoint__v3__EndpointLoadMetricStats_msg_init; +extern const upb_MiniTable* envoy__config__endpoint__v3__EndpointLoadMetricStats_msg_init_ptr; extern const upb_MiniTable envoy__config__endpoint__v3__UnnamedEndpointLoadMetricStats_msg_init; +extern const upb_MiniTable* envoy__config__endpoint__v3__UnnamedEndpointLoadMetricStats_msg_init_ptr; extern const upb_MiniTable envoy__config__endpoint__v3__ClusterStats_msg_init; +extern const upb_MiniTable* envoy__config__endpoint__v3__ClusterStats_msg_init_ptr; extern const upb_MiniTable envoy__config__endpoint__v3__ClusterStats__DroppedRequests_msg_init; +extern const upb_MiniTable* envoy__config__endpoint__v3__ClusterStats__DroppedRequests_msg_init_ptr; extern const upb_MiniTableFile envoy_config_endpoint_v3_load_report_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/config/listener/v3/api_listener.upb.h b/src/core/ext/upb-gen/envoy/config/listener/v3/api_listener.upb.h index 10d2aca4ea1..23a268a85a1 100644 --- a/src/core/ext/upb-gen/envoy/config/listener/v3/api_listener.upb.h +++ b/src/core/ext/upb-gen/envoy/config/listener/v3/api_listener.upb.h @@ -3,7 +3,8 @@ * envoy/config/listener/v3/api_listener.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_LISTENER_V3_API_LISTENER_PROTO_UPB_H_ #define ENVOY_CONFIG_LISTENER_V3_API_LISTENER_PROTO_UPB_H_ @@ -72,6 +73,7 @@ UPB_INLINE const struct google_protobuf_Any* envoy_config_listener_v3_ApiListene const struct google_protobuf_Any* default_val = NULL; const struct google_protobuf_Any* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -83,6 +85,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); 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) { diff --git a/src/core/ext/upb-gen/envoy/config/listener/v3/api_listener.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/listener/v3/api_listener.upb_minitable.c index f3b9f37f3a0..857456f6900 100644 --- a/src/core/ext/upb-gen/envoy/config/listener/v3/api_listener.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/config/listener/v3/api_listener.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/config/listener/v3/api_listener.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -15,8 +16,9 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub envoy_config_listener_v3_ApiListener_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal envoy_config_listener_v3_ApiListener_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_listener_v3_ApiListener__fields[1] = { @@ -32,6 +34,7 @@ const upb_MiniTable envoy__config__listener__v3__ApiListener_msg_init = { #endif }; +const upb_MiniTable* envoy__config__listener__v3__ApiListener_msg_init_ptr = &envoy__config__listener__v3__ApiListener_msg_init; static const upb_MiniTable *messages_layout[1] = { &envoy__config__listener__v3__ApiListener_msg_init, }; diff --git a/src/core/ext/upb-gen/envoy/config/listener/v3/api_listener.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/listener/v3/api_listener.upb_minitable.h index f7ca2d1fb42..29d6a53f75f 100644 --- a/src/core/ext/upb-gen/envoy/config/listener/v3/api_listener.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/config/listener/v3/api_listener.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/config/listener/v3/api_listener.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_LISTENER_V3_API_LISTENER_PROTO_UPB_MINITABLE_H_ #define ENVOY_CONFIG_LISTENER_V3_API_LISTENER_PROTO_UPB_MINITABLE_H_ @@ -18,6 +19,7 @@ extern "C" { #endif extern const upb_MiniTable envoy__config__listener__v3__ApiListener_msg_init; +extern const upb_MiniTable* envoy__config__listener__v3__ApiListener_msg_init_ptr; extern const upb_MiniTableFile envoy_config_listener_v3_api_listener_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/config/listener/v3/listener.upb.h b/src/core/ext/upb-gen/envoy/config/listener/v3/listener.upb.h index be164b4890e..64ff9d5818c 100644 --- a/src/core/ext/upb-gen/envoy/config/listener/v3/listener.upb.h +++ b/src/core/ext/upb-gen/envoy/config/listener/v3/listener.upb.h @@ -3,7 +3,8 @@ * envoy/config/listener/v3/listener.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_LISTENER_V3_LISTENER_PROTO_UPB_H_ #define ENVOY_CONFIG_LISTENER_V3_LISTENER_PROTO_UPB_H_ @@ -115,6 +116,7 @@ UPB_INLINE const struct envoy_config_core_v3_Address* envoy_config_listener_v3_A const struct envoy_config_core_v3_Address* default_val = NULL; const struct envoy_config_core_v3_Address* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Address_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -131,6 +133,7 @@ UPB_INLINE const struct envoy_config_core_v3_SocketOptionsOverride* envoy_config const struct envoy_config_core_v3_SocketOptionsOverride* default_val = NULL; const struct envoy_config_core_v3_SocketOptionsOverride* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__SocketOptionsOverride_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -142,6 +145,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Address_msg_init); 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) { @@ -154,6 +158,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__SocketOptionsOverride_msg_init); 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) { @@ -207,6 +212,7 @@ UPB_INLINE void envoy_config_listener_v3_ListenerCollection_clear_entries(envoy_ } UPB_INLINE const struct xds_core_v3_CollectionEntry* const* envoy_config_listener_v3_ListenerCollection_entries(const envoy_config_listener_v3_ListenerCollection* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__core__v3__CollectionEntry_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -218,6 +224,7 @@ UPB_INLINE const struct xds_core_v3_CollectionEntry* const* envoy_config_listene } UPB_INLINE const upb_Array* _envoy_config_listener_v3_ListenerCollection_entries_upb_array(const envoy_config_listener_v3_ListenerCollection* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__core__v3__CollectionEntry_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -226,6 +233,7 @@ UPB_INLINE const upb_Array* _envoy_config_listener_v3_ListenerCollection_entries } UPB_INLINE upb_Array* _envoy_config_listener_v3_ListenerCollection_entries_mutable_upb_array(envoy_config_listener_v3_ListenerCollection* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__core__v3__CollectionEntry_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -236,6 +244,7 @@ UPB_INLINE upb_Array* _envoy_config_listener_v3_ListenerCollection_entries_mutab UPB_INLINE struct xds_core_v3_CollectionEntry** envoy_config_listener_v3_ListenerCollection_mutable_entries(envoy_config_listener_v3_ListenerCollection* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__core__v3__CollectionEntry_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -252,6 +261,7 @@ UPB_INLINE struct xds_core_v3_CollectionEntry** envoy_config_listener_v3_Listene } UPB_INLINE struct xds_core_v3_CollectionEntry* envoy_config_listener_v3_ListenerCollection_add_entries(envoy_config_listener_v3_ListenerCollection* msg, upb_Arena* arena) { upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__core__v3__CollectionEntry_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -330,6 +340,7 @@ UPB_INLINE const struct envoy_config_core_v3_Address* envoy_config_listener_v3_L const struct envoy_config_core_v3_Address* default_val = NULL; const struct envoy_config_core_v3_Address* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Address_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -344,6 +355,7 @@ UPB_INLINE void envoy_config_listener_v3_Listener_clear_filter_chains(envoy_conf } UPB_INLINE const struct envoy_config_listener_v3_FilterChain* const* envoy_config_listener_v3_Listener_filter_chains(const envoy_config_listener_v3_Listener* msg, size_t* size) { const upb_MiniTableField field = {3, UPB_SIZE(16, 56), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__listener__v3__FilterChain_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -355,6 +367,7 @@ UPB_INLINE const struct envoy_config_listener_v3_FilterChain* const* envoy_confi } UPB_INLINE const upb_Array* _envoy_config_listener_v3_Listener_filter_chains_upb_array(const envoy_config_listener_v3_Listener* msg, size_t* size) { const upb_MiniTableField field = {3, UPB_SIZE(16, 56), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__listener__v3__FilterChain_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -363,6 +376,7 @@ UPB_INLINE const upb_Array* _envoy_config_listener_v3_Listener_filter_chains_upb } UPB_INLINE upb_Array* _envoy_config_listener_v3_Listener_filter_chains_mutable_upb_array(envoy_config_listener_v3_Listener* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {3, UPB_SIZE(16, 56), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__listener__v3__FilterChain_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -378,6 +392,7 @@ UPB_INLINE const struct google_protobuf_BoolValue* envoy_config_listener_v3_List const struct google_protobuf_BoolValue* default_val = NULL; const struct google_protobuf_BoolValue* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -394,6 +409,7 @@ UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_listener_v3_Li const struct google_protobuf_UInt32Value* default_val = NULL; const struct google_protobuf_UInt32Value* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -410,6 +426,7 @@ UPB_INLINE const struct envoy_config_core_v3_Metadata* envoy_config_listener_v3_ const struct envoy_config_core_v3_Metadata* default_val = NULL; const struct envoy_config_core_v3_Metadata* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Metadata_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -426,6 +443,7 @@ UPB_INLINE const envoy_config_listener_v3_Listener_DeprecatedV1* envoy_config_li const envoy_config_listener_v3_Listener_DeprecatedV1* default_val = NULL; const envoy_config_listener_v3_Listener_DeprecatedV1* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__listener__v3__Listener__DeprecatedV1_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -452,6 +470,7 @@ UPB_INLINE void envoy_config_listener_v3_Listener_clear_listener_filters(envoy_c } UPB_INLINE const struct envoy_config_listener_v3_ListenerFilter* const* envoy_config_listener_v3_Listener_listener_filters(const envoy_config_listener_v3_Listener* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__listener__v3__ListenerFilter_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -463,6 +482,7 @@ UPB_INLINE const struct envoy_config_listener_v3_ListenerFilter* const* envoy_co } UPB_INLINE const upb_Array* _envoy_config_listener_v3_Listener_listener_filters_upb_array(const envoy_config_listener_v3_Listener* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__listener__v3__ListenerFilter_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -471,6 +491,7 @@ UPB_INLINE const upb_Array* _envoy_config_listener_v3_Listener_listener_filters_ } UPB_INLINE upb_Array* _envoy_config_listener_v3_Listener_listener_filters_mutable_upb_array(envoy_config_listener_v3_Listener* msg, size_t* size, upb_Arena* arena) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__listener__v3__ListenerFilter_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -486,6 +507,7 @@ UPB_INLINE const struct google_protobuf_BoolValue* envoy_config_listener_v3_List const struct google_protobuf_BoolValue* default_val = NULL; const struct google_protobuf_BoolValue* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -502,6 +524,7 @@ UPB_INLINE const struct google_protobuf_BoolValue* envoy_config_listener_v3_List const struct google_protobuf_BoolValue* default_val = NULL; const struct google_protobuf_BoolValue* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -518,6 +541,7 @@ UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_listener_v3_Li const struct google_protobuf_UInt32Value* default_val = NULL; const struct google_protobuf_UInt32Value* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -532,6 +556,7 @@ UPB_INLINE void envoy_config_listener_v3_Listener_clear_socket_options(envoy_con } UPB_INLINE const struct envoy_config_core_v3_SocketOption* const* envoy_config_listener_v3_Listener_socket_options(const envoy_config_listener_v3_Listener* msg, size_t* size) { const upb_MiniTableField field = {13, UPB_SIZE(56, 128), 0, 10, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__SocketOption_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -543,6 +568,7 @@ UPB_INLINE const struct envoy_config_core_v3_SocketOption* const* envoy_config_l } UPB_INLINE const upb_Array* _envoy_config_listener_v3_Listener_socket_options_upb_array(const envoy_config_listener_v3_Listener* msg, size_t* size) { const upb_MiniTableField field = {13, UPB_SIZE(56, 128), 0, 10, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__SocketOption_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -551,6 +577,7 @@ UPB_INLINE const upb_Array* _envoy_config_listener_v3_Listener_socket_options_up } UPB_INLINE upb_Array* _envoy_config_listener_v3_Listener_socket_options_mutable_upb_array(envoy_config_listener_v3_Listener* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {13, UPB_SIZE(56, 128), 0, 10, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__SocketOption_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -566,6 +593,7 @@ UPB_INLINE const struct google_protobuf_Duration* envoy_config_listener_v3_Liste const struct google_protobuf_Duration* default_val = NULL; const struct google_protobuf_Duration* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -606,6 +634,7 @@ UPB_INLINE const struct envoy_config_listener_v3_UdpListenerConfig* envoy_config const struct envoy_config_listener_v3_UdpListenerConfig* default_val = NULL; const struct envoy_config_listener_v3_UdpListenerConfig* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__listener__v3__UdpListenerConfig_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -622,6 +651,7 @@ UPB_INLINE const struct envoy_config_listener_v3_ApiListener* envoy_config_liste const struct envoy_config_listener_v3_ApiListener* default_val = NULL; const struct envoy_config_listener_v3_ApiListener* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__listener__v3__ApiListener_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -638,6 +668,7 @@ UPB_INLINE const envoy_config_listener_v3_Listener_ConnectionBalanceConfig* envo const envoy_config_listener_v3_Listener_ConnectionBalanceConfig* default_val = NULL; const envoy_config_listener_v3_Listener_ConnectionBalanceConfig* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__listener__v3__Listener__ConnectionBalanceConfig_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -664,6 +695,7 @@ UPB_INLINE void envoy_config_listener_v3_Listener_clear_access_log(envoy_config_ } UPB_INLINE const struct envoy_config_accesslog_v3_AccessLog* const* envoy_config_listener_v3_Listener_access_log(const envoy_config_listener_v3_Listener* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__accesslog__v3__AccessLog_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -675,6 +707,7 @@ UPB_INLINE const struct envoy_config_accesslog_v3_AccessLog* const* envoy_config } UPB_INLINE const upb_Array* _envoy_config_listener_v3_Listener_access_log_upb_array(const envoy_config_listener_v3_Listener* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__accesslog__v3__AccessLog_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -683,6 +716,7 @@ UPB_INLINE const upb_Array* _envoy_config_listener_v3_Listener_access_log_upb_ar } UPB_INLINE upb_Array* _envoy_config_listener_v3_Listener_access_log_mutable_upb_array(envoy_config_listener_v3_Listener* msg, size_t* size, upb_Arena* arena) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__accesslog__v3__AccessLog_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -698,6 +732,7 @@ UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_listener_v3_Li const struct google_protobuf_UInt32Value* default_val = NULL; const struct google_protobuf_UInt32Value* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -714,6 +749,7 @@ UPB_INLINE const struct envoy_config_listener_v3_FilterChain* envoy_config_liste const struct envoy_config_listener_v3_FilterChain* default_val = NULL; const struct envoy_config_listener_v3_FilterChain* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__listener__v3__FilterChain_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -730,6 +766,7 @@ UPB_INLINE const struct google_protobuf_BoolValue* envoy_config_listener_v3_List const struct google_protobuf_BoolValue* default_val = NULL; const struct google_protobuf_BoolValue* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -746,6 +783,7 @@ UPB_INLINE const envoy_config_listener_v3_Listener_InternalListenerConfig* envoy 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(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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__listener__v3__Listener__InternalListenerConfig_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -774,6 +812,7 @@ UPB_INLINE const struct google_protobuf_BoolValue* envoy_config_listener_v3_List const struct google_protobuf_BoolValue* default_val = NULL; const struct google_protobuf_BoolValue* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -814,6 +853,7 @@ UPB_INLINE const struct xds_type_matcher_v3_Matcher* envoy_config_listener_v3_Li const struct xds_type_matcher_v3_Matcher* default_val = NULL; const struct xds_type_matcher_v3_Matcher* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__matcher__v3__Matcher_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -828,6 +868,7 @@ UPB_INLINE void envoy_config_listener_v3_Listener_clear_additional_addresses(env } UPB_INLINE const envoy_config_listener_v3_AdditionalAddress* const* envoy_config_listener_v3_Listener_additional_addresses(const envoy_config_listener_v3_Listener* msg, size_t* size) { const upb_MiniTableField field = {33, UPB_SIZE(120, 232), 0, 22, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__listener__v3__AdditionalAddress_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -839,6 +880,7 @@ UPB_INLINE const envoy_config_listener_v3_AdditionalAddress* const* envoy_config } UPB_INLINE const upb_Array* _envoy_config_listener_v3_Listener_additional_addresses_upb_array(const envoy_config_listener_v3_Listener* msg, size_t* size) { const upb_MiniTableField field = {33, UPB_SIZE(120, 232), 0, 22, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__listener__v3__AdditionalAddress_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -847,6 +889,7 @@ UPB_INLINE const upb_Array* _envoy_config_listener_v3_Listener_additional_addres } UPB_INLINE upb_Array* _envoy_config_listener_v3_Listener_additional_addresses_mutable_upb_array(envoy_config_listener_v3_Listener* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {33, UPB_SIZE(120, 232), 0, 22, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__listener__v3__AdditionalAddress_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -862,6 +905,7 @@ UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_listener_v3_Li const struct google_protobuf_UInt32Value* default_val = NULL; const struct google_protobuf_UInt32Value* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -889,6 +933,7 @@ UPB_INLINE void envoy_config_listener_v3_Listener_set_name(envoy_config_listener } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Address_msg_init); 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) { @@ -901,6 +946,7 @@ UPB_INLINE struct envoy_config_core_v3_Address* envoy_config_listener_v3_Listene } UPB_INLINE struct envoy_config_listener_v3_FilterChain** envoy_config_listener_v3_Listener_mutable_filter_chains(envoy_config_listener_v3_Listener* msg, size_t* size) { upb_MiniTableField field = {3, UPB_SIZE(16, 56), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__listener__v3__FilterChain_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -917,6 +963,7 @@ UPB_INLINE struct envoy_config_listener_v3_FilterChain** envoy_config_listener_v } UPB_INLINE struct envoy_config_listener_v3_FilterChain* envoy_config_listener_v3_Listener_add_filter_chains(envoy_config_listener_v3_Listener* msg, upb_Arena* arena) { upb_MiniTableField field = {3, UPB_SIZE(16, 56), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__listener__v3__FilterChain_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -931,6 +978,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); 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) { @@ -943,6 +991,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); 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) { @@ -955,6 +1004,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Metadata_msg_init); 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) { @@ -967,6 +1017,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__listener__v3__Listener__DeprecatedV1_msg_init); 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) { @@ -983,6 +1034,7 @@ UPB_INLINE void envoy_config_listener_v3_Listener_set_drain_type(envoy_config_li } 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__listener__v3__ListenerFilter_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -999,6 +1051,7 @@ UPB_INLINE struct envoy_config_listener_v3_ListenerFilter** envoy_config_listene } UPB_INLINE struct envoy_config_listener_v3_ListenerFilter* envoy_config_listener_v3_Listener_add_listener_filters(envoy_config_listener_v3_Listener* msg, upb_Arena* arena) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__listener__v3__ListenerFilter_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -1013,6 +1066,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); 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) { @@ -1025,6 +1079,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); 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) { @@ -1037,6 +1092,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); 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) { @@ -1049,6 +1105,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_listener_v3_Listener } UPB_INLINE struct envoy_config_core_v3_SocketOption** envoy_config_listener_v3_Listener_mutable_socket_options(envoy_config_listener_v3_Listener* msg, size_t* size) { upb_MiniTableField field = {13, UPB_SIZE(56, 128), 0, 10, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__SocketOption_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1065,6 +1122,7 @@ UPB_INLINE struct envoy_config_core_v3_SocketOption** envoy_config_listener_v3_L } UPB_INLINE struct envoy_config_core_v3_SocketOption* envoy_config_listener_v3_Listener_add_socket_options(envoy_config_listener_v3_Listener* msg, upb_Arena* arena) { upb_MiniTableField field = {13, UPB_SIZE(56, 128), 0, 10, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__SocketOption_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -1079,6 +1137,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { @@ -1099,6 +1158,7 @@ UPB_INLINE void envoy_config_listener_v3_Listener_set_continue_on_listener_filte } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__listener__v3__UdpListenerConfig_msg_init); 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) { @@ -1111,6 +1171,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__listener__v3__ApiListener_msg_init); 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) { @@ -1123,6 +1184,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__listener__v3__Listener__ConnectionBalanceConfig_msg_init); 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) { @@ -1139,6 +1201,7 @@ UPB_INLINE void envoy_config_listener_v3_Listener_set_reuse_port(envoy_config_li } 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__accesslog__v3__AccessLog_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1155,6 +1218,7 @@ UPB_INLINE struct envoy_config_accesslog_v3_AccessLog** envoy_config_listener_v3 } UPB_INLINE struct envoy_config_accesslog_v3_AccessLog* envoy_config_listener_v3_Listener_add_access_log(envoy_config_listener_v3_Listener* msg, upb_Arena* arena) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__accesslog__v3__AccessLog_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -1169,6 +1233,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); 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) { @@ -1181,6 +1246,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__listener__v3__FilterChain_msg_init); 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) { @@ -1193,6 +1259,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); 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) { @@ -1205,6 +1272,7 @@ UPB_INLINE struct google_protobuf_BoolValue* envoy_config_listener_v3_Listener_m } 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(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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__listener__v3__Listener__InternalListenerConfig_msg_init); 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) { @@ -1221,6 +1289,7 @@ UPB_INLINE void envoy_config_listener_v3_Listener_set_stat_prefix(envoy_config_l } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); 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) { @@ -1241,6 +1310,7 @@ UPB_INLINE void envoy_config_listener_v3_Listener_set_ignore_global_conn_limit(e } 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_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__matcher__v3__Matcher_msg_init); 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) { @@ -1253,6 +1323,7 @@ UPB_INLINE struct xds_type_matcher_v3_Matcher* envoy_config_listener_v3_Listener } UPB_INLINE envoy_config_listener_v3_AdditionalAddress** envoy_config_listener_v3_Listener_mutable_additional_addresses(envoy_config_listener_v3_Listener* msg, size_t* size) { upb_MiniTableField field = {33, UPB_SIZE(120, 232), 0, 22, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__listener__v3__AdditionalAddress_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1269,6 +1340,7 @@ UPB_INLINE envoy_config_listener_v3_AdditionalAddress** envoy_config_listener_v3 } UPB_INLINE struct envoy_config_listener_v3_AdditionalAddress* envoy_config_listener_v3_Listener_add_additional_addresses(envoy_config_listener_v3_Listener* msg, upb_Arena* arena) { upb_MiniTableField field = {33, UPB_SIZE(120, 232), 0, 22, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__listener__v3__AdditionalAddress_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -1283,6 +1355,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); 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) { @@ -1342,6 +1415,7 @@ UPB_INLINE const struct google_protobuf_BoolValue* envoy_config_listener_v3_List const struct google_protobuf_BoolValue* default_val = NULL; const struct google_protobuf_BoolValue* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1353,6 +1427,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); 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) { @@ -1418,6 +1493,7 @@ UPB_INLINE const envoy_config_listener_v3_Listener_ConnectionBalanceConfig_Exact const envoy_config_listener_v3_Listener_ConnectionBalanceConfig_ExactBalance* default_val = NULL; const envoy_config_listener_v3_Listener_ConnectionBalanceConfig_ExactBalance* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__listener__v3__Listener__ConnectionBalanceConfig__ExactBalance_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1434,6 +1510,7 @@ UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_ const struct envoy_config_core_v3_TypedExtensionConfig* default_val = NULL; const struct envoy_config_core_v3_TypedExtensionConfig* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1445,6 +1522,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__listener__v3__Listener__ConnectionBalanceConfig__ExactBalance_msg_init); 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) { @@ -1457,6 +1535,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); 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) { diff --git a/src/core/ext/upb-gen/envoy/config/listener/v3/listener.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/listener/v3/listener.upb_minitable.c index 36541d5abc8..5b19dd1bc57 100644 --- a/src/core/ext/upb-gen/envoy/config/listener/v3/listener.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/config/listener/v3/listener.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/config/listener/v3/listener.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -30,9 +31,10 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub envoy_config_listener_v3_AdditionalAddress_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Address_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__SocketOptionsOverride_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal envoy_config_listener_v3_AdditionalAddress_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Address_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__SocketOptionsOverride_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_listener_v3_AdditionalAddress__fields[2] = { @@ -49,8 +51,9 @@ const upb_MiniTable envoy__config__listener__v3__AdditionalAddress_msg_init = { #endif }; -static const upb_MiniTableSub envoy_config_listener_v3_ListenerCollection_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &xds__core__v3__CollectionEntry_msg_init}, +const upb_MiniTable* envoy__config__listener__v3__AdditionalAddress_msg_init_ptr = &envoy__config__listener__v3__AdditionalAddress_msg_init; +static const upb_MiniTableSubInternal envoy_config_listener_v3_ListenerCollection_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &xds__core__v3__CollectionEntry_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_listener_v3_ListenerCollection__fields[1] = { @@ -70,31 +73,32 @@ const upb_MiniTable envoy__config__listener__v3__ListenerCollection_msg_init = { }) }; -static const upb_MiniTableSub envoy_config_listener_v3_Listener_submsgs[24] = { - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Address_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__listener__v3__FilterChain_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Metadata_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__listener__v3__Listener__DeprecatedV1_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__listener__v3__ListenerFilter_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__SocketOption_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__listener__v3__UdpListenerConfig_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__listener__v3__ApiListener_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__listener__v3__Listener__ConnectionBalanceConfig_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__accesslog__v3__AccessLog_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__listener__v3__FilterChain_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__listener__v3__Listener__InternalListenerConfig_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init}, - {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__listener__v3__AdditionalAddress_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init}, +const upb_MiniTable* envoy__config__listener__v3__ListenerCollection_msg_init_ptr = &envoy__config__listener__v3__ListenerCollection_msg_init; +static const upb_MiniTableSubInternal envoy_config_listener_v3_Listener_submsgs[24] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Address_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__listener__v3__FilterChain_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Metadata_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__listener__v3__Listener__DeprecatedV1_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__listener__v3__ListenerFilter_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__SocketOption_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__listener__v3__UdpListenerConfig_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__listener__v3__ApiListener_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__listener__v3__Listener__ConnectionBalanceConfig_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__accesslog__v3__AccessLog_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__listener__v3__FilterChain_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__listener__v3__Listener__InternalListenerConfig_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__listener__v3__AdditionalAddress_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_listener_v3_Listener__fields[33] = { @@ -176,8 +180,9 @@ const upb_MiniTable envoy__config__listener__v3__Listener_msg_init = { }) }; -static const upb_MiniTableSub envoy_config_listener_v3_Listener_DeprecatedV1_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init}, +const upb_MiniTable* envoy__config__listener__v3__Listener_msg_init_ptr = &envoy__config__listener__v3__Listener_msg_init; +static const upb_MiniTableSubInternal envoy_config_listener_v3_Listener_DeprecatedV1_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_listener_v3_Listener_DeprecatedV1__fields[1] = { @@ -193,9 +198,10 @@ const upb_MiniTable envoy__config__listener__v3__Listener__DeprecatedV1_msg_init #endif }; -static const upb_MiniTableSub envoy_config_listener_v3_Listener_ConnectionBalanceConfig_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &envoy__config__listener__v3__Listener__ConnectionBalanceConfig__ExactBalance_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init}, +const upb_MiniTable* envoy__config__listener__v3__Listener__DeprecatedV1_msg_init_ptr = &envoy__config__listener__v3__Listener__DeprecatedV1_msg_init; +static const upb_MiniTableSubInternal envoy_config_listener_v3_Listener_ConnectionBalanceConfig_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &envoy__config__listener__v3__Listener__ConnectionBalanceConfig__ExactBalance_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_listener_v3_Listener_ConnectionBalanceConfig__fields[2] = { @@ -218,6 +224,7 @@ const upb_MiniTable envoy__config__listener__v3__Listener__ConnectionBalanceConf }) }; +const upb_MiniTable* envoy__config__listener__v3__Listener__ConnectionBalanceConfig_msg_init_ptr = &envoy__config__listener__v3__Listener__ConnectionBalanceConfig_msg_init; const upb_MiniTable envoy__config__listener__v3__Listener__ConnectionBalanceConfig__ExactBalance_msg_init = { NULL, NULL, @@ -227,6 +234,7 @@ const upb_MiniTable envoy__config__listener__v3__Listener__ConnectionBalanceConf #endif }; +const upb_MiniTable* envoy__config__listener__v3__Listener__ConnectionBalanceConfig__ExactBalance_msg_init_ptr = &envoy__config__listener__v3__Listener__ConnectionBalanceConfig__ExactBalance_msg_init; const upb_MiniTable envoy__config__listener__v3__Listener__InternalListenerConfig_msg_init = { NULL, NULL, @@ -236,6 +244,7 @@ const upb_MiniTable envoy__config__listener__v3__Listener__InternalListenerConfi #endif }; +const upb_MiniTable* envoy__config__listener__v3__Listener__InternalListenerConfig_msg_init_ptr = &envoy__config__listener__v3__Listener__InternalListenerConfig_msg_init; const upb_MiniTable envoy__config__listener__v3__ListenerManager_msg_init = { NULL, NULL, @@ -245,6 +254,7 @@ const upb_MiniTable envoy__config__listener__v3__ListenerManager_msg_init = { #endif }; +const upb_MiniTable* envoy__config__listener__v3__ListenerManager_msg_init_ptr = &envoy__config__listener__v3__ListenerManager_msg_init; const upb_MiniTable envoy__config__listener__v3__ValidationListenerManager_msg_init = { NULL, NULL, @@ -254,6 +264,7 @@ const upb_MiniTable envoy__config__listener__v3__ValidationListenerManager_msg_i #endif }; +const upb_MiniTable* envoy__config__listener__v3__ValidationListenerManager_msg_init_ptr = &envoy__config__listener__v3__ValidationListenerManager_msg_init; const upb_MiniTable envoy__config__listener__v3__ApiListenerManager_msg_init = { NULL, NULL, @@ -263,6 +274,7 @@ const upb_MiniTable envoy__config__listener__v3__ApiListenerManager_msg_init = { #endif }; +const upb_MiniTable* envoy__config__listener__v3__ApiListenerManager_msg_init_ptr = &envoy__config__listener__v3__ApiListenerManager_msg_init; static const upb_MiniTable *messages_layout[10] = { &envoy__config__listener__v3__AdditionalAddress_msg_init, &envoy__config__listener__v3__ListenerCollection_msg_init, diff --git a/src/core/ext/upb-gen/envoy/config/listener/v3/listener.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/listener/v3/listener.upb_minitable.h index 116916f8087..7e125b19f35 100644 --- a/src/core/ext/upb-gen/envoy/config/listener/v3/listener.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/config/listener/v3/listener.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/config/listener/v3/listener.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_LISTENER_V3_LISTENER_PROTO_UPB_MINITABLE_H_ #define ENVOY_CONFIG_LISTENER_V3_LISTENER_PROTO_UPB_MINITABLE_H_ @@ -18,15 +19,25 @@ extern "C" { #endif extern const upb_MiniTable envoy__config__listener__v3__AdditionalAddress_msg_init; +extern const upb_MiniTable* envoy__config__listener__v3__AdditionalAddress_msg_init_ptr; extern const upb_MiniTable envoy__config__listener__v3__ListenerCollection_msg_init; +extern const upb_MiniTable* envoy__config__listener__v3__ListenerCollection_msg_init_ptr; extern const upb_MiniTable envoy__config__listener__v3__Listener_msg_init; +extern const upb_MiniTable* envoy__config__listener__v3__Listener_msg_init_ptr; extern const upb_MiniTable envoy__config__listener__v3__Listener__DeprecatedV1_msg_init; +extern const upb_MiniTable* envoy__config__listener__v3__Listener__DeprecatedV1_msg_init_ptr; extern const upb_MiniTable envoy__config__listener__v3__Listener__ConnectionBalanceConfig_msg_init; +extern const upb_MiniTable* envoy__config__listener__v3__Listener__ConnectionBalanceConfig_msg_init_ptr; extern const upb_MiniTable envoy__config__listener__v3__Listener__ConnectionBalanceConfig__ExactBalance_msg_init; +extern const upb_MiniTable* envoy__config__listener__v3__Listener__ConnectionBalanceConfig__ExactBalance_msg_init_ptr; extern const upb_MiniTable envoy__config__listener__v3__Listener__InternalListenerConfig_msg_init; +extern const upb_MiniTable* envoy__config__listener__v3__Listener__InternalListenerConfig_msg_init_ptr; extern const upb_MiniTable envoy__config__listener__v3__ListenerManager_msg_init; +extern const upb_MiniTable* envoy__config__listener__v3__ListenerManager_msg_init_ptr; extern const upb_MiniTable envoy__config__listener__v3__ValidationListenerManager_msg_init; +extern const upb_MiniTable* envoy__config__listener__v3__ValidationListenerManager_msg_init_ptr; extern const upb_MiniTable envoy__config__listener__v3__ApiListenerManager_msg_init; +extern const upb_MiniTable* envoy__config__listener__v3__ApiListenerManager_msg_init_ptr; extern const upb_MiniTableFile envoy_config_listener_v3_listener_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/config/listener/v3/listener_components.upb.h b/src/core/ext/upb-gen/envoy/config/listener/v3/listener_components.upb.h index 5c0bcc3e11b..4257dc6236f 100644 --- a/src/core/ext/upb-gen/envoy/config/listener/v3/listener_components.upb.h +++ b/src/core/ext/upb-gen/envoy/config/listener/v3/listener_components.upb.h @@ -3,7 +3,8 @@ * envoy/config/listener/v3/listener_components.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_LISTENER_V3_LISTENER_COMPONENTS_PROTO_UPB_H_ #define ENVOY_CONFIG_LISTENER_V3_LISTENER_COMPONENTS_PROTO_UPB_H_ @@ -122,6 +123,7 @@ UPB_INLINE const struct google_protobuf_Any* envoy_config_listener_v3_Filter_typ const struct google_protobuf_Any* default_val = NULL; const struct google_protobuf_Any* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -138,6 +140,7 @@ UPB_INLINE const struct envoy_config_core_v3_ExtensionConfigSource* envoy_config const struct envoy_config_core_v3_ExtensionConfigSource* default_val = NULL; const struct envoy_config_core_v3_ExtensionConfigSource* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__ExtensionConfigSource_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -153,6 +156,7 @@ UPB_INLINE void envoy_config_listener_v3_Filter_set_name(envoy_config_listener_v } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); 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) { @@ -165,6 +169,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__ExtensionConfigSource_msg_init); 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) { @@ -218,6 +223,7 @@ UPB_INLINE void envoy_config_listener_v3_FilterChainMatch_clear_prefix_ranges(en } UPB_INLINE const struct envoy_config_core_v3_CidrRange* const* envoy_config_listener_v3_FilterChainMatch_prefix_ranges(const envoy_config_listener_v3_FilterChainMatch* msg, size_t* size) { const upb_MiniTableField field = {3, UPB_SIZE(12, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__CidrRange_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -229,6 +235,7 @@ UPB_INLINE const struct envoy_config_core_v3_CidrRange* const* envoy_config_list } UPB_INLINE const upb_Array* _envoy_config_listener_v3_FilterChainMatch_prefix_ranges_upb_array(const envoy_config_listener_v3_FilterChainMatch* msg, size_t* size) { const upb_MiniTableField field = {3, UPB_SIZE(12, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__CidrRange_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -237,6 +244,7 @@ UPB_INLINE const upb_Array* _envoy_config_listener_v3_FilterChainMatch_prefix_ra } UPB_INLINE upb_Array* _envoy_config_listener_v3_FilterChainMatch_prefix_ranges_mutable_upb_array(envoy_config_listener_v3_FilterChainMatch* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {3, UPB_SIZE(12, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__CidrRange_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -264,6 +272,7 @@ UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_listener_v3_Fi const struct google_protobuf_UInt32Value* default_val = NULL; const struct google_protobuf_UInt32Value* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -278,6 +287,7 @@ UPB_INLINE void envoy_config_listener_v3_FilterChainMatch_clear_source_prefix_ra } UPB_INLINE const struct envoy_config_core_v3_CidrRange* const* envoy_config_listener_v3_FilterChainMatch_source_prefix_ranges(const envoy_config_listener_v3_FilterChainMatch* msg, size_t* size) { const upb_MiniTableField field = {6, UPB_SIZE(20, 48), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__CidrRange_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -289,6 +299,7 @@ UPB_INLINE const struct envoy_config_core_v3_CidrRange* const* envoy_config_list } UPB_INLINE const upb_Array* _envoy_config_listener_v3_FilterChainMatch_source_prefix_ranges_upb_array(const envoy_config_listener_v3_FilterChainMatch* msg, size_t* size) { const upb_MiniTableField field = {6, UPB_SIZE(20, 48), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__CidrRange_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -297,6 +308,7 @@ UPB_INLINE const upb_Array* _envoy_config_listener_v3_FilterChainMatch_source_pr } UPB_INLINE upb_Array* _envoy_config_listener_v3_FilterChainMatch_source_prefix_ranges_mutable_upb_array(envoy_config_listener_v3_FilterChainMatch* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {6, UPB_SIZE(20, 48), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__CidrRange_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -344,6 +356,7 @@ UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_listener_v3_Fi const struct google_protobuf_UInt32Value* default_val = NULL; const struct google_protobuf_UInt32Value* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -446,6 +459,7 @@ UPB_INLINE void envoy_config_listener_v3_FilterChainMatch_clear_direct_source_pr } UPB_INLINE const struct envoy_config_core_v3_CidrRange* const* envoy_config_listener_v3_FilterChainMatch_direct_source_prefix_ranges(const envoy_config_listener_v3_FilterChainMatch* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__CidrRange_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -457,6 +471,7 @@ UPB_INLINE const struct envoy_config_core_v3_CidrRange* const* envoy_config_list } UPB_INLINE const upb_Array* _envoy_config_listener_v3_FilterChainMatch_direct_source_prefix_ranges_upb_array(const envoy_config_listener_v3_FilterChainMatch* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__CidrRange_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -465,6 +480,7 @@ UPB_INLINE const upb_Array* _envoy_config_listener_v3_FilterChainMatch_direct_so } UPB_INLINE upb_Array* _envoy_config_listener_v3_FilterChainMatch_direct_source_prefix_ranges_mutable_upb_array(envoy_config_listener_v3_FilterChainMatch* msg, size_t* size, upb_Arena* arena) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__CidrRange_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -475,6 +491,7 @@ UPB_INLINE upb_Array* _envoy_config_listener_v3_FilterChainMatch_direct_source_p UPB_INLINE struct envoy_config_core_v3_CidrRange** envoy_config_listener_v3_FilterChainMatch_mutable_prefix_ranges(envoy_config_listener_v3_FilterChainMatch* msg, size_t* size) { upb_MiniTableField field = {3, UPB_SIZE(12, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__CidrRange_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -491,6 +508,7 @@ UPB_INLINE struct envoy_config_core_v3_CidrRange** envoy_config_listener_v3_Filt } UPB_INLINE struct envoy_config_core_v3_CidrRange* envoy_config_listener_v3_FilterChainMatch_add_prefix_ranges(envoy_config_listener_v3_FilterChainMatch* msg, upb_Arena* arena) { upb_MiniTableField field = {3, UPB_SIZE(12, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__CidrRange_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -509,6 +527,7 @@ UPB_INLINE void envoy_config_listener_v3_FilterChainMatch_set_address_suffix(env } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); 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) { @@ -521,6 +540,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_listener_v3_FilterCh } UPB_INLINE struct envoy_config_core_v3_CidrRange** envoy_config_listener_v3_FilterChainMatch_mutable_source_prefix_ranges(envoy_config_listener_v3_FilterChainMatch* msg, size_t* size) { upb_MiniTableField field = {6, UPB_SIZE(20, 48), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__CidrRange_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -537,6 +557,7 @@ UPB_INLINE struct envoy_config_core_v3_CidrRange** envoy_config_listener_v3_Filt } UPB_INLINE struct envoy_config_core_v3_CidrRange* envoy_config_listener_v3_FilterChainMatch_add_source_prefix_ranges(envoy_config_listener_v3_FilterChainMatch* msg, upb_Arena* arena) { upb_MiniTableField field = {6, UPB_SIZE(20, 48), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__CidrRange_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -579,6 +600,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); 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) { @@ -655,6 +677,7 @@ UPB_INLINE void envoy_config_listener_v3_FilterChainMatch_set_source_type(envoy_ } 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__CidrRange_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -671,6 +694,7 @@ UPB_INLINE struct envoy_config_core_v3_CidrRange** envoy_config_listener_v3_Filt } UPB_INLINE struct envoy_config_core_v3_CidrRange* envoy_config_listener_v3_FilterChainMatch_add_direct_source_prefix_ranges(envoy_config_listener_v3_FilterChainMatch* msg, upb_Arena* arena) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__CidrRange_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -728,6 +752,7 @@ UPB_INLINE const envoy_config_listener_v3_FilterChainMatch* envoy_config_listene const envoy_config_listener_v3_FilterChainMatch* default_val = NULL; const envoy_config_listener_v3_FilterChainMatch* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__listener__v3__FilterChainMatch_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -742,6 +767,7 @@ UPB_INLINE void envoy_config_listener_v3_FilterChain_clear_filters(envoy_config_ } UPB_INLINE const envoy_config_listener_v3_Filter* const* envoy_config_listener_v3_FilterChain_filters(const envoy_config_listener_v3_FilterChain* msg, size_t* size) { const upb_MiniTableField field = {3, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__listener__v3__Filter_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -753,6 +779,7 @@ UPB_INLINE const envoy_config_listener_v3_Filter* const* envoy_config_listener_v } UPB_INLINE const upb_Array* _envoy_config_listener_v3_FilterChain_filters_upb_array(const envoy_config_listener_v3_FilterChain* msg, size_t* size) { const upb_MiniTableField field = {3, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__listener__v3__Filter_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -761,6 +788,7 @@ UPB_INLINE const upb_Array* _envoy_config_listener_v3_FilterChain_filters_upb_ar } UPB_INLINE upb_Array* _envoy_config_listener_v3_FilterChain_filters_mutable_upb_array(envoy_config_listener_v3_FilterChain* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {3, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__listener__v3__Filter_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -776,6 +804,7 @@ UPB_INLINE const struct google_protobuf_BoolValue* envoy_config_listener_v3_Filt const struct google_protobuf_BoolValue* default_val = NULL; const struct google_protobuf_BoolValue* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -792,6 +821,7 @@ UPB_INLINE const struct envoy_config_core_v3_Metadata* envoy_config_listener_v3_ const struct envoy_config_core_v3_Metadata* default_val = NULL; const struct envoy_config_core_v3_Metadata* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Metadata_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -808,6 +838,7 @@ UPB_INLINE const struct envoy_config_core_v3_TransportSocket* envoy_config_liste const struct envoy_config_core_v3_TransportSocket* default_val = NULL; const struct envoy_config_core_v3_TransportSocket* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TransportSocket_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -836,6 +867,7 @@ UPB_INLINE const envoy_config_listener_v3_FilterChain_OnDemandConfiguration* env const envoy_config_listener_v3_FilterChain_OnDemandConfiguration* default_val = NULL; const envoy_config_listener_v3_FilterChain_OnDemandConfiguration* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__listener__v3__FilterChain__OnDemandConfiguration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -852,6 +884,7 @@ UPB_INLINE const struct google_protobuf_Duration* envoy_config_listener_v3_Filte const struct google_protobuf_Duration* default_val = NULL; const struct google_protobuf_Duration* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -863,6 +896,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__listener__v3__FilterChainMatch_msg_init); 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) { @@ -875,6 +909,7 @@ UPB_INLINE struct envoy_config_listener_v3_FilterChainMatch* envoy_config_listen } UPB_INLINE envoy_config_listener_v3_Filter** envoy_config_listener_v3_FilterChain_mutable_filters(envoy_config_listener_v3_FilterChain* msg, size_t* size) { upb_MiniTableField field = {3, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__listener__v3__Filter_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -891,6 +926,7 @@ UPB_INLINE envoy_config_listener_v3_Filter** envoy_config_listener_v3_FilterChai } UPB_INLINE struct envoy_config_listener_v3_Filter* envoy_config_listener_v3_FilterChain_add_filters(envoy_config_listener_v3_FilterChain* msg, upb_Arena* arena) { upb_MiniTableField field = {3, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__listener__v3__Filter_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -905,6 +941,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); 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) { @@ -917,6 +954,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Metadata_msg_init); 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) { @@ -929,6 +967,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TransportSocket_msg_init); 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) { @@ -945,6 +984,7 @@ UPB_INLINE void envoy_config_listener_v3_FilterChain_set_name(envoy_config_liste } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__listener__v3__FilterChain__OnDemandConfiguration_msg_init); 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) { @@ -957,6 +997,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { @@ -1012,6 +1053,7 @@ UPB_INLINE const struct google_protobuf_Duration* envoy_config_listener_v3_Filte 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1023,6 +1065,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { @@ -1091,6 +1134,7 @@ UPB_INLINE const envoy_config_listener_v3_ListenerFilterChainMatchPredicate_Matc const envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet* default_val = NULL; const envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__listener__v3__ListenerFilterChainMatchPredicate__MatchSet_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1107,6 +1151,7 @@ UPB_INLINE const envoy_config_listener_v3_ListenerFilterChainMatchPredicate_Matc const envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet* default_val = NULL; const envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__listener__v3__ListenerFilterChainMatchPredicate__MatchSet_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1123,6 +1168,7 @@ UPB_INLINE const envoy_config_listener_v3_ListenerFilterChainMatchPredicate* env const envoy_config_listener_v3_ListenerFilterChainMatchPredicate* default_val = NULL; const envoy_config_listener_v3_ListenerFilterChainMatchPredicate* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__listener__v3__ListenerFilterChainMatchPredicate_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1155,6 +1201,7 @@ UPB_INLINE const struct envoy_type_v3_Int32Range* envoy_config_listener_v3_Liste const struct envoy_type_v3_Int32Range* default_val = NULL; const struct envoy_type_v3_Int32Range* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__v3__Int32Range_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1166,6 +1213,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__listener__v3__ListenerFilterChainMatchPredicate__MatchSet_msg_init); 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) { @@ -1178,6 +1226,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__listener__v3__ListenerFilterChainMatchPredicate__MatchSet_msg_init); 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) { @@ -1190,6 +1239,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__listener__v3__ListenerFilterChainMatchPredicate_msg_init); 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) { @@ -1206,6 +1256,7 @@ UPB_INLINE void envoy_config_listener_v3_ListenerFilterChainMatchPredicate_set_a } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__v3__Int32Range_msg_init); 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) { @@ -1259,6 +1310,7 @@ UPB_INLINE void envoy_config_listener_v3_ListenerFilterChainMatchPredicate_Match } UPB_INLINE const envoy_config_listener_v3_ListenerFilterChainMatchPredicate* const* envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet_rules(const envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__listener__v3__ListenerFilterChainMatchPredicate_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1270,6 +1322,7 @@ UPB_INLINE const envoy_config_listener_v3_ListenerFilterChainMatchPredicate* con } UPB_INLINE const upb_Array* _envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet_rules_upb_array(const envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__listener__v3__ListenerFilterChainMatchPredicate_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -1278,6 +1331,7 @@ UPB_INLINE const upb_Array* _envoy_config_listener_v3_ListenerFilterChainMatchPr } UPB_INLINE upb_Array* _envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet_rules_mutable_upb_array(envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__listener__v3__ListenerFilterChainMatchPredicate_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -1288,6 +1342,7 @@ UPB_INLINE upb_Array* _envoy_config_listener_v3_ListenerFilterChainMatchPredicat UPB_INLINE envoy_config_listener_v3_ListenerFilterChainMatchPredicate** envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet_mutable_rules(envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__listener__v3__ListenerFilterChainMatchPredicate_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1304,6 +1359,7 @@ UPB_INLINE envoy_config_listener_v3_ListenerFilterChainMatchPredicate** envoy_co } UPB_INLINE struct envoy_config_listener_v3_ListenerFilterChainMatchPredicate* envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet_add_rules(envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet* msg, upb_Arena* arena) { upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__listener__v3__ListenerFilterChainMatchPredicate_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -1383,6 +1439,7 @@ UPB_INLINE const struct google_protobuf_Any* envoy_config_listener_v3_ListenerFi const struct google_protobuf_Any* default_val = NULL; const struct google_protobuf_Any* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1399,6 +1456,7 @@ UPB_INLINE const envoy_config_listener_v3_ListenerFilterChainMatchPredicate* env const envoy_config_listener_v3_ListenerFilterChainMatchPredicate* default_val = NULL; const envoy_config_listener_v3_ListenerFilterChainMatchPredicate* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__listener__v3__ListenerFilterChainMatchPredicate_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1415,6 +1473,7 @@ UPB_INLINE const struct envoy_config_core_v3_ExtensionConfigSource* envoy_config const struct envoy_config_core_v3_ExtensionConfigSource* default_val = NULL; const struct envoy_config_core_v3_ExtensionConfigSource* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__ExtensionConfigSource_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1430,6 +1489,7 @@ UPB_INLINE void envoy_config_listener_v3_ListenerFilter_set_name(envoy_config_li } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); 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) { @@ -1442,6 +1502,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__listener__v3__ListenerFilterChainMatchPredicate_msg_init); 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) { @@ -1454,6 +1515,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__ExtensionConfigSource_msg_init); 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) { diff --git a/src/core/ext/upb-gen/envoy/config/listener/v3/listener_components.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/listener/v3/listener_components.upb_minitable.c index 238cddc7d70..36d5e3897b5 100644 --- a/src/core/ext/upb-gen/envoy/config/listener/v3/listener_components.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/config/listener/v3/listener_components.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/config/listener/v3/listener_components.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -23,9 +24,10 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub envoy_config_listener_v3_Filter_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ExtensionConfigSource_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal envoy_config_listener_v3_Filter_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ExtensionConfigSource_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_listener_v3_Filter__fields[3] = { @@ -53,12 +55,13 @@ const upb_MiniTable envoy__config__listener__v3__Filter_msg_init = { }) }; -static const upb_MiniTableSub envoy_config_listener_v3_FilterChainMatch_submsgs[5] = { - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__CidrRange_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__CidrRange_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__CidrRange_msg_init}, +const upb_MiniTable* envoy__config__listener__v3__Filter_msg_init_ptr = &envoy__config__listener__v3__Filter_msg_init; +static const upb_MiniTableSubInternal envoy_config_listener_v3_FilterChainMatch_submsgs[5] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__CidrRange_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__CidrRange_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__CidrRange_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_listener_v3_FilterChainMatch__fields[11] = { @@ -102,14 +105,15 @@ const upb_MiniTable envoy__config__listener__v3__FilterChainMatch_msg_init = { }) }; -static const upb_MiniTableSub envoy_config_listener_v3_FilterChain_submsgs[7] = { - {.UPB_PRIVATE(submsg) = &envoy__config__listener__v3__FilterChainMatch_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__listener__v3__Filter_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Metadata_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TransportSocket_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__listener__v3__FilterChain__OnDemandConfiguration_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, +const upb_MiniTable* envoy__config__listener__v3__FilterChainMatch_msg_init_ptr = &envoy__config__listener__v3__FilterChainMatch_msg_init; +static const upb_MiniTableSubInternal envoy_config_listener_v3_FilterChain_submsgs[7] = { + {.UPB_PRIVATE(submsg) = &envoy__config__listener__v3__FilterChainMatch_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__listener__v3__Filter_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Metadata_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TransportSocket_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__listener__v3__FilterChain__OnDemandConfiguration_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_listener_v3_FilterChain__fields[8] = { @@ -142,8 +146,9 @@ const upb_MiniTable envoy__config__listener__v3__FilterChain_msg_init = { }) }; -static const upb_MiniTableSub envoy_config_listener_v3_FilterChain_OnDemandConfiguration_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, +const upb_MiniTable* envoy__config__listener__v3__FilterChain_msg_init_ptr = &envoy__config__listener__v3__FilterChain_msg_init; +static const upb_MiniTableSubInternal envoy_config_listener_v3_FilterChain_OnDemandConfiguration_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_listener_v3_FilterChain_OnDemandConfiguration__fields[1] = { @@ -159,11 +164,12 @@ const upb_MiniTable envoy__config__listener__v3__FilterChain__OnDemandConfigurat #endif }; -static const upb_MiniTableSub envoy_config_listener_v3_ListenerFilterChainMatchPredicate_submsgs[4] = { - {.UPB_PRIVATE(submsg) = &envoy__config__listener__v3__ListenerFilterChainMatchPredicate__MatchSet_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__listener__v3__ListenerFilterChainMatchPredicate__MatchSet_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__listener__v3__ListenerFilterChainMatchPredicate_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__type__v3__Int32Range_msg_init}, +const upb_MiniTable* envoy__config__listener__v3__FilterChain__OnDemandConfiguration_msg_init_ptr = &envoy__config__listener__v3__FilterChain__OnDemandConfiguration_msg_init; +static const upb_MiniTableSubInternal envoy_config_listener_v3_ListenerFilterChainMatchPredicate_submsgs[4] = { + {.UPB_PRIVATE(submsg) = &envoy__config__listener__v3__ListenerFilterChainMatchPredicate__MatchSet_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__listener__v3__ListenerFilterChainMatchPredicate__MatchSet_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__listener__v3__ListenerFilterChainMatchPredicate_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__type__v3__Int32Range_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_listener_v3_ListenerFilterChainMatchPredicate__fields[5] = { @@ -193,8 +199,9 @@ const upb_MiniTable envoy__config__listener__v3__ListenerFilterChainMatchPredica }) }; -static const upb_MiniTableSub envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__config__listener__v3__ListenerFilterChainMatchPredicate_msg_init}, +const upb_MiniTable* envoy__config__listener__v3__ListenerFilterChainMatchPredicate_msg_init_ptr = &envoy__config__listener__v3__ListenerFilterChainMatchPredicate_msg_init; +static const upb_MiniTableSubInternal envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__config__listener__v3__ListenerFilterChainMatchPredicate_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet__fields[1] = { @@ -214,10 +221,11 @@ const upb_MiniTable envoy__config__listener__v3__ListenerFilterChainMatchPredica }) }; -static const upb_MiniTableSub envoy_config_listener_v3_ListenerFilter_submsgs[3] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__listener__v3__ListenerFilterChainMatchPredicate_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ExtensionConfigSource_msg_init}, +const upb_MiniTable* envoy__config__listener__v3__ListenerFilterChainMatchPredicate__MatchSet_msg_init_ptr = &envoy__config__listener__v3__ListenerFilterChainMatchPredicate__MatchSet_msg_init; +static const upb_MiniTableSubInternal envoy_config_listener_v3_ListenerFilter_submsgs[3] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__listener__v3__ListenerFilterChainMatchPredicate_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ExtensionConfigSource_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_listener_v3_ListenerFilter__fields[4] = { @@ -246,6 +254,7 @@ const upb_MiniTable envoy__config__listener__v3__ListenerFilter_msg_init = { }) }; +const upb_MiniTable* envoy__config__listener__v3__ListenerFilter_msg_init_ptr = &envoy__config__listener__v3__ListenerFilter_msg_init; static const upb_MiniTable *messages_layout[7] = { &envoy__config__listener__v3__Filter_msg_init, &envoy__config__listener__v3__FilterChainMatch_msg_init, diff --git a/src/core/ext/upb-gen/envoy/config/listener/v3/listener_components.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/listener/v3/listener_components.upb_minitable.h index faa918cc65a..d4c6ff64e27 100644 --- a/src/core/ext/upb-gen/envoy/config/listener/v3/listener_components.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/config/listener/v3/listener_components.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/config/listener/v3/listener_components.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_LISTENER_V3_LISTENER_COMPONENTS_PROTO_UPB_MINITABLE_H_ #define ENVOY_CONFIG_LISTENER_V3_LISTENER_COMPONENTS_PROTO_UPB_MINITABLE_H_ @@ -18,12 +19,19 @@ extern "C" { #endif extern const upb_MiniTable envoy__config__listener__v3__Filter_msg_init; +extern const upb_MiniTable* envoy__config__listener__v3__Filter_msg_init_ptr; extern const upb_MiniTable envoy__config__listener__v3__FilterChainMatch_msg_init; +extern const upb_MiniTable* envoy__config__listener__v3__FilterChainMatch_msg_init_ptr; extern const upb_MiniTable envoy__config__listener__v3__FilterChain_msg_init; +extern const upb_MiniTable* envoy__config__listener__v3__FilterChain_msg_init_ptr; extern const upb_MiniTable envoy__config__listener__v3__FilterChain__OnDemandConfiguration_msg_init; +extern const upb_MiniTable* envoy__config__listener__v3__FilterChain__OnDemandConfiguration_msg_init_ptr; extern const upb_MiniTable envoy__config__listener__v3__ListenerFilterChainMatchPredicate_msg_init; +extern const upb_MiniTable* envoy__config__listener__v3__ListenerFilterChainMatchPredicate_msg_init_ptr; extern const upb_MiniTable envoy__config__listener__v3__ListenerFilterChainMatchPredicate__MatchSet_msg_init; +extern const upb_MiniTable* envoy__config__listener__v3__ListenerFilterChainMatchPredicate__MatchSet_msg_init_ptr; extern const upb_MiniTable envoy__config__listener__v3__ListenerFilter_msg_init; +extern const upb_MiniTable* envoy__config__listener__v3__ListenerFilter_msg_init_ptr; extern const upb_MiniTableFile envoy_config_listener_v3_listener_components_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/config/listener/v3/quic_config.upb.h b/src/core/ext/upb-gen/envoy/config/listener/v3/quic_config.upb.h index b2000cbe94e..ac4d3f0042a 100644 --- a/src/core/ext/upb-gen/envoy/config/listener/v3/quic_config.upb.h +++ b/src/core/ext/upb-gen/envoy/config/listener/v3/quic_config.upb.h @@ -3,7 +3,8 @@ * envoy/config/listener/v3/quic_config.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_LISTENER_V3_QUIC_CONFIG_PROTO_UPB_H_ #define ENVOY_CONFIG_LISTENER_V3_QUIC_CONFIG_PROTO_UPB_H_ @@ -83,6 +84,7 @@ UPB_INLINE const struct envoy_config_core_v3_QuicProtocolOptions* envoy_config_l const struct envoy_config_core_v3_QuicProtocolOptions* default_val = NULL; const struct envoy_config_core_v3_QuicProtocolOptions* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__QuicProtocolOptions_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -99,6 +101,7 @@ UPB_INLINE const struct google_protobuf_Duration* envoy_config_listener_v3_QuicP const struct google_protobuf_Duration* default_val = NULL; const struct google_protobuf_Duration* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -115,6 +118,7 @@ UPB_INLINE const struct google_protobuf_Duration* envoy_config_listener_v3_QuicP const struct google_protobuf_Duration* default_val = NULL; const struct google_protobuf_Duration* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -131,6 +135,7 @@ UPB_INLINE const struct envoy_config_core_v3_RuntimeFeatureFlag* envoy_config_li const struct envoy_config_core_v3_RuntimeFeatureFlag* default_val = NULL; const struct envoy_config_core_v3_RuntimeFeatureFlag* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__RuntimeFeatureFlag_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -147,6 +152,7 @@ UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_listener_v3_Qu const struct google_protobuf_UInt32Value* default_val = NULL; const struct google_protobuf_UInt32Value* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -163,6 +169,7 @@ UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_ const struct envoy_config_core_v3_TypedExtensionConfig* default_val = NULL; const struct envoy_config_core_v3_TypedExtensionConfig* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -179,6 +186,7 @@ UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_ const struct envoy_config_core_v3_TypedExtensionConfig* default_val = NULL; const struct envoy_config_core_v3_TypedExtensionConfig* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -195,6 +203,7 @@ UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_ const struct envoy_config_core_v3_TypedExtensionConfig* default_val = NULL; const struct envoy_config_core_v3_TypedExtensionConfig* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -211,6 +220,7 @@ UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_ const struct envoy_config_core_v3_TypedExtensionConfig* default_val = NULL; const struct envoy_config_core_v3_TypedExtensionConfig* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -227,6 +237,7 @@ UPB_INLINE const struct google_protobuf_BoolValue* envoy_config_listener_v3_Quic 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -243,6 +254,7 @@ UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_ 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -254,6 +266,7 @@ UPB_INLINE bool envoy_config_listener_v3_QuicProtocolOptions_has_connection_debu 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__QuicProtocolOptions_msg_init); 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) { @@ -266,6 +279,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { @@ -278,6 +292,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { @@ -290,6 +305,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__RuntimeFeatureFlag_msg_init); 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) { @@ -302,6 +318,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); 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) { @@ -314,6 +331,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); 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) { @@ -326,6 +344,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); 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) { @@ -338,6 +357,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); 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) { @@ -350,6 +370,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); 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) { @@ -362,6 +383,7 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_listen } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); 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) { @@ -374,6 +396,7 @@ UPB_INLINE struct google_protobuf_BoolValue* envoy_config_listener_v3_QuicProtoc } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); 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) { diff --git a/src/core/ext/upb-gen/envoy/config/listener/v3/quic_config.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/listener/v3/quic_config.upb_minitable.c index e98406c2fb1..8556c90dd09 100644 --- a/src/core/ext/upb-gen/envoy/config/listener/v3/quic_config.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/config/listener/v3/quic_config.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/config/listener/v3/quic_config.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -21,18 +22,19 @@ // Must be last. #include "upb/port/def.inc" -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}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__RuntimeFeatureFlag_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_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) = &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}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal envoy_config_listener_v3_QuicProtocolOptions_submsgs[11] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__QuicProtocolOptions_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__RuntimeFeatureFlag_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_listener_v3_QuicProtocolOptions__fields[11] = { @@ -58,6 +60,7 @@ const upb_MiniTable envoy__config__listener__v3__QuicProtocolOptions_msg_init = #endif }; +const upb_MiniTable* envoy__config__listener__v3__QuicProtocolOptions_msg_init_ptr = &envoy__config__listener__v3__QuicProtocolOptions_msg_init; static const upb_MiniTable *messages_layout[1] = { &envoy__config__listener__v3__QuicProtocolOptions_msg_init, }; diff --git a/src/core/ext/upb-gen/envoy/config/listener/v3/quic_config.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/listener/v3/quic_config.upb_minitable.h index fa62cf23c57..c9007f487df 100644 --- a/src/core/ext/upb-gen/envoy/config/listener/v3/quic_config.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/config/listener/v3/quic_config.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/config/listener/v3/quic_config.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_LISTENER_V3_QUIC_CONFIG_PROTO_UPB_MINITABLE_H_ #define ENVOY_CONFIG_LISTENER_V3_QUIC_CONFIG_PROTO_UPB_MINITABLE_H_ @@ -18,6 +19,7 @@ extern "C" { #endif extern const upb_MiniTable envoy__config__listener__v3__QuicProtocolOptions_msg_init; +extern const upb_MiniTable* envoy__config__listener__v3__QuicProtocolOptions_msg_init_ptr; extern const upb_MiniTableFile envoy_config_listener_v3_quic_config_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/config/listener/v3/udp_listener_config.upb.h b/src/core/ext/upb-gen/envoy/config/listener/v3/udp_listener_config.upb.h index c8193d5c0c3..94b16291c8a 100644 --- a/src/core/ext/upb-gen/envoy/config/listener/v3/udp_listener_config.upb.h +++ b/src/core/ext/upb-gen/envoy/config/listener/v3/udp_listener_config.upb.h @@ -3,7 +3,8 @@ * envoy/config/listener/v3/udp_listener_config.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_LISTENER_V3_UDP_LISTENER_CONFIG_PROTO_UPB_H_ #define ENVOY_CONFIG_LISTENER_V3_UDP_LISTENER_CONFIG_PROTO_UPB_H_ @@ -77,6 +78,7 @@ UPB_INLINE const struct envoy_config_core_v3_UdpSocketConfig* envoy_config_liste const struct envoy_config_core_v3_UdpSocketConfig* default_val = NULL; const struct envoy_config_core_v3_UdpSocketConfig* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__UdpSocketConfig_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -93,6 +95,7 @@ UPB_INLINE const struct envoy_config_listener_v3_QuicProtocolOptions* envoy_conf const struct envoy_config_listener_v3_QuicProtocolOptions* default_val = NULL; const struct envoy_config_listener_v3_QuicProtocolOptions* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__listener__v3__QuicProtocolOptions_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -109,6 +112,7 @@ UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_ const struct envoy_config_core_v3_TypedExtensionConfig* default_val = NULL; const struct envoy_config_core_v3_TypedExtensionConfig* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -120,6 +124,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__UdpSocketConfig_msg_init); 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) { @@ -132,6 +137,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__listener__v3__QuicProtocolOptions_msg_init); 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) { @@ -144,6 +150,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); 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) { diff --git a/src/core/ext/upb-gen/envoy/config/listener/v3/udp_listener_config.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/listener/v3/udp_listener_config.upb_minitable.c index 8bb9a2bd1ad..6570ad43fad 100644 --- a/src/core/ext/upb-gen/envoy/config/listener/v3/udp_listener_config.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/config/listener/v3/udp_listener_config.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/config/listener/v3/udp_listener_config.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -17,10 +18,11 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub envoy_config_listener_v3_UdpListenerConfig_submsgs[3] = { - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__UdpSocketConfig_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__listener__v3__QuicProtocolOptions_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal envoy_config_listener_v3_UdpListenerConfig_submsgs[3] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__UdpSocketConfig_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__listener__v3__QuicProtocolOptions_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_listener_v3_UdpListenerConfig__fields[3] = { @@ -38,6 +40,7 @@ const upb_MiniTable envoy__config__listener__v3__UdpListenerConfig_msg_init = { #endif }; +const upb_MiniTable* envoy__config__listener__v3__UdpListenerConfig_msg_init_ptr = &envoy__config__listener__v3__UdpListenerConfig_msg_init; const upb_MiniTable envoy__config__listener__v3__ActiveRawUdpListenerConfig_msg_init = { NULL, NULL, @@ -47,6 +50,7 @@ const upb_MiniTable envoy__config__listener__v3__ActiveRawUdpListenerConfig_msg_ #endif }; +const upb_MiniTable* envoy__config__listener__v3__ActiveRawUdpListenerConfig_msg_init_ptr = &envoy__config__listener__v3__ActiveRawUdpListenerConfig_msg_init; static const upb_MiniTable *messages_layout[2] = { &envoy__config__listener__v3__UdpListenerConfig_msg_init, &envoy__config__listener__v3__ActiveRawUdpListenerConfig_msg_init, diff --git a/src/core/ext/upb-gen/envoy/config/listener/v3/udp_listener_config.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/listener/v3/udp_listener_config.upb_minitable.h index b5df95ff851..e998a4fd978 100644 --- a/src/core/ext/upb-gen/envoy/config/listener/v3/udp_listener_config.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/config/listener/v3/udp_listener_config.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/config/listener/v3/udp_listener_config.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_LISTENER_V3_UDP_LISTENER_CONFIG_PROTO_UPB_MINITABLE_H_ #define ENVOY_CONFIG_LISTENER_V3_UDP_LISTENER_CONFIG_PROTO_UPB_MINITABLE_H_ @@ -18,7 +19,9 @@ extern "C" { #endif extern const upb_MiniTable envoy__config__listener__v3__UdpListenerConfig_msg_init; +extern const upb_MiniTable* envoy__config__listener__v3__UdpListenerConfig_msg_init_ptr; extern const upb_MiniTable envoy__config__listener__v3__ActiveRawUdpListenerConfig_msg_init; +extern const upb_MiniTable* envoy__config__listener__v3__ActiveRawUdpListenerConfig_msg_init_ptr; extern const upb_MiniTableFile envoy_config_listener_v3_udp_listener_config_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/config/metrics/v3/metrics_service.upb.h b/src/core/ext/upb-gen/envoy/config/metrics/v3/metrics_service.upb.h index 748a211d587..b7ffb1c62f3 100644 --- a/src/core/ext/upb-gen/envoy/config/metrics/v3/metrics_service.upb.h +++ b/src/core/ext/upb-gen/envoy/config/metrics/v3/metrics_service.upb.h @@ -3,7 +3,8 @@ * envoy/config/metrics/v3/metrics_service.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_METRICS_V3_METRICS_SERVICE_PROTO_UPB_H_ #define ENVOY_CONFIG_METRICS_V3_METRICS_SERVICE_PROTO_UPB_H_ @@ -82,6 +83,7 @@ UPB_INLINE const struct envoy_config_core_v3_GrpcService* envoy_config_metrics_v const struct envoy_config_core_v3_GrpcService* default_val = NULL; const struct envoy_config_core_v3_GrpcService* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__GrpcService_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -98,6 +100,7 @@ UPB_INLINE const struct google_protobuf_BoolValue* envoy_config_metrics_v3_Metri const struct google_protobuf_BoolValue* default_val = NULL; const struct google_protobuf_BoolValue* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -145,6 +148,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__GrpcService_msg_init); 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) { @@ -157,6 +161,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); 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) { diff --git a/src/core/ext/upb-gen/envoy/config/metrics/v3/metrics_service.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/metrics/v3/metrics_service.upb_minitable.c index be12b7b5512..669b310608c 100644 --- a/src/core/ext/upb-gen/envoy/config/metrics/v3/metrics_service.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/config/metrics/v3/metrics_service.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/config/metrics/v3/metrics_service.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -18,9 +19,10 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub envoy_config_metrics_v3_MetricsServiceConfig_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__GrpcService_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal envoy_config_metrics_v3_MetricsServiceConfig_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__GrpcService_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_metrics_v3_MetricsServiceConfig__fields[5] = { @@ -50,6 +52,7 @@ const upb_MiniTable envoy__config__metrics__v3__MetricsServiceConfig_msg_init = }) }; +const upb_MiniTable* envoy__config__metrics__v3__MetricsServiceConfig_msg_init_ptr = &envoy__config__metrics__v3__MetricsServiceConfig_msg_init; static const upb_MiniTable *messages_layout[1] = { &envoy__config__metrics__v3__MetricsServiceConfig_msg_init, }; diff --git a/src/core/ext/upb-gen/envoy/config/metrics/v3/metrics_service.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/metrics/v3/metrics_service.upb_minitable.h index b755b7324c4..3b8ec578b2d 100644 --- a/src/core/ext/upb-gen/envoy/config/metrics/v3/metrics_service.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/config/metrics/v3/metrics_service.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/config/metrics/v3/metrics_service.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_METRICS_V3_METRICS_SERVICE_PROTO_UPB_MINITABLE_H_ #define ENVOY_CONFIG_METRICS_V3_METRICS_SERVICE_PROTO_UPB_MINITABLE_H_ @@ -18,6 +19,7 @@ extern "C" { #endif extern const upb_MiniTable envoy__config__metrics__v3__MetricsServiceConfig_msg_init; +extern const upb_MiniTable* envoy__config__metrics__v3__MetricsServiceConfig_msg_init_ptr; extern const upb_MiniTableFile envoy_config_metrics_v3_metrics_service_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/config/metrics/v3/stats.upb.h b/src/core/ext/upb-gen/envoy/config/metrics/v3/stats.upb.h index 6dd6e11085c..2d06ee4d3b7 100644 --- a/src/core/ext/upb-gen/envoy/config/metrics/v3/stats.upb.h +++ b/src/core/ext/upb-gen/envoy/config/metrics/v3/stats.upb.h @@ -3,7 +3,8 @@ * envoy/config/metrics/v3/stats.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_METRICS_V3_STATS_PROTO_UPB_H_ #define ENVOY_CONFIG_METRICS_V3_STATS_PROTO_UPB_H_ @@ -109,6 +110,7 @@ UPB_INLINE const struct google_protobuf_Any* envoy_config_metrics_v3_StatsSink_t const struct google_protobuf_Any* default_val = NULL; const struct google_protobuf_Any* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -124,6 +126,7 @@ UPB_INLINE void envoy_config_metrics_v3_StatsSink_set_name(envoy_config_metrics_ } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); 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) { @@ -177,6 +180,7 @@ UPB_INLINE void envoy_config_metrics_v3_StatsConfig_clear_stats_tags(envoy_confi } UPB_INLINE const envoy_config_metrics_v3_TagSpecifier* const* envoy_config_metrics_v3_StatsConfig_stats_tags(const envoy_config_metrics_v3_StatsConfig* msg, size_t* size) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__metrics__v3__TagSpecifier_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -188,6 +192,7 @@ UPB_INLINE const envoy_config_metrics_v3_TagSpecifier* const* envoy_config_metri } UPB_INLINE const upb_Array* _envoy_config_metrics_v3_StatsConfig_stats_tags_upb_array(const envoy_config_metrics_v3_StatsConfig* msg, size_t* size) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__metrics__v3__TagSpecifier_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -196,6 +201,7 @@ UPB_INLINE const upb_Array* _envoy_config_metrics_v3_StatsConfig_stats_tags_upb_ } UPB_INLINE upb_Array* _envoy_config_metrics_v3_StatsConfig_stats_tags_mutable_upb_array(envoy_config_metrics_v3_StatsConfig* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__metrics__v3__TagSpecifier_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -211,6 +217,7 @@ UPB_INLINE const struct google_protobuf_BoolValue* envoy_config_metrics_v3_Stats const struct google_protobuf_BoolValue* default_val = NULL; const struct google_protobuf_BoolValue* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -227,6 +234,7 @@ UPB_INLINE const envoy_config_metrics_v3_StatsMatcher* envoy_config_metrics_v3_S const envoy_config_metrics_v3_StatsMatcher* default_val = NULL; const envoy_config_metrics_v3_StatsMatcher* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__metrics__v3__StatsMatcher_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -241,6 +249,7 @@ UPB_INLINE void envoy_config_metrics_v3_StatsConfig_clear_histogram_bucket_setti } UPB_INLINE const envoy_config_metrics_v3_HistogramBucketSettings* const* envoy_config_metrics_v3_StatsConfig_histogram_bucket_settings(const envoy_config_metrics_v3_StatsConfig* msg, size_t* size) { const upb_MiniTableField field = {4, UPB_SIZE(24, 40), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__metrics__v3__HistogramBucketSettings_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -252,6 +261,7 @@ UPB_INLINE const envoy_config_metrics_v3_HistogramBucketSettings* const* envoy_c } UPB_INLINE const upb_Array* _envoy_config_metrics_v3_StatsConfig_histogram_bucket_settings_upb_array(const envoy_config_metrics_v3_StatsConfig* msg, size_t* size) { const upb_MiniTableField field = {4, UPB_SIZE(24, 40), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__metrics__v3__HistogramBucketSettings_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -260,6 +270,7 @@ UPB_INLINE const upb_Array* _envoy_config_metrics_v3_StatsConfig_histogram_bucke } UPB_INLINE upb_Array* _envoy_config_metrics_v3_StatsConfig_histogram_bucket_settings_mutable_upb_array(envoy_config_metrics_v3_StatsConfig* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {4, UPB_SIZE(24, 40), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__metrics__v3__HistogramBucketSettings_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -270,6 +281,7 @@ UPB_INLINE upb_Array* _envoy_config_metrics_v3_StatsConfig_histogram_bucket_sett UPB_INLINE envoy_config_metrics_v3_TagSpecifier** envoy_config_metrics_v3_StatsConfig_mutable_stats_tags(envoy_config_metrics_v3_StatsConfig* msg, size_t* size) { upb_MiniTableField field = {1, UPB_SIZE(12, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__metrics__v3__TagSpecifier_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -286,6 +298,7 @@ UPB_INLINE envoy_config_metrics_v3_TagSpecifier** envoy_config_metrics_v3_StatsC } UPB_INLINE struct envoy_config_metrics_v3_TagSpecifier* envoy_config_metrics_v3_StatsConfig_add_stats_tags(envoy_config_metrics_v3_StatsConfig* msg, upb_Arena* arena) { upb_MiniTableField field = {1, UPB_SIZE(12, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__metrics__v3__TagSpecifier_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -300,6 +313,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); 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) { @@ -312,6 +326,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__metrics__v3__StatsMatcher_msg_init); 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) { @@ -324,6 +339,7 @@ UPB_INLINE struct envoy_config_metrics_v3_StatsMatcher* envoy_config_metrics_v3_ } UPB_INLINE envoy_config_metrics_v3_HistogramBucketSettings** envoy_config_metrics_v3_StatsConfig_mutable_histogram_bucket_settings(envoy_config_metrics_v3_StatsConfig* msg, size_t* size) { upb_MiniTableField field = {4, UPB_SIZE(24, 40), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__metrics__v3__HistogramBucketSettings_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -340,6 +356,7 @@ UPB_INLINE envoy_config_metrics_v3_HistogramBucketSettings** envoy_config_metric } UPB_INLINE struct envoy_config_metrics_v3_HistogramBucketSettings* envoy_config_metrics_v3_StatsConfig_add_histogram_bucket_settings(envoy_config_metrics_v3_StatsConfig* msg, upb_Arena* arena) { upb_MiniTableField field = {4, UPB_SIZE(24, 40), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__metrics__v3__HistogramBucketSettings_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -424,6 +441,7 @@ UPB_INLINE const struct envoy_type_matcher_v3_ListStringMatcher* envoy_config_me const struct envoy_type_matcher_v3_ListStringMatcher* default_val = NULL; const struct envoy_type_matcher_v3_ListStringMatcher* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__ListStringMatcher_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -440,6 +458,7 @@ UPB_INLINE const struct envoy_type_matcher_v3_ListStringMatcher* envoy_config_me const struct envoy_type_matcher_v3_ListStringMatcher* default_val = NULL; const struct envoy_type_matcher_v3_ListStringMatcher* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__ListStringMatcher_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -455,6 +474,7 @@ UPB_INLINE void envoy_config_metrics_v3_StatsMatcher_set_reject_all(envoy_config } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__ListStringMatcher_msg_init); 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) { @@ -467,6 +487,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__ListStringMatcher_msg_init); 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) { @@ -626,6 +647,7 @@ UPB_INLINE const struct envoy_type_matcher_v3_StringMatcher* envoy_config_metric const struct envoy_type_matcher_v3_StringMatcher* default_val = NULL; const struct envoy_type_matcher_v3_StringMatcher* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__StringMatcher_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -669,6 +691,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__StringMatcher_msg_init); 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) { @@ -762,6 +785,7 @@ UPB_INLINE const struct envoy_config_core_v3_Address* envoy_config_metrics_v3_St const struct envoy_config_core_v3_Address* default_val = NULL; const struct envoy_config_core_v3_Address* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Address_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -801,6 +825,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Address_msg_init); 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) { @@ -873,6 +898,7 @@ UPB_INLINE const struct envoy_config_core_v3_Address* envoy_config_metrics_v3_Do const struct envoy_config_core_v3_Address* default_val = NULL; const struct envoy_config_core_v3_Address* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Address_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -901,6 +927,7 @@ UPB_INLINE const struct google_protobuf_UInt64Value* envoy_config_metrics_v3_Dog const struct google_protobuf_UInt64Value* default_val = NULL; const struct google_protobuf_UInt64Value* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt64Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -912,6 +939,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Address_msg_init); 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) { @@ -928,6 +956,7 @@ UPB_INLINE void envoy_config_metrics_v3_DogStatsdSink_set_prefix(envoy_config_me } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt64Value_msg_init); 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) { diff --git a/src/core/ext/upb-gen/envoy/config/metrics/v3/stats.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/metrics/v3/stats.upb_minitable.c index fe1d316c059..87436173c54 100644 --- a/src/core/ext/upb-gen/envoy/config/metrics/v3/stats.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/config/metrics/v3/stats.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/config/metrics/v3/stats.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -19,8 +20,9 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub envoy_config_metrics_v3_StatsSink_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal envoy_config_metrics_v3_StatsSink_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_metrics_v3_StatsSink__fields[2] = { @@ -43,11 +45,12 @@ const upb_MiniTable envoy__config__metrics__v3__StatsSink_msg_init = { }) }; -static const upb_MiniTableSub envoy_config_metrics_v3_StatsConfig_submsgs[4] = { - {.UPB_PRIVATE(submsg) = &envoy__config__metrics__v3__TagSpecifier_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__metrics__v3__StatsMatcher_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__metrics__v3__HistogramBucketSettings_msg_init}, +const upb_MiniTable* envoy__config__metrics__v3__StatsSink_msg_init_ptr = &envoy__config__metrics__v3__StatsSink_msg_init; +static const upb_MiniTableSubInternal envoy_config_metrics_v3_StatsConfig_submsgs[4] = { + {.UPB_PRIVATE(submsg) = &envoy__config__metrics__v3__TagSpecifier_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__metrics__v3__StatsMatcher_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__metrics__v3__HistogramBucketSettings_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_metrics_v3_StatsConfig__fields[4] = { @@ -76,9 +79,10 @@ const upb_MiniTable envoy__config__metrics__v3__StatsConfig_msg_init = { }) }; -static const upb_MiniTableSub envoy_config_metrics_v3_StatsMatcher_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__ListStringMatcher_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__ListStringMatcher_msg_init}, +const upb_MiniTable* envoy__config__metrics__v3__StatsConfig_msg_init_ptr = &envoy__config__metrics__v3__StatsConfig_msg_init; +static const upb_MiniTableSubInternal envoy_config_metrics_v3_StatsMatcher_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__ListStringMatcher_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__ListStringMatcher_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_metrics_v3_StatsMatcher__fields[3] = { @@ -102,6 +106,7 @@ const upb_MiniTable envoy__config__metrics__v3__StatsMatcher_msg_init = { }) }; +const upb_MiniTable* envoy__config__metrics__v3__StatsMatcher_msg_init_ptr = &envoy__config__metrics__v3__StatsMatcher_msg_init; static const upb_MiniTableField envoy_config_metrics_v3_TagSpecifier__fields[3] = { {1, UPB_SIZE(20, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, {2, UPB_SIZE(12, 16), -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, @@ -123,8 +128,9 @@ const upb_MiniTable envoy__config__metrics__v3__TagSpecifier_msg_init = { }) }; -static const upb_MiniTableSub envoy_config_metrics_v3_HistogramBucketSettings_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__StringMatcher_msg_init}, +const upb_MiniTable* envoy__config__metrics__v3__TagSpecifier_msg_init_ptr = &envoy__config__metrics__v3__TagSpecifier_msg_init; +static const upb_MiniTableSubInternal envoy_config_metrics_v3_HistogramBucketSettings_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__StringMatcher_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_metrics_v3_HistogramBucketSettings__fields[2] = { @@ -147,8 +153,9 @@ const upb_MiniTable envoy__config__metrics__v3__HistogramBucketSettings_msg_init }) }; -static const upb_MiniTableSub envoy_config_metrics_v3_StatsdSink_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Address_msg_init}, +const upb_MiniTable* envoy__config__metrics__v3__HistogramBucketSettings_msg_init_ptr = &envoy__config__metrics__v3__HistogramBucketSettings_msg_init; +static const upb_MiniTableSubInternal envoy_config_metrics_v3_StatsdSink_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Address_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_metrics_v3_StatsdSink__fields[3] = { @@ -172,9 +179,10 @@ const upb_MiniTable envoy__config__metrics__v3__StatsdSink_msg_init = { }) }; -static const upb_MiniTableSub envoy_config_metrics_v3_DogStatsdSink_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Address_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__UInt64Value_msg_init}, +const upb_MiniTable* envoy__config__metrics__v3__StatsdSink_msg_init_ptr = &envoy__config__metrics__v3__StatsdSink_msg_init; +static const upb_MiniTableSubInternal envoy_config_metrics_v3_DogStatsdSink_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Address_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt64Value_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_metrics_v3_DogStatsdSink__fields[3] = { @@ -198,6 +206,7 @@ const upb_MiniTable envoy__config__metrics__v3__DogStatsdSink_msg_init = { }) }; +const upb_MiniTable* envoy__config__metrics__v3__DogStatsdSink_msg_init_ptr = &envoy__config__metrics__v3__DogStatsdSink_msg_init; static const upb_MiniTableField envoy_config_metrics_v3_HystrixSink__fields[1] = { {1, 8, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, }; @@ -215,6 +224,7 @@ const upb_MiniTable envoy__config__metrics__v3__HystrixSink_msg_init = { }) }; +const upb_MiniTable* envoy__config__metrics__v3__HystrixSink_msg_init_ptr = &envoy__config__metrics__v3__HystrixSink_msg_init; static const upb_MiniTable *messages_layout[8] = { &envoy__config__metrics__v3__StatsSink_msg_init, &envoy__config__metrics__v3__StatsConfig_msg_init, diff --git a/src/core/ext/upb-gen/envoy/config/metrics/v3/stats.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/metrics/v3/stats.upb_minitable.h index ab6dbb2df4b..f27f3f4ed85 100644 --- a/src/core/ext/upb-gen/envoy/config/metrics/v3/stats.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/config/metrics/v3/stats.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/config/metrics/v3/stats.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_METRICS_V3_STATS_PROTO_UPB_MINITABLE_H_ #define ENVOY_CONFIG_METRICS_V3_STATS_PROTO_UPB_MINITABLE_H_ @@ -18,13 +19,21 @@ extern "C" { #endif extern const upb_MiniTable envoy__config__metrics__v3__StatsSink_msg_init; +extern const upb_MiniTable* envoy__config__metrics__v3__StatsSink_msg_init_ptr; extern const upb_MiniTable envoy__config__metrics__v3__StatsConfig_msg_init; +extern const upb_MiniTable* envoy__config__metrics__v3__StatsConfig_msg_init_ptr; extern const upb_MiniTable envoy__config__metrics__v3__StatsMatcher_msg_init; +extern const upb_MiniTable* envoy__config__metrics__v3__StatsMatcher_msg_init_ptr; extern const upb_MiniTable envoy__config__metrics__v3__TagSpecifier_msg_init; +extern const upb_MiniTable* envoy__config__metrics__v3__TagSpecifier_msg_init_ptr; extern const upb_MiniTable envoy__config__metrics__v3__HistogramBucketSettings_msg_init; +extern const upb_MiniTable* envoy__config__metrics__v3__HistogramBucketSettings_msg_init_ptr; extern const upb_MiniTable envoy__config__metrics__v3__StatsdSink_msg_init; +extern const upb_MiniTable* envoy__config__metrics__v3__StatsdSink_msg_init_ptr; extern const upb_MiniTable envoy__config__metrics__v3__DogStatsdSink_msg_init; +extern const upb_MiniTable* envoy__config__metrics__v3__DogStatsdSink_msg_init_ptr; extern const upb_MiniTable envoy__config__metrics__v3__HystrixSink_msg_init; +extern const upb_MiniTable* envoy__config__metrics__v3__HystrixSink_msg_init_ptr; extern const upb_MiniTableFile envoy_config_metrics_v3_stats_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/config/overload/v3/overload.upb.h b/src/core/ext/upb-gen/envoy/config/overload/v3/overload.upb.h index d4e55ed4953..dfff8962527 100644 --- a/src/core/ext/upb-gen/envoy/config/overload/v3/overload.upb.h +++ b/src/core/ext/upb-gen/envoy/config/overload/v3/overload.upb.h @@ -3,7 +3,8 @@ * envoy/config/overload/v3/overload.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_OVERLOAD_V3_OVERLOAD_PROTO_UPB_H_ #define ENVOY_CONFIG_OVERLOAD_V3_OVERLOAD_PROTO_UPB_H_ @@ -114,6 +115,7 @@ UPB_INLINE const struct google_protobuf_Any* envoy_config_overload_v3_ResourceMo const struct google_protobuf_Any* default_val = NULL; const struct google_protobuf_Any* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -129,6 +131,7 @@ UPB_INLINE void envoy_config_overload_v3_ResourceMonitor_set_name(envoy_config_o } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); 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) { @@ -330,6 +333,7 @@ UPB_INLINE const envoy_config_overload_v3_ThresholdTrigger* envoy_config_overloa const envoy_config_overload_v3_ThresholdTrigger* default_val = NULL; const envoy_config_overload_v3_ThresholdTrigger* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__overload__v3__ThresholdTrigger_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -346,6 +350,7 @@ UPB_INLINE const envoy_config_overload_v3_ScaledTrigger* envoy_config_overload_v const envoy_config_overload_v3_ScaledTrigger* default_val = NULL; const envoy_config_overload_v3_ScaledTrigger* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__overload__v3__ScaledTrigger_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -361,6 +366,7 @@ UPB_INLINE void envoy_config_overload_v3_Trigger_set_name(envoy_config_overload_ } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__overload__v3__ThresholdTrigger_msg_init); 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) { @@ -373,6 +379,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__overload__v3__ScaledTrigger_msg_init); 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) { @@ -426,6 +433,7 @@ UPB_INLINE void envoy_config_overload_v3_ScaleTimersOverloadActionConfig_clear_t } UPB_INLINE const envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer* const* envoy_config_overload_v3_ScaleTimersOverloadActionConfig_timer_scale_factors(const envoy_config_overload_v3_ScaleTimersOverloadActionConfig* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__overload__v3__ScaleTimersOverloadActionConfig__ScaleTimer_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -437,6 +445,7 @@ UPB_INLINE const envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleT } UPB_INLINE const upb_Array* _envoy_config_overload_v3_ScaleTimersOverloadActionConfig_timer_scale_factors_upb_array(const envoy_config_overload_v3_ScaleTimersOverloadActionConfig* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__overload__v3__ScaleTimersOverloadActionConfig__ScaleTimer_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -445,6 +454,7 @@ UPB_INLINE const upb_Array* _envoy_config_overload_v3_ScaleTimersOverloadActionC } UPB_INLINE upb_Array* _envoy_config_overload_v3_ScaleTimersOverloadActionConfig_timer_scale_factors_mutable_upb_array(envoy_config_overload_v3_ScaleTimersOverloadActionConfig* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__overload__v3__ScaleTimersOverloadActionConfig__ScaleTimer_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -455,6 +465,7 @@ UPB_INLINE upb_Array* _envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ UPB_INLINE envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer** envoy_config_overload_v3_ScaleTimersOverloadActionConfig_mutable_timer_scale_factors(envoy_config_overload_v3_ScaleTimersOverloadActionConfig* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__overload__v3__ScaleTimersOverloadActionConfig__ScaleTimer_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -471,6 +482,7 @@ UPB_INLINE envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer** } UPB_INLINE struct envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer* envoy_config_overload_v3_ScaleTimersOverloadActionConfig_add_timer_scale_factors(envoy_config_overload_v3_ScaleTimersOverloadActionConfig* msg, upb_Arena* arena) { upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__overload__v3__ScaleTimersOverloadActionConfig__ScaleTimer_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -550,6 +562,7 @@ UPB_INLINE const struct google_protobuf_Duration* envoy_config_overload_v3_Scale const struct google_protobuf_Duration* default_val = NULL; const struct google_protobuf_Duration* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -566,6 +579,7 @@ UPB_INLINE const struct envoy_type_v3_Percent* envoy_config_overload_v3_ScaleTim const struct envoy_type_v3_Percent* default_val = NULL; const struct envoy_type_v3_Percent* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__v3__Percent_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -581,6 +595,7 @@ UPB_INLINE void envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTi } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { @@ -593,6 +608,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__v3__Percent_msg_init); 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) { @@ -658,6 +674,7 @@ UPB_INLINE void envoy_config_overload_v3_OverloadAction_clear_triggers(envoy_con } UPB_INLINE const envoy_config_overload_v3_Trigger* const* envoy_config_overload_v3_OverloadAction_triggers(const envoy_config_overload_v3_OverloadAction* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__overload__v3__Trigger_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -669,6 +686,7 @@ UPB_INLINE const envoy_config_overload_v3_Trigger* const* envoy_config_overload_ } UPB_INLINE const upb_Array* _envoy_config_overload_v3_OverloadAction_triggers_upb_array(const envoy_config_overload_v3_OverloadAction* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__overload__v3__Trigger_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -677,6 +695,7 @@ UPB_INLINE const upb_Array* _envoy_config_overload_v3_OverloadAction_triggers_up } UPB_INLINE upb_Array* _envoy_config_overload_v3_OverloadAction_triggers_mutable_upb_array(envoy_config_overload_v3_OverloadAction* msg, size_t* size, upb_Arena* arena) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__overload__v3__Trigger_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -692,6 +711,7 @@ UPB_INLINE const struct google_protobuf_Any* envoy_config_overload_v3_OverloadAc const struct google_protobuf_Any* default_val = NULL; const struct google_protobuf_Any* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -707,6 +727,7 @@ UPB_INLINE void envoy_config_overload_v3_OverloadAction_set_name(envoy_config_ov } 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__overload__v3__Trigger_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -723,6 +744,7 @@ UPB_INLINE envoy_config_overload_v3_Trigger** envoy_config_overload_v3_OverloadA } UPB_INLINE struct envoy_config_overload_v3_Trigger* envoy_config_overload_v3_OverloadAction_add_triggers(envoy_config_overload_v3_OverloadAction* msg, upb_Arena* arena) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__overload__v3__Trigger_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -737,6 +759,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); 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) { @@ -802,6 +825,7 @@ UPB_INLINE void envoy_config_overload_v3_LoadShedPoint_clear_triggers(envoy_conf } UPB_INLINE const envoy_config_overload_v3_Trigger* const* envoy_config_overload_v3_LoadShedPoint_triggers(const envoy_config_overload_v3_LoadShedPoint* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__overload__v3__Trigger_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -813,6 +837,7 @@ UPB_INLINE const envoy_config_overload_v3_Trigger* const* envoy_config_overload_ } UPB_INLINE const upb_Array* _envoy_config_overload_v3_LoadShedPoint_triggers_upb_array(const envoy_config_overload_v3_LoadShedPoint* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__overload__v3__Trigger_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -821,6 +846,7 @@ UPB_INLINE const upb_Array* _envoy_config_overload_v3_LoadShedPoint_triggers_upb } UPB_INLINE upb_Array* _envoy_config_overload_v3_LoadShedPoint_triggers_mutable_upb_array(envoy_config_overload_v3_LoadShedPoint* msg, size_t* size, upb_Arena* arena) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__overload__v3__Trigger_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -835,6 +861,7 @@ UPB_INLINE void envoy_config_overload_v3_LoadShedPoint_set_name(envoy_config_ove } 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__overload__v3__Trigger_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -851,6 +878,7 @@ UPB_INLINE envoy_config_overload_v3_Trigger** envoy_config_overload_v3_LoadShedP } UPB_INLINE struct envoy_config_overload_v3_Trigger* envoy_config_overload_v3_LoadShedPoint_add_triggers(envoy_config_overload_v3_LoadShedPoint* msg, upb_Arena* arena) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__overload__v3__Trigger_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -962,6 +990,7 @@ UPB_INLINE const struct google_protobuf_Duration* envoy_config_overload_v3_Overl 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -976,6 +1005,7 @@ UPB_INLINE void envoy_config_overload_v3_OverloadManager_clear_resource_monitors } UPB_INLINE const envoy_config_overload_v3_ResourceMonitor* const* envoy_config_overload_v3_OverloadManager_resource_monitors(const envoy_config_overload_v3_OverloadManager* msg, size_t* size) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__overload__v3__ResourceMonitor_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -987,6 +1017,7 @@ UPB_INLINE const envoy_config_overload_v3_ResourceMonitor* const* envoy_config_o } UPB_INLINE const upb_Array* _envoy_config_overload_v3_OverloadManager_resource_monitors_upb_array(const envoy_config_overload_v3_OverloadManager* msg, size_t* size) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__overload__v3__ResourceMonitor_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -995,6 +1026,7 @@ UPB_INLINE const upb_Array* _envoy_config_overload_v3_OverloadManager_resource_m } UPB_INLINE upb_Array* _envoy_config_overload_v3_OverloadManager_resource_monitors_mutable_upb_array(envoy_config_overload_v3_OverloadManager* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__overload__v3__ResourceMonitor_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -1008,6 +1040,7 @@ UPB_INLINE void envoy_config_overload_v3_OverloadManager_clear_actions(envoy_con } UPB_INLINE const envoy_config_overload_v3_OverloadAction* const* envoy_config_overload_v3_OverloadManager_actions(const envoy_config_overload_v3_OverloadManager* msg, size_t* size) { const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__overload__v3__OverloadAction_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1019,6 +1052,7 @@ UPB_INLINE const envoy_config_overload_v3_OverloadAction* const* envoy_config_ov } UPB_INLINE const upb_Array* _envoy_config_overload_v3_OverloadManager_actions_upb_array(const envoy_config_overload_v3_OverloadManager* msg, size_t* size) { const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__overload__v3__OverloadAction_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -1027,6 +1061,7 @@ UPB_INLINE const upb_Array* _envoy_config_overload_v3_OverloadManager_actions_up } UPB_INLINE upb_Array* _envoy_config_overload_v3_OverloadManager_actions_mutable_upb_array(envoy_config_overload_v3_OverloadManager* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__overload__v3__OverloadAction_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -1042,6 +1077,7 @@ UPB_INLINE const envoy_config_overload_v3_BufferFactoryConfig* envoy_config_over const envoy_config_overload_v3_BufferFactoryConfig* default_val = NULL; const envoy_config_overload_v3_BufferFactoryConfig* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__overload__v3__BufferFactoryConfig_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1056,6 +1092,7 @@ UPB_INLINE void envoy_config_overload_v3_OverloadManager_clear_loadshed_points(e } UPB_INLINE const envoy_config_overload_v3_LoadShedPoint* const* envoy_config_overload_v3_OverloadManager_loadshed_points(const envoy_config_overload_v3_OverloadManager* msg, size_t* size) { const upb_MiniTableField field = {5, UPB_SIZE(28, 48), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__overload__v3__LoadShedPoint_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1067,6 +1104,7 @@ UPB_INLINE const envoy_config_overload_v3_LoadShedPoint* const* envoy_config_ove } UPB_INLINE const upb_Array* _envoy_config_overload_v3_OverloadManager_loadshed_points_upb_array(const envoy_config_overload_v3_OverloadManager* msg, size_t* size) { const upb_MiniTableField field = {5, UPB_SIZE(28, 48), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__overload__v3__LoadShedPoint_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -1075,6 +1113,7 @@ UPB_INLINE const upb_Array* _envoy_config_overload_v3_OverloadManager_loadshed_p } UPB_INLINE upb_Array* _envoy_config_overload_v3_OverloadManager_loadshed_points_mutable_upb_array(envoy_config_overload_v3_OverloadManager* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {5, UPB_SIZE(28, 48), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__overload__v3__LoadShedPoint_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -1085,6 +1124,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { @@ -1097,6 +1137,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_overload_v3_OverloadMan } UPB_INLINE envoy_config_overload_v3_ResourceMonitor** envoy_config_overload_v3_OverloadManager_mutable_resource_monitors(envoy_config_overload_v3_OverloadManager* msg, size_t* size) { upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__overload__v3__ResourceMonitor_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1113,6 +1154,7 @@ UPB_INLINE envoy_config_overload_v3_ResourceMonitor** envoy_config_overload_v3_O } UPB_INLINE struct envoy_config_overload_v3_ResourceMonitor* envoy_config_overload_v3_OverloadManager_add_resource_monitors(envoy_config_overload_v3_OverloadManager* msg, upb_Arena* arena) { upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__overload__v3__ResourceMonitor_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -1127,6 +1169,7 @@ UPB_INLINE struct envoy_config_overload_v3_ResourceMonitor* envoy_config_overloa } UPB_INLINE envoy_config_overload_v3_OverloadAction** envoy_config_overload_v3_OverloadManager_mutable_actions(envoy_config_overload_v3_OverloadManager* msg, size_t* size) { upb_MiniTableField field = {3, UPB_SIZE(20, 32), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__overload__v3__OverloadAction_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1143,6 +1186,7 @@ UPB_INLINE envoy_config_overload_v3_OverloadAction** envoy_config_overload_v3_Ov } UPB_INLINE struct envoy_config_overload_v3_OverloadAction* envoy_config_overload_v3_OverloadManager_add_actions(envoy_config_overload_v3_OverloadManager* msg, upb_Arena* arena) { upb_MiniTableField field = {3, UPB_SIZE(20, 32), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__overload__v3__OverloadAction_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -1157,6 +1201,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__overload__v3__BufferFactoryConfig_msg_init); 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) { @@ -1169,6 +1214,7 @@ UPB_INLINE struct envoy_config_overload_v3_BufferFactoryConfig* envoy_config_ove } UPB_INLINE envoy_config_overload_v3_LoadShedPoint** envoy_config_overload_v3_OverloadManager_mutable_loadshed_points(envoy_config_overload_v3_OverloadManager* msg, size_t* size) { upb_MiniTableField field = {5, UPB_SIZE(28, 48), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__overload__v3__LoadShedPoint_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1185,6 +1231,7 @@ UPB_INLINE envoy_config_overload_v3_LoadShedPoint** envoy_config_overload_v3_Ove } UPB_INLINE struct envoy_config_overload_v3_LoadShedPoint* envoy_config_overload_v3_OverloadManager_add_loadshed_points(envoy_config_overload_v3_OverloadManager* msg, upb_Arena* arena) { upb_MiniTableField field = {5, UPB_SIZE(28, 48), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__overload__v3__LoadShedPoint_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( diff --git a/src/core/ext/upb-gen/envoy/config/overload/v3/overload.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/overload/v3/overload.upb_minitable.c index 691509aeb53..b17c6021f04 100644 --- a/src/core/ext/upb-gen/envoy/config/overload/v3/overload.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/config/overload/v3/overload.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/config/overload/v3/overload.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -18,8 +19,9 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub envoy_config_overload_v3_ResourceMonitor_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal envoy_config_overload_v3_ResourceMonitor_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_overload_v3_ResourceMonitor__fields[2] = { @@ -42,6 +44,7 @@ const upb_MiniTable envoy__config__overload__v3__ResourceMonitor_msg_init = { }) }; +const upb_MiniTable* envoy__config__overload__v3__ResourceMonitor_msg_init_ptr = &envoy__config__overload__v3__ResourceMonitor_msg_init; static const upb_MiniTableField envoy_config_overload_v3_ThresholdTrigger__fields[1] = { {1, 8, 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, }; @@ -59,6 +62,7 @@ const upb_MiniTable envoy__config__overload__v3__ThresholdTrigger_msg_init = { }) }; +const upb_MiniTable* envoy__config__overload__v3__ThresholdTrigger_msg_init_ptr = &envoy__config__overload__v3__ThresholdTrigger_msg_init; static const upb_MiniTableField envoy_config_overload_v3_ScaledTrigger__fields[2] = { {1, 8, 0, kUpb_NoSub, 1, (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)}, @@ -79,9 +83,10 @@ const upb_MiniTable envoy__config__overload__v3__ScaledTrigger_msg_init = { }) }; -static const upb_MiniTableSub envoy_config_overload_v3_Trigger_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &envoy__config__overload__v3__ThresholdTrigger_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__overload__v3__ScaledTrigger_msg_init}, +const upb_MiniTable* envoy__config__overload__v3__ScaledTrigger_msg_init_ptr = &envoy__config__overload__v3__ScaledTrigger_msg_init; +static const upb_MiniTableSubInternal envoy_config_overload_v3_Trigger_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &envoy__config__overload__v3__ThresholdTrigger_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__overload__v3__ScaledTrigger_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_overload_v3_Trigger__fields[3] = { @@ -105,8 +110,9 @@ const upb_MiniTable envoy__config__overload__v3__Trigger_msg_init = { }) }; -static const upb_MiniTableSub envoy_config_overload_v3_ScaleTimersOverloadActionConfig_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__config__overload__v3__ScaleTimersOverloadActionConfig__ScaleTimer_msg_init}, +const upb_MiniTable* envoy__config__overload__v3__Trigger_msg_init_ptr = &envoy__config__overload__v3__Trigger_msg_init; +static const upb_MiniTableSubInternal envoy_config_overload_v3_ScaleTimersOverloadActionConfig_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__config__overload__v3__ScaleTimersOverloadActionConfig__ScaleTimer_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_overload_v3_ScaleTimersOverloadActionConfig__fields[1] = { @@ -126,9 +132,10 @@ const upb_MiniTable envoy__config__overload__v3__ScaleTimersOverloadActionConfig }) }; -static const upb_MiniTableSub envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__type__v3__Percent_msg_init}, +const upb_MiniTable* envoy__config__overload__v3__ScaleTimersOverloadActionConfig_msg_init_ptr = &envoy__config__overload__v3__ScaleTimersOverloadActionConfig_msg_init; +static const upb_MiniTableSubInternal envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__type__v3__Percent_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer__fields[3] = { @@ -152,9 +159,10 @@ const upb_MiniTable envoy__config__overload__v3__ScaleTimersOverloadActionConfig }) }; -static const upb_MiniTableSub envoy_config_overload_v3_OverloadAction_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &envoy__config__overload__v3__Trigger_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init}, +const upb_MiniTable* envoy__config__overload__v3__ScaleTimersOverloadActionConfig__ScaleTimer_msg_init_ptr = &envoy__config__overload__v3__ScaleTimersOverloadActionConfig__ScaleTimer_msg_init; +static const upb_MiniTableSubInternal envoy_config_overload_v3_OverloadAction_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &envoy__config__overload__v3__Trigger_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_overload_v3_OverloadAction__fields[3] = { @@ -178,8 +186,9 @@ const upb_MiniTable envoy__config__overload__v3__OverloadAction_msg_init = { }) }; -static const upb_MiniTableSub envoy_config_overload_v3_LoadShedPoint_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__config__overload__v3__Trigger_msg_init}, +const upb_MiniTable* envoy__config__overload__v3__OverloadAction_msg_init_ptr = &envoy__config__overload__v3__OverloadAction_msg_init; +static const upb_MiniTableSubInternal envoy_config_overload_v3_LoadShedPoint_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__config__overload__v3__Trigger_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_overload_v3_LoadShedPoint__fields[2] = { @@ -202,6 +211,7 @@ const upb_MiniTable envoy__config__overload__v3__LoadShedPoint_msg_init = { }) }; +const upb_MiniTable* envoy__config__overload__v3__LoadShedPoint_msg_init_ptr = &envoy__config__overload__v3__LoadShedPoint_msg_init; static const upb_MiniTableField envoy_config_overload_v3_BufferFactoryConfig__fields[1] = { {1, 8, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, }; @@ -219,12 +229,13 @@ const upb_MiniTable envoy__config__overload__v3__BufferFactoryConfig_msg_init = }) }; -static const upb_MiniTableSub envoy_config_overload_v3_OverloadManager_submsgs[5] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__overload__v3__ResourceMonitor_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__overload__v3__OverloadAction_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__overload__v3__BufferFactoryConfig_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__overload__v3__LoadShedPoint_msg_init}, +const upb_MiniTable* envoy__config__overload__v3__BufferFactoryConfig_msg_init_ptr = &envoy__config__overload__v3__BufferFactoryConfig_msg_init; +static const upb_MiniTableSubInternal envoy_config_overload_v3_OverloadManager_submsgs[5] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__overload__v3__ResourceMonitor_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__overload__v3__OverloadAction_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__overload__v3__BufferFactoryConfig_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__overload__v3__LoadShedPoint_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_overload_v3_OverloadManager__fields[5] = { @@ -254,6 +265,7 @@ const upb_MiniTable envoy__config__overload__v3__OverloadManager_msg_init = { }) }; +const upb_MiniTable* envoy__config__overload__v3__OverloadManager_msg_init_ptr = &envoy__config__overload__v3__OverloadManager_msg_init; static const upb_MiniTable *messages_layout[10] = { &envoy__config__overload__v3__ResourceMonitor_msg_init, &envoy__config__overload__v3__ThresholdTrigger_msg_init, diff --git a/src/core/ext/upb-gen/envoy/config/overload/v3/overload.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/overload/v3/overload.upb_minitable.h index d5659754b66..e91a7a06ff4 100644 --- a/src/core/ext/upb-gen/envoy/config/overload/v3/overload.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/config/overload/v3/overload.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/config/overload/v3/overload.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_OVERLOAD_V3_OVERLOAD_PROTO_UPB_MINITABLE_H_ #define ENVOY_CONFIG_OVERLOAD_V3_OVERLOAD_PROTO_UPB_MINITABLE_H_ @@ -18,15 +19,25 @@ extern "C" { #endif extern const upb_MiniTable envoy__config__overload__v3__ResourceMonitor_msg_init; +extern const upb_MiniTable* envoy__config__overload__v3__ResourceMonitor_msg_init_ptr; extern const upb_MiniTable envoy__config__overload__v3__ThresholdTrigger_msg_init; +extern const upb_MiniTable* envoy__config__overload__v3__ThresholdTrigger_msg_init_ptr; extern const upb_MiniTable envoy__config__overload__v3__ScaledTrigger_msg_init; +extern const upb_MiniTable* envoy__config__overload__v3__ScaledTrigger_msg_init_ptr; extern const upb_MiniTable envoy__config__overload__v3__Trigger_msg_init; +extern const upb_MiniTable* envoy__config__overload__v3__Trigger_msg_init_ptr; extern const upb_MiniTable envoy__config__overload__v3__ScaleTimersOverloadActionConfig_msg_init; +extern const upb_MiniTable* envoy__config__overload__v3__ScaleTimersOverloadActionConfig_msg_init_ptr; extern const upb_MiniTable envoy__config__overload__v3__ScaleTimersOverloadActionConfig__ScaleTimer_msg_init; +extern const upb_MiniTable* envoy__config__overload__v3__ScaleTimersOverloadActionConfig__ScaleTimer_msg_init_ptr; extern const upb_MiniTable envoy__config__overload__v3__OverloadAction_msg_init; +extern const upb_MiniTable* envoy__config__overload__v3__OverloadAction_msg_init_ptr; extern const upb_MiniTable envoy__config__overload__v3__LoadShedPoint_msg_init; +extern const upb_MiniTable* envoy__config__overload__v3__LoadShedPoint_msg_init_ptr; extern const upb_MiniTable envoy__config__overload__v3__BufferFactoryConfig_msg_init; +extern const upb_MiniTable* envoy__config__overload__v3__BufferFactoryConfig_msg_init_ptr; extern const upb_MiniTable envoy__config__overload__v3__OverloadManager_msg_init; +extern const upb_MiniTable* envoy__config__overload__v3__OverloadManager_msg_init_ptr; extern const upb_MiniTableFile envoy_config_overload_v3_overload_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/config/rbac/v3/rbac.upb.h b/src/core/ext/upb-gen/envoy/config/rbac/v3/rbac.upb.h index 26fa4e55e34..abfdd76f19a 100644 --- a/src/core/ext/upb-gen/envoy/config/rbac/v3/rbac.upb.h +++ b/src/core/ext/upb-gen/envoy/config/rbac/v3/rbac.upb.h @@ -3,7 +3,8 @@ * envoy/config/rbac/v3/rbac.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_RBAC_V3_RBAC_PROTO_UPB_H_ #define ENVOY_CONFIG_RBAC_V3_RBAC_PROTO_UPB_H_ @@ -131,22 +132,30 @@ UPB_INLINE size_t envoy_config_rbac_v3_RBAC_policies_size(const envoy_config_rba } UPB_INLINE bool envoy_config_rbac_v3_RBAC_policies_get(const envoy_config_rbac_v3_RBAC* msg, upb_StringView key, envoy_config_rbac_v3_Policy** val) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__rbac__v3__RBAC__PoliciesEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__rbac__v3__Policy_msg_init); 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_rbac_v3_RBAC_PoliciesEntry* envoy_config_rbac_v3_RBAC_policies_next(const envoy_config_rbac_v3_RBAC* msg, size_t* iter) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__rbac__v3__RBAC__PoliciesEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__rbac__v3__Policy_msg_init); const upb_Map* map = upb_Message_GetMap(UPB_UPCAST(msg), &field); if (!map) return NULL; return (const envoy_config_rbac_v3_RBAC_PoliciesEntry*)_upb_map_next(map, iter); } UPB_INLINE const upb_Map* _envoy_config_rbac_v3_RBAC_policies_upb_map(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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__rbac__v3__RBAC__PoliciesEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__rbac__v3__Policy_msg_init); return upb_Message_GetMap(UPB_UPCAST(msg), &field); } UPB_INLINE upb_Map* _envoy_config_rbac_v3_RBAC_policies_mutable_upb_map(envoy_config_rbac_v3_RBAC* msg, upb_Arena* a) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__rbac__v3__RBAC__PoliciesEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__rbac__v3__Policy_msg_init); return _upb_Message_GetOrCreateMutableMap(UPB_UPCAST(msg), &field, 0, sizeof(envoy_config_rbac_v3_Policy*), a); } UPB_INLINE void envoy_config_rbac_v3_RBAC_clear_audit_logging_options(envoy_config_rbac_v3_RBAC* msg) { @@ -157,6 +166,7 @@ UPB_INLINE const envoy_config_rbac_v3_RBAC_AuditLoggingOptions* envoy_config_rba const envoy_config_rbac_v3_RBAC_AuditLoggingOptions* default_val = NULL; const envoy_config_rbac_v3_RBAC_AuditLoggingOptions* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__rbac__v3__RBAC__AuditLoggingOptions_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -178,6 +188,8 @@ UPB_INLINE void envoy_config_rbac_v3_RBAC_policies_clear(envoy_config_rbac_v3_RB } UPB_INLINE bool envoy_config_rbac_v3_RBAC_policies_set(envoy_config_rbac_v3_RBAC* msg, upb_StringView key, envoy_config_rbac_v3_Policy* val, upb_Arena* a) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__rbac__v3__RBAC__PoliciesEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__rbac__v3__Policy_msg_init); 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) != @@ -191,12 +203,15 @@ UPB_INLINE bool envoy_config_rbac_v3_RBAC_policies_delete(envoy_config_rbac_v3_R } UPB_INLINE envoy_config_rbac_v3_RBAC_PoliciesEntry* envoy_config_rbac_v3_RBAC_policies_nextmutable(envoy_config_rbac_v3_RBAC* msg, size_t* iter) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__rbac__v3__RBAC__PoliciesEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__rbac__v3__Policy_msg_init); upb_Map* map = (upb_Map*)upb_Message_GetMap(UPB_UPCAST(msg), &field); if (!map) return NULL; return (envoy_config_rbac_v3_RBAC_PoliciesEntry*)_upb_map_next(map, iter); } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__rbac__v3__RBAC__AuditLoggingOptions_msg_init); 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) { @@ -262,6 +277,7 @@ UPB_INLINE void envoy_config_rbac_v3_RBAC_AuditLoggingOptions_clear_logger_confi } UPB_INLINE const envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig* const* envoy_config_rbac_v3_RBAC_AuditLoggingOptions_logger_configs(const envoy_config_rbac_v3_RBAC_AuditLoggingOptions* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__rbac__v3__RBAC__AuditLoggingOptions__AuditLoggerConfig_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -273,6 +289,7 @@ UPB_INLINE const envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig } UPB_INLINE const upb_Array* _envoy_config_rbac_v3_RBAC_AuditLoggingOptions_logger_configs_upb_array(const envoy_config_rbac_v3_RBAC_AuditLoggingOptions* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__rbac__v3__RBAC__AuditLoggingOptions__AuditLoggerConfig_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -281,6 +298,7 @@ UPB_INLINE const upb_Array* _envoy_config_rbac_v3_RBAC_AuditLoggingOptions_logge } UPB_INLINE upb_Array* _envoy_config_rbac_v3_RBAC_AuditLoggingOptions_logger_configs_mutable_upb_array(envoy_config_rbac_v3_RBAC_AuditLoggingOptions* msg, size_t* size, upb_Arena* arena) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__rbac__v3__RBAC__AuditLoggingOptions__AuditLoggerConfig_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -295,6 +313,7 @@ UPB_INLINE void envoy_config_rbac_v3_RBAC_AuditLoggingOptions_set_audit_conditio } 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__rbac__v3__RBAC__AuditLoggingOptions__AuditLoggerConfig_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -311,6 +330,7 @@ UPB_INLINE envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig** env } UPB_INLINE struct envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig* envoy_config_rbac_v3_RBAC_AuditLoggingOptions_add_logger_configs(envoy_config_rbac_v3_RBAC_AuditLoggingOptions* msg, upb_Arena* arena) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__rbac__v3__RBAC__AuditLoggingOptions__AuditLoggerConfig_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -368,6 +388,7 @@ UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_ const struct envoy_config_core_v3_TypedExtensionConfig* default_val = NULL; const struct envoy_config_core_v3_TypedExtensionConfig* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -391,6 +412,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); 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) { @@ -469,6 +491,7 @@ UPB_INLINE void envoy_config_rbac_v3_Policy_clear_permissions(envoy_config_rbac_ } UPB_INLINE const envoy_config_rbac_v3_Permission* const* envoy_config_rbac_v3_Policy_permissions(const envoy_config_rbac_v3_Policy* msg, size_t* size) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__rbac__v3__Permission_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -480,6 +503,7 @@ UPB_INLINE const envoy_config_rbac_v3_Permission* const* envoy_config_rbac_v3_Po } UPB_INLINE const upb_Array* _envoy_config_rbac_v3_Policy_permissions_upb_array(const envoy_config_rbac_v3_Policy* msg, size_t* size) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__rbac__v3__Permission_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -488,6 +512,7 @@ UPB_INLINE const upb_Array* _envoy_config_rbac_v3_Policy_permissions_upb_array(c } UPB_INLINE upb_Array* _envoy_config_rbac_v3_Policy_permissions_mutable_upb_array(envoy_config_rbac_v3_Policy* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__rbac__v3__Permission_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -501,6 +526,7 @@ UPB_INLINE void envoy_config_rbac_v3_Policy_clear_principals(envoy_config_rbac_v } UPB_INLINE const envoy_config_rbac_v3_Principal* const* envoy_config_rbac_v3_Policy_principals(const envoy_config_rbac_v3_Policy* msg, size_t* size) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__rbac__v3__Principal_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -512,6 +538,7 @@ UPB_INLINE const envoy_config_rbac_v3_Principal* const* envoy_config_rbac_v3_Pol } UPB_INLINE const upb_Array* _envoy_config_rbac_v3_Policy_principals_upb_array(const envoy_config_rbac_v3_Policy* msg, size_t* size) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__rbac__v3__Principal_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -520,6 +547,7 @@ UPB_INLINE const upb_Array* _envoy_config_rbac_v3_Policy_principals_upb_array(co } UPB_INLINE upb_Array* _envoy_config_rbac_v3_Policy_principals_mutable_upb_array(envoy_config_rbac_v3_Policy* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__rbac__v3__Principal_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -535,6 +563,7 @@ UPB_INLINE const struct google_api_expr_v1alpha1_Expr* envoy_config_rbac_v3_Poli const struct google_api_expr_v1alpha1_Expr* default_val = NULL; const struct google_api_expr_v1alpha1_Expr* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Expr_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -551,6 +580,7 @@ UPB_INLINE const struct google_api_expr_v1alpha1_CheckedExpr* envoy_config_rbac_ const struct google_api_expr_v1alpha1_CheckedExpr* default_val = NULL; const struct google_api_expr_v1alpha1_CheckedExpr* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__CheckedExpr_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -562,6 +592,7 @@ UPB_INLINE bool envoy_config_rbac_v3_Policy_has_checked_condition(const envoy_co UPB_INLINE envoy_config_rbac_v3_Permission** envoy_config_rbac_v3_Policy_mutable_permissions(envoy_config_rbac_v3_Policy* msg, size_t* size) { upb_MiniTableField field = {1, UPB_SIZE(12, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__rbac__v3__Permission_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -578,6 +609,7 @@ UPB_INLINE envoy_config_rbac_v3_Permission** envoy_config_rbac_v3_Policy_resize_ } UPB_INLINE struct envoy_config_rbac_v3_Permission* envoy_config_rbac_v3_Policy_add_permissions(envoy_config_rbac_v3_Policy* msg, upb_Arena* arena) { upb_MiniTableField field = {1, UPB_SIZE(12, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__rbac__v3__Permission_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -592,6 +624,7 @@ UPB_INLINE struct envoy_config_rbac_v3_Permission* envoy_config_rbac_v3_Policy_a } UPB_INLINE envoy_config_rbac_v3_Principal** envoy_config_rbac_v3_Policy_mutable_principals(envoy_config_rbac_v3_Policy* msg, size_t* size) { upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__rbac__v3__Principal_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -608,6 +641,7 @@ UPB_INLINE envoy_config_rbac_v3_Principal** envoy_config_rbac_v3_Policy_resize_p } UPB_INLINE struct envoy_config_rbac_v3_Principal* envoy_config_rbac_v3_Policy_add_principals(envoy_config_rbac_v3_Policy* msg, upb_Arena* arena) { upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__rbac__v3__Principal_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -622,6 +656,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Expr_msg_init); 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) { @@ -634,6 +669,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__CheckedExpr_msg_init); 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) { @@ -710,6 +746,7 @@ UPB_INLINE const envoy_config_rbac_v3_Permission_Set* envoy_config_rbac_v3_Permi const envoy_config_rbac_v3_Permission_Set* default_val = NULL; const envoy_config_rbac_v3_Permission_Set* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__rbac__v3__Permission__Set_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -726,6 +763,7 @@ UPB_INLINE const envoy_config_rbac_v3_Permission_Set* envoy_config_rbac_v3_Permi const envoy_config_rbac_v3_Permission_Set* default_val = NULL; const envoy_config_rbac_v3_Permission_Set* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__rbac__v3__Permission__Set_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -758,6 +796,7 @@ UPB_INLINE const struct envoy_config_route_v3_HeaderMatcher* envoy_config_rbac_v const struct envoy_config_route_v3_HeaderMatcher* default_val = NULL; const struct envoy_config_route_v3_HeaderMatcher* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__HeaderMatcher_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -774,6 +813,7 @@ UPB_INLINE const struct envoy_config_core_v3_CidrRange* envoy_config_rbac_v3_Per const struct envoy_config_core_v3_CidrRange* default_val = NULL; const struct envoy_config_core_v3_CidrRange* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__CidrRange_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -806,6 +846,7 @@ UPB_INLINE const struct envoy_type_matcher_v3_MetadataMatcher* envoy_config_rbac const struct envoy_type_matcher_v3_MetadataMatcher* default_val = NULL; const struct envoy_type_matcher_v3_MetadataMatcher* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__MetadataMatcher_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -822,6 +863,7 @@ UPB_INLINE const envoy_config_rbac_v3_Permission* envoy_config_rbac_v3_Permissio const envoy_config_rbac_v3_Permission* default_val = NULL; const envoy_config_rbac_v3_Permission* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__rbac__v3__Permission_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -838,6 +880,7 @@ UPB_INLINE const struct envoy_type_matcher_v3_StringMatcher* envoy_config_rbac_v const struct envoy_type_matcher_v3_StringMatcher* default_val = NULL; const struct envoy_type_matcher_v3_StringMatcher* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__StringMatcher_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -854,6 +897,7 @@ UPB_INLINE const struct envoy_type_matcher_v3_PathMatcher* envoy_config_rbac_v3_ const struct envoy_type_matcher_v3_PathMatcher* default_val = NULL; const struct envoy_type_matcher_v3_PathMatcher* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__PathMatcher_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -870,6 +914,7 @@ UPB_INLINE const struct envoy_type_v3_Int32Range* envoy_config_rbac_v3_Permissio const struct envoy_type_v3_Int32Range* default_val = NULL; const struct envoy_type_v3_Int32Range* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__v3__Int32Range_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -886,6 +931,7 @@ UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_ const struct envoy_config_core_v3_TypedExtensionConfig* default_val = NULL; const struct envoy_config_core_v3_TypedExtensionConfig* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -902,6 +948,7 @@ UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_ 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -913,6 +960,7 @@ UPB_INLINE bool envoy_config_rbac_v3_Permission_has_uri_template(const envoy_con 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__rbac__v3__Permission__Set_msg_init); 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) { @@ -925,6 +973,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__rbac__v3__Permission__Set_msg_init); 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) { @@ -941,6 +990,7 @@ UPB_INLINE void envoy_config_rbac_v3_Permission_set_any(envoy_config_rbac_v3_Per } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__HeaderMatcher_msg_init); 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) { @@ -953,6 +1003,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__CidrRange_msg_init); 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) { @@ -969,6 +1020,7 @@ UPB_INLINE void envoy_config_rbac_v3_Permission_set_destination_port(envoy_confi } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__MetadataMatcher_msg_init); 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) { @@ -981,6 +1033,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__rbac__v3__Permission_msg_init); 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) { @@ -993,6 +1046,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__StringMatcher_msg_init); 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) { @@ -1005,6 +1059,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__PathMatcher_msg_init); 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) { @@ -1017,6 +1072,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__v3__Int32Range_msg_init); 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) { @@ -1029,6 +1085,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); 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) { @@ -1041,6 +1098,7 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_rbac_v } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); 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) { @@ -1094,6 +1152,7 @@ UPB_INLINE void envoy_config_rbac_v3_Permission_Set_clear_rules(envoy_config_rba } UPB_INLINE const envoy_config_rbac_v3_Permission* const* envoy_config_rbac_v3_Permission_Set_rules(const envoy_config_rbac_v3_Permission_Set* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__rbac__v3__Permission_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1105,6 +1164,7 @@ UPB_INLINE const envoy_config_rbac_v3_Permission* const* envoy_config_rbac_v3_Pe } UPB_INLINE const upb_Array* _envoy_config_rbac_v3_Permission_Set_rules_upb_array(const envoy_config_rbac_v3_Permission_Set* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__rbac__v3__Permission_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -1113,6 +1173,7 @@ UPB_INLINE const upb_Array* _envoy_config_rbac_v3_Permission_Set_rules_upb_array } UPB_INLINE upb_Array* _envoy_config_rbac_v3_Permission_Set_rules_mutable_upb_array(envoy_config_rbac_v3_Permission_Set* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__rbac__v3__Permission_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -1123,6 +1184,7 @@ UPB_INLINE upb_Array* _envoy_config_rbac_v3_Permission_Set_rules_mutable_upb_arr UPB_INLINE envoy_config_rbac_v3_Permission** envoy_config_rbac_v3_Permission_Set_mutable_rules(envoy_config_rbac_v3_Permission_Set* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__rbac__v3__Permission_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1139,6 +1201,7 @@ UPB_INLINE envoy_config_rbac_v3_Permission** envoy_config_rbac_v3_Permission_Set } UPB_INLINE struct envoy_config_rbac_v3_Permission* envoy_config_rbac_v3_Permission_Set_add_rules(envoy_config_rbac_v3_Permission_Set* msg, upb_Arena* arena) { upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__rbac__v3__Permission_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -1216,6 +1279,7 @@ UPB_INLINE const envoy_config_rbac_v3_Principal_Set* envoy_config_rbac_v3_Princi const envoy_config_rbac_v3_Principal_Set* default_val = NULL; const envoy_config_rbac_v3_Principal_Set* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__rbac__v3__Principal__Set_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1232,6 +1296,7 @@ UPB_INLINE const envoy_config_rbac_v3_Principal_Set* envoy_config_rbac_v3_Princi const envoy_config_rbac_v3_Principal_Set* default_val = NULL; const envoy_config_rbac_v3_Principal_Set* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__rbac__v3__Principal__Set_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1264,6 +1329,7 @@ UPB_INLINE const envoy_config_rbac_v3_Principal_Authenticated* envoy_config_rbac const envoy_config_rbac_v3_Principal_Authenticated* default_val = NULL; const envoy_config_rbac_v3_Principal_Authenticated* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__rbac__v3__Principal__Authenticated_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1280,6 +1346,7 @@ UPB_INLINE const struct envoy_config_core_v3_CidrRange* envoy_config_rbac_v3_Pri const struct envoy_config_core_v3_CidrRange* default_val = NULL; const struct envoy_config_core_v3_CidrRange* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__CidrRange_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1296,6 +1363,7 @@ UPB_INLINE const struct envoy_config_route_v3_HeaderMatcher* envoy_config_rbac_v const struct envoy_config_route_v3_HeaderMatcher* default_val = NULL; const struct envoy_config_route_v3_HeaderMatcher* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__HeaderMatcher_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1312,6 +1380,7 @@ UPB_INLINE const struct envoy_type_matcher_v3_MetadataMatcher* envoy_config_rbac const struct envoy_type_matcher_v3_MetadataMatcher* default_val = NULL; const struct envoy_type_matcher_v3_MetadataMatcher* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__MetadataMatcher_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1328,6 +1397,7 @@ UPB_INLINE const envoy_config_rbac_v3_Principal* envoy_config_rbac_v3_Principal_ const envoy_config_rbac_v3_Principal* default_val = NULL; const envoy_config_rbac_v3_Principal* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__rbac__v3__Principal_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1344,6 +1414,7 @@ UPB_INLINE const struct envoy_type_matcher_v3_PathMatcher* envoy_config_rbac_v3_ const struct envoy_type_matcher_v3_PathMatcher* default_val = NULL; const struct envoy_type_matcher_v3_PathMatcher* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__PathMatcher_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1360,6 +1431,7 @@ UPB_INLINE const struct envoy_config_core_v3_CidrRange* envoy_config_rbac_v3_Pri const struct envoy_config_core_v3_CidrRange* default_val = NULL; const struct envoy_config_core_v3_CidrRange* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__CidrRange_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1376,6 +1448,7 @@ UPB_INLINE const struct envoy_config_core_v3_CidrRange* envoy_config_rbac_v3_Pri const struct envoy_config_core_v3_CidrRange* default_val = NULL; const struct envoy_config_core_v3_CidrRange* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__CidrRange_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1392,6 +1465,7 @@ UPB_INLINE const struct envoy_type_matcher_v3_FilterStateMatcher* envoy_config_r const struct envoy_type_matcher_v3_FilterStateMatcher* default_val = NULL; const struct envoy_type_matcher_v3_FilterStateMatcher* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__FilterStateMatcher_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1403,6 +1477,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__rbac__v3__Principal__Set_msg_init); 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) { @@ -1415,6 +1490,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__rbac__v3__Principal__Set_msg_init); 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) { @@ -1431,6 +1507,7 @@ UPB_INLINE void envoy_config_rbac_v3_Principal_set_any(envoy_config_rbac_v3_Prin } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__rbac__v3__Principal__Authenticated_msg_init); 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) { @@ -1443,6 +1520,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__CidrRange_msg_init); 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) { @@ -1455,6 +1533,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__HeaderMatcher_msg_init); 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) { @@ -1467,6 +1546,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__MetadataMatcher_msg_init); 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) { @@ -1479,6 +1559,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__rbac__v3__Principal_msg_init); 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) { @@ -1491,6 +1572,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__PathMatcher_msg_init); 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) { @@ -1503,6 +1585,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__CidrRange_msg_init); 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) { @@ -1515,6 +1598,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__CidrRange_msg_init); 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) { @@ -1527,6 +1611,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__FilterStateMatcher_msg_init); 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) { @@ -1580,6 +1665,7 @@ UPB_INLINE void envoy_config_rbac_v3_Principal_Set_clear_ids(envoy_config_rbac_v } UPB_INLINE const envoy_config_rbac_v3_Principal* const* envoy_config_rbac_v3_Principal_Set_ids(const envoy_config_rbac_v3_Principal_Set* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__rbac__v3__Principal_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1591,6 +1677,7 @@ UPB_INLINE const envoy_config_rbac_v3_Principal* const* envoy_config_rbac_v3_Pri } UPB_INLINE const upb_Array* _envoy_config_rbac_v3_Principal_Set_ids_upb_array(const envoy_config_rbac_v3_Principal_Set* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__rbac__v3__Principal_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -1599,6 +1686,7 @@ UPB_INLINE const upb_Array* _envoy_config_rbac_v3_Principal_Set_ids_upb_array(co } UPB_INLINE upb_Array* _envoy_config_rbac_v3_Principal_Set_ids_mutable_upb_array(envoy_config_rbac_v3_Principal_Set* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__rbac__v3__Principal_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -1609,6 +1697,7 @@ UPB_INLINE upb_Array* _envoy_config_rbac_v3_Principal_Set_ids_mutable_upb_array( UPB_INLINE envoy_config_rbac_v3_Principal** envoy_config_rbac_v3_Principal_Set_mutable_ids(envoy_config_rbac_v3_Principal_Set* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__rbac__v3__Principal_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1625,6 +1714,7 @@ UPB_INLINE envoy_config_rbac_v3_Principal** envoy_config_rbac_v3_Principal_Set_r } UPB_INLINE struct envoy_config_rbac_v3_Principal* envoy_config_rbac_v3_Principal_Set_add_ids(envoy_config_rbac_v3_Principal_Set* msg, upb_Arena* arena) { upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__rbac__v3__Principal_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -1682,6 +1772,7 @@ UPB_INLINE const struct envoy_type_matcher_v3_StringMatcher* envoy_config_rbac_v const struct envoy_type_matcher_v3_StringMatcher* default_val = NULL; const struct envoy_type_matcher_v3_StringMatcher* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__StringMatcher_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1693,6 +1784,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__StringMatcher_msg_init); 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) { diff --git a/src/core/ext/upb-gen/envoy/config/rbac/v3/rbac.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/rbac/v3/rbac.upb_minitable.c index a4684678b0a..fbcde8c9a89 100644 --- a/src/core/ext/upb-gen/envoy/config/rbac/v3/rbac.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/config/rbac/v3/rbac.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/config/rbac/v3/rbac.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -27,9 +28,10 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub envoy_config_rbac_v3_RBAC_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &envoy__config__rbac__v3__RBAC__PoliciesEntry_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__rbac__v3__RBAC__AuditLoggingOptions_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal envoy_config_rbac_v3_RBAC_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &envoy__config__rbac__v3__RBAC__PoliciesEntry_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__rbac__v3__RBAC__AuditLoggingOptions_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_rbac_v3_RBAC__fields[3] = { @@ -51,8 +53,9 @@ const upb_MiniTable envoy__config__rbac__v3__RBAC_msg_init = { }) }; -static const upb_MiniTableSub envoy_config_rbac_v3_RBAC_AuditLoggingOptions_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__config__rbac__v3__RBAC__AuditLoggingOptions__AuditLoggerConfig_msg_init}, +const upb_MiniTable* envoy__config__rbac__v3__RBAC_msg_init_ptr = &envoy__config__rbac__v3__RBAC_msg_init; +static const upb_MiniTableSubInternal envoy_config_rbac_v3_RBAC_AuditLoggingOptions_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__config__rbac__v3__RBAC__AuditLoggingOptions__AuditLoggerConfig_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_rbac_v3_RBAC_AuditLoggingOptions__fields[2] = { @@ -75,8 +78,9 @@ const upb_MiniTable envoy__config__rbac__v3__RBAC__AuditLoggingOptions_msg_init }) }; -static const upb_MiniTableSub envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init}, +const upb_MiniTable* envoy__config__rbac__v3__RBAC__AuditLoggingOptions_msg_init_ptr = &envoy__config__rbac__v3__RBAC__AuditLoggingOptions_msg_init; +static const upb_MiniTableSubInternal envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig__fields[2] = { @@ -99,8 +103,9 @@ const upb_MiniTable envoy__config__rbac__v3__RBAC__AuditLoggingOptions__AuditLog }) }; -static const upb_MiniTableSub envoy_config_rbac_v3_RBAC_PoliciesEntry_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__config__rbac__v3__Policy_msg_init}, +const upb_MiniTable* envoy__config__rbac__v3__RBAC__AuditLoggingOptions__AuditLoggerConfig_msg_init_ptr = &envoy__config__rbac__v3__RBAC__AuditLoggingOptions__AuditLoggerConfig_msg_init; +static const upb_MiniTableSubInternal envoy_config_rbac_v3_RBAC_PoliciesEntry_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__config__rbac__v3__Policy_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_rbac_v3_RBAC_PoliciesEntry__fields[2] = { @@ -121,11 +126,12 @@ const upb_MiniTable envoy__config__rbac__v3__RBAC__PoliciesEntry_msg_init = { }) }; -static const upb_MiniTableSub envoy_config_rbac_v3_Policy_submsgs[4] = { - {.UPB_PRIVATE(submsg) = &envoy__config__rbac__v3__Permission_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__rbac__v3__Principal_msg_init}, - {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Expr_msg_init}, - {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__CheckedExpr_msg_init}, +const upb_MiniTable* envoy__config__rbac__v3__RBAC__PoliciesEntry_msg_init_ptr = &envoy__config__rbac__v3__RBAC__PoliciesEntry_msg_init; +static const upb_MiniTableSubInternal envoy_config_rbac_v3_Policy_submsgs[4] = { + {.UPB_PRIVATE(submsg) = &envoy__config__rbac__v3__Permission_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__rbac__v3__Principal_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Expr_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__CheckedExpr_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_rbac_v3_Policy__fields[4] = { @@ -150,18 +156,19 @@ const upb_MiniTable envoy__config__rbac__v3__Policy_msg_init = { }) }; -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}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__CidrRange_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__MetadataMatcher_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__rbac__v3__Permission_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__StringMatcher_msg_init}, - {.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}, +const upb_MiniTable* envoy__config__rbac__v3__Policy_msg_init_ptr = &envoy__config__rbac__v3__Policy_msg_init; +static const upb_MiniTableSubInternal envoy_config_rbac_v3_Permission_submsgs[11] = { + {.UPB_PRIVATE(submsg) = &envoy__config__rbac__v3__Permission__Set_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__rbac__v3__Permission__Set_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__HeaderMatcher_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__CidrRange_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__MetadataMatcher_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__rbac__v3__Permission_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__StringMatcher_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__PathMatcher_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__type__v3__Int32Range_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_rbac_v3_Permission__fields[13] = { @@ -207,8 +214,9 @@ const upb_MiniTable envoy__config__rbac__v3__Permission_msg_init = { }) }; -static const upb_MiniTableSub envoy_config_rbac_v3_Permission_Set_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__config__rbac__v3__Permission_msg_init}, +const upb_MiniTable* envoy__config__rbac__v3__Permission_msg_init_ptr = &envoy__config__rbac__v3__Permission_msg_init; +static const upb_MiniTableSubInternal envoy_config_rbac_v3_Permission_Set_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__config__rbac__v3__Permission_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_rbac_v3_Permission_Set__fields[1] = { @@ -228,18 +236,19 @@ const upb_MiniTable envoy__config__rbac__v3__Permission__Set_msg_init = { }) }; -static const upb_MiniTableSub envoy_config_rbac_v3_Principal_submsgs[11] = { - {.UPB_PRIVATE(submsg) = &envoy__config__rbac__v3__Principal__Set_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__rbac__v3__Principal__Set_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__rbac__v3__Principal__Authenticated_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__CidrRange_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__HeaderMatcher_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__MetadataMatcher_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__rbac__v3__Principal_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__PathMatcher_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__CidrRange_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__CidrRange_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__FilterStateMatcher_msg_init}, +const upb_MiniTable* envoy__config__rbac__v3__Permission__Set_msg_init_ptr = &envoy__config__rbac__v3__Permission__Set_msg_init; +static const upb_MiniTableSubInternal envoy_config_rbac_v3_Principal_submsgs[11] = { + {.UPB_PRIVATE(submsg) = &envoy__config__rbac__v3__Principal__Set_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__rbac__v3__Principal__Set_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__rbac__v3__Principal__Authenticated_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__CidrRange_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__HeaderMatcher_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__MetadataMatcher_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__rbac__v3__Principal_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__PathMatcher_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__CidrRange_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__CidrRange_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__FilterStateMatcher_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_rbac_v3_Principal__fields[12] = { @@ -284,8 +293,9 @@ const upb_MiniTable envoy__config__rbac__v3__Principal_msg_init = { }) }; -static const upb_MiniTableSub envoy_config_rbac_v3_Principal_Set_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__config__rbac__v3__Principal_msg_init}, +const upb_MiniTable* envoy__config__rbac__v3__Principal_msg_init_ptr = &envoy__config__rbac__v3__Principal_msg_init; +static const upb_MiniTableSubInternal envoy_config_rbac_v3_Principal_Set_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__config__rbac__v3__Principal_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_rbac_v3_Principal_Set__fields[1] = { @@ -305,8 +315,9 @@ const upb_MiniTable envoy__config__rbac__v3__Principal__Set_msg_init = { }) }; -static const upb_MiniTableSub envoy_config_rbac_v3_Principal_Authenticated_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__StringMatcher_msg_init}, +const upb_MiniTable* envoy__config__rbac__v3__Principal__Set_msg_init_ptr = &envoy__config__rbac__v3__Principal__Set_msg_init; +static const upb_MiniTableSubInternal envoy_config_rbac_v3_Principal_Authenticated_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__StringMatcher_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_rbac_v3_Principal_Authenticated__fields[1] = { @@ -322,6 +333,7 @@ const upb_MiniTable envoy__config__rbac__v3__Principal__Authenticated_msg_init = #endif }; +const upb_MiniTable* envoy__config__rbac__v3__Principal__Authenticated_msg_init_ptr = &envoy__config__rbac__v3__Principal__Authenticated_msg_init; static const upb_MiniTableField envoy_config_rbac_v3_Action__fields[2] = { {1, UPB_SIZE(12, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, {2, 8, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, @@ -342,6 +354,7 @@ const upb_MiniTable envoy__config__rbac__v3__Action_msg_init = { }) }; +const upb_MiniTable* envoy__config__rbac__v3__Action_msg_init_ptr = &envoy__config__rbac__v3__Action_msg_init; static const upb_MiniTable *messages_layout[11] = { &envoy__config__rbac__v3__RBAC_msg_init, &envoy__config__rbac__v3__RBAC__AuditLoggingOptions_msg_init, diff --git a/src/core/ext/upb-gen/envoy/config/rbac/v3/rbac.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/rbac/v3/rbac.upb_minitable.h index a2612fde041..0c40e3a57ff 100644 --- a/src/core/ext/upb-gen/envoy/config/rbac/v3/rbac.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/config/rbac/v3/rbac.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/config/rbac/v3/rbac.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_RBAC_V3_RBAC_PROTO_UPB_MINITABLE_H_ #define ENVOY_CONFIG_RBAC_V3_RBAC_PROTO_UPB_MINITABLE_H_ @@ -18,16 +19,27 @@ extern "C" { #endif extern const upb_MiniTable envoy__config__rbac__v3__RBAC_msg_init; +extern const upb_MiniTable* envoy__config__rbac__v3__RBAC_msg_init_ptr; extern const upb_MiniTable envoy__config__rbac__v3__RBAC__AuditLoggingOptions_msg_init; +extern const upb_MiniTable* envoy__config__rbac__v3__RBAC__AuditLoggingOptions_msg_init_ptr; extern const upb_MiniTable envoy__config__rbac__v3__RBAC__AuditLoggingOptions__AuditLoggerConfig_msg_init; +extern const upb_MiniTable* envoy__config__rbac__v3__RBAC__AuditLoggingOptions__AuditLoggerConfig_msg_init_ptr; extern const upb_MiniTable envoy__config__rbac__v3__RBAC__PoliciesEntry_msg_init; +extern const upb_MiniTable* envoy__config__rbac__v3__RBAC__PoliciesEntry_msg_init_ptr; extern const upb_MiniTable envoy__config__rbac__v3__Policy_msg_init; +extern const upb_MiniTable* envoy__config__rbac__v3__Policy_msg_init_ptr; extern const upb_MiniTable envoy__config__rbac__v3__Permission_msg_init; +extern const upb_MiniTable* envoy__config__rbac__v3__Permission_msg_init_ptr; extern const upb_MiniTable envoy__config__rbac__v3__Permission__Set_msg_init; +extern const upb_MiniTable* envoy__config__rbac__v3__Permission__Set_msg_init_ptr; extern const upb_MiniTable envoy__config__rbac__v3__Principal_msg_init; +extern const upb_MiniTable* envoy__config__rbac__v3__Principal_msg_init_ptr; extern const upb_MiniTable envoy__config__rbac__v3__Principal__Set_msg_init; +extern const upb_MiniTable* envoy__config__rbac__v3__Principal__Set_msg_init_ptr; extern const upb_MiniTable envoy__config__rbac__v3__Principal__Authenticated_msg_init; +extern const upb_MiniTable* envoy__config__rbac__v3__Principal__Authenticated_msg_init_ptr; extern const upb_MiniTable envoy__config__rbac__v3__Action_msg_init; +extern const upb_MiniTable* envoy__config__rbac__v3__Action_msg_init_ptr; extern const upb_MiniTableFile envoy_config_rbac_v3_rbac_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/config/route/v3/route.upb.h b/src/core/ext/upb-gen/envoy/config/route/v3/route.upb.h index 316e10867fd..25ae4043eab 100644 --- a/src/core/ext/upb-gen/envoy/config/route/v3/route.upb.h +++ b/src/core/ext/upb-gen/envoy/config/route/v3/route.upb.h @@ -3,7 +3,8 @@ * envoy/config/route/v3/route.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_ROUTE_V3_ROUTE_PROTO_UPB_H_ #define ENVOY_CONFIG_ROUTE_V3_ROUTE_PROTO_UPB_H_ @@ -97,6 +98,7 @@ UPB_INLINE void envoy_config_route_v3_RouteConfiguration_clear_virtual_hosts(env } UPB_INLINE const struct envoy_config_route_v3_VirtualHost* const* envoy_config_route_v3_RouteConfiguration_virtual_hosts(const envoy_config_route_v3_RouteConfiguration* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__VirtualHost_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -108,6 +110,7 @@ UPB_INLINE const struct envoy_config_route_v3_VirtualHost* const* envoy_config_r } UPB_INLINE const upb_Array* _envoy_config_route_v3_RouteConfiguration_virtual_hosts_upb_array(const envoy_config_route_v3_RouteConfiguration* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__VirtualHost_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -116,6 +119,7 @@ UPB_INLINE const upb_Array* _envoy_config_route_v3_RouteConfiguration_virtual_ho } UPB_INLINE upb_Array* _envoy_config_route_v3_RouteConfiguration_virtual_hosts_mutable_upb_array(envoy_config_route_v3_RouteConfiguration* msg, size_t* size, upb_Arena* arena) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__VirtualHost_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -161,6 +165,7 @@ UPB_INLINE void envoy_config_route_v3_RouteConfiguration_clear_response_headers_ } UPB_INLINE const struct envoy_config_core_v3_HeaderValueOption* const* envoy_config_route_v3_RouteConfiguration_response_headers_to_add(const envoy_config_route_v3_RouteConfiguration* msg, size_t* size) { const upb_MiniTableField field = {4, UPB_SIZE(20, 48), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HeaderValueOption_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -172,6 +177,7 @@ UPB_INLINE const struct envoy_config_core_v3_HeaderValueOption* const* envoy_con } UPB_INLINE const upb_Array* _envoy_config_route_v3_RouteConfiguration_response_headers_to_add_upb_array(const envoy_config_route_v3_RouteConfiguration* msg, size_t* size) { const upb_MiniTableField field = {4, UPB_SIZE(20, 48), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HeaderValueOption_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -180,6 +186,7 @@ UPB_INLINE const upb_Array* _envoy_config_route_v3_RouteConfiguration_response_h } UPB_INLINE upb_Array* _envoy_config_route_v3_RouteConfiguration_response_headers_to_add_mutable_upb_array(envoy_config_route_v3_RouteConfiguration* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {4, UPB_SIZE(20, 48), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HeaderValueOption_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -225,6 +232,7 @@ UPB_INLINE void envoy_config_route_v3_RouteConfiguration_clear_request_headers_t } UPB_INLINE const struct envoy_config_core_v3_HeaderValueOption* const* envoy_config_route_v3_RouteConfiguration_request_headers_to_add(const envoy_config_route_v3_RouteConfiguration* msg, size_t* size) { const upb_MiniTableField field = {6, UPB_SIZE(28, 64), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HeaderValueOption_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -236,6 +244,7 @@ UPB_INLINE const struct envoy_config_core_v3_HeaderValueOption* const* envoy_con } UPB_INLINE const upb_Array* _envoy_config_route_v3_RouteConfiguration_request_headers_to_add_upb_array(const envoy_config_route_v3_RouteConfiguration* msg, size_t* size) { const upb_MiniTableField field = {6, UPB_SIZE(28, 64), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HeaderValueOption_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -244,6 +253,7 @@ UPB_INLINE const upb_Array* _envoy_config_route_v3_RouteConfiguration_request_he } UPB_INLINE upb_Array* _envoy_config_route_v3_RouteConfiguration_request_headers_to_add_mutable_upb_array(envoy_config_route_v3_RouteConfiguration* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {6, UPB_SIZE(28, 64), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HeaderValueOption_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -259,6 +269,7 @@ UPB_INLINE const struct google_protobuf_BoolValue* envoy_config_route_v3_RouteCo const struct google_protobuf_BoolValue* default_val = NULL; const struct google_protobuf_BoolValue* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -307,6 +318,7 @@ UPB_INLINE const envoy_config_route_v3_Vhds* envoy_config_route_v3_RouteConfigur const envoy_config_route_v3_Vhds* default_val = NULL; const envoy_config_route_v3_Vhds* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__Vhds_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -335,6 +347,7 @@ UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_route_v3_Route const struct google_protobuf_UInt32Value* default_val = NULL; const struct google_protobuf_UInt32Value* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -349,6 +362,7 @@ UPB_INLINE void envoy_config_route_v3_RouteConfiguration_clear_cluster_specifier } UPB_INLINE const struct envoy_config_route_v3_ClusterSpecifierPlugin* const* envoy_config_route_v3_RouteConfiguration_cluster_specifier_plugins(const envoy_config_route_v3_RouteConfiguration* msg, size_t* size) { const upb_MiniTableField field = {12, UPB_SIZE(52, 104), 0, 6, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__ClusterSpecifierPlugin_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -360,6 +374,7 @@ UPB_INLINE const struct envoy_config_route_v3_ClusterSpecifierPlugin* const* env } UPB_INLINE const upb_Array* _envoy_config_route_v3_RouteConfiguration_cluster_specifier_plugins_upb_array(const envoy_config_route_v3_RouteConfiguration* msg, size_t* size) { const upb_MiniTableField field = {12, UPB_SIZE(52, 104), 0, 6, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__ClusterSpecifierPlugin_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -368,6 +383,7 @@ UPB_INLINE const upb_Array* _envoy_config_route_v3_RouteConfiguration_cluster_sp } UPB_INLINE upb_Array* _envoy_config_route_v3_RouteConfiguration_cluster_specifier_plugins_mutable_upb_array(envoy_config_route_v3_RouteConfiguration* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {12, UPB_SIZE(52, 104), 0, 6, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__ClusterSpecifierPlugin_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -381,6 +397,7 @@ UPB_INLINE void envoy_config_route_v3_RouteConfiguration_clear_request_mirror_po } UPB_INLINE const struct envoy_config_route_v3_RouteAction_RequestMirrorPolicy* const* envoy_config_route_v3_RouteConfiguration_request_mirror_policies(const envoy_config_route_v3_RouteConfiguration* msg, size_t* size) { const upb_MiniTableField field = {13, UPB_SIZE(56, 112), 0, 7, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RouteAction__RequestMirrorPolicy_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -392,6 +409,7 @@ UPB_INLINE const struct envoy_config_route_v3_RouteAction_RequestMirrorPolicy* c } UPB_INLINE const upb_Array* _envoy_config_route_v3_RouteConfiguration_request_mirror_policies_upb_array(const envoy_config_route_v3_RouteConfiguration* msg, size_t* size) { const upb_MiniTableField field = {13, UPB_SIZE(56, 112), 0, 7, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RouteAction__RequestMirrorPolicy_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -400,6 +418,7 @@ UPB_INLINE const upb_Array* _envoy_config_route_v3_RouteConfiguration_request_mi } UPB_INLINE upb_Array* _envoy_config_route_v3_RouteConfiguration_request_mirror_policies_mutable_upb_array(envoy_config_route_v3_RouteConfiguration* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {13, UPB_SIZE(56, 112), 0, 7, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RouteAction__RequestMirrorPolicy_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -442,22 +461,30 @@ UPB_INLINE size_t envoy_config_route_v3_RouteConfiguration_typed_per_filter_conf } UPB_INLINE bool envoy_config_route_v3_RouteConfiguration_typed_per_filter_config_get(const envoy_config_route_v3_RouteConfiguration* msg, upb_StringView key, struct google_protobuf_Any** val) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RouteConfiguration__TypedPerFilterConfigEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); 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_route_v3_RouteConfiguration_TypedPerFilterConfigEntry* envoy_config_route_v3_RouteConfiguration_typed_per_filter_config_next(const envoy_config_route_v3_RouteConfiguration* msg, size_t* iter) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RouteConfiguration__TypedPerFilterConfigEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); const upb_Map* map = upb_Message_GetMap(UPB_UPCAST(msg), &field); if (!map) return NULL; return (const envoy_config_route_v3_RouteConfiguration_TypedPerFilterConfigEntry*)_upb_map_next(map, iter); } UPB_INLINE const upb_Map* _envoy_config_route_v3_RouteConfiguration_typed_per_filter_config_upb_map(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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RouteConfiguration__TypedPerFilterConfigEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); return upb_Message_GetMap(UPB_UPCAST(msg), &field); } UPB_INLINE upb_Map* _envoy_config_route_v3_RouteConfiguration_typed_per_filter_config_mutable_upb_map(envoy_config_route_v3_RouteConfiguration* msg, upb_Arena* a) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RouteConfiguration__TypedPerFilterConfigEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); return _upb_Message_GetOrCreateMutableMap(UPB_UPCAST(msg), &field, 0, sizeof(struct google_protobuf_Any*), a); } UPB_INLINE void envoy_config_route_v3_RouteConfiguration_clear_metadata(envoy_config_route_v3_RouteConfiguration* msg) { @@ -468,6 +495,7 @@ UPB_INLINE const struct envoy_config_core_v3_Metadata* envoy_config_route_v3_Rou const struct envoy_config_core_v3_Metadata* default_val = NULL; const struct envoy_config_core_v3_Metadata* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Metadata_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -483,6 +511,7 @@ UPB_INLINE void envoy_config_route_v3_RouteConfiguration_set_name(envoy_config_r } 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__VirtualHost_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -499,6 +528,7 @@ UPB_INLINE struct envoy_config_route_v3_VirtualHost** envoy_config_route_v3_Rout } UPB_INLINE struct envoy_config_route_v3_VirtualHost* envoy_config_route_v3_RouteConfiguration_add_virtual_hosts(envoy_config_route_v3_RouteConfiguration* msg, upb_Arena* arena) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__VirtualHost_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -541,6 +571,7 @@ UPB_INLINE bool envoy_config_route_v3_RouteConfiguration_add_internal_only_heade } UPB_INLINE struct envoy_config_core_v3_HeaderValueOption** envoy_config_route_v3_RouteConfiguration_mutable_response_headers_to_add(envoy_config_route_v3_RouteConfiguration* msg, size_t* size) { upb_MiniTableField field = {4, UPB_SIZE(20, 48), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HeaderValueOption_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -557,6 +588,7 @@ UPB_INLINE struct envoy_config_core_v3_HeaderValueOption** envoy_config_route_v3 } UPB_INLINE struct envoy_config_core_v3_HeaderValueOption* envoy_config_route_v3_RouteConfiguration_add_response_headers_to_add(envoy_config_route_v3_RouteConfiguration* msg, upb_Arena* arena) { upb_MiniTableField field = {4, UPB_SIZE(20, 48), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HeaderValueOption_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -599,6 +631,7 @@ UPB_INLINE bool envoy_config_route_v3_RouteConfiguration_add_response_headers_to } UPB_INLINE struct envoy_config_core_v3_HeaderValueOption** envoy_config_route_v3_RouteConfiguration_mutable_request_headers_to_add(envoy_config_route_v3_RouteConfiguration* msg, size_t* size) { upb_MiniTableField field = {6, UPB_SIZE(28, 64), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HeaderValueOption_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -615,6 +648,7 @@ UPB_INLINE struct envoy_config_core_v3_HeaderValueOption** envoy_config_route_v3 } UPB_INLINE struct envoy_config_core_v3_HeaderValueOption* envoy_config_route_v3_RouteConfiguration_add_request_headers_to_add(envoy_config_route_v3_RouteConfiguration* msg, upb_Arena* arena) { upb_MiniTableField field = {6, UPB_SIZE(28, 64), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HeaderValueOption_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -629,6 +663,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); 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) { @@ -669,6 +704,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__Vhds_msg_init); 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) { @@ -685,6 +721,7 @@ UPB_INLINE void envoy_config_route_v3_RouteConfiguration_set_most_specific_heade } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); 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) { @@ -697,6 +734,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_route_v3_RouteConfig } UPB_INLINE struct envoy_config_route_v3_ClusterSpecifierPlugin** envoy_config_route_v3_RouteConfiguration_mutable_cluster_specifier_plugins(envoy_config_route_v3_RouteConfiguration* msg, size_t* size) { upb_MiniTableField field = {12, UPB_SIZE(52, 104), 0, 6, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__ClusterSpecifierPlugin_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -713,6 +751,7 @@ UPB_INLINE struct envoy_config_route_v3_ClusterSpecifierPlugin** envoy_config_ro } UPB_INLINE struct envoy_config_route_v3_ClusterSpecifierPlugin* envoy_config_route_v3_RouteConfiguration_add_cluster_specifier_plugins(envoy_config_route_v3_RouteConfiguration* msg, upb_Arena* arena) { upb_MiniTableField field = {12, UPB_SIZE(52, 104), 0, 6, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__ClusterSpecifierPlugin_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -727,6 +766,7 @@ UPB_INLINE struct envoy_config_route_v3_ClusterSpecifierPlugin* envoy_config_rou } UPB_INLINE struct envoy_config_route_v3_RouteAction_RequestMirrorPolicy** envoy_config_route_v3_RouteConfiguration_mutable_request_mirror_policies(envoy_config_route_v3_RouteConfiguration* msg, size_t* size) { upb_MiniTableField field = {13, UPB_SIZE(56, 112), 0, 7, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RouteAction__RequestMirrorPolicy_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -743,6 +783,7 @@ UPB_INLINE struct envoy_config_route_v3_RouteAction_RequestMirrorPolicy** envoy_ } UPB_INLINE struct envoy_config_route_v3_RouteAction_RequestMirrorPolicy* envoy_config_route_v3_RouteConfiguration_add_request_mirror_policies(envoy_config_route_v3_RouteConfiguration* msg, upb_Arena* arena) { upb_MiniTableField field = {13, UPB_SIZE(56, 112), 0, 7, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RouteAction__RequestMirrorPolicy_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -771,6 +812,8 @@ UPB_INLINE void envoy_config_route_v3_RouteConfiguration_typed_per_filter_config } UPB_INLINE bool envoy_config_route_v3_RouteConfiguration_typed_per_filter_config_set(envoy_config_route_v3_RouteConfiguration* msg, upb_StringView key, struct google_protobuf_Any* val, upb_Arena* a) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RouteConfiguration__TypedPerFilterConfigEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); 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) != @@ -784,12 +827,15 @@ UPB_INLINE bool envoy_config_route_v3_RouteConfiguration_typed_per_filter_config } UPB_INLINE envoy_config_route_v3_RouteConfiguration_TypedPerFilterConfigEntry* envoy_config_route_v3_RouteConfiguration_typed_per_filter_config_nextmutable(envoy_config_route_v3_RouteConfiguration* msg, size_t* iter) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RouteConfiguration__TypedPerFilterConfigEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); upb_Map* map = (upb_Map*)upb_Message_GetMap(UPB_UPCAST(msg), &field); if (!map) return NULL; return (envoy_config_route_v3_RouteConfiguration_TypedPerFilterConfigEntry*)_upb_map_next(map, iter); } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Metadata_msg_init); 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) { @@ -866,6 +912,7 @@ UPB_INLINE const struct envoy_config_core_v3_ConfigSource* envoy_config_route_v3 const struct envoy_config_core_v3_ConfigSource* default_val = NULL; const struct envoy_config_core_v3_ConfigSource* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__ConfigSource_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -877,6 +924,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__ConfigSource_msg_init); 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) { diff --git a/src/core/ext/upb-gen/envoy/config/route/v3/route.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/route/v3/route.upb_minitable.c index e5104c4c82f..44b3a48007b 100644 --- a/src/core/ext/upb-gen/envoy/config/route/v3/route.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/config/route/v3/route.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/config/route/v3/route.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -20,17 +21,18 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub envoy_config_route_v3_RouteConfiguration_submsgs[10] = { - {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__VirtualHost_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HeaderValueOption_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HeaderValueOption_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__Vhds_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__ClusterSpecifierPlugin_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RouteAction__RequestMirrorPolicy_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RouteConfiguration__TypedPerFilterConfigEntry_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Metadata_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal envoy_config_route_v3_RouteConfiguration_submsgs[10] = { + {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__VirtualHost_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HeaderValueOption_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HeaderValueOption_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__Vhds_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__ClusterSpecifierPlugin_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RouteAction__RequestMirrorPolicy_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RouteConfiguration__TypedPerFilterConfigEntry_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Metadata_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_route_v3_RouteConfiguration__fields[17] = { @@ -80,8 +82,9 @@ const upb_MiniTable envoy__config__route__v3__RouteConfiguration_msg_init = { }) }; -static const upb_MiniTableSub envoy_config_route_v3_RouteConfiguration_TypedPerFilterConfigEntry_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init}, +const upb_MiniTable* envoy__config__route__v3__RouteConfiguration_msg_init_ptr = &envoy__config__route__v3__RouteConfiguration_msg_init; +static const upb_MiniTableSubInternal envoy_config_route_v3_RouteConfiguration_TypedPerFilterConfigEntry_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_route_v3_RouteConfiguration_TypedPerFilterConfigEntry__fields[2] = { @@ -102,8 +105,9 @@ const upb_MiniTable envoy__config__route__v3__RouteConfiguration__TypedPerFilter }) }; -static const upb_MiniTableSub envoy_config_route_v3_Vhds_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ConfigSource_msg_init}, +const upb_MiniTable* envoy__config__route__v3__RouteConfiguration__TypedPerFilterConfigEntry_msg_init_ptr = &envoy__config__route__v3__RouteConfiguration__TypedPerFilterConfigEntry_msg_init; +static const upb_MiniTableSubInternal envoy_config_route_v3_Vhds_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ConfigSource_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_route_v3_Vhds__fields[1] = { @@ -119,6 +123,7 @@ const upb_MiniTable envoy__config__route__v3__Vhds_msg_init = { #endif }; +const upb_MiniTable* envoy__config__route__v3__Vhds_msg_init_ptr = &envoy__config__route__v3__Vhds_msg_init; static const upb_MiniTable *messages_layout[3] = { &envoy__config__route__v3__RouteConfiguration_msg_init, &envoy__config__route__v3__RouteConfiguration__TypedPerFilterConfigEntry_msg_init, diff --git a/src/core/ext/upb-gen/envoy/config/route/v3/route.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/route/v3/route.upb_minitable.h index b4f9e07e0ed..0005b2b5021 100644 --- a/src/core/ext/upb-gen/envoy/config/route/v3/route.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/config/route/v3/route.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/config/route/v3/route.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_ROUTE_V3_ROUTE_PROTO_UPB_MINITABLE_H_ #define ENVOY_CONFIG_ROUTE_V3_ROUTE_PROTO_UPB_MINITABLE_H_ @@ -18,8 +19,11 @@ extern "C" { #endif extern const upb_MiniTable envoy__config__route__v3__RouteConfiguration_msg_init; +extern const upb_MiniTable* envoy__config__route__v3__RouteConfiguration_msg_init_ptr; extern const upb_MiniTable envoy__config__route__v3__RouteConfiguration__TypedPerFilterConfigEntry_msg_init; +extern const upb_MiniTable* envoy__config__route__v3__RouteConfiguration__TypedPerFilterConfigEntry_msg_init_ptr; extern const upb_MiniTable envoy__config__route__v3__Vhds_msg_init; +extern const upb_MiniTable* envoy__config__route__v3__Vhds_msg_init_ptr; extern const upb_MiniTableFile envoy_config_route_v3_route_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/config/route/v3/route_components.upb.h b/src/core/ext/upb-gen/envoy/config/route/v3/route_components.upb.h index 20313874935..e5bb26b657f 100644 --- a/src/core/ext/upb-gen/envoy/config/route/v3/route_components.upb.h +++ b/src/core/ext/upb-gen/envoy/config/route/v3/route_components.upb.h @@ -3,7 +3,8 @@ * envoy/config/route/v3/route_components.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_ROUTE_V3_ROUTE_COMPONENTS_PROTO_UPB_H_ #define ENVOY_CONFIG_ROUTE_V3_ROUTE_COMPONENTS_PROTO_UPB_H_ @@ -241,6 +242,7 @@ UPB_INLINE void envoy_config_route_v3_VirtualHost_clear_routes(envoy_config_rout } UPB_INLINE const envoy_config_route_v3_Route* const* envoy_config_route_v3_VirtualHost_routes(const envoy_config_route_v3_VirtualHost* msg, size_t* size) { const upb_MiniTableField field = {3, UPB_SIZE(16, 48), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__Route_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -252,6 +254,7 @@ UPB_INLINE const envoy_config_route_v3_Route* const* envoy_config_route_v3_Virtu } UPB_INLINE const upb_Array* _envoy_config_route_v3_VirtualHost_routes_upb_array(const envoy_config_route_v3_VirtualHost* msg, size_t* size) { const upb_MiniTableField field = {3, UPB_SIZE(16, 48), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__Route_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -260,6 +263,7 @@ UPB_INLINE const upb_Array* _envoy_config_route_v3_VirtualHost_routes_upb_array( } UPB_INLINE upb_Array* _envoy_config_route_v3_VirtualHost_routes_mutable_upb_array(envoy_config_route_v3_VirtualHost* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {3, UPB_SIZE(16, 48), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__Route_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -285,6 +289,7 @@ UPB_INLINE void envoy_config_route_v3_VirtualHost_clear_virtual_clusters(envoy_c } UPB_INLINE const envoy_config_route_v3_VirtualCluster* const* envoy_config_route_v3_VirtualHost_virtual_clusters(const envoy_config_route_v3_VirtualHost* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__VirtualCluster_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -296,6 +301,7 @@ UPB_INLINE const envoy_config_route_v3_VirtualCluster* const* envoy_config_route } UPB_INLINE const upb_Array* _envoy_config_route_v3_VirtualHost_virtual_clusters_upb_array(const envoy_config_route_v3_VirtualHost* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__VirtualCluster_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -304,6 +310,7 @@ UPB_INLINE const upb_Array* _envoy_config_route_v3_VirtualHost_virtual_clusters_ } UPB_INLINE upb_Array* _envoy_config_route_v3_VirtualHost_virtual_clusters_mutable_upb_array(envoy_config_route_v3_VirtualHost* msg, size_t* size, upb_Arena* arena) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__VirtualCluster_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -317,6 +324,7 @@ UPB_INLINE void envoy_config_route_v3_VirtualHost_clear_rate_limits(envoy_config } UPB_INLINE const envoy_config_route_v3_RateLimit* const* envoy_config_route_v3_VirtualHost_rate_limits(const envoy_config_route_v3_VirtualHost* msg, size_t* size) { const upb_MiniTableField field = {6, UPB_SIZE(28, 64), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RateLimit_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -328,6 +336,7 @@ UPB_INLINE const envoy_config_route_v3_RateLimit* const* envoy_config_route_v3_V } UPB_INLINE const upb_Array* _envoy_config_route_v3_VirtualHost_rate_limits_upb_array(const envoy_config_route_v3_VirtualHost* msg, size_t* size) { const upb_MiniTableField field = {6, UPB_SIZE(28, 64), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RateLimit_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -336,6 +345,7 @@ UPB_INLINE const upb_Array* _envoy_config_route_v3_VirtualHost_rate_limits_upb_a } UPB_INLINE upb_Array* _envoy_config_route_v3_VirtualHost_rate_limits_mutable_upb_array(envoy_config_route_v3_VirtualHost* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {6, UPB_SIZE(28, 64), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RateLimit_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -349,6 +359,7 @@ UPB_INLINE void envoy_config_route_v3_VirtualHost_clear_request_headers_to_add(e } UPB_INLINE const struct envoy_config_core_v3_HeaderValueOption* const* envoy_config_route_v3_VirtualHost_request_headers_to_add(const envoy_config_route_v3_VirtualHost* msg, size_t* size) { const upb_MiniTableField field = {7, UPB_SIZE(32, 72), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HeaderValueOption_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -360,6 +371,7 @@ UPB_INLINE const struct envoy_config_core_v3_HeaderValueOption* const* envoy_con } UPB_INLINE const upb_Array* _envoy_config_route_v3_VirtualHost_request_headers_to_add_upb_array(const envoy_config_route_v3_VirtualHost* msg, size_t* size) { const upb_MiniTableField field = {7, UPB_SIZE(32, 72), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HeaderValueOption_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -368,6 +380,7 @@ UPB_INLINE const upb_Array* _envoy_config_route_v3_VirtualHost_request_headers_t } UPB_INLINE upb_Array* _envoy_config_route_v3_VirtualHost_request_headers_to_add_mutable_upb_array(envoy_config_route_v3_VirtualHost* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {7, UPB_SIZE(32, 72), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HeaderValueOption_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -383,6 +396,7 @@ UPB_INLINE const envoy_config_route_v3_CorsPolicy* envoy_config_route_v3_Virtual const envoy_config_route_v3_CorsPolicy* default_val = NULL; const envoy_config_route_v3_CorsPolicy* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__CorsPolicy_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -397,6 +411,7 @@ UPB_INLINE void envoy_config_route_v3_VirtualHost_clear_response_headers_to_add( } UPB_INLINE const struct envoy_config_core_v3_HeaderValueOption* const* envoy_config_route_v3_VirtualHost_response_headers_to_add(const envoy_config_route_v3_VirtualHost* msg, size_t* size) { const upb_MiniTableField field = {10, UPB_SIZE(40, 88), 0, 5, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HeaderValueOption_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -408,6 +423,7 @@ UPB_INLINE const struct envoy_config_core_v3_HeaderValueOption* const* envoy_con } UPB_INLINE const upb_Array* _envoy_config_route_v3_VirtualHost_response_headers_to_add_upb_array(const envoy_config_route_v3_VirtualHost* msg, size_t* size) { const upb_MiniTableField field = {10, UPB_SIZE(40, 88), 0, 5, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HeaderValueOption_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -416,6 +432,7 @@ UPB_INLINE const upb_Array* _envoy_config_route_v3_VirtualHost_response_headers_ } UPB_INLINE upb_Array* _envoy_config_route_v3_VirtualHost_response_headers_to_add_mutable_upb_array(envoy_config_route_v3_VirtualHost* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {10, UPB_SIZE(40, 88), 0, 5, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HeaderValueOption_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -510,22 +527,30 @@ UPB_INLINE size_t envoy_config_route_v3_VirtualHost_typed_per_filter_config_size } UPB_INLINE bool envoy_config_route_v3_VirtualHost_typed_per_filter_config_get(const envoy_config_route_v3_VirtualHost* msg, upb_StringView key, struct google_protobuf_Any** val) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__VirtualHost__TypedPerFilterConfigEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); 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_route_v3_VirtualHost_TypedPerFilterConfigEntry* envoy_config_route_v3_VirtualHost_typed_per_filter_config_next(const envoy_config_route_v3_VirtualHost* msg, size_t* iter) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__VirtualHost__TypedPerFilterConfigEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); const upb_Map* map = upb_Message_GetMap(UPB_UPCAST(msg), &field); if (!map) return NULL; return (const envoy_config_route_v3_VirtualHost_TypedPerFilterConfigEntry*)_upb_map_next(map, iter); } UPB_INLINE const upb_Map* _envoy_config_route_v3_VirtualHost_typed_per_filter_config_upb_map(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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__VirtualHost__TypedPerFilterConfigEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); return upb_Message_GetMap(UPB_UPCAST(msg), &field); } UPB_INLINE upb_Map* _envoy_config_route_v3_VirtualHost_typed_per_filter_config_mutable_upb_map(envoy_config_route_v3_VirtualHost* msg, upb_Arena* a) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__VirtualHost__TypedPerFilterConfigEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); return _upb_Message_GetOrCreateMutableMap(UPB_UPCAST(msg), &field, 0, sizeof(struct google_protobuf_Any*), a); } UPB_INLINE void envoy_config_route_v3_VirtualHost_clear_retry_policy(envoy_config_route_v3_VirtualHost* msg) { @@ -536,6 +561,7 @@ UPB_INLINE const envoy_config_route_v3_RetryPolicy* envoy_config_route_v3_Virtua const envoy_config_route_v3_RetryPolicy* default_val = NULL; const envoy_config_route_v3_RetryPolicy* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RetryPolicy_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -552,6 +578,7 @@ UPB_INLINE const envoy_config_route_v3_HedgePolicy* envoy_config_route_v3_Virtua const envoy_config_route_v3_HedgePolicy* default_val = NULL; const envoy_config_route_v3_HedgePolicy* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__HedgePolicy_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -568,6 +595,7 @@ UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_route_v3_Virtu const struct google_protobuf_UInt32Value* default_val = NULL; const struct google_protobuf_UInt32Value* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -596,6 +624,7 @@ UPB_INLINE const struct google_protobuf_Any* envoy_config_route_v3_VirtualHost_r const struct google_protobuf_Any* default_val = NULL; const struct google_protobuf_Any* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -612,6 +641,7 @@ UPB_INLINE const struct xds_type_matcher_v3_Matcher* envoy_config_route_v3_Virtu const struct xds_type_matcher_v3_Matcher* default_val = NULL; const struct xds_type_matcher_v3_Matcher* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__matcher__v3__Matcher_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -626,6 +656,7 @@ UPB_INLINE void envoy_config_route_v3_VirtualHost_clear_request_mirror_policies( } UPB_INLINE const envoy_config_route_v3_RouteAction_RequestMirrorPolicy* const* envoy_config_route_v3_VirtualHost_request_mirror_policies(const envoy_config_route_v3_VirtualHost* msg, size_t* size) { const upb_MiniTableField field = {22, UPB_SIZE(84, 160), 0, 12, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RouteAction__RequestMirrorPolicy_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -637,6 +668,7 @@ UPB_INLINE const envoy_config_route_v3_RouteAction_RequestMirrorPolicy* const* e } UPB_INLINE const upb_Array* _envoy_config_route_v3_VirtualHost_request_mirror_policies_upb_array(const envoy_config_route_v3_VirtualHost* msg, size_t* size) { const upb_MiniTableField field = {22, UPB_SIZE(84, 160), 0, 12, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RouteAction__RequestMirrorPolicy_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -645,6 +677,7 @@ UPB_INLINE const upb_Array* _envoy_config_route_v3_VirtualHost_request_mirror_po } UPB_INLINE upb_Array* _envoy_config_route_v3_VirtualHost_request_mirror_policies_mutable_upb_array(envoy_config_route_v3_VirtualHost* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {22, UPB_SIZE(84, 160), 0, 12, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RouteAction__RequestMirrorPolicy_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -672,6 +705,7 @@ UPB_INLINE const struct envoy_config_core_v3_Metadata* envoy_config_route_v3_Vir const struct envoy_config_core_v3_Metadata* default_val = NULL; const struct envoy_config_core_v3_Metadata* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Metadata_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -715,6 +749,7 @@ UPB_INLINE bool envoy_config_route_v3_VirtualHost_add_domains(envoy_config_route } UPB_INLINE envoy_config_route_v3_Route** envoy_config_route_v3_VirtualHost_mutable_routes(envoy_config_route_v3_VirtualHost* msg, size_t* size) { upb_MiniTableField field = {3, UPB_SIZE(16, 48), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__Route_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -731,6 +766,7 @@ UPB_INLINE envoy_config_route_v3_Route** envoy_config_route_v3_VirtualHost_resiz } UPB_INLINE struct envoy_config_route_v3_Route* envoy_config_route_v3_VirtualHost_add_routes(envoy_config_route_v3_VirtualHost* msg, upb_Arena* arena) { upb_MiniTableField field = {3, UPB_SIZE(16, 48), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__Route_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -749,6 +785,7 @@ UPB_INLINE void envoy_config_route_v3_VirtualHost_set_require_tls(envoy_config_r } 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__VirtualCluster_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -765,6 +802,7 @@ UPB_INLINE envoy_config_route_v3_VirtualCluster** envoy_config_route_v3_VirtualH } UPB_INLINE struct envoy_config_route_v3_VirtualCluster* envoy_config_route_v3_VirtualHost_add_virtual_clusters(envoy_config_route_v3_VirtualHost* msg, upb_Arena* arena) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__VirtualCluster_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -779,6 +817,7 @@ UPB_INLINE struct envoy_config_route_v3_VirtualCluster* envoy_config_route_v3_Vi } UPB_INLINE envoy_config_route_v3_RateLimit** envoy_config_route_v3_VirtualHost_mutable_rate_limits(envoy_config_route_v3_VirtualHost* msg, size_t* size) { upb_MiniTableField field = {6, UPB_SIZE(28, 64), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RateLimit_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -795,6 +834,7 @@ UPB_INLINE envoy_config_route_v3_RateLimit** envoy_config_route_v3_VirtualHost_r } UPB_INLINE struct envoy_config_route_v3_RateLimit* envoy_config_route_v3_VirtualHost_add_rate_limits(envoy_config_route_v3_VirtualHost* msg, upb_Arena* arena) { upb_MiniTableField field = {6, UPB_SIZE(28, 64), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RateLimit_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -809,6 +849,7 @@ UPB_INLINE struct envoy_config_route_v3_RateLimit* envoy_config_route_v3_Virtual } UPB_INLINE struct envoy_config_core_v3_HeaderValueOption** envoy_config_route_v3_VirtualHost_mutable_request_headers_to_add(envoy_config_route_v3_VirtualHost* msg, size_t* size) { upb_MiniTableField field = {7, UPB_SIZE(32, 72), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HeaderValueOption_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -825,6 +866,7 @@ UPB_INLINE struct envoy_config_core_v3_HeaderValueOption** envoy_config_route_v3 } UPB_INLINE struct envoy_config_core_v3_HeaderValueOption* envoy_config_route_v3_VirtualHost_add_request_headers_to_add(envoy_config_route_v3_VirtualHost* msg, upb_Arena* arena) { upb_MiniTableField field = {7, UPB_SIZE(32, 72), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HeaderValueOption_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -839,6 +881,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__CorsPolicy_msg_init); 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) { @@ -851,6 +894,7 @@ UPB_INLINE struct envoy_config_route_v3_CorsPolicy* envoy_config_route_v3_Virtua } UPB_INLINE struct envoy_config_core_v3_HeaderValueOption** envoy_config_route_v3_VirtualHost_mutable_response_headers_to_add(envoy_config_route_v3_VirtualHost* msg, size_t* size) { upb_MiniTableField field = {10, UPB_SIZE(40, 88), 0, 5, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HeaderValueOption_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -867,6 +911,7 @@ UPB_INLINE struct envoy_config_core_v3_HeaderValueOption** envoy_config_route_v3 } UPB_INLINE struct envoy_config_core_v3_HeaderValueOption* envoy_config_route_v3_VirtualHost_add_response_headers_to_add(envoy_config_route_v3_VirtualHost* msg, upb_Arena* arena) { upb_MiniTableField field = {10, UPB_SIZE(40, 88), 0, 5, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HeaderValueOption_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -947,6 +992,8 @@ UPB_INLINE void envoy_config_route_v3_VirtualHost_typed_per_filter_config_clear( } UPB_INLINE bool envoy_config_route_v3_VirtualHost_typed_per_filter_config_set(envoy_config_route_v3_VirtualHost* msg, upb_StringView key, struct google_protobuf_Any* val, upb_Arena* a) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__VirtualHost__TypedPerFilterConfigEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); 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) != @@ -960,12 +1007,15 @@ UPB_INLINE bool envoy_config_route_v3_VirtualHost_typed_per_filter_config_delete } UPB_INLINE envoy_config_route_v3_VirtualHost_TypedPerFilterConfigEntry* envoy_config_route_v3_VirtualHost_typed_per_filter_config_nextmutable(envoy_config_route_v3_VirtualHost* msg, size_t* iter) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__VirtualHost__TypedPerFilterConfigEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); upb_Map* map = (upb_Map*)upb_Message_GetMap(UPB_UPCAST(msg), &field); if (!map) return NULL; return (envoy_config_route_v3_VirtualHost_TypedPerFilterConfigEntry*)_upb_map_next(map, iter); } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RetryPolicy_msg_init); 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) { @@ -978,6 +1028,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__HedgePolicy_msg_init); 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) { @@ -990,6 +1041,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); 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) { @@ -1006,6 +1058,7 @@ UPB_INLINE void envoy_config_route_v3_VirtualHost_set_include_attempt_count_in_r } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); 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) { @@ -1018,6 +1071,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_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__matcher__v3__Matcher_msg_init); 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) { @@ -1030,6 +1084,7 @@ UPB_INLINE struct xds_type_matcher_v3_Matcher* envoy_config_route_v3_VirtualHost } UPB_INLINE envoy_config_route_v3_RouteAction_RequestMirrorPolicy** envoy_config_route_v3_VirtualHost_mutable_request_mirror_policies(envoy_config_route_v3_VirtualHost* msg, size_t* size) { upb_MiniTableField field = {22, UPB_SIZE(84, 160), 0, 12, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RouteAction__RequestMirrorPolicy_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1046,6 +1101,7 @@ UPB_INLINE envoy_config_route_v3_RouteAction_RequestMirrorPolicy** envoy_config_ } UPB_INLINE struct envoy_config_route_v3_RouteAction_RequestMirrorPolicy* envoy_config_route_v3_VirtualHost_add_request_mirror_policies(envoy_config_route_v3_VirtualHost* msg, upb_Arena* arena) { upb_MiniTableField field = {22, UPB_SIZE(84, 160), 0, 12, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RouteAction__RequestMirrorPolicy_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -1064,6 +1120,7 @@ UPB_INLINE void envoy_config_route_v3_VirtualHost_set_include_is_timeout_retry_h } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Metadata_msg_init); 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) { @@ -1140,6 +1197,7 @@ UPB_INLINE const struct google_protobuf_Any* envoy_config_route_v3_FilterAction_ const struct google_protobuf_Any* default_val = NULL; const struct google_protobuf_Any* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1151,6 +1209,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); 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) { @@ -1204,6 +1263,7 @@ UPB_INLINE void envoy_config_route_v3_RouteList_clear_routes(envoy_config_route_ } UPB_INLINE const envoy_config_route_v3_Route* const* envoy_config_route_v3_RouteList_routes(const envoy_config_route_v3_RouteList* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__Route_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1215,6 +1275,7 @@ UPB_INLINE const envoy_config_route_v3_Route* const* envoy_config_route_v3_Route } UPB_INLINE const upb_Array* _envoy_config_route_v3_RouteList_routes_upb_array(const envoy_config_route_v3_RouteList* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__Route_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -1223,6 +1284,7 @@ UPB_INLINE const upb_Array* _envoy_config_route_v3_RouteList_routes_upb_array(co } UPB_INLINE upb_Array* _envoy_config_route_v3_RouteList_routes_mutable_upb_array(envoy_config_route_v3_RouteList* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__Route_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -1233,6 +1295,7 @@ UPB_INLINE upb_Array* _envoy_config_route_v3_RouteList_routes_mutable_upb_array( UPB_INLINE envoy_config_route_v3_Route** envoy_config_route_v3_RouteList_mutable_routes(envoy_config_route_v3_RouteList* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__Route_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1249,6 +1312,7 @@ UPB_INLINE envoy_config_route_v3_Route** envoy_config_route_v3_RouteList_resize_ } UPB_INLINE struct envoy_config_route_v3_Route* envoy_config_route_v3_RouteList_add_routes(envoy_config_route_v3_RouteList* msg, upb_Arena* arena) { upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__Route_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -1319,6 +1383,7 @@ UPB_INLINE const envoy_config_route_v3_RouteMatch* envoy_config_route_v3_Route_m const envoy_config_route_v3_RouteMatch* default_val = NULL; const envoy_config_route_v3_RouteMatch* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RouteMatch_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1335,6 +1400,7 @@ UPB_INLINE const envoy_config_route_v3_RouteAction* envoy_config_route_v3_Route_ const envoy_config_route_v3_RouteAction* default_val = NULL; const envoy_config_route_v3_RouteAction* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RouteAction_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1351,6 +1417,7 @@ UPB_INLINE const envoy_config_route_v3_RedirectAction* envoy_config_route_v3_Rou const envoy_config_route_v3_RedirectAction* default_val = NULL; const envoy_config_route_v3_RedirectAction* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RedirectAction_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1367,6 +1434,7 @@ UPB_INLINE const struct envoy_config_core_v3_Metadata* envoy_config_route_v3_Rou const struct envoy_config_core_v3_Metadata* default_val = NULL; const struct envoy_config_core_v3_Metadata* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Metadata_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1383,6 +1451,7 @@ UPB_INLINE const envoy_config_route_v3_Decorator* envoy_config_route_v3_Route_de const envoy_config_route_v3_Decorator* default_val = NULL; const envoy_config_route_v3_Decorator* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__Decorator_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1399,6 +1468,7 @@ UPB_INLINE const envoy_config_route_v3_DirectResponseAction* envoy_config_route_ const envoy_config_route_v3_DirectResponseAction* default_val = NULL; const envoy_config_route_v3_DirectResponseAction* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__DirectResponseAction_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1413,6 +1483,7 @@ UPB_INLINE void envoy_config_route_v3_Route_clear_request_headers_to_add(envoy_c } UPB_INLINE const struct envoy_config_core_v3_HeaderValueOption* const* envoy_config_route_v3_Route_request_headers_to_add(const envoy_config_route_v3_Route* msg, size_t* size) { const upb_MiniTableField field = {9, UPB_SIZE(24, 40), 0, 6, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HeaderValueOption_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1424,6 +1495,7 @@ UPB_INLINE const struct envoy_config_core_v3_HeaderValueOption* const* envoy_con } UPB_INLINE const upb_Array* _envoy_config_route_v3_Route_request_headers_to_add_upb_array(const envoy_config_route_v3_Route* msg, size_t* size) { const upb_MiniTableField field = {9, UPB_SIZE(24, 40), 0, 6, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HeaderValueOption_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -1432,6 +1504,7 @@ UPB_INLINE const upb_Array* _envoy_config_route_v3_Route_request_headers_to_add_ } UPB_INLINE upb_Array* _envoy_config_route_v3_Route_request_headers_to_add_mutable_upb_array(envoy_config_route_v3_Route* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {9, UPB_SIZE(24, 40), 0, 6, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HeaderValueOption_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -1445,6 +1518,7 @@ UPB_INLINE void envoy_config_route_v3_Route_clear_response_headers_to_add(envoy_ } UPB_INLINE const struct envoy_config_core_v3_HeaderValueOption* const* envoy_config_route_v3_Route_response_headers_to_add(const envoy_config_route_v3_Route* msg, size_t* size) { const upb_MiniTableField field = {10, UPB_SIZE(28, 48), 0, 7, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HeaderValueOption_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1456,6 +1530,7 @@ UPB_INLINE const struct envoy_config_core_v3_HeaderValueOption* const* envoy_con } UPB_INLINE const upb_Array* _envoy_config_route_v3_Route_response_headers_to_add_upb_array(const envoy_config_route_v3_Route* msg, size_t* size) { const upb_MiniTableField field = {10, UPB_SIZE(28, 48), 0, 7, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HeaderValueOption_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -1464,6 +1539,7 @@ UPB_INLINE const upb_Array* _envoy_config_route_v3_Route_response_headers_to_add } UPB_INLINE upb_Array* _envoy_config_route_v3_Route_response_headers_to_add_mutable_upb_array(envoy_config_route_v3_Route* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {10, UPB_SIZE(28, 48), 0, 7, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HeaderValueOption_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -1546,22 +1622,30 @@ UPB_INLINE size_t envoy_config_route_v3_Route_typed_per_filter_config_size(const } UPB_INLINE bool envoy_config_route_v3_Route_typed_per_filter_config_get(const envoy_config_route_v3_Route* msg, upb_StringView key, struct google_protobuf_Any** val) { const upb_MiniTableField field = {13, UPB_SIZE(40, 72), 0, 8, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__Route__TypedPerFilterConfigEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); 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_route_v3_Route_TypedPerFilterConfigEntry* envoy_config_route_v3_Route_typed_per_filter_config_next(const envoy_config_route_v3_Route* msg, size_t* iter) { const upb_MiniTableField field = {13, UPB_SIZE(40, 72), 0, 8, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__Route__TypedPerFilterConfigEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); const upb_Map* map = upb_Message_GetMap(UPB_UPCAST(msg), &field); if (!map) return NULL; return (const envoy_config_route_v3_Route_TypedPerFilterConfigEntry*)_upb_map_next(map, iter); } UPB_INLINE const upb_Map* _envoy_config_route_v3_Route_typed_per_filter_config_upb_map(envoy_config_route_v3_Route* msg) { const upb_MiniTableField field = {13, UPB_SIZE(40, 72), 0, 8, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__Route__TypedPerFilterConfigEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); return upb_Message_GetMap(UPB_UPCAST(msg), &field); } UPB_INLINE upb_Map* _envoy_config_route_v3_Route_typed_per_filter_config_mutable_upb_map(envoy_config_route_v3_Route* msg, upb_Arena* a) { const upb_MiniTableField field = {13, UPB_SIZE(40, 72), 0, 8, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__Route__TypedPerFilterConfigEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); return _upb_Message_GetOrCreateMutableMap(UPB_UPCAST(msg), &field, 0, sizeof(struct google_protobuf_Any*), a); } UPB_INLINE void envoy_config_route_v3_Route_clear_name(envoy_config_route_v3_Route* msg) { @@ -1584,6 +1668,7 @@ UPB_INLINE const envoy_config_route_v3_Tracing* envoy_config_route_v3_Route_trac const envoy_config_route_v3_Tracing* default_val = NULL; const envoy_config_route_v3_Tracing* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__Tracing_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1600,6 +1685,7 @@ UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_route_v3_Route const struct google_protobuf_UInt32Value* default_val = NULL; const struct google_protobuf_UInt32Value* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1616,6 +1702,7 @@ UPB_INLINE const envoy_config_route_v3_FilterAction* envoy_config_route_v3_Route const envoy_config_route_v3_FilterAction* default_val = NULL; const envoy_config_route_v3_FilterAction* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__FilterAction_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1632,6 +1719,7 @@ UPB_INLINE const envoy_config_route_v3_NonForwardingAction* envoy_config_route_v const envoy_config_route_v3_NonForwardingAction* default_val = NULL; const envoy_config_route_v3_NonForwardingAction* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__NonForwardingAction_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1655,6 +1743,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RouteMatch_msg_init); 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) { @@ -1667,6 +1756,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RouteAction_msg_init); 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) { @@ -1679,6 +1769,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RedirectAction_msg_init); 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) { @@ -1691,6 +1782,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Metadata_msg_init); 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) { @@ -1703,6 +1795,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__Decorator_msg_init); 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) { @@ -1715,6 +1808,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__DirectResponseAction_msg_init); 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) { @@ -1727,6 +1821,7 @@ UPB_INLINE struct envoy_config_route_v3_DirectResponseAction* envoy_config_route } UPB_INLINE struct envoy_config_core_v3_HeaderValueOption** envoy_config_route_v3_Route_mutable_request_headers_to_add(envoy_config_route_v3_Route* msg, size_t* size) { upb_MiniTableField field = {9, UPB_SIZE(24, 40), 0, 6, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HeaderValueOption_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1743,6 +1838,7 @@ UPB_INLINE struct envoy_config_core_v3_HeaderValueOption** envoy_config_route_v3 } UPB_INLINE struct envoy_config_core_v3_HeaderValueOption* envoy_config_route_v3_Route_add_request_headers_to_add(envoy_config_route_v3_Route* msg, upb_Arena* arena) { upb_MiniTableField field = {9, UPB_SIZE(24, 40), 0, 6, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HeaderValueOption_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -1757,6 +1853,7 @@ UPB_INLINE struct envoy_config_core_v3_HeaderValueOption* envoy_config_route_v3_ } UPB_INLINE struct envoy_config_core_v3_HeaderValueOption** envoy_config_route_v3_Route_mutable_response_headers_to_add(envoy_config_route_v3_Route* msg, size_t* size) { upb_MiniTableField field = {10, UPB_SIZE(28, 48), 0, 7, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HeaderValueOption_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1773,6 +1870,7 @@ UPB_INLINE struct envoy_config_core_v3_HeaderValueOption** envoy_config_route_v3 } UPB_INLINE struct envoy_config_core_v3_HeaderValueOption* envoy_config_route_v3_Route_add_response_headers_to_add(envoy_config_route_v3_Route* msg, upb_Arena* arena) { upb_MiniTableField field = {10, UPB_SIZE(28, 48), 0, 7, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HeaderValueOption_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -1849,6 +1947,8 @@ UPB_INLINE void envoy_config_route_v3_Route_typed_per_filter_config_clear(envoy_ } UPB_INLINE bool envoy_config_route_v3_Route_typed_per_filter_config_set(envoy_config_route_v3_Route* msg, upb_StringView key, struct google_protobuf_Any* val, upb_Arena* a) { const upb_MiniTableField field = {13, UPB_SIZE(40, 72), 0, 8, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__Route__TypedPerFilterConfigEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); 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) != @@ -1862,6 +1962,8 @@ UPB_INLINE bool envoy_config_route_v3_Route_typed_per_filter_config_delete(envoy } UPB_INLINE envoy_config_route_v3_Route_TypedPerFilterConfigEntry* envoy_config_route_v3_Route_typed_per_filter_config_nextmutable(envoy_config_route_v3_Route* msg, size_t* iter) { const upb_MiniTableField field = {13, UPB_SIZE(40, 72), 0, 8, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__Route__TypedPerFilterConfigEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); upb_Map* map = (upb_Map*)upb_Message_GetMap(UPB_UPCAST(msg), &field); if (!map) return NULL; return (envoy_config_route_v3_Route_TypedPerFilterConfigEntry*)_upb_map_next(map, iter); @@ -1872,6 +1974,7 @@ UPB_INLINE void envoy_config_route_v3_Route_set_name(envoy_config_route_v3_Route } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__Tracing_msg_init); 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) { @@ -1884,6 +1987,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); 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) { @@ -1896,6 +2000,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__FilterAction_msg_init); 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) { @@ -1908,6 +2013,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__NonForwardingAction_msg_init); 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) { @@ -1995,6 +2101,7 @@ UPB_INLINE void envoy_config_route_v3_WeightedCluster_clear_clusters(envoy_confi } UPB_INLINE const envoy_config_route_v3_WeightedCluster_ClusterWeight* const* envoy_config_route_v3_WeightedCluster_clusters(const envoy_config_route_v3_WeightedCluster* msg, size_t* size) { const upb_MiniTableField field = {1, UPB_SIZE(12, 32), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__WeightedCluster__ClusterWeight_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -2006,6 +2113,7 @@ UPB_INLINE const envoy_config_route_v3_WeightedCluster_ClusterWeight* const* env } UPB_INLINE const upb_Array* _envoy_config_route_v3_WeightedCluster_clusters_upb_array(const envoy_config_route_v3_WeightedCluster* msg, size_t* size) { const upb_MiniTableField field = {1, UPB_SIZE(12, 32), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__WeightedCluster__ClusterWeight_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -2014,6 +2122,7 @@ UPB_INLINE const upb_Array* _envoy_config_route_v3_WeightedCluster_clusters_upb_ } UPB_INLINE upb_Array* _envoy_config_route_v3_WeightedCluster_clusters_mutable_upb_array(envoy_config_route_v3_WeightedCluster* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {1, UPB_SIZE(12, 32), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__WeightedCluster__ClusterWeight_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -2041,6 +2150,7 @@ UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_route_v3_Weigh const struct google_protobuf_UInt32Value* default_val = NULL; const struct google_protobuf_UInt32Value* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -2068,6 +2178,7 @@ UPB_INLINE bool envoy_config_route_v3_WeightedCluster_has_header_name(const envo UPB_INLINE envoy_config_route_v3_WeightedCluster_ClusterWeight** envoy_config_route_v3_WeightedCluster_mutable_clusters(envoy_config_route_v3_WeightedCluster* msg, size_t* size) { upb_MiniTableField field = {1, UPB_SIZE(12, 32), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__WeightedCluster__ClusterWeight_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -2084,6 +2195,7 @@ UPB_INLINE envoy_config_route_v3_WeightedCluster_ClusterWeight** envoy_config_ro } UPB_INLINE struct envoy_config_route_v3_WeightedCluster_ClusterWeight* envoy_config_route_v3_WeightedCluster_add_clusters(envoy_config_route_v3_WeightedCluster* msg, upb_Arena* arena) { upb_MiniTableField field = {1, UPB_SIZE(12, 32), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__WeightedCluster__ClusterWeight_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -2102,6 +2214,7 @@ UPB_INLINE void envoy_config_route_v3_WeightedCluster_set_runtime_key_prefix(env } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); 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) { @@ -2182,6 +2295,7 @@ UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_route_v3_Weigh const struct google_protobuf_UInt32Value* default_val = NULL; const struct google_protobuf_UInt32Value* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -2198,6 +2312,7 @@ UPB_INLINE const struct envoy_config_core_v3_Metadata* envoy_config_route_v3_Wei const struct envoy_config_core_v3_Metadata* default_val = NULL; const struct envoy_config_core_v3_Metadata* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Metadata_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -2212,6 +2327,7 @@ UPB_INLINE void envoy_config_route_v3_WeightedCluster_ClusterWeight_clear_reques } UPB_INLINE const struct envoy_config_core_v3_HeaderValueOption* const* envoy_config_route_v3_WeightedCluster_ClusterWeight_request_headers_to_add(const envoy_config_route_v3_WeightedCluster_ClusterWeight* msg, size_t* size) { const upb_MiniTableField field = {4, UPB_SIZE(20, 64), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HeaderValueOption_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -2223,6 +2339,7 @@ UPB_INLINE const struct envoy_config_core_v3_HeaderValueOption* const* envoy_con } UPB_INLINE const upb_Array* _envoy_config_route_v3_WeightedCluster_ClusterWeight_request_headers_to_add_upb_array(const envoy_config_route_v3_WeightedCluster_ClusterWeight* msg, size_t* size) { const upb_MiniTableField field = {4, UPB_SIZE(20, 64), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HeaderValueOption_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -2231,6 +2348,7 @@ UPB_INLINE const upb_Array* _envoy_config_route_v3_WeightedCluster_ClusterWeight } UPB_INLINE upb_Array* _envoy_config_route_v3_WeightedCluster_ClusterWeight_request_headers_to_add_mutable_upb_array(envoy_config_route_v3_WeightedCluster_ClusterWeight* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {4, UPB_SIZE(20, 64), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HeaderValueOption_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -2244,6 +2362,7 @@ UPB_INLINE void envoy_config_route_v3_WeightedCluster_ClusterWeight_clear_respon } UPB_INLINE const struct envoy_config_core_v3_HeaderValueOption* const* envoy_config_route_v3_WeightedCluster_ClusterWeight_response_headers_to_add(const envoy_config_route_v3_WeightedCluster_ClusterWeight* msg, size_t* size) { const upb_MiniTableField field = {5, UPB_SIZE(24, 72), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HeaderValueOption_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -2255,6 +2374,7 @@ UPB_INLINE const struct envoy_config_core_v3_HeaderValueOption* const* envoy_con } UPB_INLINE const upb_Array* _envoy_config_route_v3_WeightedCluster_ClusterWeight_response_headers_to_add_upb_array(const envoy_config_route_v3_WeightedCluster_ClusterWeight* msg, size_t* size) { const upb_MiniTableField field = {5, UPB_SIZE(24, 72), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HeaderValueOption_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -2263,6 +2383,7 @@ UPB_INLINE const upb_Array* _envoy_config_route_v3_WeightedCluster_ClusterWeight } UPB_INLINE upb_Array* _envoy_config_route_v3_WeightedCluster_ClusterWeight_response_headers_to_add_mutable_upb_array(envoy_config_route_v3_WeightedCluster_ClusterWeight* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {5, UPB_SIZE(24, 72), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HeaderValueOption_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -2345,22 +2466,30 @@ UPB_INLINE size_t envoy_config_route_v3_WeightedCluster_ClusterWeight_typed_per_ } UPB_INLINE bool envoy_config_route_v3_WeightedCluster_ClusterWeight_typed_per_filter_config_get(const envoy_config_route_v3_WeightedCluster_ClusterWeight* msg, upb_StringView key, struct google_protobuf_Any** val) { const upb_MiniTableField field = {10, UPB_SIZE(36, 96), 0, 4, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__WeightedCluster__ClusterWeight__TypedPerFilterConfigEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); 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_route_v3_WeightedCluster_ClusterWeight_TypedPerFilterConfigEntry* envoy_config_route_v3_WeightedCluster_ClusterWeight_typed_per_filter_config_next(const envoy_config_route_v3_WeightedCluster_ClusterWeight* msg, size_t* iter) { const upb_MiniTableField field = {10, UPB_SIZE(36, 96), 0, 4, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__WeightedCluster__ClusterWeight__TypedPerFilterConfigEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); const upb_Map* map = upb_Message_GetMap(UPB_UPCAST(msg), &field); if (!map) return NULL; return (const envoy_config_route_v3_WeightedCluster_ClusterWeight_TypedPerFilterConfigEntry*)_upb_map_next(map, iter); } UPB_INLINE const upb_Map* _envoy_config_route_v3_WeightedCluster_ClusterWeight_typed_per_filter_config_upb_map(envoy_config_route_v3_WeightedCluster_ClusterWeight* msg) { const upb_MiniTableField field = {10, UPB_SIZE(36, 96), 0, 4, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__WeightedCluster__ClusterWeight__TypedPerFilterConfigEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); return upb_Message_GetMap(UPB_UPCAST(msg), &field); } UPB_INLINE upb_Map* _envoy_config_route_v3_WeightedCluster_ClusterWeight_typed_per_filter_config_mutable_upb_map(envoy_config_route_v3_WeightedCluster_ClusterWeight* msg, upb_Arena* a) { const upb_MiniTableField field = {10, UPB_SIZE(36, 96), 0, 4, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__WeightedCluster__ClusterWeight__TypedPerFilterConfigEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); return _upb_Message_GetOrCreateMutableMap(UPB_UPCAST(msg), &field, 0, sizeof(struct google_protobuf_Any*), a); } UPB_INLINE void envoy_config_route_v3_WeightedCluster_ClusterWeight_clear_host_rewrite_literal(envoy_config_route_v3_WeightedCluster_ClusterWeight* msg) { @@ -2398,6 +2527,7 @@ UPB_INLINE void envoy_config_route_v3_WeightedCluster_ClusterWeight_set_name(env } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); 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) { @@ -2410,6 +2540,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Metadata_msg_init); 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) { @@ -2422,6 +2553,7 @@ UPB_INLINE struct envoy_config_core_v3_Metadata* envoy_config_route_v3_WeightedC } UPB_INLINE struct envoy_config_core_v3_HeaderValueOption** envoy_config_route_v3_WeightedCluster_ClusterWeight_mutable_request_headers_to_add(envoy_config_route_v3_WeightedCluster_ClusterWeight* msg, size_t* size) { upb_MiniTableField field = {4, UPB_SIZE(20, 64), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HeaderValueOption_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -2438,6 +2570,7 @@ UPB_INLINE struct envoy_config_core_v3_HeaderValueOption** envoy_config_route_v3 } UPB_INLINE struct envoy_config_core_v3_HeaderValueOption* envoy_config_route_v3_WeightedCluster_ClusterWeight_add_request_headers_to_add(envoy_config_route_v3_WeightedCluster_ClusterWeight* msg, upb_Arena* arena) { upb_MiniTableField field = {4, UPB_SIZE(20, 64), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HeaderValueOption_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -2452,6 +2585,7 @@ UPB_INLINE struct envoy_config_core_v3_HeaderValueOption* envoy_config_route_v3_ } UPB_INLINE struct envoy_config_core_v3_HeaderValueOption** envoy_config_route_v3_WeightedCluster_ClusterWeight_mutable_response_headers_to_add(envoy_config_route_v3_WeightedCluster_ClusterWeight* msg, size_t* size) { upb_MiniTableField field = {5, UPB_SIZE(24, 72), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HeaderValueOption_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -2468,6 +2602,7 @@ UPB_INLINE struct envoy_config_core_v3_HeaderValueOption** envoy_config_route_v3 } UPB_INLINE struct envoy_config_core_v3_HeaderValueOption* envoy_config_route_v3_WeightedCluster_ClusterWeight_add_response_headers_to_add(envoy_config_route_v3_WeightedCluster_ClusterWeight* msg, upb_Arena* arena) { upb_MiniTableField field = {5, UPB_SIZE(24, 72), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HeaderValueOption_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -2544,6 +2679,8 @@ UPB_INLINE void envoy_config_route_v3_WeightedCluster_ClusterWeight_typed_per_fi } UPB_INLINE bool envoy_config_route_v3_WeightedCluster_ClusterWeight_typed_per_filter_config_set(envoy_config_route_v3_WeightedCluster_ClusterWeight* msg, upb_StringView key, struct google_protobuf_Any* val, upb_Arena* a) { const upb_MiniTableField field = {10, UPB_SIZE(36, 96), 0, 4, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__WeightedCluster__ClusterWeight__TypedPerFilterConfigEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); 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) != @@ -2557,6 +2694,8 @@ UPB_INLINE bool envoy_config_route_v3_WeightedCluster_ClusterWeight_typed_per_fi } UPB_INLINE envoy_config_route_v3_WeightedCluster_ClusterWeight_TypedPerFilterConfigEntry* envoy_config_route_v3_WeightedCluster_ClusterWeight_typed_per_filter_config_nextmutable(envoy_config_route_v3_WeightedCluster_ClusterWeight* msg, size_t* iter) { const upb_MiniTableField field = {10, UPB_SIZE(36, 96), 0, 4, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__WeightedCluster__ClusterWeight__TypedPerFilterConfigEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); upb_Map* map = (upb_Map*)upb_Message_GetMap(UPB_UPCAST(msg), &field); if (!map) return NULL; return (envoy_config_route_v3_WeightedCluster_ClusterWeight_TypedPerFilterConfigEntry*)_upb_map_next(map, iter); @@ -2635,6 +2774,7 @@ UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_ const struct envoy_config_core_v3_TypedExtensionConfig* default_val = NULL; const struct envoy_config_core_v3_TypedExtensionConfig* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -2658,6 +2798,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); 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) { @@ -2763,6 +2904,7 @@ UPB_INLINE const struct google_protobuf_BoolValue* envoy_config_route_v3_RouteMa const struct google_protobuf_BoolValue* default_val = NULL; const struct google_protobuf_BoolValue* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -2777,6 +2919,7 @@ UPB_INLINE void envoy_config_route_v3_RouteMatch_clear_headers(envoy_config_rout } UPB_INLINE const envoy_config_route_v3_HeaderMatcher* const* envoy_config_route_v3_RouteMatch_headers(const envoy_config_route_v3_RouteMatch* msg, size_t* size) { const upb_MiniTableField field = {6, UPB_SIZE(16, 40), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__HeaderMatcher_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -2788,6 +2931,7 @@ UPB_INLINE const envoy_config_route_v3_HeaderMatcher* const* envoy_config_route_ } UPB_INLINE const upb_Array* _envoy_config_route_v3_RouteMatch_headers_upb_array(const envoy_config_route_v3_RouteMatch* msg, size_t* size) { const upb_MiniTableField field = {6, UPB_SIZE(16, 40), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__HeaderMatcher_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -2796,6 +2940,7 @@ UPB_INLINE const upb_Array* _envoy_config_route_v3_RouteMatch_headers_upb_array( } UPB_INLINE upb_Array* _envoy_config_route_v3_RouteMatch_headers_mutable_upb_array(envoy_config_route_v3_RouteMatch* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {6, UPB_SIZE(16, 40), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__HeaderMatcher_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -2809,6 +2954,7 @@ UPB_INLINE void envoy_config_route_v3_RouteMatch_clear_query_parameters(envoy_co } UPB_INLINE const envoy_config_route_v3_QueryParameterMatcher* const* envoy_config_route_v3_RouteMatch_query_parameters(const envoy_config_route_v3_RouteMatch* msg, size_t* size) { const upb_MiniTableField field = {7, UPB_SIZE(20, 48), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__QueryParameterMatcher_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -2820,6 +2966,7 @@ UPB_INLINE const envoy_config_route_v3_QueryParameterMatcher* const* envoy_confi } UPB_INLINE const upb_Array* _envoy_config_route_v3_RouteMatch_query_parameters_upb_array(const envoy_config_route_v3_RouteMatch* msg, size_t* size) { const upb_MiniTableField field = {7, UPB_SIZE(20, 48), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__QueryParameterMatcher_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -2828,6 +2975,7 @@ UPB_INLINE const upb_Array* _envoy_config_route_v3_RouteMatch_query_parameters_u } UPB_INLINE upb_Array* _envoy_config_route_v3_RouteMatch_query_parameters_mutable_upb_array(envoy_config_route_v3_RouteMatch* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {7, UPB_SIZE(20, 48), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__QueryParameterMatcher_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -2843,6 +2991,7 @@ UPB_INLINE const envoy_config_route_v3_RouteMatch_GrpcRouteMatchOptions* envoy_c const envoy_config_route_v3_RouteMatch_GrpcRouteMatchOptions* default_val = NULL; const envoy_config_route_v3_RouteMatch_GrpcRouteMatchOptions* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RouteMatch__GrpcRouteMatchOptions_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -2859,6 +3008,7 @@ UPB_INLINE const struct envoy_config_core_v3_RuntimeFractionalPercent* envoy_con 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(28, 64), 66, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__RuntimeFractionalPercent_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -2875,6 +3025,7 @@ UPB_INLINE const struct envoy_type_matcher_v3_RegexMatcher* envoy_config_route_v const struct envoy_type_matcher_v3_RegexMatcher* default_val = NULL; const struct envoy_type_matcher_v3_RegexMatcher* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__RegexMatcher_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -2891,6 +3042,7 @@ UPB_INLINE const envoy_config_route_v3_RouteMatch_TlsContextMatchOptions* envoy_ const envoy_config_route_v3_RouteMatch_TlsContextMatchOptions* default_val = NULL; const envoy_config_route_v3_RouteMatch_TlsContextMatchOptions* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RouteMatch__TlsContextMatchOptions_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -2907,6 +3059,7 @@ UPB_INLINE const envoy_config_route_v3_RouteMatch_ConnectMatcher* envoy_config_r const envoy_config_route_v3_RouteMatch_ConnectMatcher* default_val = NULL; const envoy_config_route_v3_RouteMatch_ConnectMatcher* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RouteMatch__ConnectMatcher_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -2921,6 +3074,7 @@ UPB_INLINE void envoy_config_route_v3_RouteMatch_clear_dynamic_metadata(envoy_co } UPB_INLINE const struct envoy_type_matcher_v3_MetadataMatcher* const* envoy_config_route_v3_RouteMatch_dynamic_metadata(const envoy_config_route_v3_RouteMatch* msg, size_t* size) { const upb_MiniTableField field = {13, UPB_SIZE(36, 80), 0, 8, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__MetadataMatcher_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -2932,6 +3086,7 @@ UPB_INLINE const struct envoy_type_matcher_v3_MetadataMatcher* const* envoy_conf } UPB_INLINE const upb_Array* _envoy_config_route_v3_RouteMatch_dynamic_metadata_upb_array(const envoy_config_route_v3_RouteMatch* msg, size_t* size) { const upb_MiniTableField field = {13, UPB_SIZE(36, 80), 0, 8, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__MetadataMatcher_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -2940,6 +3095,7 @@ UPB_INLINE const upb_Array* _envoy_config_route_v3_RouteMatch_dynamic_metadata_u } UPB_INLINE upb_Array* _envoy_config_route_v3_RouteMatch_dynamic_metadata_mutable_upb_array(envoy_config_route_v3_RouteMatch* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {13, UPB_SIZE(36, 80), 0, 8, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__MetadataMatcher_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -2971,6 +3127,7 @@ UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_ const struct envoy_config_core_v3_TypedExtensionConfig* default_val = NULL; const struct envoy_config_core_v3_TypedExtensionConfig* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -2990,6 +3147,7 @@ UPB_INLINE void envoy_config_route_v3_RouteMatch_set_path(envoy_config_route_v3_ } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); 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) { @@ -3002,6 +3160,7 @@ UPB_INLINE struct google_protobuf_BoolValue* envoy_config_route_v3_RouteMatch_mu } UPB_INLINE envoy_config_route_v3_HeaderMatcher** envoy_config_route_v3_RouteMatch_mutable_headers(envoy_config_route_v3_RouteMatch* msg, size_t* size) { upb_MiniTableField field = {6, UPB_SIZE(16, 40), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__HeaderMatcher_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -3018,6 +3177,7 @@ UPB_INLINE envoy_config_route_v3_HeaderMatcher** envoy_config_route_v3_RouteMatc } UPB_INLINE struct envoy_config_route_v3_HeaderMatcher* envoy_config_route_v3_RouteMatch_add_headers(envoy_config_route_v3_RouteMatch* msg, upb_Arena* arena) { upb_MiniTableField field = {6, UPB_SIZE(16, 40), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__HeaderMatcher_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -3032,6 +3192,7 @@ UPB_INLINE struct envoy_config_route_v3_HeaderMatcher* envoy_config_route_v3_Rou } UPB_INLINE envoy_config_route_v3_QueryParameterMatcher** envoy_config_route_v3_RouteMatch_mutable_query_parameters(envoy_config_route_v3_RouteMatch* msg, size_t* size) { upb_MiniTableField field = {7, UPB_SIZE(20, 48), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__QueryParameterMatcher_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -3048,6 +3209,7 @@ UPB_INLINE envoy_config_route_v3_QueryParameterMatcher** envoy_config_route_v3_R } UPB_INLINE struct envoy_config_route_v3_QueryParameterMatcher* envoy_config_route_v3_RouteMatch_add_query_parameters(envoy_config_route_v3_RouteMatch* msg, upb_Arena* arena) { upb_MiniTableField field = {7, UPB_SIZE(20, 48), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__QueryParameterMatcher_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -3062,6 +3224,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RouteMatch__GrpcRouteMatchOptions_msg_init); 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) { @@ -3074,6 +3237,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__RuntimeFractionalPercent_msg_init); 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) { @@ -3086,6 +3250,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__RegexMatcher_msg_init); 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) { @@ -3098,6 +3263,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RouteMatch__TlsContextMatchOptions_msg_init); 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) { @@ -3110,6 +3276,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RouteMatch__ConnectMatcher_msg_init); 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) { @@ -3122,6 +3289,7 @@ UPB_INLINE struct envoy_config_route_v3_RouteMatch_ConnectMatcher* envoy_config_ } UPB_INLINE struct envoy_type_matcher_v3_MetadataMatcher** envoy_config_route_v3_RouteMatch_mutable_dynamic_metadata(envoy_config_route_v3_RouteMatch* msg, size_t* size) { upb_MiniTableField field = {13, UPB_SIZE(36, 80), 0, 8, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__MetadataMatcher_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -3138,6 +3306,7 @@ UPB_INLINE struct envoy_type_matcher_v3_MetadataMatcher** envoy_config_route_v3_ } UPB_INLINE struct envoy_type_matcher_v3_MetadataMatcher* envoy_config_route_v3_RouteMatch_add_dynamic_metadata(envoy_config_route_v3_RouteMatch* msg, upb_Arena* arena) { upb_MiniTableField field = {13, UPB_SIZE(36, 80), 0, 8, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__MetadataMatcher_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -3156,6 +3325,7 @@ UPB_INLINE void envoy_config_route_v3_RouteMatch_set_path_separated_prefix(envoy } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); 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) { @@ -3249,6 +3419,7 @@ UPB_INLINE const struct google_protobuf_BoolValue* envoy_config_route_v3_RouteMa const struct google_protobuf_BoolValue* default_val = NULL; const struct google_protobuf_BoolValue* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -3265,6 +3436,7 @@ UPB_INLINE const struct google_protobuf_BoolValue* envoy_config_route_v3_RouteMa const struct google_protobuf_BoolValue* default_val = NULL; const struct google_protobuf_BoolValue* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -3276,6 +3448,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); 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) { @@ -3288,6 +3461,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); 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) { @@ -3438,6 +3612,7 @@ UPB_INLINE const struct google_protobuf_BoolValue* envoy_config_route_v3_CorsPol const struct google_protobuf_BoolValue* default_val = NULL; const struct google_protobuf_BoolValue* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -3454,6 +3629,7 @@ UPB_INLINE const struct envoy_config_core_v3_RuntimeFractionalPercent* envoy_con 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(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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__RuntimeFractionalPercent_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -3470,6 +3646,7 @@ UPB_INLINE const struct envoy_config_core_v3_RuntimeFractionalPercent* envoy_con const struct envoy_config_core_v3_RuntimeFractionalPercent* default_val = NULL; const struct envoy_config_core_v3_RuntimeFractionalPercent* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__RuntimeFractionalPercent_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -3484,6 +3661,7 @@ UPB_INLINE void envoy_config_route_v3_CorsPolicy_clear_allow_origin_string_match } UPB_INLINE const struct envoy_type_matcher_v3_StringMatcher* const* envoy_config_route_v3_CorsPolicy_allow_origin_string_match(const envoy_config_route_v3_CorsPolicy* msg, size_t* size) { const upb_MiniTableField field = {11, UPB_SIZE(24, 96), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__StringMatcher_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -3495,6 +3673,7 @@ UPB_INLINE const struct envoy_type_matcher_v3_StringMatcher* const* envoy_config } UPB_INLINE const upb_Array* _envoy_config_route_v3_CorsPolicy_allow_origin_string_match_upb_array(const envoy_config_route_v3_CorsPolicy* msg, size_t* size) { const upb_MiniTableField field = {11, UPB_SIZE(24, 96), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__StringMatcher_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -3503,6 +3682,7 @@ UPB_INLINE const upb_Array* _envoy_config_route_v3_CorsPolicy_allow_origin_strin } UPB_INLINE upb_Array* _envoy_config_route_v3_CorsPolicy_allow_origin_string_match_mutable_upb_array(envoy_config_route_v3_CorsPolicy* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {11, UPB_SIZE(24, 96), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__StringMatcher_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -3518,6 +3698,7 @@ UPB_INLINE const struct google_protobuf_BoolValue* envoy_config_route_v3_CorsPol const struct google_protobuf_BoolValue* default_val = NULL; const struct google_protobuf_BoolValue* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -3534,6 +3715,7 @@ UPB_INLINE const struct google_protobuf_BoolValue* envoy_config_route_v3_CorsPol 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -3561,6 +3743,7 @@ UPB_INLINE void envoy_config_route_v3_CorsPolicy_set_max_age(envoy_config_route_ } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); 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) { @@ -3573,6 +3756,7 @@ UPB_INLINE struct google_protobuf_BoolValue* envoy_config_route_v3_CorsPolicy_mu } 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(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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__RuntimeFractionalPercent_msg_init); 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) { @@ -3585,6 +3769,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__RuntimeFractionalPercent_msg_init); 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) { @@ -3597,6 +3782,7 @@ UPB_INLINE struct envoy_config_core_v3_RuntimeFractionalPercent* envoy_config_ro } UPB_INLINE struct envoy_type_matcher_v3_StringMatcher** envoy_config_route_v3_CorsPolicy_mutable_allow_origin_string_match(envoy_config_route_v3_CorsPolicy* msg, size_t* size) { upb_MiniTableField field = {11, UPB_SIZE(24, 96), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__StringMatcher_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -3613,6 +3799,7 @@ UPB_INLINE struct envoy_type_matcher_v3_StringMatcher** envoy_config_route_v3_Co } UPB_INLINE struct envoy_type_matcher_v3_StringMatcher* envoy_config_route_v3_CorsPolicy_add_allow_origin_string_match(envoy_config_route_v3_CorsPolicy* msg, upb_Arena* arena) { upb_MiniTableField field = {11, UPB_SIZE(24, 96), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__StringMatcher_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -3627,6 +3814,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); 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) { @@ -3639,6 +3827,7 @@ UPB_INLINE struct google_protobuf_BoolValue* envoy_config_route_v3_CorsPolicy_mu } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); 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) { @@ -3751,6 +3940,7 @@ UPB_INLINE const envoy_config_route_v3_WeightedCluster* envoy_config_route_v3_Ro const envoy_config_route_v3_WeightedCluster* default_val = NULL; const envoy_config_route_v3_WeightedCluster* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__WeightedCluster_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -3767,6 +3957,7 @@ UPB_INLINE const struct envoy_config_core_v3_Metadata* envoy_config_route_v3_Rou const struct envoy_config_core_v3_Metadata* default_val = NULL; const struct envoy_config_core_v3_Metadata* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Metadata_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -3811,6 +4002,7 @@ UPB_INLINE const struct google_protobuf_BoolValue* envoy_config_route_v3_RouteAc const struct google_protobuf_BoolValue* default_val = NULL; const struct google_protobuf_BoolValue* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -3827,6 +4019,7 @@ UPB_INLINE const struct google_protobuf_Duration* envoy_config_route_v3_RouteAct const struct google_protobuf_Duration* default_val = NULL; const struct google_protobuf_Duration* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -3843,6 +4036,7 @@ UPB_INLINE const envoy_config_route_v3_RetryPolicy* envoy_config_route_v3_RouteA const envoy_config_route_v3_RetryPolicy* default_val = NULL; const envoy_config_route_v3_RetryPolicy* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RetryPolicy_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -3869,6 +4063,7 @@ UPB_INLINE void envoy_config_route_v3_RouteAction_clear_rate_limits(envoy_config } UPB_INLINE const envoy_config_route_v3_RateLimit* const* envoy_config_route_v3_RouteAction_rate_limits(const envoy_config_route_v3_RouteAction* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RateLimit_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -3880,6 +4075,7 @@ UPB_INLINE const envoy_config_route_v3_RateLimit* const* envoy_config_route_v3_R } UPB_INLINE const upb_Array* _envoy_config_route_v3_RouteAction_rate_limits_upb_array(const envoy_config_route_v3_RouteAction* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RateLimit_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -3888,6 +4084,7 @@ UPB_INLINE const upb_Array* _envoy_config_route_v3_RouteAction_rate_limits_upb_a } UPB_INLINE upb_Array* _envoy_config_route_v3_RouteAction_rate_limits_mutable_upb_array(envoy_config_route_v3_RouteAction* msg, size_t* size, upb_Arena* arena) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RateLimit_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -3903,6 +4100,7 @@ UPB_INLINE const struct google_protobuf_BoolValue* envoy_config_route_v3_RouteAc const struct google_protobuf_BoolValue* default_val = NULL; const struct google_protobuf_BoolValue* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -3917,6 +4115,7 @@ UPB_INLINE void envoy_config_route_v3_RouteAction_clear_hash_policy(envoy_config } UPB_INLINE const envoy_config_route_v3_RouteAction_HashPolicy* const* envoy_config_route_v3_RouteAction_hash_policy(const envoy_config_route_v3_RouteAction* msg, size_t* size) { const upb_MiniTableField field = {15, UPB_SIZE(36, 128), 0, 7, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RouteAction__HashPolicy_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -3928,6 +4127,7 @@ UPB_INLINE const envoy_config_route_v3_RouteAction_HashPolicy* const* envoy_conf } UPB_INLINE const upb_Array* _envoy_config_route_v3_RouteAction_hash_policy_upb_array(const envoy_config_route_v3_RouteAction* msg, size_t* size) { const upb_MiniTableField field = {15, UPB_SIZE(36, 128), 0, 7, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RouteAction__HashPolicy_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -3936,6 +4136,7 @@ UPB_INLINE const upb_Array* _envoy_config_route_v3_RouteAction_hash_policy_upb_a } UPB_INLINE upb_Array* _envoy_config_route_v3_RouteAction_hash_policy_mutable_upb_array(envoy_config_route_v3_RouteAction* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {15, UPB_SIZE(36, 128), 0, 7, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RouteAction__HashPolicy_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -3951,6 +4152,7 @@ UPB_INLINE const envoy_config_route_v3_CorsPolicy* envoy_config_route_v3_RouteAc const envoy_config_route_v3_CorsPolicy* default_val = NULL; const envoy_config_route_v3_CorsPolicy* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__CorsPolicy_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -3979,6 +4181,7 @@ UPB_INLINE const struct google_protobuf_Duration* envoy_config_route_v3_RouteAct const struct google_protobuf_Duration* default_val = NULL; const struct google_protobuf_Duration* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -3995,6 +4198,7 @@ UPB_INLINE const struct google_protobuf_Duration* envoy_config_route_v3_RouteAct const struct google_protobuf_Duration* default_val = NULL; const struct google_protobuf_Duration* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -4009,6 +4213,7 @@ UPB_INLINE void envoy_config_route_v3_RouteAction_clear_upgrade_configs(envoy_co } UPB_INLINE const envoy_config_route_v3_RouteAction_UpgradeConfig* const* envoy_config_route_v3_RouteAction_upgrade_configs(const envoy_config_route_v3_RouteAction* msg, size_t* size) { const upb_MiniTableField field = {25, UPB_SIZE(56, 160), 0, 11, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RouteAction__UpgradeConfig_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -4020,6 +4225,7 @@ UPB_INLINE const envoy_config_route_v3_RouteAction_UpgradeConfig* const* envoy_c } UPB_INLINE const upb_Array* _envoy_config_route_v3_RouteAction_upgrade_configs_upb_array(const envoy_config_route_v3_RouteAction* msg, size_t* size) { const upb_MiniTableField field = {25, UPB_SIZE(56, 160), 0, 11, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RouteAction__UpgradeConfig_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -4028,6 +4234,7 @@ UPB_INLINE const upb_Array* _envoy_config_route_v3_RouteAction_upgrade_configs_u } UPB_INLINE upb_Array* _envoy_config_route_v3_RouteAction_upgrade_configs_mutable_upb_array(envoy_config_route_v3_RouteAction* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {25, UPB_SIZE(56, 160), 0, 11, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RouteAction__UpgradeConfig_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -4055,6 +4262,7 @@ UPB_INLINE const envoy_config_route_v3_HedgePolicy* envoy_config_route_v3_RouteA const envoy_config_route_v3_HedgePolicy* default_val = NULL; const envoy_config_route_v3_HedgePolicy* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__HedgePolicy_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -4071,6 +4279,7 @@ UPB_INLINE const struct google_protobuf_Duration* envoy_config_route_v3_RouteAct const struct google_protobuf_Duration* default_val = NULL; const struct google_protobuf_Duration* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -4101,6 +4310,7 @@ UPB_INLINE void envoy_config_route_v3_RouteAction_clear_request_mirror_policies( } UPB_INLINE const envoy_config_route_v3_RouteAction_RequestMirrorPolicy* const* envoy_config_route_v3_RouteAction_request_mirror_policies(const envoy_config_route_v3_RouteAction* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RouteAction__RequestMirrorPolicy_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -4112,6 +4322,7 @@ UPB_INLINE const envoy_config_route_v3_RouteAction_RequestMirrorPolicy* const* e } UPB_INLINE const upb_Array* _envoy_config_route_v3_RouteAction_request_mirror_policies_upb_array(const envoy_config_route_v3_RouteAction* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RouteAction__RequestMirrorPolicy_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -4120,6 +4331,7 @@ UPB_INLINE const upb_Array* _envoy_config_route_v3_RouteAction_request_mirror_po } UPB_INLINE upb_Array* _envoy_config_route_v3_RouteAction_request_mirror_policies_mutable_upb_array(envoy_config_route_v3_RouteAction* msg, size_t* size, upb_Arena* arena) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RouteAction__RequestMirrorPolicy_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -4135,6 +4347,7 @@ UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_route_v3_Route const struct google_protobuf_UInt32Value* default_val = NULL; const struct google_protobuf_UInt32Value* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -4151,6 +4364,7 @@ UPB_INLINE const struct envoy_type_matcher_v3_RegexMatchAndSubstitute* envoy_con const struct envoy_type_matcher_v3_RegexMatchAndSubstitute* default_val = NULL; const struct envoy_type_matcher_v3_RegexMatchAndSubstitute* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__RegexMatchAndSubstitute_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -4167,6 +4381,7 @@ UPB_INLINE const struct google_protobuf_Any* envoy_config_route_v3_RouteAction_r const struct google_protobuf_Any* default_val = NULL; const struct google_protobuf_Any* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -4183,6 +4398,7 @@ UPB_INLINE const envoy_config_route_v3_InternalRedirectPolicy* envoy_config_rout const envoy_config_route_v3_InternalRedirectPolicy* default_val = NULL; const envoy_config_route_v3_InternalRedirectPolicy* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__InternalRedirectPolicy_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -4199,6 +4415,7 @@ UPB_INLINE const struct envoy_type_matcher_v3_RegexMatchAndSubstitute* envoy_con const struct envoy_type_matcher_v3_RegexMatchAndSubstitute* default_val = NULL; const struct envoy_type_matcher_v3_RegexMatchAndSubstitute* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__RegexMatchAndSubstitute_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -4215,6 +4432,7 @@ UPB_INLINE const envoy_config_route_v3_RouteAction_MaxStreamDuration* envoy_conf const envoy_config_route_v3_RouteAction_MaxStreamDuration* default_val = NULL; const envoy_config_route_v3_RouteAction_MaxStreamDuration* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RouteAction__MaxStreamDuration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -4259,6 +4477,7 @@ UPB_INLINE const envoy_config_route_v3_ClusterSpecifierPlugin* envoy_config_rout const envoy_config_route_v3_ClusterSpecifierPlugin* default_val = NULL; const envoy_config_route_v3_ClusterSpecifierPlugin* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__ClusterSpecifierPlugin_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -4275,6 +4494,7 @@ UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_ const struct envoy_config_core_v3_TypedExtensionConfig* default_val = NULL; const struct envoy_config_core_v3_TypedExtensionConfig* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -4291,6 +4511,7 @@ UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_ const struct envoy_config_core_v3_TypedExtensionConfig* default_val = NULL; const struct envoy_config_core_v3_TypedExtensionConfig* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -4310,6 +4531,7 @@ UPB_INLINE void envoy_config_route_v3_RouteAction_set_cluster_header(envoy_confi } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__WeightedCluster_msg_init); 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) { @@ -4322,6 +4544,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Metadata_msg_init); 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) { @@ -4342,6 +4565,7 @@ UPB_INLINE void envoy_config_route_v3_RouteAction_set_host_rewrite_literal(envoy } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); 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) { @@ -4354,6 +4578,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { @@ -4366,6 +4591,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RetryPolicy_msg_init); 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) { @@ -4382,6 +4608,7 @@ UPB_INLINE void envoy_config_route_v3_RouteAction_set_priority(envoy_config_rout } 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RateLimit_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -4398,6 +4625,7 @@ UPB_INLINE envoy_config_route_v3_RateLimit** envoy_config_route_v3_RouteAction_r } UPB_INLINE struct envoy_config_route_v3_RateLimit* envoy_config_route_v3_RouteAction_add_rate_limits(envoy_config_route_v3_RouteAction* msg, upb_Arena* arena) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RateLimit_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -4412,6 +4640,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); 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) { @@ -4424,6 +4653,7 @@ UPB_INLINE struct google_protobuf_BoolValue* envoy_config_route_v3_RouteAction_m } UPB_INLINE envoy_config_route_v3_RouteAction_HashPolicy** envoy_config_route_v3_RouteAction_mutable_hash_policy(envoy_config_route_v3_RouteAction* msg, size_t* size) { upb_MiniTableField field = {15, UPB_SIZE(36, 128), 0, 7, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RouteAction__HashPolicy_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -4440,6 +4670,7 @@ UPB_INLINE envoy_config_route_v3_RouteAction_HashPolicy** envoy_config_route_v3_ } UPB_INLINE struct envoy_config_route_v3_RouteAction_HashPolicy* envoy_config_route_v3_RouteAction_add_hash_policy(envoy_config_route_v3_RouteAction* msg, upb_Arena* arena) { upb_MiniTableField field = {15, UPB_SIZE(36, 128), 0, 7, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RouteAction__HashPolicy_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -4454,6 +4685,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__CorsPolicy_msg_init); 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) { @@ -4470,6 +4702,7 @@ UPB_INLINE void envoy_config_route_v3_RouteAction_set_cluster_not_found_response } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { @@ -4482,6 +4715,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { @@ -4494,6 +4728,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_route_v3_RouteAction_mu } UPB_INLINE envoy_config_route_v3_RouteAction_UpgradeConfig** envoy_config_route_v3_RouteAction_mutable_upgrade_configs(envoy_config_route_v3_RouteAction* msg, size_t* size) { upb_MiniTableField field = {25, UPB_SIZE(56, 160), 0, 11, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RouteAction__UpgradeConfig_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -4510,6 +4745,7 @@ UPB_INLINE envoy_config_route_v3_RouteAction_UpgradeConfig** envoy_config_route_ } UPB_INLINE struct envoy_config_route_v3_RouteAction_UpgradeConfig* envoy_config_route_v3_RouteAction_add_upgrade_configs(envoy_config_route_v3_RouteAction* msg, upb_Arena* arena) { upb_MiniTableField field = {25, UPB_SIZE(56, 160), 0, 11, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RouteAction__UpgradeConfig_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -4528,6 +4764,7 @@ UPB_INLINE void envoy_config_route_v3_RouteAction_set_internal_redirect_action(e } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__HedgePolicy_msg_init); 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) { @@ -4540,6 +4777,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { @@ -4556,6 +4794,7 @@ UPB_INLINE void envoy_config_route_v3_RouteAction_set_host_rewrite_header(envoy_ } 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RouteAction__RequestMirrorPolicy_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -4572,6 +4811,7 @@ UPB_INLINE envoy_config_route_v3_RouteAction_RequestMirrorPolicy** envoy_config_ } UPB_INLINE struct envoy_config_route_v3_RouteAction_RequestMirrorPolicy* envoy_config_route_v3_RouteAction_add_request_mirror_policies(envoy_config_route_v3_RouteAction* msg, upb_Arena* arena) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RouteAction__RequestMirrorPolicy_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -4586,6 +4826,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); 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) { @@ -4598,6 +4839,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__RegexMatchAndSubstitute_msg_init); 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) { @@ -4610,6 +4852,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); 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) { @@ -4622,6 +4865,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__InternalRedirectPolicy_msg_init); 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) { @@ -4634,6 +4878,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__RegexMatchAndSubstitute_msg_init); 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) { @@ -4646,6 +4891,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RouteAction__MaxStreamDuration_msg_init); 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) { @@ -4666,6 +4912,7 @@ UPB_INLINE void envoy_config_route_v3_RouteAction_set_append_x_forwarded_host(en } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__ClusterSpecifierPlugin_msg_init); 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) { @@ -4678,6 +4925,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); 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) { @@ -4690,6 +4938,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); 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) { @@ -4757,6 +5006,7 @@ UPB_INLINE const struct envoy_config_core_v3_RuntimeFractionalPercent* envoy_con const struct envoy_config_core_v3_RuntimeFractionalPercent* default_val = NULL; const struct envoy_config_core_v3_RuntimeFractionalPercent* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__RuntimeFractionalPercent_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -4773,6 +5023,7 @@ UPB_INLINE const struct google_protobuf_BoolValue* envoy_config_route_v3_RouteAc const struct google_protobuf_BoolValue* default_val = NULL; const struct google_protobuf_BoolValue* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -4812,6 +5063,7 @@ UPB_INLINE void envoy_config_route_v3_RouteAction_RequestMirrorPolicy_set_cluste } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__RuntimeFractionalPercent_msg_init); 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) { @@ -4824,6 +5076,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); 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) { @@ -4900,6 +5153,7 @@ UPB_INLINE const envoy_config_route_v3_RouteAction_HashPolicy_Header* envoy_conf const envoy_config_route_v3_RouteAction_HashPolicy_Header* default_val = NULL; const envoy_config_route_v3_RouteAction_HashPolicy_Header* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RouteAction__HashPolicy__Header_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -4916,6 +5170,7 @@ UPB_INLINE const envoy_config_route_v3_RouteAction_HashPolicy_Cookie* envoy_conf const envoy_config_route_v3_RouteAction_HashPolicy_Cookie* default_val = NULL; const envoy_config_route_v3_RouteAction_HashPolicy_Cookie* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RouteAction__HashPolicy__Cookie_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -4932,6 +5187,7 @@ UPB_INLINE const envoy_config_route_v3_RouteAction_HashPolicy_ConnectionProperti const envoy_config_route_v3_RouteAction_HashPolicy_ConnectionProperties* default_val = NULL; const envoy_config_route_v3_RouteAction_HashPolicy_ConnectionProperties* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RouteAction__HashPolicy__ConnectionProperties_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -4960,6 +5216,7 @@ UPB_INLINE const envoy_config_route_v3_RouteAction_HashPolicy_QueryParameter* en const envoy_config_route_v3_RouteAction_HashPolicy_QueryParameter* default_val = NULL; const envoy_config_route_v3_RouteAction_HashPolicy_QueryParameter* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RouteAction__HashPolicy__QueryParameter_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -4976,6 +5233,7 @@ UPB_INLINE const envoy_config_route_v3_RouteAction_HashPolicy_FilterState* envoy const envoy_config_route_v3_RouteAction_HashPolicy_FilterState* default_val = NULL; const envoy_config_route_v3_RouteAction_HashPolicy_FilterState* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RouteAction__HashPolicy__FilterState_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -4987,6 +5245,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RouteAction__HashPolicy__Header_msg_init); 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) { @@ -4999,6 +5258,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RouteAction__HashPolicy__Cookie_msg_init); 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) { @@ -5011,6 +5271,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RouteAction__HashPolicy__ConnectionProperties_msg_init); 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) { @@ -5027,6 +5288,7 @@ UPB_INLINE void envoy_config_route_v3_RouteAction_HashPolicy_set_terminal(envoy_ } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RouteAction__HashPolicy__QueryParameter_msg_init); 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) { @@ -5039,6 +5301,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RouteAction__HashPolicy__FilterState_msg_init); 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) { @@ -5106,6 +5369,7 @@ UPB_INLINE const struct envoy_type_matcher_v3_RegexMatchAndSubstitute* envoy_con const struct envoy_type_matcher_v3_RegexMatchAndSubstitute* default_val = NULL; const struct envoy_type_matcher_v3_RegexMatchAndSubstitute* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__RegexMatchAndSubstitute_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -5121,6 +5385,7 @@ UPB_INLINE void envoy_config_route_v3_RouteAction_HashPolicy_Header_set_header_n } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__RegexMatchAndSubstitute_msg_init); 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) { @@ -5258,6 +5523,7 @@ UPB_INLINE const struct google_protobuf_Duration* envoy_config_route_v3_RouteAct const struct google_protobuf_Duration* default_val = NULL; const struct google_protobuf_Duration* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -5284,6 +5550,7 @@ UPB_INLINE void envoy_config_route_v3_RouteAction_HashPolicy_Cookie_clear_attrib } UPB_INLINE const envoy_config_route_v3_RouteAction_HashPolicy_CookieAttribute* const* envoy_config_route_v3_RouteAction_HashPolicy_Cookie_attributes(const envoy_config_route_v3_RouteAction_HashPolicy_Cookie* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RouteAction__HashPolicy__CookieAttribute_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -5295,6 +5562,7 @@ UPB_INLINE const envoy_config_route_v3_RouteAction_HashPolicy_CookieAttribute* c } UPB_INLINE const upb_Array* _envoy_config_route_v3_RouteAction_HashPolicy_Cookie_attributes_upb_array(const envoy_config_route_v3_RouteAction_HashPolicy_Cookie* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RouteAction__HashPolicy__CookieAttribute_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -5303,6 +5571,7 @@ UPB_INLINE const upb_Array* _envoy_config_route_v3_RouteAction_HashPolicy_Cookie } UPB_INLINE upb_Array* _envoy_config_route_v3_RouteAction_HashPolicy_Cookie_attributes_mutable_upb_array(envoy_config_route_v3_RouteAction_HashPolicy_Cookie* msg, size_t* size, upb_Arena* arena) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RouteAction__HashPolicy__CookieAttribute_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -5317,6 +5586,7 @@ UPB_INLINE void envoy_config_route_v3_RouteAction_HashPolicy_Cookie_set_name(env } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { @@ -5333,6 +5603,7 @@ UPB_INLINE void envoy_config_route_v3_RouteAction_HashPolicy_Cookie_set_path(env } 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RouteAction__HashPolicy__CookieAttribute_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -5349,6 +5620,7 @@ UPB_INLINE envoy_config_route_v3_RouteAction_HashPolicy_CookieAttribute** envoy_ } UPB_INLINE struct envoy_config_route_v3_RouteAction_HashPolicy_CookieAttribute* envoy_config_route_v3_RouteAction_HashPolicy_Cookie_add_attributes(envoy_config_route_v3_RouteAction_HashPolicy_Cookie* msg, upb_Arena* arena) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RouteAction__HashPolicy__CookieAttribute_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -5580,6 +5852,7 @@ UPB_INLINE const struct google_protobuf_BoolValue* envoy_config_route_v3_RouteAc const struct google_protobuf_BoolValue* default_val = NULL; const struct google_protobuf_BoolValue* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -5596,6 +5869,7 @@ UPB_INLINE const envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig* const envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig* default_val = NULL; const envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RouteAction__UpgradeConfig__ConnectConfig_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -5611,6 +5885,7 @@ UPB_INLINE void envoy_config_route_v3_RouteAction_UpgradeConfig_set_upgrade_type } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); 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) { @@ -5623,6 +5898,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RouteAction__UpgradeConfig__ConnectConfig_msg_init); 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) { @@ -5678,6 +5954,7 @@ UPB_INLINE const struct envoy_config_core_v3_ProxyProtocolConfig* envoy_config_r const struct envoy_config_core_v3_ProxyProtocolConfig* default_val = NULL; const struct envoy_config_core_v3_ProxyProtocolConfig* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__ProxyProtocolConfig_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -5701,6 +5978,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__ProxyProtocolConfig_msg_init); 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) { @@ -5760,6 +6038,7 @@ UPB_INLINE const struct google_protobuf_Duration* envoy_config_route_v3_RouteAct 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -5776,6 +6055,7 @@ UPB_INLINE const struct google_protobuf_Duration* envoy_config_route_v3_RouteAct const struct google_protobuf_Duration* default_val = NULL; const struct google_protobuf_Duration* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -5792,6 +6072,7 @@ UPB_INLINE const struct google_protobuf_Duration* envoy_config_route_v3_RouteAct const struct google_protobuf_Duration* default_val = NULL; const struct google_protobuf_Duration* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -5803,6 +6084,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { @@ -5815,6 +6097,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { @@ -5827,6 +6110,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { @@ -5894,6 +6178,7 @@ UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_route_v3_Retry const struct google_protobuf_UInt32Value* default_val = NULL; const struct google_protobuf_UInt32Value* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -5910,6 +6195,7 @@ UPB_INLINE const struct google_protobuf_Duration* envoy_config_route_v3_RetryPol const struct google_protobuf_Duration* default_val = NULL; const struct google_protobuf_Duration* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -5926,6 +6212,7 @@ UPB_INLINE const envoy_config_route_v3_RetryPolicy_RetryPriority* envoy_config_r const envoy_config_route_v3_RetryPolicy_RetryPriority* default_val = NULL; const envoy_config_route_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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RetryPolicy__RetryPriority_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -5940,6 +6227,7 @@ UPB_INLINE void envoy_config_route_v3_RetryPolicy_clear_retry_host_predicate(env } UPB_INLINE const envoy_config_route_v3_RetryPolicy_RetryHostPredicate* const* envoy_config_route_v3_RetryPolicy_retry_host_predicate(const envoy_config_route_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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RetryPolicy__RetryHostPredicate_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -5951,6 +6239,7 @@ UPB_INLINE const envoy_config_route_v3_RetryPolicy_RetryHostPredicate* const* en } UPB_INLINE const upb_Array* _envoy_config_route_v3_RetryPolicy_retry_host_predicate_upb_array(const envoy_config_route_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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RetryPolicy__RetryHostPredicate_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -5959,6 +6248,7 @@ UPB_INLINE const upb_Array* _envoy_config_route_v3_RetryPolicy_retry_host_predic } UPB_INLINE upb_Array* _envoy_config_route_v3_RetryPolicy_retry_host_predicate_mutable_upb_array(envoy_config_route_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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RetryPolicy__RetryHostPredicate_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -6018,6 +6308,7 @@ UPB_INLINE const envoy_config_route_v3_RetryPolicy_RetryBackOff* envoy_config_ro const envoy_config_route_v3_RetryPolicy_RetryBackOff* default_val = NULL; const envoy_config_route_v3_RetryPolicy_RetryBackOff* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RetryPolicy__RetryBackOff_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -6032,6 +6323,7 @@ UPB_INLINE void envoy_config_route_v3_RetryPolicy_clear_retriable_headers(envoy_ } UPB_INLINE const envoy_config_route_v3_HeaderMatcher* const* envoy_config_route_v3_RetryPolicy_retriable_headers(const envoy_config_route_v3_RetryPolicy* msg, size_t* size) { const upb_MiniTableField field = {9, UPB_SIZE(36, 88), 0, 5, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__HeaderMatcher_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -6043,6 +6335,7 @@ UPB_INLINE const envoy_config_route_v3_HeaderMatcher* const* envoy_config_route_ } UPB_INLINE const upb_Array* _envoy_config_route_v3_RetryPolicy_retriable_headers_upb_array(const envoy_config_route_v3_RetryPolicy* msg, size_t* size) { const upb_MiniTableField field = {9, UPB_SIZE(36, 88), 0, 5, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__HeaderMatcher_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -6051,6 +6344,7 @@ UPB_INLINE const upb_Array* _envoy_config_route_v3_RetryPolicy_retriable_headers } UPB_INLINE upb_Array* _envoy_config_route_v3_RetryPolicy_retriable_headers_mutable_upb_array(envoy_config_route_v3_RetryPolicy* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {9, UPB_SIZE(36, 88), 0, 5, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__HeaderMatcher_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -6064,6 +6358,7 @@ UPB_INLINE void envoy_config_route_v3_RetryPolicy_clear_retriable_request_header } UPB_INLINE const envoy_config_route_v3_HeaderMatcher* const* envoy_config_route_v3_RetryPolicy_retriable_request_headers(const envoy_config_route_v3_RetryPolicy* msg, size_t* size) { const upb_MiniTableField field = {10, UPB_SIZE(40, 96), 0, 6, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__HeaderMatcher_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -6075,6 +6370,7 @@ UPB_INLINE const envoy_config_route_v3_HeaderMatcher* const* envoy_config_route_ } UPB_INLINE const upb_Array* _envoy_config_route_v3_RetryPolicy_retriable_request_headers_upb_array(const envoy_config_route_v3_RetryPolicy* msg, size_t* size) { const upb_MiniTableField field = {10, UPB_SIZE(40, 96), 0, 6, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__HeaderMatcher_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -6083,6 +6379,7 @@ UPB_INLINE const upb_Array* _envoy_config_route_v3_RetryPolicy_retriable_request } UPB_INLINE upb_Array* _envoy_config_route_v3_RetryPolicy_retriable_request_headers_mutable_upb_array(envoy_config_route_v3_RetryPolicy* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {10, UPB_SIZE(40, 96), 0, 6, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__HeaderMatcher_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -6098,6 +6395,7 @@ UPB_INLINE const envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff* envo const envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff* default_val = NULL; const envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RetryPolicy__RateLimitedRetryBackOff_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -6112,6 +6410,7 @@ UPB_INLINE void envoy_config_route_v3_RetryPolicy_clear_retry_options_predicates } UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* const* envoy_config_route_v3_RetryPolicy_retry_options_predicates(const envoy_config_route_v3_RetryPolicy* msg, size_t* size) { const upb_MiniTableField field = {12, UPB_SIZE(48, 112), 0, 8, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -6123,6 +6422,7 @@ UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* const* envoy_ } UPB_INLINE const upb_Array* _envoy_config_route_v3_RetryPolicy_retry_options_predicates_upb_array(const envoy_config_route_v3_RetryPolicy* msg, size_t* size) { const upb_MiniTableField field = {12, UPB_SIZE(48, 112), 0, 8, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -6131,6 +6431,7 @@ UPB_INLINE const upb_Array* _envoy_config_route_v3_RetryPolicy_retry_options_pre } UPB_INLINE upb_Array* _envoy_config_route_v3_RetryPolicy_retry_options_predicates_mutable_upb_array(envoy_config_route_v3_RetryPolicy* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {12, UPB_SIZE(48, 112), 0, 8, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -6146,6 +6447,7 @@ UPB_INLINE const struct google_protobuf_Duration* envoy_config_route_v3_RetryPol const struct google_protobuf_Duration* default_val = NULL; const struct google_protobuf_Duration* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -6161,6 +6463,7 @@ UPB_INLINE void envoy_config_route_v3_RetryPolicy_set_retry_on(envoy_config_rout } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); 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) { @@ -6173,6 +6476,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { @@ -6185,6 +6489,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RetryPolicy__RetryPriority_msg_init); 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) { @@ -6197,6 +6502,7 @@ UPB_INLINE struct envoy_config_route_v3_RetryPolicy_RetryPriority* envoy_config_ } UPB_INLINE envoy_config_route_v3_RetryPolicy_RetryHostPredicate** envoy_config_route_v3_RetryPolicy_mutable_retry_host_predicate(envoy_config_route_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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RetryPolicy__RetryHostPredicate_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -6213,6 +6519,7 @@ UPB_INLINE envoy_config_route_v3_RetryPolicy_RetryHostPredicate** envoy_config_r } UPB_INLINE struct envoy_config_route_v3_RetryPolicy_RetryHostPredicate* envoy_config_route_v3_RetryPolicy_add_retry_host_predicate(envoy_config_route_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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RetryPolicy__RetryHostPredicate_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -6259,6 +6566,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RetryPolicy__RetryBackOff_msg_init); 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) { @@ -6271,6 +6579,7 @@ UPB_INLINE struct envoy_config_route_v3_RetryPolicy_RetryBackOff* envoy_config_r } UPB_INLINE envoy_config_route_v3_HeaderMatcher** envoy_config_route_v3_RetryPolicy_mutable_retriable_headers(envoy_config_route_v3_RetryPolicy* msg, size_t* size) { upb_MiniTableField field = {9, UPB_SIZE(36, 88), 0, 5, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__HeaderMatcher_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -6287,6 +6596,7 @@ UPB_INLINE envoy_config_route_v3_HeaderMatcher** envoy_config_route_v3_RetryPoli } UPB_INLINE struct envoy_config_route_v3_HeaderMatcher* envoy_config_route_v3_RetryPolicy_add_retriable_headers(envoy_config_route_v3_RetryPolicy* msg, upb_Arena* arena) { upb_MiniTableField field = {9, UPB_SIZE(36, 88), 0, 5, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__HeaderMatcher_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -6301,6 +6611,7 @@ UPB_INLINE struct envoy_config_route_v3_HeaderMatcher* envoy_config_route_v3_Ret } UPB_INLINE envoy_config_route_v3_HeaderMatcher** envoy_config_route_v3_RetryPolicy_mutable_retriable_request_headers(envoy_config_route_v3_RetryPolicy* msg, size_t* size) { upb_MiniTableField field = {10, UPB_SIZE(40, 96), 0, 6, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__HeaderMatcher_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -6317,6 +6628,7 @@ UPB_INLINE envoy_config_route_v3_HeaderMatcher** envoy_config_route_v3_RetryPoli } UPB_INLINE struct envoy_config_route_v3_HeaderMatcher* envoy_config_route_v3_RetryPolicy_add_retriable_request_headers(envoy_config_route_v3_RetryPolicy* msg, upb_Arena* arena) { upb_MiniTableField field = {10, UPB_SIZE(40, 96), 0, 6, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__HeaderMatcher_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -6331,6 +6643,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RetryPolicy__RateLimitedRetryBackOff_msg_init); 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) { @@ -6343,6 +6656,7 @@ UPB_INLINE struct envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff* env } UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig** envoy_config_route_v3_RetryPolicy_mutable_retry_options_predicates(envoy_config_route_v3_RetryPolicy* msg, size_t* size) { upb_MiniTableField field = {12, UPB_SIZE(48, 112), 0, 8, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -6359,6 +6673,7 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig** envoy_config_route } UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_route_v3_RetryPolicy_add_retry_options_predicates(envoy_config_route_v3_RetryPolicy* msg, upb_Arena* arena) { upb_MiniTableField field = {12, UPB_SIZE(48, 112), 0, 8, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -6373,6 +6688,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { @@ -6449,6 +6765,7 @@ UPB_INLINE const struct google_protobuf_Any* envoy_config_route_v3_RetryPolicy_R const struct google_protobuf_Any* default_val = NULL; const struct google_protobuf_Any* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -6464,6 +6781,7 @@ UPB_INLINE void envoy_config_route_v3_RetryPolicy_RetryPriority_set_name(envoy_c } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); 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) { @@ -6540,6 +6858,7 @@ UPB_INLINE const struct google_protobuf_Any* envoy_config_route_v3_RetryPolicy_R const struct google_protobuf_Any* default_val = NULL; const struct google_protobuf_Any* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -6555,6 +6874,7 @@ UPB_INLINE void envoy_config_route_v3_RetryPolicy_RetryHostPredicate_set_name(en } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); 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) { @@ -6610,6 +6930,7 @@ UPB_INLINE const struct google_protobuf_Duration* envoy_config_route_v3_RetryPol 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -6626,6 +6947,7 @@ UPB_INLINE const struct google_protobuf_Duration* envoy_config_route_v3_RetryPol const struct google_protobuf_Duration* default_val = NULL; const struct google_protobuf_Duration* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -6637,6 +6959,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { @@ -6649,6 +6972,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { @@ -6772,6 +7096,7 @@ UPB_INLINE void envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff_clear_ } UPB_INLINE const envoy_config_route_v3_RetryPolicy_ResetHeader* const* envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff_reset_headers(const envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff* msg, size_t* size) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RetryPolicy__ResetHeader_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -6783,6 +7108,7 @@ UPB_INLINE const envoy_config_route_v3_RetryPolicy_ResetHeader* const* envoy_con } UPB_INLINE const upb_Array* _envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff_reset_headers_upb_array(const envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff* msg, size_t* size) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RetryPolicy__ResetHeader_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -6791,6 +7117,7 @@ UPB_INLINE const upb_Array* _envoy_config_route_v3_RetryPolicy_RateLimitedRetryB } UPB_INLINE upb_Array* _envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff_reset_headers_mutable_upb_array(envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RetryPolicy__ResetHeader_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -6806,6 +7133,7 @@ UPB_INLINE const struct google_protobuf_Duration* envoy_config_route_v3_RetryPol const struct google_protobuf_Duration* default_val = NULL; const struct google_protobuf_Duration* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -6817,6 +7145,7 @@ UPB_INLINE bool envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff_has_ma UPB_INLINE envoy_config_route_v3_RetryPolicy_ResetHeader** envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff_mutable_reset_headers(envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff* msg, size_t* size) { upb_MiniTableField field = {1, UPB_SIZE(12, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RetryPolicy__ResetHeader_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -6833,6 +7162,7 @@ UPB_INLINE envoy_config_route_v3_RetryPolicy_ResetHeader** envoy_config_route_v3 } UPB_INLINE struct envoy_config_route_v3_RetryPolicy_ResetHeader* envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff_add_reset_headers(envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff* msg, upb_Arena* arena) { upb_MiniTableField field = {1, UPB_SIZE(12, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RetryPolicy__ResetHeader_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -6847,6 +7177,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { @@ -6902,6 +7233,7 @@ UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_route_v3_Hedge const struct google_protobuf_UInt32Value* default_val = NULL; const struct google_protobuf_UInt32Value* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -6918,6 +7250,7 @@ UPB_INLINE const struct envoy_type_v3_FractionalPercent* envoy_config_route_v3_H const struct envoy_type_v3_FractionalPercent* default_val = NULL; const struct envoy_type_v3_FractionalPercent* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__v3__FractionalPercent_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -6941,6 +7274,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); 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) { @@ -6953,6 +7287,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__v3__FractionalPercent_msg_init); 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) { @@ -7145,6 +7480,7 @@ UPB_INLINE const struct envoy_type_matcher_v3_RegexMatchAndSubstitute* envoy_con const struct envoy_type_matcher_v3_RegexMatchAndSubstitute* default_val = NULL; const struct envoy_type_matcher_v3_RegexMatchAndSubstitute* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__RegexMatchAndSubstitute_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -7188,6 +7524,7 @@ UPB_INLINE void envoy_config_route_v3_RedirectAction_set_port_redirect(envoy_con } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__RegexMatchAndSubstitute_msg_init); 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) { @@ -7255,6 +7592,7 @@ UPB_INLINE const struct envoy_config_core_v3_DataSource* envoy_config_route_v3_D const struct envoy_config_core_v3_DataSource* default_val = NULL; const struct envoy_config_core_v3_DataSource* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__DataSource_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -7270,6 +7608,7 @@ UPB_INLINE void envoy_config_route_v3_DirectResponseAction_set_status(envoy_conf } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__DataSource_msg_init); 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) { @@ -7375,6 +7714,7 @@ UPB_INLINE const struct google_protobuf_BoolValue* envoy_config_route_v3_Decorat const struct google_protobuf_BoolValue* default_val = NULL; const struct google_protobuf_BoolValue* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -7390,6 +7730,7 @@ UPB_INLINE void envoy_config_route_v3_Decorator_set_operation(envoy_config_route } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); 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) { @@ -7445,6 +7786,7 @@ UPB_INLINE const struct envoy_type_v3_FractionalPercent* envoy_config_route_v3_T const struct envoy_type_v3_FractionalPercent* default_val = NULL; const struct envoy_type_v3_FractionalPercent* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__v3__FractionalPercent_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -7461,6 +7803,7 @@ UPB_INLINE const struct envoy_type_v3_FractionalPercent* envoy_config_route_v3_T const struct envoy_type_v3_FractionalPercent* default_val = NULL; const struct envoy_type_v3_FractionalPercent* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__v3__FractionalPercent_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -7477,6 +7820,7 @@ UPB_INLINE const struct envoy_type_v3_FractionalPercent* envoy_config_route_v3_T const struct envoy_type_v3_FractionalPercent* default_val = NULL; const struct envoy_type_v3_FractionalPercent* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__v3__FractionalPercent_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -7491,6 +7835,7 @@ UPB_INLINE void envoy_config_route_v3_Tracing_clear_custom_tags(envoy_config_rou } UPB_INLINE const struct envoy_type_tracing_v3_CustomTag* const* envoy_config_route_v3_Tracing_custom_tags(const envoy_config_route_v3_Tracing* msg, size_t* size) { const upb_MiniTableField field = {4, UPB_SIZE(24, 40), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__tracing__v3__CustomTag_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -7502,6 +7847,7 @@ UPB_INLINE const struct envoy_type_tracing_v3_CustomTag* const* envoy_config_rou } UPB_INLINE const upb_Array* _envoy_config_route_v3_Tracing_custom_tags_upb_array(const envoy_config_route_v3_Tracing* msg, size_t* size) { const upb_MiniTableField field = {4, UPB_SIZE(24, 40), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__tracing__v3__CustomTag_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -7510,6 +7856,7 @@ UPB_INLINE const upb_Array* _envoy_config_route_v3_Tracing_custom_tags_upb_array } UPB_INLINE upb_Array* _envoy_config_route_v3_Tracing_custom_tags_mutable_upb_array(envoy_config_route_v3_Tracing* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {4, UPB_SIZE(24, 40), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__tracing__v3__CustomTag_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -7520,6 +7867,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__v3__FractionalPercent_msg_init); 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) { @@ -7532,6 +7880,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__v3__FractionalPercent_msg_init); 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) { @@ -7544,6 +7893,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__v3__FractionalPercent_msg_init); 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) { @@ -7556,6 +7906,7 @@ UPB_INLINE struct envoy_type_v3_FractionalPercent* envoy_config_route_v3_Tracing } UPB_INLINE struct envoy_type_tracing_v3_CustomTag** envoy_config_route_v3_Tracing_mutable_custom_tags(envoy_config_route_v3_Tracing* msg, size_t* size) { upb_MiniTableField field = {4, UPB_SIZE(24, 40), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__tracing__v3__CustomTag_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -7572,6 +7923,7 @@ UPB_INLINE struct envoy_type_tracing_v3_CustomTag** envoy_config_route_v3_Tracin } UPB_INLINE struct envoy_type_tracing_v3_CustomTag* envoy_config_route_v3_Tracing_add_custom_tags(envoy_config_route_v3_Tracing* msg, upb_Arena* arena) { upb_MiniTableField field = {4, UPB_SIZE(24, 40), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__tracing__v3__CustomTag_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -7639,6 +7991,7 @@ UPB_INLINE void envoy_config_route_v3_VirtualCluster_clear_headers(envoy_config_ } UPB_INLINE const envoy_config_route_v3_HeaderMatcher* const* envoy_config_route_v3_VirtualCluster_headers(const envoy_config_route_v3_VirtualCluster* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__HeaderMatcher_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -7650,6 +8003,7 @@ UPB_INLINE const envoy_config_route_v3_HeaderMatcher* const* envoy_config_route_ } UPB_INLINE const upb_Array* _envoy_config_route_v3_VirtualCluster_headers_upb_array(const envoy_config_route_v3_VirtualCluster* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__HeaderMatcher_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -7658,6 +8012,7 @@ UPB_INLINE const upb_Array* _envoy_config_route_v3_VirtualCluster_headers_upb_ar } UPB_INLINE upb_Array* _envoy_config_route_v3_VirtualCluster_headers_mutable_upb_array(envoy_config_route_v3_VirtualCluster* msg, size_t* size, upb_Arena* arena) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__HeaderMatcher_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -7672,6 +8027,7 @@ UPB_INLINE void envoy_config_route_v3_VirtualCluster_set_name(envoy_config_route } 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__HeaderMatcher_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -7688,6 +8044,7 @@ UPB_INLINE envoy_config_route_v3_HeaderMatcher** envoy_config_route_v3_VirtualCl } UPB_INLINE struct envoy_config_route_v3_HeaderMatcher* envoy_config_route_v3_VirtualCluster_add_headers(envoy_config_route_v3_VirtualCluster* msg, upb_Arena* arena) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__HeaderMatcher_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -7745,6 +8102,7 @@ UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_route_v3_RateL const struct google_protobuf_UInt32Value* default_val = NULL; const struct google_protobuf_UInt32Value* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -7771,6 +8129,7 @@ UPB_INLINE void envoy_config_route_v3_RateLimit_clear_actions(envoy_config_route } UPB_INLINE const envoy_config_route_v3_RateLimit_Action* const* envoy_config_route_v3_RateLimit_actions(const envoy_config_route_v3_RateLimit* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RateLimit__Action_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -7782,6 +8141,7 @@ UPB_INLINE const envoy_config_route_v3_RateLimit_Action* const* envoy_config_rou } UPB_INLINE const upb_Array* _envoy_config_route_v3_RateLimit_actions_upb_array(const envoy_config_route_v3_RateLimit* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RateLimit__Action_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -7790,6 +8150,7 @@ UPB_INLINE const upb_Array* _envoy_config_route_v3_RateLimit_actions_upb_array(c } UPB_INLINE upb_Array* _envoy_config_route_v3_RateLimit_actions_mutable_upb_array(envoy_config_route_v3_RateLimit* msg, size_t* size, upb_Arena* arena) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RateLimit__Action_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -7805,6 +8166,7 @@ UPB_INLINE const envoy_config_route_v3_RateLimit_Override* envoy_config_route_v3 const envoy_config_route_v3_RateLimit_Override* default_val = NULL; const envoy_config_route_v3_RateLimit_Override* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RateLimit__Override_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -7816,6 +8178,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); 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) { @@ -7832,6 +8195,7 @@ UPB_INLINE void envoy_config_route_v3_RateLimit_set_disable_key(envoy_config_rou } 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RateLimit__Action_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -7848,6 +8212,7 @@ UPB_INLINE envoy_config_route_v3_RateLimit_Action** envoy_config_route_v3_RateLi } UPB_INLINE struct envoy_config_route_v3_RateLimit_Action* envoy_config_route_v3_RateLimit_add_actions(envoy_config_route_v3_RateLimit* msg, upb_Arena* arena) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RateLimit__Action_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -7862,6 +8227,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RateLimit__Override_msg_init); 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) { @@ -7936,6 +8302,7 @@ UPB_INLINE const envoy_config_route_v3_RateLimit_Action_SourceCluster* envoy_con const envoy_config_route_v3_RateLimit_Action_SourceCluster* default_val = NULL; const envoy_config_route_v3_RateLimit_Action_SourceCluster* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RateLimit__Action__SourceCluster_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -7952,6 +8319,7 @@ UPB_INLINE const envoy_config_route_v3_RateLimit_Action_DestinationCluster* envo const envoy_config_route_v3_RateLimit_Action_DestinationCluster* default_val = NULL; const envoy_config_route_v3_RateLimit_Action_DestinationCluster* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RateLimit__Action__DestinationCluster_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -7968,6 +8336,7 @@ UPB_INLINE const envoy_config_route_v3_RateLimit_Action_RequestHeaders* envoy_co const envoy_config_route_v3_RateLimit_Action_RequestHeaders* default_val = NULL; const envoy_config_route_v3_RateLimit_Action_RequestHeaders* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RateLimit__Action__RequestHeaders_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -7984,6 +8353,7 @@ UPB_INLINE const envoy_config_route_v3_RateLimit_Action_RemoteAddress* envoy_con const envoy_config_route_v3_RateLimit_Action_RemoteAddress* default_val = NULL; const envoy_config_route_v3_RateLimit_Action_RemoteAddress* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RateLimit__Action__RemoteAddress_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -8000,6 +8370,7 @@ UPB_INLINE const envoy_config_route_v3_RateLimit_Action_GenericKey* envoy_config const envoy_config_route_v3_RateLimit_Action_GenericKey* default_val = NULL; const envoy_config_route_v3_RateLimit_Action_GenericKey* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RateLimit__Action__GenericKey_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -8016,6 +8387,7 @@ UPB_INLINE const envoy_config_route_v3_RateLimit_Action_HeaderValueMatch* envoy_ const envoy_config_route_v3_RateLimit_Action_HeaderValueMatch* default_val = NULL; const envoy_config_route_v3_RateLimit_Action_HeaderValueMatch* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RateLimit__Action__HeaderValueMatch_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -8032,6 +8404,7 @@ UPB_INLINE const envoy_config_route_v3_RateLimit_Action_DynamicMetaData* envoy_c const envoy_config_route_v3_RateLimit_Action_DynamicMetaData* default_val = NULL; const envoy_config_route_v3_RateLimit_Action_DynamicMetaData* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RateLimit__Action__DynamicMetaData_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -8048,6 +8421,7 @@ UPB_INLINE const envoy_config_route_v3_RateLimit_Action_MetaData* envoy_config_r const envoy_config_route_v3_RateLimit_Action_MetaData* default_val = NULL; const envoy_config_route_v3_RateLimit_Action_MetaData* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RateLimit__Action__MetaData_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -8064,6 +8438,7 @@ UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_ const struct envoy_config_core_v3_TypedExtensionConfig* default_val = NULL; const struct envoy_config_core_v3_TypedExtensionConfig* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -8080,6 +8455,7 @@ UPB_INLINE const envoy_config_route_v3_RateLimit_Action_MaskedRemoteAddress* env const envoy_config_route_v3_RateLimit_Action_MaskedRemoteAddress* default_val = NULL; const envoy_config_route_v3_RateLimit_Action_MaskedRemoteAddress* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RateLimit__Action__MaskedRemoteAddress_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -8096,6 +8472,7 @@ UPB_INLINE const envoy_config_route_v3_RateLimit_Action_QueryParameterValueMatch const envoy_config_route_v3_RateLimit_Action_QueryParameterValueMatch* default_val = NULL; const envoy_config_route_v3_RateLimit_Action_QueryParameterValueMatch* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RateLimit__Action__QueryParameterValueMatch_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -8107,6 +8484,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RateLimit__Action__SourceCluster_msg_init); 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) { @@ -8119,6 +8497,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RateLimit__Action__DestinationCluster_msg_init); 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) { @@ -8131,6 +8510,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RateLimit__Action__RequestHeaders_msg_init); 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) { @@ -8143,6 +8523,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RateLimit__Action__RemoteAddress_msg_init); 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) { @@ -8155,6 +8536,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RateLimit__Action__GenericKey_msg_init); 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) { @@ -8167,6 +8549,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RateLimit__Action__HeaderValueMatch_msg_init); 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) { @@ -8179,6 +8562,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RateLimit__Action__DynamicMetaData_msg_init); 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) { @@ -8191,6 +8575,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RateLimit__Action__MetaData_msg_init); 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) { @@ -8203,6 +8588,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); 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) { @@ -8215,6 +8601,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RateLimit__Action__MaskedRemoteAddress_msg_init); 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) { @@ -8227,6 +8614,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RateLimit__Action__QueryParameterValueMatch_msg_init); 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) { @@ -8482,6 +8870,7 @@ UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_route_v3_RateL const struct google_protobuf_UInt32Value* default_val = NULL; const struct google_protobuf_UInt32Value* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -8498,6 +8887,7 @@ UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_route_v3_RateL const struct google_protobuf_UInt32Value* default_val = NULL; const struct google_protobuf_UInt32Value* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -8509,6 +8899,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); 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) { @@ -8521,6 +8912,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); 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) { @@ -8658,6 +9050,7 @@ UPB_INLINE const struct google_protobuf_BoolValue* envoy_config_route_v3_RateLim const struct google_protobuf_BoolValue* default_val = NULL; const struct google_protobuf_BoolValue* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -8672,6 +9065,7 @@ UPB_INLINE void envoy_config_route_v3_RateLimit_Action_HeaderValueMatch_clear_he } UPB_INLINE const envoy_config_route_v3_HeaderMatcher* const* envoy_config_route_v3_RateLimit_Action_HeaderValueMatch_headers(const envoy_config_route_v3_RateLimit_Action_HeaderValueMatch* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__HeaderMatcher_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -8683,6 +9077,7 @@ UPB_INLINE const envoy_config_route_v3_HeaderMatcher* const* envoy_config_route_ } UPB_INLINE const upb_Array* _envoy_config_route_v3_RateLimit_Action_HeaderValueMatch_headers_upb_array(const envoy_config_route_v3_RateLimit_Action_HeaderValueMatch* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__HeaderMatcher_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -8691,6 +9086,7 @@ UPB_INLINE const upb_Array* _envoy_config_route_v3_RateLimit_Action_HeaderValueM } UPB_INLINE upb_Array* _envoy_config_route_v3_RateLimit_Action_HeaderValueMatch_headers_mutable_upb_array(envoy_config_route_v3_RateLimit_Action_HeaderValueMatch* msg, size_t* size, upb_Arena* arena) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__HeaderMatcher_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -8717,6 +9113,7 @@ UPB_INLINE void envoy_config_route_v3_RateLimit_Action_HeaderValueMatch_set_desc } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); 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) { @@ -8729,6 +9126,7 @@ UPB_INLINE struct google_protobuf_BoolValue* envoy_config_route_v3_RateLimit_Act } UPB_INLINE envoy_config_route_v3_HeaderMatcher** envoy_config_route_v3_RateLimit_Action_HeaderValueMatch_mutable_headers(envoy_config_route_v3_RateLimit_Action_HeaderValueMatch* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__HeaderMatcher_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -8745,6 +9143,7 @@ UPB_INLINE envoy_config_route_v3_HeaderMatcher** envoy_config_route_v3_RateLimit } UPB_INLINE struct envoy_config_route_v3_HeaderMatcher* envoy_config_route_v3_RateLimit_Action_HeaderValueMatch_add_headers(envoy_config_route_v3_RateLimit_Action_HeaderValueMatch* msg, upb_Arena* arena) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__HeaderMatcher_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -8818,6 +9217,7 @@ UPB_INLINE const struct envoy_type_metadata_v3_MetadataKey* envoy_config_route_v const struct envoy_type_metadata_v3_MetadataKey* default_val = NULL; const struct envoy_type_metadata_v3_MetadataKey* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__metadata__v3__MetadataKey_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -8845,6 +9245,7 @@ UPB_INLINE void envoy_config_route_v3_RateLimit_Action_DynamicMetaData_set_descr } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__metadata__v3__MetadataKey_msg_init); 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) { @@ -8916,6 +9317,7 @@ UPB_INLINE const struct envoy_type_metadata_v3_MetadataKey* envoy_config_route_v const struct envoy_type_metadata_v3_MetadataKey* default_val = NULL; const struct envoy_type_metadata_v3_MetadataKey* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__metadata__v3__MetadataKey_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -8967,6 +9369,7 @@ UPB_INLINE void envoy_config_route_v3_RateLimit_Action_MetaData_set_descriptor_k } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__metadata__v3__MetadataKey_msg_init); 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) { @@ -9046,6 +9449,7 @@ UPB_INLINE const struct google_protobuf_BoolValue* envoy_config_route_v3_RateLim const struct google_protobuf_BoolValue* default_val = NULL; const struct google_protobuf_BoolValue* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -9060,6 +9464,7 @@ UPB_INLINE void envoy_config_route_v3_RateLimit_Action_QueryParameterValueMatch_ } UPB_INLINE const envoy_config_route_v3_QueryParameterMatcher* const* envoy_config_route_v3_RateLimit_Action_QueryParameterValueMatch_query_parameters(const envoy_config_route_v3_RateLimit_Action_QueryParameterValueMatch* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__QueryParameterMatcher_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -9071,6 +9476,7 @@ UPB_INLINE const envoy_config_route_v3_QueryParameterMatcher* const* envoy_confi } UPB_INLINE const upb_Array* _envoy_config_route_v3_RateLimit_Action_QueryParameterValueMatch_query_parameters_upb_array(const envoy_config_route_v3_RateLimit_Action_QueryParameterValueMatch* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__QueryParameterMatcher_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -9079,6 +9485,7 @@ UPB_INLINE const upb_Array* _envoy_config_route_v3_RateLimit_Action_QueryParamet } UPB_INLINE upb_Array* _envoy_config_route_v3_RateLimit_Action_QueryParameterValueMatch_query_parameters_mutable_upb_array(envoy_config_route_v3_RateLimit_Action_QueryParameterValueMatch* msg, size_t* size, upb_Arena* arena) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__QueryParameterMatcher_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -9105,6 +9512,7 @@ UPB_INLINE void envoy_config_route_v3_RateLimit_Action_QueryParameterValueMatch_ } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); 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) { @@ -9117,6 +9525,7 @@ UPB_INLINE struct google_protobuf_BoolValue* envoy_config_route_v3_RateLimit_Act } UPB_INLINE envoy_config_route_v3_QueryParameterMatcher** envoy_config_route_v3_RateLimit_Action_QueryParameterValueMatch_mutable_query_parameters(envoy_config_route_v3_RateLimit_Action_QueryParameterValueMatch* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__QueryParameterMatcher_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -9133,6 +9542,7 @@ UPB_INLINE envoy_config_route_v3_QueryParameterMatcher** envoy_config_route_v3_R } UPB_INLINE struct envoy_config_route_v3_QueryParameterMatcher* envoy_config_route_v3_RateLimit_Action_QueryParameterValueMatch_add_query_parameters(envoy_config_route_v3_RateLimit_Action_QueryParameterValueMatch* msg, upb_Arena* arena) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__QueryParameterMatcher_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -9203,6 +9613,7 @@ UPB_INLINE const envoy_config_route_v3_RateLimit_Override_DynamicMetadata* envoy const envoy_config_route_v3_RateLimit_Override_DynamicMetadata* default_val = NULL; const envoy_config_route_v3_RateLimit_Override_DynamicMetadata* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RateLimit__Override__DynamicMetadata_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -9214,6 +9625,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RateLimit__Override__DynamicMetadata_msg_init); 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) { @@ -9269,6 +9681,7 @@ UPB_INLINE const struct envoy_type_metadata_v3_MetadataKey* envoy_config_route_v const struct envoy_type_metadata_v3_MetadataKey* default_val = NULL; const struct envoy_type_metadata_v3_MetadataKey* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__metadata__v3__MetadataKey_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -9280,6 +9693,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__metadata__v3__MetadataKey_msg_init); 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) { @@ -9379,6 +9793,7 @@ UPB_INLINE const struct envoy_type_v3_Int64Range* envoy_config_route_v3_HeaderMa const struct envoy_type_v3_Int64Range* default_val = NULL; const struct envoy_type_v3_Int64Range* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__v3__Int64Range_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -9455,6 +9870,7 @@ UPB_INLINE const struct envoy_type_matcher_v3_RegexMatcher* envoy_config_route_v const struct envoy_type_matcher_v3_RegexMatcher* default_val = NULL; const struct envoy_type_matcher_v3_RegexMatcher* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__RegexMatcher_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -9487,6 +9903,7 @@ UPB_INLINE const struct envoy_type_matcher_v3_StringMatcher* envoy_config_route_ const struct envoy_type_matcher_v3_StringMatcher* default_val = NULL; const struct envoy_type_matcher_v3_StringMatcher* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__StringMatcher_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -9518,6 +9935,7 @@ UPB_INLINE void envoy_config_route_v3_HeaderMatcher_set_exact_match(envoy_config } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__v3__Int64Range_msg_init); 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) { @@ -9546,6 +9964,7 @@ UPB_INLINE void envoy_config_route_v3_HeaderMatcher_set_suffix_match(envoy_confi } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__RegexMatcher_msg_init); 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) { @@ -9562,6 +9981,7 @@ UPB_INLINE void envoy_config_route_v3_HeaderMatcher_set_contains_match(envoy_con } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__StringMatcher_msg_init); 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) { @@ -9643,6 +10063,7 @@ UPB_INLINE const struct envoy_type_matcher_v3_StringMatcher* envoy_config_route_ const struct envoy_type_matcher_v3_StringMatcher* default_val = NULL; const struct envoy_type_matcher_v3_StringMatcher* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__StringMatcher_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -9674,6 +10095,7 @@ UPB_INLINE void envoy_config_route_v3_QueryParameterMatcher_set_name(envoy_confi } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__StringMatcher_msg_init); 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) { @@ -9733,6 +10155,7 @@ UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_route_v3_Inter const struct google_protobuf_UInt32Value* default_val = NULL; const struct google_protobuf_UInt32Value* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -9779,6 +10202,7 @@ UPB_INLINE void envoy_config_route_v3_InternalRedirectPolicy_clear_predicates(en } UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* const* envoy_config_route_v3_InternalRedirectPolicy_predicates(const envoy_config_route_v3_InternalRedirectPolicy* msg, size_t* size) { const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -9790,6 +10214,7 @@ UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* const* envoy_ } UPB_INLINE const upb_Array* _envoy_config_route_v3_InternalRedirectPolicy_predicates_upb_array(const envoy_config_route_v3_InternalRedirectPolicy* msg, size_t* size) { const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -9798,6 +10223,7 @@ UPB_INLINE const upb_Array* _envoy_config_route_v3_InternalRedirectPolicy_predic } UPB_INLINE upb_Array* _envoy_config_route_v3_InternalRedirectPolicy_predicates_mutable_upb_array(envoy_config_route_v3_InternalRedirectPolicy* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -9852,6 +10278,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); 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) { @@ -9892,6 +10319,7 @@ UPB_INLINE bool envoy_config_route_v3_InternalRedirectPolicy_add_redirect_respon } UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig** envoy_config_route_v3_InternalRedirectPolicy_mutable_predicates(envoy_config_route_v3_InternalRedirectPolicy* msg, size_t* size) { upb_MiniTableField field = {3, UPB_SIZE(20, 32), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -9908,6 +10336,7 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig** envoy_config_route } UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_route_v3_InternalRedirectPolicy_add_predicates(envoy_config_route_v3_InternalRedirectPolicy* msg, upb_Arena* arena) { upb_MiniTableField field = {3, UPB_SIZE(20, 32), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -9997,6 +10426,7 @@ UPB_INLINE const struct google_protobuf_Any* envoy_config_route_v3_FilterConfig_ const struct google_protobuf_Any* default_val = NULL; const struct google_protobuf_Any* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -10032,6 +10462,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); 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) { diff --git a/src/core/ext/upb-gen/envoy/config/route/v3/route_components.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/route/v3/route_components.upb_minitable.c index c199b0c396d..710fbc5cf76 100644 --- a/src/core/ext/upb-gen/envoy/config/route/v3/route_components.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/config/route/v3/route_components.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/config/route/v3/route_components.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -32,21 +33,22 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub envoy_config_route_v3_VirtualHost_submsgs[14] = { - {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__Route_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__VirtualCluster_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RateLimit_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HeaderValueOption_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__CorsPolicy_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HeaderValueOption_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__VirtualHost__TypedPerFilterConfigEntry_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RetryPolicy_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__HedgePolicy_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init}, - {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RouteAction__RequestMirrorPolicy_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Metadata_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal envoy_config_route_v3_VirtualHost_submsgs[14] = { + {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__Route_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__VirtualCluster_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RateLimit_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HeaderValueOption_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__CorsPolicy_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HeaderValueOption_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__VirtualHost__TypedPerFilterConfigEntry_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RetryPolicy_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__HedgePolicy_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RouteAction__RequestMirrorPolicy_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Metadata_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_route_v3_VirtualHost__fields[22] = { @@ -117,8 +119,9 @@ const upb_MiniTable envoy__config__route__v3__VirtualHost_msg_init = { }) }; -static const upb_MiniTableSub envoy_config_route_v3_VirtualHost_TypedPerFilterConfigEntry_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init}, +const upb_MiniTable* envoy__config__route__v3__VirtualHost_msg_init_ptr = &envoy__config__route__v3__VirtualHost_msg_init; +static const upb_MiniTableSubInternal envoy_config_route_v3_VirtualHost_TypedPerFilterConfigEntry_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_route_v3_VirtualHost_TypedPerFilterConfigEntry__fields[2] = { @@ -139,8 +142,9 @@ const upb_MiniTable envoy__config__route__v3__VirtualHost__TypedPerFilterConfigE }) }; -static const upb_MiniTableSub envoy_config_route_v3_FilterAction_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init}, +const upb_MiniTable* envoy__config__route__v3__VirtualHost__TypedPerFilterConfigEntry_msg_init_ptr = &envoy__config__route__v3__VirtualHost__TypedPerFilterConfigEntry_msg_init; +static const upb_MiniTableSubInternal envoy_config_route_v3_FilterAction_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_route_v3_FilterAction__fields[1] = { @@ -156,8 +160,9 @@ const upb_MiniTable envoy__config__route__v3__FilterAction_msg_init = { #endif }; -static const upb_MiniTableSub envoy_config_route_v3_RouteList_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__Route_msg_init}, +const upb_MiniTable* envoy__config__route__v3__FilterAction_msg_init_ptr = &envoy__config__route__v3__FilterAction_msg_init; +static const upb_MiniTableSubInternal envoy_config_route_v3_RouteList_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__Route_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_route_v3_RouteList__fields[1] = { @@ -177,20 +182,21 @@ const upb_MiniTable envoy__config__route__v3__RouteList_msg_init = { }) }; -static const upb_MiniTableSub envoy_config_route_v3_Route_submsgs[13] = { - {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RouteMatch_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RouteAction_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RedirectAction_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Metadata_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__Decorator_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__DirectResponseAction_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HeaderValueOption_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HeaderValueOption_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__Route__TypedPerFilterConfigEntry_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__Tracing_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__FilterAction_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__NonForwardingAction_msg_init}, +const upb_MiniTable* envoy__config__route__v3__RouteList_msg_init_ptr = &envoy__config__route__v3__RouteList_msg_init; +static const upb_MiniTableSubInternal envoy_config_route_v3_Route_submsgs[13] = { + {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RouteMatch_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RouteAction_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RedirectAction_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Metadata_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__Decorator_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__DirectResponseAction_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HeaderValueOption_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HeaderValueOption_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__Route__TypedPerFilterConfigEntry_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__Tracing_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__FilterAction_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__NonForwardingAction_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_route_v3_Route__fields[17] = { @@ -256,8 +262,9 @@ const upb_MiniTable envoy__config__route__v3__Route_msg_init = { }) }; -static const upb_MiniTableSub envoy_config_route_v3_Route_TypedPerFilterConfigEntry_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init}, +const upb_MiniTable* envoy__config__route__v3__Route_msg_init_ptr = &envoy__config__route__v3__Route_msg_init; +static const upb_MiniTableSubInternal envoy_config_route_v3_Route_TypedPerFilterConfigEntry_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_route_v3_Route_TypedPerFilterConfigEntry__fields[2] = { @@ -278,9 +285,10 @@ const upb_MiniTable envoy__config__route__v3__Route__TypedPerFilterConfigEntry_m }) }; -static const upb_MiniTableSub envoy_config_route_v3_WeightedCluster_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__WeightedCluster__ClusterWeight_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init}, +const upb_MiniTable* envoy__config__route__v3__Route__TypedPerFilterConfigEntry_msg_init_ptr = &envoy__config__route__v3__Route__TypedPerFilterConfigEntry_msg_init; +static const upb_MiniTableSubInternal envoy_config_route_v3_WeightedCluster_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__WeightedCluster__ClusterWeight_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_route_v3_WeightedCluster__fields[4] = { @@ -309,12 +317,13 @@ const upb_MiniTable envoy__config__route__v3__WeightedCluster_msg_init = { }) }; -static const upb_MiniTableSub envoy_config_route_v3_WeightedCluster_ClusterWeight_submsgs[5] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Metadata_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HeaderValueOption_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HeaderValueOption_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__WeightedCluster__ClusterWeight__TypedPerFilterConfigEntry_msg_init}, +const upb_MiniTable* envoy__config__route__v3__WeightedCluster_msg_init_ptr = &envoy__config__route__v3__WeightedCluster_msg_init; +static const upb_MiniTableSubInternal envoy_config_route_v3_WeightedCluster_ClusterWeight_submsgs[5] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Metadata_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HeaderValueOption_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HeaderValueOption_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__WeightedCluster__ClusterWeight__TypedPerFilterConfigEntry_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_route_v3_WeightedCluster_ClusterWeight__fields[10] = { @@ -357,8 +366,9 @@ const upb_MiniTable envoy__config__route__v3__WeightedCluster__ClusterWeight_msg }) }; -static const upb_MiniTableSub envoy_config_route_v3_WeightedCluster_ClusterWeight_TypedPerFilterConfigEntry_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init}, +const upb_MiniTable* envoy__config__route__v3__WeightedCluster__ClusterWeight_msg_init_ptr = &envoy__config__route__v3__WeightedCluster__ClusterWeight_msg_init; +static const upb_MiniTableSubInternal envoy_config_route_v3_WeightedCluster_ClusterWeight_TypedPerFilterConfigEntry_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_route_v3_WeightedCluster_ClusterWeight_TypedPerFilterConfigEntry__fields[2] = { @@ -379,8 +389,9 @@ const upb_MiniTable envoy__config__route__v3__WeightedCluster__ClusterWeight__Ty }) }; -static const upb_MiniTableSub envoy_config_route_v3_ClusterSpecifierPlugin_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init}, +const upb_MiniTable* envoy__config__route__v3__WeightedCluster__ClusterWeight__TypedPerFilterConfigEntry_msg_init_ptr = &envoy__config__route__v3__WeightedCluster__ClusterWeight__TypedPerFilterConfigEntry_msg_init; +static const upb_MiniTableSubInternal envoy_config_route_v3_ClusterSpecifierPlugin_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_route_v3_ClusterSpecifierPlugin__fields[2] = { @@ -403,17 +414,18 @@ const upb_MiniTable envoy__config__route__v3__ClusterSpecifierPlugin_msg_init = }) }; -static const upb_MiniTableSub envoy_config_route_v3_RouteMatch_submsgs[10] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__HeaderMatcher_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__QueryParameterMatcher_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RouteMatch__GrpcRouteMatchOptions_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__RuntimeFractionalPercent_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__RegexMatcher_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RouteMatch__TlsContextMatchOptions_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RouteMatch__ConnectMatcher_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__MetadataMatcher_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init}, +const upb_MiniTable* envoy__config__route__v3__ClusterSpecifierPlugin_msg_init_ptr = &envoy__config__route__v3__ClusterSpecifierPlugin_msg_init; +static const upb_MiniTableSubInternal envoy_config_route_v3_RouteMatch_submsgs[10] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__HeaderMatcher_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__QueryParameterMatcher_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RouteMatch__GrpcRouteMatchOptions_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__RuntimeFractionalPercent_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__RegexMatcher_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RouteMatch__TlsContextMatchOptions_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RouteMatch__ConnectMatcher_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__MetadataMatcher_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_route_v3_RouteMatch__fields[13] = { @@ -459,6 +471,7 @@ const upb_MiniTable envoy__config__route__v3__RouteMatch_msg_init = { }) }; +const upb_MiniTable* envoy__config__route__v3__RouteMatch_msg_init_ptr = &envoy__config__route__v3__RouteMatch_msg_init; const upb_MiniTable envoy__config__route__v3__RouteMatch__GrpcRouteMatchOptions_msg_init = { NULL, NULL, @@ -468,9 +481,10 @@ const upb_MiniTable envoy__config__route__v3__RouteMatch__GrpcRouteMatchOptions_ #endif }; -static const upb_MiniTableSub envoy_config_route_v3_RouteMatch_TlsContextMatchOptions_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init}, +const upb_MiniTable* envoy__config__route__v3__RouteMatch__GrpcRouteMatchOptions_msg_init_ptr = &envoy__config__route__v3__RouteMatch__GrpcRouteMatchOptions_msg_init; +static const upb_MiniTableSubInternal envoy_config_route_v3_RouteMatch_TlsContextMatchOptions_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_route_v3_RouteMatch_TlsContextMatchOptions__fields[2] = { @@ -487,6 +501,7 @@ const upb_MiniTable envoy__config__route__v3__RouteMatch__TlsContextMatchOptions #endif }; +const upb_MiniTable* envoy__config__route__v3__RouteMatch__TlsContextMatchOptions_msg_init_ptr = &envoy__config__route__v3__RouteMatch__TlsContextMatchOptions_msg_init; const upb_MiniTable envoy__config__route__v3__RouteMatch__ConnectMatcher_msg_init = { NULL, NULL, @@ -496,13 +511,14 @@ const upb_MiniTable envoy__config__route__v3__RouteMatch__ConnectMatcher_msg_ini #endif }; -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}, +const upb_MiniTable* envoy__config__route__v3__RouteMatch__ConnectMatcher_msg_init_ptr = &envoy__config__route__v3__RouteMatch__ConnectMatcher_msg_init; +static const upb_MiniTableSubInternal envoy_config_route_v3_CorsPolicy_submsgs[6] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__RuntimeFractionalPercent_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__RuntimeFractionalPercent_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__StringMatcher_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_route_v3_CorsPolicy__fields[10] = { @@ -545,31 +561,32 @@ const upb_MiniTable envoy__config__route__v3__CorsPolicy_msg_init = { }) }; -static const upb_MiniTableSub envoy_config_route_v3_RouteAction_submsgs[24] = { - {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__WeightedCluster_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Metadata_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RetryPolicy_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RateLimit_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RouteAction__HashPolicy_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__CorsPolicy_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RouteAction__UpgradeConfig_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__HedgePolicy_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RouteAction__RequestMirrorPolicy_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__RegexMatchAndSubstitute_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__InternalRedirectPolicy_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__RegexMatchAndSubstitute_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RouteAction__MaxStreamDuration_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__ClusterSpecifierPlugin_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init}, +const upb_MiniTable* envoy__config__route__v3__CorsPolicy_msg_init_ptr = &envoy__config__route__v3__CorsPolicy_msg_init; +static const upb_MiniTableSubInternal envoy_config_route_v3_RouteAction_submsgs[24] = { + {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__WeightedCluster_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Metadata_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RetryPolicy_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RateLimit_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RouteAction__HashPolicy_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__CorsPolicy_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RouteAction__UpgradeConfig_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__HedgePolicy_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RouteAction__RequestMirrorPolicy_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__RegexMatchAndSubstitute_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__InternalRedirectPolicy_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__RegexMatchAndSubstitute_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RouteAction__MaxStreamDuration_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__ClusterSpecifierPlugin_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_route_v3_RouteAction__fields[34] = { @@ -652,9 +669,10 @@ const upb_MiniTable envoy__config__route__v3__RouteAction_msg_init = { }) }; -static const upb_MiniTableSub envoy_config_route_v3_RouteAction_RequestMirrorPolicy_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__RuntimeFractionalPercent_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init}, +const upb_MiniTable* envoy__config__route__v3__RouteAction_msg_init_ptr = &envoy__config__route__v3__RouteAction_msg_init; +static const upb_MiniTableSubInternal envoy_config_route_v3_RouteAction_RequestMirrorPolicy_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__RuntimeFractionalPercent_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_route_v3_RouteAction_RequestMirrorPolicy__fields[5] = { @@ -684,12 +702,13 @@ const upb_MiniTable envoy__config__route__v3__RouteAction__RequestMirrorPolicy_m }) }; -static const upb_MiniTableSub envoy_config_route_v3_RouteAction_HashPolicy_submsgs[5] = { - {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RouteAction__HashPolicy__Header_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RouteAction__HashPolicy__Cookie_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RouteAction__HashPolicy__ConnectionProperties_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RouteAction__HashPolicy__QueryParameter_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RouteAction__HashPolicy__FilterState_msg_init}, +const upb_MiniTable* envoy__config__route__v3__RouteAction__RequestMirrorPolicy_msg_init_ptr = &envoy__config__route__v3__RouteAction__RequestMirrorPolicy_msg_init; +static const upb_MiniTableSubInternal envoy_config_route_v3_RouteAction_HashPolicy_submsgs[5] = { + {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RouteAction__HashPolicy__Header_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RouteAction__HashPolicy__Cookie_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RouteAction__HashPolicy__ConnectionProperties_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RouteAction__HashPolicy__QueryParameter_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RouteAction__HashPolicy__FilterState_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_route_v3_RouteAction_HashPolicy__fields[6] = { @@ -720,8 +739,9 @@ const upb_MiniTable envoy__config__route__v3__RouteAction__HashPolicy_msg_init = }) }; -static const upb_MiniTableSub envoy_config_route_v3_RouteAction_HashPolicy_Header_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__RegexMatchAndSubstitute_msg_init}, +const upb_MiniTable* envoy__config__route__v3__RouteAction__HashPolicy_msg_init_ptr = &envoy__config__route__v3__RouteAction__HashPolicy_msg_init; +static const upb_MiniTableSubInternal envoy_config_route_v3_RouteAction_HashPolicy_Header_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__RegexMatchAndSubstitute_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_route_v3_RouteAction_HashPolicy_Header__fields[2] = { @@ -742,6 +762,7 @@ const upb_MiniTable envoy__config__route__v3__RouteAction__HashPolicy__Header_ms }) }; +const upb_MiniTable* envoy__config__route__v3__RouteAction__HashPolicy__Header_msg_init_ptr = &envoy__config__route__v3__RouteAction__HashPolicy__Header_msg_init; static const upb_MiniTableField envoy_config_route_v3_RouteAction_HashPolicy_CookieAttribute__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)}, @@ -762,9 +783,10 @@ const upb_MiniTable envoy__config__route__v3__RouteAction__HashPolicy__CookieAtt }) }; -static const upb_MiniTableSub envoy_config_route_v3_RouteAction_HashPolicy_Cookie_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RouteAction__HashPolicy__CookieAttribute_msg_init}, +const upb_MiniTable* envoy__config__route__v3__RouteAction__HashPolicy__CookieAttribute_msg_init_ptr = &envoy__config__route__v3__RouteAction__HashPolicy__CookieAttribute_msg_init; +static const upb_MiniTableSubInternal envoy_config_route_v3_RouteAction_HashPolicy_Cookie_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RouteAction__HashPolicy__CookieAttribute_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_route_v3_RouteAction_HashPolicy_Cookie__fields[4] = { @@ -793,6 +815,7 @@ const upb_MiniTable envoy__config__route__v3__RouteAction__HashPolicy__Cookie_ms }) }; +const upb_MiniTable* envoy__config__route__v3__RouteAction__HashPolicy__Cookie_msg_init_ptr = &envoy__config__route__v3__RouteAction__HashPolicy__Cookie_msg_init; static const upb_MiniTableField envoy_config_route_v3_RouteAction_HashPolicy_ConnectionProperties__fields[1] = { {1, 8, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, }; @@ -810,6 +833,7 @@ const upb_MiniTable envoy__config__route__v3__RouteAction__HashPolicy__Connectio }) }; +const upb_MiniTable* envoy__config__route__v3__RouteAction__HashPolicy__ConnectionProperties_msg_init_ptr = &envoy__config__route__v3__RouteAction__HashPolicy__ConnectionProperties_msg_init; static const upb_MiniTableField envoy_config_route_v3_RouteAction_HashPolicy_QueryParameter__fields[1] = { {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, }; @@ -827,6 +851,7 @@ const upb_MiniTable envoy__config__route__v3__RouteAction__HashPolicy__QueryPara }) }; +const upb_MiniTable* envoy__config__route__v3__RouteAction__HashPolicy__QueryParameter_msg_init_ptr = &envoy__config__route__v3__RouteAction__HashPolicy__QueryParameter_msg_init; static const upb_MiniTableField envoy_config_route_v3_RouteAction_HashPolicy_FilterState__fields[1] = { {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, }; @@ -844,9 +869,10 @@ const upb_MiniTable envoy__config__route__v3__RouteAction__HashPolicy__FilterSta }) }; -static const upb_MiniTableSub envoy_config_route_v3_RouteAction_UpgradeConfig_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RouteAction__UpgradeConfig__ConnectConfig_msg_init}, +const upb_MiniTable* envoy__config__route__v3__RouteAction__HashPolicy__FilterState_msg_init_ptr = &envoy__config__route__v3__RouteAction__HashPolicy__FilterState_msg_init; +static const upb_MiniTableSubInternal envoy_config_route_v3_RouteAction_UpgradeConfig_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RouteAction__UpgradeConfig__ConnectConfig_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_route_v3_RouteAction_UpgradeConfig__fields[3] = { @@ -868,8 +894,9 @@ const upb_MiniTable envoy__config__route__v3__RouteAction__UpgradeConfig_msg_ini }) }; -static const upb_MiniTableSub envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ProxyProtocolConfig_msg_init}, +const upb_MiniTable* envoy__config__route__v3__RouteAction__UpgradeConfig_msg_init_ptr = &envoy__config__route__v3__RouteAction__UpgradeConfig_msg_init; +static const upb_MiniTableSubInternal envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ProxyProtocolConfig_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig__fields[2] = { @@ -892,10 +919,11 @@ const upb_MiniTable envoy__config__route__v3__RouteAction__UpgradeConfig__Connec }) }; -static const upb_MiniTableSub envoy_config_route_v3_RouteAction_MaxStreamDuration_submsgs[3] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, +const upb_MiniTable* envoy__config__route__v3__RouteAction__UpgradeConfig__ConnectConfig_msg_init_ptr = &envoy__config__route__v3__RouteAction__UpgradeConfig__ConnectConfig_msg_init; +static const upb_MiniTableSubInternal envoy_config_route_v3_RouteAction_MaxStreamDuration_submsgs[3] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_route_v3_RouteAction_MaxStreamDuration__fields[3] = { @@ -913,17 +941,18 @@ const upb_MiniTable envoy__config__route__v3__RouteAction__MaxStreamDuration_msg #endif }; -static const upb_MiniTableSub envoy_config_route_v3_RetryPolicy_submsgs[10] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RetryPolicy__RetryPriority_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RetryPolicy__RetryHostPredicate_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RetryPolicy__RetryBackOff_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__HeaderMatcher_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__HeaderMatcher_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RetryPolicy__RateLimitedRetryBackOff_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, +const upb_MiniTable* envoy__config__route__v3__RouteAction__MaxStreamDuration_msg_init_ptr = &envoy__config__route__v3__RouteAction__MaxStreamDuration_msg_init; +static const upb_MiniTableSubInternal envoy_config_route_v3_RetryPolicy_submsgs[10] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RetryPolicy__RetryPriority_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RetryPolicy__RetryHostPredicate_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RetryPolicy__RetryBackOff_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__HeaderMatcher_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__HeaderMatcher_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RetryPolicy__RateLimitedRetryBackOff_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_route_v3_RetryPolicy__fields[13] = { @@ -969,8 +998,9 @@ const upb_MiniTable envoy__config__route__v3__RetryPolicy_msg_init = { }) }; -static const upb_MiniTableSub envoy_config_route_v3_RetryPolicy_RetryPriority_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init}, +const upb_MiniTable* envoy__config__route__v3__RetryPolicy_msg_init_ptr = &envoy__config__route__v3__RetryPolicy_msg_init; +static const upb_MiniTableSubInternal envoy_config_route_v3_RetryPolicy_RetryPriority_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_route_v3_RetryPolicy_RetryPriority__fields[2] = { @@ -993,8 +1023,9 @@ const upb_MiniTable envoy__config__route__v3__RetryPolicy__RetryPriority_msg_ini }) }; -static const upb_MiniTableSub envoy_config_route_v3_RetryPolicy_RetryHostPredicate_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init}, +const upb_MiniTable* envoy__config__route__v3__RetryPolicy__RetryPriority_msg_init_ptr = &envoy__config__route__v3__RetryPolicy__RetryPriority_msg_init; +static const upb_MiniTableSubInternal envoy_config_route_v3_RetryPolicy_RetryHostPredicate_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_route_v3_RetryPolicy_RetryHostPredicate__fields[2] = { @@ -1017,9 +1048,10 @@ const upb_MiniTable envoy__config__route__v3__RetryPolicy__RetryHostPredicate_ms }) }; -static const upb_MiniTableSub envoy_config_route_v3_RetryPolicy_RetryBackOff_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, +const upb_MiniTable* envoy__config__route__v3__RetryPolicy__RetryHostPredicate_msg_init_ptr = &envoy__config__route__v3__RetryPolicy__RetryHostPredicate_msg_init; +static const upb_MiniTableSubInternal envoy_config_route_v3_RetryPolicy_RetryBackOff_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_route_v3_RetryPolicy_RetryBackOff__fields[2] = { @@ -1036,6 +1068,7 @@ const upb_MiniTable envoy__config__route__v3__RetryPolicy__RetryBackOff_msg_init #endif }; +const upb_MiniTable* envoy__config__route__v3__RetryPolicy__RetryBackOff_msg_init_ptr = &envoy__config__route__v3__RetryPolicy__RetryBackOff_msg_init; static const upb_MiniTableField envoy_config_route_v3_RetryPolicy_ResetHeader__fields[2] = { {1, UPB_SIZE(12, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, {2, 8, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, @@ -1056,9 +1089,10 @@ const upb_MiniTable envoy__config__route__v3__RetryPolicy__ResetHeader_msg_init }) }; -static const upb_MiniTableSub envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RetryPolicy__ResetHeader_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, +const upb_MiniTable* envoy__config__route__v3__RetryPolicy__ResetHeader_msg_init_ptr = &envoy__config__route__v3__RetryPolicy__ResetHeader_msg_init; +static const upb_MiniTableSubInternal envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RetryPolicy__ResetHeader_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff__fields[2] = { @@ -1079,9 +1113,10 @@ const upb_MiniTable envoy__config__route__v3__RetryPolicy__RateLimitedRetryBackO }) }; -static const upb_MiniTableSub envoy_config_route_v3_HedgePolicy_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__type__v3__FractionalPercent_msg_init}, +const upb_MiniTable* envoy__config__route__v3__RetryPolicy__RateLimitedRetryBackOff_msg_init_ptr = &envoy__config__route__v3__RetryPolicy__RateLimitedRetryBackOff_msg_init; +static const upb_MiniTableSubInternal envoy_config_route_v3_HedgePolicy_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__type__v3__FractionalPercent_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_route_v3_HedgePolicy__fields[3] = { @@ -1105,8 +1140,9 @@ const upb_MiniTable envoy__config__route__v3__HedgePolicy_msg_init = { }) }; -static const upb_MiniTableSub envoy_config_route_v3_RedirectAction_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__RegexMatchAndSubstitute_msg_init}, +const upb_MiniTable* envoy__config__route__v3__HedgePolicy_msg_init_ptr = &envoy__config__route__v3__HedgePolicy_msg_init; +static const upb_MiniTableSubInternal envoy_config_route_v3_RedirectAction_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__RegexMatchAndSubstitute_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_route_v3_RedirectAction__fields[9] = { @@ -1148,8 +1184,9 @@ const upb_MiniTable envoy__config__route__v3__RedirectAction_msg_init = { }) }; -static const upb_MiniTableSub envoy_config_route_v3_DirectResponseAction_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__DataSource_msg_init}, +const upb_MiniTable* envoy__config__route__v3__RedirectAction_msg_init_ptr = &envoy__config__route__v3__RedirectAction_msg_init; +static const upb_MiniTableSubInternal envoy_config_route_v3_DirectResponseAction_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__DataSource_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_route_v3_DirectResponseAction__fields[2] = { @@ -1170,6 +1207,7 @@ const upb_MiniTable envoy__config__route__v3__DirectResponseAction_msg_init = { }) }; +const upb_MiniTable* envoy__config__route__v3__DirectResponseAction_msg_init_ptr = &envoy__config__route__v3__DirectResponseAction_msg_init; const upb_MiniTable envoy__config__route__v3__NonForwardingAction_msg_init = { NULL, NULL, @@ -1179,8 +1217,9 @@ const upb_MiniTable envoy__config__route__v3__NonForwardingAction_msg_init = { #endif }; -static const upb_MiniTableSub envoy_config_route_v3_Decorator_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init}, +const upb_MiniTable* envoy__config__route__v3__NonForwardingAction_msg_init_ptr = &envoy__config__route__v3__NonForwardingAction_msg_init; +static const upb_MiniTableSubInternal envoy_config_route_v3_Decorator_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_route_v3_Decorator__fields[2] = { @@ -1201,11 +1240,12 @@ const upb_MiniTable envoy__config__route__v3__Decorator_msg_init = { }) }; -static const upb_MiniTableSub envoy_config_route_v3_Tracing_submsgs[4] = { - {.UPB_PRIVATE(submsg) = &envoy__type__v3__FractionalPercent_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__type__v3__FractionalPercent_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__type__v3__FractionalPercent_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__type__tracing__v3__CustomTag_msg_init}, +const upb_MiniTable* envoy__config__route__v3__Decorator_msg_init_ptr = &envoy__config__route__v3__Decorator_msg_init; +static const upb_MiniTableSubInternal envoy_config_route_v3_Tracing_submsgs[4] = { + {.UPB_PRIVATE(submsg) = &envoy__type__v3__FractionalPercent_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__type__v3__FractionalPercent_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__type__v3__FractionalPercent_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__type__tracing__v3__CustomTag_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_route_v3_Tracing__fields[4] = { @@ -1234,8 +1274,9 @@ const upb_MiniTable envoy__config__route__v3__Tracing_msg_init = { }) }; -static const upb_MiniTableSub envoy_config_route_v3_VirtualCluster_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__HeaderMatcher_msg_init}, +const upb_MiniTable* envoy__config__route__v3__Tracing_msg_init_ptr = &envoy__config__route__v3__Tracing_msg_init; +static const upb_MiniTableSubInternal envoy_config_route_v3_VirtualCluster_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__HeaderMatcher_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_route_v3_VirtualCluster__fields[2] = { @@ -1262,10 +1303,11 @@ const upb_MiniTable envoy__config__route__v3__VirtualCluster_msg_init = { }) }; -static const upb_MiniTableSub envoy_config_route_v3_RateLimit_submsgs[3] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RateLimit__Action_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RateLimit__Override_msg_init}, +const upb_MiniTable* envoy__config__route__v3__VirtualCluster_msg_init_ptr = &envoy__config__route__v3__VirtualCluster_msg_init; +static const upb_MiniTableSubInternal envoy_config_route_v3_RateLimit_submsgs[3] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RateLimit__Action_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RateLimit__Override_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_route_v3_RateLimit__fields[4] = { @@ -1290,18 +1332,19 @@ const upb_MiniTable envoy__config__route__v3__RateLimit_msg_init = { }) }; -static const upb_MiniTableSub envoy_config_route_v3_RateLimit_Action_submsgs[11] = { - {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RateLimit__Action__SourceCluster_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RateLimit__Action__DestinationCluster_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RateLimit__Action__RequestHeaders_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RateLimit__Action__RemoteAddress_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RateLimit__Action__GenericKey_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RateLimit__Action__HeaderValueMatch_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RateLimit__Action__DynamicMetaData_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RateLimit__Action__MetaData_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RateLimit__Action__MaskedRemoteAddress_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RateLimit__Action__QueryParameterValueMatch_msg_init}, +const upb_MiniTable* envoy__config__route__v3__RateLimit_msg_init_ptr = &envoy__config__route__v3__RateLimit_msg_init; +static const upb_MiniTableSubInternal envoy_config_route_v3_RateLimit_Action_submsgs[11] = { + {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RateLimit__Action__SourceCluster_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RateLimit__Action__DestinationCluster_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RateLimit__Action__RequestHeaders_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RateLimit__Action__RemoteAddress_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RateLimit__Action__GenericKey_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RateLimit__Action__HeaderValueMatch_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RateLimit__Action__DynamicMetaData_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RateLimit__Action__MetaData_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RateLimit__Action__MaskedRemoteAddress_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RateLimit__Action__QueryParameterValueMatch_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_route_v3_RateLimit_Action__fields[11] = { @@ -1345,6 +1388,7 @@ const upb_MiniTable envoy__config__route__v3__RateLimit__Action_msg_init = { }) }; +const upb_MiniTable* envoy__config__route__v3__RateLimit__Action_msg_init_ptr = &envoy__config__route__v3__RateLimit__Action_msg_init; const upb_MiniTable envoy__config__route__v3__RateLimit__Action__SourceCluster_msg_init = { NULL, NULL, @@ -1354,6 +1398,7 @@ const upb_MiniTable envoy__config__route__v3__RateLimit__Action__SourceCluster_m #endif }; +const upb_MiniTable* envoy__config__route__v3__RateLimit__Action__SourceCluster_msg_init_ptr = &envoy__config__route__v3__RateLimit__Action__SourceCluster_msg_init; const upb_MiniTable envoy__config__route__v3__RateLimit__Action__DestinationCluster_msg_init = { NULL, NULL, @@ -1363,6 +1408,7 @@ const upb_MiniTable envoy__config__route__v3__RateLimit__Action__DestinationClus #endif }; +const upb_MiniTable* envoy__config__route__v3__RateLimit__Action__DestinationCluster_msg_init_ptr = &envoy__config__route__v3__RateLimit__Action__DestinationCluster_msg_init; static const upb_MiniTableField envoy_config_route_v3_RateLimit_Action_RequestHeaders__fields[3] = { {1, UPB_SIZE(12, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, {2, UPB_SIZE(20, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, @@ -1384,6 +1430,7 @@ const upb_MiniTable envoy__config__route__v3__RateLimit__Action__RequestHeaders_ }) }; +const upb_MiniTable* envoy__config__route__v3__RateLimit__Action__RequestHeaders_msg_init_ptr = &envoy__config__route__v3__RateLimit__Action__RequestHeaders_msg_init; const upb_MiniTable envoy__config__route__v3__RateLimit__Action__RemoteAddress_msg_init = { NULL, NULL, @@ -1393,9 +1440,10 @@ const upb_MiniTable envoy__config__route__v3__RateLimit__Action__RemoteAddress_m #endif }; -static const upb_MiniTableSub envoy_config_route_v3_RateLimit_Action_MaskedRemoteAddress_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init}, +const upb_MiniTable* envoy__config__route__v3__RateLimit__Action__RemoteAddress_msg_init_ptr = &envoy__config__route__v3__RateLimit__Action__RemoteAddress_msg_init; +static const upb_MiniTableSubInternal envoy_config_route_v3_RateLimit_Action_MaskedRemoteAddress_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_route_v3_RateLimit_Action_MaskedRemoteAddress__fields[2] = { @@ -1412,6 +1460,7 @@ const upb_MiniTable envoy__config__route__v3__RateLimit__Action__MaskedRemoteAdd #endif }; +const upb_MiniTable* envoy__config__route__v3__RateLimit__Action__MaskedRemoteAddress_msg_init_ptr = &envoy__config__route__v3__RateLimit__Action__MaskedRemoteAddress_msg_init; static const upb_MiniTableField envoy_config_route_v3_RateLimit_Action_GenericKey__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)}, @@ -1432,9 +1481,10 @@ const upb_MiniTable envoy__config__route__v3__RateLimit__Action__GenericKey_msg_ }) }; -static const upb_MiniTableSub envoy_config_route_v3_RateLimit_Action_HeaderValueMatch_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__HeaderMatcher_msg_init}, +const upb_MiniTable* envoy__config__route__v3__RateLimit__Action__GenericKey_msg_init_ptr = &envoy__config__route__v3__RateLimit__Action__GenericKey_msg_init; +static const upb_MiniTableSubInternal envoy_config_route_v3_RateLimit_Action_HeaderValueMatch_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__HeaderMatcher_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_route_v3_RateLimit_Action_HeaderValueMatch__fields[4] = { @@ -1463,8 +1513,9 @@ const upb_MiniTable envoy__config__route__v3__RateLimit__Action__HeaderValueMatc }) }; -static const upb_MiniTableSub envoy_config_route_v3_RateLimit_Action_DynamicMetaData_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__type__metadata__v3__MetadataKey_msg_init}, +const upb_MiniTable* envoy__config__route__v3__RateLimit__Action__HeaderValueMatch_msg_init_ptr = &envoy__config__route__v3__RateLimit__Action__HeaderValueMatch_msg_init; +static const upb_MiniTableSubInternal envoy_config_route_v3_RateLimit_Action_DynamicMetaData_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__type__metadata__v3__MetadataKey_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_route_v3_RateLimit_Action_DynamicMetaData__fields[3] = { @@ -1488,8 +1539,9 @@ const upb_MiniTable envoy__config__route__v3__RateLimit__Action__DynamicMetaData }) }; -static const upb_MiniTableSub envoy_config_route_v3_RateLimit_Action_MetaData_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__type__metadata__v3__MetadataKey_msg_init}, +const upb_MiniTable* envoy__config__route__v3__RateLimit__Action__DynamicMetaData_msg_init_ptr = &envoy__config__route__v3__RateLimit__Action__DynamicMetaData_msg_init; +static const upb_MiniTableSubInternal envoy_config_route_v3_RateLimit_Action_MetaData_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__type__metadata__v3__MetadataKey_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_route_v3_RateLimit_Action_MetaData__fields[5] = { @@ -1519,9 +1571,10 @@ const upb_MiniTable envoy__config__route__v3__RateLimit__Action__MetaData_msg_in }) }; -static const upb_MiniTableSub envoy_config_route_v3_RateLimit_Action_QueryParameterValueMatch_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__QueryParameterMatcher_msg_init}, +const upb_MiniTable* envoy__config__route__v3__RateLimit__Action__MetaData_msg_init_ptr = &envoy__config__route__v3__RateLimit__Action__MetaData_msg_init; +static const upb_MiniTableSubInternal envoy_config_route_v3_RateLimit_Action_QueryParameterValueMatch_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__QueryParameterMatcher_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_route_v3_RateLimit_Action_QueryParameterValueMatch__fields[4] = { @@ -1550,8 +1603,9 @@ const upb_MiniTable envoy__config__route__v3__RateLimit__Action__QueryParameterV }) }; -static const upb_MiniTableSub envoy_config_route_v3_RateLimit_Override_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RateLimit__Override__DynamicMetadata_msg_init}, +const upb_MiniTable* envoy__config__route__v3__RateLimit__Action__QueryParameterValueMatch_msg_init_ptr = &envoy__config__route__v3__RateLimit__Action__QueryParameterValueMatch_msg_init; +static const upb_MiniTableSubInternal envoy_config_route_v3_RateLimit_Override_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RateLimit__Override__DynamicMetadata_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_route_v3_RateLimit_Override__fields[1] = { @@ -1571,8 +1625,9 @@ const upb_MiniTable envoy__config__route__v3__RateLimit__Override_msg_init = { }) }; -static const upb_MiniTableSub envoy_config_route_v3_RateLimit_Override_DynamicMetadata_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__type__metadata__v3__MetadataKey_msg_init}, +const upb_MiniTable* envoy__config__route__v3__RateLimit__Override_msg_init_ptr = &envoy__config__route__v3__RateLimit__Override_msg_init; +static const upb_MiniTableSubInternal envoy_config_route_v3_RateLimit_Override_DynamicMetadata_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__type__metadata__v3__MetadataKey_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_route_v3_RateLimit_Override_DynamicMetadata__fields[1] = { @@ -1588,10 +1643,11 @@ const upb_MiniTable envoy__config__route__v3__RateLimit__Override__DynamicMetada #endif }; -static const upb_MiniTableSub envoy_config_route_v3_HeaderMatcher_submsgs[3] = { - {.UPB_PRIVATE(submsg) = &envoy__type__v3__Int64Range_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__RegexMatcher_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__StringMatcher_msg_init}, +const upb_MiniTable* envoy__config__route__v3__RateLimit__Override__DynamicMetadata_msg_init_ptr = &envoy__config__route__v3__RateLimit__Override__DynamicMetadata_msg_init; +static const upb_MiniTableSubInternal envoy_config_route_v3_HeaderMatcher_submsgs[3] = { + {.UPB_PRIVATE(submsg) = &envoy__type__v3__Int64Range_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__RegexMatcher_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__StringMatcher_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_route_v3_HeaderMatcher__fields[11] = { @@ -1635,8 +1691,9 @@ const upb_MiniTable envoy__config__route__v3__HeaderMatcher_msg_init = { }) }; -static const upb_MiniTableSub envoy_config_route_v3_QueryParameterMatcher_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__StringMatcher_msg_init}, +const upb_MiniTable* envoy__config__route__v3__HeaderMatcher_msg_init_ptr = &envoy__config__route__v3__HeaderMatcher_msg_init; +static const upb_MiniTableSubInternal envoy_config_route_v3_QueryParameterMatcher_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__StringMatcher_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_route_v3_QueryParameterMatcher__fields[3] = { @@ -1664,9 +1721,10 @@ const upb_MiniTable envoy__config__route__v3__QueryParameterMatcher_msg_init = { }) }; -static const upb_MiniTableSub envoy_config_route_v3_InternalRedirectPolicy_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init}, +const upb_MiniTable* envoy__config__route__v3__QueryParameterMatcher_msg_init_ptr = &envoy__config__route__v3__QueryParameterMatcher_msg_init; +static const upb_MiniTableSubInternal envoy_config_route_v3_InternalRedirectPolicy_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_route_v3_InternalRedirectPolicy__fields[5] = { @@ -1696,8 +1754,9 @@ const upb_MiniTable envoy__config__route__v3__InternalRedirectPolicy_msg_init = }) }; -static const upb_MiniTableSub envoy_config_route_v3_FilterConfig_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init}, +const upb_MiniTable* envoy__config__route__v3__InternalRedirectPolicy_msg_init_ptr = &envoy__config__route__v3__InternalRedirectPolicy_msg_init; +static const upb_MiniTableSubInternal envoy_config_route_v3_FilterConfig_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_route_v3_FilterConfig__fields[3] = { @@ -1721,6 +1780,7 @@ const upb_MiniTable envoy__config__route__v3__FilterConfig_msg_init = { }) }; +const upb_MiniTable* envoy__config__route__v3__FilterConfig_msg_init_ptr = &envoy__config__route__v3__FilterConfig_msg_init; static const upb_MiniTable *messages_layout[58] = { &envoy__config__route__v3__VirtualHost_msg_init, &envoy__config__route__v3__VirtualHost__TypedPerFilterConfigEntry_msg_init, diff --git a/src/core/ext/upb-gen/envoy/config/route/v3/route_components.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/route/v3/route_components.upb_minitable.h index c11c9c4fb9b..35331367f84 100644 --- a/src/core/ext/upb-gen/envoy/config/route/v3/route_components.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/config/route/v3/route_components.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/config/route/v3/route_components.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_ROUTE_V3_ROUTE_COMPONENTS_PROTO_UPB_MINITABLE_H_ #define ENVOY_CONFIG_ROUTE_V3_ROUTE_COMPONENTS_PROTO_UPB_MINITABLE_H_ @@ -18,63 +19,121 @@ extern "C" { #endif extern const upb_MiniTable envoy__config__route__v3__VirtualHost_msg_init; +extern const upb_MiniTable* envoy__config__route__v3__VirtualHost_msg_init_ptr; extern const upb_MiniTable envoy__config__route__v3__VirtualHost__TypedPerFilterConfigEntry_msg_init; +extern const upb_MiniTable* envoy__config__route__v3__VirtualHost__TypedPerFilterConfigEntry_msg_init_ptr; extern const upb_MiniTable envoy__config__route__v3__FilterAction_msg_init; +extern const upb_MiniTable* envoy__config__route__v3__FilterAction_msg_init_ptr; extern const upb_MiniTable envoy__config__route__v3__RouteList_msg_init; +extern const upb_MiniTable* envoy__config__route__v3__RouteList_msg_init_ptr; extern const upb_MiniTable envoy__config__route__v3__Route_msg_init; +extern const upb_MiniTable* envoy__config__route__v3__Route_msg_init_ptr; extern const upb_MiniTable envoy__config__route__v3__Route__TypedPerFilterConfigEntry_msg_init; +extern const upb_MiniTable* envoy__config__route__v3__Route__TypedPerFilterConfigEntry_msg_init_ptr; extern const upb_MiniTable envoy__config__route__v3__WeightedCluster_msg_init; +extern const upb_MiniTable* envoy__config__route__v3__WeightedCluster_msg_init_ptr; extern const upb_MiniTable envoy__config__route__v3__WeightedCluster__ClusterWeight_msg_init; +extern const upb_MiniTable* envoy__config__route__v3__WeightedCluster__ClusterWeight_msg_init_ptr; extern const upb_MiniTable envoy__config__route__v3__WeightedCluster__ClusterWeight__TypedPerFilterConfigEntry_msg_init; +extern const upb_MiniTable* envoy__config__route__v3__WeightedCluster__ClusterWeight__TypedPerFilterConfigEntry_msg_init_ptr; extern const upb_MiniTable envoy__config__route__v3__ClusterSpecifierPlugin_msg_init; +extern const upb_MiniTable* envoy__config__route__v3__ClusterSpecifierPlugin_msg_init_ptr; extern const upb_MiniTable envoy__config__route__v3__RouteMatch_msg_init; +extern const upb_MiniTable* envoy__config__route__v3__RouteMatch_msg_init_ptr; extern const upb_MiniTable envoy__config__route__v3__RouteMatch__GrpcRouteMatchOptions_msg_init; +extern const upb_MiniTable* envoy__config__route__v3__RouteMatch__GrpcRouteMatchOptions_msg_init_ptr; extern const upb_MiniTable envoy__config__route__v3__RouteMatch__TlsContextMatchOptions_msg_init; +extern const upb_MiniTable* envoy__config__route__v3__RouteMatch__TlsContextMatchOptions_msg_init_ptr; extern const upb_MiniTable envoy__config__route__v3__RouteMatch__ConnectMatcher_msg_init; +extern const upb_MiniTable* envoy__config__route__v3__RouteMatch__ConnectMatcher_msg_init_ptr; extern const upb_MiniTable envoy__config__route__v3__CorsPolicy_msg_init; +extern const upb_MiniTable* envoy__config__route__v3__CorsPolicy_msg_init_ptr; extern const upb_MiniTable envoy__config__route__v3__RouteAction_msg_init; +extern const upb_MiniTable* envoy__config__route__v3__RouteAction_msg_init_ptr; extern const upb_MiniTable envoy__config__route__v3__RouteAction__RequestMirrorPolicy_msg_init; +extern const upb_MiniTable* envoy__config__route__v3__RouteAction__RequestMirrorPolicy_msg_init_ptr; extern const upb_MiniTable envoy__config__route__v3__RouteAction__HashPolicy_msg_init; +extern const upb_MiniTable* envoy__config__route__v3__RouteAction__HashPolicy_msg_init_ptr; extern const upb_MiniTable envoy__config__route__v3__RouteAction__HashPolicy__Header_msg_init; +extern const upb_MiniTable* envoy__config__route__v3__RouteAction__HashPolicy__Header_msg_init_ptr; extern const upb_MiniTable envoy__config__route__v3__RouteAction__HashPolicy__CookieAttribute_msg_init; +extern const upb_MiniTable* envoy__config__route__v3__RouteAction__HashPolicy__CookieAttribute_msg_init_ptr; extern const upb_MiniTable envoy__config__route__v3__RouteAction__HashPolicy__Cookie_msg_init; +extern const upb_MiniTable* envoy__config__route__v3__RouteAction__HashPolicy__Cookie_msg_init_ptr; extern const upb_MiniTable envoy__config__route__v3__RouteAction__HashPolicy__ConnectionProperties_msg_init; +extern const upb_MiniTable* envoy__config__route__v3__RouteAction__HashPolicy__ConnectionProperties_msg_init_ptr; extern const upb_MiniTable envoy__config__route__v3__RouteAction__HashPolicy__QueryParameter_msg_init; +extern const upb_MiniTable* envoy__config__route__v3__RouteAction__HashPolicy__QueryParameter_msg_init_ptr; extern const upb_MiniTable envoy__config__route__v3__RouteAction__HashPolicy__FilterState_msg_init; +extern const upb_MiniTable* envoy__config__route__v3__RouteAction__HashPolicy__FilterState_msg_init_ptr; extern const upb_MiniTable envoy__config__route__v3__RouteAction__UpgradeConfig_msg_init; +extern const upb_MiniTable* envoy__config__route__v3__RouteAction__UpgradeConfig_msg_init_ptr; extern const upb_MiniTable envoy__config__route__v3__RouteAction__UpgradeConfig__ConnectConfig_msg_init; +extern const upb_MiniTable* envoy__config__route__v3__RouteAction__UpgradeConfig__ConnectConfig_msg_init_ptr; extern const upb_MiniTable envoy__config__route__v3__RouteAction__MaxStreamDuration_msg_init; +extern const upb_MiniTable* envoy__config__route__v3__RouteAction__MaxStreamDuration_msg_init_ptr; extern const upb_MiniTable envoy__config__route__v3__RetryPolicy_msg_init; +extern const upb_MiniTable* envoy__config__route__v3__RetryPolicy_msg_init_ptr; extern const upb_MiniTable envoy__config__route__v3__RetryPolicy__RetryPriority_msg_init; +extern const upb_MiniTable* envoy__config__route__v3__RetryPolicy__RetryPriority_msg_init_ptr; extern const upb_MiniTable envoy__config__route__v3__RetryPolicy__RetryHostPredicate_msg_init; +extern const upb_MiniTable* envoy__config__route__v3__RetryPolicy__RetryHostPredicate_msg_init_ptr; extern const upb_MiniTable envoy__config__route__v3__RetryPolicy__RetryBackOff_msg_init; +extern const upb_MiniTable* envoy__config__route__v3__RetryPolicy__RetryBackOff_msg_init_ptr; extern const upb_MiniTable envoy__config__route__v3__RetryPolicy__ResetHeader_msg_init; +extern const upb_MiniTable* envoy__config__route__v3__RetryPolicy__ResetHeader_msg_init_ptr; extern const upb_MiniTable envoy__config__route__v3__RetryPolicy__RateLimitedRetryBackOff_msg_init; +extern const upb_MiniTable* envoy__config__route__v3__RetryPolicy__RateLimitedRetryBackOff_msg_init_ptr; extern const upb_MiniTable envoy__config__route__v3__HedgePolicy_msg_init; +extern const upb_MiniTable* envoy__config__route__v3__HedgePolicy_msg_init_ptr; extern const upb_MiniTable envoy__config__route__v3__RedirectAction_msg_init; +extern const upb_MiniTable* envoy__config__route__v3__RedirectAction_msg_init_ptr; extern const upb_MiniTable envoy__config__route__v3__DirectResponseAction_msg_init; +extern const upb_MiniTable* envoy__config__route__v3__DirectResponseAction_msg_init_ptr; extern const upb_MiniTable envoy__config__route__v3__NonForwardingAction_msg_init; +extern const upb_MiniTable* envoy__config__route__v3__NonForwardingAction_msg_init_ptr; extern const upb_MiniTable envoy__config__route__v3__Decorator_msg_init; +extern const upb_MiniTable* envoy__config__route__v3__Decorator_msg_init_ptr; extern const upb_MiniTable envoy__config__route__v3__Tracing_msg_init; +extern const upb_MiniTable* envoy__config__route__v3__Tracing_msg_init_ptr; extern const upb_MiniTable envoy__config__route__v3__VirtualCluster_msg_init; +extern const upb_MiniTable* envoy__config__route__v3__VirtualCluster_msg_init_ptr; extern const upb_MiniTable envoy__config__route__v3__RateLimit_msg_init; +extern const upb_MiniTable* envoy__config__route__v3__RateLimit_msg_init_ptr; extern const upb_MiniTable envoy__config__route__v3__RateLimit__Action_msg_init; +extern const upb_MiniTable* envoy__config__route__v3__RateLimit__Action_msg_init_ptr; extern const upb_MiniTable envoy__config__route__v3__RateLimit__Action__SourceCluster_msg_init; +extern const upb_MiniTable* envoy__config__route__v3__RateLimit__Action__SourceCluster_msg_init_ptr; extern const upb_MiniTable envoy__config__route__v3__RateLimit__Action__DestinationCluster_msg_init; +extern const upb_MiniTable* envoy__config__route__v3__RateLimit__Action__DestinationCluster_msg_init_ptr; extern const upb_MiniTable envoy__config__route__v3__RateLimit__Action__RequestHeaders_msg_init; +extern const upb_MiniTable* envoy__config__route__v3__RateLimit__Action__RequestHeaders_msg_init_ptr; extern const upb_MiniTable envoy__config__route__v3__RateLimit__Action__RemoteAddress_msg_init; +extern const upb_MiniTable* envoy__config__route__v3__RateLimit__Action__RemoteAddress_msg_init_ptr; extern const upb_MiniTable envoy__config__route__v3__RateLimit__Action__MaskedRemoteAddress_msg_init; +extern const upb_MiniTable* envoy__config__route__v3__RateLimit__Action__MaskedRemoteAddress_msg_init_ptr; extern const upb_MiniTable envoy__config__route__v3__RateLimit__Action__GenericKey_msg_init; +extern const upb_MiniTable* envoy__config__route__v3__RateLimit__Action__GenericKey_msg_init_ptr; extern const upb_MiniTable envoy__config__route__v3__RateLimit__Action__HeaderValueMatch_msg_init; +extern const upb_MiniTable* envoy__config__route__v3__RateLimit__Action__HeaderValueMatch_msg_init_ptr; extern const upb_MiniTable envoy__config__route__v3__RateLimit__Action__DynamicMetaData_msg_init; +extern const upb_MiniTable* envoy__config__route__v3__RateLimit__Action__DynamicMetaData_msg_init_ptr; extern const upb_MiniTable envoy__config__route__v3__RateLimit__Action__MetaData_msg_init; +extern const upb_MiniTable* envoy__config__route__v3__RateLimit__Action__MetaData_msg_init_ptr; extern const upb_MiniTable envoy__config__route__v3__RateLimit__Action__QueryParameterValueMatch_msg_init; +extern const upb_MiniTable* envoy__config__route__v3__RateLimit__Action__QueryParameterValueMatch_msg_init_ptr; extern const upb_MiniTable envoy__config__route__v3__RateLimit__Override_msg_init; +extern const upb_MiniTable* envoy__config__route__v3__RateLimit__Override_msg_init_ptr; extern const upb_MiniTable envoy__config__route__v3__RateLimit__Override__DynamicMetadata_msg_init; +extern const upb_MiniTable* envoy__config__route__v3__RateLimit__Override__DynamicMetadata_msg_init_ptr; extern const upb_MiniTable envoy__config__route__v3__HeaderMatcher_msg_init; +extern const upb_MiniTable* envoy__config__route__v3__HeaderMatcher_msg_init_ptr; extern const upb_MiniTable envoy__config__route__v3__QueryParameterMatcher_msg_init; +extern const upb_MiniTable* envoy__config__route__v3__QueryParameterMatcher_msg_init_ptr; extern const upb_MiniTable envoy__config__route__v3__InternalRedirectPolicy_msg_init; +extern const upb_MiniTable* envoy__config__route__v3__InternalRedirectPolicy_msg_init_ptr; extern const upb_MiniTable envoy__config__route__v3__FilterConfig_msg_init; +extern const upb_MiniTable* envoy__config__route__v3__FilterConfig_msg_init_ptr; extern const upb_MiniTableFile envoy_config_route_v3_route_components_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/config/route/v3/scoped_route.upb.h b/src/core/ext/upb-gen/envoy/config/route/v3/scoped_route.upb.h index c64c2cf0d8d..2378a9d697a 100644 --- a/src/core/ext/upb-gen/envoy/config/route/v3/scoped_route.upb.h +++ b/src/core/ext/upb-gen/envoy/config/route/v3/scoped_route.upb.h @@ -3,7 +3,8 @@ * envoy/config/route/v3/scoped_route.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_ROUTE_V3_SCOPED_ROUTE_PROTO_UPB_H_ #define ENVOY_CONFIG_ROUTE_V3_SCOPED_ROUTE_PROTO_UPB_H_ @@ -100,6 +101,7 @@ UPB_INLINE const envoy_config_route_v3_ScopedRouteConfiguration_Key* envoy_confi const envoy_config_route_v3_ScopedRouteConfiguration_Key* default_val = NULL; const envoy_config_route_v3_ScopedRouteConfiguration_Key* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__ScopedRouteConfiguration__Key_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -128,6 +130,7 @@ UPB_INLINE const struct envoy_config_route_v3_RouteConfiguration* envoy_config_r const struct envoy_config_route_v3_RouteConfiguration* default_val = NULL; const struct envoy_config_route_v3_RouteConfiguration* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RouteConfiguration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -147,6 +150,7 @@ UPB_INLINE void envoy_config_route_v3_ScopedRouteConfiguration_set_route_configu } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__ScopedRouteConfiguration__Key_msg_init); 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) { @@ -163,6 +167,7 @@ UPB_INLINE void envoy_config_route_v3_ScopedRouteConfiguration_set_on_demand(env } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RouteConfiguration_msg_init); 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) { @@ -216,6 +221,7 @@ UPB_INLINE void envoy_config_route_v3_ScopedRouteConfiguration_Key_clear_fragmen } UPB_INLINE const envoy_config_route_v3_ScopedRouteConfiguration_Key_Fragment* const* envoy_config_route_v3_ScopedRouteConfiguration_Key_fragments(const envoy_config_route_v3_ScopedRouteConfiguration_Key* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__ScopedRouteConfiguration__Key__Fragment_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -227,6 +233,7 @@ UPB_INLINE const envoy_config_route_v3_ScopedRouteConfiguration_Key_Fragment* co } UPB_INLINE const upb_Array* _envoy_config_route_v3_ScopedRouteConfiguration_Key_fragments_upb_array(const envoy_config_route_v3_ScopedRouteConfiguration_Key* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__ScopedRouteConfiguration__Key__Fragment_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -235,6 +242,7 @@ UPB_INLINE const upb_Array* _envoy_config_route_v3_ScopedRouteConfiguration_Key_ } UPB_INLINE upb_Array* _envoy_config_route_v3_ScopedRouteConfiguration_Key_fragments_mutable_upb_array(envoy_config_route_v3_ScopedRouteConfiguration_Key* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__ScopedRouteConfiguration__Key__Fragment_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -245,6 +253,7 @@ UPB_INLINE upb_Array* _envoy_config_route_v3_ScopedRouteConfiguration_Key_fragme UPB_INLINE envoy_config_route_v3_ScopedRouteConfiguration_Key_Fragment** envoy_config_route_v3_ScopedRouteConfiguration_Key_mutable_fragments(envoy_config_route_v3_ScopedRouteConfiguration_Key* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__ScopedRouteConfiguration__Key__Fragment_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -261,6 +270,7 @@ UPB_INLINE envoy_config_route_v3_ScopedRouteConfiguration_Key_Fragment** envoy_c } UPB_INLINE struct envoy_config_route_v3_ScopedRouteConfiguration_Key_Fragment* envoy_config_route_v3_ScopedRouteConfiguration_Key_add_fragments(envoy_config_route_v3_ScopedRouteConfiguration_Key* msg, upb_Arena* arena) { upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__ScopedRouteConfiguration__Key__Fragment_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( diff --git a/src/core/ext/upb-gen/envoy/config/route/v3/scoped_route.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/route/v3/scoped_route.upb_minitable.c index b9f67e87afb..f0c3885812b 100644 --- a/src/core/ext/upb-gen/envoy/config/route/v3/scoped_route.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/config/route/v3/scoped_route.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/config/route/v3/scoped_route.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -17,9 +18,10 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub envoy_config_route_v3_ScopedRouteConfiguration_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__ScopedRouteConfiguration__Key_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RouteConfiguration_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal envoy_config_route_v3_ScopedRouteConfiguration_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__ScopedRouteConfiguration__Key_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RouteConfiguration_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_route_v3_ScopedRouteConfiguration__fields[5] = { @@ -49,8 +51,9 @@ const upb_MiniTable envoy__config__route__v3__ScopedRouteConfiguration_msg_init }) }; -static const upb_MiniTableSub envoy_config_route_v3_ScopedRouteConfiguration_Key_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__ScopedRouteConfiguration__Key__Fragment_msg_init}, +const upb_MiniTable* envoy__config__route__v3__ScopedRouteConfiguration_msg_init_ptr = &envoy__config__route__v3__ScopedRouteConfiguration_msg_init; +static const upb_MiniTableSubInternal envoy_config_route_v3_ScopedRouteConfiguration_Key_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__ScopedRouteConfiguration__Key__Fragment_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_route_v3_ScopedRouteConfiguration_Key__fields[1] = { @@ -70,6 +73,7 @@ const upb_MiniTable envoy__config__route__v3__ScopedRouteConfiguration__Key_msg_ }) }; +const upb_MiniTable* envoy__config__route__v3__ScopedRouteConfiguration__Key_msg_init_ptr = &envoy__config__route__v3__ScopedRouteConfiguration__Key_msg_init; static const upb_MiniTableField envoy_config_route_v3_ScopedRouteConfiguration_Key_Fragment__fields[1] = { {1, UPB_SIZE(12, 16), -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, }; @@ -87,6 +91,7 @@ const upb_MiniTable envoy__config__route__v3__ScopedRouteConfiguration__Key__Fra }) }; +const upb_MiniTable* envoy__config__route__v3__ScopedRouteConfiguration__Key__Fragment_msg_init_ptr = &envoy__config__route__v3__ScopedRouteConfiguration__Key__Fragment_msg_init; static const upb_MiniTable *messages_layout[3] = { &envoy__config__route__v3__ScopedRouteConfiguration_msg_init, &envoy__config__route__v3__ScopedRouteConfiguration__Key_msg_init, diff --git a/src/core/ext/upb-gen/envoy/config/route/v3/scoped_route.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/route/v3/scoped_route.upb_minitable.h index 3d0c5a10f8c..ab4ede108ea 100644 --- a/src/core/ext/upb-gen/envoy/config/route/v3/scoped_route.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/config/route/v3/scoped_route.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/config/route/v3/scoped_route.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_ROUTE_V3_SCOPED_ROUTE_PROTO_UPB_MINITABLE_H_ #define ENVOY_CONFIG_ROUTE_V3_SCOPED_ROUTE_PROTO_UPB_MINITABLE_H_ @@ -18,8 +19,11 @@ extern "C" { #endif extern const upb_MiniTable envoy__config__route__v3__ScopedRouteConfiguration_msg_init; +extern const upb_MiniTable* envoy__config__route__v3__ScopedRouteConfiguration_msg_init_ptr; extern const upb_MiniTable envoy__config__route__v3__ScopedRouteConfiguration__Key_msg_init; +extern const upb_MiniTable* envoy__config__route__v3__ScopedRouteConfiguration__Key_msg_init_ptr; extern const upb_MiniTable envoy__config__route__v3__ScopedRouteConfiguration__Key__Fragment_msg_init; +extern const upb_MiniTable* envoy__config__route__v3__ScopedRouteConfiguration__Key__Fragment_msg_init_ptr; extern const upb_MiniTableFile envoy_config_route_v3_scoped_route_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/config/tap/v3/common.upb.h b/src/core/ext/upb-gen/envoy/config/tap/v3/common.upb.h index bc779097a52..570c4cf1995 100644 --- a/src/core/ext/upb-gen/envoy/config/tap/v3/common.upb.h +++ b/src/core/ext/upb-gen/envoy/config/tap/v3/common.upb.h @@ -3,7 +3,8 @@ * envoy/config/tap/v3/common.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_TAP_V3_COMMON_PROTO_UPB_H_ #define ENVOY_CONFIG_TAP_V3_COMMON_PROTO_UPB_H_ @@ -105,6 +106,7 @@ UPB_INLINE const envoy_config_tap_v3_MatchPredicate* envoy_config_tap_v3_TapConf const envoy_config_tap_v3_MatchPredicate* default_val = NULL; const envoy_config_tap_v3_MatchPredicate* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__tap__v3__MatchPredicate_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -121,6 +123,7 @@ UPB_INLINE const envoy_config_tap_v3_OutputConfig* envoy_config_tap_v3_TapConfig const envoy_config_tap_v3_OutputConfig* default_val = NULL; const envoy_config_tap_v3_OutputConfig* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__tap__v3__OutputConfig_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -137,6 +140,7 @@ UPB_INLINE const struct envoy_config_core_v3_RuntimeFractionalPercent* envoy_con const struct envoy_config_core_v3_RuntimeFractionalPercent* default_val = NULL; const struct envoy_config_core_v3_RuntimeFractionalPercent* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__RuntimeFractionalPercent_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -153,6 +157,7 @@ UPB_INLINE const struct envoy_config_common_matcher_v3_MatchPredicate* envoy_con const struct envoy_config_common_matcher_v3_MatchPredicate* default_val = NULL; const struct envoy_config_common_matcher_v3_MatchPredicate* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__common__matcher__v3__MatchPredicate_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -164,6 +169,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__tap__v3__MatchPredicate_msg_init); 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) { @@ -176,6 +182,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__tap__v3__OutputConfig_msg_init); 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) { @@ -188,6 +195,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__RuntimeFractionalPercent_msg_init); 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) { @@ -200,6 +208,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__common__matcher__v3__MatchPredicate_msg_init); 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) { @@ -273,6 +282,7 @@ UPB_INLINE const envoy_config_tap_v3_MatchPredicate_MatchSet* envoy_config_tap_v const envoy_config_tap_v3_MatchPredicate_MatchSet* default_val = NULL; const envoy_config_tap_v3_MatchPredicate_MatchSet* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__tap__v3__MatchPredicate__MatchSet_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -289,6 +299,7 @@ UPB_INLINE const envoy_config_tap_v3_MatchPredicate_MatchSet* envoy_config_tap_v const envoy_config_tap_v3_MatchPredicate_MatchSet* default_val = NULL; const envoy_config_tap_v3_MatchPredicate_MatchSet* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__tap__v3__MatchPredicate__MatchSet_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -305,6 +316,7 @@ UPB_INLINE const envoy_config_tap_v3_MatchPredicate* envoy_config_tap_v3_MatchPr const envoy_config_tap_v3_MatchPredicate* default_val = NULL; const envoy_config_tap_v3_MatchPredicate* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__tap__v3__MatchPredicate_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -337,6 +349,7 @@ UPB_INLINE const envoy_config_tap_v3_HttpHeadersMatch* envoy_config_tap_v3_Match const envoy_config_tap_v3_HttpHeadersMatch* default_val = NULL; const envoy_config_tap_v3_HttpHeadersMatch* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__tap__v3__HttpHeadersMatch_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -353,6 +366,7 @@ UPB_INLINE const envoy_config_tap_v3_HttpHeadersMatch* envoy_config_tap_v3_Match const envoy_config_tap_v3_HttpHeadersMatch* default_val = NULL; const envoy_config_tap_v3_HttpHeadersMatch* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__tap__v3__HttpHeadersMatch_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -369,6 +383,7 @@ UPB_INLINE const envoy_config_tap_v3_HttpHeadersMatch* envoy_config_tap_v3_Match const envoy_config_tap_v3_HttpHeadersMatch* default_val = NULL; const envoy_config_tap_v3_HttpHeadersMatch* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__tap__v3__HttpHeadersMatch_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -385,6 +400,7 @@ UPB_INLINE const envoy_config_tap_v3_HttpHeadersMatch* envoy_config_tap_v3_Match const envoy_config_tap_v3_HttpHeadersMatch* default_val = NULL; const envoy_config_tap_v3_HttpHeadersMatch* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__tap__v3__HttpHeadersMatch_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -401,6 +417,7 @@ UPB_INLINE const envoy_config_tap_v3_HttpGenericBodyMatch* envoy_config_tap_v3_M const envoy_config_tap_v3_HttpGenericBodyMatch* default_val = NULL; const envoy_config_tap_v3_HttpGenericBodyMatch* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__tap__v3__HttpGenericBodyMatch_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -417,6 +434,7 @@ UPB_INLINE const envoy_config_tap_v3_HttpGenericBodyMatch* envoy_config_tap_v3_M const envoy_config_tap_v3_HttpGenericBodyMatch* default_val = NULL; const envoy_config_tap_v3_HttpGenericBodyMatch* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__tap__v3__HttpGenericBodyMatch_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -428,6 +446,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__tap__v3__MatchPredicate__MatchSet_msg_init); 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) { @@ -440,6 +459,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__tap__v3__MatchPredicate__MatchSet_msg_init); 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) { @@ -452,6 +472,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__tap__v3__MatchPredicate_msg_init); 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) { @@ -468,6 +489,7 @@ UPB_INLINE void envoy_config_tap_v3_MatchPredicate_set_any_match(envoy_config_ta } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__tap__v3__HttpHeadersMatch_msg_init); 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) { @@ -480,6 +502,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__tap__v3__HttpHeadersMatch_msg_init); 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) { @@ -492,6 +515,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__tap__v3__HttpHeadersMatch_msg_init); 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) { @@ -504,6 +528,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__tap__v3__HttpHeadersMatch_msg_init); 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) { @@ -516,6 +541,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__tap__v3__HttpGenericBodyMatch_msg_init); 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) { @@ -528,6 +554,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__tap__v3__HttpGenericBodyMatch_msg_init); 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) { @@ -581,6 +608,7 @@ UPB_INLINE void envoy_config_tap_v3_MatchPredicate_MatchSet_clear_rules(envoy_co } UPB_INLINE const envoy_config_tap_v3_MatchPredicate* const* envoy_config_tap_v3_MatchPredicate_MatchSet_rules(const envoy_config_tap_v3_MatchPredicate_MatchSet* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__tap__v3__MatchPredicate_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -592,6 +620,7 @@ UPB_INLINE const envoy_config_tap_v3_MatchPredicate* const* envoy_config_tap_v3_ } UPB_INLINE const upb_Array* _envoy_config_tap_v3_MatchPredicate_MatchSet_rules_upb_array(const envoy_config_tap_v3_MatchPredicate_MatchSet* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__tap__v3__MatchPredicate_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -600,6 +629,7 @@ UPB_INLINE const upb_Array* _envoy_config_tap_v3_MatchPredicate_MatchSet_rules_u } UPB_INLINE upb_Array* _envoy_config_tap_v3_MatchPredicate_MatchSet_rules_mutable_upb_array(envoy_config_tap_v3_MatchPredicate_MatchSet* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__tap__v3__MatchPredicate_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -610,6 +640,7 @@ UPB_INLINE upb_Array* _envoy_config_tap_v3_MatchPredicate_MatchSet_rules_mutable UPB_INLINE envoy_config_tap_v3_MatchPredicate** envoy_config_tap_v3_MatchPredicate_MatchSet_mutable_rules(envoy_config_tap_v3_MatchPredicate_MatchSet* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__tap__v3__MatchPredicate_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -626,6 +657,7 @@ UPB_INLINE envoy_config_tap_v3_MatchPredicate** envoy_config_tap_v3_MatchPredica } UPB_INLINE struct envoy_config_tap_v3_MatchPredicate* envoy_config_tap_v3_MatchPredicate_MatchSet_add_rules(envoy_config_tap_v3_MatchPredicate_MatchSet* msg, upb_Arena* arena) { upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__tap__v3__MatchPredicate_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -681,6 +713,7 @@ UPB_INLINE void envoy_config_tap_v3_HttpHeadersMatch_clear_headers(envoy_config_ } UPB_INLINE const struct envoy_config_route_v3_HeaderMatcher* const* envoy_config_tap_v3_HttpHeadersMatch_headers(const envoy_config_tap_v3_HttpHeadersMatch* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__HeaderMatcher_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -692,6 +725,7 @@ UPB_INLINE const struct envoy_config_route_v3_HeaderMatcher* const* envoy_config } UPB_INLINE const upb_Array* _envoy_config_tap_v3_HttpHeadersMatch_headers_upb_array(const envoy_config_tap_v3_HttpHeadersMatch* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__HeaderMatcher_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -700,6 +734,7 @@ UPB_INLINE const upb_Array* _envoy_config_tap_v3_HttpHeadersMatch_headers_upb_ar } UPB_INLINE upb_Array* _envoy_config_tap_v3_HttpHeadersMatch_headers_mutable_upb_array(envoy_config_tap_v3_HttpHeadersMatch* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__HeaderMatcher_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -710,6 +745,7 @@ UPB_INLINE upb_Array* _envoy_config_tap_v3_HttpHeadersMatch_headers_mutable_upb_ UPB_INLINE struct envoy_config_route_v3_HeaderMatcher** envoy_config_tap_v3_HttpHeadersMatch_mutable_headers(envoy_config_tap_v3_HttpHeadersMatch* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__HeaderMatcher_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -726,6 +762,7 @@ UPB_INLINE struct envoy_config_route_v3_HeaderMatcher** envoy_config_tap_v3_Http } UPB_INLINE struct envoy_config_route_v3_HeaderMatcher* envoy_config_tap_v3_HttpHeadersMatch_add_headers(envoy_config_tap_v3_HttpHeadersMatch* msg, upb_Arena* arena) { upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__HeaderMatcher_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -793,6 +830,7 @@ UPB_INLINE void envoy_config_tap_v3_HttpGenericBodyMatch_clear_patterns(envoy_co } UPB_INLINE const envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch* const* envoy_config_tap_v3_HttpGenericBodyMatch_patterns(const envoy_config_tap_v3_HttpGenericBodyMatch* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__tap__v3__HttpGenericBodyMatch__GenericTextMatch_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -804,6 +842,7 @@ UPB_INLINE const envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch* cons } UPB_INLINE const upb_Array* _envoy_config_tap_v3_HttpGenericBodyMatch_patterns_upb_array(const envoy_config_tap_v3_HttpGenericBodyMatch* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__tap__v3__HttpGenericBodyMatch__GenericTextMatch_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -812,6 +851,7 @@ UPB_INLINE const upb_Array* _envoy_config_tap_v3_HttpGenericBodyMatch_patterns_u } UPB_INLINE upb_Array* _envoy_config_tap_v3_HttpGenericBodyMatch_patterns_mutable_upb_array(envoy_config_tap_v3_HttpGenericBodyMatch* msg, size_t* size, upb_Arena* arena) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__tap__v3__HttpGenericBodyMatch__GenericTextMatch_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -826,6 +866,7 @@ UPB_INLINE void envoy_config_tap_v3_HttpGenericBodyMatch_set_bytes_limit(envoy_c } 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__tap__v3__HttpGenericBodyMatch__GenericTextMatch_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -842,6 +883,7 @@ UPB_INLINE envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch** envoy_con } UPB_INLINE struct envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch* envoy_config_tap_v3_HttpGenericBodyMatch_add_patterns(envoy_config_tap_v3_HttpGenericBodyMatch* msg, upb_Arena* arena) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__tap__v3__HttpGenericBodyMatch__GenericTextMatch_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -985,6 +1027,7 @@ UPB_INLINE void envoy_config_tap_v3_OutputConfig_clear_sinks(envoy_config_tap_v3 } UPB_INLINE const envoy_config_tap_v3_OutputSink* const* envoy_config_tap_v3_OutputConfig_sinks(const envoy_config_tap_v3_OutputConfig* msg, size_t* size) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__tap__v3__OutputSink_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -996,6 +1039,7 @@ UPB_INLINE const envoy_config_tap_v3_OutputSink* const* envoy_config_tap_v3_Outp } UPB_INLINE const upb_Array* _envoy_config_tap_v3_OutputConfig_sinks_upb_array(const envoy_config_tap_v3_OutputConfig* msg, size_t* size) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__tap__v3__OutputSink_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -1004,6 +1048,7 @@ UPB_INLINE const upb_Array* _envoy_config_tap_v3_OutputConfig_sinks_upb_array(co } UPB_INLINE upb_Array* _envoy_config_tap_v3_OutputConfig_sinks_mutable_upb_array(envoy_config_tap_v3_OutputConfig* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__tap__v3__OutputSink_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -1019,6 +1064,7 @@ UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_tap_v3_OutputC const struct google_protobuf_UInt32Value* default_val = NULL; const struct google_protobuf_UInt32Value* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1035,6 +1081,7 @@ UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_tap_v3_OutputC const struct google_protobuf_UInt32Value* default_val = NULL; const struct google_protobuf_UInt32Value* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1058,6 +1105,7 @@ UPB_INLINE bool envoy_config_tap_v3_OutputConfig_streaming(const envoy_config_ta UPB_INLINE envoy_config_tap_v3_OutputSink** envoy_config_tap_v3_OutputConfig_mutable_sinks(envoy_config_tap_v3_OutputConfig* msg, size_t* size) { upb_MiniTableField field = {1, UPB_SIZE(12, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__tap__v3__OutputSink_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1074,6 +1122,7 @@ UPB_INLINE envoy_config_tap_v3_OutputSink** envoy_config_tap_v3_OutputConfig_res } UPB_INLINE struct envoy_config_tap_v3_OutputSink* envoy_config_tap_v3_OutputConfig_add_sinks(envoy_config_tap_v3_OutputConfig* msg, upb_Arena* arena) { upb_MiniTableField field = {1, UPB_SIZE(12, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__tap__v3__OutputSink_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -1088,6 +1137,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); 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) { @@ -1100,6 +1150,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); 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) { @@ -1184,6 +1235,7 @@ UPB_INLINE const envoy_config_tap_v3_StreamingAdminSink* envoy_config_tap_v3_Out const envoy_config_tap_v3_StreamingAdminSink* default_val = NULL; const envoy_config_tap_v3_StreamingAdminSink* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__tap__v3__StreamingAdminSink_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1200,6 +1252,7 @@ UPB_INLINE const envoy_config_tap_v3_FilePerTapSink* envoy_config_tap_v3_OutputS const envoy_config_tap_v3_FilePerTapSink* default_val = NULL; const envoy_config_tap_v3_FilePerTapSink* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__tap__v3__FilePerTapSink_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1216,6 +1269,7 @@ UPB_INLINE const envoy_config_tap_v3_StreamingGrpcSink* envoy_config_tap_v3_Outp const envoy_config_tap_v3_StreamingGrpcSink* default_val = NULL; const envoy_config_tap_v3_StreamingGrpcSink* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__tap__v3__StreamingGrpcSink_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1232,6 +1286,7 @@ UPB_INLINE const envoy_config_tap_v3_BufferedAdminSink* envoy_config_tap_v3_Outp const envoy_config_tap_v3_BufferedAdminSink* default_val = NULL; const envoy_config_tap_v3_BufferedAdminSink* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__tap__v3__BufferedAdminSink_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1248,6 +1303,7 @@ UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_ const struct envoy_config_core_v3_TypedExtensionConfig* default_val = NULL; const struct envoy_config_core_v3_TypedExtensionConfig* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1263,6 +1319,7 @@ UPB_INLINE void envoy_config_tap_v3_OutputSink_set_format(envoy_config_tap_v3_Ou } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__tap__v3__StreamingAdminSink_msg_init); 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) { @@ -1275,6 +1332,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__tap__v3__FilePerTapSink_msg_init); 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) { @@ -1287,6 +1345,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__tap__v3__StreamingGrpcSink_msg_init); 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) { @@ -1299,6 +1358,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__tap__v3__BufferedAdminSink_msg_init); 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) { @@ -1311,6 +1371,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); 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) { @@ -1416,6 +1477,7 @@ UPB_INLINE const struct google_protobuf_Duration* envoy_config_tap_v3_BufferedAd 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1431,6 +1493,7 @@ UPB_INLINE void envoy_config_tap_v3_BufferedAdminSink_set_max_traces(envoy_confi } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { @@ -1552,6 +1615,7 @@ UPB_INLINE const struct envoy_config_core_v3_GrpcService* envoy_config_tap_v3_St const struct envoy_config_core_v3_GrpcService* default_val = NULL; const struct envoy_config_core_v3_GrpcService* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__GrpcService_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1567,6 +1631,7 @@ UPB_INLINE void envoy_config_tap_v3_StreamingGrpcSink_set_tap_id(envoy_config_ta } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__GrpcService_msg_init); 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) { diff --git a/src/core/ext/upb-gen/envoy/config/tap/v3/common.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/tap/v3/common.upb_minitable.c index 47919d16293..4b220d07431 100644 --- a/src/core/ext/upb-gen/envoy/config/tap/v3/common.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/config/tap/v3/common.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/config/tap/v3/common.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -23,11 +24,12 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub envoy_config_tap_v3_TapConfig_submsgs[4] = { - {.UPB_PRIVATE(submsg) = &envoy__config__tap__v3__MatchPredicate_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__tap__v3__OutputConfig_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__RuntimeFractionalPercent_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__common__matcher__v3__MatchPredicate_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal envoy_config_tap_v3_TapConfig_submsgs[4] = { + {.UPB_PRIVATE(submsg) = &envoy__config__tap__v3__MatchPredicate_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__tap__v3__OutputConfig_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__RuntimeFractionalPercent_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__common__matcher__v3__MatchPredicate_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_tap_v3_TapConfig__fields[4] = { @@ -46,16 +48,17 @@ const upb_MiniTable envoy__config__tap__v3__TapConfig_msg_init = { #endif }; -static const upb_MiniTableSub envoy_config_tap_v3_MatchPredicate_submsgs[9] = { - {.UPB_PRIVATE(submsg) = &envoy__config__tap__v3__MatchPredicate__MatchSet_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__tap__v3__MatchPredicate__MatchSet_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__tap__v3__MatchPredicate_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__tap__v3__HttpHeadersMatch_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__tap__v3__HttpHeadersMatch_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__tap__v3__HttpHeadersMatch_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__tap__v3__HttpHeadersMatch_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__tap__v3__HttpGenericBodyMatch_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__tap__v3__HttpGenericBodyMatch_msg_init}, +const upb_MiniTable* envoy__config__tap__v3__TapConfig_msg_init_ptr = &envoy__config__tap__v3__TapConfig_msg_init; +static const upb_MiniTableSubInternal envoy_config_tap_v3_MatchPredicate_submsgs[9] = { + {.UPB_PRIVATE(submsg) = &envoy__config__tap__v3__MatchPredicate__MatchSet_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__tap__v3__MatchPredicate__MatchSet_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__tap__v3__MatchPredicate_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__tap__v3__HttpHeadersMatch_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__tap__v3__HttpHeadersMatch_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__tap__v3__HttpHeadersMatch_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__tap__v3__HttpHeadersMatch_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__tap__v3__HttpGenericBodyMatch_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__tap__v3__HttpGenericBodyMatch_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_tap_v3_MatchPredicate__fields[10] = { @@ -98,8 +101,9 @@ const upb_MiniTable envoy__config__tap__v3__MatchPredicate_msg_init = { }) }; -static const upb_MiniTableSub envoy_config_tap_v3_MatchPredicate_MatchSet_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__config__tap__v3__MatchPredicate_msg_init}, +const upb_MiniTable* envoy__config__tap__v3__MatchPredicate_msg_init_ptr = &envoy__config__tap__v3__MatchPredicate_msg_init; +static const upb_MiniTableSubInternal envoy_config_tap_v3_MatchPredicate_MatchSet_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__config__tap__v3__MatchPredicate_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_tap_v3_MatchPredicate_MatchSet__fields[1] = { @@ -119,8 +123,9 @@ const upb_MiniTable envoy__config__tap__v3__MatchPredicate__MatchSet_msg_init = }) }; -static const upb_MiniTableSub envoy_config_tap_v3_HttpHeadersMatch_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__HeaderMatcher_msg_init}, +const upb_MiniTable* envoy__config__tap__v3__MatchPredicate__MatchSet_msg_init_ptr = &envoy__config__tap__v3__MatchPredicate__MatchSet_msg_init; +static const upb_MiniTableSubInternal envoy_config_tap_v3_HttpHeadersMatch_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__HeaderMatcher_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_tap_v3_HttpHeadersMatch__fields[1] = { @@ -140,8 +145,9 @@ const upb_MiniTable envoy__config__tap__v3__HttpHeadersMatch_msg_init = { }) }; -static const upb_MiniTableSub envoy_config_tap_v3_HttpGenericBodyMatch_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__config__tap__v3__HttpGenericBodyMatch__GenericTextMatch_msg_init}, +const upb_MiniTable* envoy__config__tap__v3__HttpHeadersMatch_msg_init_ptr = &envoy__config__tap__v3__HttpHeadersMatch_msg_init; +static const upb_MiniTableSubInternal envoy_config_tap_v3_HttpGenericBodyMatch_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__config__tap__v3__HttpGenericBodyMatch__GenericTextMatch_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_tap_v3_HttpGenericBodyMatch__fields[2] = { @@ -164,6 +170,7 @@ const upb_MiniTable envoy__config__tap__v3__HttpGenericBodyMatch_msg_init = { }) }; +const upb_MiniTable* envoy__config__tap__v3__HttpGenericBodyMatch_msg_init_ptr = &envoy__config__tap__v3__HttpGenericBodyMatch_msg_init; static const upb_MiniTableField envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch__fields[2] = { {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)}, @@ -184,10 +191,11 @@ const upb_MiniTable envoy__config__tap__v3__HttpGenericBodyMatch__GenericTextMat }) }; -static const upb_MiniTableSub envoy_config_tap_v3_OutputConfig_submsgs[3] = { - {.UPB_PRIVATE(submsg) = &envoy__config__tap__v3__OutputSink_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init}, +const upb_MiniTable* envoy__config__tap__v3__HttpGenericBodyMatch__GenericTextMatch_msg_init_ptr = &envoy__config__tap__v3__HttpGenericBodyMatch__GenericTextMatch_msg_init; +static const upb_MiniTableSubInternal envoy_config_tap_v3_OutputConfig_submsgs[3] = { + {.UPB_PRIVATE(submsg) = &envoy__config__tap__v3__OutputSink_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_tap_v3_OutputConfig__fields[4] = { @@ -216,12 +224,13 @@ const upb_MiniTable envoy__config__tap__v3__OutputConfig_msg_init = { }) }; -static const upb_MiniTableSub envoy_config_tap_v3_OutputSink_submsgs[5] = { - {.UPB_PRIVATE(submsg) = &envoy__config__tap__v3__StreamingAdminSink_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__tap__v3__FilePerTapSink_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__tap__v3__StreamingGrpcSink_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__tap__v3__BufferedAdminSink_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init}, +const upb_MiniTable* envoy__config__tap__v3__OutputConfig_msg_init_ptr = &envoy__config__tap__v3__OutputConfig_msg_init; +static const upb_MiniTableSubInternal envoy_config_tap_v3_OutputSink_submsgs[5] = { + {.UPB_PRIVATE(submsg) = &envoy__config__tap__v3__StreamingAdminSink_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__tap__v3__FilePerTapSink_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__tap__v3__StreamingGrpcSink_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__tap__v3__BufferedAdminSink_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_tap_v3_OutputSink__fields[6] = { @@ -252,6 +261,7 @@ const upb_MiniTable envoy__config__tap__v3__OutputSink_msg_init = { }) }; +const upb_MiniTable* envoy__config__tap__v3__OutputSink_msg_init_ptr = &envoy__config__tap__v3__OutputSink_msg_init; const upb_MiniTable envoy__config__tap__v3__StreamingAdminSink_msg_init = { NULL, NULL, @@ -261,8 +271,9 @@ const upb_MiniTable envoy__config__tap__v3__StreamingAdminSink_msg_init = { #endif }; -static const upb_MiniTableSub envoy_config_tap_v3_BufferedAdminSink_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, +const upb_MiniTable* envoy__config__tap__v3__StreamingAdminSink_msg_init_ptr = &envoy__config__tap__v3__StreamingAdminSink_msg_init; +static const upb_MiniTableSubInternal envoy_config_tap_v3_BufferedAdminSink_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_tap_v3_BufferedAdminSink__fields[2] = { @@ -283,6 +294,7 @@ const upb_MiniTable envoy__config__tap__v3__BufferedAdminSink_msg_init = { }) }; +const upb_MiniTable* envoy__config__tap__v3__BufferedAdminSink_msg_init_ptr = &envoy__config__tap__v3__BufferedAdminSink_msg_init; static const upb_MiniTableField envoy_config_tap_v3_FilePerTapSink__fields[1] = { {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, }; @@ -300,8 +312,9 @@ const upb_MiniTable envoy__config__tap__v3__FilePerTapSink_msg_init = { }) }; -static const upb_MiniTableSub envoy_config_tap_v3_StreamingGrpcSink_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__GrpcService_msg_init}, +const upb_MiniTable* envoy__config__tap__v3__FilePerTapSink_msg_init_ptr = &envoy__config__tap__v3__FilePerTapSink_msg_init; +static const upb_MiniTableSubInternal envoy_config_tap_v3_StreamingGrpcSink_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__GrpcService_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_tap_v3_StreamingGrpcSink__fields[2] = { @@ -322,6 +335,7 @@ const upb_MiniTable envoy__config__tap__v3__StreamingGrpcSink_msg_init = { }) }; +const upb_MiniTable* envoy__config__tap__v3__StreamingGrpcSink_msg_init_ptr = &envoy__config__tap__v3__StreamingGrpcSink_msg_init; static const upb_MiniTable *messages_layout[12] = { &envoy__config__tap__v3__TapConfig_msg_init, &envoy__config__tap__v3__MatchPredicate_msg_init, diff --git a/src/core/ext/upb-gen/envoy/config/tap/v3/common.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/tap/v3/common.upb_minitable.h index 01934e94476..27bd5683c2a 100644 --- a/src/core/ext/upb-gen/envoy/config/tap/v3/common.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/config/tap/v3/common.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/config/tap/v3/common.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_TAP_V3_COMMON_PROTO_UPB_MINITABLE_H_ #define ENVOY_CONFIG_TAP_V3_COMMON_PROTO_UPB_MINITABLE_H_ @@ -18,17 +19,29 @@ extern "C" { #endif extern const upb_MiniTable envoy__config__tap__v3__TapConfig_msg_init; +extern const upb_MiniTable* envoy__config__tap__v3__TapConfig_msg_init_ptr; extern const upb_MiniTable envoy__config__tap__v3__MatchPredicate_msg_init; +extern const upb_MiniTable* envoy__config__tap__v3__MatchPredicate_msg_init_ptr; extern const upb_MiniTable envoy__config__tap__v3__MatchPredicate__MatchSet_msg_init; +extern const upb_MiniTable* envoy__config__tap__v3__MatchPredicate__MatchSet_msg_init_ptr; extern const upb_MiniTable envoy__config__tap__v3__HttpHeadersMatch_msg_init; +extern const upb_MiniTable* envoy__config__tap__v3__HttpHeadersMatch_msg_init_ptr; extern const upb_MiniTable envoy__config__tap__v3__HttpGenericBodyMatch_msg_init; +extern const upb_MiniTable* envoy__config__tap__v3__HttpGenericBodyMatch_msg_init_ptr; extern const upb_MiniTable envoy__config__tap__v3__HttpGenericBodyMatch__GenericTextMatch_msg_init; +extern const upb_MiniTable* envoy__config__tap__v3__HttpGenericBodyMatch__GenericTextMatch_msg_init_ptr; extern const upb_MiniTable envoy__config__tap__v3__OutputConfig_msg_init; +extern const upb_MiniTable* envoy__config__tap__v3__OutputConfig_msg_init_ptr; extern const upb_MiniTable envoy__config__tap__v3__OutputSink_msg_init; +extern const upb_MiniTable* envoy__config__tap__v3__OutputSink_msg_init_ptr; extern const upb_MiniTable envoy__config__tap__v3__StreamingAdminSink_msg_init; +extern const upb_MiniTable* envoy__config__tap__v3__StreamingAdminSink_msg_init_ptr; extern const upb_MiniTable envoy__config__tap__v3__BufferedAdminSink_msg_init; +extern const upb_MiniTable* envoy__config__tap__v3__BufferedAdminSink_msg_init_ptr; extern const upb_MiniTable envoy__config__tap__v3__FilePerTapSink_msg_init; +extern const upb_MiniTable* envoy__config__tap__v3__FilePerTapSink_msg_init_ptr; extern const upb_MiniTable envoy__config__tap__v3__StreamingGrpcSink_msg_init; +extern const upb_MiniTable* envoy__config__tap__v3__StreamingGrpcSink_msg_init_ptr; extern const upb_MiniTableFile envoy_config_tap_v3_common_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/datadog.upb.h b/src/core/ext/upb-gen/envoy/config/trace/v3/datadog.upb.h index ffc331ed492..a3ef65b3f22 100644 --- a/src/core/ext/upb-gen/envoy/config/trace/v3/datadog.upb.h +++ b/src/core/ext/upb-gen/envoy/config/trace/v3/datadog.upb.h @@ -3,7 +3,8 @@ * envoy/config/trace/v3/datadog.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_TRACE_V3_DATADOG_PROTO_UPB_H_ #define ENVOY_CONFIG_TRACE_V3_DATADOG_PROTO_UPB_H_ @@ -75,6 +76,7 @@ UPB_INLINE const struct google_protobuf_Duration* envoy_config_trace_v3_DatadogR 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -86,6 +88,7 @@ UPB_INLINE bool envoy_config_trace_v3_DatadogRemoteConfig_has_polling_interval(c 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { @@ -177,6 +180,7 @@ UPB_INLINE const envoy_config_trace_v3_DatadogRemoteConfig* envoy_config_trace_v 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__trace__v3__DatadogRemoteConfig_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -200,6 +204,7 @@ UPB_INLINE void envoy_config_trace_v3_DatadogConfig_set_collector_hostname(envoy } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__trace__v3__DatadogRemoteConfig_msg_init); 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) { diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/datadog.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/trace/v3/datadog.upb_minitable.c index 03e5cb99956..0d7512e8fcf 100644 --- a/src/core/ext/upb-gen/envoy/config/trace/v3/datadog.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/config/trace/v3/datadog.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/config/trace/v3/datadog.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -17,8 +18,9 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub envoy_config_trace_v3_DatadogRemoteConfig_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal envoy_config_trace_v3_DatadogRemoteConfig_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_trace_v3_DatadogRemoteConfig__fields[1] = { @@ -34,8 +36,9 @@ const upb_MiniTable envoy__config__trace__v3__DatadogRemoteConfig_msg_init = { #endif }; -static const upb_MiniTableSub envoy_config_trace_v3_DatadogConfig_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__config__trace__v3__DatadogRemoteConfig_msg_init}, +const upb_MiniTable* envoy__config__trace__v3__DatadogRemoteConfig_msg_init_ptr = &envoy__config__trace__v3__DatadogRemoteConfig_msg_init; +static const upb_MiniTableSubInternal envoy_config_trace_v3_DatadogConfig_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__config__trace__v3__DatadogRemoteConfig_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_trace_v3_DatadogConfig__fields[4] = { @@ -60,6 +63,7 @@ const upb_MiniTable envoy__config__trace__v3__DatadogConfig_msg_init = { }) }; +const upb_MiniTable* envoy__config__trace__v3__DatadogConfig_msg_init_ptr = &envoy__config__trace__v3__DatadogConfig_msg_init; static const upb_MiniTable *messages_layout[2] = { &envoy__config__trace__v3__DatadogRemoteConfig_msg_init, &envoy__config__trace__v3__DatadogConfig_msg_init, diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/datadog.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/trace/v3/datadog.upb_minitable.h index 9378ae585df..d7d096c7f9f 100644 --- a/src/core/ext/upb-gen/envoy/config/trace/v3/datadog.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/config/trace/v3/datadog.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/config/trace/v3/datadog.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_TRACE_V3_DATADOG_PROTO_UPB_MINITABLE_H_ #define ENVOY_CONFIG_TRACE_V3_DATADOG_PROTO_UPB_MINITABLE_H_ @@ -18,7 +19,9 @@ extern "C" { #endif extern const upb_MiniTable envoy__config__trace__v3__DatadogRemoteConfig_msg_init; +extern const upb_MiniTable* envoy__config__trace__v3__DatadogRemoteConfig_msg_init_ptr; extern const upb_MiniTable envoy__config__trace__v3__DatadogConfig_msg_init; +extern const upb_MiniTable* envoy__config__trace__v3__DatadogConfig_msg_init_ptr; extern const upb_MiniTableFile envoy_config_trace_v3_datadog_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/dynamic_ot.upb.h b/src/core/ext/upb-gen/envoy/config/trace/v3/dynamic_ot.upb.h index 6ba1fcd8b64..23124ea5a38 100644 --- a/src/core/ext/upb-gen/envoy/config/trace/v3/dynamic_ot.upb.h +++ b/src/core/ext/upb-gen/envoy/config/trace/v3/dynamic_ot.upb.h @@ -3,7 +3,8 @@ * envoy/config/trace/v3/dynamic_ot.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_TRACE_V3_DYNAMIC_OT_PROTO_UPB_H_ #define ENVOY_CONFIG_TRACE_V3_DYNAMIC_OT_PROTO_UPB_H_ @@ -87,6 +88,7 @@ UPB_INLINE const struct google_protobuf_Struct* envoy_config_trace_v3_DynamicOtC const struct google_protobuf_Struct* default_val = NULL; const struct google_protobuf_Struct* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Struct_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -102,6 +104,7 @@ UPB_INLINE void envoy_config_trace_v3_DynamicOtConfig_set_library(envoy_config_t } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Struct_msg_init); 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) { diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/dynamic_ot.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/trace/v3/dynamic_ot.upb_minitable.c index d95d8121e7f..d05f6993b54 100644 --- a/src/core/ext/upb-gen/envoy/config/trace/v3/dynamic_ot.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/config/trace/v3/dynamic_ot.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/config/trace/v3/dynamic_ot.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -18,8 +19,9 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub envoy_config_trace_v3_DynamicOtConfig_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__Struct_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal envoy_config_trace_v3_DynamicOtConfig_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Struct_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_trace_v3_DynamicOtConfig__fields[2] = { @@ -40,6 +42,7 @@ const upb_MiniTable envoy__config__trace__v3__DynamicOtConfig_msg_init = { }) }; +const upb_MiniTable* envoy__config__trace__v3__DynamicOtConfig_msg_init_ptr = &envoy__config__trace__v3__DynamicOtConfig_msg_init; static const upb_MiniTable *messages_layout[1] = { &envoy__config__trace__v3__DynamicOtConfig_msg_init, }; diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/dynamic_ot.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/trace/v3/dynamic_ot.upb_minitable.h index b464a2f0275..3b8b0edf536 100644 --- a/src/core/ext/upb-gen/envoy/config/trace/v3/dynamic_ot.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/config/trace/v3/dynamic_ot.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/config/trace/v3/dynamic_ot.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_TRACE_V3_DYNAMIC_OT_PROTO_UPB_MINITABLE_H_ #define ENVOY_CONFIG_TRACE_V3_DYNAMIC_OT_PROTO_UPB_MINITABLE_H_ @@ -18,6 +19,7 @@ extern "C" { #endif extern const upb_MiniTable envoy__config__trace__v3__DynamicOtConfig_msg_init; +extern const upb_MiniTable* envoy__config__trace__v3__DynamicOtConfig_msg_init_ptr; extern const upb_MiniTableFile envoy_config_trace_v3_dynamic_ot_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/http_tracer.upb.h b/src/core/ext/upb-gen/envoy/config/trace/v3/http_tracer.upb.h index 9aba7b2b750..a3a19e96a2a 100644 --- a/src/core/ext/upb-gen/envoy/config/trace/v3/http_tracer.upb.h +++ b/src/core/ext/upb-gen/envoy/config/trace/v3/http_tracer.upb.h @@ -3,7 +3,8 @@ * envoy/config/trace/v3/http_tracer.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_TRACE_V3_HTTP_TRACER_PROTO_UPB_H_ #define ENVOY_CONFIG_TRACE_V3_HTTP_TRACER_PROTO_UPB_H_ @@ -74,6 +75,7 @@ UPB_INLINE const envoy_config_trace_v3_Tracing_Http* envoy_config_trace_v3_Traci const envoy_config_trace_v3_Tracing_Http* default_val = NULL; const envoy_config_trace_v3_Tracing_Http* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__trace__v3__Tracing__Http_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -85,6 +87,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__trace__v3__Tracing__Http_msg_init); 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) { @@ -161,6 +164,7 @@ UPB_INLINE const struct google_protobuf_Any* envoy_config_trace_v3_Tracing_Http_ const struct google_protobuf_Any* default_val = NULL; const struct google_protobuf_Any* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -176,6 +180,7 @@ UPB_INLINE void envoy_config_trace_v3_Tracing_Http_set_name(envoy_config_trace_v } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); 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) { diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/http_tracer.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/trace/v3/http_tracer.upb_minitable.c index c08fd77c02a..b7e3acdf71c 100644 --- a/src/core/ext/upb-gen/envoy/config/trace/v3/http_tracer.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/config/trace/v3/http_tracer.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/config/trace/v3/http_tracer.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -16,8 +17,9 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub envoy_config_trace_v3_Tracing_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__config__trace__v3__Tracing__Http_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal envoy_config_trace_v3_Tracing_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__config__trace__v3__Tracing__Http_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_trace_v3_Tracing__fields[1] = { @@ -33,8 +35,9 @@ const upb_MiniTable envoy__config__trace__v3__Tracing_msg_init = { #endif }; -static const upb_MiniTableSub envoy_config_trace_v3_Tracing_Http_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init}, +const upb_MiniTable* envoy__config__trace__v3__Tracing_msg_init_ptr = &envoy__config__trace__v3__Tracing_msg_init; +static const upb_MiniTableSubInternal envoy_config_trace_v3_Tracing_Http_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_trace_v3_Tracing_Http__fields[2] = { @@ -57,6 +60,7 @@ const upb_MiniTable envoy__config__trace__v3__Tracing__Http_msg_init = { }) }; +const upb_MiniTable* envoy__config__trace__v3__Tracing__Http_msg_init_ptr = &envoy__config__trace__v3__Tracing__Http_msg_init; static const upb_MiniTable *messages_layout[2] = { &envoy__config__trace__v3__Tracing_msg_init, &envoy__config__trace__v3__Tracing__Http_msg_init, diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/http_tracer.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/trace/v3/http_tracer.upb_minitable.h index 02151eea430..3a73ca85b2e 100644 --- a/src/core/ext/upb-gen/envoy/config/trace/v3/http_tracer.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/config/trace/v3/http_tracer.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/config/trace/v3/http_tracer.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_TRACE_V3_HTTP_TRACER_PROTO_UPB_MINITABLE_H_ #define ENVOY_CONFIG_TRACE_V3_HTTP_TRACER_PROTO_UPB_MINITABLE_H_ @@ -18,7 +19,9 @@ extern "C" { #endif extern const upb_MiniTable envoy__config__trace__v3__Tracing_msg_init; +extern const upb_MiniTable* envoy__config__trace__v3__Tracing_msg_init_ptr; extern const upb_MiniTable envoy__config__trace__v3__Tracing__Http_msg_init; +extern const upb_MiniTable* envoy__config__trace__v3__Tracing__Http_msg_init_ptr; extern const upb_MiniTableFile envoy_config_trace_v3_http_tracer_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/lightstep.upb.h b/src/core/ext/upb-gen/envoy/config/trace/v3/lightstep.upb.h index 18101a2c5b5..40ed544864a 100644 --- a/src/core/ext/upb-gen/envoy/config/trace/v3/lightstep.upb.h +++ b/src/core/ext/upb-gen/envoy/config/trace/v3/lightstep.upb.h @@ -3,7 +3,8 @@ * envoy/config/trace/v3/lightstep.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_TRACE_V3_LIGHTSTEP_PROTO_UPB_H_ #define ENVOY_CONFIG_TRACE_V3_LIGHTSTEP_PROTO_UPB_H_ @@ -138,6 +139,7 @@ UPB_INLINE const struct envoy_config_core_v3_DataSource* envoy_config_trace_v3_L const struct envoy_config_core_v3_DataSource* default_val = NULL; const struct envoy_config_core_v3_DataSource* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__DataSource_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -185,6 +187,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__DataSource_msg_init); 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) { diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/lightstep.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/trace/v3/lightstep.upb_minitable.c index b5764272119..32d753f6414 100644 --- a/src/core/ext/upb-gen/envoy/config/trace/v3/lightstep.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/config/trace/v3/lightstep.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/config/trace/v3/lightstep.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -18,8 +19,9 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub envoy_config_trace_v3_LightstepConfig_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__DataSource_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal envoy_config_trace_v3_LightstepConfig_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__DataSource_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_trace_v3_LightstepConfig__fields[4] = { @@ -44,6 +46,7 @@ const upb_MiniTable envoy__config__trace__v3__LightstepConfig_msg_init = { }) }; +const upb_MiniTable* envoy__config__trace__v3__LightstepConfig_msg_init_ptr = &envoy__config__trace__v3__LightstepConfig_msg_init; static const upb_MiniTable *messages_layout[1] = { &envoy__config__trace__v3__LightstepConfig_msg_init, }; diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/lightstep.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/trace/v3/lightstep.upb_minitable.h index 74d423825e9..1ba326dce4e 100644 --- a/src/core/ext/upb-gen/envoy/config/trace/v3/lightstep.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/config/trace/v3/lightstep.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/config/trace/v3/lightstep.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_TRACE_V3_LIGHTSTEP_PROTO_UPB_MINITABLE_H_ #define ENVOY_CONFIG_TRACE_V3_LIGHTSTEP_PROTO_UPB_MINITABLE_H_ @@ -18,6 +19,7 @@ extern "C" { #endif extern const upb_MiniTable envoy__config__trace__v3__LightstepConfig_msg_init; +extern const upb_MiniTable* envoy__config__trace__v3__LightstepConfig_msg_init_ptr; extern const upb_MiniTableFile envoy_config_trace_v3_lightstep_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/opencensus.upb.h b/src/core/ext/upb-gen/envoy/config/trace/v3/opencensus.upb.h index 4a83d6cb057..6e5b919ff19 100644 --- a/src/core/ext/upb-gen/envoy/config/trace/v3/opencensus.upb.h +++ b/src/core/ext/upb-gen/envoy/config/trace/v3/opencensus.upb.h @@ -3,7 +3,8 @@ * envoy/config/trace/v3/opencensus.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_TRACE_V3_OPENCENSUS_PROTO_UPB_H_ #define ENVOY_CONFIG_TRACE_V3_OPENCENSUS_PROTO_UPB_H_ @@ -84,6 +85,7 @@ UPB_INLINE const struct opencensus_proto_trace_v1_TraceConfig* envoy_config_trac const struct opencensus_proto_trace_v1_TraceConfig* default_val = NULL; const struct opencensus_proto_trace_v1_TraceConfig* 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_PRIVATE(_upb_MiniTable_StrongReference)(&opencensus__proto__trace__v1__TraceConfig_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -260,6 +262,7 @@ UPB_INLINE const struct envoy_config_core_v3_GrpcService* envoy_config_trace_v3_ const struct envoy_config_core_v3_GrpcService* default_val = NULL; const struct envoy_config_core_v3_GrpcService* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__GrpcService_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -276,6 +279,7 @@ UPB_INLINE const struct envoy_config_core_v3_GrpcService* envoy_config_trace_v3_ const struct envoy_config_core_v3_GrpcService* default_val = NULL; const struct envoy_config_core_v3_GrpcService* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__GrpcService_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -287,6 +291,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_PRIVATE(_upb_MiniTable_StrongReference)(&opencensus__proto__trace__v1__TraceConfig_msg_init); 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) { @@ -387,6 +392,7 @@ UPB_INLINE void envoy_config_trace_v3_OpenCensusConfig_set_ocagent_address(envoy } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__GrpcService_msg_init); 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) { @@ -399,6 +405,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__GrpcService_msg_init); 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) { diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/opencensus.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/trace/v3/opencensus.upb_minitable.c index e65603ed9fd..591498a04a0 100644 --- a/src/core/ext/upb-gen/envoy/config/trace/v3/opencensus.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/config/trace/v3/opencensus.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/config/trace/v3/opencensus.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -18,10 +19,11 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub envoy_config_trace_v3_OpenCensusConfig_submsgs[3] = { - {.UPB_PRIVATE(submsg) = &opencensus__proto__trace__v1__TraceConfig_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__GrpcService_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__GrpcService_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal envoy_config_trace_v3_OpenCensusConfig_submsgs[3] = { + {.UPB_PRIVATE(submsg) = &opencensus__proto__trace__v1__TraceConfig_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__GrpcService_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__GrpcService_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_trace_v3_OpenCensusConfig__fields[13] = { @@ -67,6 +69,7 @@ const upb_MiniTable envoy__config__trace__v3__OpenCensusConfig_msg_init = { }) }; +const upb_MiniTable* envoy__config__trace__v3__OpenCensusConfig_msg_init_ptr = &envoy__config__trace__v3__OpenCensusConfig_msg_init; static const upb_MiniTable *messages_layout[1] = { &envoy__config__trace__v3__OpenCensusConfig_msg_init, }; diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/opencensus.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/trace/v3/opencensus.upb_minitable.h index ec74950812d..a50ace9f603 100644 --- a/src/core/ext/upb-gen/envoy/config/trace/v3/opencensus.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/config/trace/v3/opencensus.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/config/trace/v3/opencensus.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_TRACE_V3_OPENCENSUS_PROTO_UPB_MINITABLE_H_ #define ENVOY_CONFIG_TRACE_V3_OPENCENSUS_PROTO_UPB_MINITABLE_H_ @@ -18,6 +19,7 @@ extern "C" { #endif extern const upb_MiniTable envoy__config__trace__v3__OpenCensusConfig_msg_init; +extern const upb_MiniTable* envoy__config__trace__v3__OpenCensusConfig_msg_init_ptr; extern const upb_MiniTableFile envoy_config_trace_v3_opencensus_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/opentelemetry.upb.h b/src/core/ext/upb-gen/envoy/config/trace/v3/opentelemetry.upb.h index 9a5c96a42df..dfe7668e2a4 100644 --- a/src/core/ext/upb-gen/envoy/config/trace/v3/opentelemetry.upb.h +++ b/src/core/ext/upb-gen/envoy/config/trace/v3/opentelemetry.upb.h @@ -3,7 +3,8 @@ * envoy/config/trace/v3/opentelemetry.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_TRACE_V3_OPENTELEMETRY_PROTO_UPB_H_ #define ENVOY_CONFIG_TRACE_V3_OPENTELEMETRY_PROTO_UPB_H_ @@ -76,6 +77,7 @@ UPB_INLINE const struct envoy_config_core_v3_GrpcService* envoy_config_trace_v3_ const struct envoy_config_core_v3_GrpcService* default_val = NULL; const struct envoy_config_core_v3_GrpcService* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__GrpcService_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -104,6 +106,7 @@ UPB_INLINE const struct envoy_config_core_v3_HttpService* envoy_config_trace_v3_ const struct envoy_config_core_v3_HttpService* default_val = NULL; const struct envoy_config_core_v3_HttpService* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HttpService_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -118,6 +121,7 @@ UPB_INLINE void envoy_config_trace_v3_OpenTelemetryConfig_clear_resource_detecto } UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* const* envoy_config_trace_v3_OpenTelemetryConfig_resource_detectors(const envoy_config_trace_v3_OpenTelemetryConfig* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -129,6 +133,7 @@ UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* const* envoy_ } UPB_INLINE const upb_Array* _envoy_config_trace_v3_OpenTelemetryConfig_resource_detectors_upb_array(const envoy_config_trace_v3_OpenTelemetryConfig* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -137,6 +142,7 @@ UPB_INLINE const upb_Array* _envoy_config_trace_v3_OpenTelemetryConfig_resource_ } UPB_INLINE upb_Array* _envoy_config_trace_v3_OpenTelemetryConfig_resource_detectors_mutable_upb_array(envoy_config_trace_v3_OpenTelemetryConfig* msg, size_t* size, upb_Arena* arena) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -152,6 +158,7 @@ UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_ const struct envoy_config_core_v3_TypedExtensionConfig* default_val = NULL; const struct envoy_config_core_v3_TypedExtensionConfig* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -163,6 +170,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__GrpcService_msg_init); 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) { @@ -179,6 +187,7 @@ UPB_INLINE void envoy_config_trace_v3_OpenTelemetryConfig_set_service_name(envoy } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HttpService_msg_init); 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) { @@ -191,6 +200,7 @@ UPB_INLINE struct envoy_config_core_v3_HttpService* envoy_config_trace_v3_OpenTe } UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig** envoy_config_trace_v3_OpenTelemetryConfig_mutable_resource_detectors(envoy_config_trace_v3_OpenTelemetryConfig* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -207,6 +217,7 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig** envoy_config_trace } UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_trace_v3_OpenTelemetryConfig_add_resource_detectors(envoy_config_trace_v3_OpenTelemetryConfig* msg, upb_Arena* arena) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -221,6 +232,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); 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) { diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/opentelemetry.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/trace/v3/opentelemetry.upb_minitable.c index 444bd1e530f..881108402f2 100644 --- a/src/core/ext/upb-gen/envoy/config/trace/v3/opentelemetry.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/config/trace/v3/opentelemetry.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/config/trace/v3/opentelemetry.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -17,11 +18,12 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub envoy_config_trace_v3_OpenTelemetryConfig_submsgs[4] = { - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__GrpcService_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HttpService_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal envoy_config_trace_v3_OpenTelemetryConfig_submsgs[4] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__GrpcService_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HttpService_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_trace_v3_OpenTelemetryConfig__fields[5] = { @@ -51,6 +53,7 @@ const upb_MiniTable envoy__config__trace__v3__OpenTelemetryConfig_msg_init = { }) }; +const upb_MiniTable* envoy__config__trace__v3__OpenTelemetryConfig_msg_init_ptr = &envoy__config__trace__v3__OpenTelemetryConfig_msg_init; static const upb_MiniTable *messages_layout[1] = { &envoy__config__trace__v3__OpenTelemetryConfig_msg_init, }; diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/opentelemetry.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/trace/v3/opentelemetry.upb_minitable.h index b3887bb385a..76c4b4e13ec 100644 --- a/src/core/ext/upb-gen/envoy/config/trace/v3/opentelemetry.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/config/trace/v3/opentelemetry.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/config/trace/v3/opentelemetry.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_TRACE_V3_OPENTELEMETRY_PROTO_UPB_MINITABLE_H_ #define ENVOY_CONFIG_TRACE_V3_OPENTELEMETRY_PROTO_UPB_MINITABLE_H_ @@ -18,6 +19,7 @@ extern "C" { #endif extern const upb_MiniTable envoy__config__trace__v3__OpenTelemetryConfig_msg_init; +extern const upb_MiniTable* envoy__config__trace__v3__OpenTelemetryConfig_msg_init_ptr; extern const upb_MiniTableFile envoy_config_trace_v3_opentelemetry_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/service.upb.h b/src/core/ext/upb-gen/envoy/config/trace/v3/service.upb.h index a113d9e8a73..c82e4f2620d 100644 --- a/src/core/ext/upb-gen/envoy/config/trace/v3/service.upb.h +++ b/src/core/ext/upb-gen/envoy/config/trace/v3/service.upb.h @@ -3,7 +3,8 @@ * envoy/config/trace/v3/service.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_TRACE_V3_SERVICE_PROTO_UPB_H_ #define ENVOY_CONFIG_TRACE_V3_SERVICE_PROTO_UPB_H_ @@ -73,6 +74,7 @@ UPB_INLINE const struct envoy_config_core_v3_GrpcService* envoy_config_trace_v3_ const struct envoy_config_core_v3_GrpcService* default_val = NULL; const struct envoy_config_core_v3_GrpcService* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__GrpcService_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -84,6 +86,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__GrpcService_msg_init); 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) { diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/service.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/trace/v3/service.upb_minitable.c index adf7dc47684..33bfcf34a48 100644 --- a/src/core/ext/upb-gen/envoy/config/trace/v3/service.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/config/trace/v3/service.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/config/trace/v3/service.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -16,8 +17,9 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub envoy_config_trace_v3_TraceServiceConfig_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__GrpcService_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal envoy_config_trace_v3_TraceServiceConfig_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__GrpcService_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_trace_v3_TraceServiceConfig__fields[1] = { @@ -33,6 +35,7 @@ const upb_MiniTable envoy__config__trace__v3__TraceServiceConfig_msg_init = { #endif }; +const upb_MiniTable* envoy__config__trace__v3__TraceServiceConfig_msg_init_ptr = &envoy__config__trace__v3__TraceServiceConfig_msg_init; static const upb_MiniTable *messages_layout[1] = { &envoy__config__trace__v3__TraceServiceConfig_msg_init, }; diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/service.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/trace/v3/service.upb_minitable.h index d11957f4b3f..2a03b64e0c4 100644 --- a/src/core/ext/upb-gen/envoy/config/trace/v3/service.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/config/trace/v3/service.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/config/trace/v3/service.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_TRACE_V3_SERVICE_PROTO_UPB_MINITABLE_H_ #define ENVOY_CONFIG_TRACE_V3_SERVICE_PROTO_UPB_MINITABLE_H_ @@ -18,6 +19,7 @@ extern "C" { #endif extern const upb_MiniTable envoy__config__trace__v3__TraceServiceConfig_msg_init; +extern const upb_MiniTable* envoy__config__trace__v3__TraceServiceConfig_msg_init_ptr; extern const upb_MiniTableFile envoy_config_trace_v3_service_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/skywalking.upb.h b/src/core/ext/upb-gen/envoy/config/trace/v3/skywalking.upb.h index b0a32fd324a..a0faa7cf2c8 100644 --- a/src/core/ext/upb-gen/envoy/config/trace/v3/skywalking.upb.h +++ b/src/core/ext/upb-gen/envoy/config/trace/v3/skywalking.upb.h @@ -3,7 +3,8 @@ * envoy/config/trace/v3/skywalking.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_TRACE_V3_SKYWALKING_PROTO_UPB_H_ #define ENVOY_CONFIG_TRACE_V3_SKYWALKING_PROTO_UPB_H_ @@ -77,6 +78,7 @@ UPB_INLINE const struct envoy_config_core_v3_GrpcService* envoy_config_trace_v3_ const struct envoy_config_core_v3_GrpcService* default_val = NULL; const struct envoy_config_core_v3_GrpcService* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__GrpcService_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -93,6 +95,7 @@ UPB_INLINE const envoy_config_trace_v3_ClientConfig* envoy_config_trace_v3_SkyWa const envoy_config_trace_v3_ClientConfig* default_val = NULL; const envoy_config_trace_v3_ClientConfig* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__trace__v3__ClientConfig_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -104,6 +107,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__GrpcService_msg_init); 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) { @@ -116,6 +120,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__trace__v3__ClientConfig_msg_init); 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) { @@ -220,6 +225,7 @@ UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_trace_v3_Clien const struct google_protobuf_UInt32Value* default_val = NULL; const struct google_protobuf_UInt32Value* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -243,6 +249,7 @@ UPB_INLINE void envoy_config_trace_v3_ClientConfig_set_backend_token(envoy_confi } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); 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) { diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/skywalking.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/trace/v3/skywalking.upb_minitable.c index 6d84e720d86..204599f1930 100644 --- a/src/core/ext/upb-gen/envoy/config/trace/v3/skywalking.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/config/trace/v3/skywalking.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/config/trace/v3/skywalking.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -18,9 +19,10 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub envoy_config_trace_v3_SkyWalkingConfig_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__GrpcService_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__trace__v3__ClientConfig_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal envoy_config_trace_v3_SkyWalkingConfig_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__GrpcService_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__trace__v3__ClientConfig_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_trace_v3_SkyWalkingConfig__fields[2] = { @@ -37,8 +39,9 @@ const upb_MiniTable envoy__config__trace__v3__SkyWalkingConfig_msg_init = { #endif }; -static const upb_MiniTableSub envoy_config_trace_v3_ClientConfig_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init}, +const upb_MiniTable* envoy__config__trace__v3__SkyWalkingConfig_msg_init_ptr = &envoy__config__trace__v3__SkyWalkingConfig_msg_init; +static const upb_MiniTableSubInternal envoy_config_trace_v3_ClientConfig_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_trace_v3_ClientConfig__fields[4] = { @@ -63,6 +66,7 @@ const upb_MiniTable envoy__config__trace__v3__ClientConfig_msg_init = { }) }; +const upb_MiniTable* envoy__config__trace__v3__ClientConfig_msg_init_ptr = &envoy__config__trace__v3__ClientConfig_msg_init; static const upb_MiniTable *messages_layout[2] = { &envoy__config__trace__v3__SkyWalkingConfig_msg_init, &envoy__config__trace__v3__ClientConfig_msg_init, diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/skywalking.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/trace/v3/skywalking.upb_minitable.h index 08ef598dd64..9c8b5dec067 100644 --- a/src/core/ext/upb-gen/envoy/config/trace/v3/skywalking.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/config/trace/v3/skywalking.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/config/trace/v3/skywalking.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_TRACE_V3_SKYWALKING_PROTO_UPB_MINITABLE_H_ #define ENVOY_CONFIG_TRACE_V3_SKYWALKING_PROTO_UPB_MINITABLE_H_ @@ -18,7 +19,9 @@ extern "C" { #endif extern const upb_MiniTable envoy__config__trace__v3__SkyWalkingConfig_msg_init; +extern const upb_MiniTable* envoy__config__trace__v3__SkyWalkingConfig_msg_init_ptr; extern const upb_MiniTable envoy__config__trace__v3__ClientConfig_msg_init; +extern const upb_MiniTable* envoy__config__trace__v3__ClientConfig_msg_init_ptr; extern const upb_MiniTableFile envoy_config_trace_v3_skywalking_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/trace.upb.h b/src/core/ext/upb-gen/envoy/config/trace/v3/trace.upb.h index dd8ad387d12..3eb50b671da 100644 --- a/src/core/ext/upb-gen/envoy/config/trace/v3/trace.upb.h +++ b/src/core/ext/upb-gen/envoy/config/trace/v3/trace.upb.h @@ -3,7 +3,8 @@ * envoy/config/trace/v3/trace.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_TRACE_V3_TRACE_PROTO_UPB_H_ #define ENVOY_CONFIG_TRACE_V3_TRACE_PROTO_UPB_H_ diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/trace.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/trace/v3/trace.upb_minitable.c index eb396c3b2d5..136737a3b1e 100644 --- a/src/core/ext/upb-gen/envoy/config/trace/v3/trace.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/config/trace/v3/trace.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/config/trace/v3/trace.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -20,6 +21,7 @@ // Must be last. #include "upb/port/def.inc" +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); const upb_MiniTableFile envoy_config_trace_v3_trace_proto_upb_file_layout = { NULL, NULL, diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/trace.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/trace/v3/trace.upb_minitable.h index 772847047f6..5975b4104d9 100644 --- a/src/core/ext/upb-gen/envoy/config/trace/v3/trace.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/config/trace/v3/trace.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/config/trace/v3/trace.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_TRACE_V3_TRACE_PROTO_UPB_MINITABLE_H_ #define ENVOY_CONFIG_TRACE_V3_TRACE_PROTO_UPB_MINITABLE_H_ diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/xray.upb.h b/src/core/ext/upb-gen/envoy/config/trace/v3/xray.upb.h index a6683494028..c49be10959e 100644 --- a/src/core/ext/upb-gen/envoy/config/trace/v3/xray.upb.h +++ b/src/core/ext/upb-gen/envoy/config/trace/v3/xray.upb.h @@ -3,7 +3,8 @@ * envoy/config/trace/v3/xray.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_TRACE_V3_XRAY_PROTO_UPB_H_ #define ENVOY_CONFIG_TRACE_V3_XRAY_PROTO_UPB_H_ @@ -79,6 +80,7 @@ UPB_INLINE const struct envoy_config_core_v3_SocketAddress* envoy_config_trace_v const struct envoy_config_core_v3_SocketAddress* default_val = NULL; const struct envoy_config_core_v3_SocketAddress* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__SocketAddress_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -107,6 +109,7 @@ UPB_INLINE const struct envoy_config_core_v3_DataSource* envoy_config_trace_v3_X const struct envoy_config_core_v3_DataSource* default_val = NULL; const struct envoy_config_core_v3_DataSource* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__DataSource_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -123,6 +126,7 @@ UPB_INLINE const envoy_config_trace_v3_XRayConfig_SegmentFields* envoy_config_tr const envoy_config_trace_v3_XRayConfig_SegmentFields* default_val = NULL; const envoy_config_trace_v3_XRayConfig_SegmentFields* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__trace__v3__XRayConfig__SegmentFields_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -134,6 +138,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__SocketAddress_msg_init); 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) { @@ -150,6 +155,7 @@ UPB_INLINE void envoy_config_trace_v3_XRayConfig_set_segment_name(envoy_config_t } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__DataSource_msg_init); 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) { @@ -162,6 +168,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__trace__v3__XRayConfig__SegmentFields_msg_init); 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) { @@ -229,6 +236,7 @@ UPB_INLINE const struct google_protobuf_Struct* envoy_config_trace_v3_XRayConfig const struct google_protobuf_Struct* default_val = NULL; const struct google_protobuf_Struct* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Struct_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -244,6 +252,7 @@ UPB_INLINE void envoy_config_trace_v3_XRayConfig_SegmentFields_set_origin(envoy_ } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Struct_msg_init); 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) { diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/xray.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/trace/v3/xray.upb_minitable.c index cae473d1988..7e7e00e2a87 100644 --- a/src/core/ext/upb-gen/envoy/config/trace/v3/xray.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/config/trace/v3/xray.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/config/trace/v3/xray.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -19,10 +20,11 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub envoy_config_trace_v3_XRayConfig_submsgs[3] = { - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__SocketAddress_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__DataSource_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__trace__v3__XRayConfig__SegmentFields_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal envoy_config_trace_v3_XRayConfig_submsgs[3] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__SocketAddress_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__DataSource_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__trace__v3__XRayConfig__SegmentFields_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_trace_v3_XRayConfig__fields[4] = { @@ -47,8 +49,9 @@ const upb_MiniTable envoy__config__trace__v3__XRayConfig_msg_init = { }) }; -static const upb_MiniTableSub envoy_config_trace_v3_XRayConfig_SegmentFields_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__Struct_msg_init}, +const upb_MiniTable* envoy__config__trace__v3__XRayConfig_msg_init_ptr = &envoy__config__trace__v3__XRayConfig_msg_init; +static const upb_MiniTableSubInternal envoy_config_trace_v3_XRayConfig_SegmentFields_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Struct_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_trace_v3_XRayConfig_SegmentFields__fields[2] = { @@ -69,6 +72,7 @@ const upb_MiniTable envoy__config__trace__v3__XRayConfig__SegmentFields_msg_init }) }; +const upb_MiniTable* envoy__config__trace__v3__XRayConfig__SegmentFields_msg_init_ptr = &envoy__config__trace__v3__XRayConfig__SegmentFields_msg_init; static const upb_MiniTable *messages_layout[2] = { &envoy__config__trace__v3__XRayConfig_msg_init, &envoy__config__trace__v3__XRayConfig__SegmentFields_msg_init, diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/xray.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/trace/v3/xray.upb_minitable.h index 39da1cd5267..50d82879aea 100644 --- a/src/core/ext/upb-gen/envoy/config/trace/v3/xray.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/config/trace/v3/xray.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/config/trace/v3/xray.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_TRACE_V3_XRAY_PROTO_UPB_MINITABLE_H_ #define ENVOY_CONFIG_TRACE_V3_XRAY_PROTO_UPB_MINITABLE_H_ @@ -18,7 +19,9 @@ extern "C" { #endif extern const upb_MiniTable envoy__config__trace__v3__XRayConfig_msg_init; +extern const upb_MiniTable* envoy__config__trace__v3__XRayConfig_msg_init_ptr; extern const upb_MiniTable envoy__config__trace__v3__XRayConfig__SegmentFields_msg_init; +extern const upb_MiniTable* envoy__config__trace__v3__XRayConfig__SegmentFields_msg_init_ptr; extern const upb_MiniTableFile envoy_config_trace_v3_xray_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/zipkin.upb.h b/src/core/ext/upb-gen/envoy/config/trace/v3/zipkin.upb.h index 0ac4e4daea7..c3bd9434a83 100644 --- a/src/core/ext/upb-gen/envoy/config/trace/v3/zipkin.upb.h +++ b/src/core/ext/upb-gen/envoy/config/trace/v3/zipkin.upb.h @@ -3,7 +3,8 @@ * envoy/config/trace/v3/zipkin.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_TRACE_V3_ZIPKIN_PROTO_UPB_H_ #define ENVOY_CONFIG_TRACE_V3_ZIPKIN_PROTO_UPB_H_ @@ -118,6 +119,7 @@ UPB_INLINE const struct google_protobuf_BoolValue* envoy_config_trace_v3_ZipkinC const struct google_protobuf_BoolValue* default_val = NULL; const struct google_protobuf_BoolValue* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -177,6 +179,7 @@ UPB_INLINE void envoy_config_trace_v3_ZipkinConfig_set_trace_id_128bit(envoy_con } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); 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) { diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/zipkin.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/trace/v3/zipkin.upb_minitable.c index 36576c7d00d..24f29ffec73 100644 --- a/src/core/ext/upb-gen/envoy/config/trace/v3/zipkin.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/config/trace/v3/zipkin.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/config/trace/v3/zipkin.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -18,8 +19,9 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub envoy_config_trace_v3_ZipkinConfig_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal envoy_config_trace_v3_ZipkinConfig_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr}, }; static const upb_MiniTableField envoy_config_trace_v3_ZipkinConfig__fields[7] = { @@ -51,6 +53,7 @@ const upb_MiniTable envoy__config__trace__v3__ZipkinConfig_msg_init = { }) }; +const upb_MiniTable* envoy__config__trace__v3__ZipkinConfig_msg_init_ptr = &envoy__config__trace__v3__ZipkinConfig_msg_init; static const upb_MiniTable *messages_layout[1] = { &envoy__config__trace__v3__ZipkinConfig_msg_init, }; diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/zipkin.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/trace/v3/zipkin.upb_minitable.h index 7acdf3ec906..2e207c74a97 100644 --- a/src/core/ext/upb-gen/envoy/config/trace/v3/zipkin.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/config/trace/v3/zipkin.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/config/trace/v3/zipkin.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_TRACE_V3_ZIPKIN_PROTO_UPB_MINITABLE_H_ #define ENVOY_CONFIG_TRACE_V3_ZIPKIN_PROTO_UPB_MINITABLE_H_ @@ -18,6 +19,7 @@ extern "C" { #endif extern const upb_MiniTable envoy__config__trace__v3__ZipkinConfig_msg_init; +extern const upb_MiniTable* envoy__config__trace__v3__ZipkinConfig_msg_init_ptr; extern const upb_MiniTableFile envoy_config_trace_v3_zipkin_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/data/accesslog/v3/accesslog.upb.h b/src/core/ext/upb-gen/envoy/data/accesslog/v3/accesslog.upb.h index 2fd2340611a..21ea86b1401 100644 --- a/src/core/ext/upb-gen/envoy/data/accesslog/v3/accesslog.upb.h +++ b/src/core/ext/upb-gen/envoy/data/accesslog/v3/accesslog.upb.h @@ -3,7 +3,8 @@ * envoy/data/accesslog/v3/accesslog.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_DATA_ACCESSLOG_V3_ACCESSLOG_PROTO_UPB_H_ #define ENVOY_DATA_ACCESSLOG_V3_ACCESSLOG_PROTO_UPB_H_ @@ -137,6 +138,7 @@ UPB_INLINE const envoy_data_accesslog_v3_AccessLogCommon* envoy_data_accesslog_v const envoy_data_accesslog_v3_AccessLogCommon* default_val = NULL; const envoy_data_accesslog_v3_AccessLogCommon* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__data__accesslog__v3__AccessLogCommon_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -153,6 +155,7 @@ UPB_INLINE const envoy_data_accesslog_v3_ConnectionProperties* envoy_data_access const envoy_data_accesslog_v3_ConnectionProperties* default_val = NULL; const envoy_data_accesslog_v3_ConnectionProperties* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__data__accesslog__v3__ConnectionProperties_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -164,6 +167,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__data__accesslog__v3__AccessLogCommon_msg_init); 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) { @@ -176,6 +180,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__data__accesslog__v3__ConnectionProperties_msg_init); 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) { @@ -231,6 +236,7 @@ UPB_INLINE const envoy_data_accesslog_v3_AccessLogCommon* envoy_data_accesslog_v const envoy_data_accesslog_v3_AccessLogCommon* default_val = NULL; const envoy_data_accesslog_v3_AccessLogCommon* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__data__accesslog__v3__AccessLogCommon_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -259,6 +265,7 @@ UPB_INLINE const envoy_data_accesslog_v3_HTTPRequestProperties* envoy_data_acces const envoy_data_accesslog_v3_HTTPRequestProperties* default_val = NULL; const envoy_data_accesslog_v3_HTTPRequestProperties* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__data__accesslog__v3__HTTPRequestProperties_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -275,6 +282,7 @@ UPB_INLINE const envoy_data_accesslog_v3_HTTPResponseProperties* envoy_data_acce const envoy_data_accesslog_v3_HTTPResponseProperties* default_val = NULL; const envoy_data_accesslog_v3_HTTPResponseProperties* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__data__accesslog__v3__HTTPResponseProperties_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -286,6 +294,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__data__accesslog__v3__AccessLogCommon_msg_init); 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) { @@ -302,6 +311,7 @@ UPB_INLINE void envoy_data_accesslog_v3_HTTPAccessLogEntry_set_protocol_version( } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__data__accesslog__v3__HTTPRequestProperties_msg_init); 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) { @@ -314,6 +324,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__data__accesslog__v3__HTTPResponseProperties_msg_init); 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) { @@ -451,6 +462,7 @@ UPB_INLINE const struct envoy_config_core_v3_Address* envoy_data_accesslog_v3_Ac const struct envoy_config_core_v3_Address* default_val = NULL; const struct envoy_config_core_v3_Address* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Address_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -467,6 +479,7 @@ UPB_INLINE const struct envoy_config_core_v3_Address* envoy_data_accesslog_v3_Ac const struct envoy_config_core_v3_Address* default_val = NULL; const struct envoy_config_core_v3_Address* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Address_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -483,6 +496,7 @@ UPB_INLINE const envoy_data_accesslog_v3_TLSProperties* envoy_data_accesslog_v3_ const envoy_data_accesslog_v3_TLSProperties* default_val = NULL; const envoy_data_accesslog_v3_TLSProperties* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__data__accesslog__v3__TLSProperties_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -499,6 +513,7 @@ UPB_INLINE const struct google_protobuf_Timestamp* envoy_data_accesslog_v3_Acces const struct google_protobuf_Timestamp* default_val = NULL; const struct google_protobuf_Timestamp* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Timestamp_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -515,6 +530,7 @@ UPB_INLINE const struct google_protobuf_Duration* envoy_data_accesslog_v3_Access 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -531,6 +547,7 @@ UPB_INLINE const struct google_protobuf_Duration* envoy_data_accesslog_v3_Access const struct google_protobuf_Duration* default_val = NULL; const struct google_protobuf_Duration* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -547,6 +564,7 @@ UPB_INLINE const struct google_protobuf_Duration* envoy_data_accesslog_v3_Access const struct google_protobuf_Duration* default_val = NULL; const struct google_protobuf_Duration* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -563,6 +581,7 @@ UPB_INLINE const struct google_protobuf_Duration* envoy_data_accesslog_v3_Access const struct google_protobuf_Duration* default_val = NULL; const struct google_protobuf_Duration* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -579,6 +598,7 @@ UPB_INLINE const struct google_protobuf_Duration* envoy_data_accesslog_v3_Access const struct google_protobuf_Duration* default_val = NULL; const struct google_protobuf_Duration* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -595,6 +615,7 @@ UPB_INLINE const struct google_protobuf_Duration* envoy_data_accesslog_v3_Access const struct google_protobuf_Duration* default_val = NULL; const struct google_protobuf_Duration* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -611,6 +632,7 @@ UPB_INLINE const struct google_protobuf_Duration* envoy_data_accesslog_v3_Access const struct google_protobuf_Duration* default_val = NULL; const struct google_protobuf_Duration* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -627,6 +649,7 @@ UPB_INLINE const struct envoy_config_core_v3_Address* envoy_data_accesslog_v3_Ac const struct envoy_config_core_v3_Address* default_val = NULL; const struct envoy_config_core_v3_Address* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Address_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -643,6 +666,7 @@ UPB_INLINE const struct envoy_config_core_v3_Address* envoy_data_accesslog_v3_Ac const struct envoy_config_core_v3_Address* default_val = NULL; const struct envoy_config_core_v3_Address* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Address_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -671,6 +695,7 @@ UPB_INLINE const envoy_data_accesslog_v3_ResponseFlags* envoy_data_accesslog_v3_ const envoy_data_accesslog_v3_ResponseFlags* default_val = NULL; const envoy_data_accesslog_v3_ResponseFlags* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__data__accesslog__v3__ResponseFlags_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -687,6 +712,7 @@ UPB_INLINE const struct envoy_config_core_v3_Metadata* envoy_data_accesslog_v3_A const struct envoy_config_core_v3_Metadata* default_val = NULL; const struct envoy_config_core_v3_Metadata* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Metadata_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -727,6 +753,7 @@ UPB_INLINE const struct envoy_config_core_v3_Address* envoy_data_accesslog_v3_Ac const struct envoy_config_core_v3_Address* default_val = NULL; const struct envoy_config_core_v3_Address* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Address_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -746,22 +773,30 @@ UPB_INLINE size_t envoy_data_accesslog_v3_AccessLogCommon_filter_state_objects_s } UPB_INLINE bool envoy_data_accesslog_v3_AccessLogCommon_filter_state_objects_get(const envoy_data_accesslog_v3_AccessLogCommon* msg, upb_StringView key, struct google_protobuf_Any** val) { const upb_MiniTableField field = {21, UPB_SIZE(76, 208), 0, 16, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__data__accesslog__v3__AccessLogCommon__FilterStateObjectsEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); 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_data_accesslog_v3_AccessLogCommon_FilterStateObjectsEntry* envoy_data_accesslog_v3_AccessLogCommon_filter_state_objects_next(const envoy_data_accesslog_v3_AccessLogCommon* msg, size_t* iter) { const upb_MiniTableField field = {21, UPB_SIZE(76, 208), 0, 16, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__data__accesslog__v3__AccessLogCommon__FilterStateObjectsEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); const upb_Map* map = upb_Message_GetMap(UPB_UPCAST(msg), &field); if (!map) return NULL; return (const envoy_data_accesslog_v3_AccessLogCommon_FilterStateObjectsEntry*)_upb_map_next(map, iter); } UPB_INLINE const upb_Map* _envoy_data_accesslog_v3_AccessLogCommon_filter_state_objects_upb_map(envoy_data_accesslog_v3_AccessLogCommon* msg) { const upb_MiniTableField field = {21, UPB_SIZE(76, 208), 0, 16, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__data__accesslog__v3__AccessLogCommon__FilterStateObjectsEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); return upb_Message_GetMap(UPB_UPCAST(msg), &field); } UPB_INLINE upb_Map* _envoy_data_accesslog_v3_AccessLogCommon_filter_state_objects_mutable_upb_map(envoy_data_accesslog_v3_AccessLogCommon* msg, upb_Arena* a) { const upb_MiniTableField field = {21, UPB_SIZE(76, 208), 0, 16, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__data__accesslog__v3__AccessLogCommon__FilterStateObjectsEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); return _upb_Message_GetOrCreateMutableMap(UPB_UPCAST(msg), &field, 0, sizeof(struct google_protobuf_Any*), a); } UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_clear_custom_tags(envoy_data_accesslog_v3_AccessLogCommon* msg) { @@ -775,22 +810,26 @@ UPB_INLINE size_t envoy_data_accesslog_v3_AccessLogCommon_custom_tags_size(const } UPB_INLINE bool envoy_data_accesslog_v3_AccessLogCommon_custom_tags_get(const envoy_data_accesslog_v3_AccessLogCommon* msg, upb_StringView key, upb_StringView* val) { const upb_MiniTableField field = {22, UPB_SIZE(80, 216), 0, 17, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__data__accesslog__v3__AccessLogCommon__CustomTagsEntry_msg_init); const upb_Map* map = upb_Message_GetMap(UPB_UPCAST(msg), &field); if (!map) return false; return _upb_Map_Get(map, &key, 0, val, 0); } UPB_INLINE const envoy_data_accesslog_v3_AccessLogCommon_CustomTagsEntry* envoy_data_accesslog_v3_AccessLogCommon_custom_tags_next(const envoy_data_accesslog_v3_AccessLogCommon* msg, size_t* iter) { const upb_MiniTableField field = {22, UPB_SIZE(80, 216), 0, 17, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__data__accesslog__v3__AccessLogCommon__CustomTagsEntry_msg_init); const upb_Map* map = upb_Message_GetMap(UPB_UPCAST(msg), &field); if (!map) return NULL; return (const envoy_data_accesslog_v3_AccessLogCommon_CustomTagsEntry*)_upb_map_next(map, iter); } UPB_INLINE const upb_Map* _envoy_data_accesslog_v3_AccessLogCommon_custom_tags_upb_map(envoy_data_accesslog_v3_AccessLogCommon* msg) { const upb_MiniTableField field = {22, UPB_SIZE(80, 216), 0, 17, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__data__accesslog__v3__AccessLogCommon__CustomTagsEntry_msg_init); return upb_Message_GetMap(UPB_UPCAST(msg), &field); } UPB_INLINE upb_Map* _envoy_data_accesslog_v3_AccessLogCommon_custom_tags_mutable_upb_map(envoy_data_accesslog_v3_AccessLogCommon* msg, upb_Arena* a) { const upb_MiniTableField field = {22, UPB_SIZE(80, 216), 0, 17, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__data__accesslog__v3__AccessLogCommon__CustomTagsEntry_msg_init); return _upb_Message_GetOrCreateMutableMap(UPB_UPCAST(msg), &field, 0, 0, a); } UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_clear_duration(envoy_data_accesslog_v3_AccessLogCommon* msg) { @@ -801,6 +840,7 @@ UPB_INLINE const struct google_protobuf_Duration* envoy_data_accesslog_v3_Access const struct google_protobuf_Duration* default_val = NULL; const struct google_protobuf_Duration* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -936,6 +976,7 @@ UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_sample_rate(envoy_da } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Address_msg_init); 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) { @@ -948,6 +989,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Address_msg_init); 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) { @@ -960,6 +1002,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__data__accesslog__v3__TLSProperties_msg_init); 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) { @@ -972,6 +1015,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Timestamp_msg_init); 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) { @@ -984,6 +1028,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { @@ -996,6 +1041,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { @@ -1008,6 +1054,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { @@ -1020,6 +1067,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { @@ -1032,6 +1080,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { @@ -1044,6 +1093,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { @@ -1056,6 +1106,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { @@ -1068,6 +1119,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Address_msg_init); 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) { @@ -1080,6 +1132,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Address_msg_init); 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) { @@ -1096,6 +1149,7 @@ UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_upstream_cluster(env } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__data__accesslog__v3__ResponseFlags_msg_init); 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) { @@ -1108,6 +1162,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Metadata_msg_init); 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) { @@ -1128,6 +1183,7 @@ UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_route_name(envoy_dat } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Address_msg_init); 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) { @@ -1146,6 +1202,8 @@ UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_filter_state_objects_cle } UPB_INLINE bool envoy_data_accesslog_v3_AccessLogCommon_filter_state_objects_set(envoy_data_accesslog_v3_AccessLogCommon* msg, upb_StringView key, struct google_protobuf_Any* val, upb_Arena* a) { const upb_MiniTableField field = {21, UPB_SIZE(76, 208), 0, 16, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__data__accesslog__v3__AccessLogCommon__FilterStateObjectsEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); 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) != @@ -1159,6 +1217,8 @@ UPB_INLINE bool envoy_data_accesslog_v3_AccessLogCommon_filter_state_objects_del } UPB_INLINE envoy_data_accesslog_v3_AccessLogCommon_FilterStateObjectsEntry* envoy_data_accesslog_v3_AccessLogCommon_filter_state_objects_nextmutable(envoy_data_accesslog_v3_AccessLogCommon* msg, size_t* iter) { const upb_MiniTableField field = {21, UPB_SIZE(76, 208), 0, 16, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__data__accesslog__v3__AccessLogCommon__FilterStateObjectsEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); upb_Map* map = (upb_Map*)upb_Message_GetMap(UPB_UPCAST(msg), &field); if (!map) return NULL; return (envoy_data_accesslog_v3_AccessLogCommon_FilterStateObjectsEntry*)_upb_map_next(map, iter); @@ -1171,6 +1231,7 @@ UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_custom_tags_clear(envoy_ } UPB_INLINE bool envoy_data_accesslog_v3_AccessLogCommon_custom_tags_set(envoy_data_accesslog_v3_AccessLogCommon* msg, upb_StringView key, upb_StringView val, upb_Arena* a) { const upb_MiniTableField field = {22, UPB_SIZE(80, 216), 0, 17, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__data__accesslog__v3__AccessLogCommon__CustomTagsEntry_msg_init); upb_Map* map = _upb_Message_GetOrCreateMutableMap(UPB_UPCAST(msg), &field, 0, 0, a); return _upb_Map_Insert(map, &key, 0, &val, 0, a) != @@ -1184,12 +1245,14 @@ UPB_INLINE bool envoy_data_accesslog_v3_AccessLogCommon_custom_tags_delete(envoy } UPB_INLINE envoy_data_accesslog_v3_AccessLogCommon_CustomTagsEntry* envoy_data_accesslog_v3_AccessLogCommon_custom_tags_nextmutable(envoy_data_accesslog_v3_AccessLogCommon* msg, size_t* iter) { const upb_MiniTableField field = {22, UPB_SIZE(80, 216), 0, 17, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__data__accesslog__v3__AccessLogCommon__CustomTagsEntry_msg_init); upb_Map* map = (upb_Map*)upb_Message_GetMap(UPB_UPCAST(msg), &field); if (!map) return NULL; return (envoy_data_accesslog_v3_AccessLogCommon_CustomTagsEntry*)_upb_map_next(map, iter); } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { @@ -1467,6 +1530,7 @@ UPB_INLINE const envoy_data_accesslog_v3_ResponseFlags_Unauthorized* envoy_data_ const envoy_data_accesslog_v3_ResponseFlags_Unauthorized* default_val = NULL; const envoy_data_accesslog_v3_ResponseFlags_Unauthorized* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__data__accesslog__v3__ResponseFlags__Unauthorized_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1706,6 +1770,7 @@ UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_rate_limited(envoy_dat } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__data__accesslog__v3__ResponseFlags__Unauthorized_msg_init); 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) { @@ -1887,6 +1952,7 @@ UPB_INLINE const struct google_protobuf_UInt32Value* envoy_data_accesslog_v3_TLS 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1915,6 +1981,7 @@ UPB_INLINE const envoy_data_accesslog_v3_TLSProperties_CertificateProperties* en const envoy_data_accesslog_v3_TLSProperties_CertificateProperties* default_val = NULL; const envoy_data_accesslog_v3_TLSProperties_CertificateProperties* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__data__accesslog__v3__TLSProperties__CertificateProperties_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1931,6 +1998,7 @@ UPB_INLINE const envoy_data_accesslog_v3_TLSProperties_CertificateProperties* en const envoy_data_accesslog_v3_TLSProperties_CertificateProperties* default_val = NULL; const envoy_data_accesslog_v3_TLSProperties_CertificateProperties* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__data__accesslog__v3__TLSProperties__CertificateProperties_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1970,6 +2038,7 @@ UPB_INLINE void envoy_data_accesslog_v3_TLSProperties_set_tls_version(envoy_data } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); 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) { @@ -1986,6 +2055,7 @@ UPB_INLINE void envoy_data_accesslog_v3_TLSProperties_set_tls_sni_hostname(envoy } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__data__accesslog__v3__TLSProperties__CertificateProperties_msg_init); 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) { @@ -1998,6 +2068,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__data__accesslog__v3__TLSProperties__CertificateProperties_msg_init); 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) { @@ -2059,6 +2130,7 @@ UPB_INLINE void envoy_data_accesslog_v3_TLSProperties_CertificateProperties_clea } UPB_INLINE const envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName* const* envoy_data_accesslog_v3_TLSProperties_CertificateProperties_subject_alt_name(const envoy_data_accesslog_v3_TLSProperties_CertificateProperties* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__data__accesslog__v3__TLSProperties__CertificateProperties__SubjectAltName_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -2070,6 +2142,7 @@ UPB_INLINE const envoy_data_accesslog_v3_TLSProperties_CertificateProperties_Sub } UPB_INLINE const upb_Array* _envoy_data_accesslog_v3_TLSProperties_CertificateProperties_subject_alt_name_upb_array(const envoy_data_accesslog_v3_TLSProperties_CertificateProperties* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__data__accesslog__v3__TLSProperties__CertificateProperties__SubjectAltName_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -2078,6 +2151,7 @@ UPB_INLINE const upb_Array* _envoy_data_accesslog_v3_TLSProperties_CertificatePr } UPB_INLINE upb_Array* _envoy_data_accesslog_v3_TLSProperties_CertificateProperties_subject_alt_name_mutable_upb_array(envoy_data_accesslog_v3_TLSProperties_CertificateProperties* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__data__accesslog__v3__TLSProperties__CertificateProperties__SubjectAltName_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -2112,6 +2186,7 @@ UPB_INLINE upb_StringView envoy_data_accesslog_v3_TLSProperties_CertificatePrope UPB_INLINE envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName** envoy_data_accesslog_v3_TLSProperties_CertificateProperties_mutable_subject_alt_name(envoy_data_accesslog_v3_TLSProperties_CertificateProperties* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__data__accesslog__v3__TLSProperties__CertificateProperties__SubjectAltName_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -2128,6 +2203,7 @@ UPB_INLINE envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAl } UPB_INLINE struct envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName* envoy_data_accesslog_v3_TLSProperties_CertificateProperties_add_subject_alt_name(envoy_data_accesslog_v3_TLSProperties_CertificateProperties* msg, upb_Arena* arena) { upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__data__accesslog__v3__TLSProperties__CertificateProperties__SubjectAltName_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -2317,6 +2393,7 @@ UPB_INLINE const struct google_protobuf_UInt32Value* envoy_data_accesslog_v3_HTT const struct google_protobuf_UInt32Value* default_val = NULL; const struct google_protobuf_UInt32Value* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -2432,22 +2509,26 @@ UPB_INLINE size_t envoy_data_accesslog_v3_HTTPRequestProperties_request_headers_ } UPB_INLINE bool envoy_data_accesslog_v3_HTTPRequestProperties_request_headers_get(const envoy_data_accesslog_v3_HTTPRequestProperties* msg, upb_StringView key, upb_StringView* val) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__data__accesslog__v3__HTTPRequestProperties__RequestHeadersEntry_msg_init); const upb_Map* map = upb_Message_GetMap(UPB_UPCAST(msg), &field); if (!map) return false; return _upb_Map_Get(map, &key, 0, val, 0); } UPB_INLINE const envoy_data_accesslog_v3_HTTPRequestProperties_RequestHeadersEntry* envoy_data_accesslog_v3_HTTPRequestProperties_request_headers_next(const envoy_data_accesslog_v3_HTTPRequestProperties* msg, size_t* iter) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__data__accesslog__v3__HTTPRequestProperties__RequestHeadersEntry_msg_init); const upb_Map* map = upb_Message_GetMap(UPB_UPCAST(msg), &field); if (!map) return NULL; return (const envoy_data_accesslog_v3_HTTPRequestProperties_RequestHeadersEntry*)_upb_map_next(map, iter); } UPB_INLINE const upb_Map* _envoy_data_accesslog_v3_HTTPRequestProperties_request_headers_upb_map(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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__data__accesslog__v3__HTTPRequestProperties__RequestHeadersEntry_msg_init); return upb_Message_GetMap(UPB_UPCAST(msg), &field); } UPB_INLINE upb_Map* _envoy_data_accesslog_v3_HTTPRequestProperties_request_headers_mutable_upb_map(envoy_data_accesslog_v3_HTTPRequestProperties* msg, upb_Arena* a) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__data__accesslog__v3__HTTPRequestProperties__RequestHeadersEntry_msg_init); return _upb_Message_GetOrCreateMutableMap(UPB_UPCAST(msg), &field, 0, 0, a); } UPB_INLINE void envoy_data_accesslog_v3_HTTPRequestProperties_clear_upstream_header_bytes_sent(envoy_data_accesslog_v3_HTTPRequestProperties* msg) { @@ -2489,6 +2570,7 @@ UPB_INLINE void envoy_data_accesslog_v3_HTTPRequestProperties_set_authority(envo } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); 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) { @@ -2539,6 +2621,7 @@ UPB_INLINE void envoy_data_accesslog_v3_HTTPRequestProperties_request_headers_cl } UPB_INLINE bool envoy_data_accesslog_v3_HTTPRequestProperties_request_headers_set(envoy_data_accesslog_v3_HTTPRequestProperties* msg, upb_StringView key, upb_StringView val, upb_Arena* a) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__data__accesslog__v3__HTTPRequestProperties__RequestHeadersEntry_msg_init); upb_Map* map = _upb_Message_GetOrCreateMutableMap(UPB_UPCAST(msg), &field, 0, 0, a); return _upb_Map_Insert(map, &key, 0, &val, 0, a) != @@ -2552,6 +2635,7 @@ UPB_INLINE bool envoy_data_accesslog_v3_HTTPRequestProperties_request_headers_de } UPB_INLINE envoy_data_accesslog_v3_HTTPRequestProperties_RequestHeadersEntry* envoy_data_accesslog_v3_HTTPRequestProperties_request_headers_nextmutable(envoy_data_accesslog_v3_HTTPRequestProperties* msg, size_t* iter) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__data__accesslog__v3__HTTPRequestProperties__RequestHeadersEntry_msg_init); upb_Map* map = (upb_Map*)upb_Message_GetMap(UPB_UPCAST(msg), &field); if (!map) return NULL; return (envoy_data_accesslog_v3_HTTPRequestProperties_RequestHeadersEntry*)_upb_map_next(map, iter); @@ -2626,6 +2710,7 @@ UPB_INLINE const struct google_protobuf_UInt32Value* envoy_data_accesslog_v3_HTT const struct google_protobuf_UInt32Value* default_val = NULL; const struct google_protobuf_UInt32Value* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -2669,22 +2754,26 @@ UPB_INLINE size_t envoy_data_accesslog_v3_HTTPResponseProperties_response_header } UPB_INLINE bool envoy_data_accesslog_v3_HTTPResponseProperties_response_headers_get(const envoy_data_accesslog_v3_HTTPResponseProperties* msg, upb_StringView key, upb_StringView* val) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__data__accesslog__v3__HTTPResponseProperties__ResponseHeadersEntry_msg_init); const upb_Map* map = upb_Message_GetMap(UPB_UPCAST(msg), &field); if (!map) return false; return _upb_Map_Get(map, &key, 0, val, 0); } UPB_INLINE const envoy_data_accesslog_v3_HTTPResponseProperties_ResponseHeadersEntry* envoy_data_accesslog_v3_HTTPResponseProperties_response_headers_next(const envoy_data_accesslog_v3_HTTPResponseProperties* msg, size_t* iter) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__data__accesslog__v3__HTTPResponseProperties__ResponseHeadersEntry_msg_init); const upb_Map* map = upb_Message_GetMap(UPB_UPCAST(msg), &field); if (!map) return NULL; return (const envoy_data_accesslog_v3_HTTPResponseProperties_ResponseHeadersEntry*)_upb_map_next(map, iter); } UPB_INLINE const upb_Map* _envoy_data_accesslog_v3_HTTPResponseProperties_response_headers_upb_map(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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__data__accesslog__v3__HTTPResponseProperties__ResponseHeadersEntry_msg_init); return upb_Message_GetMap(UPB_UPCAST(msg), &field); } UPB_INLINE upb_Map* _envoy_data_accesslog_v3_HTTPResponseProperties_response_headers_mutable_upb_map(envoy_data_accesslog_v3_HTTPResponseProperties* msg, upb_Arena* a) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__data__accesslog__v3__HTTPResponseProperties__ResponseHeadersEntry_msg_init); return _upb_Message_GetOrCreateMutableMap(UPB_UPCAST(msg), &field, 0, 0, a); } UPB_INLINE void envoy_data_accesslog_v3_HTTPResponseProperties_clear_response_trailers(envoy_data_accesslog_v3_HTTPResponseProperties* msg) { @@ -2698,22 +2787,26 @@ UPB_INLINE size_t envoy_data_accesslog_v3_HTTPResponseProperties_response_traile } UPB_INLINE bool envoy_data_accesslog_v3_HTTPResponseProperties_response_trailers_get(const envoy_data_accesslog_v3_HTTPResponseProperties* msg, upb_StringView key, upb_StringView* val) { const upb_MiniTableField field = {5, UPB_SIZE(20, 48), 0, 2, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__data__accesslog__v3__HTTPResponseProperties__ResponseTrailersEntry_msg_init); const upb_Map* map = upb_Message_GetMap(UPB_UPCAST(msg), &field); if (!map) return false; return _upb_Map_Get(map, &key, 0, val, 0); } UPB_INLINE const envoy_data_accesslog_v3_HTTPResponseProperties_ResponseTrailersEntry* envoy_data_accesslog_v3_HTTPResponseProperties_response_trailers_next(const envoy_data_accesslog_v3_HTTPResponseProperties* msg, size_t* iter) { const upb_MiniTableField field = {5, UPB_SIZE(20, 48), 0, 2, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__data__accesslog__v3__HTTPResponseProperties__ResponseTrailersEntry_msg_init); const upb_Map* map = upb_Message_GetMap(UPB_UPCAST(msg), &field); if (!map) return NULL; return (const envoy_data_accesslog_v3_HTTPResponseProperties_ResponseTrailersEntry*)_upb_map_next(map, iter); } UPB_INLINE const upb_Map* _envoy_data_accesslog_v3_HTTPResponseProperties_response_trailers_upb_map(envoy_data_accesslog_v3_HTTPResponseProperties* msg) { const upb_MiniTableField field = {5, UPB_SIZE(20, 48), 0, 2, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__data__accesslog__v3__HTTPResponseProperties__ResponseTrailersEntry_msg_init); return upb_Message_GetMap(UPB_UPCAST(msg), &field); } UPB_INLINE upb_Map* _envoy_data_accesslog_v3_HTTPResponseProperties_response_trailers_mutable_upb_map(envoy_data_accesslog_v3_HTTPResponseProperties* msg, upb_Arena* a) { const upb_MiniTableField field = {5, UPB_SIZE(20, 48), 0, 2, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__data__accesslog__v3__HTTPResponseProperties__ResponseTrailersEntry_msg_init); return _upb_Message_GetOrCreateMutableMap(UPB_UPCAST(msg), &field, 0, 0, a); } UPB_INLINE void envoy_data_accesslog_v3_HTTPResponseProperties_clear_response_code_details(envoy_data_accesslog_v3_HTTPResponseProperties* msg) { @@ -2755,6 +2848,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); 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) { @@ -2781,6 +2875,7 @@ UPB_INLINE void envoy_data_accesslog_v3_HTTPResponseProperties_response_headers_ } UPB_INLINE bool envoy_data_accesslog_v3_HTTPResponseProperties_response_headers_set(envoy_data_accesslog_v3_HTTPResponseProperties* msg, upb_StringView key, upb_StringView val, upb_Arena* a) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__data__accesslog__v3__HTTPResponseProperties__ResponseHeadersEntry_msg_init); upb_Map* map = _upb_Message_GetOrCreateMutableMap(UPB_UPCAST(msg), &field, 0, 0, a); return _upb_Map_Insert(map, &key, 0, &val, 0, a) != @@ -2794,6 +2889,7 @@ UPB_INLINE bool envoy_data_accesslog_v3_HTTPResponseProperties_response_headers_ } UPB_INLINE envoy_data_accesslog_v3_HTTPResponseProperties_ResponseHeadersEntry* envoy_data_accesslog_v3_HTTPResponseProperties_response_headers_nextmutable(envoy_data_accesslog_v3_HTTPResponseProperties* msg, size_t* iter) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__data__accesslog__v3__HTTPResponseProperties__ResponseHeadersEntry_msg_init); upb_Map* map = (upb_Map*)upb_Message_GetMap(UPB_UPCAST(msg), &field); if (!map) return NULL; return (envoy_data_accesslog_v3_HTTPResponseProperties_ResponseHeadersEntry*)_upb_map_next(map, iter); @@ -2806,6 +2902,7 @@ UPB_INLINE void envoy_data_accesslog_v3_HTTPResponseProperties_response_trailers } UPB_INLINE bool envoy_data_accesslog_v3_HTTPResponseProperties_response_trailers_set(envoy_data_accesslog_v3_HTTPResponseProperties* msg, upb_StringView key, upb_StringView val, upb_Arena* a) { const upb_MiniTableField field = {5, UPB_SIZE(20, 48), 0, 2, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__data__accesslog__v3__HTTPResponseProperties__ResponseTrailersEntry_msg_init); upb_Map* map = _upb_Message_GetOrCreateMutableMap(UPB_UPCAST(msg), &field, 0, 0, a); return _upb_Map_Insert(map, &key, 0, &val, 0, a) != @@ -2819,6 +2916,7 @@ UPB_INLINE bool envoy_data_accesslog_v3_HTTPResponseProperties_response_trailers } UPB_INLINE envoy_data_accesslog_v3_HTTPResponseProperties_ResponseTrailersEntry* envoy_data_accesslog_v3_HTTPResponseProperties_response_trailers_nextmutable(envoy_data_accesslog_v3_HTTPResponseProperties* msg, size_t* iter) { const upb_MiniTableField field = {5, UPB_SIZE(20, 48), 0, 2, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__data__accesslog__v3__HTTPResponseProperties__ResponseTrailersEntry_msg_init); upb_Map* map = (upb_Map*)upb_Message_GetMap(UPB_UPCAST(msg), &field); if (!map) return NULL; return (envoy_data_accesslog_v3_HTTPResponseProperties_ResponseTrailersEntry*)_upb_map_next(map, iter); diff --git a/src/core/ext/upb-gen/envoy/data/accesslog/v3/accesslog.upb_minitable.c b/src/core/ext/upb-gen/envoy/data/accesslog/v3/accesslog.upb_minitable.c index f4aeac90a78..2ba6173bf4f 100644 --- a/src/core/ext/upb-gen/envoy/data/accesslog/v3/accesslog.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/data/accesslog/v3/accesslog.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/data/accesslog/v3/accesslog.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -22,9 +23,10 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub envoy_data_accesslog_v3_TCPAccessLogEntry_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &envoy__data__accesslog__v3__AccessLogCommon_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__data__accesslog__v3__ConnectionProperties_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal envoy_data_accesslog_v3_TCPAccessLogEntry_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &envoy__data__accesslog__v3__AccessLogCommon_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__data__accesslog__v3__ConnectionProperties_msg_init_ptr}, }; static const upb_MiniTableField envoy_data_accesslog_v3_TCPAccessLogEntry__fields[2] = { @@ -41,10 +43,11 @@ const upb_MiniTable envoy__data__accesslog__v3__TCPAccessLogEntry_msg_init = { #endif }; -static const upb_MiniTableSub envoy_data_accesslog_v3_HTTPAccessLogEntry_submsgs[3] = { - {.UPB_PRIVATE(submsg) = &envoy__data__accesslog__v3__AccessLogCommon_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__data__accesslog__v3__HTTPRequestProperties_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__data__accesslog__v3__HTTPResponseProperties_msg_init}, +const upb_MiniTable* envoy__data__accesslog__v3__TCPAccessLogEntry_msg_init_ptr = &envoy__data__accesslog__v3__TCPAccessLogEntry_msg_init; +static const upb_MiniTableSubInternal envoy_data_accesslog_v3_HTTPAccessLogEntry_submsgs[3] = { + {.UPB_PRIVATE(submsg) = &envoy__data__accesslog__v3__AccessLogCommon_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__data__accesslog__v3__HTTPRequestProperties_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__data__accesslog__v3__HTTPResponseProperties_msg_init_ptr}, }; static const upb_MiniTableField envoy_data_accesslog_v3_HTTPAccessLogEntry__fields[4] = { @@ -69,6 +72,7 @@ const upb_MiniTable envoy__data__accesslog__v3__HTTPAccessLogEntry_msg_init = { }) }; +const upb_MiniTable* envoy__data__accesslog__v3__HTTPAccessLogEntry_msg_init_ptr = &envoy__data__accesslog__v3__HTTPAccessLogEntry_msg_init; static const upb_MiniTableField envoy_data_accesslog_v3_ConnectionProperties__fields[2] = { {1, 8, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, {2, 16, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, @@ -89,26 +93,27 @@ const upb_MiniTable envoy__data__accesslog__v3__ConnectionProperties_msg_init = }) }; -static const upb_MiniTableSub envoy_data_accesslog_v3_AccessLogCommon_submsgs[19] = { - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Address_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Address_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__data__accesslog__v3__TLSProperties_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Address_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Address_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__data__accesslog__v3__ResponseFlags_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Metadata_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Address_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__data__accesslog__v3__AccessLogCommon__FilterStateObjectsEntry_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__data__accesslog__v3__AccessLogCommon__CustomTagsEntry_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, +const upb_MiniTable* envoy__data__accesslog__v3__ConnectionProperties_msg_init_ptr = &envoy__data__accesslog__v3__ConnectionProperties_msg_init; +static const upb_MiniTableSubInternal envoy_data_accesslog_v3_AccessLogCommon_submsgs[19] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Address_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Address_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__data__accesslog__v3__TLSProperties_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Address_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Address_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__data__accesslog__v3__ResponseFlags_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Metadata_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Address_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__data__accesslog__v3__AccessLogCommon__FilterStateObjectsEntry_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__data__accesslog__v3__AccessLogCommon__CustomTagsEntry_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, }; static const upb_MiniTableField envoy_data_accesslog_v3_AccessLogCommon__fields[33] = { @@ -190,8 +195,9 @@ const upb_MiniTable envoy__data__accesslog__v3__AccessLogCommon_msg_init = { }) }; -static const upb_MiniTableSub envoy_data_accesslog_v3_AccessLogCommon_FilterStateObjectsEntry_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init}, +const upb_MiniTable* envoy__data__accesslog__v3__AccessLogCommon_msg_init_ptr = &envoy__data__accesslog__v3__AccessLogCommon_msg_init; +static const upb_MiniTableSubInternal envoy_data_accesslog_v3_AccessLogCommon_FilterStateObjectsEntry_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, }; static const upb_MiniTableField envoy_data_accesslog_v3_AccessLogCommon_FilterStateObjectsEntry__fields[2] = { @@ -212,6 +218,7 @@ const upb_MiniTable envoy__data__accesslog__v3__AccessLogCommon__FilterStateObje }) }; +const upb_MiniTable* envoy__data__accesslog__v3__AccessLogCommon__FilterStateObjectsEntry_msg_init_ptr = &envoy__data__accesslog__v3__AccessLogCommon__FilterStateObjectsEntry_msg_init; static const upb_MiniTableField envoy_data_accesslog_v3_AccessLogCommon_CustomTagsEntry__fields[2] = { {1, 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)}, @@ -232,8 +239,9 @@ const upb_MiniTable envoy__data__accesslog__v3__AccessLogCommon__CustomTagsEntry }) }; -static const upb_MiniTableSub envoy_data_accesslog_v3_ResponseFlags_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__data__accesslog__v3__ResponseFlags__Unauthorized_msg_init}, +const upb_MiniTable* envoy__data__accesslog__v3__AccessLogCommon__CustomTagsEntry_msg_init_ptr = &envoy__data__accesslog__v3__AccessLogCommon__CustomTagsEntry_msg_init; +static const upb_MiniTableSubInternal envoy_data_accesslog_v3_ResponseFlags_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__data__accesslog__v3__ResponseFlags__Unauthorized_msg_init_ptr}, }; static const upb_MiniTableField envoy_data_accesslog_v3_ResponseFlags__fields[28] = { @@ -310,6 +318,7 @@ const upb_MiniTable envoy__data__accesslog__v3__ResponseFlags_msg_init = { }) }; +const upb_MiniTable* envoy__data__accesslog__v3__ResponseFlags_msg_init_ptr = &envoy__data__accesslog__v3__ResponseFlags_msg_init; static const upb_MiniTableField envoy_data_accesslog_v3_ResponseFlags_Unauthorized__fields[1] = { {1, 8, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, }; @@ -327,10 +336,11 @@ const upb_MiniTable envoy__data__accesslog__v3__ResponseFlags__Unauthorized_msg_ }) }; -static const upb_MiniTableSub envoy_data_accesslog_v3_TLSProperties_submsgs[3] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__data__accesslog__v3__TLSProperties__CertificateProperties_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__data__accesslog__v3__TLSProperties__CertificateProperties_msg_init}, +const upb_MiniTable* envoy__data__accesslog__v3__ResponseFlags__Unauthorized_msg_init_ptr = &envoy__data__accesslog__v3__ResponseFlags__Unauthorized_msg_init; +static const upb_MiniTableSubInternal envoy_data_accesslog_v3_TLSProperties_submsgs[3] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__data__accesslog__v3__TLSProperties__CertificateProperties_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__data__accesslog__v3__TLSProperties__CertificateProperties_msg_init_ptr}, }; static const upb_MiniTableField envoy_data_accesslog_v3_TLSProperties__fields[7] = { @@ -362,8 +372,9 @@ const upb_MiniTable envoy__data__accesslog__v3__TLSProperties_msg_init = { }) }; -static const upb_MiniTableSub envoy_data_accesslog_v3_TLSProperties_CertificateProperties_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__data__accesslog__v3__TLSProperties__CertificateProperties__SubjectAltName_msg_init}, +const upb_MiniTable* envoy__data__accesslog__v3__TLSProperties_msg_init_ptr = &envoy__data__accesslog__v3__TLSProperties_msg_init; +static const upb_MiniTableSubInternal envoy_data_accesslog_v3_TLSProperties_CertificateProperties_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__data__accesslog__v3__TLSProperties__CertificateProperties__SubjectAltName_msg_init_ptr}, }; static const upb_MiniTableField envoy_data_accesslog_v3_TLSProperties_CertificateProperties__fields[3] = { @@ -387,6 +398,7 @@ const upb_MiniTable envoy__data__accesslog__v3__TLSProperties__CertificateProper }) }; +const upb_MiniTable* envoy__data__accesslog__v3__TLSProperties__CertificateProperties_msg_init_ptr = &envoy__data__accesslog__v3__TLSProperties__CertificateProperties_msg_init; static const upb_MiniTableField envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName__fields[2] = { {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, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, @@ -407,9 +419,10 @@ const upb_MiniTable envoy__data__accesslog__v3__TLSProperties__CertificateProper }) }; -static const upb_MiniTableSub envoy_data_accesslog_v3_HTTPRequestProperties_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__data__accesslog__v3__HTTPRequestProperties__RequestHeadersEntry_msg_init}, +const upb_MiniTable* envoy__data__accesslog__v3__TLSProperties__CertificateProperties__SubjectAltName_msg_init_ptr = &envoy__data__accesslog__v3__TLSProperties__CertificateProperties__SubjectAltName_msg_init; +static const upb_MiniTableSubInternal envoy_data_accesslog_v3_HTTPRequestProperties_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__data__accesslog__v3__HTTPRequestProperties__RequestHeadersEntry_msg_init_ptr}, }; static const upb_MiniTableField envoy_data_accesslog_v3_HTTPRequestProperties__fields[15] = { @@ -457,6 +470,7 @@ const upb_MiniTable envoy__data__accesslog__v3__HTTPRequestProperties_msg_init = }) }; +const upb_MiniTable* envoy__data__accesslog__v3__HTTPRequestProperties_msg_init_ptr = &envoy__data__accesslog__v3__HTTPRequestProperties_msg_init; static const upb_MiniTableField envoy_data_accesslog_v3_HTTPRequestProperties_RequestHeadersEntry__fields[2] = { {1, 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)}, @@ -477,10 +491,11 @@ const upb_MiniTable envoy__data__accesslog__v3__HTTPRequestProperties__RequestHe }) }; -static const upb_MiniTableSub envoy_data_accesslog_v3_HTTPResponseProperties_submsgs[3] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__data__accesslog__v3__HTTPResponseProperties__ResponseHeadersEntry_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__data__accesslog__v3__HTTPResponseProperties__ResponseTrailersEntry_msg_init}, +const upb_MiniTable* envoy__data__accesslog__v3__HTTPRequestProperties__RequestHeadersEntry_msg_init_ptr = &envoy__data__accesslog__v3__HTTPRequestProperties__RequestHeadersEntry_msg_init; +static const upb_MiniTableSubInternal envoy_data_accesslog_v3_HTTPResponseProperties_submsgs[3] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__data__accesslog__v3__HTTPResponseProperties__ResponseHeadersEntry_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__data__accesslog__v3__HTTPResponseProperties__ResponseTrailersEntry_msg_init_ptr}, }; static const upb_MiniTableField envoy_data_accesslog_v3_HTTPResponseProperties__fields[8] = { @@ -521,6 +536,7 @@ const upb_MiniTable envoy__data__accesslog__v3__HTTPResponseProperties_msg_init }) }; +const upb_MiniTable* envoy__data__accesslog__v3__HTTPResponseProperties_msg_init_ptr = &envoy__data__accesslog__v3__HTTPResponseProperties_msg_init; static const upb_MiniTableField envoy_data_accesslog_v3_HTTPResponseProperties_ResponseHeadersEntry__fields[2] = { {1, 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)}, @@ -541,6 +557,7 @@ const upb_MiniTable envoy__data__accesslog__v3__HTTPResponseProperties__Response }) }; +const upb_MiniTable* envoy__data__accesslog__v3__HTTPResponseProperties__ResponseHeadersEntry_msg_init_ptr = &envoy__data__accesslog__v3__HTTPResponseProperties__ResponseHeadersEntry_msg_init; static const upb_MiniTableField envoy_data_accesslog_v3_HTTPResponseProperties_ResponseTrailersEntry__fields[2] = { {1, 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)}, @@ -561,6 +578,7 @@ const upb_MiniTable envoy__data__accesslog__v3__HTTPResponseProperties__Response }) }; +const upb_MiniTable* envoy__data__accesslog__v3__HTTPResponseProperties__ResponseTrailersEntry_msg_init_ptr = &envoy__data__accesslog__v3__HTTPResponseProperties__ResponseTrailersEntry_msg_init; static const upb_MiniTable *messages_layout[16] = { &envoy__data__accesslog__v3__TCPAccessLogEntry_msg_init, &envoy__data__accesslog__v3__HTTPAccessLogEntry_msg_init, diff --git a/src/core/ext/upb-gen/envoy/data/accesslog/v3/accesslog.upb_minitable.h b/src/core/ext/upb-gen/envoy/data/accesslog/v3/accesslog.upb_minitable.h index 53d7d0196ed..ffce3d33589 100644 --- a/src/core/ext/upb-gen/envoy/data/accesslog/v3/accesslog.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/data/accesslog/v3/accesslog.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/data/accesslog/v3/accesslog.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_DATA_ACCESSLOG_V3_ACCESSLOG_PROTO_UPB_MINITABLE_H_ #define ENVOY_DATA_ACCESSLOG_V3_ACCESSLOG_PROTO_UPB_MINITABLE_H_ @@ -18,21 +19,37 @@ extern "C" { #endif extern const upb_MiniTable envoy__data__accesslog__v3__TCPAccessLogEntry_msg_init; +extern const upb_MiniTable* envoy__data__accesslog__v3__TCPAccessLogEntry_msg_init_ptr; extern const upb_MiniTable envoy__data__accesslog__v3__HTTPAccessLogEntry_msg_init; +extern const upb_MiniTable* envoy__data__accesslog__v3__HTTPAccessLogEntry_msg_init_ptr; extern const upb_MiniTable envoy__data__accesslog__v3__ConnectionProperties_msg_init; +extern const upb_MiniTable* envoy__data__accesslog__v3__ConnectionProperties_msg_init_ptr; extern const upb_MiniTable envoy__data__accesslog__v3__AccessLogCommon_msg_init; +extern const upb_MiniTable* envoy__data__accesslog__v3__AccessLogCommon_msg_init_ptr; extern const upb_MiniTable envoy__data__accesslog__v3__AccessLogCommon__FilterStateObjectsEntry_msg_init; +extern const upb_MiniTable* envoy__data__accesslog__v3__AccessLogCommon__FilterStateObjectsEntry_msg_init_ptr; extern const upb_MiniTable envoy__data__accesslog__v3__AccessLogCommon__CustomTagsEntry_msg_init; +extern const upb_MiniTable* envoy__data__accesslog__v3__AccessLogCommon__CustomTagsEntry_msg_init_ptr; extern const upb_MiniTable envoy__data__accesslog__v3__ResponseFlags_msg_init; +extern const upb_MiniTable* envoy__data__accesslog__v3__ResponseFlags_msg_init_ptr; extern const upb_MiniTable envoy__data__accesslog__v3__ResponseFlags__Unauthorized_msg_init; +extern const upb_MiniTable* envoy__data__accesslog__v3__ResponseFlags__Unauthorized_msg_init_ptr; extern const upb_MiniTable envoy__data__accesslog__v3__TLSProperties_msg_init; +extern const upb_MiniTable* envoy__data__accesslog__v3__TLSProperties_msg_init_ptr; extern const upb_MiniTable envoy__data__accesslog__v3__TLSProperties__CertificateProperties_msg_init; +extern const upb_MiniTable* envoy__data__accesslog__v3__TLSProperties__CertificateProperties_msg_init_ptr; extern const upb_MiniTable envoy__data__accesslog__v3__TLSProperties__CertificateProperties__SubjectAltName_msg_init; +extern const upb_MiniTable* envoy__data__accesslog__v3__TLSProperties__CertificateProperties__SubjectAltName_msg_init_ptr; extern const upb_MiniTable envoy__data__accesslog__v3__HTTPRequestProperties_msg_init; +extern const upb_MiniTable* envoy__data__accesslog__v3__HTTPRequestProperties_msg_init_ptr; extern const upb_MiniTable envoy__data__accesslog__v3__HTTPRequestProperties__RequestHeadersEntry_msg_init; +extern const upb_MiniTable* envoy__data__accesslog__v3__HTTPRequestProperties__RequestHeadersEntry_msg_init_ptr; extern const upb_MiniTable envoy__data__accesslog__v3__HTTPResponseProperties_msg_init; +extern const upb_MiniTable* envoy__data__accesslog__v3__HTTPResponseProperties_msg_init_ptr; extern const upb_MiniTable envoy__data__accesslog__v3__HTTPResponseProperties__ResponseHeadersEntry_msg_init; +extern const upb_MiniTable* envoy__data__accesslog__v3__HTTPResponseProperties__ResponseHeadersEntry_msg_init_ptr; extern const upb_MiniTable envoy__data__accesslog__v3__HTTPResponseProperties__ResponseTrailersEntry_msg_init; +extern const upb_MiniTable* envoy__data__accesslog__v3__HTTPResponseProperties__ResponseTrailersEntry_msg_init_ptr; extern const upb_MiniTableFile envoy_data_accesslog_v3_accesslog_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/extensions/clusters/aggregate/v3/cluster.upb.h b/src/core/ext/upb-gen/envoy/extensions/clusters/aggregate/v3/cluster.upb.h index ca89fe079c8..8c6ebbe6a41 100644 --- a/src/core/ext/upb-gen/envoy/extensions/clusters/aggregate/v3/cluster.upb.h +++ b/src/core/ext/upb-gen/envoy/extensions/clusters/aggregate/v3/cluster.upb.h @@ -3,7 +3,8 @@ * envoy/extensions/clusters/aggregate/v3/cluster.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_EXTENSIONS_CLUSTERS_AGGREGATE_V3_CLUSTER_PROTO_UPB_H_ #define ENVOY_EXTENSIONS_CLUSTERS_AGGREGATE_V3_CLUSTER_PROTO_UPB_H_ diff --git a/src/core/ext/upb-gen/envoy/extensions/clusters/aggregate/v3/cluster.upb_minitable.c b/src/core/ext/upb-gen/envoy/extensions/clusters/aggregate/v3/cluster.upb_minitable.c index 8f929ddb538..12299329574 100644 --- a/src/core/ext/upb-gen/envoy/extensions/clusters/aggregate/v3/cluster.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/extensions/clusters/aggregate/v3/cluster.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/extensions/clusters/aggregate/v3/cluster.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -15,6 +16,7 @@ // Must be last. #include "upb/port/def.inc" +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); static const upb_MiniTableField envoy_extensions_clusters_aggregate_v3_ClusterConfig__fields[1] = { {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, }; @@ -32,6 +34,7 @@ const upb_MiniTable envoy__extensions__clusters__aggregate__v3__ClusterConfig_ms }) }; +const upb_MiniTable* envoy__extensions__clusters__aggregate__v3__ClusterConfig_msg_init_ptr = &envoy__extensions__clusters__aggregate__v3__ClusterConfig_msg_init; static const upb_MiniTable *messages_layout[1] = { &envoy__extensions__clusters__aggregate__v3__ClusterConfig_msg_init, }; diff --git a/src/core/ext/upb-gen/envoy/extensions/clusters/aggregate/v3/cluster.upb_minitable.h b/src/core/ext/upb-gen/envoy/extensions/clusters/aggregate/v3/cluster.upb_minitable.h index 7a18de08b59..266c0efb767 100644 --- a/src/core/ext/upb-gen/envoy/extensions/clusters/aggregate/v3/cluster.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/extensions/clusters/aggregate/v3/cluster.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/extensions/clusters/aggregate/v3/cluster.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_EXTENSIONS_CLUSTERS_AGGREGATE_V3_CLUSTER_PROTO_UPB_MINITABLE_H_ #define ENVOY_EXTENSIONS_CLUSTERS_AGGREGATE_V3_CLUSTER_PROTO_UPB_MINITABLE_H_ @@ -18,6 +19,7 @@ extern "C" { #endif extern const upb_MiniTable envoy__extensions__clusters__aggregate__v3__ClusterConfig_msg_init; +extern const upb_MiniTable* envoy__extensions__clusters__aggregate__v3__ClusterConfig_msg_init_ptr; extern const upb_MiniTableFile envoy_extensions_clusters_aggregate_v3_cluster_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/extensions/filters/common/fault/v3/fault.upb.h b/src/core/ext/upb-gen/envoy/extensions/filters/common/fault/v3/fault.upb.h index f48a3c58f48..48a4be6ca67 100644 --- a/src/core/ext/upb-gen/envoy/extensions/filters/common/fault/v3/fault.upb.h +++ b/src/core/ext/upb-gen/envoy/extensions/filters/common/fault/v3/fault.upb.h @@ -3,7 +3,8 @@ * envoy/extensions/filters/common/fault/v3/fault.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_EXTENSIONS_FILTERS_COMMON_FAULT_V3_FAULT_PROTO_UPB_H_ #define ENVOY_EXTENSIONS_FILTERS_COMMON_FAULT_V3_FAULT_PROTO_UPB_H_ @@ -93,6 +94,7 @@ UPB_INLINE const struct google_protobuf_Duration* envoy_extensions_filters_commo const struct google_protobuf_Duration* default_val = NULL; const struct google_protobuf_Duration* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -109,6 +111,7 @@ UPB_INLINE const struct envoy_type_v3_FractionalPercent* envoy_extensions_filter const struct envoy_type_v3_FractionalPercent* default_val = NULL; const struct envoy_type_v3_FractionalPercent* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__v3__FractionalPercent_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -125,6 +128,7 @@ UPB_INLINE const envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay const envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay* default_val = NULL; const envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__filters__common__fault__v3__FaultDelay__HeaderDelay_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -136,6 +140,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { @@ -148,6 +153,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__v3__FractionalPercent_msg_init); 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) { @@ -160,6 +166,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__filters__common__fault__v3__FaultDelay__HeaderDelay_msg_init); 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) { @@ -263,6 +270,7 @@ UPB_INLINE const envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLi const envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit* default_val = NULL; const envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__filters__common__fault__v3__FaultRateLimit__FixedLimit_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -279,6 +287,7 @@ UPB_INLINE const struct envoy_type_v3_FractionalPercent* envoy_extensions_filter const struct envoy_type_v3_FractionalPercent* default_val = NULL; const struct envoy_type_v3_FractionalPercent* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__v3__FractionalPercent_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -295,6 +304,7 @@ UPB_INLINE const envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderL const envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit* default_val = NULL; const envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__filters__common__fault__v3__FaultRateLimit__HeaderLimit_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -306,6 +316,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__filters__common__fault__v3__FaultRateLimit__FixedLimit_msg_init); 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) { @@ -318,6 +329,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__v3__FractionalPercent_msg_init); 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) { @@ -330,6 +342,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__filters__common__fault__v3__FaultRateLimit__HeaderLimit_msg_init); 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) { diff --git a/src/core/ext/upb-gen/envoy/extensions/filters/common/fault/v3/fault.upb_minitable.c b/src/core/ext/upb-gen/envoy/extensions/filters/common/fault/v3/fault.upb_minitable.c index 98bd93d83ab..7e53431d5db 100644 --- a/src/core/ext/upb-gen/envoy/extensions/filters/common/fault/v3/fault.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/extensions/filters/common/fault/v3/fault.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/extensions/filters/common/fault/v3/fault.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -17,10 +18,11 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub envoy_extensions_filters_common_fault_v3_FaultDelay_submsgs[3] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__type__v3__FractionalPercent_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__extensions__filters__common__fault__v3__FaultDelay__HeaderDelay_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal envoy_extensions_filters_common_fault_v3_FaultDelay_submsgs[3] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__type__v3__FractionalPercent_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__extensions__filters__common__fault__v3__FaultDelay__HeaderDelay_msg_init_ptr}, }; static const upb_MiniTableField envoy_extensions_filters_common_fault_v3_FaultDelay__fields[3] = { @@ -48,6 +50,7 @@ const upb_MiniTable envoy__extensions__filters__common__fault__v3__FaultDelay_ms }) }; +const upb_MiniTable* envoy__extensions__filters__common__fault__v3__FaultDelay_msg_init_ptr = &envoy__extensions__filters__common__fault__v3__FaultDelay_msg_init; const upb_MiniTable envoy__extensions__filters__common__fault__v3__FaultDelay__HeaderDelay_msg_init = { NULL, NULL, @@ -57,10 +60,11 @@ const upb_MiniTable envoy__extensions__filters__common__fault__v3__FaultDelay__H #endif }; -static const upb_MiniTableSub envoy_extensions_filters_common_fault_v3_FaultRateLimit_submsgs[3] = { - {.UPB_PRIVATE(submsg) = &envoy__extensions__filters__common__fault__v3__FaultRateLimit__FixedLimit_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__type__v3__FractionalPercent_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__extensions__filters__common__fault__v3__FaultRateLimit__HeaderLimit_msg_init}, +const upb_MiniTable* envoy__extensions__filters__common__fault__v3__FaultDelay__HeaderDelay_msg_init_ptr = &envoy__extensions__filters__common__fault__v3__FaultDelay__HeaderDelay_msg_init; +static const upb_MiniTableSubInternal envoy_extensions_filters_common_fault_v3_FaultRateLimit_submsgs[3] = { + {.UPB_PRIVATE(submsg) = &envoy__extensions__filters__common__fault__v3__FaultRateLimit__FixedLimit_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__type__v3__FractionalPercent_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__extensions__filters__common__fault__v3__FaultRateLimit__HeaderLimit_msg_init_ptr}, }; static const upb_MiniTableField envoy_extensions_filters_common_fault_v3_FaultRateLimit__fields[3] = { @@ -84,6 +88,7 @@ const upb_MiniTable envoy__extensions__filters__common__fault__v3__FaultRateLimi }) }; +const upb_MiniTable* envoy__extensions__filters__common__fault__v3__FaultRateLimit_msg_init_ptr = &envoy__extensions__filters__common__fault__v3__FaultRateLimit_msg_init; static const upb_MiniTableField envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit__fields[1] = { {1, 8, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, }; @@ -101,6 +106,7 @@ const upb_MiniTable envoy__extensions__filters__common__fault__v3__FaultRateLimi }) }; +const upb_MiniTable* envoy__extensions__filters__common__fault__v3__FaultRateLimit__FixedLimit_msg_init_ptr = &envoy__extensions__filters__common__fault__v3__FaultRateLimit__FixedLimit_msg_init; const upb_MiniTable envoy__extensions__filters__common__fault__v3__FaultRateLimit__HeaderLimit_msg_init = { NULL, NULL, @@ -110,6 +116,7 @@ const upb_MiniTable envoy__extensions__filters__common__fault__v3__FaultRateLimi #endif }; +const upb_MiniTable* envoy__extensions__filters__common__fault__v3__FaultRateLimit__HeaderLimit_msg_init_ptr = &envoy__extensions__filters__common__fault__v3__FaultRateLimit__HeaderLimit_msg_init; static const upb_MiniTable *messages_layout[5] = { &envoy__extensions__filters__common__fault__v3__FaultDelay_msg_init, &envoy__extensions__filters__common__fault__v3__FaultDelay__HeaderDelay_msg_init, diff --git a/src/core/ext/upb-gen/envoy/extensions/filters/common/fault/v3/fault.upb_minitable.h b/src/core/ext/upb-gen/envoy/extensions/filters/common/fault/v3/fault.upb_minitable.h index b5f4270c40e..f5047f1468e 100644 --- a/src/core/ext/upb-gen/envoy/extensions/filters/common/fault/v3/fault.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/extensions/filters/common/fault/v3/fault.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/extensions/filters/common/fault/v3/fault.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_EXTENSIONS_FILTERS_COMMON_FAULT_V3_FAULT_PROTO_UPB_MINITABLE_H_ #define ENVOY_EXTENSIONS_FILTERS_COMMON_FAULT_V3_FAULT_PROTO_UPB_MINITABLE_H_ @@ -18,10 +19,15 @@ extern "C" { #endif extern const upb_MiniTable envoy__extensions__filters__common__fault__v3__FaultDelay_msg_init; +extern const upb_MiniTable* envoy__extensions__filters__common__fault__v3__FaultDelay_msg_init_ptr; extern const upb_MiniTable envoy__extensions__filters__common__fault__v3__FaultDelay__HeaderDelay_msg_init; +extern const upb_MiniTable* envoy__extensions__filters__common__fault__v3__FaultDelay__HeaderDelay_msg_init_ptr; extern const upb_MiniTable envoy__extensions__filters__common__fault__v3__FaultRateLimit_msg_init; +extern const upb_MiniTable* envoy__extensions__filters__common__fault__v3__FaultRateLimit_msg_init_ptr; extern const upb_MiniTable envoy__extensions__filters__common__fault__v3__FaultRateLimit__FixedLimit_msg_init; +extern const upb_MiniTable* envoy__extensions__filters__common__fault__v3__FaultRateLimit__FixedLimit_msg_init_ptr; extern const upb_MiniTable envoy__extensions__filters__common__fault__v3__FaultRateLimit__HeaderLimit_msg_init; +extern const upb_MiniTable* envoy__extensions__filters__common__fault__v3__FaultRateLimit__HeaderLimit_msg_init_ptr; extern const upb_MiniTableFile envoy_extensions_filters_common_fault_v3_fault_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/extensions/filters/http/fault/v3/fault.upb.h b/src/core/ext/upb-gen/envoy/extensions/filters/http/fault/v3/fault.upb.h index 94cf90be881..5d02885458e 100644 --- a/src/core/ext/upb-gen/envoy/extensions/filters/http/fault/v3/fault.upb.h +++ b/src/core/ext/upb-gen/envoy/extensions/filters/http/fault/v3/fault.upb.h @@ -3,7 +3,8 @@ * envoy/extensions/filters/http/fault/v3/fault.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_EXTENSIONS_FILTERS_HTTP_FAULT_V3_FAULT_PROTO_UPB_H_ #define ENVOY_EXTENSIONS_FILTERS_HTTP_FAULT_V3_FAULT_PROTO_UPB_H_ @@ -111,6 +112,7 @@ UPB_INLINE const struct envoy_type_v3_FractionalPercent* envoy_extensions_filter const struct envoy_type_v3_FractionalPercent* default_val = NULL; const struct envoy_type_v3_FractionalPercent* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__v3__FractionalPercent_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -127,6 +129,7 @@ UPB_INLINE const envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort* const envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort* default_val = NULL; const envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__filters__http__fault__v3__FaultAbort__HeaderAbort_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -158,6 +161,7 @@ UPB_INLINE void envoy_extensions_filters_http_fault_v3_FaultAbort_set_http_statu } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__v3__FractionalPercent_msg_init); 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) { @@ -170,6 +174,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__filters__http__fault__v3__FaultAbort__HeaderAbort_msg_init); 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) { @@ -267,6 +272,7 @@ UPB_INLINE const struct envoy_extensions_filters_common_fault_v3_FaultDelay* env const struct envoy_extensions_filters_common_fault_v3_FaultDelay* default_val = NULL; const struct envoy_extensions_filters_common_fault_v3_FaultDelay* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__filters__common__fault__v3__FaultDelay_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -283,6 +289,7 @@ UPB_INLINE const envoy_extensions_filters_http_fault_v3_FaultAbort* envoy_extens const envoy_extensions_filters_http_fault_v3_FaultAbort* default_val = NULL; const envoy_extensions_filters_http_fault_v3_FaultAbort* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__filters__http__fault__v3__FaultAbort_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -309,6 +316,7 @@ UPB_INLINE void envoy_extensions_filters_http_fault_v3_HTTPFault_clear_headers(e } UPB_INLINE const struct envoy_config_route_v3_HeaderMatcher* const* envoy_extensions_filters_http_fault_v3_HTTPFault_headers(const envoy_extensions_filters_http_fault_v3_HTTPFault* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__HeaderMatcher_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -320,6 +328,7 @@ UPB_INLINE const struct envoy_config_route_v3_HeaderMatcher* const* envoy_extens } UPB_INLINE const upb_Array* _envoy_extensions_filters_http_fault_v3_HTTPFault_headers_upb_array(const envoy_extensions_filters_http_fault_v3_HTTPFault* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__HeaderMatcher_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -328,6 +337,7 @@ UPB_INLINE const upb_Array* _envoy_extensions_filters_http_fault_v3_HTTPFault_he } UPB_INLINE upb_Array* _envoy_extensions_filters_http_fault_v3_HTTPFault_headers_mutable_upb_array(envoy_extensions_filters_http_fault_v3_HTTPFault* msg, size_t* size, upb_Arena* arena) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__HeaderMatcher_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -375,6 +385,7 @@ UPB_INLINE const struct google_protobuf_UInt32Value* envoy_extensions_filters_ht const struct google_protobuf_UInt32Value* default_val = NULL; const struct google_protobuf_UInt32Value* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -391,6 +402,7 @@ UPB_INLINE const struct envoy_extensions_filters_common_fault_v3_FaultRateLimit* const struct envoy_extensions_filters_common_fault_v3_FaultRateLimit* default_val = NULL; const struct envoy_extensions_filters_common_fault_v3_FaultRateLimit* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__filters__common__fault__v3__FaultRateLimit_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -503,6 +515,7 @@ UPB_INLINE const struct google_protobuf_Struct* envoy_extensions_filters_http_fa const struct google_protobuf_Struct* default_val = NULL; const struct google_protobuf_Struct* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Struct_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -514,6 +527,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__filters__common__fault__v3__FaultDelay_msg_init); 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) { @@ -526,6 +540,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__filters__http__fault__v3__FaultAbort_msg_init); 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) { @@ -542,6 +557,7 @@ UPB_INLINE void envoy_extensions_filters_http_fault_v3_HTTPFault_set_upstream_cl } 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__HeaderMatcher_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -558,6 +574,7 @@ UPB_INLINE struct envoy_config_route_v3_HeaderMatcher** envoy_extensions_filters } UPB_INLINE struct envoy_config_route_v3_HeaderMatcher* envoy_extensions_filters_http_fault_v3_HTTPFault_add_headers(envoy_extensions_filters_http_fault_v3_HTTPFault* msg, upb_Arena* arena) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__HeaderMatcher_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -600,6 +617,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); 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) { @@ -612,6 +630,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__filters__common__fault__v3__FaultRateLimit_msg_init); 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) { @@ -656,6 +675,7 @@ UPB_INLINE void envoy_extensions_filters_http_fault_v3_HTTPFault_set_disable_dow } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Struct_msg_init); 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) { diff --git a/src/core/ext/upb-gen/envoy/extensions/filters/http/fault/v3/fault.upb_minitable.c b/src/core/ext/upb-gen/envoy/extensions/filters/http/fault/v3/fault.upb_minitable.c index 8b9cb2b986e..707992af708 100644 --- a/src/core/ext/upb-gen/envoy/extensions/filters/http/fault/v3/fault.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/extensions/filters/http/fault/v3/fault.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/extensions/filters/http/fault/v3/fault.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -20,9 +21,10 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub envoy_extensions_filters_http_fault_v3_FaultAbort_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &envoy__type__v3__FractionalPercent_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__extensions__filters__http__fault__v3__FaultAbort__HeaderAbort_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal envoy_extensions_filters_http_fault_v3_FaultAbort_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &envoy__type__v3__FractionalPercent_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__extensions__filters__http__fault__v3__FaultAbort__HeaderAbort_msg_init_ptr}, }; static const upb_MiniTableField envoy_extensions_filters_http_fault_v3_FaultAbort__fields[4] = { @@ -51,6 +53,7 @@ const upb_MiniTable envoy__extensions__filters__http__fault__v3__FaultAbort_msg_ }) }; +const upb_MiniTable* envoy__extensions__filters__http__fault__v3__FaultAbort_msg_init_ptr = &envoy__extensions__filters__http__fault__v3__FaultAbort_msg_init; const upb_MiniTable envoy__extensions__filters__http__fault__v3__FaultAbort__HeaderAbort_msg_init = { NULL, NULL, @@ -60,13 +63,14 @@ const upb_MiniTable envoy__extensions__filters__http__fault__v3__FaultAbort__Hea #endif }; -static const upb_MiniTableSub envoy_extensions_filters_http_fault_v3_HTTPFault_submsgs[6] = { - {.UPB_PRIVATE(submsg) = &envoy__extensions__filters__common__fault__v3__FaultDelay_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__extensions__filters__http__fault__v3__FaultAbort_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__HeaderMatcher_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__extensions__filters__common__fault__v3__FaultRateLimit_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Struct_msg_init}, +const upb_MiniTable* envoy__extensions__filters__http__fault__v3__FaultAbort__HeaderAbort_msg_init_ptr = &envoy__extensions__filters__http__fault__v3__FaultAbort__HeaderAbort_msg_init; +static const upb_MiniTableSubInternal envoy_extensions_filters_http_fault_v3_HTTPFault_submsgs[6] = { + {.UPB_PRIVATE(submsg) = &envoy__extensions__filters__common__fault__v3__FaultDelay_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__extensions__filters__http__fault__v3__FaultAbort_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__HeaderMatcher_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__extensions__filters__common__fault__v3__FaultRateLimit_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Struct_msg_init_ptr}, }; static const upb_MiniTableField envoy_extensions_filters_http_fault_v3_HTTPFault__fields[16] = { @@ -115,6 +119,7 @@ const upb_MiniTable envoy__extensions__filters__http__fault__v3__HTTPFault_msg_i }) }; +const upb_MiniTable* envoy__extensions__filters__http__fault__v3__HTTPFault_msg_init_ptr = &envoy__extensions__filters__http__fault__v3__HTTPFault_msg_init; static const upb_MiniTable *messages_layout[3] = { &envoy__extensions__filters__http__fault__v3__FaultAbort_msg_init, &envoy__extensions__filters__http__fault__v3__FaultAbort__HeaderAbort_msg_init, diff --git a/src/core/ext/upb-gen/envoy/extensions/filters/http/fault/v3/fault.upb_minitable.h b/src/core/ext/upb-gen/envoy/extensions/filters/http/fault/v3/fault.upb_minitable.h index 02fef1103f7..c027169292f 100644 --- a/src/core/ext/upb-gen/envoy/extensions/filters/http/fault/v3/fault.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/extensions/filters/http/fault/v3/fault.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/extensions/filters/http/fault/v3/fault.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_EXTENSIONS_FILTERS_HTTP_FAULT_V3_FAULT_PROTO_UPB_MINITABLE_H_ #define ENVOY_EXTENSIONS_FILTERS_HTTP_FAULT_V3_FAULT_PROTO_UPB_MINITABLE_H_ @@ -18,8 +19,11 @@ extern "C" { #endif extern const upb_MiniTable envoy__extensions__filters__http__fault__v3__FaultAbort_msg_init; +extern const upb_MiniTable* envoy__extensions__filters__http__fault__v3__FaultAbort_msg_init_ptr; extern const upb_MiniTable envoy__extensions__filters__http__fault__v3__FaultAbort__HeaderAbort_msg_init; +extern const upb_MiniTable* envoy__extensions__filters__http__fault__v3__FaultAbort__HeaderAbort_msg_init_ptr; extern const upb_MiniTable envoy__extensions__filters__http__fault__v3__HTTPFault_msg_init; +extern const upb_MiniTable* envoy__extensions__filters__http__fault__v3__HTTPFault_msg_init_ptr; extern const upb_MiniTableFile envoy_extensions_filters_http_fault_v3_fault_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.upb.h b/src/core/ext/upb-gen/envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.upb.h index d98d03a9c10..5f22ea41ce0 100644 --- a/src/core/ext/upb-gen/envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.upb.h +++ b/src/core/ext/upb-gen/envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.upb.h @@ -3,7 +3,8 @@ * envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #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_ @@ -82,6 +83,7 @@ UPB_INLINE const struct envoy_config_core_v3_HttpUri* envoy_extensions_filters_h 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HttpUri_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -98,6 +100,7 @@ UPB_INLINE const struct envoy_config_core_v3_RetryPolicy* envoy_extensions_filte 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__RetryPolicy_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -114,6 +117,7 @@ UPB_INLINE const envoy_extensions_filters_http_gcp_authn_v3_TokenCacheConfig* en 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__filters__http__gcp_0authn__v3__TokenCacheConfig_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -130,6 +134,7 @@ UPB_INLINE const envoy_extensions_filters_http_gcp_authn_v3_TokenHeader* envoy_e 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__filters__http__gcp_0authn__v3__TokenHeader_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -158,6 +163,7 @@ UPB_INLINE const struct google_protobuf_Duration* envoy_extensions_filters_http_ 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -169,6 +175,7 @@ UPB_INLINE bool envoy_extensions_filters_http_gcp_authn_v3_GcpAuthnFilterConfig_ 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HttpUri_msg_init); 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) { @@ -181,6 +188,7 @@ UPB_INLINE struct envoy_config_core_v3_HttpUri* envoy_extensions_filters_http_gc } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__RetryPolicy_msg_init); 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) { @@ -193,6 +201,7 @@ UPB_INLINE struct envoy_config_core_v3_RetryPolicy* envoy_extensions_filters_htt } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__filters__http__gcp_0authn__v3__TokenCacheConfig_msg_init); 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) { @@ -205,6 +214,7 @@ UPB_INLINE struct envoy_extensions_filters_http_gcp_authn_v3_TokenCacheConfig* e } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__filters__http__gcp_0authn__v3__TokenHeader_msg_init); 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) { @@ -221,6 +231,7 @@ UPB_INLINE void envoy_extensions_filters_http_gcp_authn_v3_GcpAuthnFilterConfig_ } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { @@ -330,6 +341,7 @@ UPB_INLINE const struct google_protobuf_UInt64Value* envoy_extensions_filters_ht 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt64Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -341,6 +353,7 @@ UPB_INLINE bool envoy_extensions_filters_http_gcp_authn_v3_TokenCacheConfig_has_ 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt64Value_msg_init); 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) { diff --git a/src/core/ext/upb-gen/envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.upb_minitable.c b/src/core/ext/upb-gen/envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.upb_minitable.c index c81951d563d..546ac22ac0a 100644 --- a/src/core/ext/upb-gen/envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -19,12 +20,13 @@ // 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}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal envoy_extensions_filters_http_gcp_authn_v3_GcpAuthnFilterConfig_submsgs[5] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HttpUri_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__RetryPolicy_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__extensions__filters__http__gcp_0authn__v3__TokenCacheConfig_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__extensions__filters__http__gcp_0authn__v3__TokenHeader_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, }; static const upb_MiniTableField envoy_extensions_filters_http_gcp_authn_v3_GcpAuthnFilterConfig__fields[6] = { @@ -55,6 +57,7 @@ const upb_MiniTable envoy__extensions__filters__http__gcp_0authn__v3__GcpAuthnFi }) }; +const upb_MiniTable* envoy__extensions__filters__http__gcp_0authn__v3__GcpAuthnFilterConfig_msg_init_ptr = &envoy__extensions__filters__http__gcp_0authn__v3__GcpAuthnFilterConfig_msg_init; 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)}, }; @@ -72,8 +75,9 @@ const upb_MiniTable envoy__extensions__filters__http__gcp_0authn__v3__Audience_m }) }; -static const upb_MiniTableSub envoy_extensions_filters_http_gcp_authn_v3_TokenCacheConfig_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__UInt64Value_msg_init}, +const upb_MiniTable* envoy__extensions__filters__http__gcp_0authn__v3__Audience_msg_init_ptr = &envoy__extensions__filters__http__gcp_0authn__v3__Audience_msg_init; +static const upb_MiniTableSubInternal envoy_extensions_filters_http_gcp_authn_v3_TokenCacheConfig_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt64Value_msg_init_ptr}, }; static const upb_MiniTableField envoy_extensions_filters_http_gcp_authn_v3_TokenCacheConfig__fields[1] = { @@ -89,6 +93,7 @@ const upb_MiniTable envoy__extensions__filters__http__gcp_0authn__v3__TokenCache #endif }; +const upb_MiniTable* envoy__extensions__filters__http__gcp_0authn__v3__TokenCacheConfig_msg_init_ptr = &envoy__extensions__filters__http__gcp_0authn__v3__TokenCacheConfig_msg_init; 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)}, @@ -109,6 +114,7 @@ const upb_MiniTable envoy__extensions__filters__http__gcp_0authn__v3__TokenHeade }) }; +const upb_MiniTable* envoy__extensions__filters__http__gcp_0authn__v3__TokenHeader_msg_init_ptr = &envoy__extensions__filters__http__gcp_0authn__v3__TokenHeader_msg_init; 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, diff --git a/src/core/ext/upb-gen/envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.upb_minitable.h b/src/core/ext/upb-gen/envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.upb_minitable.h index ae92576dbb4..e0837c746fe 100644 --- a/src/core/ext/upb-gen/envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #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_ @@ -18,9 +19,13 @@ 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__GcpAuthnFilterConfig_msg_init_ptr; 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__Audience_msg_init_ptr; 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__TokenCacheConfig_msg_init_ptr; extern const upb_MiniTable envoy__extensions__filters__http__gcp_0authn__v3__TokenHeader_msg_init; +extern const upb_MiniTable* envoy__extensions__filters__http__gcp_0authn__v3__TokenHeader_msg_init_ptr; extern const upb_MiniTableFile envoy_extensions_filters_http_gcp_authn_v3_gcp_authn_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/extensions/filters/http/rbac/v3/rbac.upb.h b/src/core/ext/upb-gen/envoy/extensions/filters/http/rbac/v3/rbac.upb.h index 3f09a915524..fc3bfd9f9f5 100644 --- a/src/core/ext/upb-gen/envoy/extensions/filters/http/rbac/v3/rbac.upb.h +++ b/src/core/ext/upb-gen/envoy/extensions/filters/http/rbac/v3/rbac.upb.h @@ -3,7 +3,8 @@ * envoy/extensions/filters/http/rbac/v3/rbac.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_EXTENSIONS_FILTERS_HTTP_RBAC_V3_RBAC_PROTO_UPB_H_ #define ENVOY_EXTENSIONS_FILTERS_HTTP_RBAC_V3_RBAC_PROTO_UPB_H_ @@ -77,6 +78,7 @@ UPB_INLINE const struct envoy_config_rbac_v3_RBAC* envoy_extensions_filters_http const struct envoy_config_rbac_v3_RBAC* default_val = NULL; const struct envoy_config_rbac_v3_RBAC* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__rbac__v3__RBAC_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -93,6 +95,7 @@ UPB_INLINE const struct envoy_config_rbac_v3_RBAC* envoy_extensions_filters_http const struct envoy_config_rbac_v3_RBAC* default_val = NULL; const struct envoy_config_rbac_v3_RBAC* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__rbac__v3__RBAC_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -121,6 +124,7 @@ UPB_INLINE const struct xds_type_matcher_v3_Matcher* envoy_extensions_filters_ht const struct xds_type_matcher_v3_Matcher* default_val = NULL; const struct xds_type_matcher_v3_Matcher* 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_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__matcher__v3__Matcher_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -137,6 +141,7 @@ UPB_INLINE const struct xds_type_matcher_v3_Matcher* envoy_extensions_filters_ht const struct xds_type_matcher_v3_Matcher* default_val = NULL; const struct xds_type_matcher_v3_Matcher* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__matcher__v3__Matcher_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -172,6 +177,7 @@ UPB_INLINE bool envoy_extensions_filters_http_rbac_v3_RBAC_track_per_rule_stats( 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__rbac__v3__RBAC_msg_init); 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) { @@ -184,6 +190,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__rbac__v3__RBAC_msg_init); 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) { @@ -200,6 +207,7 @@ UPB_INLINE void envoy_extensions_filters_http_rbac_v3_RBAC_set_shadow_rules_stat } 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_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__matcher__v3__Matcher_msg_init); 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) { @@ -212,6 +220,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_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__matcher__v3__Matcher_msg_init); 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) { @@ -275,6 +284,7 @@ UPB_INLINE const envoy_extensions_filters_http_rbac_v3_RBAC* envoy_extensions_fi const envoy_extensions_filters_http_rbac_v3_RBAC* default_val = NULL; const envoy_extensions_filters_http_rbac_v3_RBAC* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__filters__http__rbac__v3__RBAC_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -286,6 +296,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__filters__http__rbac__v3__RBAC_msg_init); 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) { diff --git a/src/core/ext/upb-gen/envoy/extensions/filters/http/rbac/v3/rbac.upb_minitable.c b/src/core/ext/upb-gen/envoy/extensions/filters/http/rbac/v3/rbac.upb_minitable.c index 279415bcf15..b01ac992b48 100644 --- a/src/core/ext/upb-gen/envoy/extensions/filters/http/rbac/v3/rbac.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/extensions/filters/http/rbac/v3/rbac.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/extensions/filters/http/rbac/v3/rbac.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -18,11 +19,12 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub envoy_extensions_filters_http_rbac_v3_RBAC_submsgs[4] = { - {.UPB_PRIVATE(submsg) = &envoy__config__rbac__v3__RBAC_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__rbac__v3__RBAC_msg_init}, - {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher_msg_init}, - {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal envoy_extensions_filters_http_rbac_v3_RBAC_submsgs[4] = { + {.UPB_PRIVATE(submsg) = &envoy__config__rbac__v3__RBAC_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__rbac__v3__RBAC_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher_msg_init_ptr}, }; static const upb_MiniTableField envoy_extensions_filters_http_rbac_v3_RBAC__fields[7] = { @@ -54,8 +56,9 @@ const upb_MiniTable envoy__extensions__filters__http__rbac__v3__RBAC_msg_init = }) }; -static const upb_MiniTableSub envoy_extensions_filters_http_rbac_v3_RBACPerRoute_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__extensions__filters__http__rbac__v3__RBAC_msg_init}, +const upb_MiniTable* envoy__extensions__filters__http__rbac__v3__RBAC_msg_init_ptr = &envoy__extensions__filters__http__rbac__v3__RBAC_msg_init; +static const upb_MiniTableSubInternal envoy_extensions_filters_http_rbac_v3_RBACPerRoute_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__extensions__filters__http__rbac__v3__RBAC_msg_init_ptr}, }; static const upb_MiniTableField envoy_extensions_filters_http_rbac_v3_RBACPerRoute__fields[1] = { @@ -71,6 +74,7 @@ const upb_MiniTable envoy__extensions__filters__http__rbac__v3__RBACPerRoute_msg #endif }; +const upb_MiniTable* envoy__extensions__filters__http__rbac__v3__RBACPerRoute_msg_init_ptr = &envoy__extensions__filters__http__rbac__v3__RBACPerRoute_msg_init; static const upb_MiniTable *messages_layout[2] = { &envoy__extensions__filters__http__rbac__v3__RBAC_msg_init, &envoy__extensions__filters__http__rbac__v3__RBACPerRoute_msg_init, diff --git a/src/core/ext/upb-gen/envoy/extensions/filters/http/rbac/v3/rbac.upb_minitable.h b/src/core/ext/upb-gen/envoy/extensions/filters/http/rbac/v3/rbac.upb_minitable.h index 3a6671638c3..242b192bd9f 100644 --- a/src/core/ext/upb-gen/envoy/extensions/filters/http/rbac/v3/rbac.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/extensions/filters/http/rbac/v3/rbac.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/extensions/filters/http/rbac/v3/rbac.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_EXTENSIONS_FILTERS_HTTP_RBAC_V3_RBAC_PROTO_UPB_MINITABLE_H_ #define ENVOY_EXTENSIONS_FILTERS_HTTP_RBAC_V3_RBAC_PROTO_UPB_MINITABLE_H_ @@ -18,7 +19,9 @@ extern "C" { #endif extern const upb_MiniTable envoy__extensions__filters__http__rbac__v3__RBAC_msg_init; +extern const upb_MiniTable* envoy__extensions__filters__http__rbac__v3__RBAC_msg_init_ptr; extern const upb_MiniTable envoy__extensions__filters__http__rbac__v3__RBACPerRoute_msg_init; +extern const upb_MiniTable* envoy__extensions__filters__http__rbac__v3__RBACPerRoute_msg_init_ptr; extern const upb_MiniTableFile envoy_extensions_filters_http_rbac_v3_rbac_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/extensions/filters/http/router/v3/router.upb.h b/src/core/ext/upb-gen/envoy/extensions/filters/http/router/v3/router.upb.h index f5035e0e392..de9b482468e 100644 --- a/src/core/ext/upb-gen/envoy/extensions/filters/http/router/v3/router.upb.h +++ b/src/core/ext/upb-gen/envoy/extensions/filters/http/router/v3/router.upb.h @@ -3,7 +3,8 @@ * envoy/extensions/filters/http/router/v3/router.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_EXTENSIONS_FILTERS_HTTP_ROUTER_V3_ROUTER_PROTO_UPB_H_ #define ENVOY_EXTENSIONS_FILTERS_HTTP_ROUTER_V3_ROUTER_PROTO_UPB_H_ @@ -81,6 +82,7 @@ UPB_INLINE const struct google_protobuf_BoolValue* envoy_extensions_filters_http const struct google_protobuf_BoolValue* default_val = NULL; const struct google_protobuf_BoolValue* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -107,6 +109,7 @@ UPB_INLINE void envoy_extensions_filters_http_router_v3_Router_clear_upstream_lo } UPB_INLINE const struct envoy_config_accesslog_v3_AccessLog* const* envoy_extensions_filters_http_router_v3_Router_upstream_log(const envoy_extensions_filters_http_router_v3_Router* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__accesslog__v3__AccessLog_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -118,6 +121,7 @@ UPB_INLINE const struct envoy_config_accesslog_v3_AccessLog* const* envoy_extens } UPB_INLINE const upb_Array* _envoy_extensions_filters_http_router_v3_Router_upstream_log_upb_array(const envoy_extensions_filters_http_router_v3_Router* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__accesslog__v3__AccessLog_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -126,6 +130,7 @@ UPB_INLINE const upb_Array* _envoy_extensions_filters_http_router_v3_Router_upst } UPB_INLINE upb_Array* _envoy_extensions_filters_http_router_v3_Router_upstream_log_mutable_upb_array(envoy_extensions_filters_http_router_v3_Router* msg, size_t* size, upb_Arena* arena) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__accesslog__v3__AccessLog_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -207,6 +212,7 @@ UPB_INLINE void envoy_extensions_filters_http_router_v3_Router_clear_upstream_ht } UPB_INLINE const struct envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter* const* envoy_extensions_filters_http_router_v3_Router_upstream_http_filters(const envoy_extensions_filters_http_router_v3_Router* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__filters__network__http_0connection_0manager__v3__HttpFilter_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -218,6 +224,7 @@ UPB_INLINE const struct envoy_extensions_filters_network_http_connection_manager } UPB_INLINE const upb_Array* _envoy_extensions_filters_http_router_v3_Router_upstream_http_filters_upb_array(const envoy_extensions_filters_http_router_v3_Router* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__filters__network__http_0connection_0manager__v3__HttpFilter_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -226,6 +233,7 @@ UPB_INLINE const upb_Array* _envoy_extensions_filters_http_router_v3_Router_upst } UPB_INLINE upb_Array* _envoy_extensions_filters_http_router_v3_Router_upstream_http_filters_mutable_upb_array(envoy_extensions_filters_http_router_v3_Router* msg, size_t* size, upb_Arena* arena) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__filters__network__http_0connection_0manager__v3__HttpFilter_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -241,6 +249,7 @@ UPB_INLINE const envoy_extensions_filters_http_router_v3_Router_UpstreamAccessLo const envoy_extensions_filters_http_router_v3_Router_UpstreamAccessLogOptions* default_val = NULL; const envoy_extensions_filters_http_router_v3_Router_UpstreamAccessLogOptions* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__filters__http__router__v3__Router__UpstreamAccessLogOptions_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -252,6 +261,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); 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) { @@ -268,6 +278,7 @@ UPB_INLINE void envoy_extensions_filters_http_router_v3_Router_set_start_child_s } 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__accesslog__v3__AccessLog_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -284,6 +295,7 @@ UPB_INLINE struct envoy_config_accesslog_v3_AccessLog** envoy_extensions_filters } UPB_INLINE struct envoy_config_accesslog_v3_AccessLog* envoy_extensions_filters_http_router_v3_Router_add_upstream_log(envoy_extensions_filters_http_router_v3_Router* msg, upb_Arena* arena) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__accesslog__v3__AccessLog_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -338,6 +350,7 @@ UPB_INLINE void envoy_extensions_filters_http_router_v3_Router_set_suppress_grpc } 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__filters__network__http_0connection_0manager__v3__HttpFilter_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -354,6 +367,7 @@ UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_Ht } UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter* envoy_extensions_filters_http_router_v3_Router_add_upstream_http_filters(envoy_extensions_filters_http_router_v3_Router* msg, upb_Arena* arena) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__filters__network__http_0connection_0manager__v3__HttpFilter_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -368,6 +382,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__filters__http__router__v3__Router__UpstreamAccessLogOptions_msg_init); 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) { @@ -435,6 +450,7 @@ UPB_INLINE const struct google_protobuf_Duration* envoy_extensions_filters_http_ const struct google_protobuf_Duration* default_val = NULL; const struct google_protobuf_Duration* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -450,6 +466,7 @@ UPB_INLINE void envoy_extensions_filters_http_router_v3_Router_UpstreamAccessLog } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { diff --git a/src/core/ext/upb-gen/envoy/extensions/filters/http/router/v3/router.upb_minitable.c b/src/core/ext/upb-gen/envoy/extensions/filters/http/router/v3/router.upb_minitable.c index d778168144b..c0351cb47f7 100644 --- a/src/core/ext/upb-gen/envoy/extensions/filters/http/router/v3/router.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/extensions/filters/http/router/v3/router.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/extensions/filters/http/router/v3/router.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -20,11 +21,12 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub envoy_extensions_filters_http_router_v3_Router_submsgs[4] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__accesslog__v3__AccessLog_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpFilter_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__extensions__filters__http__router__v3__Router__UpstreamAccessLogOptions_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal envoy_extensions_filters_http_router_v3_Router_submsgs[4] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__accesslog__v3__AccessLog_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpFilter_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__extensions__filters__http__router__v3__Router__UpstreamAccessLogOptions_msg_init_ptr}, }; static const upb_MiniTableField envoy_extensions_filters_http_router_v3_Router__fields[9] = { @@ -66,8 +68,9 @@ const upb_MiniTable envoy__extensions__filters__http__router__v3__Router_msg_ini }) }; -static const upb_MiniTableSub envoy_extensions_filters_http_router_v3_Router_UpstreamAccessLogOptions_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, +const upb_MiniTable* envoy__extensions__filters__http__router__v3__Router_msg_init_ptr = &envoy__extensions__filters__http__router__v3__Router_msg_init; +static const upb_MiniTableSubInternal envoy_extensions_filters_http_router_v3_Router_UpstreamAccessLogOptions_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, }; static const upb_MiniTableField envoy_extensions_filters_http_router_v3_Router_UpstreamAccessLogOptions__fields[2] = { @@ -88,6 +91,7 @@ const upb_MiniTable envoy__extensions__filters__http__router__v3__Router__Upstre }) }; +const upb_MiniTable* envoy__extensions__filters__http__router__v3__Router__UpstreamAccessLogOptions_msg_init_ptr = &envoy__extensions__filters__http__router__v3__Router__UpstreamAccessLogOptions_msg_init; static const upb_MiniTable *messages_layout[2] = { &envoy__extensions__filters__http__router__v3__Router_msg_init, &envoy__extensions__filters__http__router__v3__Router__UpstreamAccessLogOptions_msg_init, diff --git a/src/core/ext/upb-gen/envoy/extensions/filters/http/router/v3/router.upb_minitable.h b/src/core/ext/upb-gen/envoy/extensions/filters/http/router/v3/router.upb_minitable.h index d58fb3cac39..a2a86c4685f 100644 --- a/src/core/ext/upb-gen/envoy/extensions/filters/http/router/v3/router.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/extensions/filters/http/router/v3/router.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/extensions/filters/http/router/v3/router.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_EXTENSIONS_FILTERS_HTTP_ROUTER_V3_ROUTER_PROTO_UPB_MINITABLE_H_ #define ENVOY_EXTENSIONS_FILTERS_HTTP_ROUTER_V3_ROUTER_PROTO_UPB_MINITABLE_H_ @@ -18,7 +19,9 @@ extern "C" { #endif extern const upb_MiniTable envoy__extensions__filters__http__router__v3__Router_msg_init; +extern const upb_MiniTable* envoy__extensions__filters__http__router__v3__Router_msg_init_ptr; extern const upb_MiniTable envoy__extensions__filters__http__router__v3__Router__UpstreamAccessLogOptions_msg_init; +extern const upb_MiniTable* envoy__extensions__filters__http__router__v3__Router__UpstreamAccessLogOptions_msg_init_ptr; extern const upb_MiniTableFile envoy_extensions_filters_http_router_v3_router_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb.h b/src/core/ext/upb-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb.h index 09b9e6aedb6..e8e9dd19168 100644 --- a/src/core/ext/upb-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb.h +++ b/src/core/ext/upb-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb.h @@ -3,7 +3,8 @@ * envoy/extensions/filters/http/stateful_session/v3/stateful_session.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_EXTENSIONS_FILTERS_HTTP_STATEFUL_SESSION_V3_STATEFUL_SESSION_PROTO_UPB_H_ #define ENVOY_EXTENSIONS_FILTERS_HTTP_STATEFUL_SESSION_V3_STATEFUL_SESSION_PROTO_UPB_H_ @@ -73,6 +74,7 @@ UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* envoy_extensi const struct envoy_config_core_v3_TypedExtensionConfig* default_val = NULL; const struct envoy_config_core_v3_TypedExtensionConfig* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -96,6 +98,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); 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) { @@ -181,6 +184,7 @@ UPB_INLINE const envoy_extensions_filters_http_stateful_session_v3_StatefulSessi const envoy_extensions_filters_http_stateful_session_v3_StatefulSession* default_val = NULL; const envoy_extensions_filters_http_stateful_session_v3_StatefulSession* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__filters__http__stateful_0session__v3__StatefulSession_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -196,6 +200,7 @@ UPB_INLINE void envoy_extensions_filters_http_stateful_session_v3_StatefulSessio } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__filters__http__stateful_0session__v3__StatefulSession_msg_init); 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) { diff --git a/src/core/ext/upb-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb_minitable.c b/src/core/ext/upb-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb_minitable.c index 2f462758e0a..5f080e14a9f 100644 --- a/src/core/ext/upb-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/extensions/filters/http/stateful_session/v3/stateful_session.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -15,8 +16,9 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub envoy_extensions_filters_http_stateful_session_v3_StatefulSession_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal envoy_extensions_filters_http_stateful_session_v3_StatefulSession_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init_ptr}, }; static const upb_MiniTableField envoy_extensions_filters_http_stateful_session_v3_StatefulSession__fields[2] = { @@ -39,8 +41,9 @@ const upb_MiniTable envoy__extensions__filters__http__stateful_0session__v3__Sta }) }; -static const upb_MiniTableSub envoy_extensions_filters_http_stateful_session_v3_StatefulSessionPerRoute_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__extensions__filters__http__stateful_0session__v3__StatefulSession_msg_init}, +const upb_MiniTable* envoy__extensions__filters__http__stateful_0session__v3__StatefulSession_msg_init_ptr = &envoy__extensions__filters__http__stateful_0session__v3__StatefulSession_msg_init; +static const upb_MiniTableSubInternal envoy_extensions_filters_http_stateful_session_v3_StatefulSessionPerRoute_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__extensions__filters__http__stateful_0session__v3__StatefulSession_msg_init_ptr}, }; static const upb_MiniTableField envoy_extensions_filters_http_stateful_session_v3_StatefulSessionPerRoute__fields[2] = { @@ -63,6 +66,7 @@ const upb_MiniTable envoy__extensions__filters__http__stateful_0session__v3__Sta }) }; +const upb_MiniTable* envoy__extensions__filters__http__stateful_0session__v3__StatefulSessionPerRoute_msg_init_ptr = &envoy__extensions__filters__http__stateful_0session__v3__StatefulSessionPerRoute_msg_init; static const upb_MiniTable *messages_layout[2] = { &envoy__extensions__filters__http__stateful_0session__v3__StatefulSession_msg_init, &envoy__extensions__filters__http__stateful_0session__v3__StatefulSessionPerRoute_msg_init, diff --git a/src/core/ext/upb-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb_minitable.h b/src/core/ext/upb-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb_minitable.h index 7e79af26bc1..93e101e8fb4 100644 --- a/src/core/ext/upb-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/extensions/filters/http/stateful_session/v3/stateful_session.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_EXTENSIONS_FILTERS_HTTP_STATEFUL_SESSION_V3_STATEFUL_SESSION_PROTO_UPB_MINITABLE_H_ #define ENVOY_EXTENSIONS_FILTERS_HTTP_STATEFUL_SESSION_V3_STATEFUL_SESSION_PROTO_UPB_MINITABLE_H_ @@ -18,7 +19,9 @@ extern "C" { #endif extern const upb_MiniTable envoy__extensions__filters__http__stateful_0session__v3__StatefulSession_msg_init; +extern const upb_MiniTable* envoy__extensions__filters__http__stateful_0session__v3__StatefulSession_msg_init_ptr; extern const upb_MiniTable envoy__extensions__filters__http__stateful_0session__v3__StatefulSessionPerRoute_msg_init; +extern const upb_MiniTable* envoy__extensions__filters__http__stateful_0session__v3__StatefulSessionPerRoute_msg_init_ptr; extern const upb_MiniTableFile envoy_extensions_filters_http_stateful_session_v3_stateful_session_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.h b/src/core/ext/upb-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.h index 7ed0360530e..bd62a0fdebc 100644 --- a/src/core/ext/upb-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.h +++ b/src/core/ext/upb-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.h @@ -3,7 +3,8 @@ * envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_EXTENSIONS_FILTERS_NETWORK_HTTP_CONNECTION_MANAGER_V3_HTTP_CONNECTION_MANAGER_PROTO_UPB_H_ #define ENVOY_EXTENSIONS_FILTERS_NETWORK_HTTP_CONNECTION_MANAGER_V3_HTTP_CONNECTION_MANAGER_PROTO_UPB_H_ @@ -212,6 +213,7 @@ UPB_INLINE const envoy_extensions_filters_network_http_connection_manager_v3_Rds 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(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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__filters__network__http_0connection_0manager__v3__Rds_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -228,6 +230,7 @@ UPB_INLINE const struct envoy_config_route_v3_RouteConfiguration* envoy_extensio 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(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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RouteConfiguration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -242,6 +245,7 @@ UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_Http } UPB_INLINE const envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter* const* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_http_filters(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, size_t* size) { const upb_MiniTableField field = {5, UPB_SIZE(16, 80), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__filters__network__http_0connection_0manager__v3__HttpFilter_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -253,6 +257,7 @@ UPB_INLINE const envoy_extensions_filters_network_http_connection_manager_v3_Htt } UPB_INLINE const upb_Array* _envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_http_filters_upb_array(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, size_t* size) { const upb_MiniTableField field = {5, UPB_SIZE(16, 80), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__filters__network__http_0connection_0manager__v3__HttpFilter_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -261,6 +266,7 @@ UPB_INLINE const upb_Array* _envoy_extensions_filters_network_http_connection_ma } UPB_INLINE upb_Array* _envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_http_filters_mutable_upb_array(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {5, UPB_SIZE(16, 80), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__filters__network__http_0connection_0manager__v3__HttpFilter_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -276,6 +282,7 @@ UPB_INLINE const struct google_protobuf_BoolValue* envoy_extensions_filters_netw const struct google_protobuf_BoolValue* default_val = NULL; const struct google_protobuf_BoolValue* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -292,6 +299,7 @@ UPB_INLINE const envoy_extensions_filters_network_http_connection_manager_v3_Htt const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing* default_val = NULL; const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__Tracing_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -308,6 +316,7 @@ UPB_INLINE const struct envoy_config_core_v3_Http1ProtocolOptions* envoy_extensi const struct envoy_config_core_v3_Http1ProtocolOptions* default_val = NULL; const struct envoy_config_core_v3_Http1ProtocolOptions* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Http1ProtocolOptions_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -324,6 +333,7 @@ UPB_INLINE const struct envoy_config_core_v3_Http2ProtocolOptions* envoy_extensi const struct envoy_config_core_v3_Http2ProtocolOptions* default_val = NULL; const struct envoy_config_core_v3_Http2ProtocolOptions* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Http2ProtocolOptions_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -352,6 +362,7 @@ UPB_INLINE const struct google_protobuf_Duration* envoy_extensions_filters_netwo const struct google_protobuf_Duration* default_val = NULL; const struct google_protobuf_Duration* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -366,6 +377,7 @@ UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_Http } UPB_INLINE const struct envoy_config_accesslog_v3_AccessLog* const* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_access_log(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, size_t* size) { const upb_MiniTableField field = {13, UPB_SIZE(40, 144), 0, 8, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__accesslog__v3__AccessLog_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -377,6 +389,7 @@ UPB_INLINE const struct envoy_config_accesslog_v3_AccessLog* const* envoy_extens } UPB_INLINE const upb_Array* _envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_access_log_upb_array(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, size_t* size) { const upb_MiniTableField field = {13, UPB_SIZE(40, 144), 0, 8, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__accesslog__v3__AccessLog_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -385,6 +398,7 @@ UPB_INLINE const upb_Array* _envoy_extensions_filters_network_http_connection_ma } UPB_INLINE upb_Array* _envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_access_log_mutable_upb_array(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {13, UPB_SIZE(40, 144), 0, 8, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__accesslog__v3__AccessLog_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -400,6 +414,7 @@ UPB_INLINE const struct google_protobuf_BoolValue* envoy_extensions_filters_netw const struct google_protobuf_BoolValue* default_val = NULL; const struct google_protobuf_BoolValue* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -416,6 +431,7 @@ UPB_INLINE const struct google_protobuf_BoolValue* envoy_extensions_filters_netw const struct google_protobuf_BoolValue* default_val = NULL; const struct google_protobuf_BoolValue* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -444,6 +460,7 @@ UPB_INLINE const envoy_extensions_filters_network_http_connection_manager_v3_Htt const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails* default_val = NULL; const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__SetCurrentClientCertDetails_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -518,6 +535,7 @@ UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_Http } UPB_INLINE const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig* const* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_upgrade_configs(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__UpgradeConfig_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -529,6 +547,7 @@ UPB_INLINE const envoy_extensions_filters_network_http_connection_manager_v3_Htt } UPB_INLINE const upb_Array* _envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_upgrade_configs_upb_array(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__UpgradeConfig_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -537,6 +556,7 @@ UPB_INLINE const upb_Array* _envoy_extensions_filters_network_http_connection_ma } UPB_INLINE upb_Array* _envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_upgrade_configs_mutable_upb_array(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, size_t* size, upb_Arena* arena) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__UpgradeConfig_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -552,6 +572,7 @@ UPB_INLINE const struct google_protobuf_Duration* envoy_extensions_filters_netwo const struct google_protobuf_Duration* default_val = NULL; const struct google_protobuf_Duration* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -568,6 +589,7 @@ UPB_INLINE const envoy_extensions_filters_network_http_connection_manager_v3_Htt const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_InternalAddressConfig* default_val = NULL; const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_InternalAddressConfig* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__InternalAddressConfig_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -584,6 +606,7 @@ UPB_INLINE const struct google_protobuf_Duration* envoy_extensions_filters_netwo const struct google_protobuf_Duration* default_val = NULL; const struct google_protobuf_Duration* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -600,6 +623,7 @@ UPB_INLINE const struct google_protobuf_Duration* envoy_extensions_filters_netwo const struct google_protobuf_Duration* default_val = NULL; const struct google_protobuf_Duration* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -616,6 +640,7 @@ UPB_INLINE const struct google_protobuf_UInt32Value* envoy_extensions_filters_ne const struct google_protobuf_UInt32Value* default_val = NULL; const struct google_protobuf_UInt32Value* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -632,6 +657,7 @@ UPB_INLINE const struct google_protobuf_BoolValue* envoy_extensions_filters_netw const struct google_protobuf_BoolValue* default_val = NULL; const struct google_protobuf_BoolValue* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -648,6 +674,7 @@ UPB_INLINE const envoy_extensions_filters_network_http_connection_manager_v3_Sco 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(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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -700,6 +727,7 @@ UPB_INLINE const struct envoy_config_core_v3_HttpProtocolOptions* envoy_extensio const struct envoy_config_core_v3_HttpProtocolOptions* default_val = NULL; const struct envoy_config_core_v3_HttpProtocolOptions* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HttpProtocolOptions_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -716,6 +744,7 @@ UPB_INLINE const envoy_extensions_filters_network_http_connection_manager_v3_Req const envoy_extensions_filters_network_http_connection_manager_v3_RequestIDExtension* default_val = NULL; const envoy_extensions_filters_network_http_connection_manager_v3_RequestIDExtension* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__filters__network__http_0connection_0manager__v3__RequestIDExtension_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -744,6 +773,7 @@ UPB_INLINE const envoy_extensions_filters_network_http_connection_manager_v3_Loc const envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig* default_val = NULL; const envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__filters__network__http_0connection_0manager__v3__LocalReplyConfig_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -772,6 +802,7 @@ UPB_INLINE const struct google_protobuf_BoolValue* envoy_extensions_filters_netw const struct google_protobuf_BoolValue* default_val = NULL; const struct google_protobuf_BoolValue* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -788,6 +819,7 @@ UPB_INLINE const struct google_protobuf_Duration* envoy_extensions_filters_netwo const struct google_protobuf_Duration* default_val = NULL; const struct google_protobuf_Duration* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -820,6 +852,7 @@ UPB_INLINE const envoy_extensions_filters_network_http_connection_manager_v3_Htt const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions* default_val = NULL; const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__PathNormalizationOptions_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -836,6 +869,7 @@ UPB_INLINE const struct envoy_config_core_v3_Http3ProtocolOptions* envoy_extensi const struct envoy_config_core_v3_Http3ProtocolOptions* default_val = NULL; const struct envoy_config_core_v3_Http3ProtocolOptions* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Http3ProtocolOptions_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -862,6 +896,7 @@ UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_Http } UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* const* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_original_ip_detection_extensions(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -873,6 +908,7 @@ UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* const* envoy_ } UPB_INLINE const upb_Array* _envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_original_ip_detection_extensions_upb_array(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -881,6 +917,7 @@ UPB_INLINE const upb_Array* _envoy_extensions_filters_network_http_connection_ma } UPB_INLINE upb_Array* _envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_original_ip_detection_extensions_mutable_upb_array(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, size_t* size, upb_Arena* arena) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -908,6 +945,7 @@ UPB_INLINE const struct envoy_config_core_v3_SchemeHeaderTransformation* envoy_e const struct envoy_config_core_v3_SchemeHeaderTransformation* default_val = NULL; const struct envoy_config_core_v3_SchemeHeaderTransformation* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__SchemeHeaderTransformation_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -924,6 +962,7 @@ UPB_INLINE const envoy_extensions_filters_network_http_connection_manager_v3_Htt const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_ProxyStatusConfig* default_val = NULL; const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_ProxyStatusConfig* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__ProxyStatusConfig_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -940,6 +979,7 @@ UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* envoy_extensi const struct envoy_config_core_v3_TypedExtensionConfig* default_val = NULL; const struct envoy_config_core_v3_TypedExtensionConfig* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -966,6 +1006,7 @@ UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_Http } UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* const* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_early_header_mutation_extensions(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -977,6 +1018,7 @@ UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* const* envoy_ } UPB_INLINE const upb_Array* _envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_early_header_mutation_extensions_upb_array(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -985,6 +1027,7 @@ UPB_INLINE const upb_Array* _envoy_extensions_filters_network_http_connection_ma } UPB_INLINE upb_Array* _envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_early_header_mutation_extensions_mutable_upb_array(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, size_t* size, upb_Arena* arena) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -1000,6 +1043,7 @@ UPB_INLINE const struct google_protobuf_BoolValue* envoy_extensions_filters_netw const struct google_protobuf_BoolValue* default_val = NULL; const struct google_protobuf_BoolValue* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1016,6 +1060,7 @@ UPB_INLINE const struct google_protobuf_Duration* envoy_extensions_filters_netwo const struct google_protobuf_Duration* default_val = NULL; const struct google_protobuf_Duration* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1044,6 +1089,7 @@ UPB_INLINE const envoy_extensions_filters_network_http_connection_manager_v3_Htt const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_HcmAccessLogOptions* default_val = NULL; const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_HcmAccessLogOptions* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__HcmAccessLogOptions_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1075,6 +1121,7 @@ UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_Http } 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(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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__filters__network__http_0connection_0manager__v3__Rds_msg_init); 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) { @@ -1087,6 +1134,7 @@ UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_Rd } 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(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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__RouteConfiguration_msg_init); 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) { @@ -1099,6 +1147,7 @@ UPB_INLINE struct envoy_config_route_v3_RouteConfiguration* envoy_extensions_fil } UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter** envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_mutable_http_filters(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, size_t* size) { upb_MiniTableField field = {5, UPB_SIZE(16, 80), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__filters__network__http_0connection_0manager__v3__HttpFilter_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1115,6 +1164,7 @@ UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_HttpFilte } UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_add_http_filters(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, upb_Arena* arena) { upb_MiniTableField field = {5, UPB_SIZE(16, 80), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__filters__network__http_0connection_0manager__v3__HttpFilter_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -1129,6 +1179,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); 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) { @@ -1141,6 +1192,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__Tracing_msg_init); 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) { @@ -1153,6 +1205,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Http1ProtocolOptions_msg_init); 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) { @@ -1165,6 +1218,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Http2ProtocolOptions_msg_init); 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) { @@ -1181,6 +1235,7 @@ UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_Http } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { @@ -1193,6 +1248,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_extensions_filters_network_htt } UPB_INLINE struct envoy_config_accesslog_v3_AccessLog** envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_mutable_access_log(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, size_t* size) { upb_MiniTableField field = {13, UPB_SIZE(40, 144), 0, 8, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__accesslog__v3__AccessLog_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1209,6 +1265,7 @@ UPB_INLINE struct envoy_config_accesslog_v3_AccessLog** envoy_extensions_filters } UPB_INLINE struct envoy_config_accesslog_v3_AccessLog* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_add_access_log(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, upb_Arena* arena) { upb_MiniTableField field = {13, UPB_SIZE(40, 144), 0, 8, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__accesslog__v3__AccessLog_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -1223,6 +1280,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); 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) { @@ -1235,6 +1293,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); 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) { @@ -1251,6 +1310,7 @@ UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_Http } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__SetCurrentClientCertDetails_msg_init); 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) { @@ -1283,6 +1343,7 @@ UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_Http } 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__UpgradeConfig_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1299,6 +1360,7 @@ UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_HttpConne } UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_add_upgrade_configs(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, upb_Arena* arena) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__UpgradeConfig_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -1313,6 +1375,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { @@ -1325,6 +1388,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__InternalAddressConfig_msg_init); 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) { @@ -1337,6 +1401,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { @@ -1349,6 +1414,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { @@ -1361,6 +1427,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); 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) { @@ -1373,6 +1440,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); 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) { @@ -1385,6 +1453,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_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(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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes_msg_init); 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) { @@ -1409,6 +1478,7 @@ UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_Http } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HttpProtocolOptions_msg_init); 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) { @@ -1421,6 +1491,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__filters__network__http_0connection_0manager__v3__RequestIDExtension_msg_init); 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) { @@ -1437,6 +1508,7 @@ UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_Http } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__filters__network__http_0connection_0manager__v3__LocalReplyConfig_msg_init); 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) { @@ -1453,6 +1525,7 @@ UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_Http } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); 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) { @@ -1465,6 +1538,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { @@ -1481,6 +1555,7 @@ UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_Http } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__PathNormalizationOptions_msg_init); 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) { @@ -1493,6 +1568,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Http3ProtocolOptions_msg_init); 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) { @@ -1509,6 +1585,7 @@ UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_Http } 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1525,6 +1602,7 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig** envoy_extensions_f } UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_add_original_ip_detection_extensions(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, upb_Arena* arena) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -1543,6 +1621,7 @@ UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_Http } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__SchemeHeaderTransformation_msg_init); 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) { @@ -1555,6 +1634,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__ProxyStatusConfig_msg_init); 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) { @@ -1567,6 +1647,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); 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) { @@ -1583,6 +1664,7 @@ UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_Http } 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1599,6 +1681,7 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig** envoy_extensions_f } UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_add_early_header_mutation_extensions(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, upb_Arena* arena) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -1613,6 +1696,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); 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) { @@ -1625,6 +1709,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { @@ -1641,6 +1726,7 @@ UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_Http } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__HcmAccessLogOptions_msg_init); 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) { @@ -1700,6 +1786,7 @@ UPB_INLINE const struct envoy_type_v3_Percent* envoy_extensions_filters_network_ const struct envoy_type_v3_Percent* default_val = NULL; const struct envoy_type_v3_Percent* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__v3__Percent_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1716,6 +1803,7 @@ UPB_INLINE const struct envoy_type_v3_Percent* envoy_extensions_filters_network_ const struct envoy_type_v3_Percent* default_val = NULL; const struct envoy_type_v3_Percent* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__v3__Percent_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1732,6 +1820,7 @@ UPB_INLINE const struct envoy_type_v3_Percent* envoy_extensions_filters_network_ const struct envoy_type_v3_Percent* default_val = NULL; const struct envoy_type_v3_Percent* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__v3__Percent_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1760,6 +1849,7 @@ UPB_INLINE const struct google_protobuf_UInt32Value* envoy_extensions_filters_ne const struct google_protobuf_UInt32Value* default_val = NULL; const struct google_protobuf_UInt32Value* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1774,6 +1864,7 @@ UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_Http } UPB_INLINE const struct envoy_type_tracing_v3_CustomTag* const* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_custom_tags(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing* msg, size_t* size) { const upb_MiniTableField field = {8, UPB_SIZE(32, 48), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__tracing__v3__CustomTag_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1785,6 +1876,7 @@ UPB_INLINE const struct envoy_type_tracing_v3_CustomTag* const* envoy_extensions } UPB_INLINE const upb_Array* _envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_custom_tags_upb_array(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing* msg, size_t* size) { const upb_MiniTableField field = {8, UPB_SIZE(32, 48), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__tracing__v3__CustomTag_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -1793,6 +1885,7 @@ UPB_INLINE const upb_Array* _envoy_extensions_filters_network_http_connection_ma } UPB_INLINE upb_Array* _envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_custom_tags_mutable_upb_array(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {8, UPB_SIZE(32, 48), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__tracing__v3__CustomTag_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -1808,6 +1901,7 @@ UPB_INLINE const struct envoy_config_trace_v3_Tracing_Http* envoy_extensions_fil const struct envoy_config_trace_v3_Tracing_Http* default_val = NULL; const struct envoy_config_trace_v3_Tracing_Http* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__trace__v3__Tracing__Http_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1824,6 +1918,7 @@ UPB_INLINE const struct google_protobuf_BoolValue* envoy_extensions_filters_netw const struct google_protobuf_BoolValue* default_val = NULL; const struct google_protobuf_BoolValue* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1835,6 +1930,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__v3__Percent_msg_init); 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) { @@ -1847,6 +1943,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__v3__Percent_msg_init); 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) { @@ -1859,6 +1956,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__v3__Percent_msg_init); 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) { @@ -1875,6 +1973,7 @@ UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_Http } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); 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) { @@ -1887,6 +1986,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_extensions_filters_network_ } UPB_INLINE struct envoy_type_tracing_v3_CustomTag** envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_mutable_custom_tags(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing* msg, size_t* size) { upb_MiniTableField field = {8, UPB_SIZE(32, 48), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__tracing__v3__CustomTag_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1903,6 +2003,7 @@ UPB_INLINE struct envoy_type_tracing_v3_CustomTag** envoy_extensions_filters_net } UPB_INLINE struct envoy_type_tracing_v3_CustomTag* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_add_custom_tags(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing* msg, upb_Arena* arena) { upb_MiniTableField field = {8, UPB_SIZE(32, 48), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__tracing__v3__CustomTag_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -1917,6 +2018,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__trace__v3__Tracing__Http_msg_init); 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) { @@ -1929,6 +2031,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); 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) { @@ -1994,6 +2097,7 @@ UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_Http } UPB_INLINE const struct envoy_config_core_v3_CidrRange* const* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_InternalAddressConfig_cidr_ranges(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_InternalAddressConfig* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__CidrRange_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -2005,6 +2109,7 @@ UPB_INLINE const struct envoy_config_core_v3_CidrRange* const* envoy_extensions_ } UPB_INLINE const upb_Array* _envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_InternalAddressConfig_cidr_ranges_upb_array(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_InternalAddressConfig* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__CidrRange_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -2013,6 +2118,7 @@ UPB_INLINE const upb_Array* _envoy_extensions_filters_network_http_connection_ma } UPB_INLINE upb_Array* _envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_InternalAddressConfig_cidr_ranges_mutable_upb_array(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_InternalAddressConfig* msg, size_t* size, upb_Arena* arena) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__CidrRange_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -2027,6 +2133,7 @@ UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_Http } 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__CidrRange_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -2043,6 +2150,7 @@ UPB_INLINE struct envoy_config_core_v3_CidrRange** envoy_extensions_filters_netw } UPB_INLINE struct envoy_config_core_v3_CidrRange* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_InternalAddressConfig_add_cidr_ranges(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_InternalAddressConfig* msg, upb_Arena* arena) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__CidrRange_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -2100,6 +2208,7 @@ UPB_INLINE const struct google_protobuf_BoolValue* envoy_extensions_filters_netw const struct google_protobuf_BoolValue* default_val = NULL; const struct google_protobuf_BoolValue* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -2159,6 +2268,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); 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) { @@ -2240,6 +2350,7 @@ UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_Http } UPB_INLINE const envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter* const* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig_filters(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__filters__network__http_0connection_0manager__v3__HttpFilter_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -2251,6 +2362,7 @@ UPB_INLINE const envoy_extensions_filters_network_http_connection_manager_v3_Htt } UPB_INLINE const upb_Array* _envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig_filters_upb_array(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__filters__network__http_0connection_0manager__v3__HttpFilter_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -2259,6 +2371,7 @@ UPB_INLINE const upb_Array* _envoy_extensions_filters_network_http_connection_ma } UPB_INLINE upb_Array* _envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig_filters_mutable_upb_array(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig* msg, size_t* size, upb_Arena* arena) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__filters__network__http_0connection_0manager__v3__HttpFilter_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -2274,6 +2387,7 @@ UPB_INLINE const struct google_protobuf_BoolValue* envoy_extensions_filters_netw const struct google_protobuf_BoolValue* default_val = NULL; const struct google_protobuf_BoolValue* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -2289,6 +2403,7 @@ UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_Http } 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__filters__network__http_0connection_0manager__v3__HttpFilter_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -2305,6 +2420,7 @@ UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_HttpFilte } UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig_add_filters(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig* msg, upb_Arena* arena) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__filters__network__http_0connection_0manager__v3__HttpFilter_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -2319,6 +2435,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); 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) { @@ -2374,6 +2491,7 @@ UPB_INLINE const struct envoy_type_http_v3_PathTransformation* envoy_extensions_ const struct envoy_type_http_v3_PathTransformation* default_val = NULL; const struct envoy_type_http_v3_PathTransformation* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__http__v3__PathTransformation_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -2390,6 +2508,7 @@ UPB_INLINE const struct envoy_type_http_v3_PathTransformation* envoy_extensions_ const struct envoy_type_http_v3_PathTransformation* default_val = NULL; const struct envoy_type_http_v3_PathTransformation* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__http__v3__PathTransformation_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -2401,6 +2520,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__http__v3__PathTransformation_msg_init); 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) { @@ -2413,6 +2533,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__http__v3__PathTransformation_msg_init); 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) { @@ -2620,6 +2741,7 @@ UPB_INLINE const struct google_protobuf_Duration* envoy_extensions_filters_netwo 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -2655,6 +2777,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { @@ -2716,6 +2839,7 @@ UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_Loca } UPB_INLINE const envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper* const* envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig_mappers(const envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig* msg, size_t* size) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__filters__network__http_0connection_0manager__v3__ResponseMapper_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -2727,6 +2851,7 @@ UPB_INLINE const envoy_extensions_filters_network_http_connection_manager_v3_Res } UPB_INLINE const upb_Array* _envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig_mappers_upb_array(const envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig* msg, size_t* size) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__filters__network__http_0connection_0manager__v3__ResponseMapper_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -2735,6 +2860,7 @@ UPB_INLINE const upb_Array* _envoy_extensions_filters_network_http_connection_ma } UPB_INLINE upb_Array* _envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig_mappers_mutable_upb_array(envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__filters__network__http_0connection_0manager__v3__ResponseMapper_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -2750,6 +2876,7 @@ UPB_INLINE const struct envoy_config_core_v3_SubstitutionFormatString* envoy_ext const struct envoy_config_core_v3_SubstitutionFormatString* default_val = NULL; const struct envoy_config_core_v3_SubstitutionFormatString* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__SubstitutionFormatString_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -2761,6 +2888,7 @@ UPB_INLINE bool envoy_extensions_filters_network_http_connection_manager_v3_Loca UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper** envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig_mutable_mappers(envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig* msg, size_t* size) { upb_MiniTableField field = {1, UPB_SIZE(12, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__filters__network__http_0connection_0manager__v3__ResponseMapper_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -2777,6 +2905,7 @@ UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_ResponseM } UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper* envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig_add_mappers(envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig* msg, upb_Arena* arena) { upb_MiniTableField field = {1, UPB_SIZE(12, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__filters__network__http_0connection_0manager__v3__ResponseMapper_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -2791,6 +2920,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__SubstitutionFormatString_msg_init); 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) { @@ -2846,6 +2976,7 @@ UPB_INLINE const struct envoy_config_accesslog_v3_AccessLogFilter* envoy_extensi const struct envoy_config_accesslog_v3_AccessLogFilter* default_val = NULL; const struct envoy_config_accesslog_v3_AccessLogFilter* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__accesslog__v3__AccessLogFilter_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -2862,6 +2993,7 @@ UPB_INLINE const struct google_protobuf_UInt32Value* envoy_extensions_filters_ne const struct google_protobuf_UInt32Value* default_val = NULL; const struct google_protobuf_UInt32Value* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -2878,6 +3010,7 @@ UPB_INLINE const struct envoy_config_core_v3_DataSource* envoy_extensions_filter const struct envoy_config_core_v3_DataSource* default_val = NULL; const struct envoy_config_core_v3_DataSource* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__DataSource_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -2894,6 +3027,7 @@ UPB_INLINE const struct envoy_config_core_v3_SubstitutionFormatString* envoy_ext const struct envoy_config_core_v3_SubstitutionFormatString* default_val = NULL; const struct envoy_config_core_v3_SubstitutionFormatString* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__SubstitutionFormatString_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -2908,6 +3042,7 @@ UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_Resp } UPB_INLINE const struct envoy_config_core_v3_HeaderValueOption* const* envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper_headers_to_add(const envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper* msg, size_t* size) { const upb_MiniTableField field = {5, UPB_SIZE(28, 48), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HeaderValueOption_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -2919,6 +3054,7 @@ UPB_INLINE const struct envoy_config_core_v3_HeaderValueOption* const* envoy_ext } UPB_INLINE const upb_Array* _envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper_headers_to_add_upb_array(const envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper* msg, size_t* size) { const upb_MiniTableField field = {5, UPB_SIZE(28, 48), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HeaderValueOption_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -2927,6 +3063,7 @@ UPB_INLINE const upb_Array* _envoy_extensions_filters_network_http_connection_ma } UPB_INLINE upb_Array* _envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper_headers_to_add_mutable_upb_array(envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {5, UPB_SIZE(28, 48), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HeaderValueOption_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -2937,6 +3074,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__accesslog__v3__AccessLogFilter_msg_init); 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) { @@ -2949,6 +3087,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); 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) { @@ -2961,6 +3100,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__DataSource_msg_init); 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) { @@ -2973,6 +3113,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__SubstitutionFormatString_msg_init); 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) { @@ -2985,6 +3126,7 @@ UPB_INLINE struct envoy_config_core_v3_SubstitutionFormatString* envoy_extension } UPB_INLINE struct envoy_config_core_v3_HeaderValueOption** envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper_mutable_headers_to_add(envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper* msg, size_t* size) { upb_MiniTableField field = {5, UPB_SIZE(28, 48), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HeaderValueOption_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -3001,6 +3143,7 @@ UPB_INLINE struct envoy_config_core_v3_HeaderValueOption** envoy_extensions_filt } UPB_INLINE struct envoy_config_core_v3_HeaderValueOption* envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper_add_headers_to_add(envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper* msg, upb_Arena* arena) { upb_MiniTableField field = {5, UPB_SIZE(28, 48), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HeaderValueOption_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -3058,6 +3201,7 @@ UPB_INLINE const struct envoy_config_core_v3_ConfigSource* envoy_extensions_filt const struct envoy_config_core_v3_ConfigSource* default_val = NULL; const struct envoy_config_core_v3_ConfigSource* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__ConfigSource_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -3081,6 +3225,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__ConfigSource_msg_init); 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) { @@ -3138,6 +3283,7 @@ UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_Scop } UPB_INLINE const struct envoy_config_route_v3_ScopedRouteConfiguration* const* envoy_extensions_filters_network_http_connection_manager_v3_ScopedRouteConfigurationsList_scoped_route_configurations(const envoy_extensions_filters_network_http_connection_manager_v3_ScopedRouteConfigurationsList* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__ScopedRouteConfiguration_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -3149,6 +3295,7 @@ UPB_INLINE const struct envoy_config_route_v3_ScopedRouteConfiguration* const* e } UPB_INLINE const upb_Array* _envoy_extensions_filters_network_http_connection_manager_v3_ScopedRouteConfigurationsList_scoped_route_configurations_upb_array(const envoy_extensions_filters_network_http_connection_manager_v3_ScopedRouteConfigurationsList* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__ScopedRouteConfiguration_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -3157,6 +3304,7 @@ UPB_INLINE const upb_Array* _envoy_extensions_filters_network_http_connection_ma } UPB_INLINE upb_Array* _envoy_extensions_filters_network_http_connection_manager_v3_ScopedRouteConfigurationsList_scoped_route_configurations_mutable_upb_array(envoy_extensions_filters_network_http_connection_manager_v3_ScopedRouteConfigurationsList* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__ScopedRouteConfiguration_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -3167,6 +3315,7 @@ UPB_INLINE upb_Array* _envoy_extensions_filters_network_http_connection_manager_ UPB_INLINE struct envoy_config_route_v3_ScopedRouteConfiguration** envoy_extensions_filters_network_http_connection_manager_v3_ScopedRouteConfigurationsList_mutable_scoped_route_configurations(envoy_extensions_filters_network_http_connection_manager_v3_ScopedRouteConfigurationsList* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__ScopedRouteConfiguration_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -3183,6 +3332,7 @@ UPB_INLINE struct envoy_config_route_v3_ScopedRouteConfiguration** envoy_extensi } UPB_INLINE struct envoy_config_route_v3_ScopedRouteConfiguration* envoy_extensions_filters_network_http_connection_manager_v3_ScopedRouteConfigurationsList_add_scoped_route_configurations(envoy_extensions_filters_network_http_connection_manager_v3_ScopedRouteConfigurationsList* msg, upb_Arena* arena) { upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__route__v3__ScopedRouteConfiguration_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -3262,6 +3412,7 @@ UPB_INLINE const envoy_extensions_filters_network_http_connection_manager_v3_Sco const envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder* default_val = NULL; const envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes__ScopeKeyBuilder_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -3278,6 +3429,7 @@ UPB_INLINE const struct envoy_config_core_v3_ConfigSource* envoy_extensions_filt const struct envoy_config_core_v3_ConfigSource* default_val = NULL; const struct envoy_config_core_v3_ConfigSource* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__ConfigSource_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -3294,6 +3446,7 @@ UPB_INLINE const envoy_extensions_filters_network_http_connection_manager_v3_Sco const envoy_extensions_filters_network_http_connection_manager_v3_ScopedRouteConfigurationsList* default_val = NULL; const envoy_extensions_filters_network_http_connection_manager_v3_ScopedRouteConfigurationsList* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRouteConfigurationsList_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -3310,6 +3463,7 @@ UPB_INLINE const envoy_extensions_filters_network_http_connection_manager_v3_Sco const envoy_extensions_filters_network_http_connection_manager_v3_ScopedRds* default_val = NULL; const envoy_extensions_filters_network_http_connection_manager_v3_ScopedRds* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRds_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -3325,6 +3479,7 @@ UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_Scop } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes__ScopeKeyBuilder_msg_init); 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) { @@ -3337,6 +3492,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__ConfigSource_msg_init); 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) { @@ -3349,6 +3505,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRouteConfigurationsList_msg_init); 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) { @@ -3361,6 +3518,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRds_msg_init); 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) { @@ -3414,6 +3572,7 @@ UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_Scop } UPB_INLINE const envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder* const* envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_fragments(const envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes__ScopeKeyBuilder__FragmentBuilder_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -3425,6 +3584,7 @@ UPB_INLINE const envoy_extensions_filters_network_http_connection_manager_v3_Sco } UPB_INLINE const upb_Array* _envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_fragments_upb_array(const envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes__ScopeKeyBuilder__FragmentBuilder_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -3433,6 +3593,7 @@ UPB_INLINE const upb_Array* _envoy_extensions_filters_network_http_connection_ma } UPB_INLINE upb_Array* _envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_fragments_mutable_upb_array(envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes__ScopeKeyBuilder__FragmentBuilder_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -3443,6 +3604,7 @@ UPB_INLINE upb_Array* _envoy_extensions_filters_network_http_connection_manager_ UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder** envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_mutable_fragments(envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes__ScopeKeyBuilder__FragmentBuilder_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -3459,6 +3621,7 @@ UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_ScopedRou } UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder* envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_add_fragments(envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder* msg, upb_Arena* arena) { upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes__ScopeKeyBuilder__FragmentBuilder_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -3525,6 +3688,7 @@ UPB_INLINE const envoy_extensions_filters_network_http_connection_manager_v3_Sco const envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor* default_val = NULL; const envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes__ScopeKeyBuilder__FragmentBuilder__HeaderValueExtractor_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -3536,6 +3700,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes__ScopeKeyBuilder__FragmentBuilder__HeaderValueExtractor_msg_init); 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) { @@ -3641,6 +3806,7 @@ UPB_INLINE const envoy_extensions_filters_network_http_connection_manager_v3_Sco const envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_KvElement* default_val = NULL; const envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_KvElement* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes__ScopeKeyBuilder__FragmentBuilder__HeaderValueExtractor__KvElement_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -3664,6 +3830,7 @@ UPB_INLINE void 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_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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes__ScopeKeyBuilder__FragmentBuilder__HeaderValueExtractor__KvElement_msg_init); 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) { @@ -3789,6 +3956,7 @@ UPB_INLINE const struct envoy_config_core_v3_ConfigSource* envoy_extensions_filt const struct envoy_config_core_v3_ConfigSource* default_val = NULL; const struct envoy_config_core_v3_ConfigSource* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__ConfigSource_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -3812,6 +3980,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__ConfigSource_msg_init); 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) { @@ -3893,6 +4062,7 @@ UPB_INLINE const struct google_protobuf_Any* envoy_extensions_filters_network_ht const struct google_protobuf_Any* default_val = NULL; const struct google_protobuf_Any* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -3909,6 +4079,7 @@ UPB_INLINE const struct envoy_config_core_v3_ExtensionConfigSource* envoy_extens const struct envoy_config_core_v3_ExtensionConfigSource* default_val = NULL; const struct envoy_config_core_v3_ExtensionConfigSource* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__ExtensionConfigSource_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -3948,6 +4119,7 @@ UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_Http } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); 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) { @@ -3960,6 +4132,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__ExtensionConfigSource_msg_init); 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) { @@ -4023,6 +4196,7 @@ UPB_INLINE const struct google_protobuf_Any* envoy_extensions_filters_network_ht const struct google_protobuf_Any* default_val = NULL; const struct google_protobuf_Any* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -4034,6 +4208,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); 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) { @@ -4089,6 +4264,7 @@ UPB_INLINE const envoy_extensions_filters_network_http_connection_manager_v3_Htt const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* default_val = NULL; const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -4100,6 +4276,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager_msg_init); 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) { diff --git a/src/core/ext/upb-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb_minitable.c b/src/core/ext/upb-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb_minitable.c index a03ba035fcc..af00227b2ea 100644 --- a/src/core/ext/upb-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -34,42 +35,43 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_submsgs[35] = { - {.UPB_PRIVATE(submsg) = &envoy__extensions__filters__network__http_0connection_0manager__v3__Rds_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RouteConfiguration_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpFilter_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__Tracing_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Http1ProtocolOptions_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Http2ProtocolOptions_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__accesslog__v3__AccessLog_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__SetCurrentClientCertDetails_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__UpgradeConfig_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__InternalAddressConfig_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HttpProtocolOptions_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__extensions__filters__network__http_0connection_0manager__v3__RequestIDExtension_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__extensions__filters__network__http_0connection_0manager__v3__LocalReplyConfig_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__PathNormalizationOptions_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Http3ProtocolOptions_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__SchemeHeaderTransformation_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__ProxyStatusConfig_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) = &google__protobuf__Duration_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__HcmAccessLogOptions_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_submsgs[35] = { + {.UPB_PRIVATE(submsg) = &envoy__extensions__filters__network__http_0connection_0manager__v3__Rds_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RouteConfiguration_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpFilter_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__Tracing_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Http1ProtocolOptions_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Http2ProtocolOptions_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__accesslog__v3__AccessLog_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__SetCurrentClientCertDetails_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__UpgradeConfig_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__InternalAddressConfig_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HttpProtocolOptions_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__extensions__filters__network__http_0connection_0manager__v3__RequestIDExtension_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__extensions__filters__network__http_0connection_0manager__v3__LocalReplyConfig_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__PathNormalizationOptions_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Http3ProtocolOptions_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__SchemeHeaderTransformation_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__ProxyStatusConfig_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__HcmAccessLogOptions_msg_init_ptr}, }; static const upb_MiniTableField envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager__fields[55] = { @@ -173,14 +175,15 @@ const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manag }) }; -static const upb_MiniTableSub envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_submsgs[7] = { - {.UPB_PRIVATE(submsg) = &envoy__type__v3__Percent_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__type__v3__Percent_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__type__v3__Percent_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__type__tracing__v3__CustomTag_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__trace__v3__Tracing__Http_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init}, +const upb_MiniTable* envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager_msg_init_ptr = &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager_msg_init; +static const upb_MiniTableSubInternal envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_submsgs[7] = { + {.UPB_PRIVATE(submsg) = &envoy__type__v3__Percent_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__type__v3__Percent_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__type__v3__Percent_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__type__tracing__v3__CustomTag_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__trace__v3__Tracing__Http_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr}, }; static const upb_MiniTableField envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing__fields[8] = { @@ -221,8 +224,9 @@ const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manag }) }; -static const upb_MiniTableSub envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_InternalAddressConfig_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__CidrRange_msg_init}, +const upb_MiniTable* envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__Tracing_msg_init_ptr = &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__Tracing_msg_init; +static const upb_MiniTableSubInternal envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_InternalAddressConfig_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__CidrRange_msg_init_ptr}, }; static const upb_MiniTableField envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_InternalAddressConfig__fields[2] = { @@ -245,8 +249,9 @@ const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manag }) }; -static const upb_MiniTableSub envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init}, +const upb_MiniTable* envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__InternalAddressConfig_msg_init_ptr = &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__InternalAddressConfig_msg_init; +static const upb_MiniTableSubInternal envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr}, }; static const upb_MiniTableField envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails__fields[5] = { @@ -276,9 +281,10 @@ const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manag }) }; -static const upb_MiniTableSub envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpFilter_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init}, +const upb_MiniTable* envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__SetCurrentClientCertDetails_msg_init_ptr = &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__SetCurrentClientCertDetails_msg_init; +static const upb_MiniTableSubInternal envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpFilter_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr}, }; static const upb_MiniTableField envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig__fields[3] = { @@ -302,9 +308,10 @@ const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manag }) }; -static const upb_MiniTableSub envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &envoy__type__http__v3__PathTransformation_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__type__http__v3__PathTransformation_msg_init}, +const upb_MiniTable* envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__UpgradeConfig_msg_init_ptr = &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__UpgradeConfig_msg_init; +static const upb_MiniTableSubInternal envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &envoy__type__http__v3__PathTransformation_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__type__http__v3__PathTransformation_msg_init_ptr}, }; static const upb_MiniTableField envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions__fields[2] = { @@ -321,6 +328,7 @@ const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manag #endif }; +const upb_MiniTable* envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__PathNormalizationOptions_msg_init_ptr = &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__PathNormalizationOptions_msg_init; static const upb_MiniTableField envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_ProxyStatusConfig__fields[6] = { {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)}, @@ -349,8 +357,9 @@ const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manag }) }; -static const upb_MiniTableSub envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_HcmAccessLogOptions_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, +const upb_MiniTable* envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__ProxyStatusConfig_msg_init_ptr = &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__ProxyStatusConfig_msg_init; +static const upb_MiniTableSubInternal envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_HcmAccessLogOptions_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, }; static const upb_MiniTableField envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_HcmAccessLogOptions__fields[3] = { @@ -374,9 +383,10 @@ const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manag }) }; -static const upb_MiniTableSub envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &envoy__extensions__filters__network__http_0connection_0manager__v3__ResponseMapper_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__SubstitutionFormatString_msg_init}, +const upb_MiniTable* envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__HcmAccessLogOptions_msg_init_ptr = &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__HcmAccessLogOptions_msg_init; +static const upb_MiniTableSubInternal envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &envoy__extensions__filters__network__http_0connection_0manager__v3__ResponseMapper_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__SubstitutionFormatString_msg_init_ptr}, }; static const upb_MiniTableField envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig__fields[2] = { @@ -397,12 +407,13 @@ const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manag }) }; -static const upb_MiniTableSub envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper_submsgs[5] = { - {.UPB_PRIVATE(submsg) = &envoy__config__accesslog__v3__AccessLogFilter_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__DataSource_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__SubstitutionFormatString_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HeaderValueOption_msg_init}, +const upb_MiniTable* envoy__extensions__filters__network__http_0connection_0manager__v3__LocalReplyConfig_msg_init_ptr = &envoy__extensions__filters__network__http_0connection_0manager__v3__LocalReplyConfig_msg_init; +static const upb_MiniTableSubInternal envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper_submsgs[5] = { + {.UPB_PRIVATE(submsg) = &envoy__config__accesslog__v3__AccessLogFilter_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__DataSource_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__SubstitutionFormatString_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HeaderValueOption_msg_init_ptr}, }; static const upb_MiniTableField envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper__fields[5] = { @@ -432,8 +443,9 @@ const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manag }) }; -static const upb_MiniTableSub envoy_extensions_filters_network_http_connection_manager_v3_Rds_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ConfigSource_msg_init}, +const upb_MiniTable* envoy__extensions__filters__network__http_0connection_0manager__v3__ResponseMapper_msg_init_ptr = &envoy__extensions__filters__network__http_0connection_0manager__v3__ResponseMapper_msg_init; +static const upb_MiniTableSubInternal envoy_extensions_filters_network_http_connection_manager_v3_Rds_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ConfigSource_msg_init_ptr}, }; static const upb_MiniTableField envoy_extensions_filters_network_http_connection_manager_v3_Rds__fields[2] = { @@ -456,8 +468,9 @@ const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manag }) }; -static const upb_MiniTableSub envoy_extensions_filters_network_http_connection_manager_v3_ScopedRouteConfigurationsList_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__ScopedRouteConfiguration_msg_init}, +const upb_MiniTable* envoy__extensions__filters__network__http_0connection_0manager__v3__Rds_msg_init_ptr = &envoy__extensions__filters__network__http_0connection_0manager__v3__Rds_msg_init; +static const upb_MiniTableSubInternal envoy_extensions_filters_network_http_connection_manager_v3_ScopedRouteConfigurationsList_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__ScopedRouteConfiguration_msg_init_ptr}, }; static const upb_MiniTableField envoy_extensions_filters_network_http_connection_manager_v3_ScopedRouteConfigurationsList__fields[1] = { @@ -477,11 +490,12 @@ const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manag }) }; -static const upb_MiniTableSub envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_submsgs[4] = { - {.UPB_PRIVATE(submsg) = &envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes__ScopeKeyBuilder_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ConfigSource_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRouteConfigurationsList_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRds_msg_init}, +const upb_MiniTable* envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRouteConfigurationsList_msg_init_ptr = &envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRouteConfigurationsList_msg_init; +static const upb_MiniTableSubInternal envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_submsgs[4] = { + {.UPB_PRIVATE(submsg) = &envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes__ScopeKeyBuilder_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ConfigSource_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRouteConfigurationsList_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRds_msg_init_ptr}, }; static const upb_MiniTableField envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes__fields[5] = { @@ -511,8 +525,9 @@ const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manag }) }; -static const upb_MiniTableSub envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes__ScopeKeyBuilder__FragmentBuilder_msg_init}, +const upb_MiniTable* envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes_msg_init_ptr = &envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes_msg_init; +static const upb_MiniTableSubInternal envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes__ScopeKeyBuilder__FragmentBuilder_msg_init_ptr}, }; static const upb_MiniTableField envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder__fields[1] = { @@ -532,8 +547,9 @@ const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manag }) }; -static const upb_MiniTableSub envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes__ScopeKeyBuilder__FragmentBuilder__HeaderValueExtractor_msg_init}, +const upb_MiniTable* envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes__ScopeKeyBuilder_msg_init_ptr = &envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes__ScopeKeyBuilder_msg_init; +static const upb_MiniTableSubInternal envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes__ScopeKeyBuilder__FragmentBuilder__HeaderValueExtractor_msg_init_ptr}, }; static const upb_MiniTableField envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder__fields[1] = { @@ -553,8 +569,9 @@ const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manag }) }; -static const upb_MiniTableSub envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes__ScopeKeyBuilder__FragmentBuilder__HeaderValueExtractor__KvElement_msg_init}, +const upb_MiniTable* envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes__ScopeKeyBuilder__FragmentBuilder_msg_init_ptr = &envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes__ScopeKeyBuilder__FragmentBuilder_msg_init; +static const upb_MiniTableSubInternal envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes__ScopeKeyBuilder__FragmentBuilder__HeaderValueExtractor__KvElement_msg_init_ptr}, }; static const upb_MiniTableField envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor__fields[4] = { @@ -583,6 +600,7 @@ const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manag }) }; +const upb_MiniTable* envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes__ScopeKeyBuilder__FragmentBuilder__HeaderValueExtractor_msg_init_ptr = &envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes__ScopeKeyBuilder__FragmentBuilder__HeaderValueExtractor_msg_init; static const upb_MiniTableField envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_KvElement__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)}, @@ -603,8 +621,9 @@ const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manag }) }; -static const upb_MiniTableSub envoy_extensions_filters_network_http_connection_manager_v3_ScopedRds_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ConfigSource_msg_init}, +const upb_MiniTable* envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes__ScopeKeyBuilder__FragmentBuilder__HeaderValueExtractor__KvElement_msg_init_ptr = &envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes__ScopeKeyBuilder__FragmentBuilder__HeaderValueExtractor__KvElement_msg_init; +static const upb_MiniTableSubInternal envoy_extensions_filters_network_http_connection_manager_v3_ScopedRds_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ConfigSource_msg_init_ptr}, }; static const upb_MiniTableField envoy_extensions_filters_network_http_connection_manager_v3_ScopedRds__fields[2] = { @@ -627,9 +646,10 @@ const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manag }) }; -static const upb_MiniTableSub envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ExtensionConfigSource_msg_init}, +const upb_MiniTable* envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRds_msg_init_ptr = &envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRds_msg_init; +static const upb_MiniTableSubInternal envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ExtensionConfigSource_msg_init_ptr}, }; static const upb_MiniTableField envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter__fields[5] = { @@ -659,8 +679,9 @@ const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manag }) }; -static const upb_MiniTableSub envoy_extensions_filters_network_http_connection_manager_v3_RequestIDExtension_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init}, +const upb_MiniTable* envoy__extensions__filters__network__http_0connection_0manager__v3__HttpFilter_msg_init_ptr = &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpFilter_msg_init; +static const upb_MiniTableSubInternal envoy_extensions_filters_network_http_connection_manager_v3_RequestIDExtension_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, }; static const upb_MiniTableField envoy_extensions_filters_network_http_connection_manager_v3_RequestIDExtension__fields[1] = { @@ -676,8 +697,9 @@ const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manag #endif }; -static const upb_MiniTableSub envoy_extensions_filters_network_http_connection_manager_v3_EnvoyMobileHttpConnectionManager_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager_msg_init}, +const upb_MiniTable* envoy__extensions__filters__network__http_0connection_0manager__v3__RequestIDExtension_msg_init_ptr = &envoy__extensions__filters__network__http_0connection_0manager__v3__RequestIDExtension_msg_init; +static const upb_MiniTableSubInternal envoy_extensions_filters_network_http_connection_manager_v3_EnvoyMobileHttpConnectionManager_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager_msg_init_ptr}, }; static const upb_MiniTableField envoy_extensions_filters_network_http_connection_manager_v3_EnvoyMobileHttpConnectionManager__fields[1] = { @@ -693,6 +715,7 @@ const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manag #endif }; +const upb_MiniTable* envoy__extensions__filters__network__http_0connection_0manager__v3__EnvoyMobileHttpConnectionManager_msg_init_ptr = &envoy__extensions__filters__network__http_0connection_0manager__v3__EnvoyMobileHttpConnectionManager_msg_init; static const upb_MiniTable *messages_layout[21] = { &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager_msg_init, &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__Tracing_msg_init, diff --git a/src/core/ext/upb-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb_minitable.h b/src/core/ext/upb-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb_minitable.h index 0f559e8cfb8..9ab23a7a759 100644 --- a/src/core/ext/upb-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_EXTENSIONS_FILTERS_NETWORK_HTTP_CONNECTION_MANAGER_V3_HTTP_CONNECTION_MANAGER_PROTO_UPB_MINITABLE_H_ #define ENVOY_EXTENSIONS_FILTERS_NETWORK_HTTP_CONNECTION_MANAGER_V3_HTTP_CONNECTION_MANAGER_PROTO_UPB_MINITABLE_H_ @@ -18,26 +19,47 @@ extern "C" { #endif extern const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager_msg_init; +extern const upb_MiniTable* envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager_msg_init_ptr; extern const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__Tracing_msg_init; +extern const upb_MiniTable* envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__Tracing_msg_init_ptr; extern const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__InternalAddressConfig_msg_init; +extern const upb_MiniTable* envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__InternalAddressConfig_msg_init_ptr; extern const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__SetCurrentClientCertDetails_msg_init; +extern const upb_MiniTable* envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__SetCurrentClientCertDetails_msg_init_ptr; extern const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__UpgradeConfig_msg_init; +extern const upb_MiniTable* envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__UpgradeConfig_msg_init_ptr; extern const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__PathNormalizationOptions_msg_init; +extern const upb_MiniTable* envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__PathNormalizationOptions_msg_init_ptr; extern const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__ProxyStatusConfig_msg_init; +extern const upb_MiniTable* envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__ProxyStatusConfig_msg_init_ptr; extern const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__HcmAccessLogOptions_msg_init; +extern const upb_MiniTable* envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__HcmAccessLogOptions_msg_init_ptr; extern const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manager__v3__LocalReplyConfig_msg_init; +extern const upb_MiniTable* envoy__extensions__filters__network__http_0connection_0manager__v3__LocalReplyConfig_msg_init_ptr; extern const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manager__v3__ResponseMapper_msg_init; +extern const upb_MiniTable* envoy__extensions__filters__network__http_0connection_0manager__v3__ResponseMapper_msg_init_ptr; extern const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manager__v3__Rds_msg_init; +extern const upb_MiniTable* envoy__extensions__filters__network__http_0connection_0manager__v3__Rds_msg_init_ptr; extern const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRouteConfigurationsList_msg_init; +extern const upb_MiniTable* envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRouteConfigurationsList_msg_init_ptr; extern const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes_msg_init; +extern const upb_MiniTable* envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes_msg_init_ptr; extern const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes__ScopeKeyBuilder_msg_init; +extern const upb_MiniTable* envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes__ScopeKeyBuilder_msg_init_ptr; extern const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes__ScopeKeyBuilder__FragmentBuilder_msg_init; +extern const upb_MiniTable* envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes__ScopeKeyBuilder__FragmentBuilder_msg_init_ptr; extern const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes__ScopeKeyBuilder__FragmentBuilder__HeaderValueExtractor_msg_init; +extern const upb_MiniTable* envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes__ScopeKeyBuilder__FragmentBuilder__HeaderValueExtractor_msg_init_ptr; extern const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes__ScopeKeyBuilder__FragmentBuilder__HeaderValueExtractor__KvElement_msg_init; +extern const upb_MiniTable* envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes__ScopeKeyBuilder__FragmentBuilder__HeaderValueExtractor__KvElement_msg_init_ptr; extern const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRds_msg_init; +extern const upb_MiniTable* envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRds_msg_init_ptr; extern const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manager__v3__HttpFilter_msg_init; +extern const upb_MiniTable* envoy__extensions__filters__network__http_0connection_0manager__v3__HttpFilter_msg_init_ptr; extern const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manager__v3__RequestIDExtension_msg_init; +extern const upb_MiniTable* envoy__extensions__filters__network__http_0connection_0manager__v3__RequestIDExtension_msg_init_ptr; extern const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manager__v3__EnvoyMobileHttpConnectionManager_msg_init; +extern const upb_MiniTable* envoy__extensions__filters__network__http_0connection_0manager__v3__EnvoyMobileHttpConnectionManager_msg_init_ptr; extern const upb_MiniTableFile envoy_extensions_filters_network_http_connection_manager_v3_http_connection_manager_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb.h b/src/core/ext/upb-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb.h index b04c4f3694f..52cb6c02065 100644 --- a/src/core/ext/upb-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb.h +++ b/src/core/ext/upb-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb.h @@ -3,7 +3,8 @@ * envoy/extensions/http/stateful_session/cookie/v3/cookie.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_EXTENSIONS_HTTP_STATEFUL_SESSION_COOKIE_V3_COOKIE_PROTO_UPB_H_ #define ENVOY_EXTENSIONS_HTTP_STATEFUL_SESSION_COOKIE_V3_COOKIE_PROTO_UPB_H_ @@ -72,6 +73,7 @@ UPB_INLINE const struct envoy_type_http_v3_Cookie* envoy_extensions_http_statefu const struct envoy_type_http_v3_Cookie* default_val = NULL; const struct envoy_type_http_v3_Cookie* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__http__v3__Cookie_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -83,6 +85,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__http__v3__Cookie_msg_init); 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) { diff --git a/src/core/ext/upb-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb_minitable.c b/src/core/ext/upb-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb_minitable.c index 5b8d30ea277..1b86f49d99b 100644 --- a/src/core/ext/upb-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/extensions/http/stateful_session/cookie/v3/cookie.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -15,8 +16,9 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub envoy_extensions_http_stateful_session_cookie_v3_CookieBasedSessionState_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__type__http__v3__Cookie_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal envoy_extensions_http_stateful_session_cookie_v3_CookieBasedSessionState_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__type__http__v3__Cookie_msg_init_ptr}, }; static const upb_MiniTableField envoy_extensions_http_stateful_session_cookie_v3_CookieBasedSessionState__fields[1] = { @@ -32,6 +34,7 @@ const upb_MiniTable envoy__extensions__http__stateful_0session__cookie__v3__Cook #endif }; +const upb_MiniTable* envoy__extensions__http__stateful_0session__cookie__v3__CookieBasedSessionState_msg_init_ptr = &envoy__extensions__http__stateful_0session__cookie__v3__CookieBasedSessionState_msg_init; static const upb_MiniTable *messages_layout[1] = { &envoy__extensions__http__stateful_0session__cookie__v3__CookieBasedSessionState_msg_init, }; diff --git a/src/core/ext/upb-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb_minitable.h b/src/core/ext/upb-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb_minitable.h index b553761f2a5..bd205f1009f 100644 --- a/src/core/ext/upb-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/extensions/http/stateful_session/cookie/v3/cookie.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_EXTENSIONS_HTTP_STATEFUL_SESSION_COOKIE_V3_COOKIE_PROTO_UPB_MINITABLE_H_ #define ENVOY_EXTENSIONS_HTTP_STATEFUL_SESSION_COOKIE_V3_COOKIE_PROTO_UPB_MINITABLE_H_ @@ -18,6 +19,7 @@ extern "C" { #endif extern const upb_MiniTable envoy__extensions__http__stateful_0session__cookie__v3__CookieBasedSessionState_msg_init; +extern const upb_MiniTable* envoy__extensions__http__stateful_0session__cookie__v3__CookieBasedSessionState_msg_init_ptr; extern const upb_MiniTableFile envoy_extensions_http_stateful_session_cookie_v3_cookie_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb.h b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb.h index c6e7a9a19fc..53d30883356 100644 --- a/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb.h +++ b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb.h @@ -3,7 +3,8 @@ * envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_CLIENT_SIDE_WEIGHTED_ROUND_ROBIN_V3_CLIENT_SIDE_WEIGHTED_ROUND_ROBIN_PROTO_UPB_H_ #define ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_CLIENT_SIDE_WEIGHTED_ROUND_ROBIN_V3_CLIENT_SIDE_WEIGHTED_ROUND_ROBIN_PROTO_UPB_H_ @@ -75,6 +76,7 @@ UPB_INLINE const struct google_protobuf_BoolValue* envoy_extensions_load_balanci const struct google_protobuf_BoolValue* default_val = NULL; const struct google_protobuf_BoolValue* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -91,6 +93,7 @@ UPB_INLINE const struct google_protobuf_Duration* envoy_extensions_load_balancin const struct google_protobuf_Duration* default_val = NULL; const struct google_protobuf_Duration* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -107,6 +110,7 @@ UPB_INLINE const struct google_protobuf_Duration* envoy_extensions_load_balancin const struct google_protobuf_Duration* default_val = NULL; const struct google_protobuf_Duration* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -123,6 +127,7 @@ UPB_INLINE const struct google_protobuf_Duration* envoy_extensions_load_balancin const struct google_protobuf_Duration* default_val = NULL; const struct google_protobuf_Duration* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -139,6 +144,7 @@ UPB_INLINE const struct google_protobuf_Duration* envoy_extensions_load_balancin const struct google_protobuf_Duration* default_val = NULL; const struct google_protobuf_Duration* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -155,6 +161,7 @@ UPB_INLINE const struct google_protobuf_FloatValue* envoy_extensions_load_balanc const struct google_protobuf_FloatValue* default_val = NULL; const struct google_protobuf_FloatValue* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FloatValue_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -166,6 +173,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); 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) { @@ -178,6 +186,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { @@ -190,6 +199,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { @@ -202,6 +212,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { @@ -214,6 +225,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { @@ -226,6 +238,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FloatValue_msg_init); 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) { diff --git a/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/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 14d36f8d264..09683a4aec4 100644 --- a/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/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -16,13 +17,14 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin_submsgs[6] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__FloatValue_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin_submsgs[6] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__FloatValue_msg_init_ptr}, }; static const upb_MiniTableField envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin__fields[6] = { @@ -43,6 +45,7 @@ const upb_MiniTable envoy__extensions__load_0balancing_0policies__client_0side_0 #endif }; +const upb_MiniTable* envoy__extensions__load_0balancing_0policies__client_0side_0weighted_0round_0robin__v3__ClientSideWeightedRoundRobin_msg_init_ptr = &envoy__extensions__load_0balancing_0policies__client_0side_0weighted_0round_0robin__v3__ClientSideWeightedRoundRobin_msg_init; static const upb_MiniTable *messages_layout[1] = { &envoy__extensions__load_0balancing_0policies__client_0side_0weighted_0round_0robin__v3__ClientSideWeightedRoundRobin_msg_init, }; diff --git a/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb_minitable.h b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb_minitable.h index f053fb9cfe9..ea08acd3937 100644 --- a/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_CLIENT_SIDE_WEIGHTED_ROUND_ROBIN_V3_CLIENT_SIDE_WEIGHTED_ROUND_ROBIN_PROTO_UPB_MINITABLE_H_ #define ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_CLIENT_SIDE_WEIGHTED_ROUND_ROBIN_V3_CLIENT_SIDE_WEIGHTED_ROUND_ROBIN_PROTO_UPB_MINITABLE_H_ @@ -18,6 +19,7 @@ extern "C" { #endif extern const upb_MiniTable envoy__extensions__load_0balancing_0policies__client_0side_0weighted_0round_0robin__v3__ClientSideWeightedRoundRobin_msg_init; +extern const upb_MiniTable* envoy__extensions__load_0balancing_0policies__client_0side_0weighted_0round_0robin__v3__ClientSideWeightedRoundRobin_msg_init_ptr; extern const upb_MiniTableFile envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_client_side_weighted_round_robin_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/common/v3/common.upb.h b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/common/v3/common.upb.h index e05be67fda2..791b6f0ce49 100644 --- a/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/common/v3/common.upb.h +++ b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/common/v3/common.upb.h @@ -3,7 +3,8 @@ * envoy/extensions/load_balancing_policies/common/v3/common.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_COMMON_V3_COMMON_PROTO_UPB_H_ #define ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_COMMON_V3_COMMON_PROTO_UPB_H_ @@ -93,6 +94,7 @@ UPB_INLINE const envoy_extensions_load_balancing_policies_common_v3_LocalityLbCo const envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig* default_val = NULL; const envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__load_0balancing_0policies__common__v3__LocalityLbConfig__ZoneAwareLbConfig_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -109,6 +111,7 @@ UPB_INLINE const envoy_extensions_load_balancing_policies_common_v3_LocalityLbCo const envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_LocalityWeightedLbConfig* default_val = NULL; const envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_LocalityWeightedLbConfig* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__load_0balancing_0policies__common__v3__LocalityLbConfig__LocalityWeightedLbConfig_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -120,6 +123,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__load_0balancing_0policies__common__v3__LocalityLbConfig__ZoneAwareLbConfig_msg_init); 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) { @@ -132,6 +136,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__load_0balancing_0policies__common__v3__LocalityLbConfig__LocalityWeightedLbConfig_msg_init); 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) { @@ -187,6 +192,7 @@ UPB_INLINE const struct envoy_type_v3_Percent* envoy_extensions_load_balancing_p const struct envoy_type_v3_Percent* default_val = NULL; const struct envoy_type_v3_Percent* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__v3__Percent_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -203,6 +209,7 @@ UPB_INLINE const struct google_protobuf_UInt64Value* envoy_extensions_load_balan const struct google_protobuf_UInt64Value* default_val = NULL; const struct google_protobuf_UInt64Value* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt64Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -226,6 +233,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__v3__Percent_msg_init); 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) { @@ -238,6 +246,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt64Value_msg_init); 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) { @@ -335,6 +344,7 @@ UPB_INLINE const struct google_protobuf_Duration* envoy_extensions_load_balancin 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -351,6 +361,7 @@ UPB_INLINE const struct envoy_config_core_v3_RuntimeDouble* envoy_extensions_loa const struct envoy_config_core_v3_RuntimeDouble* default_val = NULL; const struct envoy_config_core_v3_RuntimeDouble* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__RuntimeDouble_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -367,6 +378,7 @@ UPB_INLINE const struct envoy_type_v3_Percent* envoy_extensions_load_balancing_p const struct envoy_type_v3_Percent* default_val = NULL; const struct envoy_type_v3_Percent* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__v3__Percent_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -378,6 +390,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { @@ -390,6 +403,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__RuntimeDouble_msg_init); 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) { @@ -402,6 +416,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__v3__Percent_msg_init); 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) { @@ -469,6 +484,7 @@ UPB_INLINE const struct google_protobuf_UInt32Value* envoy_extensions_load_balan const struct google_protobuf_UInt32Value* default_val = NULL; const struct google_protobuf_UInt32Value* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -484,6 +500,7 @@ UPB_INLINE void envoy_extensions_load_balancing_policies_common_v3_ConsistentHas } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); 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) { diff --git a/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/common/v3/common.upb_minitable.c b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/common/v3/common.upb_minitable.c index 895d12b0cd4..2673eae4233 100644 --- a/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/common/v3/common.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/common/v3/common.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/extensions/load_balancing_policies/common/v3/common.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -18,9 +19,10 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &envoy__extensions__load_0balancing_0policies__common__v3__LocalityLbConfig__ZoneAwareLbConfig_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__extensions__load_0balancing_0policies__common__v3__LocalityLbConfig__LocalityWeightedLbConfig_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &envoy__extensions__load_0balancing_0policies__common__v3__LocalityLbConfig__ZoneAwareLbConfig_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__extensions__load_0balancing_0policies__common__v3__LocalityLbConfig__LocalityWeightedLbConfig_msg_init_ptr}, }; static const upb_MiniTableField envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig__fields[2] = { @@ -43,9 +45,10 @@ const upb_MiniTable envoy__extensions__load_0balancing_0policies__common__v3__Lo }) }; -static const upb_MiniTableSub envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &envoy__type__v3__Percent_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__UInt64Value_msg_init}, +const upb_MiniTable* envoy__extensions__load_0balancing_0policies__common__v3__LocalityLbConfig_msg_init_ptr = &envoy__extensions__load_0balancing_0policies__common__v3__LocalityLbConfig_msg_init; +static const upb_MiniTableSubInternal envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &envoy__type__v3__Percent_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt64Value_msg_init_ptr}, }; static const upb_MiniTableField envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig__fields[3] = { @@ -69,6 +72,7 @@ const upb_MiniTable envoy__extensions__load_0balancing_0policies__common__v3__Lo }) }; +const upb_MiniTable* envoy__extensions__load_0balancing_0policies__common__v3__LocalityLbConfig__ZoneAwareLbConfig_msg_init_ptr = &envoy__extensions__load_0balancing_0policies__common__v3__LocalityLbConfig__ZoneAwareLbConfig_msg_init; const upb_MiniTable envoy__extensions__load_0balancing_0policies__common__v3__LocalityLbConfig__LocalityWeightedLbConfig_msg_init = { NULL, NULL, @@ -78,10 +82,11 @@ const upb_MiniTable envoy__extensions__load_0balancing_0policies__common__v3__Lo #endif }; -static const upb_MiniTableSub envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig_submsgs[3] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__RuntimeDouble_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__type__v3__Percent_msg_init}, +const upb_MiniTable* envoy__extensions__load_0balancing_0policies__common__v3__LocalityLbConfig__LocalityWeightedLbConfig_msg_init_ptr = &envoy__extensions__load_0balancing_0policies__common__v3__LocalityLbConfig__LocalityWeightedLbConfig_msg_init; +static const upb_MiniTableSubInternal envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig_submsgs[3] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__RuntimeDouble_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__type__v3__Percent_msg_init_ptr}, }; static const upb_MiniTableField envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig__fields[3] = { @@ -99,8 +104,9 @@ const upb_MiniTable envoy__extensions__load_0balancing_0policies__common__v3__Sl #endif }; -static const upb_MiniTableSub envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init}, +const upb_MiniTable* envoy__extensions__load_0balancing_0policies__common__v3__SlowStartConfig_msg_init_ptr = &envoy__extensions__load_0balancing_0policies__common__v3__SlowStartConfig_msg_init; +static const upb_MiniTableSubInternal envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, }; static const upb_MiniTableField envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig__fields[2] = { @@ -121,6 +127,7 @@ const upb_MiniTable envoy__extensions__load_0balancing_0policies__common__v3__Co }) }; +const upb_MiniTable* envoy__extensions__load_0balancing_0policies__common__v3__ConsistentHashingLbConfig_msg_init_ptr = &envoy__extensions__load_0balancing_0policies__common__v3__ConsistentHashingLbConfig_msg_init; static const upb_MiniTable *messages_layout[5] = { &envoy__extensions__load_0balancing_0policies__common__v3__LocalityLbConfig_msg_init, &envoy__extensions__load_0balancing_0policies__common__v3__LocalityLbConfig__ZoneAwareLbConfig_msg_init, diff --git a/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/common/v3/common.upb_minitable.h b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/common/v3/common.upb_minitable.h index 844a1aa8094..4625747e38b 100644 --- a/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/common/v3/common.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/common/v3/common.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/extensions/load_balancing_policies/common/v3/common.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_COMMON_V3_COMMON_PROTO_UPB_MINITABLE_H_ #define ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_COMMON_V3_COMMON_PROTO_UPB_MINITABLE_H_ @@ -18,10 +19,15 @@ extern "C" { #endif extern const upb_MiniTable envoy__extensions__load_0balancing_0policies__common__v3__LocalityLbConfig_msg_init; +extern const upb_MiniTable* envoy__extensions__load_0balancing_0policies__common__v3__LocalityLbConfig_msg_init_ptr; extern const upb_MiniTable envoy__extensions__load_0balancing_0policies__common__v3__LocalityLbConfig__ZoneAwareLbConfig_msg_init; +extern const upb_MiniTable* envoy__extensions__load_0balancing_0policies__common__v3__LocalityLbConfig__ZoneAwareLbConfig_msg_init_ptr; extern const upb_MiniTable envoy__extensions__load_0balancing_0policies__common__v3__LocalityLbConfig__LocalityWeightedLbConfig_msg_init; +extern const upb_MiniTable* envoy__extensions__load_0balancing_0policies__common__v3__LocalityLbConfig__LocalityWeightedLbConfig_msg_init_ptr; extern const upb_MiniTable envoy__extensions__load_0balancing_0policies__common__v3__SlowStartConfig_msg_init; +extern const upb_MiniTable* envoy__extensions__load_0balancing_0policies__common__v3__SlowStartConfig_msg_init_ptr; extern const upb_MiniTable envoy__extensions__load_0balancing_0policies__common__v3__ConsistentHashingLbConfig_msg_init; +extern const upb_MiniTable* envoy__extensions__load_0balancing_0policies__common__v3__ConsistentHashingLbConfig_msg_init_ptr; extern const upb_MiniTableFile envoy_extensions_load_balancing_policies_common_v3_common_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb.h b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb.h index f8872c80248..74da76be89b 100644 --- a/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb.h +++ b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb.h @@ -3,7 +3,8 @@ * envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_PICK_FIRST_V3_PICK_FIRST_PROTO_UPB_H_ #define ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_PICK_FIRST_V3_PICK_FIRST_PROTO_UPB_H_ diff --git a/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb_minitable.c b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb_minitable.c index d9d62595cb7..9a3db08f860 100644 --- a/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -13,6 +14,7 @@ // Must be last. #include "upb/port/def.inc" +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); static const upb_MiniTableField envoy_extensions_load_balancing_policies_pick_first_v3_PickFirst__fields[1] = { {1, 8, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, }; @@ -30,6 +32,7 @@ const upb_MiniTable envoy__extensions__load_0balancing_0policies__pick_0first__v }) }; +const upb_MiniTable* envoy__extensions__load_0balancing_0policies__pick_0first__v3__PickFirst_msg_init_ptr = &envoy__extensions__load_0balancing_0policies__pick_0first__v3__PickFirst_msg_init; static const upb_MiniTable *messages_layout[1] = { &envoy__extensions__load_0balancing_0policies__pick_0first__v3__PickFirst_msg_init, }; diff --git a/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb_minitable.h b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb_minitable.h index 8e91a419f4f..c3af38b4a9d 100644 --- a/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_PICK_FIRST_V3_PICK_FIRST_PROTO_UPB_MINITABLE_H_ #define ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_PICK_FIRST_V3_PICK_FIRST_PROTO_UPB_MINITABLE_H_ @@ -18,6 +19,7 @@ extern "C" { #endif extern const upb_MiniTable envoy__extensions__load_0balancing_0policies__pick_0first__v3__PickFirst_msg_init; +extern const upb_MiniTable* envoy__extensions__load_0balancing_0policies__pick_0first__v3__PickFirst_msg_init_ptr; extern const upb_MiniTableFile envoy_extensions_load_balancing_policies_pick_first_v3_pick_first_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb.h b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb.h index 622dc30b503..2ce386991b7 100644 --- a/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb.h +++ b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb.h @@ -3,7 +3,8 @@ * envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_RING_HASH_V3_RING_HASH_PROTO_UPB_H_ #define ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_RING_HASH_V3_RING_HASH_PROTO_UPB_H_ @@ -95,6 +96,7 @@ UPB_INLINE const struct google_protobuf_UInt64Value* envoy_extensions_load_balan const struct google_protobuf_UInt64Value* default_val = NULL; const struct google_protobuf_UInt64Value* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt64Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -111,6 +113,7 @@ UPB_INLINE const struct google_protobuf_UInt64Value* envoy_extensions_load_balan const struct google_protobuf_UInt64Value* default_val = NULL; const struct google_protobuf_UInt64Value* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt64Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -139,6 +142,7 @@ UPB_INLINE const struct google_protobuf_UInt32Value* envoy_extensions_load_balan const struct google_protobuf_UInt32Value* default_val = NULL; const struct google_protobuf_UInt32Value* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -155,6 +159,7 @@ UPB_INLINE const struct envoy_extensions_load_balancing_policies_common_v3_Consi const struct envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig* default_val = NULL; const struct envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__load_0balancing_0policies__common__v3__ConsistentHashingLbConfig_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -171,6 +176,7 @@ UPB_INLINE const struct envoy_extensions_load_balancing_policies_common_v3_Local const struct envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_LocalityWeightedLbConfig* default_val = NULL; const struct envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_LocalityWeightedLbConfig* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__load_0balancing_0policies__common__v3__LocalityLbConfig__LocalityWeightedLbConfig_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -186,6 +192,7 @@ UPB_INLINE void envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash_s } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt64Value_msg_init); 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) { @@ -198,6 +205,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt64Value_msg_init); 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) { @@ -214,6 +222,7 @@ UPB_INLINE void envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash_s } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); 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) { @@ -226,6 +235,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__load_0balancing_0policies__common__v3__ConsistentHashingLbConfig_msg_init); 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) { @@ -238,6 +248,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__load_0balancing_0policies__common__v3__LocalityLbConfig__LocalityWeightedLbConfig_msg_init); 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) { diff --git a/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb_minitable.c b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb_minitable.c index 2685586b5f0..c9e4ef66317 100644 --- a/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -17,12 +18,13 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash_submsgs[5] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__UInt64Value_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__UInt64Value_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__extensions__load_0balancing_0policies__common__v3__ConsistentHashingLbConfig_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__extensions__load_0balancing_0policies__common__v3__LocalityLbConfig__LocalityWeightedLbConfig_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash_submsgs[5] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt64Value_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt64Value_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__extensions__load_0balancing_0policies__common__v3__ConsistentHashingLbConfig_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__extensions__load_0balancing_0policies__common__v3__LocalityLbConfig__LocalityWeightedLbConfig_msg_init_ptr}, }; static const upb_MiniTableField envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash__fields[7] = { @@ -54,6 +56,7 @@ const upb_MiniTable envoy__extensions__load_0balancing_0policies__ring_0hash__v3 }) }; +const upb_MiniTable* envoy__extensions__load_0balancing_0policies__ring_0hash__v3__RingHash_msg_init_ptr = &envoy__extensions__load_0balancing_0policies__ring_0hash__v3__RingHash_msg_init; static const upb_MiniTable *messages_layout[1] = { &envoy__extensions__load_0balancing_0policies__ring_0hash__v3__RingHash_msg_init, }; diff --git a/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb_minitable.h b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb_minitable.h index 5cca88629df..b900eeddecd 100644 --- a/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_RING_HASH_V3_RING_HASH_PROTO_UPB_MINITABLE_H_ #define ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_RING_HASH_V3_RING_HASH_PROTO_UPB_MINITABLE_H_ @@ -18,6 +19,7 @@ extern "C" { #endif extern const upb_MiniTable envoy__extensions__load_0balancing_0policies__ring_0hash__v3__RingHash_msg_init; +extern const upb_MiniTable* envoy__extensions__load_0balancing_0policies__ring_0hash__v3__RingHash_msg_init_ptr; extern const upb_MiniTableFile envoy_extensions_load_balancing_policies_ring_hash_v3_ring_hash_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb.h b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb.h index 808b1368018..e765134f4d0 100644 --- a/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb.h +++ b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb.h @@ -3,7 +3,8 @@ * envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_WRR_LOCALITY_V3_WRR_LOCALITY_PROTO_UPB_H_ #define ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_WRR_LOCALITY_V3_WRR_LOCALITY_PROTO_UPB_H_ @@ -72,6 +73,7 @@ UPB_INLINE const struct envoy_config_cluster_v3_LoadBalancingPolicy* envoy_exten const struct envoy_config_cluster_v3_LoadBalancingPolicy* default_val = NULL; const struct envoy_config_cluster_v3_LoadBalancingPolicy* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__cluster__v3__LoadBalancingPolicy_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -83,6 +85,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__cluster__v3__LoadBalancingPolicy_msg_init); 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) { diff --git a/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb_minitable.c b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb_minitable.c index 249345c0989..48ded812324 100644 --- a/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -15,8 +16,9 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub envoy_extensions_load_balancing_policies_wrr_locality_v3_WrrLocality_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__config__cluster__v3__LoadBalancingPolicy_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal envoy_extensions_load_balancing_policies_wrr_locality_v3_WrrLocality_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__config__cluster__v3__LoadBalancingPolicy_msg_init_ptr}, }; static const upb_MiniTableField envoy_extensions_load_balancing_policies_wrr_locality_v3_WrrLocality__fields[1] = { @@ -32,6 +34,7 @@ const upb_MiniTable envoy__extensions__load_0balancing_0policies__wrr_0locality_ #endif }; +const upb_MiniTable* envoy__extensions__load_0balancing_0policies__wrr_0locality__v3__WrrLocality_msg_init_ptr = &envoy__extensions__load_0balancing_0policies__wrr_0locality__v3__WrrLocality_msg_init; static const upb_MiniTable *messages_layout[1] = { &envoy__extensions__load_0balancing_0policies__wrr_0locality__v3__WrrLocality_msg_init, }; diff --git a/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb_minitable.h b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb_minitable.h index dfb0608636a..b0e444089b0 100644 --- a/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_WRR_LOCALITY_V3_WRR_LOCALITY_PROTO_UPB_MINITABLE_H_ #define ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_WRR_LOCALITY_V3_WRR_LOCALITY_PROTO_UPB_MINITABLE_H_ @@ -18,6 +19,7 @@ extern "C" { #endif extern const upb_MiniTable envoy__extensions__load_0balancing_0policies__wrr_0locality__v3__WrrLocality_msg_init; +extern const upb_MiniTable* envoy__extensions__load_0balancing_0policies__wrr_0locality__v3__WrrLocality_msg_init_ptr; extern const upb_MiniTableFile envoy_extensions_load_balancing_policies_wrr_locality_v3_wrr_locality_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/cert.upb.h b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/cert.upb.h index 406cf0ff068..d4ddd65a370 100644 --- a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/cert.upb.h +++ b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/cert.upb.h @@ -3,7 +3,8 @@ * envoy/extensions/transport_sockets/tls/v3/cert.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_CERT_PROTO_UPB_H_ #define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_CERT_PROTO_UPB_H_ diff --git a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/cert.upb_minitable.c b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/cert.upb_minitable.c index 3d9870943ce..53c75c6679a 100644 --- a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/cert.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/cert.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/extensions/transport_sockets/tls/v3/cert.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -15,6 +16,7 @@ // Must be last. #include "upb/port/def.inc" +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); const upb_MiniTableFile envoy_extensions_transport_sockets_tls_v3_cert_proto_upb_file_layout = { NULL, NULL, diff --git a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/cert.upb_minitable.h b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/cert.upb_minitable.h index 60fbbc8e2db..1a0c8be676e 100644 --- a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/cert.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/cert.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/extensions/transport_sockets/tls/v3/cert.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_CERT_PROTO_UPB_MINITABLE_H_ #define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_CERT_PROTO_UPB_MINITABLE_H_ diff --git a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/common.upb.h b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/common.upb.h index 5949405a957..a90abb9e57d 100644 --- a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/common.upb.h +++ b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/common.upb.h @@ -3,7 +3,8 @@ * envoy/extensions/transport_sockets/tls/v3/common.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_COMMON_PROTO_UPB_H_ #define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_COMMON_PROTO_UPB_H_ @@ -386,6 +387,7 @@ UPB_INLINE const struct google_protobuf_Any* envoy_extensions_transport_sockets_ const struct google_protobuf_Any* default_val = NULL; const struct google_protobuf_Any* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -413,6 +415,7 @@ UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider_set } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); 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) { @@ -472,6 +475,7 @@ UPB_INLINE const struct envoy_config_core_v3_DataSource* envoy_extensions_transp const struct envoy_config_core_v3_DataSource* default_val = NULL; const struct envoy_config_core_v3_DataSource* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__DataSource_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -488,6 +492,7 @@ UPB_INLINE const struct envoy_config_core_v3_DataSource* envoy_extensions_transp const struct envoy_config_core_v3_DataSource* default_val = NULL; const struct envoy_config_core_v3_DataSource* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__DataSource_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -504,6 +509,7 @@ UPB_INLINE const struct envoy_config_core_v3_DataSource* envoy_extensions_transp const struct envoy_config_core_v3_DataSource* default_val = NULL; const struct envoy_config_core_v3_DataSource* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__DataSource_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -520,6 +526,7 @@ UPB_INLINE const struct envoy_config_core_v3_DataSource* envoy_extensions_transp const struct envoy_config_core_v3_DataSource* default_val = NULL; const struct envoy_config_core_v3_DataSource* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__DataSource_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -534,6 +541,7 @@ UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_TlsCertificate_clear_s } UPB_INLINE const struct envoy_config_core_v3_DataSource* const* envoy_extensions_transport_sockets_tls_v3_TlsCertificate_signed_certificate_timestamp(const envoy_extensions_transport_sockets_tls_v3_TlsCertificate* msg, size_t* size) { const upb_MiniTableField field = {5, UPB_SIZE(28, 48), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__DataSource_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -545,6 +553,7 @@ UPB_INLINE const struct envoy_config_core_v3_DataSource* const* envoy_extensions } UPB_INLINE const upb_Array* _envoy_extensions_transport_sockets_tls_v3_TlsCertificate_signed_certificate_timestamp_upb_array(const envoy_extensions_transport_sockets_tls_v3_TlsCertificate* msg, size_t* size) { const upb_MiniTableField field = {5, UPB_SIZE(28, 48), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__DataSource_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -553,6 +562,7 @@ UPB_INLINE const upb_Array* _envoy_extensions_transport_sockets_tls_v3_TlsCertif } UPB_INLINE upb_Array* _envoy_extensions_transport_sockets_tls_v3_TlsCertificate_signed_certificate_timestamp_mutable_upb_array(envoy_extensions_transport_sockets_tls_v3_TlsCertificate* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {5, UPB_SIZE(28, 48), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__DataSource_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -568,6 +578,7 @@ UPB_INLINE const envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider* e const envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider* default_val = NULL; const envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__transport_0sockets__tls__v3__PrivateKeyProvider_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -584,6 +595,7 @@ UPB_INLINE const struct envoy_config_core_v3_WatchedDirectory* envoy_extensions_ const struct envoy_config_core_v3_WatchedDirectory* default_val = NULL; const struct envoy_config_core_v3_WatchedDirectory* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__WatchedDirectory_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -600,6 +612,7 @@ UPB_INLINE const struct envoy_config_core_v3_DataSource* envoy_extensions_transp const struct envoy_config_core_v3_DataSource* default_val = NULL; const struct envoy_config_core_v3_DataSource* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__DataSource_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -611,6 +624,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__DataSource_msg_init); 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) { @@ -623,6 +637,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__DataSource_msg_init); 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) { @@ -635,6 +650,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__DataSource_msg_init); 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) { @@ -647,6 +663,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__DataSource_msg_init); 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) { @@ -659,6 +676,7 @@ UPB_INLINE struct envoy_config_core_v3_DataSource* envoy_extensions_transport_so } UPB_INLINE struct envoy_config_core_v3_DataSource** envoy_extensions_transport_sockets_tls_v3_TlsCertificate_mutable_signed_certificate_timestamp(envoy_extensions_transport_sockets_tls_v3_TlsCertificate* msg, size_t* size) { upb_MiniTableField field = {5, UPB_SIZE(28, 48), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__DataSource_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -675,6 +693,7 @@ UPB_INLINE struct envoy_config_core_v3_DataSource** envoy_extensions_transport_s } UPB_INLINE struct envoy_config_core_v3_DataSource* envoy_extensions_transport_sockets_tls_v3_TlsCertificate_add_signed_certificate_timestamp(envoy_extensions_transport_sockets_tls_v3_TlsCertificate* msg, upb_Arena* arena) { upb_MiniTableField field = {5, UPB_SIZE(28, 48), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__DataSource_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -689,6 +708,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__transport_0sockets__tls__v3__PrivateKeyProvider_msg_init); 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) { @@ -701,6 +721,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__WatchedDirectory_msg_init); 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) { @@ -713,6 +734,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__DataSource_msg_init); 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) { @@ -766,6 +788,7 @@ UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys_c } UPB_INLINE const struct envoy_config_core_v3_DataSource* const* envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys_keys(const envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__DataSource_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -777,6 +800,7 @@ UPB_INLINE const struct envoy_config_core_v3_DataSource* const* envoy_extensions } UPB_INLINE const upb_Array* _envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys_keys_upb_array(const envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__DataSource_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -785,6 +809,7 @@ UPB_INLINE const upb_Array* _envoy_extensions_transport_sockets_tls_v3_TlsSessio } UPB_INLINE upb_Array* _envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys_keys_mutable_upb_array(envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__DataSource_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -795,6 +820,7 @@ UPB_INLINE upb_Array* _envoy_extensions_transport_sockets_tls_v3_TlsSessionTicke UPB_INLINE struct envoy_config_core_v3_DataSource** envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys_mutable_keys(envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__DataSource_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -811,6 +837,7 @@ UPB_INLINE struct envoy_config_core_v3_DataSource** envoy_extensions_transport_s } UPB_INLINE struct envoy_config_core_v3_DataSource* envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys_add_keys(envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys* msg, upb_Arena* arena) { upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__DataSource_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -950,6 +977,7 @@ UPB_INLINE const struct envoy_type_matcher_v3_StringMatcher* envoy_extensions_tr const struct envoy_type_matcher_v3_StringMatcher* default_val = NULL; const struct envoy_type_matcher_v3_StringMatcher* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__StringMatcher_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -977,6 +1005,7 @@ UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher_ } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__StringMatcher_msg_init); 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) { @@ -1036,6 +1065,7 @@ UPB_INLINE const struct envoy_config_core_v3_DataSource* envoy_extensions_transp const struct envoy_config_core_v3_DataSource* default_val = NULL; const struct envoy_config_core_v3_DataSource* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__DataSource_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1116,6 +1146,7 @@ UPB_INLINE const struct google_protobuf_BoolValue* envoy_extensions_transport_so const struct google_protobuf_BoolValue* default_val = NULL; const struct google_protobuf_BoolValue* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1132,6 +1163,7 @@ UPB_INLINE const struct envoy_config_core_v3_DataSource* envoy_extensions_transp const struct envoy_config_core_v3_DataSource* default_val = NULL; const struct envoy_config_core_v3_DataSource* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__DataSource_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1158,6 +1190,7 @@ UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CertificateValidationC } UPB_INLINE const struct envoy_type_matcher_v3_StringMatcher* const* envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_match_subject_alt_names(const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__StringMatcher_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1169,6 +1202,7 @@ UPB_INLINE const struct envoy_type_matcher_v3_StringMatcher* const* envoy_extens } UPB_INLINE const upb_Array* _envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_match_subject_alt_names_upb_array(const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__StringMatcher_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -1177,6 +1211,7 @@ UPB_INLINE const upb_Array* _envoy_extensions_transport_sockets_tls_v3_Certifica } UPB_INLINE upb_Array* _envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_match_subject_alt_names_mutable_upb_array(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg, size_t* size, upb_Arena* arena) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__StringMatcher_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -1204,6 +1239,7 @@ UPB_INLINE const struct envoy_config_core_v3_WatchedDirectory* envoy_extensions_ const struct envoy_config_core_v3_WatchedDirectory* default_val = NULL; const struct envoy_config_core_v3_WatchedDirectory* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__WatchedDirectory_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1220,6 +1256,7 @@ UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* envoy_extensi const struct envoy_config_core_v3_TypedExtensionConfig* default_val = NULL; const struct envoy_config_core_v3_TypedExtensionConfig* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1236,6 +1273,7 @@ UPB_INLINE const envoy_extensions_transport_sockets_tls_v3_CertificateProviderPl const envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance* default_val = NULL; const envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__transport_0sockets__tls__v3__CertificateProviderPluginInstance_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1262,6 +1300,7 @@ UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CertificateValidationC } UPB_INLINE const envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher* const* envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_match_typed_subject_alt_names(const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__transport_0sockets__tls__v3__SubjectAltNameMatcher_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1273,6 +1312,7 @@ UPB_INLINE const envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher } UPB_INLINE const upb_Array* _envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_match_typed_subject_alt_names_upb_array(const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__transport_0sockets__tls__v3__SubjectAltNameMatcher_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -1281,6 +1321,7 @@ UPB_INLINE const upb_Array* _envoy_extensions_transport_sockets_tls_v3_Certifica } UPB_INLINE upb_Array* _envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_match_typed_subject_alt_names_mutable_upb_array(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg, size_t* size, upb_Arena* arena) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__transport_0sockets__tls__v3__SubjectAltNameMatcher_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -1296,6 +1337,7 @@ UPB_INLINE const struct google_protobuf_UInt32Value* envoy_extensions_transport_ const struct google_protobuf_UInt32Value* default_val = NULL; const struct google_protobuf_UInt32Value* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1312,6 +1354,7 @@ UPB_INLINE const envoy_extensions_transport_sockets_tls_v3_CertificateValidation 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__transport_0sockets__tls__v3__CertificateValidationContext__SystemRootCerts_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1323,6 +1366,7 @@ UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_CertificateValidationC 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__DataSource_msg_init); 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) { @@ -1391,6 +1435,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); 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) { @@ -1403,6 +1448,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__DataSource_msg_init); 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) { @@ -1419,6 +1465,7 @@ UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CertificateValidationC } 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__StringMatcher_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1435,6 +1482,7 @@ UPB_INLINE struct envoy_type_matcher_v3_StringMatcher** envoy_extensions_transpo } UPB_INLINE struct envoy_type_matcher_v3_StringMatcher* envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_add_match_subject_alt_names(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg, upb_Arena* arena) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__StringMatcher_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -1453,6 +1501,7 @@ UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CertificateValidationC } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__WatchedDirectory_msg_init); 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) { @@ -1465,6 +1514,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); 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) { @@ -1477,6 +1527,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__transport_0sockets__tls__v3__CertificateProviderPluginInstance_msg_init); 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) { @@ -1493,6 +1544,7 @@ UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CertificateValidationC } 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__transport_0sockets__tls__v3__SubjectAltNameMatcher_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1509,6 +1561,7 @@ UPB_INLINE envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher** env } UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher* envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_add_match_typed_subject_alt_names(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg, upb_Arena* arena) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__transport_0sockets__tls__v3__SubjectAltNameMatcher_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -1523,6 +1576,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); 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) { @@ -1535,6 +1589,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_extensions_transport_socket } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__transport_0sockets__tls__v3__CertificateValidationContext__SystemRootCerts_msg_init); 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) { diff --git a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/common.upb_minitable.c b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/common.upb_minitable.c index 53b28a2136f..a5b3b63750a 100644 --- a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/common.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/common.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/extensions/transport_sockets/tls/v3/common.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -23,6 +24,7 @@ // Must be last. #include "upb/port/def.inc" +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); static const upb_MiniTableField envoy_extensions_transport_sockets_tls_v3_TlsParameters__fields[5] = { {1, 8, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, {2, 12, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, @@ -50,8 +52,9 @@ const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__TlsParameter }) }; -static const upb_MiniTableSub envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init}, +const upb_MiniTable* envoy__extensions__transport_0sockets__tls__v3__TlsParameters_msg_init_ptr = &envoy__extensions__transport_0sockets__tls__v3__TlsParameters_msg_init; +static const upb_MiniTableSubInternal envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, }; static const upb_MiniTableField envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider__fields[3] = { @@ -79,15 +82,16 @@ const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__PrivateKeyPr }) }; -static const upb_MiniTableSub envoy_extensions_transport_sockets_tls_v3_TlsCertificate_submsgs[8] = { - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__DataSource_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__DataSource_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__DataSource_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__DataSource_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__DataSource_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__extensions__transport_0sockets__tls__v3__PrivateKeyProvider_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__WatchedDirectory_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__DataSource_msg_init}, +const upb_MiniTable* envoy__extensions__transport_0sockets__tls__v3__PrivateKeyProvider_msg_init_ptr = &envoy__extensions__transport_0sockets__tls__v3__PrivateKeyProvider_msg_init; +static const upb_MiniTableSubInternal envoy_extensions_transport_sockets_tls_v3_TlsCertificate_submsgs[8] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__DataSource_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__DataSource_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__DataSource_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__DataSource_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__DataSource_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__extensions__transport_0sockets__tls__v3__PrivateKeyProvider_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__WatchedDirectory_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__DataSource_msg_init_ptr}, }; static const upb_MiniTableField envoy_extensions_transport_sockets_tls_v3_TlsCertificate__fields[8] = { @@ -120,8 +124,9 @@ const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__TlsCertifica }) }; -static const upb_MiniTableSub envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__DataSource_msg_init}, +const upb_MiniTable* envoy__extensions__transport_0sockets__tls__v3__TlsCertificate_msg_init_ptr = &envoy__extensions__transport_0sockets__tls__v3__TlsCertificate_msg_init; +static const upb_MiniTableSubInternal envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__DataSource_msg_init_ptr}, }; static const upb_MiniTableField envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys__fields[1] = { @@ -141,6 +146,7 @@ const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__TlsSessionTi }) }; +const upb_MiniTable* envoy__extensions__transport_0sockets__tls__v3__TlsSessionTicketKeys_msg_init_ptr = &envoy__extensions__transport_0sockets__tls__v3__TlsSessionTicketKeys_msg_init; static const upb_MiniTableField envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance__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)}, @@ -161,8 +167,9 @@ const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__CertificateP }) }; -static const upb_MiniTableSub envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__StringMatcher_msg_init}, +const upb_MiniTable* envoy__extensions__transport_0sockets__tls__v3__CertificateProviderPluginInstance_msg_init_ptr = &envoy__extensions__transport_0sockets__tls__v3__CertificateProviderPluginInstance_msg_init; +static const upb_MiniTableSubInternal envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__StringMatcher_msg_init_ptr}, }; static const upb_MiniTableField envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher__fields[3] = { @@ -186,17 +193,18 @@ const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__SubjectAltNa }) }; -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}, - {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__StringMatcher_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__WatchedDirectory_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init}, - {.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}, +const upb_MiniTable* envoy__extensions__transport_0sockets__tls__v3__SubjectAltNameMatcher_msg_init_ptr = &envoy__extensions__transport_0sockets__tls__v3__SubjectAltNameMatcher_msg_init; +static const upb_MiniTableSubInternal envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_submsgs[10] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__DataSource_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__DataSource_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__StringMatcher_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__WatchedDirectory_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__extensions__transport_0sockets__tls__v3__CertificateProviderPluginInstance_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__extensions__transport_0sockets__tls__v3__SubjectAltNameMatcher_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__extensions__transport_0sockets__tls__v3__CertificateValidationContext__SystemRootCerts_msg_init_ptr}, }; static const upb_MiniTableField envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext__fields[15] = { @@ -244,6 +252,7 @@ const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__CertificateV }) }; +const upb_MiniTable* envoy__extensions__transport_0sockets__tls__v3__CertificateValidationContext_msg_init_ptr = &envoy__extensions__transport_0sockets__tls__v3__CertificateValidationContext_msg_init; const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__CertificateValidationContext__SystemRootCerts_msg_init = { NULL, NULL, @@ -253,6 +262,7 @@ const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__CertificateV #endif }; +const upb_MiniTable* envoy__extensions__transport_0sockets__tls__v3__CertificateValidationContext__SystemRootCerts_msg_init_ptr = &envoy__extensions__transport_0sockets__tls__v3__CertificateValidationContext__SystemRootCerts_msg_init; 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, diff --git a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/common.upb_minitable.h b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/common.upb_minitable.h index 233709125b5..fe8e9410692 100644 --- a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/common.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/common.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/extensions/transport_sockets/tls/v3/common.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_COMMON_PROTO_UPB_MINITABLE_H_ #define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_COMMON_PROTO_UPB_MINITABLE_H_ @@ -18,13 +19,21 @@ extern "C" { #endif extern const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__TlsParameters_msg_init; +extern const upb_MiniTable* envoy__extensions__transport_0sockets__tls__v3__TlsParameters_msg_init_ptr; extern const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__PrivateKeyProvider_msg_init; +extern const upb_MiniTable* envoy__extensions__transport_0sockets__tls__v3__PrivateKeyProvider_msg_init_ptr; extern const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__TlsCertificate_msg_init; +extern const upb_MiniTable* envoy__extensions__transport_0sockets__tls__v3__TlsCertificate_msg_init_ptr; extern const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__TlsSessionTicketKeys_msg_init; +extern const upb_MiniTable* envoy__extensions__transport_0sockets__tls__v3__TlsSessionTicketKeys_msg_init_ptr; extern const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__CertificateProviderPluginInstance_msg_init; +extern const upb_MiniTable* envoy__extensions__transport_0sockets__tls__v3__CertificateProviderPluginInstance_msg_init_ptr; extern const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__SubjectAltNameMatcher_msg_init; +extern const upb_MiniTable* envoy__extensions__transport_0sockets__tls__v3__SubjectAltNameMatcher_msg_init_ptr; extern const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__CertificateValidationContext_msg_init; +extern const upb_MiniTable* envoy__extensions__transport_0sockets__tls__v3__CertificateValidationContext_msg_init_ptr; extern const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__CertificateValidationContext__SystemRootCerts_msg_init; +extern const upb_MiniTable* envoy__extensions__transport_0sockets__tls__v3__CertificateValidationContext__SystemRootCerts_msg_init_ptr; extern const upb_MiniTableFile envoy_extensions_transport_sockets_tls_v3_common_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/secret.upb.h b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/secret.upb.h index ba918559763..652e2367dd9 100644 --- a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/secret.upb.h +++ b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/secret.upb.h @@ -3,7 +3,8 @@ * envoy/extensions/transport_sockets/tls/v3/secret.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_SECRET_PROTO_UPB_H_ #define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_SECRET_PROTO_UPB_H_ @@ -82,6 +83,7 @@ UPB_INLINE const struct envoy_config_core_v3_DataSource* envoy_extensions_transp const struct envoy_config_core_v3_DataSource* default_val = NULL; const struct envoy_config_core_v3_DataSource* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__DataSource_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -93,6 +95,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__DataSource_msg_init); 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) { @@ -160,6 +163,7 @@ UPB_INLINE const struct envoy_config_core_v3_ConfigSource* envoy_extensions_tran const struct envoy_config_core_v3_ConfigSource* default_val = NULL; const struct envoy_config_core_v3_ConfigSource* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__ConfigSource_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -175,6 +179,7 @@ UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig_set_na } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__ConfigSource_msg_init); 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) { @@ -254,6 +259,7 @@ UPB_INLINE const struct envoy_extensions_transport_sockets_tls_v3_TlsCertificate const struct envoy_extensions_transport_sockets_tls_v3_TlsCertificate* default_val = NULL; const struct envoy_extensions_transport_sockets_tls_v3_TlsCertificate* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__transport_0sockets__tls__v3__TlsCertificate_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -270,6 +276,7 @@ UPB_INLINE const struct envoy_extensions_transport_sockets_tls_v3_TlsSessionTick const struct envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys* default_val = NULL; const struct envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__transport_0sockets__tls__v3__TlsSessionTicketKeys_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -286,6 +293,7 @@ UPB_INLINE const struct envoy_extensions_transport_sockets_tls_v3_CertificateVal const struct envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* default_val = NULL; const struct envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__transport_0sockets__tls__v3__CertificateValidationContext_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -302,6 +310,7 @@ UPB_INLINE const envoy_extensions_transport_sockets_tls_v3_GenericSecret* envoy_ const envoy_extensions_transport_sockets_tls_v3_GenericSecret* default_val = NULL; const envoy_extensions_transport_sockets_tls_v3_GenericSecret* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__transport_0sockets__tls__v3__GenericSecret_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -317,6 +326,7 @@ UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_Secret_set_name(envoy_ } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__transport_0sockets__tls__v3__TlsCertificate_msg_init); 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) { @@ -329,6 +339,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__transport_0sockets__tls__v3__TlsSessionTicketKeys_msg_init); 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) { @@ -341,6 +352,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__transport_0sockets__tls__v3__CertificateValidationContext_msg_init); 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) { @@ -353,6 +365,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__transport_0sockets__tls__v3__GenericSecret_msg_init); 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) { diff --git a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/secret.upb_minitable.c b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/secret.upb_minitable.c index 8f168e1c3ef..5e6cbde9c88 100644 --- a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/secret.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/secret.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/extensions/transport_sockets/tls/v3/secret.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -19,8 +20,9 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub envoy_extensions_transport_sockets_tls_v3_GenericSecret_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__DataSource_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal envoy_extensions_transport_sockets_tls_v3_GenericSecret_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__DataSource_msg_init_ptr}, }; static const upb_MiniTableField envoy_extensions_transport_sockets_tls_v3_GenericSecret__fields[1] = { @@ -36,8 +38,9 @@ const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__GenericSecre #endif }; -static const upb_MiniTableSub envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ConfigSource_msg_init}, +const upb_MiniTable* envoy__extensions__transport_0sockets__tls__v3__GenericSecret_msg_init_ptr = &envoy__extensions__transport_0sockets__tls__v3__GenericSecret_msg_init; +static const upb_MiniTableSubInternal envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ConfigSource_msg_init_ptr}, }; static const upb_MiniTableField envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig__fields[2] = { @@ -58,11 +61,12 @@ const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__SdsSecretCon }) }; -static const upb_MiniTableSub envoy_extensions_transport_sockets_tls_v3_Secret_submsgs[4] = { - {.UPB_PRIVATE(submsg) = &envoy__extensions__transport_0sockets__tls__v3__TlsCertificate_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__extensions__transport_0sockets__tls__v3__TlsSessionTicketKeys_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__extensions__transport_0sockets__tls__v3__CertificateValidationContext_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__extensions__transport_0sockets__tls__v3__GenericSecret_msg_init}, +const upb_MiniTable* envoy__extensions__transport_0sockets__tls__v3__SdsSecretConfig_msg_init_ptr = &envoy__extensions__transport_0sockets__tls__v3__SdsSecretConfig_msg_init; +static const upb_MiniTableSubInternal envoy_extensions_transport_sockets_tls_v3_Secret_submsgs[4] = { + {.UPB_PRIVATE(submsg) = &envoy__extensions__transport_0sockets__tls__v3__TlsCertificate_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__extensions__transport_0sockets__tls__v3__TlsSessionTicketKeys_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__extensions__transport_0sockets__tls__v3__CertificateValidationContext_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__extensions__transport_0sockets__tls__v3__GenericSecret_msg_init_ptr}, }; static const upb_MiniTableField envoy_extensions_transport_sockets_tls_v3_Secret__fields[5] = { @@ -92,6 +96,7 @@ const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__Secret_msg_i }) }; +const upb_MiniTable* envoy__extensions__transport_0sockets__tls__v3__Secret_msg_init_ptr = &envoy__extensions__transport_0sockets__tls__v3__Secret_msg_init; static const upb_MiniTable *messages_layout[3] = { &envoy__extensions__transport_0sockets__tls__v3__GenericSecret_msg_init, &envoy__extensions__transport_0sockets__tls__v3__SdsSecretConfig_msg_init, diff --git a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/secret.upb_minitable.h b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/secret.upb_minitable.h index 26b06398a2d..a7df95d18cb 100644 --- a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/secret.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/secret.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/extensions/transport_sockets/tls/v3/secret.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_SECRET_PROTO_UPB_MINITABLE_H_ #define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_SECRET_PROTO_UPB_MINITABLE_H_ @@ -18,8 +19,11 @@ extern "C" { #endif extern const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__GenericSecret_msg_init; +extern const upb_MiniTable* envoy__extensions__transport_0sockets__tls__v3__GenericSecret_msg_init_ptr; extern const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__SdsSecretConfig_msg_init; +extern const upb_MiniTable* envoy__extensions__transport_0sockets__tls__v3__SdsSecretConfig_msg_init_ptr; extern const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__Secret_msg_init; +extern const upb_MiniTable* envoy__extensions__transport_0sockets__tls__v3__Secret_msg_init_ptr; extern const upb_MiniTableFile envoy_extensions_transport_sockets_tls_v3_secret_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls.upb.h b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls.upb.h index 93287c34abd..0f23e4efb3d 100644 --- a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls.upb.h +++ b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls.upb.h @@ -3,7 +3,8 @@ * envoy/extensions/transport_sockets/tls/v3/tls.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_TLS_PROTO_UPB_H_ #define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_TLS_PROTO_UPB_H_ @@ -101,6 +102,7 @@ UPB_INLINE const envoy_extensions_transport_sockets_tls_v3_CommonTlsContext* env const envoy_extensions_transport_sockets_tls_v3_CommonTlsContext* default_val = NULL; const envoy_extensions_transport_sockets_tls_v3_CommonTlsContext* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -141,6 +143,7 @@ UPB_INLINE const struct google_protobuf_UInt32Value* envoy_extensions_transport_ const struct google_protobuf_UInt32Value* default_val = NULL; const struct google_protobuf_UInt32Value* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -157,6 +160,7 @@ UPB_INLINE const struct google_protobuf_BoolValue* envoy_extensions_transport_so const struct google_protobuf_BoolValue* default_val = NULL; const struct google_protobuf_BoolValue* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -168,6 +172,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext_msg_init); 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) { @@ -188,6 +193,7 @@ UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext_set } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); 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) { @@ -200,6 +206,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); 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) { @@ -266,6 +273,7 @@ UPB_INLINE const envoy_extensions_transport_sockets_tls_v3_CommonTlsContext* env const envoy_extensions_transport_sockets_tls_v3_CommonTlsContext* default_val = NULL; const envoy_extensions_transport_sockets_tls_v3_CommonTlsContext* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -282,6 +290,7 @@ UPB_INLINE const struct google_protobuf_BoolValue* envoy_extensions_transport_so const struct google_protobuf_BoolValue* default_val = NULL; const struct google_protobuf_BoolValue* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -298,6 +307,7 @@ UPB_INLINE const struct google_protobuf_BoolValue* envoy_extensions_transport_so const struct google_protobuf_BoolValue* default_val = NULL; const struct google_protobuf_BoolValue* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -314,6 +324,7 @@ UPB_INLINE const struct envoy_extensions_transport_sockets_tls_v3_TlsSessionTick const struct envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys* default_val = NULL; const struct envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__transport_0sockets__tls__v3__TlsSessionTicketKeys_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -330,6 +341,7 @@ UPB_INLINE const struct envoy_extensions_transport_sockets_tls_v3_SdsSecretConfi const struct envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig* default_val = NULL; const struct envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__transport_0sockets__tls__v3__SdsSecretConfig_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -346,6 +358,7 @@ UPB_INLINE const struct google_protobuf_Duration* envoy_extensions_transport_soc const struct google_protobuf_Duration* default_val = NULL; const struct google_protobuf_Duration* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -390,6 +403,7 @@ UPB_INLINE const struct google_protobuf_BoolValue* envoy_extensions_transport_so const struct google_protobuf_BoolValue* default_val = NULL; const struct google_protobuf_BoolValue* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -413,6 +427,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext_msg_init); 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) { @@ -425,6 +440,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); 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) { @@ -437,6 +453,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); 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) { @@ -449,6 +466,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__transport_0sockets__tls__v3__TlsSessionTicketKeys_msg_init); 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) { @@ -461,6 +479,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__transport_0sockets__tls__v3__SdsSecretConfig_msg_init); 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) { @@ -473,6 +492,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { @@ -493,6 +513,7 @@ UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_s } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__BoolValue_msg_init); 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) { @@ -562,6 +583,7 @@ UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_TlsKeyLog_clear_local_ } UPB_INLINE const struct envoy_config_core_v3_CidrRange* const* envoy_extensions_transport_sockets_tls_v3_TlsKeyLog_local_address_range(const envoy_extensions_transport_sockets_tls_v3_TlsKeyLog* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__CidrRange_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -573,6 +595,7 @@ UPB_INLINE const struct envoy_config_core_v3_CidrRange* const* envoy_extensions_ } UPB_INLINE const upb_Array* _envoy_extensions_transport_sockets_tls_v3_TlsKeyLog_local_address_range_upb_array(const envoy_extensions_transport_sockets_tls_v3_TlsKeyLog* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__CidrRange_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -581,6 +604,7 @@ UPB_INLINE const upb_Array* _envoy_extensions_transport_sockets_tls_v3_TlsKeyLog } UPB_INLINE upb_Array* _envoy_extensions_transport_sockets_tls_v3_TlsKeyLog_local_address_range_mutable_upb_array(envoy_extensions_transport_sockets_tls_v3_TlsKeyLog* msg, size_t* size, upb_Arena* arena) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__CidrRange_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -594,6 +618,7 @@ UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_TlsKeyLog_clear_remote } UPB_INLINE const struct envoy_config_core_v3_CidrRange* const* envoy_extensions_transport_sockets_tls_v3_TlsKeyLog_remote_address_range(const envoy_extensions_transport_sockets_tls_v3_TlsKeyLog* msg, size_t* size) { const upb_MiniTableField field = {3, UPB_SIZE(12, 32), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__CidrRange_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -605,6 +630,7 @@ UPB_INLINE const struct envoy_config_core_v3_CidrRange* const* envoy_extensions_ } UPB_INLINE const upb_Array* _envoy_extensions_transport_sockets_tls_v3_TlsKeyLog_remote_address_range_upb_array(const envoy_extensions_transport_sockets_tls_v3_TlsKeyLog* msg, size_t* size) { const upb_MiniTableField field = {3, UPB_SIZE(12, 32), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__CidrRange_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -613,6 +639,7 @@ UPB_INLINE const upb_Array* _envoy_extensions_transport_sockets_tls_v3_TlsKeyLog } UPB_INLINE upb_Array* _envoy_extensions_transport_sockets_tls_v3_TlsKeyLog_remote_address_range_mutable_upb_array(envoy_extensions_transport_sockets_tls_v3_TlsKeyLog* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {3, UPB_SIZE(12, 32), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__CidrRange_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -627,6 +654,7 @@ UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_TlsKeyLog_set_path(env } 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__CidrRange_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -643,6 +671,7 @@ UPB_INLINE struct envoy_config_core_v3_CidrRange** envoy_extensions_transport_so } UPB_INLINE struct envoy_config_core_v3_CidrRange* envoy_extensions_transport_sockets_tls_v3_TlsKeyLog_add_local_address_range(envoy_extensions_transport_sockets_tls_v3_TlsKeyLog* msg, upb_Arena* arena) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__CidrRange_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -657,6 +686,7 @@ UPB_INLINE struct envoy_config_core_v3_CidrRange* envoy_extensions_transport_soc } UPB_INLINE struct envoy_config_core_v3_CidrRange** envoy_extensions_transport_sockets_tls_v3_TlsKeyLog_mutable_remote_address_range(envoy_extensions_transport_sockets_tls_v3_TlsKeyLog* msg, size_t* size) { upb_MiniTableField field = {3, UPB_SIZE(12, 32), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__CidrRange_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -673,6 +703,7 @@ UPB_INLINE struct envoy_config_core_v3_CidrRange** envoy_extensions_transport_so } UPB_INLINE struct envoy_config_core_v3_CidrRange* envoy_extensions_transport_sockets_tls_v3_TlsKeyLog_add_remote_address_range(envoy_extensions_transport_sockets_tls_v3_TlsKeyLog* msg, upb_Arena* arena) { upb_MiniTableField field = {3, UPB_SIZE(12, 32), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__CidrRange_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -743,6 +774,7 @@ UPB_INLINE const struct envoy_extensions_transport_sockets_tls_v3_TlsParameters* const struct envoy_extensions_transport_sockets_tls_v3_TlsParameters* default_val = NULL; const struct envoy_extensions_transport_sockets_tls_v3_TlsParameters* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__transport_0sockets__tls__v3__TlsParameters_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -757,6 +789,7 @@ UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_clear } UPB_INLINE const struct envoy_extensions_transport_sockets_tls_v3_TlsCertificate* const* envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_tls_certificates(const envoy_extensions_transport_sockets_tls_v3_CommonTlsContext* msg, size_t* size) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__transport_0sockets__tls__v3__TlsCertificate_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -768,6 +801,7 @@ UPB_INLINE const struct envoy_extensions_transport_sockets_tls_v3_TlsCertificate } UPB_INLINE const upb_Array* _envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_tls_certificates_upb_array(const envoy_extensions_transport_sockets_tls_v3_CommonTlsContext* msg, size_t* size) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__transport_0sockets__tls__v3__TlsCertificate_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -776,6 +810,7 @@ UPB_INLINE const upb_Array* _envoy_extensions_transport_sockets_tls_v3_CommonTls } UPB_INLINE upb_Array* _envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_tls_certificates_mutable_upb_array(envoy_extensions_transport_sockets_tls_v3_CommonTlsContext* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__transport_0sockets__tls__v3__TlsCertificate_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -791,6 +826,7 @@ UPB_INLINE const struct envoy_extensions_transport_sockets_tls_v3_CertificateVal const struct envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* default_val = NULL; const struct envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__transport_0sockets__tls__v3__CertificateValidationContext_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -837,6 +873,7 @@ UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_clear } UPB_INLINE const struct envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig* const* envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_tls_certificate_sds_secret_configs(const envoy_extensions_transport_sockets_tls_v3_CommonTlsContext* msg, size_t* size) { const upb_MiniTableField field = {6, UPB_SIZE(24, 40), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__transport_0sockets__tls__v3__SdsSecretConfig_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -848,6 +885,7 @@ UPB_INLINE const struct envoy_extensions_transport_sockets_tls_v3_SdsSecretConfi } UPB_INLINE const upb_Array* _envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_tls_certificate_sds_secret_configs_upb_array(const envoy_extensions_transport_sockets_tls_v3_CommonTlsContext* msg, size_t* size) { const upb_MiniTableField field = {6, UPB_SIZE(24, 40), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__transport_0sockets__tls__v3__SdsSecretConfig_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -856,6 +894,7 @@ UPB_INLINE const upb_Array* _envoy_extensions_transport_sockets_tls_v3_CommonTls } UPB_INLINE upb_Array* _envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_tls_certificate_sds_secret_configs_mutable_upb_array(envoy_extensions_transport_sockets_tls_v3_CommonTlsContext* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {6, UPB_SIZE(24, 40), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__transport_0sockets__tls__v3__SdsSecretConfig_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -871,6 +910,7 @@ UPB_INLINE const struct envoy_extensions_transport_sockets_tls_v3_SdsSecretConfi const struct envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig* default_val = NULL; const struct envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__transport_0sockets__tls__v3__SdsSecretConfig_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -887,6 +927,7 @@ UPB_INLINE const envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_Comb const envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext* default_val = NULL; const envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext__CombinedCertificateValidationContext_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -903,6 +944,7 @@ UPB_INLINE const envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_Cert const envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider* default_val = NULL; const envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext__CertificateProvider_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -919,6 +961,7 @@ UPB_INLINE const envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_Cert const envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider* default_val = NULL; const envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext__CertificateProvider_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -935,6 +978,7 @@ UPB_INLINE const envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_Cert const envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance* default_val = NULL; const envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext__CertificateProviderInstance_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -951,6 +995,7 @@ UPB_INLINE const envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_Cert const envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance* default_val = NULL; const envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext__CertificateProviderInstance_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -967,6 +1012,7 @@ UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* envoy_extensi 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(40, 64), 67, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -983,6 +1029,7 @@ UPB_INLINE const struct envoy_extensions_transport_sockets_tls_v3_CertificatePro const struct envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance* default_val = NULL; const struct envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__transport_0sockets__tls__v3__CertificateProviderPluginInstance_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -999,6 +1046,7 @@ UPB_INLINE const envoy_extensions_transport_sockets_tls_v3_TlsKeyLog* envoy_exte const envoy_extensions_transport_sockets_tls_v3_TlsKeyLog* default_val = NULL; const envoy_extensions_transport_sockets_tls_v3_TlsKeyLog* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__transport_0sockets__tls__v3__TlsKeyLog_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1010,6 +1058,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__transport_0sockets__tls__v3__TlsParameters_msg_init); 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) { @@ -1022,6 +1071,7 @@ UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_TlsParameters* envoy } UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_TlsCertificate** envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_mutable_tls_certificates(envoy_extensions_transport_sockets_tls_v3_CommonTlsContext* msg, size_t* size) { upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__transport_0sockets__tls__v3__TlsCertificate_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1038,6 +1088,7 @@ UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_TlsCertificate** env } UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_TlsCertificate* envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_add_tls_certificates(envoy_extensions_transport_sockets_tls_v3_CommonTlsContext* msg, upb_Arena* arena) { upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__transport_0sockets__tls__v3__TlsCertificate_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -1052,6 +1103,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__transport_0sockets__tls__v3__CertificateValidationContext_msg_init); 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) { @@ -1092,6 +1144,7 @@ UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_add_a } UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig** envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_mutable_tls_certificate_sds_secret_configs(envoy_extensions_transport_sockets_tls_v3_CommonTlsContext* msg, size_t* size) { upb_MiniTableField field = {6, UPB_SIZE(24, 40), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__transport_0sockets__tls__v3__SdsSecretConfig_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1108,6 +1161,7 @@ UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig** en } UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig* envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_add_tls_certificate_sds_secret_configs(envoy_extensions_transport_sockets_tls_v3_CommonTlsContext* msg, upb_Arena* arena) { upb_MiniTableField field = {6, UPB_SIZE(24, 40), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__transport_0sockets__tls__v3__SdsSecretConfig_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -1122,6 +1176,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__transport_0sockets__tls__v3__SdsSecretConfig_msg_init); 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) { @@ -1134,6 +1189,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext__CombinedCertificateValidationContext_msg_init); 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) { @@ -1146,6 +1202,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext__CertificateProvider_msg_init); 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) { @@ -1158,6 +1215,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext__CertificateProvider_msg_init); 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) { @@ -1170,6 +1228,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext__CertificateProviderInstance_msg_init); 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) { @@ -1182,6 +1241,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext__CertificateProviderInstance_msg_init); 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) { @@ -1194,6 +1254,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); 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) { @@ -1206,6 +1267,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__transport_0sockets__tls__v3__CertificateProviderPluginInstance_msg_init); 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) { @@ -1218,6 +1280,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__transport_0sockets__tls__v3__TlsKeyLog_msg_init); 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) { @@ -1294,6 +1357,7 @@ UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* envoy_extensi const struct envoy_config_core_v3_TypedExtensionConfig* default_val = NULL; const struct envoy_config_core_v3_TypedExtensionConfig* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1309,6 +1373,7 @@ UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_Certi } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); 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) { @@ -1434,6 +1499,7 @@ UPB_INLINE const struct envoy_extensions_transport_sockets_tls_v3_CertificateVal const struct envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* default_val = NULL; const struct envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__transport_0sockets__tls__v3__CertificateValidationContext_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1450,6 +1516,7 @@ UPB_INLINE const struct envoy_extensions_transport_sockets_tls_v3_SdsSecretConfi const struct envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig* default_val = NULL; const struct envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__transport_0sockets__tls__v3__SdsSecretConfig_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1466,6 +1533,7 @@ UPB_INLINE const envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_Cert const envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider* default_val = NULL; const envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext__CertificateProvider_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1482,6 +1550,7 @@ UPB_INLINE const envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_Cert const envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance* default_val = NULL; const envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext__CertificateProviderInstance_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1493,6 +1562,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__transport_0sockets__tls__v3__CertificateValidationContext_msg_init); 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) { @@ -1505,6 +1575,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__transport_0sockets__tls__v3__SdsSecretConfig_msg_init); 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) { @@ -1517,6 +1588,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext__CertificateProvider_msg_init); 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) { @@ -1529,6 +1601,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext__CertificateProviderInstance_msg_init); 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) { diff --git a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls.upb_minitable.c b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls.upb_minitable.c index b8ff4989e6d..805e4f0658e 100644 --- a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/extensions/transport_sockets/tls/v3/tls.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -22,10 +23,11 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext_submsgs[3] = { - {.UPB_PRIVATE(submsg) = &envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext_submsgs[3] = { + {.UPB_PRIVATE(submsg) = &envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr}, }; static const upb_MiniTableField envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext__fields[5] = { @@ -51,14 +53,15 @@ const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__UpstreamTlsC }) }; -static const upb_MiniTableSub envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_submsgs[7] = { - {.UPB_PRIVATE(submsg) = &envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__extensions__transport_0sockets__tls__v3__TlsSessionTicketKeys_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__extensions__transport_0sockets__tls__v3__SdsSecretConfig_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init}, +const upb_MiniTable* envoy__extensions__transport_0sockets__tls__v3__UpstreamTlsContext_msg_init_ptr = &envoy__extensions__transport_0sockets__tls__v3__UpstreamTlsContext_msg_init; +static const upb_MiniTableSubInternal envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_submsgs[7] = { + {.UPB_PRIVATE(submsg) = &envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__extensions__transport_0sockets__tls__v3__TlsSessionTicketKeys_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__extensions__transport_0sockets__tls__v3__SdsSecretConfig_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr}, }; static const upb_MiniTableField envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext__fields[10] = { @@ -101,9 +104,10 @@ const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__DownstreamTl }) }; -static const upb_MiniTableSub envoy_extensions_transport_sockets_tls_v3_TlsKeyLog_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__CidrRange_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__CidrRange_msg_init}, +const upb_MiniTable* envoy__extensions__transport_0sockets__tls__v3__DownstreamTlsContext_msg_init_ptr = &envoy__extensions__transport_0sockets__tls__v3__DownstreamTlsContext_msg_init; +static const upb_MiniTableSubInternal envoy_extensions_transport_sockets_tls_v3_TlsKeyLog_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__CidrRange_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__CidrRange_msg_init_ptr}, }; static const upb_MiniTableField envoy_extensions_transport_sockets_tls_v3_TlsKeyLog__fields[3] = { @@ -127,20 +131,21 @@ const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__TlsKeyLog_ms }) }; -static const upb_MiniTableSub envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_submsgs[13] = { - {.UPB_PRIVATE(submsg) = &envoy__extensions__transport_0sockets__tls__v3__TlsParameters_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__extensions__transport_0sockets__tls__v3__TlsCertificate_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__extensions__transport_0sockets__tls__v3__CertificateValidationContext_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__extensions__transport_0sockets__tls__v3__SdsSecretConfig_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__extensions__transport_0sockets__tls__v3__SdsSecretConfig_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext__CombinedCertificateValidationContext_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext__CertificateProvider_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext__CertificateProvider_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext__CertificateProviderInstance_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext__CertificateProviderInstance_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__extensions__transport_0sockets__tls__v3__CertificateProviderPluginInstance_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__extensions__transport_0sockets__tls__v3__TlsKeyLog_msg_init}, +const upb_MiniTable* envoy__extensions__transport_0sockets__tls__v3__TlsKeyLog_msg_init_ptr = &envoy__extensions__transport_0sockets__tls__v3__TlsKeyLog_msg_init; +static const upb_MiniTableSubInternal envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_submsgs[13] = { + {.UPB_PRIVATE(submsg) = &envoy__extensions__transport_0sockets__tls__v3__TlsParameters_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__extensions__transport_0sockets__tls__v3__TlsCertificate_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__extensions__transport_0sockets__tls__v3__CertificateValidationContext_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__extensions__transport_0sockets__tls__v3__SdsSecretConfig_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__extensions__transport_0sockets__tls__v3__SdsSecretConfig_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext__CombinedCertificateValidationContext_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext__CertificateProvider_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext__CertificateProvider_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext__CertificateProviderInstance_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext__CertificateProviderInstance_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__extensions__transport_0sockets__tls__v3__CertificateProviderPluginInstance_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__extensions__transport_0sockets__tls__v3__TlsKeyLog_msg_init_ptr}, }; static const upb_MiniTableField envoy_extensions_transport_sockets_tls_v3_CommonTlsContext__fields[14] = { @@ -187,8 +192,9 @@ const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__CommonTlsCon }) }; -static const upb_MiniTableSub envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init}, +const upb_MiniTable* envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext_msg_init_ptr = &envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext_msg_init; +static const upb_MiniTableSubInternal envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init_ptr}, }; static const upb_MiniTableField envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider__fields[2] = { @@ -211,6 +217,7 @@ const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__CommonTlsCon }) }; +const upb_MiniTable* envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext__CertificateProvider_msg_init_ptr = &envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext__CertificateProvider_msg_init; static const upb_MiniTableField envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance__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)}, @@ -231,11 +238,12 @@ const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__CommonTlsCon }) }; -static const upb_MiniTableSub envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext_submsgs[4] = { - {.UPB_PRIVATE(submsg) = &envoy__extensions__transport_0sockets__tls__v3__CertificateValidationContext_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__extensions__transport_0sockets__tls__v3__SdsSecretConfig_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext__CertificateProvider_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext__CertificateProviderInstance_msg_init}, +const upb_MiniTable* envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext__CertificateProviderInstance_msg_init_ptr = &envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext__CertificateProviderInstance_msg_init; +static const upb_MiniTableSubInternal envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext_submsgs[4] = { + {.UPB_PRIVATE(submsg) = &envoy__extensions__transport_0sockets__tls__v3__CertificateValidationContext_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__extensions__transport_0sockets__tls__v3__SdsSecretConfig_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext__CertificateProvider_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext__CertificateProviderInstance_msg_init_ptr}, }; static const upb_MiniTableField envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext__fields[4] = { @@ -254,6 +262,7 @@ const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__CommonTlsCon #endif }; +const upb_MiniTable* envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext__CombinedCertificateValidationContext_msg_init_ptr = &envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext__CombinedCertificateValidationContext_msg_init; static const upb_MiniTable *messages_layout[7] = { &envoy__extensions__transport_0sockets__tls__v3__UpstreamTlsContext_msg_init, &envoy__extensions__transport_0sockets__tls__v3__DownstreamTlsContext_msg_init, diff --git a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls.upb_minitable.h b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls.upb_minitable.h index da98df5e9a0..f562352ea4e 100644 --- a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/extensions/transport_sockets/tls/v3/tls.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_TLS_PROTO_UPB_MINITABLE_H_ #define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_TLS_PROTO_UPB_MINITABLE_H_ @@ -18,12 +19,19 @@ extern "C" { #endif extern const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__UpstreamTlsContext_msg_init; +extern const upb_MiniTable* envoy__extensions__transport_0sockets__tls__v3__UpstreamTlsContext_msg_init_ptr; extern const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__DownstreamTlsContext_msg_init; +extern const upb_MiniTable* envoy__extensions__transport_0sockets__tls__v3__DownstreamTlsContext_msg_init_ptr; extern const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__TlsKeyLog_msg_init; +extern const upb_MiniTable* envoy__extensions__transport_0sockets__tls__v3__TlsKeyLog_msg_init_ptr; extern const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext_msg_init; +extern const upb_MiniTable* envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext_msg_init_ptr; extern const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext__CertificateProvider_msg_init; +extern const upb_MiniTable* envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext__CertificateProvider_msg_init_ptr; extern const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext__CertificateProviderInstance_msg_init; +extern const upb_MiniTable* envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext__CertificateProviderInstance_msg_init_ptr; extern const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext__CombinedCertificateValidationContext_msg_init; +extern const upb_MiniTable* envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext__CombinedCertificateValidationContext_msg_init_ptr; extern const upb_MiniTableFile envoy_extensions_transport_sockets_tls_v3_tls_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb.h b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb.h index a661d08ad1a..b622debd1b7 100644 --- a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb.h +++ b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb.h @@ -3,7 +3,8 @@ * envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_TLS_SPIFFE_VALIDATOR_CONFIG_PROTO_UPB_H_ #define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_TLS_SPIFFE_VALIDATOR_CONFIG_PROTO_UPB_H_ @@ -71,6 +72,7 @@ UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorCon } UPB_INLINE const envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_TrustDomain* const* envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_trust_domains(const envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__transport_0sockets__tls__v3__SPIFFECertValidatorConfig__TrustDomain_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -82,6 +84,7 @@ UPB_INLINE const envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorCo } UPB_INLINE const upb_Array* _envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_trust_domains_upb_array(const envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__transport_0sockets__tls__v3__SPIFFECertValidatorConfig__TrustDomain_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -90,6 +93,7 @@ UPB_INLINE const upb_Array* _envoy_extensions_transport_sockets_tls_v3_SPIFFECer } UPB_INLINE upb_Array* _envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_trust_domains_mutable_upb_array(envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__transport_0sockets__tls__v3__SPIFFECertValidatorConfig__TrustDomain_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -100,6 +104,7 @@ UPB_INLINE upb_Array* _envoy_extensions_transport_sockets_tls_v3_SPIFFECertValid UPB_INLINE envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_TrustDomain** envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_mutable_trust_domains(envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__transport_0sockets__tls__v3__SPIFFECertValidatorConfig__TrustDomain_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -116,6 +121,7 @@ UPB_INLINE envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_T } UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_TrustDomain* envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_add_trust_domains(envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig* msg, upb_Arena* arena) { upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__transport_0sockets__tls__v3__SPIFFECertValidatorConfig__TrustDomain_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -185,6 +191,7 @@ UPB_INLINE const struct envoy_config_core_v3_DataSource* envoy_extensions_transp const struct envoy_config_core_v3_DataSource* default_val = NULL; const struct envoy_config_core_v3_DataSource* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__DataSource_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -200,6 +207,7 @@ UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorCon } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__DataSource_msg_init); 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) { diff --git a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb_minitable.c b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb_minitable.c index 94fd8341dd6..f9d6847d911 100644 --- a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -15,8 +16,9 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__extensions__transport_0sockets__tls__v3__SPIFFECertValidatorConfig__TrustDomain_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__extensions__transport_0sockets__tls__v3__SPIFFECertValidatorConfig__TrustDomain_msg_init_ptr}, }; static const upb_MiniTableField envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig__fields[1] = { @@ -36,8 +38,9 @@ const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__SPIFFECertVa }) }; -static const upb_MiniTableSub envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_TrustDomain_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__DataSource_msg_init}, +const upb_MiniTable* envoy__extensions__transport_0sockets__tls__v3__SPIFFECertValidatorConfig_msg_init_ptr = &envoy__extensions__transport_0sockets__tls__v3__SPIFFECertValidatorConfig_msg_init; +static const upb_MiniTableSubInternal envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_TrustDomain_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__DataSource_msg_init_ptr}, }; static const upb_MiniTableField envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_TrustDomain__fields[2] = { @@ -58,6 +61,7 @@ const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__SPIFFECertVa }) }; +const upb_MiniTable* envoy__extensions__transport_0sockets__tls__v3__SPIFFECertValidatorConfig__TrustDomain_msg_init_ptr = &envoy__extensions__transport_0sockets__tls__v3__SPIFFECertValidatorConfig__TrustDomain_msg_init; static const upb_MiniTable *messages_layout[2] = { &envoy__extensions__transport_0sockets__tls__v3__SPIFFECertValidatorConfig_msg_init, &envoy__extensions__transport_0sockets__tls__v3__SPIFFECertValidatorConfig__TrustDomain_msg_init, diff --git a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb_minitable.h b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb_minitable.h index 64c7400853a..d6817d60b36 100644 --- a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_TLS_SPIFFE_VALIDATOR_CONFIG_PROTO_UPB_MINITABLE_H_ #define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_TLS_SPIFFE_VALIDATOR_CONFIG_PROTO_UPB_MINITABLE_H_ @@ -18,7 +19,9 @@ extern "C" { #endif extern const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__SPIFFECertValidatorConfig_msg_init; +extern const upb_MiniTable* envoy__extensions__transport_0sockets__tls__v3__SPIFFECertValidatorConfig_msg_init_ptr; extern const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__SPIFFECertValidatorConfig__TrustDomain_msg_init; +extern const upb_MiniTable* envoy__extensions__transport_0sockets__tls__v3__SPIFFECertValidatorConfig__TrustDomain_msg_init_ptr; extern const upb_MiniTableFile envoy_extensions_transport_sockets_tls_v3_tls_spiffe_validator_config_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/extensions/upstreams/http/v3/http_protocol_options.upb.h b/src/core/ext/upb-gen/envoy/extensions/upstreams/http/v3/http_protocol_options.upb.h index 5869d7af4f9..4a73cb9d201 100644 --- a/src/core/ext/upb-gen/envoy/extensions/upstreams/http/v3/http_protocol_options.upb.h +++ b/src/core/ext/upb-gen/envoy/extensions/upstreams/http/v3/http_protocol_options.upb.h @@ -3,7 +3,8 @@ * envoy/extensions/upstreams/http/v3/http_protocol_options.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_EXTENSIONS_UPSTREAMS_HTTP_V3_HTTP_PROTOCOL_OPTIONS_PROTO_UPB_H_ #define ENVOY_EXTENSIONS_UPSTREAMS_HTTP_V3_HTTP_PROTOCOL_OPTIONS_PROTO_UPB_H_ @@ -95,6 +96,7 @@ UPB_INLINE const struct envoy_config_core_v3_HttpProtocolOptions* envoy_extensio const struct envoy_config_core_v3_HttpProtocolOptions* default_val = NULL; const struct envoy_config_core_v3_HttpProtocolOptions* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HttpProtocolOptions_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -111,6 +113,7 @@ UPB_INLINE const struct envoy_config_core_v3_UpstreamHttpProtocolOptions* envoy_ const struct envoy_config_core_v3_UpstreamHttpProtocolOptions* default_val = NULL; const struct envoy_config_core_v3_UpstreamHttpProtocolOptions* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__UpstreamHttpProtocolOptions_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -127,6 +130,7 @@ UPB_INLINE const envoy_extensions_upstreams_http_v3_HttpProtocolOptions_Explicit const envoy_extensions_upstreams_http_v3_HttpProtocolOptions_ExplicitHttpConfig* default_val = NULL; const envoy_extensions_upstreams_http_v3_HttpProtocolOptions_ExplicitHttpConfig* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__upstreams__http__v3__HttpProtocolOptions__ExplicitHttpConfig_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -143,6 +147,7 @@ UPB_INLINE const envoy_extensions_upstreams_http_v3_HttpProtocolOptions_UseDowns const envoy_extensions_upstreams_http_v3_HttpProtocolOptions_UseDownstreamHttpConfig* default_val = NULL; const envoy_extensions_upstreams_http_v3_HttpProtocolOptions_UseDownstreamHttpConfig* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__upstreams__http__v3__HttpProtocolOptions__UseDownstreamHttpConfig_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -159,6 +164,7 @@ UPB_INLINE const envoy_extensions_upstreams_http_v3_HttpProtocolOptions_AutoHttp const envoy_extensions_upstreams_http_v3_HttpProtocolOptions_AutoHttpConfig* default_val = NULL; const envoy_extensions_upstreams_http_v3_HttpProtocolOptions_AutoHttpConfig* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__upstreams__http__v3__HttpProtocolOptions__AutoHttpConfig_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -173,6 +179,7 @@ UPB_INLINE void envoy_extensions_upstreams_http_v3_HttpProtocolOptions_clear_htt } UPB_INLINE const struct envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter* const* envoy_extensions_upstreams_http_v3_HttpProtocolOptions_http_filters(const envoy_extensions_upstreams_http_v3_HttpProtocolOptions* msg, size_t* size) { const upb_MiniTableField field = {6, UPB_SIZE(24, 32), 0, 5, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__filters__network__http_0connection_0manager__v3__HttpFilter_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -184,6 +191,7 @@ UPB_INLINE const struct envoy_extensions_filters_network_http_connection_manager } UPB_INLINE const upb_Array* _envoy_extensions_upstreams_http_v3_HttpProtocolOptions_http_filters_upb_array(const envoy_extensions_upstreams_http_v3_HttpProtocolOptions* msg, size_t* size) { const upb_MiniTableField field = {6, UPB_SIZE(24, 32), 0, 5, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__filters__network__http_0connection_0manager__v3__HttpFilter_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -192,6 +200,7 @@ UPB_INLINE const upb_Array* _envoy_extensions_upstreams_http_v3_HttpProtocolOpti } UPB_INLINE upb_Array* _envoy_extensions_upstreams_http_v3_HttpProtocolOptions_http_filters_mutable_upb_array(envoy_extensions_upstreams_http_v3_HttpProtocolOptions* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {6, UPB_SIZE(24, 32), 0, 5, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__filters__network__http_0connection_0manager__v3__HttpFilter_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -207,6 +216,7 @@ UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* envoy_extensi const struct envoy_config_core_v3_TypedExtensionConfig* default_val = NULL; const struct envoy_config_core_v3_TypedExtensionConfig* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -218,6 +228,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__HttpProtocolOptions_msg_init); 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) { @@ -230,6 +241,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__UpstreamHttpProtocolOptions_msg_init); 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) { @@ -242,6 +254,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__upstreams__http__v3__HttpProtocolOptions__ExplicitHttpConfig_msg_init); 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) { @@ -254,6 +267,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__upstreams__http__v3__HttpProtocolOptions__UseDownstreamHttpConfig_msg_init); 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) { @@ -266,6 +280,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__upstreams__http__v3__HttpProtocolOptions__AutoHttpConfig_msg_init); 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) { @@ -278,6 +293,7 @@ UPB_INLINE struct envoy_extensions_upstreams_http_v3_HttpProtocolOptions_AutoHtt } UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter** envoy_extensions_upstreams_http_v3_HttpProtocolOptions_mutable_http_filters(envoy_extensions_upstreams_http_v3_HttpProtocolOptions* msg, size_t* size) { upb_MiniTableField field = {6, UPB_SIZE(24, 32), 0, 5, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__filters__network__http_0connection_0manager__v3__HttpFilter_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -294,6 +310,7 @@ UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_Ht } UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter* envoy_extensions_upstreams_http_v3_HttpProtocolOptions_add_http_filters(envoy_extensions_upstreams_http_v3_HttpProtocolOptions* msg, upb_Arena* arena) { upb_MiniTableField field = {6, UPB_SIZE(24, 32), 0, 5, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__extensions__filters__network__http_0connection_0manager__v3__HttpFilter_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -308,6 +325,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TypedExtensionConfig_msg_init); 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) { @@ -374,6 +392,7 @@ UPB_INLINE const struct envoy_config_core_v3_Http1ProtocolOptions* envoy_extensi const struct envoy_config_core_v3_Http1ProtocolOptions* default_val = NULL; const struct envoy_config_core_v3_Http1ProtocolOptions* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Http1ProtocolOptions_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -390,6 +409,7 @@ UPB_INLINE const struct envoy_config_core_v3_Http2ProtocolOptions* envoy_extensi const struct envoy_config_core_v3_Http2ProtocolOptions* default_val = NULL; const struct envoy_config_core_v3_Http2ProtocolOptions* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Http2ProtocolOptions_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -406,6 +426,7 @@ UPB_INLINE const struct envoy_config_core_v3_Http3ProtocolOptions* envoy_extensi const struct envoy_config_core_v3_Http3ProtocolOptions* default_val = NULL; const struct envoy_config_core_v3_Http3ProtocolOptions* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Http3ProtocolOptions_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -417,6 +438,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Http1ProtocolOptions_msg_init); 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) { @@ -429,6 +451,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Http2ProtocolOptions_msg_init); 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) { @@ -441,6 +464,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Http3ProtocolOptions_msg_init); 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) { @@ -496,6 +520,7 @@ UPB_INLINE const struct envoy_config_core_v3_Http1ProtocolOptions* envoy_extensi const struct envoy_config_core_v3_Http1ProtocolOptions* default_val = NULL; const struct envoy_config_core_v3_Http1ProtocolOptions* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Http1ProtocolOptions_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -512,6 +537,7 @@ UPB_INLINE const struct envoy_config_core_v3_Http2ProtocolOptions* envoy_extensi const struct envoy_config_core_v3_Http2ProtocolOptions* default_val = NULL; const struct envoy_config_core_v3_Http2ProtocolOptions* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Http2ProtocolOptions_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -528,6 +554,7 @@ UPB_INLINE const struct envoy_config_core_v3_Http3ProtocolOptions* envoy_extensi const struct envoy_config_core_v3_Http3ProtocolOptions* default_val = NULL; const struct envoy_config_core_v3_Http3ProtocolOptions* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Http3ProtocolOptions_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -539,6 +566,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Http1ProtocolOptions_msg_init); 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) { @@ -551,6 +579,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Http2ProtocolOptions_msg_init); 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) { @@ -563,6 +592,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Http3ProtocolOptions_msg_init); 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) { @@ -618,6 +648,7 @@ UPB_INLINE const struct envoy_config_core_v3_Http1ProtocolOptions* envoy_extensi const struct envoy_config_core_v3_Http1ProtocolOptions* default_val = NULL; const struct envoy_config_core_v3_Http1ProtocolOptions* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Http1ProtocolOptions_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -634,6 +665,7 @@ UPB_INLINE const struct envoy_config_core_v3_Http2ProtocolOptions* envoy_extensi const struct envoy_config_core_v3_Http2ProtocolOptions* default_val = NULL; const struct envoy_config_core_v3_Http2ProtocolOptions* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Http2ProtocolOptions_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -650,6 +682,7 @@ UPB_INLINE const struct envoy_config_core_v3_Http3ProtocolOptions* envoy_extensi const struct envoy_config_core_v3_Http3ProtocolOptions* default_val = NULL; const struct envoy_config_core_v3_Http3ProtocolOptions* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Http3ProtocolOptions_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -666,6 +699,7 @@ UPB_INLINE const struct envoy_config_core_v3_AlternateProtocolsCacheOptions* env const struct envoy_config_core_v3_AlternateProtocolsCacheOptions* default_val = NULL; const struct envoy_config_core_v3_AlternateProtocolsCacheOptions* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__AlternateProtocolsCacheOptions_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -677,6 +711,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Http1ProtocolOptions_msg_init); 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) { @@ -689,6 +724,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Http2ProtocolOptions_msg_init); 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) { @@ -701,6 +737,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Http3ProtocolOptions_msg_init); 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) { @@ -713,6 +750,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__AlternateProtocolsCacheOptions_msg_init); 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) { diff --git a/src/core/ext/upb-gen/envoy/extensions/upstreams/http/v3/http_protocol_options.upb_minitable.c b/src/core/ext/upb-gen/envoy/extensions/upstreams/http/v3/http_protocol_options.upb_minitable.c index fde736fba24..84118d2a127 100644 --- a/src/core/ext/upb-gen/envoy/extensions/upstreams/http/v3/http_protocol_options.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/extensions/upstreams/http/v3/http_protocol_options.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/extensions/upstreams/http/v3/http_protocol_options.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -17,14 +18,15 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub envoy_extensions_upstreams_http_v3_HttpProtocolOptions_submsgs[7] = { - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HttpProtocolOptions_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__UpstreamHttpProtocolOptions_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__extensions__upstreams__http__v3__HttpProtocolOptions__ExplicitHttpConfig_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__extensions__upstreams__http__v3__HttpProtocolOptions__UseDownstreamHttpConfig_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__extensions__upstreams__http__v3__HttpProtocolOptions__AutoHttpConfig_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpFilter_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal envoy_extensions_upstreams_http_v3_HttpProtocolOptions_submsgs[7] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HttpProtocolOptions_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__UpstreamHttpProtocolOptions_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__extensions__upstreams__http__v3__HttpProtocolOptions__ExplicitHttpConfig_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__extensions__upstreams__http__v3__HttpProtocolOptions__UseDownstreamHttpConfig_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__extensions__upstreams__http__v3__HttpProtocolOptions__AutoHttpConfig_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpFilter_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init_ptr}, }; static const upb_MiniTableField envoy_extensions_upstreams_http_v3_HttpProtocolOptions__fields[7] = { @@ -56,10 +58,11 @@ const upb_MiniTable envoy__extensions__upstreams__http__v3__HttpProtocolOptions_ }) }; -static const upb_MiniTableSub envoy_extensions_upstreams_http_v3_HttpProtocolOptions_ExplicitHttpConfig_submsgs[3] = { - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Http1ProtocolOptions_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Http2ProtocolOptions_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Http3ProtocolOptions_msg_init}, +const upb_MiniTable* envoy__extensions__upstreams__http__v3__HttpProtocolOptions_msg_init_ptr = &envoy__extensions__upstreams__http__v3__HttpProtocolOptions_msg_init; +static const upb_MiniTableSubInternal envoy_extensions_upstreams_http_v3_HttpProtocolOptions_ExplicitHttpConfig_submsgs[3] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Http1ProtocolOptions_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Http2ProtocolOptions_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Http3ProtocolOptions_msg_init_ptr}, }; static const upb_MiniTableField envoy_extensions_upstreams_http_v3_HttpProtocolOptions_ExplicitHttpConfig__fields[3] = { @@ -83,10 +86,11 @@ const upb_MiniTable envoy__extensions__upstreams__http__v3__HttpProtocolOptions_ }) }; -static const upb_MiniTableSub envoy_extensions_upstreams_http_v3_HttpProtocolOptions_UseDownstreamHttpConfig_submsgs[3] = { - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Http1ProtocolOptions_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Http2ProtocolOptions_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Http3ProtocolOptions_msg_init}, +const upb_MiniTable* envoy__extensions__upstreams__http__v3__HttpProtocolOptions__ExplicitHttpConfig_msg_init_ptr = &envoy__extensions__upstreams__http__v3__HttpProtocolOptions__ExplicitHttpConfig_msg_init; +static const upb_MiniTableSubInternal envoy_extensions_upstreams_http_v3_HttpProtocolOptions_UseDownstreamHttpConfig_submsgs[3] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Http1ProtocolOptions_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Http2ProtocolOptions_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Http3ProtocolOptions_msg_init_ptr}, }; static const upb_MiniTableField envoy_extensions_upstreams_http_v3_HttpProtocolOptions_UseDownstreamHttpConfig__fields[3] = { @@ -104,11 +108,12 @@ const upb_MiniTable envoy__extensions__upstreams__http__v3__HttpProtocolOptions_ #endif }; -static const upb_MiniTableSub envoy_extensions_upstreams_http_v3_HttpProtocolOptions_AutoHttpConfig_submsgs[4] = { - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Http1ProtocolOptions_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Http2ProtocolOptions_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Http3ProtocolOptions_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__AlternateProtocolsCacheOptions_msg_init}, +const upb_MiniTable* envoy__extensions__upstreams__http__v3__HttpProtocolOptions__UseDownstreamHttpConfig_msg_init_ptr = &envoy__extensions__upstreams__http__v3__HttpProtocolOptions__UseDownstreamHttpConfig_msg_init; +static const upb_MiniTableSubInternal envoy_extensions_upstreams_http_v3_HttpProtocolOptions_AutoHttpConfig_submsgs[4] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Http1ProtocolOptions_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Http2ProtocolOptions_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Http3ProtocolOptions_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__AlternateProtocolsCacheOptions_msg_init_ptr}, }; static const upb_MiniTableField envoy_extensions_upstreams_http_v3_HttpProtocolOptions_AutoHttpConfig__fields[4] = { @@ -127,6 +132,7 @@ const upb_MiniTable envoy__extensions__upstreams__http__v3__HttpProtocolOptions_ #endif }; +const upb_MiniTable* envoy__extensions__upstreams__http__v3__HttpProtocolOptions__AutoHttpConfig_msg_init_ptr = &envoy__extensions__upstreams__http__v3__HttpProtocolOptions__AutoHttpConfig_msg_init; static const upb_MiniTable *messages_layout[4] = { &envoy__extensions__upstreams__http__v3__HttpProtocolOptions_msg_init, &envoy__extensions__upstreams__http__v3__HttpProtocolOptions__ExplicitHttpConfig_msg_init, diff --git a/src/core/ext/upb-gen/envoy/extensions/upstreams/http/v3/http_protocol_options.upb_minitable.h b/src/core/ext/upb-gen/envoy/extensions/upstreams/http/v3/http_protocol_options.upb_minitable.h index c4bd8317c35..6eaf0d58c26 100644 --- a/src/core/ext/upb-gen/envoy/extensions/upstreams/http/v3/http_protocol_options.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/extensions/upstreams/http/v3/http_protocol_options.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/extensions/upstreams/http/v3/http_protocol_options.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_EXTENSIONS_UPSTREAMS_HTTP_V3_HTTP_PROTOCOL_OPTIONS_PROTO_UPB_MINITABLE_H_ #define ENVOY_EXTENSIONS_UPSTREAMS_HTTP_V3_HTTP_PROTOCOL_OPTIONS_PROTO_UPB_MINITABLE_H_ @@ -18,9 +19,13 @@ extern "C" { #endif extern const upb_MiniTable envoy__extensions__upstreams__http__v3__HttpProtocolOptions_msg_init; +extern const upb_MiniTable* envoy__extensions__upstreams__http__v3__HttpProtocolOptions_msg_init_ptr; extern const upb_MiniTable envoy__extensions__upstreams__http__v3__HttpProtocolOptions__ExplicitHttpConfig_msg_init; +extern const upb_MiniTable* envoy__extensions__upstreams__http__v3__HttpProtocolOptions__ExplicitHttpConfig_msg_init_ptr; extern const upb_MiniTable envoy__extensions__upstreams__http__v3__HttpProtocolOptions__UseDownstreamHttpConfig_msg_init; +extern const upb_MiniTable* envoy__extensions__upstreams__http__v3__HttpProtocolOptions__UseDownstreamHttpConfig_msg_init_ptr; extern const upb_MiniTable envoy__extensions__upstreams__http__v3__HttpProtocolOptions__AutoHttpConfig_msg_init; +extern const upb_MiniTable* envoy__extensions__upstreams__http__v3__HttpProtocolOptions__AutoHttpConfig_msg_init_ptr; extern const upb_MiniTableFile envoy_extensions_upstreams_http_v3_http_protocol_options_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/service/discovery/v3/ads.upb.h b/src/core/ext/upb-gen/envoy/service/discovery/v3/ads.upb.h index 498eb910b72..147bc33f0df 100644 --- a/src/core/ext/upb-gen/envoy/service/discovery/v3/ads.upb.h +++ b/src/core/ext/upb-gen/envoy/service/discovery/v3/ads.upb.h @@ -3,7 +3,8 @@ * envoy/service/discovery/v3/ads.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_SERVICE_DISCOVERY_V3_ADS_PROTO_UPB_H_ #define ENVOY_SERVICE_DISCOVERY_V3_ADS_PROTO_UPB_H_ diff --git a/src/core/ext/upb-gen/envoy/service/discovery/v3/ads.upb_minitable.c b/src/core/ext/upb-gen/envoy/service/discovery/v3/ads.upb_minitable.c index 375955de93f..c24d0a82ca8 100644 --- a/src/core/ext/upb-gen/envoy/service/discovery/v3/ads.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/service/discovery/v3/ads.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/service/discovery/v3/ads.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -15,6 +16,7 @@ // Must be last. #include "upb/port/def.inc" +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); const upb_MiniTable envoy__service__discovery__v3__AdsDummy_msg_init = { NULL, NULL, @@ -24,6 +26,7 @@ const upb_MiniTable envoy__service__discovery__v3__AdsDummy_msg_init = { #endif }; +const upb_MiniTable* envoy__service__discovery__v3__AdsDummy_msg_init_ptr = &envoy__service__discovery__v3__AdsDummy_msg_init; static const upb_MiniTable *messages_layout[1] = { &envoy__service__discovery__v3__AdsDummy_msg_init, }; diff --git a/src/core/ext/upb-gen/envoy/service/discovery/v3/ads.upb_minitable.h b/src/core/ext/upb-gen/envoy/service/discovery/v3/ads.upb_minitable.h index 5724b024b79..90fb109d579 100644 --- a/src/core/ext/upb-gen/envoy/service/discovery/v3/ads.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/service/discovery/v3/ads.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/service/discovery/v3/ads.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_SERVICE_DISCOVERY_V3_ADS_PROTO_UPB_MINITABLE_H_ #define ENVOY_SERVICE_DISCOVERY_V3_ADS_PROTO_UPB_MINITABLE_H_ @@ -18,6 +19,7 @@ extern "C" { #endif extern const upb_MiniTable envoy__service__discovery__v3__AdsDummy_msg_init; +extern const upb_MiniTable* envoy__service__discovery__v3__AdsDummy_msg_init_ptr; extern const upb_MiniTableFile envoy_service_discovery_v3_ads_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/service/discovery/v3/discovery.upb.h b/src/core/ext/upb-gen/envoy/service/discovery/v3/discovery.upb.h index efc38874db9..eaaf3fe236e 100644 --- a/src/core/ext/upb-gen/envoy/service/discovery/v3/discovery.upb.h +++ b/src/core/ext/upb-gen/envoy/service/discovery/v3/discovery.upb.h @@ -3,7 +3,8 @@ * envoy/service/discovery/v3/discovery.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_SERVICE_DISCOVERY_V3_DISCOVERY_PROTO_UPB_H_ #define ENVOY_SERVICE_DISCOVERY_V3_DISCOVERY_PROTO_UPB_H_ @@ -109,22 +110,26 @@ UPB_INLINE size_t envoy_service_discovery_v3_ResourceLocator_dynamic_parameters_ } UPB_INLINE bool envoy_service_discovery_v3_ResourceLocator_dynamic_parameters_get(const envoy_service_discovery_v3_ResourceLocator* msg, upb_StringView key, upb_StringView* val) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__service__discovery__v3__ResourceLocator__DynamicParametersEntry_msg_init); const upb_Map* map = upb_Message_GetMap(UPB_UPCAST(msg), &field); if (!map) return false; return _upb_Map_Get(map, &key, 0, val, 0); } UPB_INLINE const envoy_service_discovery_v3_ResourceLocator_DynamicParametersEntry* envoy_service_discovery_v3_ResourceLocator_dynamic_parameters_next(const envoy_service_discovery_v3_ResourceLocator* msg, size_t* iter) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__service__discovery__v3__ResourceLocator__DynamicParametersEntry_msg_init); const upb_Map* map = upb_Message_GetMap(UPB_UPCAST(msg), &field); if (!map) return NULL; return (const envoy_service_discovery_v3_ResourceLocator_DynamicParametersEntry*)_upb_map_next(map, iter); } UPB_INLINE const upb_Map* _envoy_service_discovery_v3_ResourceLocator_dynamic_parameters_upb_map(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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__service__discovery__v3__ResourceLocator__DynamicParametersEntry_msg_init); return upb_Message_GetMap(UPB_UPCAST(msg), &field); } UPB_INLINE upb_Map* _envoy_service_discovery_v3_ResourceLocator_dynamic_parameters_mutable_upb_map(envoy_service_discovery_v3_ResourceLocator* msg, upb_Arena* a) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__service__discovery__v3__ResourceLocator__DynamicParametersEntry_msg_init); return _upb_Message_GetOrCreateMutableMap(UPB_UPCAST(msg), &field, 0, 0, a); } @@ -140,6 +145,7 @@ UPB_INLINE void envoy_service_discovery_v3_ResourceLocator_dynamic_parameters_cl } UPB_INLINE bool envoy_service_discovery_v3_ResourceLocator_dynamic_parameters_set(envoy_service_discovery_v3_ResourceLocator* msg, upb_StringView key, upb_StringView val, upb_Arena* a) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__service__discovery__v3__ResourceLocator__DynamicParametersEntry_msg_init); upb_Map* map = _upb_Message_GetOrCreateMutableMap(UPB_UPCAST(msg), &field, 0, 0, a); return _upb_Map_Insert(map, &key, 0, &val, 0, a) != @@ -153,6 +159,7 @@ UPB_INLINE bool envoy_service_discovery_v3_ResourceLocator_dynamic_parameters_de } UPB_INLINE envoy_service_discovery_v3_ResourceLocator_DynamicParametersEntry* envoy_service_discovery_v3_ResourceLocator_dynamic_parameters_nextmutable(envoy_service_discovery_v3_ResourceLocator* msg, size_t* iter) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__service__discovery__v3__ResourceLocator__DynamicParametersEntry_msg_init); upb_Map* map = (upb_Map*)upb_Message_GetMap(UPB_UPCAST(msg), &field); if (!map) return NULL; return (envoy_service_discovery_v3_ResourceLocator_DynamicParametersEntry*)_upb_map_next(map, iter); @@ -231,6 +238,7 @@ UPB_INLINE const envoy_service_discovery_v3_DynamicParameterConstraints* envoy_s const envoy_service_discovery_v3_DynamicParameterConstraints* default_val = NULL; const envoy_service_discovery_v3_DynamicParameterConstraints* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__service__discovery__v3__DynamicParameterConstraints_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -246,6 +254,7 @@ UPB_INLINE void envoy_service_discovery_v3_ResourceName_set_name(envoy_service_d } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__service__discovery__v3__DynamicParameterConstraints_msg_init); 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) { @@ -313,6 +322,7 @@ UPB_INLINE const struct envoy_config_core_v3_Node* envoy_service_discovery_v3_Di const struct envoy_config_core_v3_Node* default_val = NULL; const struct envoy_config_core_v3_Node* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Node_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -385,6 +395,7 @@ UPB_INLINE const struct google_rpc_Status* envoy_service_discovery_v3_DiscoveryR const struct google_rpc_Status* default_val = NULL; const struct google_rpc_Status* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__rpc__Status_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -399,6 +410,7 @@ UPB_INLINE void envoy_service_discovery_v3_DiscoveryRequest_clear_resource_locat } UPB_INLINE const envoy_service_discovery_v3_ResourceLocator* const* envoy_service_discovery_v3_DiscoveryRequest_resource_locators(const envoy_service_discovery_v3_DiscoveryRequest* msg, size_t* size) { const upb_MiniTableField field = {7, UPB_SIZE(24, 88), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__service__discovery__v3__ResourceLocator_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -410,6 +422,7 @@ UPB_INLINE const envoy_service_discovery_v3_ResourceLocator* const* envoy_servic } UPB_INLINE const upb_Array* _envoy_service_discovery_v3_DiscoveryRequest_resource_locators_upb_array(const envoy_service_discovery_v3_DiscoveryRequest* msg, size_t* size) { const upb_MiniTableField field = {7, UPB_SIZE(24, 88), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__service__discovery__v3__ResourceLocator_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -418,6 +431,7 @@ UPB_INLINE const upb_Array* _envoy_service_discovery_v3_DiscoveryRequest_resourc } UPB_INLINE upb_Array* _envoy_service_discovery_v3_DiscoveryRequest_resource_locators_mutable_upb_array(envoy_service_discovery_v3_DiscoveryRequest* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {7, UPB_SIZE(24, 88), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__service__discovery__v3__ResourceLocator_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -432,6 +446,7 @@ UPB_INLINE void envoy_service_discovery_v3_DiscoveryRequest_set_version_info(env } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Node_msg_init); 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) { @@ -480,6 +495,7 @@ UPB_INLINE void envoy_service_discovery_v3_DiscoveryRequest_set_response_nonce(e } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__rpc__Status_msg_init); 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) { @@ -492,6 +508,7 @@ UPB_INLINE struct google_rpc_Status* envoy_service_discovery_v3_DiscoveryRequest } UPB_INLINE envoy_service_discovery_v3_ResourceLocator** envoy_service_discovery_v3_DiscoveryRequest_mutable_resource_locators(envoy_service_discovery_v3_DiscoveryRequest* msg, size_t* size) { upb_MiniTableField field = {7, UPB_SIZE(24, 88), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__service__discovery__v3__ResourceLocator_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -508,6 +525,7 @@ UPB_INLINE envoy_service_discovery_v3_ResourceLocator** envoy_service_discovery_ } UPB_INLINE struct envoy_service_discovery_v3_ResourceLocator* envoy_service_discovery_v3_DiscoveryRequest_add_resource_locators(envoy_service_discovery_v3_DiscoveryRequest* msg, upb_Arena* arena) { upb_MiniTableField field = {7, UPB_SIZE(24, 88), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__service__discovery__v3__ResourceLocator_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -575,6 +593,7 @@ UPB_INLINE void envoy_service_discovery_v3_DiscoveryResponse_clear_resources(env } UPB_INLINE const struct google_protobuf_Any* const* envoy_service_discovery_v3_DiscoveryResponse_resources(const envoy_service_discovery_v3_DiscoveryResponse* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -586,6 +605,7 @@ UPB_INLINE const struct google_protobuf_Any* const* envoy_service_discovery_v3_D } UPB_INLINE const upb_Array* _envoy_service_discovery_v3_DiscoveryResponse_resources_upb_array(const envoy_service_discovery_v3_DiscoveryResponse* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -594,6 +614,7 @@ UPB_INLINE const upb_Array* _envoy_service_discovery_v3_DiscoveryResponse_resour } UPB_INLINE upb_Array* _envoy_service_discovery_v3_DiscoveryResponse_resources_mutable_upb_array(envoy_service_discovery_v3_DiscoveryResponse* msg, size_t* size, upb_Arena* arena) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -645,6 +666,7 @@ UPB_INLINE const struct envoy_config_core_v3_ControlPlane* envoy_service_discove const struct envoy_config_core_v3_ControlPlane* default_val = NULL; const struct envoy_config_core_v3_ControlPlane* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__ControlPlane_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -660,6 +682,7 @@ UPB_INLINE void envoy_service_discovery_v3_DiscoveryResponse_set_version_info(en } 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -676,6 +699,7 @@ UPB_INLINE struct google_protobuf_Any** envoy_service_discovery_v3_DiscoveryResp } UPB_INLINE struct google_protobuf_Any* envoy_service_discovery_v3_DiscoveryResponse_add_resources(envoy_service_discovery_v3_DiscoveryResponse* msg, upb_Arena* arena) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -702,6 +726,7 @@ UPB_INLINE void envoy_service_discovery_v3_DiscoveryResponse_set_nonce(envoy_ser } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__ControlPlane_msg_init); 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) { @@ -757,6 +782,7 @@ UPB_INLINE const struct envoy_config_core_v3_Node* envoy_service_discovery_v3_De 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, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Node_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -852,22 +878,26 @@ UPB_INLINE size_t envoy_service_discovery_v3_DeltaDiscoveryRequest_initial_resou } UPB_INLINE bool envoy_service_discovery_v3_DeltaDiscoveryRequest_initial_resource_versions_get(const envoy_service_discovery_v3_DeltaDiscoveryRequest* msg, upb_StringView key, upb_StringView* val) { const upb_MiniTableField field = {5, UPB_SIZE(24, 56), 0, 1, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__service__discovery__v3__DeltaDiscoveryRequest__InitialResourceVersionsEntry_msg_init); const upb_Map* map = upb_Message_GetMap(UPB_UPCAST(msg), &field); if (!map) return false; return _upb_Map_Get(map, &key, 0, val, 0); } UPB_INLINE const envoy_service_discovery_v3_DeltaDiscoveryRequest_InitialResourceVersionsEntry* envoy_service_discovery_v3_DeltaDiscoveryRequest_initial_resource_versions_next(const envoy_service_discovery_v3_DeltaDiscoveryRequest* msg, size_t* iter) { const upb_MiniTableField field = {5, UPB_SIZE(24, 56), 0, 1, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__service__discovery__v3__DeltaDiscoveryRequest__InitialResourceVersionsEntry_msg_init); const upb_Map* map = upb_Message_GetMap(UPB_UPCAST(msg), &field); if (!map) return NULL; return (const envoy_service_discovery_v3_DeltaDiscoveryRequest_InitialResourceVersionsEntry*)_upb_map_next(map, iter); } UPB_INLINE const upb_Map* _envoy_service_discovery_v3_DeltaDiscoveryRequest_initial_resource_versions_upb_map(envoy_service_discovery_v3_DeltaDiscoveryRequest* msg) { const upb_MiniTableField field = {5, UPB_SIZE(24, 56), 0, 1, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__service__discovery__v3__DeltaDiscoveryRequest__InitialResourceVersionsEntry_msg_init); return upb_Message_GetMap(UPB_UPCAST(msg), &field); } UPB_INLINE upb_Map* _envoy_service_discovery_v3_DeltaDiscoveryRequest_initial_resource_versions_mutable_upb_map(envoy_service_discovery_v3_DeltaDiscoveryRequest* msg, upb_Arena* a) { const upb_MiniTableField field = {5, UPB_SIZE(24, 56), 0, 1, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__service__discovery__v3__DeltaDiscoveryRequest__InitialResourceVersionsEntry_msg_init); return _upb_Message_GetOrCreateMutableMap(UPB_UPCAST(msg), &field, 0, 0, a); } UPB_INLINE void envoy_service_discovery_v3_DeltaDiscoveryRequest_clear_response_nonce(envoy_service_discovery_v3_DeltaDiscoveryRequest* msg) { @@ -890,6 +920,7 @@ UPB_INLINE const struct google_rpc_Status* envoy_service_discovery_v3_DeltaDisco const struct google_rpc_Status* default_val = NULL; const struct google_rpc_Status* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__rpc__Status_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -904,6 +935,7 @@ UPB_INLINE void envoy_service_discovery_v3_DeltaDiscoveryRequest_clear_resource_ } UPB_INLINE const envoy_service_discovery_v3_ResourceLocator* const* envoy_service_discovery_v3_DeltaDiscoveryRequest_resource_locators_subscribe(const envoy_service_discovery_v3_DeltaDiscoveryRequest* msg, size_t* size) { const upb_MiniTableField field = {8, UPB_SIZE(32, 88), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__service__discovery__v3__ResourceLocator_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -915,6 +947,7 @@ UPB_INLINE const envoy_service_discovery_v3_ResourceLocator* const* envoy_servic } UPB_INLINE const upb_Array* _envoy_service_discovery_v3_DeltaDiscoveryRequest_resource_locators_subscribe_upb_array(const envoy_service_discovery_v3_DeltaDiscoveryRequest* msg, size_t* size) { const upb_MiniTableField field = {8, UPB_SIZE(32, 88), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__service__discovery__v3__ResourceLocator_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -923,6 +956,7 @@ UPB_INLINE const upb_Array* _envoy_service_discovery_v3_DeltaDiscoveryRequest_re } UPB_INLINE upb_Array* _envoy_service_discovery_v3_DeltaDiscoveryRequest_resource_locators_subscribe_mutable_upb_array(envoy_service_discovery_v3_DeltaDiscoveryRequest* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {8, UPB_SIZE(32, 88), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__service__discovery__v3__ResourceLocator_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -936,6 +970,7 @@ UPB_INLINE void envoy_service_discovery_v3_DeltaDiscoveryRequest_clear_resource_ } UPB_INLINE const envoy_service_discovery_v3_ResourceLocator* const* envoy_service_discovery_v3_DeltaDiscoveryRequest_resource_locators_unsubscribe(const envoy_service_discovery_v3_DeltaDiscoveryRequest* msg, size_t* size) { const upb_MiniTableField field = {9, UPB_SIZE(36, 96), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__service__discovery__v3__ResourceLocator_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -947,6 +982,7 @@ UPB_INLINE const envoy_service_discovery_v3_ResourceLocator* const* envoy_servic } UPB_INLINE const upb_Array* _envoy_service_discovery_v3_DeltaDiscoveryRequest_resource_locators_unsubscribe_upb_array(const envoy_service_discovery_v3_DeltaDiscoveryRequest* msg, size_t* size) { const upb_MiniTableField field = {9, UPB_SIZE(36, 96), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__service__discovery__v3__ResourceLocator_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -955,6 +991,7 @@ UPB_INLINE const upb_Array* _envoy_service_discovery_v3_DeltaDiscoveryRequest_re } UPB_INLINE upb_Array* _envoy_service_discovery_v3_DeltaDiscoveryRequest_resource_locators_unsubscribe_mutable_upb_array(envoy_service_discovery_v3_DeltaDiscoveryRequest* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {9, UPB_SIZE(36, 96), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__service__discovery__v3__ResourceLocator_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -965,6 +1002,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Node_msg_init); 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) { @@ -1043,6 +1081,7 @@ UPB_INLINE void envoy_service_discovery_v3_DeltaDiscoveryRequest_initial_resourc } UPB_INLINE bool envoy_service_discovery_v3_DeltaDiscoveryRequest_initial_resource_versions_set(envoy_service_discovery_v3_DeltaDiscoveryRequest* msg, upb_StringView key, upb_StringView val, upb_Arena* a) { const upb_MiniTableField field = {5, UPB_SIZE(24, 56), 0, 1, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__service__discovery__v3__DeltaDiscoveryRequest__InitialResourceVersionsEntry_msg_init); upb_Map* map = _upb_Message_GetOrCreateMutableMap(UPB_UPCAST(msg), &field, 0, 0, a); return _upb_Map_Insert(map, &key, 0, &val, 0, a) != @@ -1056,6 +1095,7 @@ UPB_INLINE bool envoy_service_discovery_v3_DeltaDiscoveryRequest_initial_resourc } UPB_INLINE envoy_service_discovery_v3_DeltaDiscoveryRequest_InitialResourceVersionsEntry* envoy_service_discovery_v3_DeltaDiscoveryRequest_initial_resource_versions_nextmutable(envoy_service_discovery_v3_DeltaDiscoveryRequest* msg, size_t* iter) { const upb_MiniTableField field = {5, UPB_SIZE(24, 56), 0, 1, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__service__discovery__v3__DeltaDiscoveryRequest__InitialResourceVersionsEntry_msg_init); upb_Map* map = (upb_Map*)upb_Message_GetMap(UPB_UPCAST(msg), &field); if (!map) return NULL; return (envoy_service_discovery_v3_DeltaDiscoveryRequest_InitialResourceVersionsEntry*)_upb_map_next(map, iter); @@ -1066,6 +1106,7 @@ UPB_INLINE void envoy_service_discovery_v3_DeltaDiscoveryRequest_set_response_no } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__rpc__Status_msg_init); 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) { @@ -1078,6 +1119,7 @@ UPB_INLINE struct google_rpc_Status* envoy_service_discovery_v3_DeltaDiscoveryRe } UPB_INLINE envoy_service_discovery_v3_ResourceLocator** envoy_service_discovery_v3_DeltaDiscoveryRequest_mutable_resource_locators_subscribe(envoy_service_discovery_v3_DeltaDiscoveryRequest* msg, size_t* size) { upb_MiniTableField field = {8, UPB_SIZE(32, 88), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__service__discovery__v3__ResourceLocator_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1094,6 +1136,7 @@ UPB_INLINE envoy_service_discovery_v3_ResourceLocator** envoy_service_discovery_ } UPB_INLINE struct envoy_service_discovery_v3_ResourceLocator* envoy_service_discovery_v3_DeltaDiscoveryRequest_add_resource_locators_subscribe(envoy_service_discovery_v3_DeltaDiscoveryRequest* msg, upb_Arena* arena) { upb_MiniTableField field = {8, UPB_SIZE(32, 88), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__service__discovery__v3__ResourceLocator_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -1108,6 +1151,7 @@ UPB_INLINE struct envoy_service_discovery_v3_ResourceLocator* envoy_service_disc } UPB_INLINE envoy_service_discovery_v3_ResourceLocator** envoy_service_discovery_v3_DeltaDiscoveryRequest_mutable_resource_locators_unsubscribe(envoy_service_discovery_v3_DeltaDiscoveryRequest* msg, size_t* size) { upb_MiniTableField field = {9, UPB_SIZE(36, 96), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__service__discovery__v3__ResourceLocator_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1124,6 +1168,7 @@ UPB_INLINE envoy_service_discovery_v3_ResourceLocator** envoy_service_discovery_ } UPB_INLINE struct envoy_service_discovery_v3_ResourceLocator* envoy_service_discovery_v3_DeltaDiscoveryRequest_add_resource_locators_unsubscribe(envoy_service_discovery_v3_DeltaDiscoveryRequest* msg, upb_Arena* arena) { upb_MiniTableField field = {9, UPB_SIZE(36, 96), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__service__discovery__v3__ResourceLocator_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -1208,6 +1253,7 @@ UPB_INLINE void envoy_service_discovery_v3_DeltaDiscoveryResponse_clear_resource } UPB_INLINE const envoy_service_discovery_v3_Resource* const* envoy_service_discovery_v3_DeltaDiscoveryResponse_resources(const envoy_service_discovery_v3_DeltaDiscoveryResponse* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__service__discovery__v3__Resource_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1219,6 +1265,7 @@ UPB_INLINE const envoy_service_discovery_v3_Resource* const* envoy_service_disco } UPB_INLINE const upb_Array* _envoy_service_discovery_v3_DeltaDiscoveryResponse_resources_upb_array(const envoy_service_discovery_v3_DeltaDiscoveryResponse* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__service__discovery__v3__Resource_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -1227,6 +1274,7 @@ UPB_INLINE const upb_Array* _envoy_service_discovery_v3_DeltaDiscoveryResponse_r } UPB_INLINE upb_Array* _envoy_service_discovery_v3_DeltaDiscoveryResponse_resources_mutable_upb_array(envoy_service_discovery_v3_DeltaDiscoveryResponse* msg, size_t* size, upb_Arena* arena) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__service__discovery__v3__Resource_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -1298,6 +1346,7 @@ UPB_INLINE const struct envoy_config_core_v3_ControlPlane* envoy_service_discove const struct envoy_config_core_v3_ControlPlane* default_val = NULL; const struct envoy_config_core_v3_ControlPlane* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__ControlPlane_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1312,6 +1361,7 @@ UPB_INLINE void envoy_service_discovery_v3_DeltaDiscoveryResponse_clear_removed_ } UPB_INLINE const envoy_service_discovery_v3_ResourceName* const* envoy_service_discovery_v3_DeltaDiscoveryResponse_removed_resource_names(const envoy_service_discovery_v3_DeltaDiscoveryResponse* msg, size_t* size) { const upb_MiniTableField field = {8, UPB_SIZE(24, 88), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__service__discovery__v3__ResourceName_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1323,6 +1373,7 @@ UPB_INLINE const envoy_service_discovery_v3_ResourceName* const* envoy_service_d } UPB_INLINE const upb_Array* _envoy_service_discovery_v3_DeltaDiscoveryResponse_removed_resource_names_upb_array(const envoy_service_discovery_v3_DeltaDiscoveryResponse* msg, size_t* size) { const upb_MiniTableField field = {8, UPB_SIZE(24, 88), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__service__discovery__v3__ResourceName_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -1331,6 +1382,7 @@ UPB_INLINE const upb_Array* _envoy_service_discovery_v3_DeltaDiscoveryResponse_r } UPB_INLINE upb_Array* _envoy_service_discovery_v3_DeltaDiscoveryResponse_removed_resource_names_mutable_upb_array(envoy_service_discovery_v3_DeltaDiscoveryResponse* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {8, UPB_SIZE(24, 88), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__service__discovery__v3__ResourceName_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -1345,6 +1397,7 @@ UPB_INLINE void envoy_service_discovery_v3_DeltaDiscoveryResponse_set_system_ver } 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__service__discovery__v3__Resource_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1361,6 +1414,7 @@ UPB_INLINE envoy_service_discovery_v3_Resource** envoy_service_discovery_v3_Delt } UPB_INLINE struct envoy_service_discovery_v3_Resource* envoy_service_discovery_v3_DeltaDiscoveryResponse_add_resources(envoy_service_discovery_v3_DeltaDiscoveryResponse* msg, upb_Arena* arena) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__service__discovery__v3__Resource_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -1411,6 +1465,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__ControlPlane_msg_init); 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) { @@ -1423,6 +1478,7 @@ UPB_INLINE struct envoy_config_core_v3_ControlPlane* envoy_service_discovery_v3_ } UPB_INLINE envoy_service_discovery_v3_ResourceName** envoy_service_discovery_v3_DeltaDiscoveryResponse_mutable_removed_resource_names(envoy_service_discovery_v3_DeltaDiscoveryResponse* msg, size_t* size) { upb_MiniTableField field = {8, UPB_SIZE(24, 88), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__service__discovery__v3__ResourceName_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1439,6 +1495,7 @@ UPB_INLINE envoy_service_discovery_v3_ResourceName** envoy_service_discovery_v3_ } UPB_INLINE struct envoy_service_discovery_v3_ResourceName* envoy_service_discovery_v3_DeltaDiscoveryResponse_add_removed_resource_names(envoy_service_discovery_v3_DeltaDiscoveryResponse* msg, upb_Arena* arena) { upb_MiniTableField field = {8, UPB_SIZE(24, 88), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__service__discovery__v3__ResourceName_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -1508,6 +1565,7 @@ UPB_INLINE const envoy_service_discovery_v3_DynamicParameterConstraints_SingleCo const envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint* default_val = NULL; const envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__service__discovery__v3__DynamicParameterConstraints__SingleConstraint_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1524,6 +1582,7 @@ UPB_INLINE const envoy_service_discovery_v3_DynamicParameterConstraints_Constrai const envoy_service_discovery_v3_DynamicParameterConstraints_ConstraintList* default_val = NULL; const envoy_service_discovery_v3_DynamicParameterConstraints_ConstraintList* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__service__discovery__v3__DynamicParameterConstraints__ConstraintList_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1540,6 +1599,7 @@ UPB_INLINE const envoy_service_discovery_v3_DynamicParameterConstraints_Constrai const envoy_service_discovery_v3_DynamicParameterConstraints_ConstraintList* default_val = NULL; const envoy_service_discovery_v3_DynamicParameterConstraints_ConstraintList* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__service__discovery__v3__DynamicParameterConstraints__ConstraintList_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1556,6 +1616,7 @@ UPB_INLINE const envoy_service_discovery_v3_DynamicParameterConstraints* envoy_s const envoy_service_discovery_v3_DynamicParameterConstraints* default_val = NULL; const envoy_service_discovery_v3_DynamicParameterConstraints* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__service__discovery__v3__DynamicParameterConstraints_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1567,6 +1628,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__service__discovery__v3__DynamicParameterConstraints__SingleConstraint_msg_init); 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) { @@ -1579,6 +1641,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__service__discovery__v3__DynamicParameterConstraints__ConstraintList_msg_init); 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) { @@ -1591,6 +1654,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__service__discovery__v3__DynamicParameterConstraints__ConstraintList_msg_init); 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) { @@ -1603,6 +1667,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__service__discovery__v3__DynamicParameterConstraints_msg_init); 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) { @@ -1696,6 +1761,7 @@ UPB_INLINE const envoy_service_discovery_v3_DynamicParameterConstraints_SingleCo const envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint_Exists* default_val = NULL; const envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint_Exists* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__service__discovery__v3__DynamicParameterConstraints__SingleConstraint__Exists_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1715,6 +1781,7 @@ UPB_INLINE void envoy_service_discovery_v3_DynamicParameterConstraints_SingleCon } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__service__discovery__v3__DynamicParameterConstraints__SingleConstraint__Exists_msg_init); 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) { @@ -1806,6 +1873,7 @@ UPB_INLINE void envoy_service_discovery_v3_DynamicParameterConstraints_Constrain } UPB_INLINE const envoy_service_discovery_v3_DynamicParameterConstraints* const* envoy_service_discovery_v3_DynamicParameterConstraints_ConstraintList_constraints(const envoy_service_discovery_v3_DynamicParameterConstraints_ConstraintList* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__service__discovery__v3__DynamicParameterConstraints_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1817,6 +1885,7 @@ UPB_INLINE const envoy_service_discovery_v3_DynamicParameterConstraints* const* } UPB_INLINE const upb_Array* _envoy_service_discovery_v3_DynamicParameterConstraints_ConstraintList_constraints_upb_array(const envoy_service_discovery_v3_DynamicParameterConstraints_ConstraintList* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__service__discovery__v3__DynamicParameterConstraints_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -1825,6 +1894,7 @@ UPB_INLINE const upb_Array* _envoy_service_discovery_v3_DynamicParameterConstrai } UPB_INLINE upb_Array* _envoy_service_discovery_v3_DynamicParameterConstraints_ConstraintList_constraints_mutable_upb_array(envoy_service_discovery_v3_DynamicParameterConstraints_ConstraintList* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__service__discovery__v3__DynamicParameterConstraints_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -1835,6 +1905,7 @@ UPB_INLINE upb_Array* _envoy_service_discovery_v3_DynamicParameterConstraints_Co UPB_INLINE envoy_service_discovery_v3_DynamicParameterConstraints** envoy_service_discovery_v3_DynamicParameterConstraints_ConstraintList_mutable_constraints(envoy_service_discovery_v3_DynamicParameterConstraints_ConstraintList* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__service__discovery__v3__DynamicParameterConstraints_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1851,6 +1922,7 @@ UPB_INLINE envoy_service_discovery_v3_DynamicParameterConstraints** envoy_servic } UPB_INLINE struct envoy_service_discovery_v3_DynamicParameterConstraints* envoy_service_discovery_v3_DynamicParameterConstraints_ConstraintList_add_constraints(envoy_service_discovery_v3_DynamicParameterConstraints_ConstraintList* msg, upb_Arena* arena) { upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__service__discovery__v3__DynamicParameterConstraints_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -1920,6 +1992,7 @@ UPB_INLINE const struct google_protobuf_Any* envoy_service_discovery_v3_Resource const struct google_protobuf_Any* default_val = NULL; const struct google_protobuf_Any* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1980,6 +2053,7 @@ UPB_INLINE const struct google_protobuf_Duration* envoy_service_discovery_v3_Res const struct google_protobuf_Duration* default_val = NULL; const struct google_protobuf_Duration* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1996,6 +2070,7 @@ UPB_INLINE const envoy_service_discovery_v3_Resource_CacheControl* envoy_service const envoy_service_discovery_v3_Resource_CacheControl* default_val = NULL; const envoy_service_discovery_v3_Resource_CacheControl* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__service__discovery__v3__Resource__CacheControl_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -2012,6 +2087,7 @@ UPB_INLINE const envoy_service_discovery_v3_ResourceName* envoy_service_discover const envoy_service_discovery_v3_ResourceName* default_val = NULL; const envoy_service_discovery_v3_ResourceName* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__service__discovery__v3__ResourceName_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -2028,6 +2104,7 @@ UPB_INLINE const struct envoy_config_core_v3_Metadata* envoy_service_discovery_v 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(32, 88), 68, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Metadata_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -2043,6 +2120,7 @@ UPB_INLINE void envoy_service_discovery_v3_Resource_set_version(envoy_service_di } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); 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) { @@ -2087,6 +2165,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { @@ -2099,6 +2178,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__service__discovery__v3__Resource__CacheControl_msg_init); 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) { @@ -2111,6 +2191,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__service__discovery__v3__ResourceName_msg_init); 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) { @@ -2123,6 +2204,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Metadata_msg_init); 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) { diff --git a/src/core/ext/upb-gen/envoy/service/discovery/v3/discovery.upb_minitable.c b/src/core/ext/upb-gen/envoy/service/discovery/v3/discovery.upb_minitable.c index 744b5fd20f4..5793ae610b8 100644 --- a/src/core/ext/upb-gen/envoy/service/discovery/v3/discovery.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/service/discovery/v3/discovery.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/service/discovery/v3/discovery.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -19,8 +20,9 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub envoy_service_discovery_v3_ResourceLocator_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__service__discovery__v3__ResourceLocator__DynamicParametersEntry_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal envoy_service_discovery_v3_ResourceLocator_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__service__discovery__v3__ResourceLocator__DynamicParametersEntry_msg_init_ptr}, }; static const upb_MiniTableField envoy_service_discovery_v3_ResourceLocator__fields[2] = { @@ -41,6 +43,7 @@ const upb_MiniTable envoy__service__discovery__v3__ResourceLocator_msg_init = { }) }; +const upb_MiniTable* envoy__service__discovery__v3__ResourceLocator_msg_init_ptr = &envoy__service__discovery__v3__ResourceLocator_msg_init; static const upb_MiniTableField envoy_service_discovery_v3_ResourceLocator_DynamicParametersEntry__fields[2] = { {1, 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)}, @@ -61,8 +64,9 @@ const upb_MiniTable envoy__service__discovery__v3__ResourceLocator__DynamicParam }) }; -static const upb_MiniTableSub envoy_service_discovery_v3_ResourceName_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__service__discovery__v3__DynamicParameterConstraints_msg_init}, +const upb_MiniTable* envoy__service__discovery__v3__ResourceLocator__DynamicParametersEntry_msg_init_ptr = &envoy__service__discovery__v3__ResourceLocator__DynamicParametersEntry_msg_init; +static const upb_MiniTableSubInternal envoy_service_discovery_v3_ResourceName_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__service__discovery__v3__DynamicParameterConstraints_msg_init_ptr}, }; static const upb_MiniTableField envoy_service_discovery_v3_ResourceName__fields[2] = { @@ -83,10 +87,11 @@ const upb_MiniTable envoy__service__discovery__v3__ResourceName_msg_init = { }) }; -static const upb_MiniTableSub envoy_service_discovery_v3_DiscoveryRequest_submsgs[3] = { - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Node_msg_init}, - {.UPB_PRIVATE(submsg) = &google__rpc__Status_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__service__discovery__v3__ResourceLocator_msg_init}, +const upb_MiniTable* envoy__service__discovery__v3__ResourceName_msg_init_ptr = &envoy__service__discovery__v3__ResourceName_msg_init; +static const upb_MiniTableSubInternal envoy_service_discovery_v3_DiscoveryRequest_submsgs[3] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Node_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__rpc__Status_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__service__discovery__v3__ResourceLocator_msg_init_ptr}, }; static const upb_MiniTableField envoy_service_discovery_v3_DiscoveryRequest__fields[7] = { @@ -118,9 +123,10 @@ const upb_MiniTable envoy__service__discovery__v3__DiscoveryRequest_msg_init = { }) }; -static const upb_MiniTableSub envoy_service_discovery_v3_DiscoveryResponse_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ControlPlane_msg_init}, +const upb_MiniTable* envoy__service__discovery__v3__DiscoveryRequest_msg_init_ptr = &envoy__service__discovery__v3__DiscoveryRequest_msg_init; +static const upb_MiniTableSubInternal envoy_service_discovery_v3_DiscoveryResponse_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ControlPlane_msg_init_ptr}, }; static const upb_MiniTableField envoy_service_discovery_v3_DiscoveryResponse__fields[6] = { @@ -151,12 +157,13 @@ const upb_MiniTable envoy__service__discovery__v3__DiscoveryResponse_msg_init = }) }; -static const upb_MiniTableSub envoy_service_discovery_v3_DeltaDiscoveryRequest_submsgs[5] = { - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Node_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__service__discovery__v3__DeltaDiscoveryRequest__InitialResourceVersionsEntry_msg_init}, - {.UPB_PRIVATE(submsg) = &google__rpc__Status_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__service__discovery__v3__ResourceLocator_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__service__discovery__v3__ResourceLocator_msg_init}, +const upb_MiniTable* envoy__service__discovery__v3__DiscoveryResponse_msg_init_ptr = &envoy__service__discovery__v3__DiscoveryResponse_msg_init; +static const upb_MiniTableSubInternal envoy_service_discovery_v3_DeltaDiscoveryRequest_submsgs[5] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Node_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__service__discovery__v3__DeltaDiscoveryRequest__InitialResourceVersionsEntry_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__rpc__Status_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__service__discovery__v3__ResourceLocator_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__service__discovery__v3__ResourceLocator_msg_init_ptr}, }; static const upb_MiniTableField envoy_service_discovery_v3_DeltaDiscoveryRequest__fields[9] = { @@ -198,6 +205,7 @@ const upb_MiniTable envoy__service__discovery__v3__DeltaDiscoveryRequest_msg_ini }) }; +const upb_MiniTable* envoy__service__discovery__v3__DeltaDiscoveryRequest_msg_init_ptr = &envoy__service__discovery__v3__DeltaDiscoveryRequest_msg_init; static const upb_MiniTableField envoy_service_discovery_v3_DeltaDiscoveryRequest_InitialResourceVersionsEntry__fields[2] = { {1, 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)}, @@ -218,10 +226,11 @@ const upb_MiniTable envoy__service__discovery__v3__DeltaDiscoveryRequest__Initia }) }; -static const upb_MiniTableSub envoy_service_discovery_v3_DeltaDiscoveryResponse_submsgs[3] = { - {.UPB_PRIVATE(submsg) = &envoy__service__discovery__v3__Resource_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ControlPlane_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__service__discovery__v3__ResourceName_msg_init}, +const upb_MiniTable* envoy__service__discovery__v3__DeltaDiscoveryRequest__InitialResourceVersionsEntry_msg_init_ptr = &envoy__service__discovery__v3__DeltaDiscoveryRequest__InitialResourceVersionsEntry_msg_init; +static const upb_MiniTableSubInternal envoy_service_discovery_v3_DeltaDiscoveryResponse_submsgs[3] = { + {.UPB_PRIVATE(submsg) = &envoy__service__discovery__v3__Resource_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ControlPlane_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__service__discovery__v3__ResourceName_msg_init_ptr}, }; static const upb_MiniTableField envoy_service_discovery_v3_DeltaDiscoveryResponse__fields[7] = { @@ -261,11 +270,12 @@ const upb_MiniTable envoy__service__discovery__v3__DeltaDiscoveryResponse_msg_in }) }; -static const upb_MiniTableSub envoy_service_discovery_v3_DynamicParameterConstraints_submsgs[4] = { - {.UPB_PRIVATE(submsg) = &envoy__service__discovery__v3__DynamicParameterConstraints__SingleConstraint_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__service__discovery__v3__DynamicParameterConstraints__ConstraintList_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__service__discovery__v3__DynamicParameterConstraints__ConstraintList_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__service__discovery__v3__DynamicParameterConstraints_msg_init}, +const upb_MiniTable* envoy__service__discovery__v3__DeltaDiscoveryResponse_msg_init_ptr = &envoy__service__discovery__v3__DeltaDiscoveryResponse_msg_init; +static const upb_MiniTableSubInternal envoy_service_discovery_v3_DynamicParameterConstraints_submsgs[4] = { + {.UPB_PRIVATE(submsg) = &envoy__service__discovery__v3__DynamicParameterConstraints__SingleConstraint_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__service__discovery__v3__DynamicParameterConstraints__ConstraintList_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__service__discovery__v3__DynamicParameterConstraints__ConstraintList_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__service__discovery__v3__DynamicParameterConstraints_msg_init_ptr}, }; static const upb_MiniTableField envoy_service_discovery_v3_DynamicParameterConstraints__fields[4] = { @@ -294,8 +304,9 @@ const upb_MiniTable envoy__service__discovery__v3__DynamicParameterConstraints_m }) }; -static const upb_MiniTableSub envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__service__discovery__v3__DynamicParameterConstraints__SingleConstraint__Exists_msg_init}, +const upb_MiniTable* envoy__service__discovery__v3__DynamicParameterConstraints_msg_init_ptr = &envoy__service__discovery__v3__DynamicParameterConstraints_msg_init; +static const upb_MiniTableSubInternal envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__service__discovery__v3__DynamicParameterConstraints__SingleConstraint__Exists_msg_init_ptr}, }; static const upb_MiniTableField envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint__fields[3] = { @@ -319,6 +330,7 @@ const upb_MiniTable envoy__service__discovery__v3__DynamicParameterConstraints__ }) }; +const upb_MiniTable* envoy__service__discovery__v3__DynamicParameterConstraints__SingleConstraint_msg_init_ptr = &envoy__service__discovery__v3__DynamicParameterConstraints__SingleConstraint_msg_init; const upb_MiniTable envoy__service__discovery__v3__DynamicParameterConstraints__SingleConstraint__Exists_msg_init = { NULL, NULL, @@ -328,8 +340,9 @@ const upb_MiniTable envoy__service__discovery__v3__DynamicParameterConstraints__ #endif }; -static const upb_MiniTableSub envoy_service_discovery_v3_DynamicParameterConstraints_ConstraintList_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__service__discovery__v3__DynamicParameterConstraints_msg_init}, +const upb_MiniTable* envoy__service__discovery__v3__DynamicParameterConstraints__SingleConstraint__Exists_msg_init_ptr = &envoy__service__discovery__v3__DynamicParameterConstraints__SingleConstraint__Exists_msg_init; +static const upb_MiniTableSubInternal envoy_service_discovery_v3_DynamicParameterConstraints_ConstraintList_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__service__discovery__v3__DynamicParameterConstraints_msg_init_ptr}, }; static const upb_MiniTableField envoy_service_discovery_v3_DynamicParameterConstraints_ConstraintList__fields[1] = { @@ -349,12 +362,13 @@ const upb_MiniTable envoy__service__discovery__v3__DynamicParameterConstraints__ }) }; -static const upb_MiniTableSub envoy_service_discovery_v3_Resource_submsgs[5] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__service__discovery__v3__Resource__CacheControl_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__service__discovery__v3__ResourceName_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Metadata_msg_init}, +const upb_MiniTable* envoy__service__discovery__v3__DynamicParameterConstraints__ConstraintList_msg_init_ptr = &envoy__service__discovery__v3__DynamicParameterConstraints__ConstraintList_msg_init; +static const upb_MiniTableSubInternal envoy_service_discovery_v3_Resource_submsgs[5] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__service__discovery__v3__Resource__CacheControl_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__service__discovery__v3__ResourceName_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Metadata_msg_init_ptr}, }; static const upb_MiniTableField envoy_service_discovery_v3_Resource__fields[8] = { @@ -387,6 +401,7 @@ const upb_MiniTable envoy__service__discovery__v3__Resource_msg_init = { }) }; +const upb_MiniTable* envoy__service__discovery__v3__Resource_msg_init_ptr = &envoy__service__discovery__v3__Resource_msg_init; static const upb_MiniTableField envoy_service_discovery_v3_Resource_CacheControl__fields[1] = { {1, 8, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, }; @@ -404,6 +419,7 @@ const upb_MiniTable envoy__service__discovery__v3__Resource__CacheControl_msg_in }) }; +const upb_MiniTable* envoy__service__discovery__v3__Resource__CacheControl_msg_init_ptr = &envoy__service__discovery__v3__Resource__CacheControl_msg_init; static const upb_MiniTable *messages_layout[14] = { &envoy__service__discovery__v3__ResourceLocator_msg_init, &envoy__service__discovery__v3__ResourceLocator__DynamicParametersEntry_msg_init, diff --git a/src/core/ext/upb-gen/envoy/service/discovery/v3/discovery.upb_minitable.h b/src/core/ext/upb-gen/envoy/service/discovery/v3/discovery.upb_minitable.h index 225a402041a..95a5c2f72e7 100644 --- a/src/core/ext/upb-gen/envoy/service/discovery/v3/discovery.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/service/discovery/v3/discovery.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/service/discovery/v3/discovery.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_SERVICE_DISCOVERY_V3_DISCOVERY_PROTO_UPB_MINITABLE_H_ #define ENVOY_SERVICE_DISCOVERY_V3_DISCOVERY_PROTO_UPB_MINITABLE_H_ @@ -18,19 +19,33 @@ extern "C" { #endif extern const upb_MiniTable envoy__service__discovery__v3__ResourceLocator_msg_init; +extern const upb_MiniTable* envoy__service__discovery__v3__ResourceLocator_msg_init_ptr; extern const upb_MiniTable envoy__service__discovery__v3__ResourceLocator__DynamicParametersEntry_msg_init; +extern const upb_MiniTable* envoy__service__discovery__v3__ResourceLocator__DynamicParametersEntry_msg_init_ptr; extern const upb_MiniTable envoy__service__discovery__v3__ResourceName_msg_init; +extern const upb_MiniTable* envoy__service__discovery__v3__ResourceName_msg_init_ptr; extern const upb_MiniTable envoy__service__discovery__v3__DiscoveryRequest_msg_init; +extern const upb_MiniTable* envoy__service__discovery__v3__DiscoveryRequest_msg_init_ptr; extern const upb_MiniTable envoy__service__discovery__v3__DiscoveryResponse_msg_init; +extern const upb_MiniTable* envoy__service__discovery__v3__DiscoveryResponse_msg_init_ptr; extern const upb_MiniTable envoy__service__discovery__v3__DeltaDiscoveryRequest_msg_init; +extern const upb_MiniTable* envoy__service__discovery__v3__DeltaDiscoveryRequest_msg_init_ptr; extern const upb_MiniTable envoy__service__discovery__v3__DeltaDiscoveryRequest__InitialResourceVersionsEntry_msg_init; +extern const upb_MiniTable* envoy__service__discovery__v3__DeltaDiscoveryRequest__InitialResourceVersionsEntry_msg_init_ptr; extern const upb_MiniTable envoy__service__discovery__v3__DeltaDiscoveryResponse_msg_init; +extern const upb_MiniTable* envoy__service__discovery__v3__DeltaDiscoveryResponse_msg_init_ptr; extern const upb_MiniTable envoy__service__discovery__v3__DynamicParameterConstraints_msg_init; +extern const upb_MiniTable* envoy__service__discovery__v3__DynamicParameterConstraints_msg_init_ptr; extern const upb_MiniTable envoy__service__discovery__v3__DynamicParameterConstraints__SingleConstraint_msg_init; +extern const upb_MiniTable* envoy__service__discovery__v3__DynamicParameterConstraints__SingleConstraint_msg_init_ptr; extern const upb_MiniTable envoy__service__discovery__v3__DynamicParameterConstraints__SingleConstraint__Exists_msg_init; +extern const upb_MiniTable* envoy__service__discovery__v3__DynamicParameterConstraints__SingleConstraint__Exists_msg_init_ptr; extern const upb_MiniTable envoy__service__discovery__v3__DynamicParameterConstraints__ConstraintList_msg_init; +extern const upb_MiniTable* envoy__service__discovery__v3__DynamicParameterConstraints__ConstraintList_msg_init_ptr; extern const upb_MiniTable envoy__service__discovery__v3__Resource_msg_init; +extern const upb_MiniTable* envoy__service__discovery__v3__Resource_msg_init_ptr; extern const upb_MiniTable envoy__service__discovery__v3__Resource__CacheControl_msg_init; +extern const upb_MiniTable* envoy__service__discovery__v3__Resource__CacheControl_msg_init_ptr; extern const upb_MiniTableFile envoy_service_discovery_v3_discovery_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/service/load_stats/v3/lrs.upb.h b/src/core/ext/upb-gen/envoy/service/load_stats/v3/lrs.upb.h index 3a54812419d..fab8ea107d0 100644 --- a/src/core/ext/upb-gen/envoy/service/load_stats/v3/lrs.upb.h +++ b/src/core/ext/upb-gen/envoy/service/load_stats/v3/lrs.upb.h @@ -3,7 +3,8 @@ * envoy/service/load_stats/v3/lrs.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_SERVICE_LOAD_STATS_V3_LRS_PROTO_UPB_H_ #define ENVOY_SERVICE_LOAD_STATS_V3_LRS_PROTO_UPB_H_ @@ -77,6 +78,7 @@ UPB_INLINE const struct envoy_config_core_v3_Node* envoy_service_load_stats_v3_L 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, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Node_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -91,6 +93,7 @@ UPB_INLINE void envoy_service_load_stats_v3_LoadStatsRequest_clear_cluster_stats } UPB_INLINE const struct envoy_config_endpoint_v3_ClusterStats* const* envoy_service_load_stats_v3_LoadStatsRequest_cluster_stats(const envoy_service_load_stats_v3_LoadStatsRequest* msg, size_t* size) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__endpoint__v3__ClusterStats_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -102,6 +105,7 @@ UPB_INLINE const struct envoy_config_endpoint_v3_ClusterStats* const* envoy_serv } UPB_INLINE const upb_Array* _envoy_service_load_stats_v3_LoadStatsRequest_cluster_stats_upb_array(const envoy_service_load_stats_v3_LoadStatsRequest* msg, size_t* size) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__endpoint__v3__ClusterStats_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -110,6 +114,7 @@ UPB_INLINE const upb_Array* _envoy_service_load_stats_v3_LoadStatsRequest_cluste } UPB_INLINE upb_Array* _envoy_service_load_stats_v3_LoadStatsRequest_cluster_stats_mutable_upb_array(envoy_service_load_stats_v3_LoadStatsRequest* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__endpoint__v3__ClusterStats_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -120,6 +125,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Node_msg_init); 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) { @@ -132,6 +138,7 @@ UPB_INLINE struct envoy_config_core_v3_Node* envoy_service_load_stats_v3_LoadSta } UPB_INLINE struct envoy_config_endpoint_v3_ClusterStats** envoy_service_load_stats_v3_LoadStatsRequest_mutable_cluster_stats(envoy_service_load_stats_v3_LoadStatsRequest* msg, size_t* size) { upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__endpoint__v3__ClusterStats_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -148,6 +155,7 @@ UPB_INLINE struct envoy_config_endpoint_v3_ClusterStats** envoy_service_load_sta } UPB_INLINE struct envoy_config_endpoint_v3_ClusterStats* envoy_service_load_stats_v3_LoadStatsRequest_add_cluster_stats(envoy_service_load_stats_v3_LoadStatsRequest* msg, upb_Arena* arena) { upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__endpoint__v3__ClusterStats_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -237,6 +245,7 @@ UPB_INLINE const struct google_protobuf_Duration* envoy_service_load_stats_v3_Lo const struct google_protobuf_Duration* default_val = NULL; const struct google_protobuf_Duration* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -300,6 +309,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { diff --git a/src/core/ext/upb-gen/envoy/service/load_stats/v3/lrs.upb_minitable.c b/src/core/ext/upb-gen/envoy/service/load_stats/v3/lrs.upb_minitable.c index 9692dc55306..08ef903046d 100644 --- a/src/core/ext/upb-gen/envoy/service/load_stats/v3/lrs.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/service/load_stats/v3/lrs.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/service/load_stats/v3/lrs.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -17,9 +18,10 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub envoy_service_load_stats_v3_LoadStatsRequest_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Node_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__endpoint__v3__ClusterStats_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal envoy_service_load_stats_v3_LoadStatsRequest_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Node_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__endpoint__v3__ClusterStats_msg_init_ptr}, }; static const upb_MiniTableField envoy_service_load_stats_v3_LoadStatsRequest__fields[2] = { @@ -42,8 +44,9 @@ const upb_MiniTable envoy__service__load_0stats__v3__LoadStatsRequest_msg_init = }) }; -static const upb_MiniTableSub envoy_service_load_stats_v3_LoadStatsResponse_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, +const upb_MiniTable* envoy__service__load_0stats__v3__LoadStatsRequest_msg_init_ptr = &envoy__service__load_0stats__v3__LoadStatsRequest_msg_init; +static const upb_MiniTableSubInternal envoy_service_load_stats_v3_LoadStatsResponse_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, }; static const upb_MiniTableField envoy_service_load_stats_v3_LoadStatsResponse__fields[4] = { @@ -72,6 +75,7 @@ const upb_MiniTable envoy__service__load_0stats__v3__LoadStatsResponse_msg_init }) }; +const upb_MiniTable* envoy__service__load_0stats__v3__LoadStatsResponse_msg_init_ptr = &envoy__service__load_0stats__v3__LoadStatsResponse_msg_init; static const upb_MiniTable *messages_layout[2] = { &envoy__service__load_0stats__v3__LoadStatsRequest_msg_init, &envoy__service__load_0stats__v3__LoadStatsResponse_msg_init, diff --git a/src/core/ext/upb-gen/envoy/service/load_stats/v3/lrs.upb_minitable.h b/src/core/ext/upb-gen/envoy/service/load_stats/v3/lrs.upb_minitable.h index b5248c8ae83..cdcb76f9526 100644 --- a/src/core/ext/upb-gen/envoy/service/load_stats/v3/lrs.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/service/load_stats/v3/lrs.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/service/load_stats/v3/lrs.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_SERVICE_LOAD_STATS_V3_LRS_PROTO_UPB_MINITABLE_H_ #define ENVOY_SERVICE_LOAD_STATS_V3_LRS_PROTO_UPB_MINITABLE_H_ @@ -18,7 +19,9 @@ extern "C" { #endif extern const upb_MiniTable envoy__service__load_0stats__v3__LoadStatsRequest_msg_init; +extern const upb_MiniTable* envoy__service__load_0stats__v3__LoadStatsRequest_msg_init_ptr; extern const upb_MiniTable envoy__service__load_0stats__v3__LoadStatsResponse_msg_init; +extern const upb_MiniTable* envoy__service__load_0stats__v3__LoadStatsResponse_msg_init_ptr; extern const upb_MiniTableFile envoy_service_load_stats_v3_lrs_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/service/status/v3/csds.upb.h b/src/core/ext/upb-gen/envoy/service/status/v3/csds.upb.h index 65767ff2c10..05c78f8dfc8 100644 --- a/src/core/ext/upb-gen/envoy/service/status/v3/csds.upb.h +++ b/src/core/ext/upb-gen/envoy/service/status/v3/csds.upb.h @@ -3,7 +3,8 @@ * envoy/service/status/v3/csds.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_SERVICE_STATUS_V3_CSDS_PROTO_UPB_H_ #define ENVOY_SERVICE_STATUS_V3_CSDS_PROTO_UPB_H_ @@ -104,6 +105,7 @@ UPB_INLINE void envoy_service_status_v3_ClientStatusRequest_clear_node_matchers( } UPB_INLINE const struct envoy_type_matcher_v3_NodeMatcher* const* envoy_service_status_v3_ClientStatusRequest_node_matchers(const envoy_service_status_v3_ClientStatusRequest* msg, size_t* size) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__NodeMatcher_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -115,6 +117,7 @@ UPB_INLINE const struct envoy_type_matcher_v3_NodeMatcher* const* envoy_service_ } UPB_INLINE const upb_Array* _envoy_service_status_v3_ClientStatusRequest_node_matchers_upb_array(const envoy_service_status_v3_ClientStatusRequest* msg, size_t* size) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__NodeMatcher_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -123,6 +126,7 @@ UPB_INLINE const upb_Array* _envoy_service_status_v3_ClientStatusRequest_node_ma } UPB_INLINE upb_Array* _envoy_service_status_v3_ClientStatusRequest_node_matchers_mutable_upb_array(envoy_service_status_v3_ClientStatusRequest* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__NodeMatcher_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -138,6 +142,7 @@ UPB_INLINE const struct envoy_config_core_v3_Node* envoy_service_status_v3_Clien const struct envoy_config_core_v3_Node* default_val = NULL; const struct envoy_config_core_v3_Node* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Node_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -161,6 +166,7 @@ UPB_INLINE bool envoy_service_status_v3_ClientStatusRequest_exclude_resource_con UPB_INLINE struct envoy_type_matcher_v3_NodeMatcher** envoy_service_status_v3_ClientStatusRequest_mutable_node_matchers(envoy_service_status_v3_ClientStatusRequest* msg, size_t* size) { upb_MiniTableField field = {1, UPB_SIZE(12, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__NodeMatcher_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -177,6 +183,7 @@ UPB_INLINE struct envoy_type_matcher_v3_NodeMatcher** envoy_service_status_v3_Cl } UPB_INLINE struct envoy_type_matcher_v3_NodeMatcher* envoy_service_status_v3_ClientStatusRequest_add_node_matchers(envoy_service_status_v3_ClientStatusRequest* msg, upb_Arena* arena) { upb_MiniTableField field = {1, UPB_SIZE(12, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__NodeMatcher_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -191,6 +198,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Node_msg_init); 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) { @@ -275,6 +283,7 @@ UPB_INLINE const struct envoy_admin_v3_ListenersConfigDump* envoy_service_status const struct envoy_admin_v3_ListenersConfigDump* default_val = NULL; const struct envoy_admin_v3_ListenersConfigDump* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__ListenersConfigDump_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -291,6 +300,7 @@ UPB_INLINE const struct envoy_admin_v3_ClustersConfigDump* envoy_service_status_ const struct envoy_admin_v3_ClustersConfigDump* default_val = NULL; const struct envoy_admin_v3_ClustersConfigDump* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__ClustersConfigDump_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -307,6 +317,7 @@ UPB_INLINE const struct envoy_admin_v3_RoutesConfigDump* envoy_service_status_v3 const struct envoy_admin_v3_RoutesConfigDump* default_val = NULL; const struct envoy_admin_v3_RoutesConfigDump* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__RoutesConfigDump_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -323,6 +334,7 @@ UPB_INLINE const struct envoy_admin_v3_ScopedRoutesConfigDump* envoy_service_sta const struct envoy_admin_v3_ScopedRoutesConfigDump* default_val = NULL; const struct envoy_admin_v3_ScopedRoutesConfigDump* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__ScopedRoutesConfigDump_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -339,6 +351,7 @@ UPB_INLINE const struct envoy_admin_v3_EndpointsConfigDump* envoy_service_status const struct envoy_admin_v3_EndpointsConfigDump* default_val = NULL; const struct envoy_admin_v3_EndpointsConfigDump* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__EndpointsConfigDump_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -366,6 +379,7 @@ UPB_INLINE void envoy_service_status_v3_PerXdsConfig_set_status(envoy_service_st } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__ListenersConfigDump_msg_init); 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) { @@ -378,6 +392,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__ClustersConfigDump_msg_init); 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) { @@ -390,6 +405,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__RoutesConfigDump_msg_init); 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) { @@ -402,6 +418,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__ScopedRoutesConfigDump_msg_init); 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) { @@ -414,6 +431,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__EndpointsConfigDump_msg_init); 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) { @@ -473,6 +491,7 @@ UPB_INLINE const struct envoy_config_core_v3_Node* envoy_service_status_v3_Clien 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, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Node_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -487,6 +506,7 @@ UPB_INLINE void envoy_service_status_v3_ClientConfig_clear_xds_config(envoy_serv } UPB_INLINE const envoy_service_status_v3_PerXdsConfig* const* envoy_service_status_v3_ClientConfig_xds_config(const envoy_service_status_v3_ClientConfig* msg, size_t* size) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__service__status__v3__PerXdsConfig_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -498,6 +518,7 @@ UPB_INLINE const envoy_service_status_v3_PerXdsConfig* const* envoy_service_stat } UPB_INLINE const upb_Array* _envoy_service_status_v3_ClientConfig_xds_config_upb_array(const envoy_service_status_v3_ClientConfig* msg, size_t* size) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__service__status__v3__PerXdsConfig_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -506,6 +527,7 @@ UPB_INLINE const upb_Array* _envoy_service_status_v3_ClientConfig_xds_config_upb } UPB_INLINE upb_Array* _envoy_service_status_v3_ClientConfig_xds_config_mutable_upb_array(envoy_service_status_v3_ClientConfig* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__service__status__v3__PerXdsConfig_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -519,6 +541,7 @@ UPB_INLINE void envoy_service_status_v3_ClientConfig_clear_generic_xds_configs(e } UPB_INLINE const envoy_service_status_v3_ClientConfig_GenericXdsConfig* const* envoy_service_status_v3_ClientConfig_generic_xds_configs(const envoy_service_status_v3_ClientConfig* msg, size_t* size) { const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__service__status__v3__ClientConfig__GenericXdsConfig_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -530,6 +553,7 @@ UPB_INLINE const envoy_service_status_v3_ClientConfig_GenericXdsConfig* const* e } UPB_INLINE const upb_Array* _envoy_service_status_v3_ClientConfig_generic_xds_configs_upb_array(const envoy_service_status_v3_ClientConfig* msg, size_t* size) { const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__service__status__v3__ClientConfig__GenericXdsConfig_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -538,6 +562,7 @@ UPB_INLINE const upb_Array* _envoy_service_status_v3_ClientConfig_generic_xds_co } UPB_INLINE upb_Array* _envoy_service_status_v3_ClientConfig_generic_xds_configs_mutable_upb_array(envoy_service_status_v3_ClientConfig* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__service__status__v3__ClientConfig__GenericXdsConfig_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -560,6 +585,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__Node_msg_init); 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) { @@ -572,6 +598,7 @@ UPB_INLINE struct envoy_config_core_v3_Node* envoy_service_status_v3_ClientConfi } UPB_INLINE envoy_service_status_v3_PerXdsConfig** envoy_service_status_v3_ClientConfig_mutable_xds_config(envoy_service_status_v3_ClientConfig* msg, size_t* size) { upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__service__status__v3__PerXdsConfig_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -588,6 +615,7 @@ UPB_INLINE envoy_service_status_v3_PerXdsConfig** envoy_service_status_v3_Client } UPB_INLINE struct envoy_service_status_v3_PerXdsConfig* envoy_service_status_v3_ClientConfig_add_xds_config(envoy_service_status_v3_ClientConfig* msg, upb_Arena* arena) { upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__service__status__v3__PerXdsConfig_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -602,6 +630,7 @@ UPB_INLINE struct envoy_service_status_v3_PerXdsConfig* envoy_service_status_v3_ } UPB_INLINE envoy_service_status_v3_ClientConfig_GenericXdsConfig** envoy_service_status_v3_ClientConfig_mutable_generic_xds_configs(envoy_service_status_v3_ClientConfig* msg, size_t* size) { upb_MiniTableField field = {3, UPB_SIZE(20, 32), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__service__status__v3__ClientConfig__GenericXdsConfig_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -618,6 +647,7 @@ UPB_INLINE envoy_service_status_v3_ClientConfig_GenericXdsConfig** envoy_service } UPB_INLINE struct envoy_service_status_v3_ClientConfig_GenericXdsConfig* envoy_service_status_v3_ClientConfig_add_generic_xds_configs(envoy_service_status_v3_ClientConfig* msg, upb_Arena* arena) { upb_MiniTableField field = {3, UPB_SIZE(20, 32), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__service__status__v3__ClientConfig__GenericXdsConfig_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -715,6 +745,7 @@ UPB_INLINE const struct google_protobuf_Any* envoy_service_status_v3_ClientConfi const struct google_protobuf_Any* default_val = NULL; const struct google_protobuf_Any* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -731,6 +762,7 @@ UPB_INLINE const struct google_protobuf_Timestamp* envoy_service_status_v3_Clien const struct google_protobuf_Timestamp* default_val = NULL; const struct google_protobuf_Timestamp* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Timestamp_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -771,6 +803,7 @@ UPB_INLINE const struct envoy_admin_v3_UpdateFailureState* envoy_service_status_ const struct envoy_admin_v3_UpdateFailureState* default_val = NULL; const struct envoy_admin_v3_UpdateFailureState* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__UpdateFailureState_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -806,6 +839,7 @@ UPB_INLINE void envoy_service_status_v3_ClientConfig_GenericXdsConfig_set_versio } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); 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) { @@ -818,6 +852,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Timestamp_msg_init); 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) { @@ -838,6 +873,7 @@ UPB_INLINE void envoy_service_status_v3_ClientConfig_GenericXdsConfig_set_client } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__admin__v3__UpdateFailureState_msg_init); 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) { @@ -895,6 +931,7 @@ UPB_INLINE void envoy_service_status_v3_ClientStatusResponse_clear_config(envoy_ } UPB_INLINE const envoy_service_status_v3_ClientConfig* const* envoy_service_status_v3_ClientStatusResponse_config(const envoy_service_status_v3_ClientStatusResponse* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__service__status__v3__ClientConfig_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -906,6 +943,7 @@ UPB_INLINE const envoy_service_status_v3_ClientConfig* const* envoy_service_stat } UPB_INLINE const upb_Array* _envoy_service_status_v3_ClientStatusResponse_config_upb_array(const envoy_service_status_v3_ClientStatusResponse* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__service__status__v3__ClientConfig_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -914,6 +952,7 @@ UPB_INLINE const upb_Array* _envoy_service_status_v3_ClientStatusResponse_config } UPB_INLINE upb_Array* _envoy_service_status_v3_ClientStatusResponse_config_mutable_upb_array(envoy_service_status_v3_ClientStatusResponse* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__service__status__v3__ClientConfig_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -924,6 +963,7 @@ UPB_INLINE upb_Array* _envoy_service_status_v3_ClientStatusResponse_config_mutab UPB_INLINE envoy_service_status_v3_ClientConfig** envoy_service_status_v3_ClientStatusResponse_mutable_config(envoy_service_status_v3_ClientStatusResponse* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__service__status__v3__ClientConfig_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -940,6 +980,7 @@ UPB_INLINE envoy_service_status_v3_ClientConfig** envoy_service_status_v3_Client } UPB_INLINE struct envoy_service_status_v3_ClientConfig* envoy_service_status_v3_ClientStatusResponse_add_config(envoy_service_status_v3_ClientStatusResponse* msg, upb_Arena* arena) { upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__service__status__v3__ClientConfig_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( diff --git a/src/core/ext/upb-gen/envoy/service/status/v3/csds.upb_minitable.c b/src/core/ext/upb-gen/envoy/service/status/v3/csds.upb_minitable.c index 4dafb073d45..b84e5136cc3 100644 --- a/src/core/ext/upb-gen/envoy/service/status/v3/csds.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/service/status/v3/csds.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/service/status/v3/csds.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -21,9 +22,10 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub envoy_service_status_v3_ClientStatusRequest_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__NodeMatcher_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Node_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal envoy_service_status_v3_ClientStatusRequest_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__NodeMatcher_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Node_msg_init_ptr}, }; static const upb_MiniTableField envoy_service_status_v3_ClientStatusRequest__fields[3] = { @@ -47,12 +49,13 @@ const upb_MiniTable envoy__service__status__v3__ClientStatusRequest_msg_init = { }) }; -static const upb_MiniTableSub envoy_service_status_v3_PerXdsConfig_submsgs[5] = { - {.UPB_PRIVATE(submsg) = &envoy__admin__v3__ListenersConfigDump_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__admin__v3__ClustersConfigDump_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__admin__v3__RoutesConfigDump_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__admin__v3__ScopedRoutesConfigDump_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__admin__v3__EndpointsConfigDump_msg_init}, +const upb_MiniTable* envoy__service__status__v3__ClientStatusRequest_msg_init_ptr = &envoy__service__status__v3__ClientStatusRequest_msg_init; +static const upb_MiniTableSubInternal envoy_service_status_v3_PerXdsConfig_submsgs[5] = { + {.UPB_PRIVATE(submsg) = &envoy__admin__v3__ListenersConfigDump_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__admin__v3__ClustersConfigDump_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__admin__v3__RoutesConfigDump_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__admin__v3__ScopedRoutesConfigDump_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__admin__v3__EndpointsConfigDump_msg_init_ptr}, }; static const upb_MiniTableField envoy_service_status_v3_PerXdsConfig__fields[7] = { @@ -84,10 +87,11 @@ const upb_MiniTable envoy__service__status__v3__PerXdsConfig_msg_init = { }) }; -static const upb_MiniTableSub envoy_service_status_v3_ClientConfig_submsgs[3] = { - {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Node_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__service__status__v3__PerXdsConfig_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__service__status__v3__ClientConfig__GenericXdsConfig_msg_init}, +const upb_MiniTable* envoy__service__status__v3__PerXdsConfig_msg_init_ptr = &envoy__service__status__v3__PerXdsConfig_msg_init; +static const upb_MiniTableSubInternal envoy_service_status_v3_ClientConfig_submsgs[3] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Node_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__service__status__v3__PerXdsConfig_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__service__status__v3__ClientConfig__GenericXdsConfig_msg_init_ptr}, }; static const upb_MiniTableField envoy_service_status_v3_ClientConfig__fields[4] = { @@ -116,10 +120,11 @@ const upb_MiniTable envoy__service__status__v3__ClientConfig_msg_init = { }) }; -static const upb_MiniTableSub envoy_service_status_v3_ClientConfig_GenericXdsConfig_submsgs[3] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__admin__v3__UpdateFailureState_msg_init}, +const upb_MiniTable* envoy__service__status__v3__ClientConfig_msg_init_ptr = &envoy__service__status__v3__ClientConfig_msg_init; +static const upb_MiniTableSubInternal envoy_service_status_v3_ClientConfig_GenericXdsConfig_submsgs[3] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__admin__v3__UpdateFailureState_msg_init_ptr}, }; static const upb_MiniTableField envoy_service_status_v3_ClientConfig_GenericXdsConfig__fields[9] = { @@ -161,8 +166,9 @@ const upb_MiniTable envoy__service__status__v3__ClientConfig__GenericXdsConfig_m }) }; -static const upb_MiniTableSub envoy_service_status_v3_ClientStatusResponse_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__service__status__v3__ClientConfig_msg_init}, +const upb_MiniTable* envoy__service__status__v3__ClientConfig__GenericXdsConfig_msg_init_ptr = &envoy__service__status__v3__ClientConfig__GenericXdsConfig_msg_init; +static const upb_MiniTableSubInternal envoy_service_status_v3_ClientStatusResponse_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__service__status__v3__ClientConfig_msg_init_ptr}, }; static const upb_MiniTableField envoy_service_status_v3_ClientStatusResponse__fields[1] = { @@ -182,6 +188,7 @@ const upb_MiniTable envoy__service__status__v3__ClientStatusResponse_msg_init = }) }; +const upb_MiniTable* envoy__service__status__v3__ClientStatusResponse_msg_init_ptr = &envoy__service__status__v3__ClientStatusResponse_msg_init; static const upb_MiniTable *messages_layout[5] = { &envoy__service__status__v3__ClientStatusRequest_msg_init, &envoy__service__status__v3__PerXdsConfig_msg_init, diff --git a/src/core/ext/upb-gen/envoy/service/status/v3/csds.upb_minitable.h b/src/core/ext/upb-gen/envoy/service/status/v3/csds.upb_minitable.h index 0deeb2762d9..07d360f42f7 100644 --- a/src/core/ext/upb-gen/envoy/service/status/v3/csds.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/service/status/v3/csds.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/service/status/v3/csds.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_SERVICE_STATUS_V3_CSDS_PROTO_UPB_MINITABLE_H_ #define ENVOY_SERVICE_STATUS_V3_CSDS_PROTO_UPB_MINITABLE_H_ @@ -18,10 +19,15 @@ extern "C" { #endif extern const upb_MiniTable envoy__service__status__v3__ClientStatusRequest_msg_init; +extern const upb_MiniTable* envoy__service__status__v3__ClientStatusRequest_msg_init_ptr; extern const upb_MiniTable envoy__service__status__v3__PerXdsConfig_msg_init; +extern const upb_MiniTable* envoy__service__status__v3__PerXdsConfig_msg_init_ptr; extern const upb_MiniTable envoy__service__status__v3__ClientConfig_msg_init; +extern const upb_MiniTable* envoy__service__status__v3__ClientConfig_msg_init_ptr; extern const upb_MiniTable envoy__service__status__v3__ClientConfig__GenericXdsConfig_msg_init; +extern const upb_MiniTable* envoy__service__status__v3__ClientConfig__GenericXdsConfig_msg_init_ptr; extern const upb_MiniTable envoy__service__status__v3__ClientStatusResponse_msg_init; +extern const upb_MiniTable* envoy__service__status__v3__ClientStatusResponse_msg_init_ptr; extern const upb_MiniTableFile envoy_service_status_v3_csds_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/type/http/v3/cookie.upb.h b/src/core/ext/upb-gen/envoy/type/http/v3/cookie.upb.h index d55b10d8660..179fbe3e289 100644 --- a/src/core/ext/upb-gen/envoy/type/http/v3/cookie.upb.h +++ b/src/core/ext/upb-gen/envoy/type/http/v3/cookie.upb.h @@ -3,7 +3,8 @@ * envoy/type/http/v3/cookie.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_TYPE_HTTP_V3_COOKIE_PROTO_UPB_H_ #define ENVOY_TYPE_HTTP_V3_COOKIE_PROTO_UPB_H_ @@ -84,6 +85,7 @@ UPB_INLINE const struct google_protobuf_Duration* envoy_type_http_v3_Cookie_ttl( const struct google_protobuf_Duration* default_val = NULL; const struct google_protobuf_Duration* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -111,6 +113,7 @@ UPB_INLINE void envoy_type_http_v3_Cookie_set_name(envoy_type_http_v3_Cookie *ms } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { diff --git a/src/core/ext/upb-gen/envoy/type/http/v3/cookie.upb_minitable.c b/src/core/ext/upb-gen/envoy/type/http/v3/cookie.upb_minitable.c index 4a43d458d20..fd87b4de2f7 100644 --- a/src/core/ext/upb-gen/envoy/type/http/v3/cookie.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/type/http/v3/cookie.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/type/http/v3/cookie.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -15,8 +16,9 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub envoy_type_http_v3_Cookie_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal envoy_type_http_v3_Cookie_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, }; static const upb_MiniTableField envoy_type_http_v3_Cookie__fields[3] = { @@ -40,6 +42,7 @@ const upb_MiniTable envoy__type__http__v3__Cookie_msg_init = { }) }; +const upb_MiniTable* envoy__type__http__v3__Cookie_msg_init_ptr = &envoy__type__http__v3__Cookie_msg_init; static const upb_MiniTable *messages_layout[1] = { &envoy__type__http__v3__Cookie_msg_init, }; diff --git a/src/core/ext/upb-gen/envoy/type/http/v3/cookie.upb_minitable.h b/src/core/ext/upb-gen/envoy/type/http/v3/cookie.upb_minitable.h index 6f345ce31a1..109b94018b4 100644 --- a/src/core/ext/upb-gen/envoy/type/http/v3/cookie.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/type/http/v3/cookie.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/type/http/v3/cookie.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_TYPE_HTTP_V3_COOKIE_PROTO_UPB_MINITABLE_H_ #define ENVOY_TYPE_HTTP_V3_COOKIE_PROTO_UPB_MINITABLE_H_ @@ -18,6 +19,7 @@ extern "C" { #endif extern const upb_MiniTable envoy__type__http__v3__Cookie_msg_init; +extern const upb_MiniTable* envoy__type__http__v3__Cookie_msg_init_ptr; extern const upb_MiniTableFile envoy_type_http_v3_cookie_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/type/http/v3/path_transformation.upb.h b/src/core/ext/upb-gen/envoy/type/http/v3/path_transformation.upb.h index c9606652655..57c4f05a6d1 100644 --- a/src/core/ext/upb-gen/envoy/type/http/v3/path_transformation.upb.h +++ b/src/core/ext/upb-gen/envoy/type/http/v3/path_transformation.upb.h @@ -3,7 +3,8 @@ * envoy/type/http/v3/path_transformation.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_TYPE_HTTP_V3_PATH_TRANSFORMATION_PROTO_UPB_H_ #define ENVOY_TYPE_HTTP_V3_PATH_TRANSFORMATION_PROTO_UPB_H_ @@ -71,6 +72,7 @@ UPB_INLINE void envoy_type_http_v3_PathTransformation_clear_operations(envoy_typ } UPB_INLINE const envoy_type_http_v3_PathTransformation_Operation* const* envoy_type_http_v3_PathTransformation_operations(const envoy_type_http_v3_PathTransformation* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__http__v3__PathTransformation__Operation_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -82,6 +84,7 @@ UPB_INLINE const envoy_type_http_v3_PathTransformation_Operation* const* envoy_t } UPB_INLINE const upb_Array* _envoy_type_http_v3_PathTransformation_operations_upb_array(const envoy_type_http_v3_PathTransformation* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__http__v3__PathTransformation__Operation_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -90,6 +93,7 @@ UPB_INLINE const upb_Array* _envoy_type_http_v3_PathTransformation_operations_up } UPB_INLINE upb_Array* _envoy_type_http_v3_PathTransformation_operations_mutable_upb_array(envoy_type_http_v3_PathTransformation* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__http__v3__PathTransformation__Operation_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -100,6 +104,7 @@ UPB_INLINE upb_Array* _envoy_type_http_v3_PathTransformation_operations_mutable_ UPB_INLINE envoy_type_http_v3_PathTransformation_Operation** envoy_type_http_v3_PathTransformation_mutable_operations(envoy_type_http_v3_PathTransformation* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__http__v3__PathTransformation__Operation_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -116,6 +121,7 @@ UPB_INLINE envoy_type_http_v3_PathTransformation_Operation** envoy_type_http_v3_ } UPB_INLINE struct envoy_type_http_v3_PathTransformation_Operation* envoy_type_http_v3_PathTransformation_add_operations(envoy_type_http_v3_PathTransformation* msg, upb_Arena* arena) { upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__http__v3__PathTransformation__Operation_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -183,6 +189,7 @@ UPB_INLINE const envoy_type_http_v3_PathTransformation_Operation_NormalizePathRF const envoy_type_http_v3_PathTransformation_Operation_NormalizePathRFC3986* default_val = NULL; const envoy_type_http_v3_PathTransformation_Operation_NormalizePathRFC3986* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__http__v3__PathTransformation__Operation__NormalizePathRFC3986_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -199,6 +206,7 @@ UPB_INLINE const envoy_type_http_v3_PathTransformation_Operation_MergeSlashes* e const envoy_type_http_v3_PathTransformation_Operation_MergeSlashes* default_val = NULL; const envoy_type_http_v3_PathTransformation_Operation_MergeSlashes* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__http__v3__PathTransformation__Operation__MergeSlashes_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -210,6 +218,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__http__v3__PathTransformation__Operation__NormalizePathRFC3986_msg_init); 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) { @@ -222,6 +231,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__http__v3__PathTransformation__Operation__MergeSlashes_msg_init); 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) { diff --git a/src/core/ext/upb-gen/envoy/type/http/v3/path_transformation.upb_minitable.c b/src/core/ext/upb-gen/envoy/type/http/v3/path_transformation.upb_minitable.c index 210a0daa64a..7197abbfd5c 100644 --- a/src/core/ext/upb-gen/envoy/type/http/v3/path_transformation.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/type/http/v3/path_transformation.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/type/http/v3/path_transformation.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -14,8 +15,9 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub envoy_type_http_v3_PathTransformation_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__type__http__v3__PathTransformation__Operation_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal envoy_type_http_v3_PathTransformation_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__type__http__v3__PathTransformation__Operation_msg_init_ptr}, }; static const upb_MiniTableField envoy_type_http_v3_PathTransformation__fields[1] = { @@ -35,9 +37,10 @@ const upb_MiniTable envoy__type__http__v3__PathTransformation_msg_init = { }) }; -static const upb_MiniTableSub envoy_type_http_v3_PathTransformation_Operation_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &envoy__type__http__v3__PathTransformation__Operation__NormalizePathRFC3986_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__type__http__v3__PathTransformation__Operation__MergeSlashes_msg_init}, +const upb_MiniTable* envoy__type__http__v3__PathTransformation_msg_init_ptr = &envoy__type__http__v3__PathTransformation_msg_init; +static const upb_MiniTableSubInternal envoy_type_http_v3_PathTransformation_Operation_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &envoy__type__http__v3__PathTransformation__Operation__NormalizePathRFC3986_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__type__http__v3__PathTransformation__Operation__MergeSlashes_msg_init_ptr}, }; static const upb_MiniTableField envoy_type_http_v3_PathTransformation_Operation__fields[2] = { @@ -60,6 +63,7 @@ const upb_MiniTable envoy__type__http__v3__PathTransformation__Operation_msg_ini }) }; +const upb_MiniTable* envoy__type__http__v3__PathTransformation__Operation_msg_init_ptr = &envoy__type__http__v3__PathTransformation__Operation_msg_init; const upb_MiniTable envoy__type__http__v3__PathTransformation__Operation__NormalizePathRFC3986_msg_init = { NULL, NULL, @@ -69,6 +73,7 @@ const upb_MiniTable envoy__type__http__v3__PathTransformation__Operation__Normal #endif }; +const upb_MiniTable* envoy__type__http__v3__PathTransformation__Operation__NormalizePathRFC3986_msg_init_ptr = &envoy__type__http__v3__PathTransformation__Operation__NormalizePathRFC3986_msg_init; const upb_MiniTable envoy__type__http__v3__PathTransformation__Operation__MergeSlashes_msg_init = { NULL, NULL, @@ -78,6 +83,7 @@ const upb_MiniTable envoy__type__http__v3__PathTransformation__Operation__MergeS #endif }; +const upb_MiniTable* envoy__type__http__v3__PathTransformation__Operation__MergeSlashes_msg_init_ptr = &envoy__type__http__v3__PathTransformation__Operation__MergeSlashes_msg_init; static const upb_MiniTable *messages_layout[4] = { &envoy__type__http__v3__PathTransformation_msg_init, &envoy__type__http__v3__PathTransformation__Operation_msg_init, diff --git a/src/core/ext/upb-gen/envoy/type/http/v3/path_transformation.upb_minitable.h b/src/core/ext/upb-gen/envoy/type/http/v3/path_transformation.upb_minitable.h index 8ff8f254827..27d742c58d1 100644 --- a/src/core/ext/upb-gen/envoy/type/http/v3/path_transformation.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/type/http/v3/path_transformation.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/type/http/v3/path_transformation.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_TYPE_HTTP_V3_PATH_TRANSFORMATION_PROTO_UPB_MINITABLE_H_ #define ENVOY_TYPE_HTTP_V3_PATH_TRANSFORMATION_PROTO_UPB_MINITABLE_H_ @@ -18,9 +19,13 @@ extern "C" { #endif extern const upb_MiniTable envoy__type__http__v3__PathTransformation_msg_init; +extern const upb_MiniTable* envoy__type__http__v3__PathTransformation_msg_init_ptr; extern const upb_MiniTable envoy__type__http__v3__PathTransformation__Operation_msg_init; +extern const upb_MiniTable* envoy__type__http__v3__PathTransformation__Operation_msg_init_ptr; extern const upb_MiniTable envoy__type__http__v3__PathTransformation__Operation__NormalizePathRFC3986_msg_init; +extern const upb_MiniTable* envoy__type__http__v3__PathTransformation__Operation__NormalizePathRFC3986_msg_init_ptr; extern const upb_MiniTable envoy__type__http__v3__PathTransformation__Operation__MergeSlashes_msg_init; +extern const upb_MiniTable* envoy__type__http__v3__PathTransformation__Operation__MergeSlashes_msg_init_ptr; extern const upb_MiniTableFile envoy_type_http_v3_path_transformation_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/filter_state.upb.h b/src/core/ext/upb-gen/envoy/type/matcher/v3/filter_state.upb.h index 03253db4d6a..f18ab285bf3 100644 --- a/src/core/ext/upb-gen/envoy/type/matcher/v3/filter_state.upb.h +++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/filter_state.upb.h @@ -3,7 +3,8 @@ * envoy/type/matcher/v3/filter_state.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_TYPE_MATCHER_V3_FILTER_STATE_PROTO_UPB_H_ #define ENVOY_TYPE_MATCHER_V3_FILTER_STATE_PROTO_UPB_H_ @@ -93,6 +94,7 @@ UPB_INLINE const struct envoy_type_matcher_v3_StringMatcher* envoy_type_matcher_ const struct envoy_type_matcher_v3_StringMatcher* default_val = NULL; const struct envoy_type_matcher_v3_StringMatcher* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__StringMatcher_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -108,6 +110,7 @@ UPB_INLINE void envoy_type_matcher_v3_FilterStateMatcher_set_key(envoy_type_matc } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__StringMatcher_msg_init); 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) { diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/filter_state.upb_minitable.c b/src/core/ext/upb-gen/envoy/type/matcher/v3/filter_state.upb_minitable.c index 7a15139bdca..f1f79d4e80a 100644 --- a/src/core/ext/upb-gen/envoy/type/matcher/v3/filter_state.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/filter_state.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/type/matcher/v3/filter_state.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -15,8 +16,9 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub envoy_type_matcher_v3_FilterStateMatcher_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__StringMatcher_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal envoy_type_matcher_v3_FilterStateMatcher_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__StringMatcher_msg_init_ptr}, }; static const upb_MiniTableField envoy_type_matcher_v3_FilterStateMatcher__fields[2] = { @@ -39,6 +41,7 @@ const upb_MiniTable envoy__type__matcher__v3__FilterStateMatcher_msg_init = { }) }; +const upb_MiniTable* envoy__type__matcher__v3__FilterStateMatcher_msg_init_ptr = &envoy__type__matcher__v3__FilterStateMatcher_msg_init; static const upb_MiniTable *messages_layout[1] = { &envoy__type__matcher__v3__FilterStateMatcher_msg_init, }; diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/filter_state.upb_minitable.h b/src/core/ext/upb-gen/envoy/type/matcher/v3/filter_state.upb_minitable.h index 95ded9842f5..9477a7b1978 100644 --- a/src/core/ext/upb-gen/envoy/type/matcher/v3/filter_state.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/filter_state.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/type/matcher/v3/filter_state.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_TYPE_MATCHER_V3_FILTER_STATE_PROTO_UPB_MINITABLE_H_ #define ENVOY_TYPE_MATCHER_V3_FILTER_STATE_PROTO_UPB_MINITABLE_H_ @@ -18,6 +19,7 @@ extern "C" { #endif extern const upb_MiniTable envoy__type__matcher__v3__FilterStateMatcher_msg_init; +extern const upb_MiniTable* envoy__type__matcher__v3__FilterStateMatcher_msg_init_ptr; extern const upb_MiniTableFile envoy_type_matcher_v3_filter_state_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/http_inputs.upb.h b/src/core/ext/upb-gen/envoy/type/matcher/v3/http_inputs.upb.h index d908fec9a7d..5d8758b8f3e 100644 --- a/src/core/ext/upb-gen/envoy/type/matcher/v3/http_inputs.upb.h +++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/http_inputs.upb.h @@ -3,7 +3,8 @@ * envoy/type/matcher/v3/http_inputs.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPB_H_ #define ENVOY_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPB_H_ diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/http_inputs.upb_minitable.c b/src/core/ext/upb-gen/envoy/type/matcher/v3/http_inputs.upb_minitable.c index 06abd1fa528..11acab638b5 100644 --- a/src/core/ext/upb-gen/envoy/type/matcher/v3/http_inputs.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/http_inputs.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/type/matcher/v3/http_inputs.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -14,6 +15,7 @@ // Must be last. #include "upb/port/def.inc" +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); static const upb_MiniTableField envoy_type_matcher_v3_HttpRequestHeaderMatchInput__fields[1] = { {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, }; @@ -31,6 +33,7 @@ const upb_MiniTable envoy__type__matcher__v3__HttpRequestHeaderMatchInput_msg_in }) }; +const upb_MiniTable* envoy__type__matcher__v3__HttpRequestHeaderMatchInput_msg_init_ptr = &envoy__type__matcher__v3__HttpRequestHeaderMatchInput_msg_init; static const upb_MiniTableField envoy_type_matcher_v3_HttpRequestTrailerMatchInput__fields[1] = { {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, }; @@ -48,6 +51,7 @@ const upb_MiniTable envoy__type__matcher__v3__HttpRequestTrailerMatchInput_msg_i }) }; +const upb_MiniTable* envoy__type__matcher__v3__HttpRequestTrailerMatchInput_msg_init_ptr = &envoy__type__matcher__v3__HttpRequestTrailerMatchInput_msg_init; static const upb_MiniTableField envoy_type_matcher_v3_HttpResponseHeaderMatchInput__fields[1] = { {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, }; @@ -65,6 +69,7 @@ const upb_MiniTable envoy__type__matcher__v3__HttpResponseHeaderMatchInput_msg_i }) }; +const upb_MiniTable* envoy__type__matcher__v3__HttpResponseHeaderMatchInput_msg_init_ptr = &envoy__type__matcher__v3__HttpResponseHeaderMatchInput_msg_init; static const upb_MiniTableField envoy_type_matcher_v3_HttpResponseTrailerMatchInput__fields[1] = { {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, }; @@ -82,6 +87,7 @@ const upb_MiniTable envoy__type__matcher__v3__HttpResponseTrailerMatchInput_msg_ }) }; +const upb_MiniTable* envoy__type__matcher__v3__HttpResponseTrailerMatchInput_msg_init_ptr = &envoy__type__matcher__v3__HttpResponseTrailerMatchInput_msg_init; static const upb_MiniTableField envoy_type_matcher_v3_HttpRequestQueryParamMatchInput__fields[1] = { {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, }; @@ -99,6 +105,7 @@ const upb_MiniTable envoy__type__matcher__v3__HttpRequestQueryParamMatchInput_ms }) }; +const upb_MiniTable* envoy__type__matcher__v3__HttpRequestQueryParamMatchInput_msg_init_ptr = &envoy__type__matcher__v3__HttpRequestQueryParamMatchInput_msg_init; static const upb_MiniTable *messages_layout[5] = { &envoy__type__matcher__v3__HttpRequestHeaderMatchInput_msg_init, &envoy__type__matcher__v3__HttpRequestTrailerMatchInput_msg_init, diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/http_inputs.upb_minitable.h b/src/core/ext/upb-gen/envoy/type/matcher/v3/http_inputs.upb_minitable.h index 8df39ff34fe..99ec0f45fa7 100644 --- a/src/core/ext/upb-gen/envoy/type/matcher/v3/http_inputs.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/http_inputs.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/type/matcher/v3/http_inputs.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPB_MINITABLE_H_ #define ENVOY_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPB_MINITABLE_H_ @@ -18,10 +19,15 @@ extern "C" { #endif extern const upb_MiniTable envoy__type__matcher__v3__HttpRequestHeaderMatchInput_msg_init; +extern const upb_MiniTable* envoy__type__matcher__v3__HttpRequestHeaderMatchInput_msg_init_ptr; extern const upb_MiniTable envoy__type__matcher__v3__HttpRequestTrailerMatchInput_msg_init; +extern const upb_MiniTable* envoy__type__matcher__v3__HttpRequestTrailerMatchInput_msg_init_ptr; extern const upb_MiniTable envoy__type__matcher__v3__HttpResponseHeaderMatchInput_msg_init; +extern const upb_MiniTable* envoy__type__matcher__v3__HttpResponseHeaderMatchInput_msg_init_ptr; extern const upb_MiniTable envoy__type__matcher__v3__HttpResponseTrailerMatchInput_msg_init; +extern const upb_MiniTable* envoy__type__matcher__v3__HttpResponseTrailerMatchInput_msg_init_ptr; extern const upb_MiniTable envoy__type__matcher__v3__HttpRequestQueryParamMatchInput_msg_init; +extern const upb_MiniTable* envoy__type__matcher__v3__HttpRequestQueryParamMatchInput_msg_init_ptr; extern const upb_MiniTableFile envoy_type_matcher_v3_http_inputs_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/metadata.upb.h b/src/core/ext/upb-gen/envoy/type/matcher/v3/metadata.upb.h index de6034d7f6e..77ec26ba48a 100644 --- a/src/core/ext/upb-gen/envoy/type/matcher/v3/metadata.upb.h +++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/metadata.upb.h @@ -3,7 +3,8 @@ * envoy/type/matcher/v3/metadata.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_TYPE_MATCHER_V3_METADATA_PROTO_UPB_H_ #define ENVOY_TYPE_MATCHER_V3_METADATA_PROTO_UPB_H_ @@ -84,6 +85,7 @@ UPB_INLINE void envoy_type_matcher_v3_MetadataMatcher_clear_path(envoy_type_matc } UPB_INLINE const envoy_type_matcher_v3_MetadataMatcher_PathSegment* const* envoy_type_matcher_v3_MetadataMatcher_path(const envoy_type_matcher_v3_MetadataMatcher* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__MetadataMatcher__PathSegment_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -95,6 +97,7 @@ UPB_INLINE const envoy_type_matcher_v3_MetadataMatcher_PathSegment* const* envoy } UPB_INLINE const upb_Array* _envoy_type_matcher_v3_MetadataMatcher_path_upb_array(const envoy_type_matcher_v3_MetadataMatcher* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__MetadataMatcher__PathSegment_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -103,6 +106,7 @@ UPB_INLINE const upb_Array* _envoy_type_matcher_v3_MetadataMatcher_path_upb_arra } UPB_INLINE upb_Array* _envoy_type_matcher_v3_MetadataMatcher_path_mutable_upb_array(envoy_type_matcher_v3_MetadataMatcher* msg, size_t* size, upb_Arena* arena) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__MetadataMatcher__PathSegment_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -118,6 +122,7 @@ UPB_INLINE const struct envoy_type_matcher_v3_ValueMatcher* envoy_type_matcher_v const struct envoy_type_matcher_v3_ValueMatcher* default_val = NULL; const struct envoy_type_matcher_v3_ValueMatcher* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__ValueMatcher_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -145,6 +150,7 @@ UPB_INLINE void envoy_type_matcher_v3_MetadataMatcher_set_filter(envoy_type_matc } 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__MetadataMatcher__PathSegment_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -161,6 +167,7 @@ UPB_INLINE envoy_type_matcher_v3_MetadataMatcher_PathSegment** envoy_type_matche } UPB_INLINE struct envoy_type_matcher_v3_MetadataMatcher_PathSegment* envoy_type_matcher_v3_MetadataMatcher_add_path(envoy_type_matcher_v3_MetadataMatcher* msg, upb_Arena* arena) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__MetadataMatcher__PathSegment_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -175,6 +182,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__ValueMatcher_msg_init); 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) { diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/metadata.upb_minitable.c b/src/core/ext/upb-gen/envoy/type/matcher/v3/metadata.upb_minitable.c index 3225a2ab0eb..4a15c4f5459 100644 --- a/src/core/ext/upb-gen/envoy/type/matcher/v3/metadata.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/metadata.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/type/matcher/v3/metadata.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -16,9 +17,10 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub envoy_type_matcher_v3_MetadataMatcher_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__MetadataMatcher__PathSegment_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__ValueMatcher_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal envoy_type_matcher_v3_MetadataMatcher_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__MetadataMatcher__PathSegment_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__ValueMatcher_msg_init_ptr}, }; static const upb_MiniTableField envoy_type_matcher_v3_MetadataMatcher__fields[4] = { @@ -47,6 +49,7 @@ const upb_MiniTable envoy__type__matcher__v3__MetadataMatcher_msg_init = { }) }; +const upb_MiniTable* envoy__type__matcher__v3__MetadataMatcher_msg_init_ptr = &envoy__type__matcher__v3__MetadataMatcher_msg_init; static const upb_MiniTableField envoy_type_matcher_v3_MetadataMatcher_PathSegment__fields[1] = { {1, UPB_SIZE(12, 16), -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, }; @@ -64,6 +67,7 @@ const upb_MiniTable envoy__type__matcher__v3__MetadataMatcher__PathSegment_msg_i }) }; +const upb_MiniTable* envoy__type__matcher__v3__MetadataMatcher__PathSegment_msg_init_ptr = &envoy__type__matcher__v3__MetadataMatcher__PathSegment_msg_init; static const upb_MiniTable *messages_layout[2] = { &envoy__type__matcher__v3__MetadataMatcher_msg_init, &envoy__type__matcher__v3__MetadataMatcher__PathSegment_msg_init, diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/metadata.upb_minitable.h b/src/core/ext/upb-gen/envoy/type/matcher/v3/metadata.upb_minitable.h index b2803e332e3..a157502cb55 100644 --- a/src/core/ext/upb-gen/envoy/type/matcher/v3/metadata.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/metadata.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/type/matcher/v3/metadata.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_TYPE_MATCHER_V3_METADATA_PROTO_UPB_MINITABLE_H_ #define ENVOY_TYPE_MATCHER_V3_METADATA_PROTO_UPB_MINITABLE_H_ @@ -18,7 +19,9 @@ extern "C" { #endif extern const upb_MiniTable envoy__type__matcher__v3__MetadataMatcher_msg_init; +extern const upb_MiniTable* envoy__type__matcher__v3__MetadataMatcher_msg_init_ptr; extern const upb_MiniTable envoy__type__matcher__v3__MetadataMatcher__PathSegment_msg_init; +extern const upb_MiniTable* envoy__type__matcher__v3__MetadataMatcher__PathSegment_msg_init_ptr; extern const upb_MiniTableFile envoy_type_matcher_v3_metadata_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/node.upb.h b/src/core/ext/upb-gen/envoy/type/matcher/v3/node.upb.h index 8391ff7d1df..7473342c824 100644 --- a/src/core/ext/upb-gen/envoy/type/matcher/v3/node.upb.h +++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/node.upb.h @@ -3,7 +3,8 @@ * envoy/type/matcher/v3/node.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_TYPE_MATCHER_V3_NODE_PROTO_UPB_H_ #define ENVOY_TYPE_MATCHER_V3_NODE_PROTO_UPB_H_ @@ -74,6 +75,7 @@ UPB_INLINE const struct envoy_type_matcher_v3_StringMatcher* envoy_type_matcher_ const struct envoy_type_matcher_v3_StringMatcher* default_val = NULL; const struct envoy_type_matcher_v3_StringMatcher* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__StringMatcher_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -88,6 +90,7 @@ UPB_INLINE void envoy_type_matcher_v3_NodeMatcher_clear_node_metadatas(envoy_typ } UPB_INLINE const struct envoy_type_matcher_v3_StructMatcher* const* envoy_type_matcher_v3_NodeMatcher_node_metadatas(const envoy_type_matcher_v3_NodeMatcher* msg, size_t* size) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__StructMatcher_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -99,6 +102,7 @@ UPB_INLINE const struct envoy_type_matcher_v3_StructMatcher* const* envoy_type_m } UPB_INLINE const upb_Array* _envoy_type_matcher_v3_NodeMatcher_node_metadatas_upb_array(const envoy_type_matcher_v3_NodeMatcher* msg, size_t* size) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__StructMatcher_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -107,6 +111,7 @@ UPB_INLINE const upb_Array* _envoy_type_matcher_v3_NodeMatcher_node_metadatas_up } UPB_INLINE upb_Array* _envoy_type_matcher_v3_NodeMatcher_node_metadatas_mutable_upb_array(envoy_type_matcher_v3_NodeMatcher* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__StructMatcher_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -117,6 +122,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__StringMatcher_msg_init); 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) { @@ -129,6 +135,7 @@ UPB_INLINE struct envoy_type_matcher_v3_StringMatcher* envoy_type_matcher_v3_Nod } UPB_INLINE struct envoy_type_matcher_v3_StructMatcher** envoy_type_matcher_v3_NodeMatcher_mutable_node_metadatas(envoy_type_matcher_v3_NodeMatcher* msg, size_t* size) { upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__StructMatcher_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -145,6 +152,7 @@ UPB_INLINE struct envoy_type_matcher_v3_StructMatcher** envoy_type_matcher_v3_No } UPB_INLINE struct envoy_type_matcher_v3_StructMatcher* envoy_type_matcher_v3_NodeMatcher_add_node_metadatas(envoy_type_matcher_v3_NodeMatcher* msg, upb_Arena* arena) { upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__StructMatcher_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/node.upb_minitable.c b/src/core/ext/upb-gen/envoy/type/matcher/v3/node.upb_minitable.c index aee0c43b65f..25d9d598e72 100644 --- a/src/core/ext/upb-gen/envoy/type/matcher/v3/node.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/node.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/type/matcher/v3/node.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -16,9 +17,10 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub envoy_type_matcher_v3_NodeMatcher_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__StringMatcher_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__StructMatcher_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal envoy_type_matcher_v3_NodeMatcher_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__StringMatcher_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__StructMatcher_msg_init_ptr}, }; static const upb_MiniTableField envoy_type_matcher_v3_NodeMatcher__fields[2] = { @@ -41,6 +43,7 @@ const upb_MiniTable envoy__type__matcher__v3__NodeMatcher_msg_init = { }) }; +const upb_MiniTable* envoy__type__matcher__v3__NodeMatcher_msg_init_ptr = &envoy__type__matcher__v3__NodeMatcher_msg_init; static const upb_MiniTable *messages_layout[1] = { &envoy__type__matcher__v3__NodeMatcher_msg_init, }; diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/node.upb_minitable.h b/src/core/ext/upb-gen/envoy/type/matcher/v3/node.upb_minitable.h index 65c8e3cf6fd..6fb41d5c650 100644 --- a/src/core/ext/upb-gen/envoy/type/matcher/v3/node.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/node.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/type/matcher/v3/node.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_TYPE_MATCHER_V3_NODE_PROTO_UPB_MINITABLE_H_ #define ENVOY_TYPE_MATCHER_V3_NODE_PROTO_UPB_MINITABLE_H_ @@ -18,6 +19,7 @@ extern "C" { #endif extern const upb_MiniTable envoy__type__matcher__v3__NodeMatcher_msg_init; +extern const upb_MiniTable* envoy__type__matcher__v3__NodeMatcher_msg_init_ptr; extern const upb_MiniTableFile envoy_type_matcher_v3_node_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/number.upb.h b/src/core/ext/upb-gen/envoy/type/matcher/v3/number.upb.h index a9597359a90..7d9d0222dc6 100644 --- a/src/core/ext/upb-gen/envoy/type/matcher/v3/number.upb.h +++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/number.upb.h @@ -3,7 +3,8 @@ * envoy/type/matcher/v3/number.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_TYPE_MATCHER_V3_NUMBER_PROTO_UPB_H_ #define ENVOY_TYPE_MATCHER_V3_NUMBER_PROTO_UPB_H_ @@ -83,6 +84,7 @@ UPB_INLINE const struct envoy_type_v3_DoubleRange* envoy_type_matcher_v3_DoubleM const struct envoy_type_v3_DoubleRange* default_val = NULL; const struct envoy_type_v3_DoubleRange* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__v3__DoubleRange_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -110,6 +112,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__v3__DoubleRange_msg_init); 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) { diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/number.upb_minitable.c b/src/core/ext/upb-gen/envoy/type/matcher/v3/number.upb_minitable.c index 561ceb9874f..268878b1bc3 100644 --- a/src/core/ext/upb-gen/envoy/type/matcher/v3/number.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/number.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/type/matcher/v3/number.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -16,8 +17,9 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub envoy_type_matcher_v3_DoubleMatcher_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__type__v3__DoubleRange_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal envoy_type_matcher_v3_DoubleMatcher_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__type__v3__DoubleRange_msg_init_ptr}, }; static const upb_MiniTableField envoy_type_matcher_v3_DoubleMatcher__fields[2] = { @@ -40,6 +42,7 @@ const upb_MiniTable envoy__type__matcher__v3__DoubleMatcher_msg_init = { }) }; +const upb_MiniTable* envoy__type__matcher__v3__DoubleMatcher_msg_init_ptr = &envoy__type__matcher__v3__DoubleMatcher_msg_init; static const upb_MiniTable *messages_layout[1] = { &envoy__type__matcher__v3__DoubleMatcher_msg_init, }; diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/number.upb_minitable.h b/src/core/ext/upb-gen/envoy/type/matcher/v3/number.upb_minitable.h index ecc48762e84..7190e62a918 100644 --- a/src/core/ext/upb-gen/envoy/type/matcher/v3/number.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/number.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/type/matcher/v3/number.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_TYPE_MATCHER_V3_NUMBER_PROTO_UPB_MINITABLE_H_ #define ENVOY_TYPE_MATCHER_V3_NUMBER_PROTO_UPB_MINITABLE_H_ @@ -18,6 +19,7 @@ extern "C" { #endif extern const upb_MiniTable envoy__type__matcher__v3__DoubleMatcher_msg_init; +extern const upb_MiniTable* envoy__type__matcher__v3__DoubleMatcher_msg_init_ptr; extern const upb_MiniTableFile envoy_type_matcher_v3_number_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/path.upb.h b/src/core/ext/upb-gen/envoy/type/matcher/v3/path.upb.h index c61a147b8d0..66cd683ce00 100644 --- a/src/core/ext/upb-gen/envoy/type/matcher/v3/path.upb.h +++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/path.upb.h @@ -3,7 +3,8 @@ * envoy/type/matcher/v3/path.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_TYPE_MATCHER_V3_PATH_PROTO_UPB_H_ #define ENVOY_TYPE_MATCHER_V3_PATH_PROTO_UPB_H_ @@ -82,6 +83,7 @@ UPB_INLINE const struct envoy_type_matcher_v3_StringMatcher* envoy_type_matcher_ const struct envoy_type_matcher_v3_StringMatcher* default_val = NULL; const struct envoy_type_matcher_v3_StringMatcher* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__StringMatcher_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -93,6 +95,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__StringMatcher_msg_init); 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) { diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/path.upb_minitable.c b/src/core/ext/upb-gen/envoy/type/matcher/v3/path.upb_minitable.c index 2b0006b360b..997691d98d0 100644 --- a/src/core/ext/upb-gen/envoy/type/matcher/v3/path.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/path.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/type/matcher/v3/path.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -16,8 +17,9 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub envoy_type_matcher_v3_PathMatcher_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__StringMatcher_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal envoy_type_matcher_v3_PathMatcher_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__StringMatcher_msg_init_ptr}, }; static const upb_MiniTableField envoy_type_matcher_v3_PathMatcher__fields[1] = { @@ -37,6 +39,7 @@ const upb_MiniTable envoy__type__matcher__v3__PathMatcher_msg_init = { }) }; +const upb_MiniTable* envoy__type__matcher__v3__PathMatcher_msg_init_ptr = &envoy__type__matcher__v3__PathMatcher_msg_init; static const upb_MiniTable *messages_layout[1] = { &envoy__type__matcher__v3__PathMatcher_msg_init, }; diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/path.upb_minitable.h b/src/core/ext/upb-gen/envoy/type/matcher/v3/path.upb_minitable.h index 64280def130..8a7d00590cf 100644 --- a/src/core/ext/upb-gen/envoy/type/matcher/v3/path.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/path.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/type/matcher/v3/path.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_TYPE_MATCHER_V3_PATH_PROTO_UPB_MINITABLE_H_ #define ENVOY_TYPE_MATCHER_V3_PATH_PROTO_UPB_MINITABLE_H_ @@ -18,6 +19,7 @@ extern "C" { #endif extern const upb_MiniTable envoy__type__matcher__v3__PathMatcher_msg_init; +extern const upb_MiniTable* envoy__type__matcher__v3__PathMatcher_msg_init_ptr; extern const upb_MiniTableFile envoy_type_matcher_v3_path_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/regex.upb.h b/src/core/ext/upb-gen/envoy/type/matcher/v3/regex.upb.h index 98d33474d04..b2faf366a57 100644 --- a/src/core/ext/upb-gen/envoy/type/matcher/v3/regex.upb.h +++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/regex.upb.h @@ -3,7 +3,8 @@ * envoy/type/matcher/v3/regex.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_TYPE_MATCHER_V3_REGEX_PROTO_UPB_H_ #define ENVOY_TYPE_MATCHER_V3_REGEX_PROTO_UPB_H_ @@ -85,6 +86,7 @@ UPB_INLINE const envoy_type_matcher_v3_RegexMatcher_GoogleRE2* envoy_type_matche const envoy_type_matcher_v3_RegexMatcher_GoogleRE2* default_val = NULL; const envoy_type_matcher_v3_RegexMatcher_GoogleRE2* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__RegexMatcher__GoogleRE2_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -108,6 +110,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__RegexMatcher__GoogleRE2_msg_init); 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) { @@ -167,6 +170,7 @@ UPB_INLINE const struct google_protobuf_UInt32Value* envoy_type_matcher_v3_Regex const struct google_protobuf_UInt32Value* default_val = NULL; const struct google_protobuf_UInt32Value* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -178,6 +182,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); 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) { @@ -233,6 +238,7 @@ UPB_INLINE const envoy_type_matcher_v3_RegexMatcher* envoy_type_matcher_v3_Regex const envoy_type_matcher_v3_RegexMatcher* default_val = NULL; const envoy_type_matcher_v3_RegexMatcher* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__RegexMatcher_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -256,6 +262,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__RegexMatcher_msg_init); 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) { diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/regex.upb_minitable.c b/src/core/ext/upb-gen/envoy/type/matcher/v3/regex.upb_minitable.c index fb238383c69..e99f0a58a07 100644 --- a/src/core/ext/upb-gen/envoy/type/matcher/v3/regex.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/regex.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/type/matcher/v3/regex.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -17,8 +18,9 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub envoy_type_matcher_v3_RegexMatcher_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__RegexMatcher__GoogleRE2_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal envoy_type_matcher_v3_RegexMatcher_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__RegexMatcher__GoogleRE2_msg_init_ptr}, }; static const upb_MiniTableField envoy_type_matcher_v3_RegexMatcher__fields[2] = { @@ -41,8 +43,9 @@ const upb_MiniTable envoy__type__matcher__v3__RegexMatcher_msg_init = { }) }; -static const upb_MiniTableSub envoy_type_matcher_v3_RegexMatcher_GoogleRE2_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init}, +const upb_MiniTable* envoy__type__matcher__v3__RegexMatcher_msg_init_ptr = &envoy__type__matcher__v3__RegexMatcher_msg_init; +static const upb_MiniTableSubInternal envoy_type_matcher_v3_RegexMatcher_GoogleRE2_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, }; static const upb_MiniTableField envoy_type_matcher_v3_RegexMatcher_GoogleRE2__fields[1] = { @@ -58,8 +61,9 @@ const upb_MiniTable envoy__type__matcher__v3__RegexMatcher__GoogleRE2_msg_init = #endif }; -static const upb_MiniTableSub envoy_type_matcher_v3_RegexMatchAndSubstitute_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__RegexMatcher_msg_init}, +const upb_MiniTable* envoy__type__matcher__v3__RegexMatcher__GoogleRE2_msg_init_ptr = &envoy__type__matcher__v3__RegexMatcher__GoogleRE2_msg_init; +static const upb_MiniTableSubInternal envoy_type_matcher_v3_RegexMatchAndSubstitute_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__RegexMatcher_msg_init_ptr}, }; static const upb_MiniTableField envoy_type_matcher_v3_RegexMatchAndSubstitute__fields[2] = { @@ -82,6 +86,7 @@ const upb_MiniTable envoy__type__matcher__v3__RegexMatchAndSubstitute_msg_init = }) }; +const upb_MiniTable* envoy__type__matcher__v3__RegexMatchAndSubstitute_msg_init_ptr = &envoy__type__matcher__v3__RegexMatchAndSubstitute_msg_init; static const upb_MiniTable *messages_layout[3] = { &envoy__type__matcher__v3__RegexMatcher_msg_init, &envoy__type__matcher__v3__RegexMatcher__GoogleRE2_msg_init, diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/regex.upb_minitable.h b/src/core/ext/upb-gen/envoy/type/matcher/v3/regex.upb_minitable.h index 70cb6c6c74e..2ac7b428ba6 100644 --- a/src/core/ext/upb-gen/envoy/type/matcher/v3/regex.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/regex.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/type/matcher/v3/regex.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_TYPE_MATCHER_V3_REGEX_PROTO_UPB_MINITABLE_H_ #define ENVOY_TYPE_MATCHER_V3_REGEX_PROTO_UPB_MINITABLE_H_ @@ -18,8 +19,11 @@ extern "C" { #endif extern const upb_MiniTable envoy__type__matcher__v3__RegexMatcher_msg_init; +extern const upb_MiniTable* envoy__type__matcher__v3__RegexMatcher_msg_init_ptr; extern const upb_MiniTable envoy__type__matcher__v3__RegexMatcher__GoogleRE2_msg_init; +extern const upb_MiniTable* envoy__type__matcher__v3__RegexMatcher__GoogleRE2_msg_init_ptr; extern const upb_MiniTable envoy__type__matcher__v3__RegexMatchAndSubstitute_msg_init; +extern const upb_MiniTable* envoy__type__matcher__v3__RegexMatchAndSubstitute_msg_init_ptr; extern const upb_MiniTableFile envoy_type_matcher_v3_regex_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/status_code_input.upb.h b/src/core/ext/upb-gen/envoy/type/matcher/v3/status_code_input.upb.h index 1065c62021e..7985bdaa742 100644 --- a/src/core/ext/upb-gen/envoy/type/matcher/v3/status_code_input.upb.h +++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/status_code_input.upb.h @@ -3,7 +3,8 @@ * envoy/type/matcher/v3/status_code_input.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_TYPE_MATCHER_V3_STATUS_CODE_INPUT_PROTO_UPB_H_ #define ENVOY_TYPE_MATCHER_V3_STATUS_CODE_INPUT_PROTO_UPB_H_ diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/status_code_input.upb_minitable.c b/src/core/ext/upb-gen/envoy/type/matcher/v3/status_code_input.upb_minitable.c index 4b15e52f27e..43fdbe740ea 100644 --- a/src/core/ext/upb-gen/envoy/type/matcher/v3/status_code_input.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/status_code_input.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/type/matcher/v3/status_code_input.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -13,6 +14,7 @@ // Must be last. #include "upb/port/def.inc" +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); const upb_MiniTable envoy__type__matcher__v3__HttpResponseStatusCodeMatchInput_msg_init = { NULL, NULL, @@ -22,6 +24,7 @@ const upb_MiniTable envoy__type__matcher__v3__HttpResponseStatusCodeMatchInput_m #endif }; +const upb_MiniTable* envoy__type__matcher__v3__HttpResponseStatusCodeMatchInput_msg_init_ptr = &envoy__type__matcher__v3__HttpResponseStatusCodeMatchInput_msg_init; const upb_MiniTable envoy__type__matcher__v3__HttpResponseStatusCodeClassMatchInput_msg_init = { NULL, NULL, @@ -31,6 +34,7 @@ const upb_MiniTable envoy__type__matcher__v3__HttpResponseStatusCodeClassMatchIn #endif }; +const upb_MiniTable* envoy__type__matcher__v3__HttpResponseStatusCodeClassMatchInput_msg_init_ptr = &envoy__type__matcher__v3__HttpResponseStatusCodeClassMatchInput_msg_init; static const upb_MiniTable *messages_layout[2] = { &envoy__type__matcher__v3__HttpResponseStatusCodeMatchInput_msg_init, &envoy__type__matcher__v3__HttpResponseStatusCodeClassMatchInput_msg_init, diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/status_code_input.upb_minitable.h b/src/core/ext/upb-gen/envoy/type/matcher/v3/status_code_input.upb_minitable.h index a6bf81448f1..dc3f52e5079 100644 --- a/src/core/ext/upb-gen/envoy/type/matcher/v3/status_code_input.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/status_code_input.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/type/matcher/v3/status_code_input.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_TYPE_MATCHER_V3_STATUS_CODE_INPUT_PROTO_UPB_MINITABLE_H_ #define ENVOY_TYPE_MATCHER_V3_STATUS_CODE_INPUT_PROTO_UPB_MINITABLE_H_ @@ -18,7 +19,9 @@ extern "C" { #endif extern const upb_MiniTable envoy__type__matcher__v3__HttpResponseStatusCodeMatchInput_msg_init; +extern const upb_MiniTable* envoy__type__matcher__v3__HttpResponseStatusCodeMatchInput_msg_init_ptr; extern const upb_MiniTable envoy__type__matcher__v3__HttpResponseStatusCodeClassMatchInput_msg_init; +extern const upb_MiniTable* envoy__type__matcher__v3__HttpResponseStatusCodeClassMatchInput_msg_init_ptr; extern const upb_MiniTableFile envoy_type_matcher_v3_status_code_input_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/string.upb.h b/src/core/ext/upb-gen/envoy/type/matcher/v3/string.upb.h index f52d767e28d..00a059731ac 100644 --- a/src/core/ext/upb-gen/envoy/type/matcher/v3/string.upb.h +++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/string.upb.h @@ -3,7 +3,8 @@ * envoy/type/matcher/v3/string.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_TYPE_MATCHER_V3_STRING_PROTO_UPB_H_ #define ENVOY_TYPE_MATCHER_V3_STRING_PROTO_UPB_H_ @@ -138,6 +139,7 @@ UPB_INLINE const struct envoy_type_matcher_v3_RegexMatcher* envoy_type_matcher_v const struct envoy_type_matcher_v3_RegexMatcher* default_val = NULL; const struct envoy_type_matcher_v3_RegexMatcher* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__RegexMatcher_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -182,6 +184,7 @@ UPB_INLINE const struct xds_core_v3_TypedExtensionConfig* envoy_type_matcher_v3_ 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_PRIVATE(_upb_MiniTable_StrongReference)(&xds__core__v3__TypedExtensionConfig_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -205,6 +208,7 @@ UPB_INLINE void envoy_type_matcher_v3_StringMatcher_set_suffix(envoy_type_matche } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__RegexMatcher_msg_init); 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) { @@ -225,6 +229,7 @@ UPB_INLINE void envoy_type_matcher_v3_StringMatcher_set_contains(envoy_type_matc } 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_PRIVATE(_upb_MiniTable_StrongReference)(&xds__core__v3__TypedExtensionConfig_msg_init); 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) { @@ -278,6 +283,7 @@ UPB_INLINE void envoy_type_matcher_v3_ListStringMatcher_clear_patterns(envoy_typ } UPB_INLINE const envoy_type_matcher_v3_StringMatcher* const* envoy_type_matcher_v3_ListStringMatcher_patterns(const envoy_type_matcher_v3_ListStringMatcher* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__StringMatcher_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -289,6 +295,7 @@ UPB_INLINE const envoy_type_matcher_v3_StringMatcher* const* envoy_type_matcher_ } UPB_INLINE const upb_Array* _envoy_type_matcher_v3_ListStringMatcher_patterns_upb_array(const envoy_type_matcher_v3_ListStringMatcher* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__StringMatcher_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -297,6 +304,7 @@ UPB_INLINE const upb_Array* _envoy_type_matcher_v3_ListStringMatcher_patterns_up } UPB_INLINE upb_Array* _envoy_type_matcher_v3_ListStringMatcher_patterns_mutable_upb_array(envoy_type_matcher_v3_ListStringMatcher* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__StringMatcher_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -307,6 +315,7 @@ UPB_INLINE upb_Array* _envoy_type_matcher_v3_ListStringMatcher_patterns_mutable_ UPB_INLINE envoy_type_matcher_v3_StringMatcher** envoy_type_matcher_v3_ListStringMatcher_mutable_patterns(envoy_type_matcher_v3_ListStringMatcher* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__StringMatcher_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -323,6 +332,7 @@ UPB_INLINE envoy_type_matcher_v3_StringMatcher** envoy_type_matcher_v3_ListStrin } UPB_INLINE struct envoy_type_matcher_v3_StringMatcher* envoy_type_matcher_v3_ListStringMatcher_add_patterns(envoy_type_matcher_v3_ListStringMatcher* msg, upb_Arena* arena) { upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__StringMatcher_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/string.upb_minitable.c b/src/core/ext/upb-gen/envoy/type/matcher/v3/string.upb_minitable.c index 22adb6bf231..9fe42b97679 100644 --- a/src/core/ext/upb-gen/envoy/type/matcher/v3/string.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/string.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/type/matcher/v3/string.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -17,9 +18,10 @@ // Must be last. #include "upb/port/def.inc" -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}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal envoy_type_matcher_v3_StringMatcher_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__RegexMatcher_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &xds__core__v3__TypedExtensionConfig_msg_init_ptr}, }; static const upb_MiniTableField envoy_type_matcher_v3_StringMatcher__fields[7] = { @@ -59,8 +61,9 @@ const upb_MiniTable envoy__type__matcher__v3__StringMatcher_msg_init = { }) }; -static const upb_MiniTableSub envoy_type_matcher_v3_ListStringMatcher_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__StringMatcher_msg_init}, +const upb_MiniTable* envoy__type__matcher__v3__StringMatcher_msg_init_ptr = &envoy__type__matcher__v3__StringMatcher_msg_init; +static const upb_MiniTableSubInternal envoy_type_matcher_v3_ListStringMatcher_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__StringMatcher_msg_init_ptr}, }; static const upb_MiniTableField envoy_type_matcher_v3_ListStringMatcher__fields[1] = { @@ -80,6 +83,7 @@ const upb_MiniTable envoy__type__matcher__v3__ListStringMatcher_msg_init = { }) }; +const upb_MiniTable* envoy__type__matcher__v3__ListStringMatcher_msg_init_ptr = &envoy__type__matcher__v3__ListStringMatcher_msg_init; static const upb_MiniTable *messages_layout[2] = { &envoy__type__matcher__v3__StringMatcher_msg_init, &envoy__type__matcher__v3__ListStringMatcher_msg_init, diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/string.upb_minitable.h b/src/core/ext/upb-gen/envoy/type/matcher/v3/string.upb_minitable.h index 961f4c6c26c..2a931f65844 100644 --- a/src/core/ext/upb-gen/envoy/type/matcher/v3/string.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/string.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/type/matcher/v3/string.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_TYPE_MATCHER_V3_STRING_PROTO_UPB_MINITABLE_H_ #define ENVOY_TYPE_MATCHER_V3_STRING_PROTO_UPB_MINITABLE_H_ @@ -18,7 +19,9 @@ extern "C" { #endif extern const upb_MiniTable envoy__type__matcher__v3__StringMatcher_msg_init; +extern const upb_MiniTable* envoy__type__matcher__v3__StringMatcher_msg_init_ptr; extern const upb_MiniTable envoy__type__matcher__v3__ListStringMatcher_msg_init; +extern const upb_MiniTable* envoy__type__matcher__v3__ListStringMatcher_msg_init_ptr; extern const upb_MiniTableFile envoy_type_matcher_v3_string_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/struct.upb.h b/src/core/ext/upb-gen/envoy/type/matcher/v3/struct.upb.h index 547291911aa..75f10611b79 100644 --- a/src/core/ext/upb-gen/envoy/type/matcher/v3/struct.upb.h +++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/struct.upb.h @@ -3,7 +3,8 @@ * envoy/type/matcher/v3/struct.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_TYPE_MATCHER_V3_STRUCT_PROTO_UPB_H_ #define ENVOY_TYPE_MATCHER_V3_STRUCT_PROTO_UPB_H_ @@ -72,6 +73,7 @@ UPB_INLINE void envoy_type_matcher_v3_StructMatcher_clear_path(envoy_type_matche } UPB_INLINE const envoy_type_matcher_v3_StructMatcher_PathSegment* const* envoy_type_matcher_v3_StructMatcher_path(const envoy_type_matcher_v3_StructMatcher* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__StructMatcher__PathSegment_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -83,6 +85,7 @@ UPB_INLINE const envoy_type_matcher_v3_StructMatcher_PathSegment* const* envoy_t } UPB_INLINE const upb_Array* _envoy_type_matcher_v3_StructMatcher_path_upb_array(const envoy_type_matcher_v3_StructMatcher* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__StructMatcher__PathSegment_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -91,6 +94,7 @@ UPB_INLINE const upb_Array* _envoy_type_matcher_v3_StructMatcher_path_upb_array( } UPB_INLINE upb_Array* _envoy_type_matcher_v3_StructMatcher_path_mutable_upb_array(envoy_type_matcher_v3_StructMatcher* msg, size_t* size, upb_Arena* arena) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__StructMatcher__PathSegment_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -106,6 +110,7 @@ UPB_INLINE const struct envoy_type_matcher_v3_ValueMatcher* envoy_type_matcher_v const struct envoy_type_matcher_v3_ValueMatcher* default_val = NULL; const struct envoy_type_matcher_v3_ValueMatcher* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__ValueMatcher_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -117,6 +122,7 @@ UPB_INLINE bool envoy_type_matcher_v3_StructMatcher_has_value(const envoy_type_m UPB_INLINE envoy_type_matcher_v3_StructMatcher_PathSegment** envoy_type_matcher_v3_StructMatcher_mutable_path(envoy_type_matcher_v3_StructMatcher* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__StructMatcher__PathSegment_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -133,6 +139,7 @@ UPB_INLINE envoy_type_matcher_v3_StructMatcher_PathSegment** envoy_type_matcher_ } UPB_INLINE struct envoy_type_matcher_v3_StructMatcher_PathSegment* envoy_type_matcher_v3_StructMatcher_add_path(envoy_type_matcher_v3_StructMatcher* msg, upb_Arena* arena) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__StructMatcher__PathSegment_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -147,6 +154,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__ValueMatcher_msg_init); 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) { diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/struct.upb_minitable.c b/src/core/ext/upb-gen/envoy/type/matcher/v3/struct.upb_minitable.c index 330d63f80e2..64ddc3a7020 100644 --- a/src/core/ext/upb-gen/envoy/type/matcher/v3/struct.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/struct.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/type/matcher/v3/struct.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -16,9 +17,10 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub envoy_type_matcher_v3_StructMatcher_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__StructMatcher__PathSegment_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__ValueMatcher_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal envoy_type_matcher_v3_StructMatcher_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__StructMatcher__PathSegment_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__ValueMatcher_msg_init_ptr}, }; static const upb_MiniTableField envoy_type_matcher_v3_StructMatcher__fields[2] = { @@ -41,6 +43,7 @@ const upb_MiniTable envoy__type__matcher__v3__StructMatcher_msg_init = { }) }; +const upb_MiniTable* envoy__type__matcher__v3__StructMatcher_msg_init_ptr = &envoy__type__matcher__v3__StructMatcher_msg_init; static const upb_MiniTableField envoy_type_matcher_v3_StructMatcher_PathSegment__fields[1] = { {1, UPB_SIZE(12, 16), -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, }; @@ -58,6 +61,7 @@ const upb_MiniTable envoy__type__matcher__v3__StructMatcher__PathSegment_msg_ini }) }; +const upb_MiniTable* envoy__type__matcher__v3__StructMatcher__PathSegment_msg_init_ptr = &envoy__type__matcher__v3__StructMatcher__PathSegment_msg_init; static const upb_MiniTable *messages_layout[2] = { &envoy__type__matcher__v3__StructMatcher_msg_init, &envoy__type__matcher__v3__StructMatcher__PathSegment_msg_init, diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/struct.upb_minitable.h b/src/core/ext/upb-gen/envoy/type/matcher/v3/struct.upb_minitable.h index fdc1e736f6a..e5e06624661 100644 --- a/src/core/ext/upb-gen/envoy/type/matcher/v3/struct.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/struct.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/type/matcher/v3/struct.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_TYPE_MATCHER_V3_STRUCT_PROTO_UPB_MINITABLE_H_ #define ENVOY_TYPE_MATCHER_V3_STRUCT_PROTO_UPB_MINITABLE_H_ @@ -18,7 +19,9 @@ extern "C" { #endif extern const upb_MiniTable envoy__type__matcher__v3__StructMatcher_msg_init; +extern const upb_MiniTable* envoy__type__matcher__v3__StructMatcher_msg_init_ptr; extern const upb_MiniTable envoy__type__matcher__v3__StructMatcher__PathSegment_msg_init; +extern const upb_MiniTable* envoy__type__matcher__v3__StructMatcher__PathSegment_msg_init_ptr; extern const upb_MiniTableFile envoy_type_matcher_v3_struct_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/value.upb.h b/src/core/ext/upb-gen/envoy/type/matcher/v3/value.upb.h index f6cdac0e421..d68504fe09a 100644 --- a/src/core/ext/upb-gen/envoy/type/matcher/v3/value.upb.h +++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/value.upb.h @@ -3,7 +3,8 @@ * envoy/type/matcher/v3/value.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_TYPE_MATCHER_V3_VALUE_PROTO_UPB_H_ #define ENVOY_TYPE_MATCHER_V3_VALUE_PROTO_UPB_H_ @@ -93,6 +94,7 @@ UPB_INLINE const envoy_type_matcher_v3_ValueMatcher_NullMatch* envoy_type_matche const envoy_type_matcher_v3_ValueMatcher_NullMatch* default_val = NULL; const envoy_type_matcher_v3_ValueMatcher_NullMatch* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__ValueMatcher__NullMatch_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -109,6 +111,7 @@ UPB_INLINE const struct envoy_type_matcher_v3_DoubleMatcher* envoy_type_matcher_ const struct envoy_type_matcher_v3_DoubleMatcher* default_val = NULL; const struct envoy_type_matcher_v3_DoubleMatcher* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__DoubleMatcher_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -125,6 +128,7 @@ UPB_INLINE const struct envoy_type_matcher_v3_StringMatcher* envoy_type_matcher_ const struct envoy_type_matcher_v3_StringMatcher* default_val = NULL; const struct envoy_type_matcher_v3_StringMatcher* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__StringMatcher_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -173,6 +177,7 @@ UPB_INLINE const envoy_type_matcher_v3_ListMatcher* envoy_type_matcher_v3_ValueM const envoy_type_matcher_v3_ListMatcher* default_val = NULL; const envoy_type_matcher_v3_ListMatcher* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__ListMatcher_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -189,6 +194,7 @@ UPB_INLINE const envoy_type_matcher_v3_OrMatcher* envoy_type_matcher_v3_ValueMat const envoy_type_matcher_v3_OrMatcher* default_val = NULL; const envoy_type_matcher_v3_OrMatcher* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__OrMatcher_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -200,6 +206,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__ValueMatcher__NullMatch_msg_init); 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) { @@ -212,6 +219,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__DoubleMatcher_msg_init); 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) { @@ -224,6 +232,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__StringMatcher_msg_init); 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) { @@ -244,6 +253,7 @@ UPB_INLINE void envoy_type_matcher_v3_ValueMatcher_set_present_match(envoy_type_ } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__ListMatcher_msg_init); 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) { @@ -256,6 +266,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__OrMatcher_msg_init); 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) { @@ -358,6 +369,7 @@ UPB_INLINE const envoy_type_matcher_v3_ValueMatcher* envoy_type_matcher_v3_ListM const envoy_type_matcher_v3_ValueMatcher* default_val = NULL; const envoy_type_matcher_v3_ValueMatcher* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__ValueMatcher_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -369,6 +381,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__ValueMatcher_msg_init); 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) { @@ -422,6 +435,7 @@ UPB_INLINE void envoy_type_matcher_v3_OrMatcher_clear_value_matchers(envoy_type_ } UPB_INLINE const envoy_type_matcher_v3_ValueMatcher* const* envoy_type_matcher_v3_OrMatcher_value_matchers(const envoy_type_matcher_v3_OrMatcher* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__ValueMatcher_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -433,6 +447,7 @@ UPB_INLINE const envoy_type_matcher_v3_ValueMatcher* const* envoy_type_matcher_v } UPB_INLINE const upb_Array* _envoy_type_matcher_v3_OrMatcher_value_matchers_upb_array(const envoy_type_matcher_v3_OrMatcher* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__ValueMatcher_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -441,6 +456,7 @@ UPB_INLINE const upb_Array* _envoy_type_matcher_v3_OrMatcher_value_matchers_upb_ } UPB_INLINE upb_Array* _envoy_type_matcher_v3_OrMatcher_value_matchers_mutable_upb_array(envoy_type_matcher_v3_OrMatcher* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__ValueMatcher_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -451,6 +467,7 @@ UPB_INLINE upb_Array* _envoy_type_matcher_v3_OrMatcher_value_matchers_mutable_up UPB_INLINE envoy_type_matcher_v3_ValueMatcher** envoy_type_matcher_v3_OrMatcher_mutable_value_matchers(envoy_type_matcher_v3_OrMatcher* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__ValueMatcher_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -467,6 +484,7 @@ UPB_INLINE envoy_type_matcher_v3_ValueMatcher** envoy_type_matcher_v3_OrMatcher_ } UPB_INLINE struct envoy_type_matcher_v3_ValueMatcher* envoy_type_matcher_v3_OrMatcher_add_value_matchers(envoy_type_matcher_v3_OrMatcher* msg, upb_Arena* arena) { upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__ValueMatcher_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/value.upb_minitable.c b/src/core/ext/upb-gen/envoy/type/matcher/v3/value.upb_minitable.c index 17bd63007d0..a6e3b476ecc 100644 --- a/src/core/ext/upb-gen/envoy/type/matcher/v3/value.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/value.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/type/matcher/v3/value.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -17,12 +18,13 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub envoy_type_matcher_v3_ValueMatcher_submsgs[5] = { - {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__ValueMatcher__NullMatch_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__DoubleMatcher_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__StringMatcher_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__ListMatcher_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__OrMatcher_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal envoy_type_matcher_v3_ValueMatcher_submsgs[5] = { + {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__ValueMatcher__NullMatch_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__DoubleMatcher_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__StringMatcher_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__ListMatcher_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__OrMatcher_msg_init_ptr}, }; static const upb_MiniTableField envoy_type_matcher_v3_ValueMatcher__fields[7] = { @@ -54,6 +56,7 @@ const upb_MiniTable envoy__type__matcher__v3__ValueMatcher_msg_init = { }) }; +const upb_MiniTable* envoy__type__matcher__v3__ValueMatcher_msg_init_ptr = &envoy__type__matcher__v3__ValueMatcher_msg_init; const upb_MiniTable envoy__type__matcher__v3__ValueMatcher__NullMatch_msg_init = { NULL, NULL, @@ -63,8 +66,9 @@ const upb_MiniTable envoy__type__matcher__v3__ValueMatcher__NullMatch_msg_init = #endif }; -static const upb_MiniTableSub envoy_type_matcher_v3_ListMatcher_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__ValueMatcher_msg_init}, +const upb_MiniTable* envoy__type__matcher__v3__ValueMatcher__NullMatch_msg_init_ptr = &envoy__type__matcher__v3__ValueMatcher__NullMatch_msg_init; +static const upb_MiniTableSubInternal envoy_type_matcher_v3_ListMatcher_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__ValueMatcher_msg_init_ptr}, }; static const upb_MiniTableField envoy_type_matcher_v3_ListMatcher__fields[1] = { @@ -84,8 +88,9 @@ const upb_MiniTable envoy__type__matcher__v3__ListMatcher_msg_init = { }) }; -static const upb_MiniTableSub envoy_type_matcher_v3_OrMatcher_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__ValueMatcher_msg_init}, +const upb_MiniTable* envoy__type__matcher__v3__ListMatcher_msg_init_ptr = &envoy__type__matcher__v3__ListMatcher_msg_init; +static const upb_MiniTableSubInternal envoy_type_matcher_v3_OrMatcher_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__ValueMatcher_msg_init_ptr}, }; static const upb_MiniTableField envoy_type_matcher_v3_OrMatcher__fields[1] = { @@ -105,6 +110,7 @@ const upb_MiniTable envoy__type__matcher__v3__OrMatcher_msg_init = { }) }; +const upb_MiniTable* envoy__type__matcher__v3__OrMatcher_msg_init_ptr = &envoy__type__matcher__v3__OrMatcher_msg_init; static const upb_MiniTable *messages_layout[4] = { &envoy__type__matcher__v3__ValueMatcher_msg_init, &envoy__type__matcher__v3__ValueMatcher__NullMatch_msg_init, diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/value.upb_minitable.h b/src/core/ext/upb-gen/envoy/type/matcher/v3/value.upb_minitable.h index c9e09e3b4fd..c20dc81a36b 100644 --- a/src/core/ext/upb-gen/envoy/type/matcher/v3/value.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/value.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/type/matcher/v3/value.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_TYPE_MATCHER_V3_VALUE_PROTO_UPB_MINITABLE_H_ #define ENVOY_TYPE_MATCHER_V3_VALUE_PROTO_UPB_MINITABLE_H_ @@ -18,9 +19,13 @@ extern "C" { #endif extern const upb_MiniTable envoy__type__matcher__v3__ValueMatcher_msg_init; +extern const upb_MiniTable* envoy__type__matcher__v3__ValueMatcher_msg_init_ptr; extern const upb_MiniTable envoy__type__matcher__v3__ValueMatcher__NullMatch_msg_init; +extern const upb_MiniTable* envoy__type__matcher__v3__ValueMatcher__NullMatch_msg_init_ptr; extern const upb_MiniTable envoy__type__matcher__v3__ListMatcher_msg_init; +extern const upb_MiniTable* envoy__type__matcher__v3__ListMatcher_msg_init_ptr; extern const upb_MiniTable envoy__type__matcher__v3__OrMatcher_msg_init; +extern const upb_MiniTable* envoy__type__matcher__v3__OrMatcher_msg_init_ptr; extern const upb_MiniTableFile envoy_type_matcher_v3_value_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/type/metadata/v3/metadata.upb.h b/src/core/ext/upb-gen/envoy/type/metadata/v3/metadata.upb.h index 27de07aa9c6..b5da11c4d5f 100644 --- a/src/core/ext/upb-gen/envoy/type/metadata/v3/metadata.upb.h +++ b/src/core/ext/upb-gen/envoy/type/metadata/v3/metadata.upb.h @@ -3,7 +3,8 @@ * envoy/type/metadata/v3/metadata.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_TYPE_METADATA_V3_METADATA_PROTO_UPB_H_ #define ENVOY_TYPE_METADATA_V3_METADATA_PROTO_UPB_H_ @@ -87,6 +88,7 @@ UPB_INLINE void envoy_type_metadata_v3_MetadataKey_clear_path(envoy_type_metadat } UPB_INLINE const envoy_type_metadata_v3_MetadataKey_PathSegment* const* envoy_type_metadata_v3_MetadataKey_path(const envoy_type_metadata_v3_MetadataKey* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__metadata__v3__MetadataKey__PathSegment_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -98,6 +100,7 @@ UPB_INLINE const envoy_type_metadata_v3_MetadataKey_PathSegment* const* envoy_ty } UPB_INLINE const upb_Array* _envoy_type_metadata_v3_MetadataKey_path_upb_array(const envoy_type_metadata_v3_MetadataKey* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__metadata__v3__MetadataKey__PathSegment_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -106,6 +109,7 @@ UPB_INLINE const upb_Array* _envoy_type_metadata_v3_MetadataKey_path_upb_array(c } UPB_INLINE upb_Array* _envoy_type_metadata_v3_MetadataKey_path_mutable_upb_array(envoy_type_metadata_v3_MetadataKey* msg, size_t* size, upb_Arena* arena) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__metadata__v3__MetadataKey__PathSegment_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -120,6 +124,7 @@ UPB_INLINE void envoy_type_metadata_v3_MetadataKey_set_key(envoy_type_metadata_v } 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__metadata__v3__MetadataKey__PathSegment_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -136,6 +141,7 @@ UPB_INLINE envoy_type_metadata_v3_MetadataKey_PathSegment** envoy_type_metadata_ } UPB_INLINE struct envoy_type_metadata_v3_MetadataKey_PathSegment* envoy_type_metadata_v3_MetadataKey_add_path(envoy_type_metadata_v3_MetadataKey* msg, upb_Arena* arena) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__metadata__v3__MetadataKey__PathSegment_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -272,6 +278,7 @@ UPB_INLINE const envoy_type_metadata_v3_MetadataKind_Request* envoy_type_metadat const envoy_type_metadata_v3_MetadataKind_Request* default_val = NULL; const envoy_type_metadata_v3_MetadataKind_Request* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__metadata__v3__MetadataKind__Request_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -288,6 +295,7 @@ UPB_INLINE const envoy_type_metadata_v3_MetadataKind_Route* envoy_type_metadata_ const envoy_type_metadata_v3_MetadataKind_Route* default_val = NULL; const envoy_type_metadata_v3_MetadataKind_Route* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__metadata__v3__MetadataKind__Route_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -304,6 +312,7 @@ UPB_INLINE const envoy_type_metadata_v3_MetadataKind_Cluster* envoy_type_metadat const envoy_type_metadata_v3_MetadataKind_Cluster* default_val = NULL; const envoy_type_metadata_v3_MetadataKind_Cluster* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__metadata__v3__MetadataKind__Cluster_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -320,6 +329,7 @@ UPB_INLINE const envoy_type_metadata_v3_MetadataKind_Host* envoy_type_metadata_v const envoy_type_metadata_v3_MetadataKind_Host* default_val = NULL; const envoy_type_metadata_v3_MetadataKind_Host* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__metadata__v3__MetadataKind__Host_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -331,6 +341,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__metadata__v3__MetadataKind__Request_msg_init); 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) { @@ -343,6 +354,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__metadata__v3__MetadataKind__Route_msg_init); 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) { @@ -355,6 +367,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__metadata__v3__MetadataKind__Cluster_msg_init); 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) { @@ -367,6 +380,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__metadata__v3__MetadataKind__Host_msg_init); 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) { diff --git a/src/core/ext/upb-gen/envoy/type/metadata/v3/metadata.upb_minitable.c b/src/core/ext/upb-gen/envoy/type/metadata/v3/metadata.upb_minitable.c index 866f03dad53..5e474bd4403 100644 --- a/src/core/ext/upb-gen/envoy/type/metadata/v3/metadata.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/type/metadata/v3/metadata.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/type/metadata/v3/metadata.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -15,8 +16,9 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub envoy_type_metadata_v3_MetadataKey_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &envoy__type__metadata__v3__MetadataKey__PathSegment_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal envoy_type_metadata_v3_MetadataKey_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__type__metadata__v3__MetadataKey__PathSegment_msg_init_ptr}, }; static const upb_MiniTableField envoy_type_metadata_v3_MetadataKey__fields[2] = { @@ -39,6 +41,7 @@ const upb_MiniTable envoy__type__metadata__v3__MetadataKey_msg_init = { }) }; +const upb_MiniTable* envoy__type__metadata__v3__MetadataKey_msg_init_ptr = &envoy__type__metadata__v3__MetadataKey_msg_init; static const upb_MiniTableField envoy_type_metadata_v3_MetadataKey_PathSegment__fields[1] = { {1, UPB_SIZE(12, 16), -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, }; @@ -56,11 +59,12 @@ const upb_MiniTable envoy__type__metadata__v3__MetadataKey__PathSegment_msg_init }) }; -static const upb_MiniTableSub envoy_type_metadata_v3_MetadataKind_submsgs[4] = { - {.UPB_PRIVATE(submsg) = &envoy__type__metadata__v3__MetadataKind__Request_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__type__metadata__v3__MetadataKind__Route_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__type__metadata__v3__MetadataKind__Cluster_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__type__metadata__v3__MetadataKind__Host_msg_init}, +const upb_MiniTable* envoy__type__metadata__v3__MetadataKey__PathSegment_msg_init_ptr = &envoy__type__metadata__v3__MetadataKey__PathSegment_msg_init; +static const upb_MiniTableSubInternal envoy_type_metadata_v3_MetadataKind_submsgs[4] = { + {.UPB_PRIVATE(submsg) = &envoy__type__metadata__v3__MetadataKind__Request_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__type__metadata__v3__MetadataKind__Route_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__type__metadata__v3__MetadataKind__Cluster_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__type__metadata__v3__MetadataKind__Host_msg_init_ptr}, }; static const upb_MiniTableField envoy_type_metadata_v3_MetadataKind__fields[4] = { @@ -89,6 +93,7 @@ const upb_MiniTable envoy__type__metadata__v3__MetadataKind_msg_init = { }) }; +const upb_MiniTable* envoy__type__metadata__v3__MetadataKind_msg_init_ptr = &envoy__type__metadata__v3__MetadataKind_msg_init; const upb_MiniTable envoy__type__metadata__v3__MetadataKind__Request_msg_init = { NULL, NULL, @@ -98,6 +103,7 @@ const upb_MiniTable envoy__type__metadata__v3__MetadataKind__Request_msg_init = #endif }; +const upb_MiniTable* envoy__type__metadata__v3__MetadataKind__Request_msg_init_ptr = &envoy__type__metadata__v3__MetadataKind__Request_msg_init; const upb_MiniTable envoy__type__metadata__v3__MetadataKind__Route_msg_init = { NULL, NULL, @@ -107,6 +113,7 @@ const upb_MiniTable envoy__type__metadata__v3__MetadataKind__Route_msg_init = { #endif }; +const upb_MiniTable* envoy__type__metadata__v3__MetadataKind__Route_msg_init_ptr = &envoy__type__metadata__v3__MetadataKind__Route_msg_init; const upb_MiniTable envoy__type__metadata__v3__MetadataKind__Cluster_msg_init = { NULL, NULL, @@ -116,6 +123,7 @@ const upb_MiniTable envoy__type__metadata__v3__MetadataKind__Cluster_msg_init = #endif }; +const upb_MiniTable* envoy__type__metadata__v3__MetadataKind__Cluster_msg_init_ptr = &envoy__type__metadata__v3__MetadataKind__Cluster_msg_init; const upb_MiniTable envoy__type__metadata__v3__MetadataKind__Host_msg_init = { NULL, NULL, @@ -125,6 +133,7 @@ const upb_MiniTable envoy__type__metadata__v3__MetadataKind__Host_msg_init = { #endif }; +const upb_MiniTable* envoy__type__metadata__v3__MetadataKind__Host_msg_init_ptr = &envoy__type__metadata__v3__MetadataKind__Host_msg_init; static const upb_MiniTable *messages_layout[7] = { &envoy__type__metadata__v3__MetadataKey_msg_init, &envoy__type__metadata__v3__MetadataKey__PathSegment_msg_init, diff --git a/src/core/ext/upb-gen/envoy/type/metadata/v3/metadata.upb_minitable.h b/src/core/ext/upb-gen/envoy/type/metadata/v3/metadata.upb_minitable.h index a88e86243ac..2d478596583 100644 --- a/src/core/ext/upb-gen/envoy/type/metadata/v3/metadata.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/type/metadata/v3/metadata.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/type/metadata/v3/metadata.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_TYPE_METADATA_V3_METADATA_PROTO_UPB_MINITABLE_H_ #define ENVOY_TYPE_METADATA_V3_METADATA_PROTO_UPB_MINITABLE_H_ @@ -18,12 +19,19 @@ extern "C" { #endif extern const upb_MiniTable envoy__type__metadata__v3__MetadataKey_msg_init; +extern const upb_MiniTable* envoy__type__metadata__v3__MetadataKey_msg_init_ptr; extern const upb_MiniTable envoy__type__metadata__v3__MetadataKey__PathSegment_msg_init; +extern const upb_MiniTable* envoy__type__metadata__v3__MetadataKey__PathSegment_msg_init_ptr; extern const upb_MiniTable envoy__type__metadata__v3__MetadataKind_msg_init; +extern const upb_MiniTable* envoy__type__metadata__v3__MetadataKind_msg_init_ptr; extern const upb_MiniTable envoy__type__metadata__v3__MetadataKind__Request_msg_init; +extern const upb_MiniTable* envoy__type__metadata__v3__MetadataKind__Request_msg_init_ptr; extern const upb_MiniTable envoy__type__metadata__v3__MetadataKind__Route_msg_init; +extern const upb_MiniTable* envoy__type__metadata__v3__MetadataKind__Route_msg_init_ptr; extern const upb_MiniTable envoy__type__metadata__v3__MetadataKind__Cluster_msg_init; +extern const upb_MiniTable* envoy__type__metadata__v3__MetadataKind__Cluster_msg_init_ptr; extern const upb_MiniTable envoy__type__metadata__v3__MetadataKind__Host_msg_init; +extern const upb_MiniTable* envoy__type__metadata__v3__MetadataKind__Host_msg_init_ptr; extern const upb_MiniTableFile envoy_type_metadata_v3_metadata_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/type/tracing/v3/custom_tag.upb.h b/src/core/ext/upb-gen/envoy/type/tracing/v3/custom_tag.upb.h index a685a68927f..93f025325e1 100644 --- a/src/core/ext/upb-gen/envoy/type/tracing/v3/custom_tag.upb.h +++ b/src/core/ext/upb-gen/envoy/type/tracing/v3/custom_tag.upb.h @@ -3,7 +3,8 @@ * envoy/type/tracing/v3/custom_tag.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_TYPE_TRACING_V3_CUSTOM_TAG_PROTO_UPB_H_ #define ENVOY_TYPE_TRACING_V3_CUSTOM_TAG_PROTO_UPB_H_ @@ -102,6 +103,7 @@ UPB_INLINE const envoy_type_tracing_v3_CustomTag_Literal* envoy_type_tracing_v3_ const envoy_type_tracing_v3_CustomTag_Literal* default_val = NULL; const envoy_type_tracing_v3_CustomTag_Literal* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__tracing__v3__CustomTag__Literal_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -118,6 +120,7 @@ UPB_INLINE const envoy_type_tracing_v3_CustomTag_Environment* envoy_type_tracing const envoy_type_tracing_v3_CustomTag_Environment* default_val = NULL; const envoy_type_tracing_v3_CustomTag_Environment* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__tracing__v3__CustomTag__Environment_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -134,6 +137,7 @@ UPB_INLINE const envoy_type_tracing_v3_CustomTag_Header* envoy_type_tracing_v3_C const envoy_type_tracing_v3_CustomTag_Header* default_val = NULL; const envoy_type_tracing_v3_CustomTag_Header* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__tracing__v3__CustomTag__Header_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -150,6 +154,7 @@ UPB_INLINE const envoy_type_tracing_v3_CustomTag_Metadata* envoy_type_tracing_v3 const envoy_type_tracing_v3_CustomTag_Metadata* default_val = NULL; const envoy_type_tracing_v3_CustomTag_Metadata* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__tracing__v3__CustomTag__Metadata_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -165,6 +170,7 @@ UPB_INLINE void envoy_type_tracing_v3_CustomTag_set_tag(envoy_type_tracing_v3_Cu } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__tracing__v3__CustomTag__Literal_msg_init); 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) { @@ -177,6 +183,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__tracing__v3__CustomTag__Environment_msg_init); 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) { @@ -189,6 +196,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__tracing__v3__CustomTag__Header_msg_init); 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) { @@ -201,6 +209,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__tracing__v3__CustomTag__Metadata_msg_init); 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) { @@ -450,6 +459,7 @@ UPB_INLINE const struct envoy_type_metadata_v3_MetadataKind* envoy_type_tracing_ const struct envoy_type_metadata_v3_MetadataKind* default_val = NULL; const struct envoy_type_metadata_v3_MetadataKind* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__metadata__v3__MetadataKind_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -466,6 +476,7 @@ UPB_INLINE const struct envoy_type_metadata_v3_MetadataKey* envoy_type_tracing_v const struct envoy_type_metadata_v3_MetadataKey* default_val = NULL; const struct envoy_type_metadata_v3_MetadataKey* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__metadata__v3__MetadataKey_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -489,6 +500,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__metadata__v3__MetadataKind_msg_init); 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) { @@ -501,6 +513,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__metadata__v3__MetadataKey_msg_init); 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) { diff --git a/src/core/ext/upb-gen/envoy/type/tracing/v3/custom_tag.upb_minitable.c b/src/core/ext/upb-gen/envoy/type/tracing/v3/custom_tag.upb_minitable.c index 71a72baf894..c84c1071af9 100644 --- a/src/core/ext/upb-gen/envoy/type/tracing/v3/custom_tag.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/type/tracing/v3/custom_tag.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/type/tracing/v3/custom_tag.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -16,11 +17,12 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub envoy_type_tracing_v3_CustomTag_submsgs[4] = { - {.UPB_PRIVATE(submsg) = &envoy__type__tracing__v3__CustomTag__Literal_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__type__tracing__v3__CustomTag__Environment_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__type__tracing__v3__CustomTag__Header_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__type__tracing__v3__CustomTag__Metadata_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal envoy_type_tracing_v3_CustomTag_submsgs[4] = { + {.UPB_PRIVATE(submsg) = &envoy__type__tracing__v3__CustomTag__Literal_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__type__tracing__v3__CustomTag__Environment_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__type__tracing__v3__CustomTag__Header_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__type__tracing__v3__CustomTag__Metadata_msg_init_ptr}, }; static const upb_MiniTableField envoy_type_tracing_v3_CustomTag__fields[5] = { @@ -50,6 +52,7 @@ const upb_MiniTable envoy__type__tracing__v3__CustomTag_msg_init = { }) }; +const upb_MiniTable* envoy__type__tracing__v3__CustomTag_msg_init_ptr = &envoy__type__tracing__v3__CustomTag_msg_init; static const upb_MiniTableField envoy_type_tracing_v3_CustomTag_Literal__fields[1] = { {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, }; @@ -67,6 +70,7 @@ const upb_MiniTable envoy__type__tracing__v3__CustomTag__Literal_msg_init = { }) }; +const upb_MiniTable* envoy__type__tracing__v3__CustomTag__Literal_msg_init_ptr = &envoy__type__tracing__v3__CustomTag__Literal_msg_init; static const upb_MiniTableField envoy_type_tracing_v3_CustomTag_Environment__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)}, @@ -87,6 +91,7 @@ const upb_MiniTable envoy__type__tracing__v3__CustomTag__Environment_msg_init = }) }; +const upb_MiniTable* envoy__type__tracing__v3__CustomTag__Environment_msg_init_ptr = &envoy__type__tracing__v3__CustomTag__Environment_msg_init; static const upb_MiniTableField envoy_type_tracing_v3_CustomTag_Header__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)}, @@ -107,9 +112,10 @@ const upb_MiniTable envoy__type__tracing__v3__CustomTag__Header_msg_init = { }) }; -static const upb_MiniTableSub envoy_type_tracing_v3_CustomTag_Metadata_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &envoy__type__metadata__v3__MetadataKind_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__type__metadata__v3__MetadataKey_msg_init}, +const upb_MiniTable* envoy__type__tracing__v3__CustomTag__Header_msg_init_ptr = &envoy__type__tracing__v3__CustomTag__Header_msg_init; +static const upb_MiniTableSubInternal envoy_type_tracing_v3_CustomTag_Metadata_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &envoy__type__metadata__v3__MetadataKind_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__type__metadata__v3__MetadataKey_msg_init_ptr}, }; static const upb_MiniTableField envoy_type_tracing_v3_CustomTag_Metadata__fields[3] = { @@ -133,6 +139,7 @@ const upb_MiniTable envoy__type__tracing__v3__CustomTag__Metadata_msg_init = { }) }; +const upb_MiniTable* envoy__type__tracing__v3__CustomTag__Metadata_msg_init_ptr = &envoy__type__tracing__v3__CustomTag__Metadata_msg_init; static const upb_MiniTable *messages_layout[5] = { &envoy__type__tracing__v3__CustomTag_msg_init, &envoy__type__tracing__v3__CustomTag__Literal_msg_init, diff --git a/src/core/ext/upb-gen/envoy/type/tracing/v3/custom_tag.upb_minitable.h b/src/core/ext/upb-gen/envoy/type/tracing/v3/custom_tag.upb_minitable.h index df52ab8ae3a..bb56ee9735d 100644 --- a/src/core/ext/upb-gen/envoy/type/tracing/v3/custom_tag.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/type/tracing/v3/custom_tag.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/type/tracing/v3/custom_tag.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_TYPE_TRACING_V3_CUSTOM_TAG_PROTO_UPB_MINITABLE_H_ #define ENVOY_TYPE_TRACING_V3_CUSTOM_TAG_PROTO_UPB_MINITABLE_H_ @@ -18,10 +19,15 @@ extern "C" { #endif extern const upb_MiniTable envoy__type__tracing__v3__CustomTag_msg_init; +extern const upb_MiniTable* envoy__type__tracing__v3__CustomTag_msg_init_ptr; extern const upb_MiniTable envoy__type__tracing__v3__CustomTag__Literal_msg_init; +extern const upb_MiniTable* envoy__type__tracing__v3__CustomTag__Literal_msg_init_ptr; extern const upb_MiniTable envoy__type__tracing__v3__CustomTag__Environment_msg_init; +extern const upb_MiniTable* envoy__type__tracing__v3__CustomTag__Environment_msg_init_ptr; extern const upb_MiniTable envoy__type__tracing__v3__CustomTag__Header_msg_init; +extern const upb_MiniTable* envoy__type__tracing__v3__CustomTag__Header_msg_init_ptr; extern const upb_MiniTable envoy__type__tracing__v3__CustomTag__Metadata_msg_init; +extern const upb_MiniTable* envoy__type__tracing__v3__CustomTag__Metadata_msg_init_ptr; extern const upb_MiniTableFile envoy_type_tracing_v3_custom_tag_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/type/v3/hash_policy.upb.h b/src/core/ext/upb-gen/envoy/type/v3/hash_policy.upb.h index 784b9ad89ef..ca2c40ea3a0 100644 --- a/src/core/ext/upb-gen/envoy/type/v3/hash_policy.upb.h +++ b/src/core/ext/upb-gen/envoy/type/v3/hash_policy.upb.h @@ -3,7 +3,8 @@ * envoy/type/v3/hash_policy.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_TYPE_V3_HASH_POLICY_PROTO_UPB_H_ #define ENVOY_TYPE_V3_HASH_POLICY_PROTO_UPB_H_ @@ -83,6 +84,7 @@ UPB_INLINE const envoy_type_v3_HashPolicy_SourceIp* envoy_type_v3_HashPolicy_sou const envoy_type_v3_HashPolicy_SourceIp* default_val = NULL; const envoy_type_v3_HashPolicy_SourceIp* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__v3__HashPolicy__SourceIp_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -99,6 +101,7 @@ UPB_INLINE const envoy_type_v3_HashPolicy_FilterState* envoy_type_v3_HashPolicy_ const envoy_type_v3_HashPolicy_FilterState* default_val = NULL; const envoy_type_v3_HashPolicy_FilterState* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__v3__HashPolicy__FilterState_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -110,6 +113,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__v3__HashPolicy__SourceIp_msg_init); 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) { @@ -122,6 +126,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__v3__HashPolicy__FilterState_msg_init); 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) { diff --git a/src/core/ext/upb-gen/envoy/type/v3/hash_policy.upb_minitable.c b/src/core/ext/upb-gen/envoy/type/v3/hash_policy.upb_minitable.c index de7bad7194c..1b4ab885248 100644 --- a/src/core/ext/upb-gen/envoy/type/v3/hash_policy.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/type/v3/hash_policy.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/type/v3/hash_policy.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -15,9 +16,10 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub envoy_type_v3_HashPolicy_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &envoy__type__v3__HashPolicy__SourceIp_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__type__v3__HashPolicy__FilterState_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal envoy_type_v3_HashPolicy_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &envoy__type__v3__HashPolicy__SourceIp_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__type__v3__HashPolicy__FilterState_msg_init_ptr}, }; static const upb_MiniTableField envoy_type_v3_HashPolicy__fields[2] = { @@ -40,6 +42,7 @@ const upb_MiniTable envoy__type__v3__HashPolicy_msg_init = { }) }; +const upb_MiniTable* envoy__type__v3__HashPolicy_msg_init_ptr = &envoy__type__v3__HashPolicy_msg_init; const upb_MiniTable envoy__type__v3__HashPolicy__SourceIp_msg_init = { NULL, NULL, @@ -49,6 +52,7 @@ const upb_MiniTable envoy__type__v3__HashPolicy__SourceIp_msg_init = { #endif }; +const upb_MiniTable* envoy__type__v3__HashPolicy__SourceIp_msg_init_ptr = &envoy__type__v3__HashPolicy__SourceIp_msg_init; static const upb_MiniTableField envoy_type_v3_HashPolicy_FilterState__fields[1] = { {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, }; @@ -66,6 +70,7 @@ const upb_MiniTable envoy__type__v3__HashPolicy__FilterState_msg_init = { }) }; +const upb_MiniTable* envoy__type__v3__HashPolicy__FilterState_msg_init_ptr = &envoy__type__v3__HashPolicy__FilterState_msg_init; static const upb_MiniTable *messages_layout[3] = { &envoy__type__v3__HashPolicy_msg_init, &envoy__type__v3__HashPolicy__SourceIp_msg_init, diff --git a/src/core/ext/upb-gen/envoy/type/v3/hash_policy.upb_minitable.h b/src/core/ext/upb-gen/envoy/type/v3/hash_policy.upb_minitable.h index f54a830895f..ef433125279 100644 --- a/src/core/ext/upb-gen/envoy/type/v3/hash_policy.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/type/v3/hash_policy.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/type/v3/hash_policy.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_TYPE_V3_HASH_POLICY_PROTO_UPB_MINITABLE_H_ #define ENVOY_TYPE_V3_HASH_POLICY_PROTO_UPB_MINITABLE_H_ @@ -18,8 +19,11 @@ extern "C" { #endif extern const upb_MiniTable envoy__type__v3__HashPolicy_msg_init; +extern const upb_MiniTable* envoy__type__v3__HashPolicy_msg_init_ptr; extern const upb_MiniTable envoy__type__v3__HashPolicy__SourceIp_msg_init; +extern const upb_MiniTable* envoy__type__v3__HashPolicy__SourceIp_msg_init_ptr; extern const upb_MiniTable envoy__type__v3__HashPolicy__FilterState_msg_init; +extern const upb_MiniTable* envoy__type__v3__HashPolicy__FilterState_msg_init_ptr; extern const upb_MiniTableFile envoy_type_v3_hash_policy_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/type/v3/http.upb.h b/src/core/ext/upb-gen/envoy/type/v3/http.upb.h index ff12940bdcf..5c8d0035b62 100644 --- a/src/core/ext/upb-gen/envoy/type/v3/http.upb.h +++ b/src/core/ext/upb-gen/envoy/type/v3/http.upb.h @@ -3,7 +3,8 @@ * envoy/type/v3/http.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_TYPE_V3_HTTP_PROTO_UPB_H_ #define ENVOY_TYPE_V3_HTTP_PROTO_UPB_H_ diff --git a/src/core/ext/upb-gen/envoy/type/v3/http.upb_minitable.c b/src/core/ext/upb-gen/envoy/type/v3/http.upb_minitable.c index c54e11f451f..14fb4670652 100644 --- a/src/core/ext/upb-gen/envoy/type/v3/http.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/type/v3/http.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/type/v3/http.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -13,6 +14,7 @@ // Must be last. #include "upb/port/def.inc" +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); const upb_MiniTableFile envoy_type_v3_http_proto_upb_file_layout = { NULL, NULL, diff --git a/src/core/ext/upb-gen/envoy/type/v3/http.upb_minitable.h b/src/core/ext/upb-gen/envoy/type/v3/http.upb_minitable.h index 499d347a67a..a08e816387d 100644 --- a/src/core/ext/upb-gen/envoy/type/v3/http.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/type/v3/http.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/type/v3/http.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_TYPE_V3_HTTP_PROTO_UPB_MINITABLE_H_ #define ENVOY_TYPE_V3_HTTP_PROTO_UPB_MINITABLE_H_ diff --git a/src/core/ext/upb-gen/envoy/type/v3/http_status.upb.h b/src/core/ext/upb-gen/envoy/type/v3/http_status.upb.h index 7bba6670269..99c392180e2 100644 --- a/src/core/ext/upb-gen/envoy/type/v3/http_status.upb.h +++ b/src/core/ext/upb-gen/envoy/type/v3/http_status.upb.h @@ -3,7 +3,8 @@ * envoy/type/v3/http_status.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_TYPE_V3_HTTP_STATUS_PROTO_UPB_H_ #define ENVOY_TYPE_V3_HTTP_STATUS_PROTO_UPB_H_ diff --git a/src/core/ext/upb-gen/envoy/type/v3/http_status.upb_minitable.c b/src/core/ext/upb-gen/envoy/type/v3/http_status.upb_minitable.c index 753271ec954..ce182730eac 100644 --- a/src/core/ext/upb-gen/envoy/type/v3/http_status.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/type/v3/http_status.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/type/v3/http_status.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -15,6 +16,7 @@ // Must be last. #include "upb/port/def.inc" +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); static const upb_MiniTableField envoy_type_v3_HttpStatus__fields[1] = { {1, 8, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, }; @@ -32,6 +34,7 @@ const upb_MiniTable envoy__type__v3__HttpStatus_msg_init = { }) }; +const upb_MiniTable* envoy__type__v3__HttpStatus_msg_init_ptr = &envoy__type__v3__HttpStatus_msg_init; static const upb_MiniTable *messages_layout[1] = { &envoy__type__v3__HttpStatus_msg_init, }; diff --git a/src/core/ext/upb-gen/envoy/type/v3/http_status.upb_minitable.h b/src/core/ext/upb-gen/envoy/type/v3/http_status.upb_minitable.h index 1deb302d375..8f71d7e3163 100644 --- a/src/core/ext/upb-gen/envoy/type/v3/http_status.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/type/v3/http_status.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/type/v3/http_status.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_TYPE_V3_HTTP_STATUS_PROTO_UPB_MINITABLE_H_ #define ENVOY_TYPE_V3_HTTP_STATUS_PROTO_UPB_MINITABLE_H_ @@ -18,6 +19,7 @@ extern "C" { #endif extern const upb_MiniTable envoy__type__v3__HttpStatus_msg_init; +extern const upb_MiniTable* envoy__type__v3__HttpStatus_msg_init_ptr; extern const upb_MiniTableFile envoy_type_v3_http_status_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/type/v3/percent.upb.h b/src/core/ext/upb-gen/envoy/type/v3/percent.upb.h index fbc1ccc5dc1..6d211675c93 100644 --- a/src/core/ext/upb-gen/envoy/type/v3/percent.upb.h +++ b/src/core/ext/upb-gen/envoy/type/v3/percent.upb.h @@ -3,7 +3,8 @@ * envoy/type/v3/percent.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_TYPE_V3_PERCENT_PROTO_UPB_H_ #define ENVOY_TYPE_V3_PERCENT_PROTO_UPB_H_ diff --git a/src/core/ext/upb-gen/envoy/type/v3/percent.upb_minitable.c b/src/core/ext/upb-gen/envoy/type/v3/percent.upb_minitable.c index b1c326948f6..6ad4ee6eeda 100644 --- a/src/core/ext/upb-gen/envoy/type/v3/percent.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/type/v3/percent.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/type/v3/percent.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -15,6 +16,7 @@ // Must be last. #include "upb/port/def.inc" +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); static const upb_MiniTableField envoy_type_v3_Percent__fields[1] = { {1, 8, 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, }; @@ -32,6 +34,7 @@ const upb_MiniTable envoy__type__v3__Percent_msg_init = { }) }; +const upb_MiniTable* envoy__type__v3__Percent_msg_init_ptr = &envoy__type__v3__Percent_msg_init; static const upb_MiniTableField envoy_type_v3_FractionalPercent__fields[2] = { {1, 8, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, {2, 12, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, @@ -52,6 +55,7 @@ const upb_MiniTable envoy__type__v3__FractionalPercent_msg_init = { }) }; +const upb_MiniTable* envoy__type__v3__FractionalPercent_msg_init_ptr = &envoy__type__v3__FractionalPercent_msg_init; static const upb_MiniTable *messages_layout[2] = { &envoy__type__v3__Percent_msg_init, &envoy__type__v3__FractionalPercent_msg_init, diff --git a/src/core/ext/upb-gen/envoy/type/v3/percent.upb_minitable.h b/src/core/ext/upb-gen/envoy/type/v3/percent.upb_minitable.h index de5d7c88e12..b9eb6640fad 100644 --- a/src/core/ext/upb-gen/envoy/type/v3/percent.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/type/v3/percent.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/type/v3/percent.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_TYPE_V3_PERCENT_PROTO_UPB_MINITABLE_H_ #define ENVOY_TYPE_V3_PERCENT_PROTO_UPB_MINITABLE_H_ @@ -18,7 +19,9 @@ extern "C" { #endif extern const upb_MiniTable envoy__type__v3__Percent_msg_init; +extern const upb_MiniTable* envoy__type__v3__Percent_msg_init_ptr; extern const upb_MiniTable envoy__type__v3__FractionalPercent_msg_init; +extern const upb_MiniTable* envoy__type__v3__FractionalPercent_msg_init_ptr; extern const upb_MiniTableFile envoy_type_v3_percent_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/type/v3/range.upb.h b/src/core/ext/upb-gen/envoy/type/v3/range.upb.h index 497e60a9997..78fc3a58317 100644 --- a/src/core/ext/upb-gen/envoy/type/v3/range.upb.h +++ b/src/core/ext/upb-gen/envoy/type/v3/range.upb.h @@ -3,7 +3,8 @@ * envoy/type/v3/range.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_TYPE_V3_RANGE_PROTO_UPB_H_ #define ENVOY_TYPE_V3_RANGE_PROTO_UPB_H_ diff --git a/src/core/ext/upb-gen/envoy/type/v3/range.upb_minitable.c b/src/core/ext/upb-gen/envoy/type/v3/range.upb_minitable.c index 9ffc6f5454f..030a87762f8 100644 --- a/src/core/ext/upb-gen/envoy/type/v3/range.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/type/v3/range.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/type/v3/range.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -14,6 +15,7 @@ // Must be last. #include "upb/port/def.inc" +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); static const upb_MiniTableField envoy_type_v3_Int64Range__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)}, @@ -34,6 +36,7 @@ const upb_MiniTable envoy__type__v3__Int64Range_msg_init = { }) }; +const upb_MiniTable* envoy__type__v3__Int64Range_msg_init_ptr = &envoy__type__v3__Int64Range_msg_init; static const upb_MiniTableField envoy_type_v3_Int32Range__fields[2] = { {1, 8, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, {2, 12, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, @@ -54,6 +57,7 @@ const upb_MiniTable envoy__type__v3__Int32Range_msg_init = { }) }; +const upb_MiniTable* envoy__type__v3__Int32Range_msg_init_ptr = &envoy__type__v3__Int32Range_msg_init; static const upb_MiniTableField envoy_type_v3_DoubleRange__fields[2] = { {1, 8, 0, kUpb_NoSub, 1, (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)}, @@ -74,6 +78,7 @@ const upb_MiniTable envoy__type__v3__DoubleRange_msg_init = { }) }; +const upb_MiniTable* envoy__type__v3__DoubleRange_msg_init_ptr = &envoy__type__v3__DoubleRange_msg_init; static const upb_MiniTable *messages_layout[3] = { &envoy__type__v3__Int64Range_msg_init, &envoy__type__v3__Int32Range_msg_init, diff --git a/src/core/ext/upb-gen/envoy/type/v3/range.upb_minitable.h b/src/core/ext/upb-gen/envoy/type/v3/range.upb_minitable.h index 3e8c29434b5..006971ebc2d 100644 --- a/src/core/ext/upb-gen/envoy/type/v3/range.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/type/v3/range.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/type/v3/range.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_TYPE_V3_RANGE_PROTO_UPB_MINITABLE_H_ #define ENVOY_TYPE_V3_RANGE_PROTO_UPB_MINITABLE_H_ @@ -18,8 +19,11 @@ extern "C" { #endif extern const upb_MiniTable envoy__type__v3__Int64Range_msg_init; +extern const upb_MiniTable* envoy__type__v3__Int64Range_msg_init_ptr; extern const upb_MiniTable envoy__type__v3__Int32Range_msg_init; +extern const upb_MiniTable* envoy__type__v3__Int32Range_msg_init_ptr; extern const upb_MiniTable envoy__type__v3__DoubleRange_msg_init; +extern const upb_MiniTable* envoy__type__v3__DoubleRange_msg_init_ptr; extern const upb_MiniTableFile envoy_type_v3_range_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/type/v3/ratelimit_strategy.upb.h b/src/core/ext/upb-gen/envoy/type/v3/ratelimit_strategy.upb.h index c94e29ac2d4..060177c296d 100644 --- a/src/core/ext/upb-gen/envoy/type/v3/ratelimit_strategy.upb.h +++ b/src/core/ext/upb-gen/envoy/type/v3/ratelimit_strategy.upb.h @@ -3,7 +3,8 @@ * envoy/type/v3/ratelimit_strategy.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_TYPE_V3_RATELIMIT_STRATEGY_PROTO_UPB_H_ #define ENVOY_TYPE_V3_RATELIMIT_STRATEGY_PROTO_UPB_H_ @@ -107,6 +108,7 @@ UPB_INLINE const envoy_type_v3_RateLimitStrategy_RequestsPerTimeUnit* envoy_type const envoy_type_v3_RateLimitStrategy_RequestsPerTimeUnit* default_val = NULL; const envoy_type_v3_RateLimitStrategy_RequestsPerTimeUnit* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__v3__RateLimitStrategy__RequestsPerTimeUnit_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -123,6 +125,7 @@ UPB_INLINE const struct envoy_type_v3_TokenBucket* envoy_type_v3_RateLimitStrate const struct envoy_type_v3_TokenBucket* default_val = NULL; const struct envoy_type_v3_TokenBucket* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__v3__TokenBucket_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -138,6 +141,7 @@ UPB_INLINE void envoy_type_v3_RateLimitStrategy_set_blanket_rule(envoy_type_v3_R } 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__v3__RateLimitStrategy__RequestsPerTimeUnit_msg_init); 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) { @@ -150,6 +154,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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__v3__TokenBucket_msg_init); 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) { diff --git a/src/core/ext/upb-gen/envoy/type/v3/ratelimit_strategy.upb_minitable.c b/src/core/ext/upb-gen/envoy/type/v3/ratelimit_strategy.upb_minitable.c index 9b1b35c1f69..7a4ff32fd9c 100644 --- a/src/core/ext/upb-gen/envoy/type/v3/ratelimit_strategy.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/type/v3/ratelimit_strategy.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/type/v3/ratelimit_strategy.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -17,9 +18,10 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub envoy_type_v3_RateLimitStrategy_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &envoy__type__v3__RateLimitStrategy__RequestsPerTimeUnit_msg_init}, - {.UPB_PRIVATE(submsg) = &envoy__type__v3__TokenBucket_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal envoy_type_v3_RateLimitStrategy_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &envoy__type__v3__RateLimitStrategy__RequestsPerTimeUnit_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &envoy__type__v3__TokenBucket_msg_init_ptr}, }; static const upb_MiniTableField envoy_type_v3_RateLimitStrategy__fields[3] = { @@ -43,6 +45,7 @@ const upb_MiniTable envoy__type__v3__RateLimitStrategy_msg_init = { }) }; +const upb_MiniTable* envoy__type__v3__RateLimitStrategy_msg_init_ptr = &envoy__type__v3__RateLimitStrategy_msg_init; static const upb_MiniTableField envoy_type_v3_RateLimitStrategy_RequestsPerTimeUnit__fields[2] = { {1, 16, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, {2, 8, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, @@ -63,6 +66,7 @@ const upb_MiniTable envoy__type__v3__RateLimitStrategy__RequestsPerTimeUnit_msg_ }) }; +const upb_MiniTable* envoy__type__v3__RateLimitStrategy__RequestsPerTimeUnit_msg_init_ptr = &envoy__type__v3__RateLimitStrategy__RequestsPerTimeUnit_msg_init; static const upb_MiniTable *messages_layout[2] = { &envoy__type__v3__RateLimitStrategy_msg_init, &envoy__type__v3__RateLimitStrategy__RequestsPerTimeUnit_msg_init, diff --git a/src/core/ext/upb-gen/envoy/type/v3/ratelimit_strategy.upb_minitable.h b/src/core/ext/upb-gen/envoy/type/v3/ratelimit_strategy.upb_minitable.h index 6b3623bb9f4..6d696d1ce8c 100644 --- a/src/core/ext/upb-gen/envoy/type/v3/ratelimit_strategy.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/type/v3/ratelimit_strategy.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/type/v3/ratelimit_strategy.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_TYPE_V3_RATELIMIT_STRATEGY_PROTO_UPB_MINITABLE_H_ #define ENVOY_TYPE_V3_RATELIMIT_STRATEGY_PROTO_UPB_MINITABLE_H_ @@ -18,7 +19,9 @@ extern "C" { #endif extern const upb_MiniTable envoy__type__v3__RateLimitStrategy_msg_init; +extern const upb_MiniTable* envoy__type__v3__RateLimitStrategy_msg_init_ptr; extern const upb_MiniTable envoy__type__v3__RateLimitStrategy__RequestsPerTimeUnit_msg_init; +extern const upb_MiniTable* envoy__type__v3__RateLimitStrategy__RequestsPerTimeUnit_msg_init_ptr; extern const upb_MiniTableFile envoy_type_v3_ratelimit_strategy_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/type/v3/ratelimit_unit.upb.h b/src/core/ext/upb-gen/envoy/type/v3/ratelimit_unit.upb.h index b1b9a9ebc1b..0e03ae64725 100644 --- a/src/core/ext/upb-gen/envoy/type/v3/ratelimit_unit.upb.h +++ b/src/core/ext/upb-gen/envoy/type/v3/ratelimit_unit.upb.h @@ -3,7 +3,8 @@ * envoy/type/v3/ratelimit_unit.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_TYPE_V3_RATELIMIT_UNIT_PROTO_UPB_H_ #define ENVOY_TYPE_V3_RATELIMIT_UNIT_PROTO_UPB_H_ diff --git a/src/core/ext/upb-gen/envoy/type/v3/ratelimit_unit.upb_minitable.c b/src/core/ext/upb-gen/envoy/type/v3/ratelimit_unit.upb_minitable.c index e6731c1ffa5..2683e22a07d 100644 --- a/src/core/ext/upb-gen/envoy/type/v3/ratelimit_unit.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/type/v3/ratelimit_unit.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/type/v3/ratelimit_unit.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -13,6 +14,7 @@ // Must be last. #include "upb/port/def.inc" +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); const upb_MiniTableFile envoy_type_v3_ratelimit_unit_proto_upb_file_layout = { NULL, NULL, diff --git a/src/core/ext/upb-gen/envoy/type/v3/ratelimit_unit.upb_minitable.h b/src/core/ext/upb-gen/envoy/type/v3/ratelimit_unit.upb_minitable.h index a20e7d368cd..1a764729125 100644 --- a/src/core/ext/upb-gen/envoy/type/v3/ratelimit_unit.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/type/v3/ratelimit_unit.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/type/v3/ratelimit_unit.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_TYPE_V3_RATELIMIT_UNIT_PROTO_UPB_MINITABLE_H_ #define ENVOY_TYPE_V3_RATELIMIT_UNIT_PROTO_UPB_MINITABLE_H_ diff --git a/src/core/ext/upb-gen/envoy/type/v3/semantic_version.upb.h b/src/core/ext/upb-gen/envoy/type/v3/semantic_version.upb.h index 704ae971968..f472ac3a66e 100644 --- a/src/core/ext/upb-gen/envoy/type/v3/semantic_version.upb.h +++ b/src/core/ext/upb-gen/envoy/type/v3/semantic_version.upb.h @@ -3,7 +3,8 @@ * envoy/type/v3/semantic_version.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_TYPE_V3_SEMANTIC_VERSION_PROTO_UPB_H_ #define ENVOY_TYPE_V3_SEMANTIC_VERSION_PROTO_UPB_H_ diff --git a/src/core/ext/upb-gen/envoy/type/v3/semantic_version.upb_minitable.c b/src/core/ext/upb-gen/envoy/type/v3/semantic_version.upb_minitable.c index 923ec89a455..1912f389229 100644 --- a/src/core/ext/upb-gen/envoy/type/v3/semantic_version.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/type/v3/semantic_version.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/type/v3/semantic_version.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -14,6 +15,7 @@ // Must be last. #include "upb/port/def.inc" +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); static const upb_MiniTableField envoy_type_v3_SemanticVersion__fields[3] = { {1, 8, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, {2, 12, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, @@ -35,6 +37,7 @@ const upb_MiniTable envoy__type__v3__SemanticVersion_msg_init = { }) }; +const upb_MiniTable* envoy__type__v3__SemanticVersion_msg_init_ptr = &envoy__type__v3__SemanticVersion_msg_init; static const upb_MiniTable *messages_layout[1] = { &envoy__type__v3__SemanticVersion_msg_init, }; diff --git a/src/core/ext/upb-gen/envoy/type/v3/semantic_version.upb_minitable.h b/src/core/ext/upb-gen/envoy/type/v3/semantic_version.upb_minitable.h index 183a79a94f0..6611d2e608c 100644 --- a/src/core/ext/upb-gen/envoy/type/v3/semantic_version.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/type/v3/semantic_version.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/type/v3/semantic_version.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_TYPE_V3_SEMANTIC_VERSION_PROTO_UPB_MINITABLE_H_ #define ENVOY_TYPE_V3_SEMANTIC_VERSION_PROTO_UPB_MINITABLE_H_ @@ -18,6 +19,7 @@ extern "C" { #endif extern const upb_MiniTable envoy__type__v3__SemanticVersion_msg_init; +extern const upb_MiniTable* envoy__type__v3__SemanticVersion_msg_init_ptr; extern const upb_MiniTableFile envoy_type_v3_semantic_version_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/type/v3/token_bucket.upb.h b/src/core/ext/upb-gen/envoy/type/v3/token_bucket.upb.h index 24696afb703..86fb0620112 100644 --- a/src/core/ext/upb-gen/envoy/type/v3/token_bucket.upb.h +++ b/src/core/ext/upb-gen/envoy/type/v3/token_bucket.upb.h @@ -3,7 +3,8 @@ * envoy/type/v3/token_bucket.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_TYPE_V3_TOKEN_BUCKET_PROTO_UPB_H_ #define ENVOY_TYPE_V3_TOKEN_BUCKET_PROTO_UPB_H_ @@ -87,6 +88,7 @@ UPB_INLINE const struct google_protobuf_UInt32Value* envoy_type_v3_TokenBucket_t 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -103,6 +105,7 @@ UPB_INLINE const struct google_protobuf_Duration* envoy_type_v3_TokenBucket_fill const struct google_protobuf_Duration* default_val = NULL; const struct google_protobuf_Duration* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -118,6 +121,7 @@ UPB_INLINE void envoy_type_v3_TokenBucket_set_max_tokens(envoy_type_v3_TokenBuck } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); 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) { @@ -130,6 +134,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { diff --git a/src/core/ext/upb-gen/envoy/type/v3/token_bucket.upb_minitable.c b/src/core/ext/upb-gen/envoy/type/v3/token_bucket.upb_minitable.c index dcfe1e086d7..4ee1428130d 100644 --- a/src/core/ext/upb-gen/envoy/type/v3/token_bucket.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/type/v3/token_bucket.upb_minitable.c @@ -3,7 +3,8 @@ * envoy/type/v3/token_bucket.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -17,9 +18,10 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub envoy_type_v3_TokenBucket_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal envoy_type_v3_TokenBucket_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, }; static const upb_MiniTableField envoy_type_v3_TokenBucket__fields[3] = { @@ -41,6 +43,7 @@ const upb_MiniTable envoy__type__v3__TokenBucket_msg_init = { }) }; +const upb_MiniTable* envoy__type__v3__TokenBucket_msg_init_ptr = &envoy__type__v3__TokenBucket_msg_init; static const upb_MiniTable *messages_layout[1] = { &envoy__type__v3__TokenBucket_msg_init, }; diff --git a/src/core/ext/upb-gen/envoy/type/v3/token_bucket.upb_minitable.h b/src/core/ext/upb-gen/envoy/type/v3/token_bucket.upb_minitable.h index d9aaac68ba5..20a72de42c3 100644 --- a/src/core/ext/upb-gen/envoy/type/v3/token_bucket.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/type/v3/token_bucket.upb_minitable.h @@ -3,7 +3,8 @@ * envoy/type/v3/token_bucket.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_TYPE_V3_TOKEN_BUCKET_PROTO_UPB_MINITABLE_H_ #define ENVOY_TYPE_V3_TOKEN_BUCKET_PROTO_UPB_MINITABLE_H_ @@ -18,6 +19,7 @@ extern "C" { #endif extern const upb_MiniTable envoy__type__v3__TokenBucket_msg_init; +extern const upb_MiniTable* envoy__type__v3__TokenBucket_msg_init_ptr; extern const upb_MiniTableFile envoy_type_v3_token_bucket_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/google/api/annotations.upb.h b/src/core/ext/upb-gen/google/api/annotations.upb.h index 681baa3335d..5130ecc66da 100644 --- a/src/core/ext/upb-gen/google/api/annotations.upb.h +++ b/src/core/ext/upb-gen/google/api/annotations.upb.h @@ -3,7 +3,8 @@ * google/api/annotations.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef GOOGLE_API_ANNOTATIONS_PROTO_UPB_H_ #define GOOGLE_API_ANNOTATIONS_PROTO_UPB_H_ diff --git a/src/core/ext/upb-gen/google/api/annotations.upb_minitable.c b/src/core/ext/upb-gen/google/api/annotations.upb_minitable.c index 215b98e938c..fc0e3d6e67b 100644 --- a/src/core/ext/upb-gen/google/api/annotations.upb_minitable.c +++ b/src/core/ext/upb-gen/google/api/annotations.upb_minitable.c @@ -3,7 +3,8 @@ * google/api/annotations.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -14,6 +15,8 @@ // Must be last. #include "upb/port/def.inc" +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +UPB_LINKARR_APPEND(upb_AllExts) const upb_MiniTableExtension google_api_http_ext = { {72295728, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, &google__protobuf__MethodOptions_msg_init, diff --git a/src/core/ext/upb-gen/google/api/annotations.upb_minitable.h b/src/core/ext/upb-gen/google/api/annotations.upb_minitable.h index d98f0dacdda..101b37d51ea 100644 --- a/src/core/ext/upb-gen/google/api/annotations.upb_minitable.h +++ b/src/core/ext/upb-gen/google/api/annotations.upb_minitable.h @@ -3,7 +3,8 @@ * google/api/annotations.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef GOOGLE_API_ANNOTATIONS_PROTO_UPB_MINITABLE_H_ #define GOOGLE_API_ANNOTATIONS_PROTO_UPB_MINITABLE_H_ diff --git a/src/core/ext/upb-gen/google/api/expr/v1alpha1/checked.upb.h b/src/core/ext/upb-gen/google/api/expr/v1alpha1/checked.upb.h index 3b87f262b91..8a1b0be2fd1 100644 --- a/src/core/ext/upb-gen/google/api/expr/v1alpha1/checked.upb.h +++ b/src/core/ext/upb-gen/google/api/expr/v1alpha1/checked.upb.h @@ -3,7 +3,8 @@ * google/api/expr/v1alpha1/checked.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef GOOGLE_API_EXPR_V1ALPHA1_CHECKED_PROTO_UPB_H_ #define GOOGLE_API_EXPR_V1ALPHA1_CHECKED_PROTO_UPB_H_ @@ -107,22 +108,30 @@ UPB_INLINE size_t google_api_expr_v1alpha1_CheckedExpr_reference_map_size(const } UPB_INLINE bool google_api_expr_v1alpha1_CheckedExpr_reference_map_get(const google_api_expr_v1alpha1_CheckedExpr* msg, int64_t key, google_api_expr_v1alpha1_Reference** val) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__CheckedExpr__ReferenceMapEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Reference_msg_init); const upb_Map* map = upb_Message_GetMap(UPB_UPCAST(msg), &field); if (!map) return false; return _upb_Map_Get(map, &key, sizeof(key), val, sizeof(*val)); } UPB_INLINE const google_api_expr_v1alpha1_CheckedExpr_ReferenceMapEntry* google_api_expr_v1alpha1_CheckedExpr_reference_map_next(const google_api_expr_v1alpha1_CheckedExpr* msg, size_t* iter) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__CheckedExpr__ReferenceMapEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Reference_msg_init); const upb_Map* map = upb_Message_GetMap(UPB_UPCAST(msg), &field); if (!map) return NULL; return (const google_api_expr_v1alpha1_CheckedExpr_ReferenceMapEntry*)_upb_map_next(map, iter); } UPB_INLINE const upb_Map* _google_api_expr_v1alpha1_CheckedExpr_reference_map_upb_map(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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__CheckedExpr__ReferenceMapEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Reference_msg_init); return upb_Message_GetMap(UPB_UPCAST(msg), &field); } UPB_INLINE upb_Map* _google_api_expr_v1alpha1_CheckedExpr_reference_map_mutable_upb_map(google_api_expr_v1alpha1_CheckedExpr* msg, upb_Arena* a) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__CheckedExpr__ReferenceMapEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Reference_msg_init); return _upb_Message_GetOrCreateMutableMap(UPB_UPCAST(msg), &field, sizeof(int64_t), sizeof(google_api_expr_v1alpha1_Reference*), a); } UPB_INLINE void google_api_expr_v1alpha1_CheckedExpr_clear_type_map(google_api_expr_v1alpha1_CheckedExpr* msg) { @@ -136,22 +145,30 @@ UPB_INLINE size_t google_api_expr_v1alpha1_CheckedExpr_type_map_size(const googl } UPB_INLINE bool google_api_expr_v1alpha1_CheckedExpr_type_map_get(const google_api_expr_v1alpha1_CheckedExpr* msg, int64_t key, google_api_expr_v1alpha1_Type** val) { const upb_MiniTableField field = {3, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__CheckedExpr__TypeMapEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Type_msg_init); const upb_Map* map = upb_Message_GetMap(UPB_UPCAST(msg), &field); if (!map) return false; return _upb_Map_Get(map, &key, sizeof(key), val, sizeof(*val)); } UPB_INLINE const google_api_expr_v1alpha1_CheckedExpr_TypeMapEntry* google_api_expr_v1alpha1_CheckedExpr_type_map_next(const google_api_expr_v1alpha1_CheckedExpr* msg, size_t* iter) { const upb_MiniTableField field = {3, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__CheckedExpr__TypeMapEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Type_msg_init); const upb_Map* map = upb_Message_GetMap(UPB_UPCAST(msg), &field); if (!map) return NULL; return (const google_api_expr_v1alpha1_CheckedExpr_TypeMapEntry*)_upb_map_next(map, iter); } UPB_INLINE const upb_Map* _google_api_expr_v1alpha1_CheckedExpr_type_map_upb_map(google_api_expr_v1alpha1_CheckedExpr* msg) { const upb_MiniTableField field = {3, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__CheckedExpr__TypeMapEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Type_msg_init); return upb_Message_GetMap(UPB_UPCAST(msg), &field); } UPB_INLINE upb_Map* _google_api_expr_v1alpha1_CheckedExpr_type_map_mutable_upb_map(google_api_expr_v1alpha1_CheckedExpr* msg, upb_Arena* a) { const upb_MiniTableField field = {3, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__CheckedExpr__TypeMapEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Type_msg_init); return _upb_Message_GetOrCreateMutableMap(UPB_UPCAST(msg), &field, sizeof(int64_t), sizeof(google_api_expr_v1alpha1_Type*), a); } UPB_INLINE void google_api_expr_v1alpha1_CheckedExpr_clear_expr(google_api_expr_v1alpha1_CheckedExpr* msg) { @@ -162,6 +179,7 @@ UPB_INLINE const struct google_api_expr_v1alpha1_Expr* google_api_expr_v1alpha1_ const struct google_api_expr_v1alpha1_Expr* default_val = NULL; const struct google_api_expr_v1alpha1_Expr* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Expr_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -178,6 +196,7 @@ UPB_INLINE const struct google_api_expr_v1alpha1_SourceInfo* google_api_expr_v1a const struct google_api_expr_v1alpha1_SourceInfo* default_val = NULL; const struct google_api_expr_v1alpha1_SourceInfo* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__SourceInfo_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -207,6 +226,8 @@ UPB_INLINE void google_api_expr_v1alpha1_CheckedExpr_reference_map_clear(google_ } UPB_INLINE bool google_api_expr_v1alpha1_CheckedExpr_reference_map_set(google_api_expr_v1alpha1_CheckedExpr* msg, int64_t key, google_api_expr_v1alpha1_Reference* val, upb_Arena* a) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__CheckedExpr__ReferenceMapEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Reference_msg_init); upb_Map* map = _upb_Message_GetOrCreateMutableMap(UPB_UPCAST(msg), &field, sizeof(key), sizeof(val), a); return _upb_Map_Insert(map, &key, sizeof(key), &val, sizeof(val), a) != @@ -220,6 +241,8 @@ UPB_INLINE bool google_api_expr_v1alpha1_CheckedExpr_reference_map_delete(google } UPB_INLINE google_api_expr_v1alpha1_CheckedExpr_ReferenceMapEntry* google_api_expr_v1alpha1_CheckedExpr_reference_map_nextmutable(google_api_expr_v1alpha1_CheckedExpr* msg, size_t* iter) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__CheckedExpr__ReferenceMapEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Reference_msg_init); upb_Map* map = (upb_Map*)upb_Message_GetMap(UPB_UPCAST(msg), &field); if (!map) return NULL; return (google_api_expr_v1alpha1_CheckedExpr_ReferenceMapEntry*)_upb_map_next(map, iter); @@ -232,6 +255,8 @@ UPB_INLINE void google_api_expr_v1alpha1_CheckedExpr_type_map_clear(google_api_e } UPB_INLINE bool google_api_expr_v1alpha1_CheckedExpr_type_map_set(google_api_expr_v1alpha1_CheckedExpr* msg, int64_t key, google_api_expr_v1alpha1_Type* val, upb_Arena* a) { const upb_MiniTableField field = {3, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__CheckedExpr__TypeMapEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Type_msg_init); upb_Map* map = _upb_Message_GetOrCreateMutableMap(UPB_UPCAST(msg), &field, sizeof(key), sizeof(val), a); return _upb_Map_Insert(map, &key, sizeof(key), &val, sizeof(val), a) != @@ -245,12 +270,15 @@ UPB_INLINE bool google_api_expr_v1alpha1_CheckedExpr_type_map_delete(google_api_ } UPB_INLINE google_api_expr_v1alpha1_CheckedExpr_TypeMapEntry* google_api_expr_v1alpha1_CheckedExpr_type_map_nextmutable(google_api_expr_v1alpha1_CheckedExpr* msg, size_t* iter) { const upb_MiniTableField field = {3, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__CheckedExpr__TypeMapEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Type_msg_init); upb_Map* map = (upb_Map*)upb_Message_GetMap(UPB_UPCAST(msg), &field); if (!map) return NULL; return (google_api_expr_v1alpha1_CheckedExpr_TypeMapEntry*)_upb_map_next(map, iter); } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Expr_msg_init); 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) { @@ -263,6 +291,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__SourceInfo_msg_init); 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) { @@ -385,6 +414,7 @@ UPB_INLINE const struct google_protobuf_Empty* google_api_expr_v1alpha1_Type_dyn const struct google_protobuf_Empty* default_val = NULL; const struct google_protobuf_Empty* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Empty_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -465,6 +495,7 @@ UPB_INLINE const google_api_expr_v1alpha1_Type_ListType* google_api_expr_v1alpha const google_api_expr_v1alpha1_Type_ListType* default_val = NULL; const google_api_expr_v1alpha1_Type_ListType* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Type__ListType_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -481,6 +512,7 @@ UPB_INLINE const google_api_expr_v1alpha1_Type_MapType* google_api_expr_v1alpha1 const google_api_expr_v1alpha1_Type_MapType* default_val = NULL; const google_api_expr_v1alpha1_Type_MapType* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Type__MapType_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -497,6 +529,7 @@ UPB_INLINE const google_api_expr_v1alpha1_Type_FunctionType* google_api_expr_v1a const google_api_expr_v1alpha1_Type_FunctionType* default_val = NULL; const google_api_expr_v1alpha1_Type_FunctionType* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Type__FunctionType_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -545,6 +578,7 @@ UPB_INLINE const google_api_expr_v1alpha1_Type* google_api_expr_v1alpha1_Type_ty const google_api_expr_v1alpha1_Type* default_val = NULL; const google_api_expr_v1alpha1_Type* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Type_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -561,6 +595,7 @@ UPB_INLINE const struct google_protobuf_Empty* google_api_expr_v1alpha1_Type_err const struct google_protobuf_Empty* default_val = NULL; const struct google_protobuf_Empty* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Empty_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -577,6 +612,7 @@ UPB_INLINE const google_api_expr_v1alpha1_Type_AbstractType* google_api_expr_v1a const google_api_expr_v1alpha1_Type_AbstractType* default_val = NULL; const google_api_expr_v1alpha1_Type_AbstractType* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Type__AbstractType_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -588,6 +624,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Empty_msg_init); 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) { @@ -616,6 +653,7 @@ UPB_INLINE void google_api_expr_v1alpha1_Type_set_well_known(google_api_expr_v1a } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Type__ListType_msg_init); 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) { @@ -628,6 +666,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Type__MapType_msg_init); 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) { @@ -640,6 +679,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Type__FunctionType_msg_init); 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) { @@ -660,6 +700,7 @@ UPB_INLINE void google_api_expr_v1alpha1_Type_set_type_param(google_api_expr_v1a } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Type_msg_init); 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) { @@ -672,6 +713,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Empty_msg_init); 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) { @@ -684,6 +726,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Type__AbstractType_msg_init); 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) { @@ -739,6 +782,7 @@ UPB_INLINE const google_api_expr_v1alpha1_Type* google_api_expr_v1alpha1_Type_Li const google_api_expr_v1alpha1_Type* default_val = NULL; const google_api_expr_v1alpha1_Type* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Type_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -750,6 +794,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Type_msg_init); 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) { @@ -805,6 +850,7 @@ UPB_INLINE const google_api_expr_v1alpha1_Type* google_api_expr_v1alpha1_Type_Ma const google_api_expr_v1alpha1_Type* default_val = NULL; const google_api_expr_v1alpha1_Type* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Type_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -821,6 +867,7 @@ UPB_INLINE const google_api_expr_v1alpha1_Type* google_api_expr_v1alpha1_Type_Ma const google_api_expr_v1alpha1_Type* default_val = NULL; const google_api_expr_v1alpha1_Type* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Type_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -832,6 +879,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Type_msg_init); 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) { @@ -844,6 +892,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Type_msg_init); 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) { @@ -899,6 +948,7 @@ UPB_INLINE const google_api_expr_v1alpha1_Type* google_api_expr_v1alpha1_Type_Fu const google_api_expr_v1alpha1_Type* default_val = NULL; const google_api_expr_v1alpha1_Type* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Type_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -913,6 +963,7 @@ UPB_INLINE void google_api_expr_v1alpha1_Type_FunctionType_clear_arg_types(googl } UPB_INLINE const google_api_expr_v1alpha1_Type* const* google_api_expr_v1alpha1_Type_FunctionType_arg_types(const google_api_expr_v1alpha1_Type_FunctionType* msg, size_t* size) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Type_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -924,6 +975,7 @@ UPB_INLINE const google_api_expr_v1alpha1_Type* const* google_api_expr_v1alpha1_ } UPB_INLINE const upb_Array* _google_api_expr_v1alpha1_Type_FunctionType_arg_types_upb_array(const google_api_expr_v1alpha1_Type_FunctionType* msg, size_t* size) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Type_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -932,6 +984,7 @@ UPB_INLINE const upb_Array* _google_api_expr_v1alpha1_Type_FunctionType_arg_type } UPB_INLINE upb_Array* _google_api_expr_v1alpha1_Type_FunctionType_arg_types_mutable_upb_array(google_api_expr_v1alpha1_Type_FunctionType* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Type_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -942,6 +995,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Type_msg_init); 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) { @@ -954,6 +1008,7 @@ UPB_INLINE struct google_api_expr_v1alpha1_Type* google_api_expr_v1alpha1_Type_F } UPB_INLINE google_api_expr_v1alpha1_Type** google_api_expr_v1alpha1_Type_FunctionType_mutable_arg_types(google_api_expr_v1alpha1_Type_FunctionType* msg, size_t* size) { upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Type_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -970,6 +1025,7 @@ UPB_INLINE google_api_expr_v1alpha1_Type** google_api_expr_v1alpha1_Type_Functio } UPB_INLINE struct google_api_expr_v1alpha1_Type* google_api_expr_v1alpha1_Type_FunctionType_add_arg_types(google_api_expr_v1alpha1_Type_FunctionType* msg, upb_Arena* arena) { upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Type_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -1037,6 +1093,7 @@ UPB_INLINE void google_api_expr_v1alpha1_Type_AbstractType_clear_parameter_types } UPB_INLINE const google_api_expr_v1alpha1_Type* const* google_api_expr_v1alpha1_Type_AbstractType_parameter_types(const google_api_expr_v1alpha1_Type_AbstractType* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Type_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1048,6 +1105,7 @@ UPB_INLINE const google_api_expr_v1alpha1_Type* const* google_api_expr_v1alpha1_ } UPB_INLINE const upb_Array* _google_api_expr_v1alpha1_Type_AbstractType_parameter_types_upb_array(const google_api_expr_v1alpha1_Type_AbstractType* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Type_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -1056,6 +1114,7 @@ UPB_INLINE const upb_Array* _google_api_expr_v1alpha1_Type_AbstractType_paramete } UPB_INLINE upb_Array* _google_api_expr_v1alpha1_Type_AbstractType_parameter_types_mutable_upb_array(google_api_expr_v1alpha1_Type_AbstractType* msg, size_t* size, upb_Arena* arena) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Type_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -1070,6 +1129,7 @@ UPB_INLINE void google_api_expr_v1alpha1_Type_AbstractType_set_name(google_api_e } 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Type_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1086,6 +1146,7 @@ UPB_INLINE google_api_expr_v1alpha1_Type** google_api_expr_v1alpha1_Type_Abstrac } UPB_INLINE struct google_api_expr_v1alpha1_Type* google_api_expr_v1alpha1_Type_AbstractType_add_parameter_types(google_api_expr_v1alpha1_Type_AbstractType* msg, upb_Arena* arena) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Type_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -1165,6 +1226,7 @@ UPB_INLINE const google_api_expr_v1alpha1_Decl_IdentDecl* google_api_expr_v1alph const google_api_expr_v1alpha1_Decl_IdentDecl* default_val = NULL; const google_api_expr_v1alpha1_Decl_IdentDecl* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Decl__IdentDecl_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1181,6 +1243,7 @@ UPB_INLINE const google_api_expr_v1alpha1_Decl_FunctionDecl* google_api_expr_v1a const google_api_expr_v1alpha1_Decl_FunctionDecl* default_val = NULL; const google_api_expr_v1alpha1_Decl_FunctionDecl* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Decl__FunctionDecl_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1196,6 +1259,7 @@ UPB_INLINE void google_api_expr_v1alpha1_Decl_set_name(google_api_expr_v1alpha1_ } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Decl__IdentDecl_msg_init); 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) { @@ -1208,6 +1272,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Decl__FunctionDecl_msg_init); 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) { @@ -1263,6 +1328,7 @@ UPB_INLINE const google_api_expr_v1alpha1_Type* google_api_expr_v1alpha1_Decl_Id const google_api_expr_v1alpha1_Type* default_val = NULL; const google_api_expr_v1alpha1_Type* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Type_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1279,6 +1345,7 @@ UPB_INLINE const struct google_api_expr_v1alpha1_Constant* google_api_expr_v1alp const struct google_api_expr_v1alpha1_Constant* default_val = NULL; const struct google_api_expr_v1alpha1_Constant* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Constant_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1302,6 +1369,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Type_msg_init); 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) { @@ -1314,6 +1382,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Constant_msg_init); 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) { @@ -1371,6 +1440,7 @@ UPB_INLINE void google_api_expr_v1alpha1_Decl_FunctionDecl_clear_overloads(googl } UPB_INLINE const google_api_expr_v1alpha1_Decl_FunctionDecl_Overload* const* google_api_expr_v1alpha1_Decl_FunctionDecl_overloads(const google_api_expr_v1alpha1_Decl_FunctionDecl* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Decl__FunctionDecl__Overload_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1382,6 +1452,7 @@ UPB_INLINE const google_api_expr_v1alpha1_Decl_FunctionDecl_Overload* const* goo } UPB_INLINE const upb_Array* _google_api_expr_v1alpha1_Decl_FunctionDecl_overloads_upb_array(const google_api_expr_v1alpha1_Decl_FunctionDecl* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Decl__FunctionDecl__Overload_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -1390,6 +1461,7 @@ UPB_INLINE const upb_Array* _google_api_expr_v1alpha1_Decl_FunctionDecl_overload } UPB_INLINE upb_Array* _google_api_expr_v1alpha1_Decl_FunctionDecl_overloads_mutable_upb_array(google_api_expr_v1alpha1_Decl_FunctionDecl* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Decl__FunctionDecl__Overload_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -1400,6 +1472,7 @@ UPB_INLINE upb_Array* _google_api_expr_v1alpha1_Decl_FunctionDecl_overloads_muta UPB_INLINE google_api_expr_v1alpha1_Decl_FunctionDecl_Overload** google_api_expr_v1alpha1_Decl_FunctionDecl_mutable_overloads(google_api_expr_v1alpha1_Decl_FunctionDecl* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Decl__FunctionDecl__Overload_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1416,6 +1489,7 @@ UPB_INLINE google_api_expr_v1alpha1_Decl_FunctionDecl_Overload** google_api_expr } UPB_INLINE struct google_api_expr_v1alpha1_Decl_FunctionDecl_Overload* google_api_expr_v1alpha1_Decl_FunctionDecl_add_overloads(google_api_expr_v1alpha1_Decl_FunctionDecl* msg, upb_Arena* arena) { upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Decl__FunctionDecl__Overload_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -1483,6 +1557,7 @@ UPB_INLINE void google_api_expr_v1alpha1_Decl_FunctionDecl_Overload_clear_params } UPB_INLINE const google_api_expr_v1alpha1_Type* const* google_api_expr_v1alpha1_Decl_FunctionDecl_Overload_params(const google_api_expr_v1alpha1_Decl_FunctionDecl_Overload* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Type_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1494,6 +1569,7 @@ UPB_INLINE const google_api_expr_v1alpha1_Type* const* google_api_expr_v1alpha1_ } UPB_INLINE const upb_Array* _google_api_expr_v1alpha1_Decl_FunctionDecl_Overload_params_upb_array(const google_api_expr_v1alpha1_Decl_FunctionDecl_Overload* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Type_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -1502,6 +1578,7 @@ UPB_INLINE const upb_Array* _google_api_expr_v1alpha1_Decl_FunctionDecl_Overload } UPB_INLINE upb_Array* _google_api_expr_v1alpha1_Decl_FunctionDecl_Overload_params_mutable_upb_array(google_api_expr_v1alpha1_Decl_FunctionDecl_Overload* msg, size_t* size, upb_Arena* arena) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Type_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -1549,6 +1626,7 @@ UPB_INLINE const google_api_expr_v1alpha1_Type* google_api_expr_v1alpha1_Decl_Fu const google_api_expr_v1alpha1_Type* default_val = NULL; const google_api_expr_v1alpha1_Type* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Type_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1588,6 +1666,7 @@ UPB_INLINE void google_api_expr_v1alpha1_Decl_FunctionDecl_Overload_set_overload } 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Type_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1604,6 +1683,7 @@ UPB_INLINE google_api_expr_v1alpha1_Type** google_api_expr_v1alpha1_Decl_Functio } UPB_INLINE struct google_api_expr_v1alpha1_Type* google_api_expr_v1alpha1_Decl_FunctionDecl_Overload_add_params(google_api_expr_v1alpha1_Decl_FunctionDecl_Overload* msg, upb_Arena* arena) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Type_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -1646,6 +1726,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Type_msg_init); 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) { @@ -1753,6 +1834,7 @@ UPB_INLINE const struct google_api_expr_v1alpha1_Constant* google_api_expr_v1alp const struct google_api_expr_v1alpha1_Constant* default_val = NULL; const struct google_api_expr_v1alpha1_Constant* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Constant_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1796,6 +1878,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Constant_msg_init); 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) { diff --git a/src/core/ext/upb-gen/google/api/expr/v1alpha1/checked.upb_minitable.c b/src/core/ext/upb-gen/google/api/expr/v1alpha1/checked.upb_minitable.c index a9296e36e9c..5cc51080242 100644 --- a/src/core/ext/upb-gen/google/api/expr/v1alpha1/checked.upb_minitable.c +++ b/src/core/ext/upb-gen/google/api/expr/v1alpha1/checked.upb_minitable.c @@ -3,7 +3,8 @@ * google/api/expr/v1alpha1/checked.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -15,11 +16,12 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub google_api_expr_v1alpha1_CheckedExpr_submsgs[4] = { - {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__CheckedExpr__ReferenceMapEntry_msg_init}, - {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__CheckedExpr__TypeMapEntry_msg_init}, - {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Expr_msg_init}, - {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__SourceInfo_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal google_api_expr_v1alpha1_CheckedExpr_submsgs[4] = { + {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__CheckedExpr__ReferenceMapEntry_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__CheckedExpr__TypeMapEntry_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Expr_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__SourceInfo_msg_init_ptr}, }; static const upb_MiniTableField google_api_expr_v1alpha1_CheckedExpr__fields[5] = { @@ -49,8 +51,9 @@ const upb_MiniTable google__api__expr__v1alpha1__CheckedExpr_msg_init = { }) }; -static const upb_MiniTableSub google_api_expr_v1alpha1_CheckedExpr_ReferenceMapEntry_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Reference_msg_init}, +const upb_MiniTable* google__api__expr__v1alpha1__CheckedExpr_msg_init_ptr = &google__api__expr__v1alpha1__CheckedExpr_msg_init; +static const upb_MiniTableSubInternal google_api_expr_v1alpha1_CheckedExpr_ReferenceMapEntry_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Reference_msg_init_ptr}, }; static const upb_MiniTableField google_api_expr_v1alpha1_CheckedExpr_ReferenceMapEntry__fields[2] = { @@ -71,8 +74,9 @@ const upb_MiniTable google__api__expr__v1alpha1__CheckedExpr__ReferenceMapEntry_ }) }; -static const upb_MiniTableSub google_api_expr_v1alpha1_CheckedExpr_TypeMapEntry_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Type_msg_init}, +const upb_MiniTable* google__api__expr__v1alpha1__CheckedExpr__ReferenceMapEntry_msg_init_ptr = &google__api__expr__v1alpha1__CheckedExpr__ReferenceMapEntry_msg_init; +static const upb_MiniTableSubInternal google_api_expr_v1alpha1_CheckedExpr_TypeMapEntry_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Type_msg_init_ptr}, }; static const upb_MiniTableField google_api_expr_v1alpha1_CheckedExpr_TypeMapEntry__fields[2] = { @@ -93,14 +97,15 @@ const upb_MiniTable google__api__expr__v1alpha1__CheckedExpr__TypeMapEntry_msg_i }) }; -static const upb_MiniTableSub google_api_expr_v1alpha1_Type_submsgs[7] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__Empty_msg_init}, - {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Type__ListType_msg_init}, - {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Type__MapType_msg_init}, - {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Type__FunctionType_msg_init}, - {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Type_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Empty_msg_init}, - {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Type__AbstractType_msg_init}, +const upb_MiniTable* google__api__expr__v1alpha1__CheckedExpr__TypeMapEntry_msg_init_ptr = &google__api__expr__v1alpha1__CheckedExpr__TypeMapEntry_msg_init; +static const upb_MiniTableSubInternal google_api_expr_v1alpha1_Type_submsgs[7] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Empty_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Type__ListType_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Type__MapType_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Type__FunctionType_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Type_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Empty_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Type__AbstractType_msg_init_ptr}, }; static const upb_MiniTableField google_api_expr_v1alpha1_Type__fields[13] = { @@ -146,8 +151,9 @@ const upb_MiniTable google__api__expr__v1alpha1__Type_msg_init = { }) }; -static const upb_MiniTableSub google_api_expr_v1alpha1_Type_ListType_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Type_msg_init}, +const upb_MiniTable* google__api__expr__v1alpha1__Type_msg_init_ptr = &google__api__expr__v1alpha1__Type_msg_init; +static const upb_MiniTableSubInternal google_api_expr_v1alpha1_Type_ListType_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Type_msg_init_ptr}, }; static const upb_MiniTableField google_api_expr_v1alpha1_Type_ListType__fields[1] = { @@ -163,9 +169,10 @@ const upb_MiniTable google__api__expr__v1alpha1__Type__ListType_msg_init = { #endif }; -static const upb_MiniTableSub google_api_expr_v1alpha1_Type_MapType_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Type_msg_init}, - {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Type_msg_init}, +const upb_MiniTable* google__api__expr__v1alpha1__Type__ListType_msg_init_ptr = &google__api__expr__v1alpha1__Type__ListType_msg_init; +static const upb_MiniTableSubInternal google_api_expr_v1alpha1_Type_MapType_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Type_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Type_msg_init_ptr}, }; static const upb_MiniTableField google_api_expr_v1alpha1_Type_MapType__fields[2] = { @@ -182,9 +189,10 @@ const upb_MiniTable google__api__expr__v1alpha1__Type__MapType_msg_init = { #endif }; -static const upb_MiniTableSub google_api_expr_v1alpha1_Type_FunctionType_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Type_msg_init}, - {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Type_msg_init}, +const upb_MiniTable* google__api__expr__v1alpha1__Type__MapType_msg_init_ptr = &google__api__expr__v1alpha1__Type__MapType_msg_init; +static const upb_MiniTableSubInternal google_api_expr_v1alpha1_Type_FunctionType_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Type_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Type_msg_init_ptr}, }; static const upb_MiniTableField google_api_expr_v1alpha1_Type_FunctionType__fields[2] = { @@ -207,8 +215,9 @@ const upb_MiniTable google__api__expr__v1alpha1__Type__FunctionType_msg_init = { }) }; -static const upb_MiniTableSub google_api_expr_v1alpha1_Type_AbstractType_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Type_msg_init}, +const upb_MiniTable* google__api__expr__v1alpha1__Type__FunctionType_msg_init_ptr = &google__api__expr__v1alpha1__Type__FunctionType_msg_init; +static const upb_MiniTableSubInternal google_api_expr_v1alpha1_Type_AbstractType_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Type_msg_init_ptr}, }; static const upb_MiniTableField google_api_expr_v1alpha1_Type_AbstractType__fields[2] = { @@ -231,9 +240,10 @@ const upb_MiniTable google__api__expr__v1alpha1__Type__AbstractType_msg_init = { }) }; -static const upb_MiniTableSub google_api_expr_v1alpha1_Decl_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Decl__IdentDecl_msg_init}, - {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Decl__FunctionDecl_msg_init}, +const upb_MiniTable* google__api__expr__v1alpha1__Type__AbstractType_msg_init_ptr = &google__api__expr__v1alpha1__Type__AbstractType_msg_init; +static const upb_MiniTableSubInternal google_api_expr_v1alpha1_Decl_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Decl__IdentDecl_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Decl__FunctionDecl_msg_init_ptr}, }; static const upb_MiniTableField google_api_expr_v1alpha1_Decl__fields[3] = { @@ -257,9 +267,10 @@ const upb_MiniTable google__api__expr__v1alpha1__Decl_msg_init = { }) }; -static const upb_MiniTableSub google_api_expr_v1alpha1_Decl_IdentDecl_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Type_msg_init}, - {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Constant_msg_init}, +const upb_MiniTable* google__api__expr__v1alpha1__Decl_msg_init_ptr = &google__api__expr__v1alpha1__Decl_msg_init; +static const upb_MiniTableSubInternal google_api_expr_v1alpha1_Decl_IdentDecl_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Type_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Constant_msg_init_ptr}, }; static const upb_MiniTableField google_api_expr_v1alpha1_Decl_IdentDecl__fields[3] = { @@ -283,8 +294,9 @@ const upb_MiniTable google__api__expr__v1alpha1__Decl__IdentDecl_msg_init = { }) }; -static const upb_MiniTableSub google_api_expr_v1alpha1_Decl_FunctionDecl_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Decl__FunctionDecl__Overload_msg_init}, +const upb_MiniTable* google__api__expr__v1alpha1__Decl__IdentDecl_msg_init_ptr = &google__api__expr__v1alpha1__Decl__IdentDecl_msg_init; +static const upb_MiniTableSubInternal google_api_expr_v1alpha1_Decl_FunctionDecl_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Decl__FunctionDecl__Overload_msg_init_ptr}, }; static const upb_MiniTableField google_api_expr_v1alpha1_Decl_FunctionDecl__fields[1] = { @@ -304,9 +316,10 @@ const upb_MiniTable google__api__expr__v1alpha1__Decl__FunctionDecl_msg_init = { }) }; -static const upb_MiniTableSub google_api_expr_v1alpha1_Decl_FunctionDecl_Overload_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Type_msg_init}, - {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Type_msg_init}, +const upb_MiniTable* google__api__expr__v1alpha1__Decl__FunctionDecl_msg_init_ptr = &google__api__expr__v1alpha1__Decl__FunctionDecl_msg_init; +static const upb_MiniTableSubInternal google_api_expr_v1alpha1_Decl_FunctionDecl_Overload_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Type_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Type_msg_init_ptr}, }; static const upb_MiniTableField google_api_expr_v1alpha1_Decl_FunctionDecl_Overload__fields[6] = { @@ -337,8 +350,9 @@ const upb_MiniTable google__api__expr__v1alpha1__Decl__FunctionDecl__Overload_ms }) }; -static const upb_MiniTableSub google_api_expr_v1alpha1_Reference_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Constant_msg_init}, +const upb_MiniTable* google__api__expr__v1alpha1__Decl__FunctionDecl__Overload_msg_init_ptr = &google__api__expr__v1alpha1__Decl__FunctionDecl__Overload_msg_init; +static const upb_MiniTableSubInternal google_api_expr_v1alpha1_Reference_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Constant_msg_init_ptr}, }; static const upb_MiniTableField google_api_expr_v1alpha1_Reference__fields[3] = { @@ -362,6 +376,7 @@ const upb_MiniTable google__api__expr__v1alpha1__Reference_msg_init = { }) }; +const upb_MiniTable* google__api__expr__v1alpha1__Reference_msg_init_ptr = &google__api__expr__v1alpha1__Reference_msg_init; static const upb_MiniTable *messages_layout[13] = { &google__api__expr__v1alpha1__CheckedExpr_msg_init, &google__api__expr__v1alpha1__CheckedExpr__ReferenceMapEntry_msg_init, diff --git a/src/core/ext/upb-gen/google/api/expr/v1alpha1/checked.upb_minitable.h b/src/core/ext/upb-gen/google/api/expr/v1alpha1/checked.upb_minitable.h index 2dca15da5fb..b99fbb20744 100644 --- a/src/core/ext/upb-gen/google/api/expr/v1alpha1/checked.upb_minitable.h +++ b/src/core/ext/upb-gen/google/api/expr/v1alpha1/checked.upb_minitable.h @@ -3,7 +3,8 @@ * google/api/expr/v1alpha1/checked.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef GOOGLE_API_EXPR_V1ALPHA1_CHECKED_PROTO_UPB_MINITABLE_H_ #define GOOGLE_API_EXPR_V1ALPHA1_CHECKED_PROTO_UPB_MINITABLE_H_ @@ -18,18 +19,31 @@ extern "C" { #endif extern const upb_MiniTable google__api__expr__v1alpha1__CheckedExpr_msg_init; +extern const upb_MiniTable* google__api__expr__v1alpha1__CheckedExpr_msg_init_ptr; extern const upb_MiniTable google__api__expr__v1alpha1__CheckedExpr__ReferenceMapEntry_msg_init; +extern const upb_MiniTable* google__api__expr__v1alpha1__CheckedExpr__ReferenceMapEntry_msg_init_ptr; extern const upb_MiniTable google__api__expr__v1alpha1__CheckedExpr__TypeMapEntry_msg_init; +extern const upb_MiniTable* google__api__expr__v1alpha1__CheckedExpr__TypeMapEntry_msg_init_ptr; extern const upb_MiniTable google__api__expr__v1alpha1__Type_msg_init; +extern const upb_MiniTable* google__api__expr__v1alpha1__Type_msg_init_ptr; extern const upb_MiniTable google__api__expr__v1alpha1__Type__ListType_msg_init; +extern const upb_MiniTable* google__api__expr__v1alpha1__Type__ListType_msg_init_ptr; extern const upb_MiniTable google__api__expr__v1alpha1__Type__MapType_msg_init; +extern const upb_MiniTable* google__api__expr__v1alpha1__Type__MapType_msg_init_ptr; extern const upb_MiniTable google__api__expr__v1alpha1__Type__FunctionType_msg_init; +extern const upb_MiniTable* google__api__expr__v1alpha1__Type__FunctionType_msg_init_ptr; extern const upb_MiniTable google__api__expr__v1alpha1__Type__AbstractType_msg_init; +extern const upb_MiniTable* google__api__expr__v1alpha1__Type__AbstractType_msg_init_ptr; extern const upb_MiniTable google__api__expr__v1alpha1__Decl_msg_init; +extern const upb_MiniTable* google__api__expr__v1alpha1__Decl_msg_init_ptr; extern const upb_MiniTable google__api__expr__v1alpha1__Decl__IdentDecl_msg_init; +extern const upb_MiniTable* google__api__expr__v1alpha1__Decl__IdentDecl_msg_init_ptr; extern const upb_MiniTable google__api__expr__v1alpha1__Decl__FunctionDecl_msg_init; +extern const upb_MiniTable* google__api__expr__v1alpha1__Decl__FunctionDecl_msg_init_ptr; extern const upb_MiniTable google__api__expr__v1alpha1__Decl__FunctionDecl__Overload_msg_init; +extern const upb_MiniTable* google__api__expr__v1alpha1__Decl__FunctionDecl__Overload_msg_init_ptr; extern const upb_MiniTable google__api__expr__v1alpha1__Reference_msg_init; +extern const upb_MiniTable* google__api__expr__v1alpha1__Reference_msg_init_ptr; extern const upb_MiniTableFile google_api_expr_v1alpha1_checked_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/google/api/expr/v1alpha1/syntax.upb.h b/src/core/ext/upb-gen/google/api/expr/v1alpha1/syntax.upb.h index c7ff8662289..c27267eb43b 100644 --- a/src/core/ext/upb-gen/google/api/expr/v1alpha1/syntax.upb.h +++ b/src/core/ext/upb-gen/google/api/expr/v1alpha1/syntax.upb.h @@ -3,7 +3,8 @@ * google/api/expr/v1alpha1/syntax.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef GOOGLE_API_EXPR_V1ALPHA1_SYNTAX_PROTO_UPB_H_ #define GOOGLE_API_EXPR_V1ALPHA1_SYNTAX_PROTO_UPB_H_ @@ -95,6 +96,7 @@ UPB_INLINE const google_api_expr_v1alpha1_Expr* google_api_expr_v1alpha1_ParsedE const google_api_expr_v1alpha1_Expr* default_val = NULL; const google_api_expr_v1alpha1_Expr* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Expr_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -111,6 +113,7 @@ UPB_INLINE const google_api_expr_v1alpha1_SourceInfo* google_api_expr_v1alpha1_P const google_api_expr_v1alpha1_SourceInfo* default_val = NULL; const google_api_expr_v1alpha1_SourceInfo* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__SourceInfo_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -122,6 +125,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Expr_msg_init); 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) { @@ -134,6 +138,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__SourceInfo_msg_init); 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) { @@ -216,6 +221,7 @@ UPB_INLINE const google_api_expr_v1alpha1_Constant* google_api_expr_v1alpha1_Exp const google_api_expr_v1alpha1_Constant* default_val = NULL; const google_api_expr_v1alpha1_Constant* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Constant_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -232,6 +238,7 @@ UPB_INLINE const google_api_expr_v1alpha1_Expr_Ident* google_api_expr_v1alpha1_E const google_api_expr_v1alpha1_Expr_Ident* default_val = NULL; const google_api_expr_v1alpha1_Expr_Ident* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Expr__Ident_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -248,6 +255,7 @@ UPB_INLINE const google_api_expr_v1alpha1_Expr_Select* google_api_expr_v1alpha1_ const google_api_expr_v1alpha1_Expr_Select* default_val = NULL; const google_api_expr_v1alpha1_Expr_Select* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Expr__Select_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -264,6 +272,7 @@ UPB_INLINE const google_api_expr_v1alpha1_Expr_Call* google_api_expr_v1alpha1_Ex const google_api_expr_v1alpha1_Expr_Call* default_val = NULL; const google_api_expr_v1alpha1_Expr_Call* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Expr__Call_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -280,6 +289,7 @@ UPB_INLINE const google_api_expr_v1alpha1_Expr_CreateList* google_api_expr_v1alp const google_api_expr_v1alpha1_Expr_CreateList* default_val = NULL; const google_api_expr_v1alpha1_Expr_CreateList* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Expr__CreateList_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -296,6 +306,7 @@ UPB_INLINE const google_api_expr_v1alpha1_Expr_CreateStruct* google_api_expr_v1a const google_api_expr_v1alpha1_Expr_CreateStruct* default_val = NULL; const google_api_expr_v1alpha1_Expr_CreateStruct* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Expr__CreateStruct_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -312,6 +323,7 @@ UPB_INLINE const google_api_expr_v1alpha1_Expr_Comprehension* google_api_expr_v1 const google_api_expr_v1alpha1_Expr_Comprehension* default_val = NULL; const google_api_expr_v1alpha1_Expr_Comprehension* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Expr__Comprehension_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -327,6 +339,7 @@ UPB_INLINE void google_api_expr_v1alpha1_Expr_set_id(google_api_expr_v1alpha1_Ex } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Constant_msg_init); 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) { @@ -339,6 +352,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Expr__Ident_msg_init); 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) { @@ -351,6 +365,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Expr__Select_msg_init); 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) { @@ -363,6 +378,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Expr__Call_msg_init); 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) { @@ -375,6 +391,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Expr__CreateList_msg_init); 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) { @@ -387,6 +404,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Expr__CreateStruct_msg_init); 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) { @@ -399,6 +417,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Expr__Comprehension_msg_init); 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) { @@ -508,6 +527,7 @@ UPB_INLINE const google_api_expr_v1alpha1_Expr* google_api_expr_v1alpha1_Expr_Se const google_api_expr_v1alpha1_Expr* default_val = NULL; const google_api_expr_v1alpha1_Expr* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Expr_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -543,6 +563,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Expr_msg_init); 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) { @@ -606,6 +627,7 @@ UPB_INLINE const google_api_expr_v1alpha1_Expr* google_api_expr_v1alpha1_Expr_Ca const google_api_expr_v1alpha1_Expr* default_val = NULL; const google_api_expr_v1alpha1_Expr* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Expr_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -632,6 +654,7 @@ UPB_INLINE void google_api_expr_v1alpha1_Expr_Call_clear_args(google_api_expr_v1 } UPB_INLINE const google_api_expr_v1alpha1_Expr* const* google_api_expr_v1alpha1_Expr_Call_args(const google_api_expr_v1alpha1_Expr_Call* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Expr_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -643,6 +666,7 @@ UPB_INLINE const google_api_expr_v1alpha1_Expr* const* google_api_expr_v1alpha1_ } UPB_INLINE const upb_Array* _google_api_expr_v1alpha1_Expr_Call_args_upb_array(const google_api_expr_v1alpha1_Expr_Call* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Expr_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -651,6 +675,7 @@ UPB_INLINE const upb_Array* _google_api_expr_v1alpha1_Expr_Call_args_upb_array(c } UPB_INLINE upb_Array* _google_api_expr_v1alpha1_Expr_Call_args_mutable_upb_array(google_api_expr_v1alpha1_Expr_Call* msg, size_t* size, upb_Arena* arena) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Expr_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -661,6 +686,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Expr_msg_init); 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) { @@ -677,6 +703,7 @@ UPB_INLINE void google_api_expr_v1alpha1_Expr_Call_set_function(google_api_expr_ } 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Expr_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -693,6 +720,7 @@ UPB_INLINE google_api_expr_v1alpha1_Expr** google_api_expr_v1alpha1_Expr_Call_re } UPB_INLINE struct google_api_expr_v1alpha1_Expr* google_api_expr_v1alpha1_Expr_Call_add_args(google_api_expr_v1alpha1_Expr_Call* msg, upb_Arena* arena) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Expr_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -748,6 +776,7 @@ UPB_INLINE void google_api_expr_v1alpha1_Expr_CreateList_clear_elements(google_a } UPB_INLINE const google_api_expr_v1alpha1_Expr* const* google_api_expr_v1alpha1_Expr_CreateList_elements(const google_api_expr_v1alpha1_Expr_CreateList* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Expr_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -759,6 +788,7 @@ UPB_INLINE const google_api_expr_v1alpha1_Expr* const* google_api_expr_v1alpha1_ } UPB_INLINE const upb_Array* _google_api_expr_v1alpha1_Expr_CreateList_elements_upb_array(const google_api_expr_v1alpha1_Expr_CreateList* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Expr_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -767,6 +797,7 @@ UPB_INLINE const upb_Array* _google_api_expr_v1alpha1_Expr_CreateList_elements_u } UPB_INLINE upb_Array* _google_api_expr_v1alpha1_Expr_CreateList_elements_mutable_upb_array(google_api_expr_v1alpha1_Expr_CreateList* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Expr_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -809,6 +840,7 @@ UPB_INLINE upb_Array* _google_api_expr_v1alpha1_Expr_CreateList_optional_indices 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Expr_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -825,6 +857,7 @@ UPB_INLINE google_api_expr_v1alpha1_Expr** google_api_expr_v1alpha1_Expr_CreateL } UPB_INLINE struct google_api_expr_v1alpha1_Expr* google_api_expr_v1alpha1_Expr_CreateList_add_elements(google_api_expr_v1alpha1_Expr_CreateList* msg, upb_Arena* arena) { upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Expr_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -920,6 +953,7 @@ UPB_INLINE void google_api_expr_v1alpha1_Expr_CreateStruct_clear_entries(google_ } UPB_INLINE const google_api_expr_v1alpha1_Expr_CreateStruct_Entry* const* google_api_expr_v1alpha1_Expr_CreateStruct_entries(const google_api_expr_v1alpha1_Expr_CreateStruct* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Expr__CreateStruct__Entry_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -931,6 +965,7 @@ UPB_INLINE const google_api_expr_v1alpha1_Expr_CreateStruct_Entry* const* google } UPB_INLINE const upb_Array* _google_api_expr_v1alpha1_Expr_CreateStruct_entries_upb_array(const google_api_expr_v1alpha1_Expr_CreateStruct* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Expr__CreateStruct__Entry_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -939,6 +974,7 @@ UPB_INLINE const upb_Array* _google_api_expr_v1alpha1_Expr_CreateStruct_entries_ } UPB_INLINE upb_Array* _google_api_expr_v1alpha1_Expr_CreateStruct_entries_mutable_upb_array(google_api_expr_v1alpha1_Expr_CreateStruct* msg, size_t* size, upb_Arena* arena) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Expr__CreateStruct__Entry_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -953,6 +989,7 @@ UPB_INLINE void google_api_expr_v1alpha1_Expr_CreateStruct_set_message_name(goog } 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Expr__CreateStruct__Entry_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -969,6 +1006,7 @@ UPB_INLINE google_api_expr_v1alpha1_Expr_CreateStruct_Entry** google_api_expr_v1 } UPB_INLINE struct google_api_expr_v1alpha1_Expr_CreateStruct_Entry* google_api_expr_v1alpha1_Expr_CreateStruct_add_entries(google_api_expr_v1alpha1_Expr_CreateStruct* msg, upb_Arena* arena) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Expr__CreateStruct__Entry_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -1064,6 +1102,7 @@ UPB_INLINE const google_api_expr_v1alpha1_Expr* google_api_expr_v1alpha1_Expr_Cr const google_api_expr_v1alpha1_Expr* default_val = NULL; const google_api_expr_v1alpha1_Expr* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Expr_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1080,6 +1119,7 @@ UPB_INLINE const google_api_expr_v1alpha1_Expr* google_api_expr_v1alpha1_Expr_Cr const google_api_expr_v1alpha1_Expr* default_val = NULL; const google_api_expr_v1alpha1_Expr* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Expr_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1111,6 +1151,7 @@ UPB_INLINE void google_api_expr_v1alpha1_Expr_CreateStruct_Entry_set_field_key(g } 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, 24, -13, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Expr_msg_init); 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) { @@ -1123,6 +1164,7 @@ UPB_INLINE struct google_api_expr_v1alpha1_Expr* google_api_expr_v1alpha1_Expr_C } 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, 48), 64, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Expr_msg_init); 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) { @@ -1194,6 +1236,7 @@ UPB_INLINE const google_api_expr_v1alpha1_Expr* google_api_expr_v1alpha1_Expr_Co const google_api_expr_v1alpha1_Expr* default_val = NULL; const google_api_expr_v1alpha1_Expr* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Expr_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1222,6 +1265,7 @@ UPB_INLINE const google_api_expr_v1alpha1_Expr* google_api_expr_v1alpha1_Expr_Co const google_api_expr_v1alpha1_Expr* default_val = NULL; const google_api_expr_v1alpha1_Expr* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Expr_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1238,6 +1282,7 @@ UPB_INLINE const google_api_expr_v1alpha1_Expr* google_api_expr_v1alpha1_Expr_Co const google_api_expr_v1alpha1_Expr* default_val = NULL; const google_api_expr_v1alpha1_Expr* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Expr_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1254,6 +1299,7 @@ UPB_INLINE const google_api_expr_v1alpha1_Expr* google_api_expr_v1alpha1_Expr_Co const google_api_expr_v1alpha1_Expr* default_val = NULL; const google_api_expr_v1alpha1_Expr* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Expr_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1270,6 +1316,7 @@ UPB_INLINE const google_api_expr_v1alpha1_Expr* google_api_expr_v1alpha1_Expr_Co const google_api_expr_v1alpha1_Expr* default_val = NULL; const google_api_expr_v1alpha1_Expr* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Expr_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1297,6 +1344,7 @@ UPB_INLINE void google_api_expr_v1alpha1_Expr_Comprehension_set_iter_var(google_ } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Expr_msg_init); 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) { @@ -1313,6 +1361,7 @@ UPB_INLINE void google_api_expr_v1alpha1_Expr_Comprehension_set_accu_var(google_ } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Expr_msg_init); 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) { @@ -1325,6 +1374,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Expr_msg_init); 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) { @@ -1337,6 +1387,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Expr_msg_init); 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) { @@ -1349,6 +1400,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Expr_msg_init); 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) { @@ -1537,6 +1589,7 @@ UPB_INLINE const struct google_protobuf_Duration* google_api_expr_v1alpha1_Const const struct google_protobuf_Duration* default_val = NULL; const struct google_protobuf_Duration* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1553,6 +1606,7 @@ UPB_INLINE const struct google_protobuf_Timestamp* google_api_expr_v1alpha1_Cons const struct google_protobuf_Timestamp* default_val = NULL; const struct google_protobuf_Timestamp* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Timestamp_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1592,6 +1646,7 @@ UPB_INLINE void google_api_expr_v1alpha1_Constant_set_bytes_value(google_api_exp } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { @@ -1604,6 +1659,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Timestamp_msg_init); 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) { @@ -1718,22 +1774,26 @@ UPB_INLINE size_t google_api_expr_v1alpha1_SourceInfo_positions_size(const googl } UPB_INLINE bool google_api_expr_v1alpha1_SourceInfo_positions_get(const google_api_expr_v1alpha1_SourceInfo* msg, int64_t key, int32_t* val) { const upb_MiniTableField field = {4, UPB_SIZE(12, 48), 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__SourceInfo__PositionsEntry_msg_init); const upb_Map* map = upb_Message_GetMap(UPB_UPCAST(msg), &field); if (!map) return false; return _upb_Map_Get(map, &key, sizeof(key), val, sizeof(*val)); } UPB_INLINE const google_api_expr_v1alpha1_SourceInfo_PositionsEntry* google_api_expr_v1alpha1_SourceInfo_positions_next(const google_api_expr_v1alpha1_SourceInfo* msg, size_t* iter) { const upb_MiniTableField field = {4, UPB_SIZE(12, 48), 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__SourceInfo__PositionsEntry_msg_init); const upb_Map* map = upb_Message_GetMap(UPB_UPCAST(msg), &field); if (!map) return NULL; return (const google_api_expr_v1alpha1_SourceInfo_PositionsEntry*)_upb_map_next(map, iter); } UPB_INLINE const upb_Map* _google_api_expr_v1alpha1_SourceInfo_positions_upb_map(google_api_expr_v1alpha1_SourceInfo* msg) { const upb_MiniTableField field = {4, UPB_SIZE(12, 48), 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__SourceInfo__PositionsEntry_msg_init); return upb_Message_GetMap(UPB_UPCAST(msg), &field); } UPB_INLINE upb_Map* _google_api_expr_v1alpha1_SourceInfo_positions_mutable_upb_map(google_api_expr_v1alpha1_SourceInfo* msg, upb_Arena* a) { const upb_MiniTableField field = {4, UPB_SIZE(12, 48), 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__SourceInfo__PositionsEntry_msg_init); return _upb_Message_GetOrCreateMutableMap(UPB_UPCAST(msg), &field, sizeof(int64_t), sizeof(int32_t), a); } UPB_INLINE void google_api_expr_v1alpha1_SourceInfo_clear_macro_calls(google_api_expr_v1alpha1_SourceInfo* msg) { @@ -1747,22 +1807,30 @@ UPB_INLINE size_t google_api_expr_v1alpha1_SourceInfo_macro_calls_size(const goo } UPB_INLINE bool google_api_expr_v1alpha1_SourceInfo_macro_calls_get(const google_api_expr_v1alpha1_SourceInfo* msg, int64_t key, google_api_expr_v1alpha1_Expr** val) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__SourceInfo__MacroCallsEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Expr_msg_init); const upb_Map* map = upb_Message_GetMap(UPB_UPCAST(msg), &field); if (!map) return false; return _upb_Map_Get(map, &key, sizeof(key), val, sizeof(*val)); } UPB_INLINE const google_api_expr_v1alpha1_SourceInfo_MacroCallsEntry* google_api_expr_v1alpha1_SourceInfo_macro_calls_next(const google_api_expr_v1alpha1_SourceInfo* msg, size_t* iter) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__SourceInfo__MacroCallsEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Expr_msg_init); const upb_Map* map = upb_Message_GetMap(UPB_UPCAST(msg), &field); if (!map) return NULL; return (const google_api_expr_v1alpha1_SourceInfo_MacroCallsEntry*)_upb_map_next(map, iter); } UPB_INLINE const upb_Map* _google_api_expr_v1alpha1_SourceInfo_macro_calls_upb_map(google_api_expr_v1alpha1_SourceInfo* msg) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__SourceInfo__MacroCallsEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Expr_msg_init); return upb_Message_GetMap(UPB_UPCAST(msg), &field); } UPB_INLINE upb_Map* _google_api_expr_v1alpha1_SourceInfo_macro_calls_mutable_upb_map(google_api_expr_v1alpha1_SourceInfo* msg, upb_Arena* a) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__SourceInfo__MacroCallsEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Expr_msg_init); 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) { @@ -1771,6 +1839,7 @@ UPB_INLINE void google_api_expr_v1alpha1_SourceInfo_clear_extensions(google_api_ } 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__SourceInfo__Extension_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1782,6 +1851,7 @@ UPB_INLINE const google_api_expr_v1alpha1_SourceInfo_Extension* const* google_ap } 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__SourceInfo__Extension_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -1790,6 +1860,7 @@ UPB_INLINE const upb_Array* _google_api_expr_v1alpha1_SourceInfo_extensions_upb_ } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__SourceInfo__Extension_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -1842,6 +1913,7 @@ UPB_INLINE void google_api_expr_v1alpha1_SourceInfo_positions_clear(google_api_e } UPB_INLINE bool google_api_expr_v1alpha1_SourceInfo_positions_set(google_api_expr_v1alpha1_SourceInfo* msg, int64_t key, int32_t val, upb_Arena* a) { const upb_MiniTableField field = {4, UPB_SIZE(12, 48), 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__SourceInfo__PositionsEntry_msg_init); upb_Map* map = _upb_Message_GetOrCreateMutableMap(UPB_UPCAST(msg), &field, sizeof(key), sizeof(val), a); return _upb_Map_Insert(map, &key, sizeof(key), &val, sizeof(val), a) != @@ -1855,6 +1927,7 @@ UPB_INLINE bool google_api_expr_v1alpha1_SourceInfo_positions_delete(google_api_ } UPB_INLINE google_api_expr_v1alpha1_SourceInfo_PositionsEntry* google_api_expr_v1alpha1_SourceInfo_positions_nextmutable(google_api_expr_v1alpha1_SourceInfo* msg, size_t* iter) { const upb_MiniTableField field = {4, UPB_SIZE(12, 48), 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__SourceInfo__PositionsEntry_msg_init); upb_Map* map = (upb_Map*)upb_Message_GetMap(UPB_UPCAST(msg), &field); if (!map) return NULL; return (google_api_expr_v1alpha1_SourceInfo_PositionsEntry*)_upb_map_next(map, iter); @@ -1867,6 +1940,8 @@ UPB_INLINE void google_api_expr_v1alpha1_SourceInfo_macro_calls_clear(google_api } UPB_INLINE bool google_api_expr_v1alpha1_SourceInfo_macro_calls_set(google_api_expr_v1alpha1_SourceInfo* msg, int64_t key, google_api_expr_v1alpha1_Expr* val, upb_Arena* a) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__SourceInfo__MacroCallsEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Expr_msg_init); upb_Map* map = _upb_Message_GetOrCreateMutableMap(UPB_UPCAST(msg), &field, sizeof(key), sizeof(val), a); return _upb_Map_Insert(map, &key, sizeof(key), &val, sizeof(val), a) != @@ -1880,12 +1955,15 @@ UPB_INLINE bool google_api_expr_v1alpha1_SourceInfo_macro_calls_delete(google_ap } UPB_INLINE google_api_expr_v1alpha1_SourceInfo_MacroCallsEntry* google_api_expr_v1alpha1_SourceInfo_macro_calls_nextmutable(google_api_expr_v1alpha1_SourceInfo* msg, size_t* iter) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__SourceInfo__MacroCallsEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__Expr_msg_init); upb_Map* map = (upb_Map*)upb_Message_GetMap(UPB_UPCAST(msg), &field); 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__SourceInfo__Extension_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1902,6 +1980,7 @@ UPB_INLINE google_api_expr_v1alpha1_SourceInfo_Extension** google_api_expr_v1alp } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__SourceInfo__Extension_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -2003,6 +2082,7 @@ UPB_INLINE const google_api_expr_v1alpha1_SourceInfo_Extension_Version* google_a 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__SourceInfo__Extension__Version_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -2046,6 +2126,7 @@ UPB_INLINE bool google_api_expr_v1alpha1_SourceInfo_Extension_add_affected_compo } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__SourceInfo__Extension__Version_msg_init); 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) { diff --git a/src/core/ext/upb-gen/google/api/expr/v1alpha1/syntax.upb_minitable.c b/src/core/ext/upb-gen/google/api/expr/v1alpha1/syntax.upb_minitable.c index 86de1318a58..7f4d6951b29 100644 --- a/src/core/ext/upb-gen/google/api/expr/v1alpha1/syntax.upb_minitable.c +++ b/src/core/ext/upb-gen/google/api/expr/v1alpha1/syntax.upb_minitable.c @@ -3,7 +3,8 @@ * google/api/expr/v1alpha1/syntax.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -15,9 +16,10 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub google_api_expr_v1alpha1_ParsedExpr_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Expr_msg_init}, - {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__SourceInfo_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal google_api_expr_v1alpha1_ParsedExpr_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Expr_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__SourceInfo_msg_init_ptr}, }; static const upb_MiniTableField google_api_expr_v1alpha1_ParsedExpr__fields[2] = { @@ -34,14 +36,15 @@ const upb_MiniTable google__api__expr__v1alpha1__ParsedExpr_msg_init = { #endif }; -static const upb_MiniTableSub google_api_expr_v1alpha1_Expr_submsgs[7] = { - {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Constant_msg_init}, - {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Expr__Ident_msg_init}, - {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Expr__Select_msg_init}, - {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Expr__Call_msg_init}, - {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Expr__CreateList_msg_init}, - {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Expr__CreateStruct_msg_init}, - {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Expr__Comprehension_msg_init}, +const upb_MiniTable* google__api__expr__v1alpha1__ParsedExpr_msg_init_ptr = &google__api__expr__v1alpha1__ParsedExpr_msg_init; +static const upb_MiniTableSubInternal google_api_expr_v1alpha1_Expr_submsgs[7] = { + {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Constant_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Expr__Ident_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Expr__Select_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Expr__Call_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Expr__CreateList_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Expr__CreateStruct_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Expr__Comprehension_msg_init_ptr}, }; static const upb_MiniTableField google_api_expr_v1alpha1_Expr__fields[8] = { @@ -82,6 +85,7 @@ const upb_MiniTable google__api__expr__v1alpha1__Expr_msg_init = { }) }; +const upb_MiniTable* google__api__expr__v1alpha1__Expr_msg_init_ptr = &google__api__expr__v1alpha1__Expr_msg_init; static const upb_MiniTableField google_api_expr_v1alpha1_Expr_Ident__fields[1] = { {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, }; @@ -99,8 +103,9 @@ const upb_MiniTable google__api__expr__v1alpha1__Expr__Ident_msg_init = { }) }; -static const upb_MiniTableSub google_api_expr_v1alpha1_Expr_Select_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Expr_msg_init}, +const upb_MiniTable* google__api__expr__v1alpha1__Expr__Ident_msg_init_ptr = &google__api__expr__v1alpha1__Expr__Ident_msg_init; +static const upb_MiniTableSubInternal google_api_expr_v1alpha1_Expr_Select_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Expr_msg_init_ptr}, }; static const upb_MiniTableField google_api_expr_v1alpha1_Expr_Select__fields[3] = { @@ -124,9 +129,10 @@ const upb_MiniTable google__api__expr__v1alpha1__Expr__Select_msg_init = { }) }; -static const upb_MiniTableSub google_api_expr_v1alpha1_Expr_Call_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Expr_msg_init}, - {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Expr_msg_init}, +const upb_MiniTable* google__api__expr__v1alpha1__Expr__Select_msg_init_ptr = &google__api__expr__v1alpha1__Expr__Select_msg_init; +static const upb_MiniTableSubInternal google_api_expr_v1alpha1_Expr_Call_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Expr_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Expr_msg_init_ptr}, }; static const upb_MiniTableField google_api_expr_v1alpha1_Expr_Call__fields[3] = { @@ -150,8 +156,9 @@ const upb_MiniTable google__api__expr__v1alpha1__Expr__Call_msg_init = { }) }; -static const upb_MiniTableSub google_api_expr_v1alpha1_Expr_CreateList_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Expr_msg_init}, +const upb_MiniTable* google__api__expr__v1alpha1__Expr__Call_msg_init_ptr = &google__api__expr__v1alpha1__Expr__Call_msg_init; +static const upb_MiniTableSubInternal google_api_expr_v1alpha1_Expr_CreateList_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Expr_msg_init_ptr}, }; static const upb_MiniTableField google_api_expr_v1alpha1_Expr_CreateList__fields[2] = { @@ -174,8 +181,9 @@ const upb_MiniTable google__api__expr__v1alpha1__Expr__CreateList_msg_init = { }) }; -static const upb_MiniTableSub google_api_expr_v1alpha1_Expr_CreateStruct_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Expr__CreateStruct__Entry_msg_init}, +const upb_MiniTable* google__api__expr__v1alpha1__Expr__CreateList_msg_init_ptr = &google__api__expr__v1alpha1__Expr__CreateList_msg_init; +static const upb_MiniTableSubInternal google_api_expr_v1alpha1_Expr_CreateStruct_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Expr__CreateStruct__Entry_msg_init_ptr}, }; static const upb_MiniTableField google_api_expr_v1alpha1_Expr_CreateStruct__fields[2] = { @@ -198,9 +206,10 @@ const upb_MiniTable google__api__expr__v1alpha1__Expr__CreateStruct_msg_init = { }) }; -static const upb_MiniTableSub google_api_expr_v1alpha1_Expr_CreateStruct_Entry_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Expr_msg_init}, - {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Expr_msg_init}, +const upb_MiniTable* google__api__expr__v1alpha1__Expr__CreateStruct_msg_init_ptr = &google__api__expr__v1alpha1__Expr__CreateStruct_msg_init; +static const upb_MiniTableSubInternal google_api_expr_v1alpha1_Expr_CreateStruct_Entry_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Expr_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Expr_msg_init_ptr}, }; static const upb_MiniTableField google_api_expr_v1alpha1_Expr_CreateStruct_Entry__fields[5] = { @@ -230,12 +239,13 @@ const upb_MiniTable google__api__expr__v1alpha1__Expr__CreateStruct__Entry_msg_i }) }; -static const upb_MiniTableSub google_api_expr_v1alpha1_Expr_Comprehension_submsgs[5] = { - {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Expr_msg_init}, - {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Expr_msg_init}, - {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Expr_msg_init}, - {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Expr_msg_init}, - {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Expr_msg_init}, +const upb_MiniTable* google__api__expr__v1alpha1__Expr__CreateStruct__Entry_msg_init_ptr = &google__api__expr__v1alpha1__Expr__CreateStruct__Entry_msg_init; +static const upb_MiniTableSubInternal google_api_expr_v1alpha1_Expr_Comprehension_submsgs[5] = { + {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Expr_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Expr_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Expr_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Expr_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Expr_msg_init_ptr}, }; static const upb_MiniTableField google_api_expr_v1alpha1_Expr_Comprehension__fields[8] = { @@ -276,9 +286,10 @@ const upb_MiniTable google__api__expr__v1alpha1__Expr__Comprehension_msg_init = }) }; -static const upb_MiniTableSub google_api_expr_v1alpha1_Constant_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init}, +const upb_MiniTable* google__api__expr__v1alpha1__Expr__Comprehension_msg_init_ptr = &google__api__expr__v1alpha1__Expr__Comprehension_msg_init; +static const upb_MiniTableSubInternal google_api_expr_v1alpha1_Constant_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init_ptr}, }; static const upb_MiniTableField google_api_expr_v1alpha1_Constant__fields[9] = { @@ -320,10 +331,11 @@ const upb_MiniTable google__api__expr__v1alpha1__Constant_msg_init = { }) }; -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}, +const upb_MiniTable* google__api__expr__v1alpha1__Constant_msg_init_ptr = &google__api__expr__v1alpha1__Constant_msg_init; +static const upb_MiniTableSubInternal google_api_expr_v1alpha1_SourceInfo_submsgs[3] = { + {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__SourceInfo__PositionsEntry_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__SourceInfo__MacroCallsEntry_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__SourceInfo__Extension_msg_init_ptr}, }; static const upb_MiniTableField google_api_expr_v1alpha1_SourceInfo__fields[6] = { @@ -354,8 +366,9 @@ const upb_MiniTable google__api__expr__v1alpha1__SourceInfo_msg_init = { }) }; -static const upb_MiniTableSub google_api_expr_v1alpha1_SourceInfo_Extension_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__SourceInfo__Extension__Version_msg_init}, +const upb_MiniTable* google__api__expr__v1alpha1__SourceInfo_msg_init_ptr = &google__api__expr__v1alpha1__SourceInfo_msg_init; +static const upb_MiniTableSubInternal google_api_expr_v1alpha1_SourceInfo_Extension_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__SourceInfo__Extension__Version_msg_init_ptr}, }; static const upb_MiniTableField google_api_expr_v1alpha1_SourceInfo_Extension__fields[3] = { @@ -379,6 +392,7 @@ const upb_MiniTable google__api__expr__v1alpha1__SourceInfo__Extension_msg_init }) }; +const upb_MiniTable* google__api__expr__v1alpha1__SourceInfo__Extension_msg_init_ptr = &google__api__expr__v1alpha1__SourceInfo__Extension_msg_init; 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)}, @@ -399,6 +413,7 @@ const upb_MiniTable google__api__expr__v1alpha1__SourceInfo__Extension__Version_ }) }; +const upb_MiniTable* google__api__expr__v1alpha1__SourceInfo__Extension__Version_msg_init_ptr = &google__api__expr__v1alpha1__SourceInfo__Extension__Version_msg_init; static const upb_MiniTableField google_api_expr_v1alpha1_SourceInfo_PositionsEntry__fields[2] = { {1, 16, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, {2, 32, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, @@ -419,8 +434,9 @@ const upb_MiniTable google__api__expr__v1alpha1__SourceInfo__PositionsEntry_msg_ }) }; -static const upb_MiniTableSub google_api_expr_v1alpha1_SourceInfo_MacroCallsEntry_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Expr_msg_init}, +const upb_MiniTable* google__api__expr__v1alpha1__SourceInfo__PositionsEntry_msg_init_ptr = &google__api__expr__v1alpha1__SourceInfo__PositionsEntry_msg_init; +static const upb_MiniTableSubInternal google_api_expr_v1alpha1_SourceInfo_MacroCallsEntry_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Expr_msg_init_ptr}, }; static const upb_MiniTableField google_api_expr_v1alpha1_SourceInfo_MacroCallsEntry__fields[2] = { @@ -441,6 +457,7 @@ const upb_MiniTable google__api__expr__v1alpha1__SourceInfo__MacroCallsEntry_msg }) }; +const upb_MiniTable* google__api__expr__v1alpha1__SourceInfo__MacroCallsEntry_msg_init_ptr = &google__api__expr__v1alpha1__SourceInfo__MacroCallsEntry_msg_init; static const upb_MiniTableField google_api_expr_v1alpha1_SourcePosition__fields[4] = { {1, UPB_SIZE(20, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, {2, 8, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, @@ -467,6 +484,7 @@ const upb_MiniTable google__api__expr__v1alpha1__SourcePosition_msg_init = { }) }; +const upb_MiniTable* google__api__expr__v1alpha1__SourcePosition_msg_init_ptr = &google__api__expr__v1alpha1__SourcePosition_msg_init; static const upb_MiniTable *messages_layout[16] = { &google__api__expr__v1alpha1__ParsedExpr_msg_init, &google__api__expr__v1alpha1__Expr_msg_init, diff --git a/src/core/ext/upb-gen/google/api/expr/v1alpha1/syntax.upb_minitable.h b/src/core/ext/upb-gen/google/api/expr/v1alpha1/syntax.upb_minitable.h index 269a82c1a39..42ea2132083 100644 --- a/src/core/ext/upb-gen/google/api/expr/v1alpha1/syntax.upb_minitable.h +++ b/src/core/ext/upb-gen/google/api/expr/v1alpha1/syntax.upb_minitable.h @@ -3,7 +3,8 @@ * google/api/expr/v1alpha1/syntax.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef GOOGLE_API_EXPR_V1ALPHA1_SYNTAX_PROTO_UPB_MINITABLE_H_ #define GOOGLE_API_EXPR_V1ALPHA1_SYNTAX_PROTO_UPB_MINITABLE_H_ @@ -18,21 +19,37 @@ extern "C" { #endif extern const upb_MiniTable google__api__expr__v1alpha1__ParsedExpr_msg_init; +extern const upb_MiniTable* google__api__expr__v1alpha1__ParsedExpr_msg_init_ptr; extern const upb_MiniTable google__api__expr__v1alpha1__Expr_msg_init; +extern const upb_MiniTable* google__api__expr__v1alpha1__Expr_msg_init_ptr; extern const upb_MiniTable google__api__expr__v1alpha1__Expr__Ident_msg_init; +extern const upb_MiniTable* google__api__expr__v1alpha1__Expr__Ident_msg_init_ptr; extern const upb_MiniTable google__api__expr__v1alpha1__Expr__Select_msg_init; +extern const upb_MiniTable* google__api__expr__v1alpha1__Expr__Select_msg_init_ptr; extern const upb_MiniTable google__api__expr__v1alpha1__Expr__Call_msg_init; +extern const upb_MiniTable* google__api__expr__v1alpha1__Expr__Call_msg_init_ptr; extern const upb_MiniTable google__api__expr__v1alpha1__Expr__CreateList_msg_init; +extern const upb_MiniTable* google__api__expr__v1alpha1__Expr__CreateList_msg_init_ptr; extern const upb_MiniTable google__api__expr__v1alpha1__Expr__CreateStruct_msg_init; +extern const upb_MiniTable* google__api__expr__v1alpha1__Expr__CreateStruct_msg_init_ptr; extern const upb_MiniTable google__api__expr__v1alpha1__Expr__CreateStruct__Entry_msg_init; +extern const upb_MiniTable* google__api__expr__v1alpha1__Expr__CreateStruct__Entry_msg_init_ptr; extern const upb_MiniTable google__api__expr__v1alpha1__Expr__Comprehension_msg_init; +extern const upb_MiniTable* google__api__expr__v1alpha1__Expr__Comprehension_msg_init_ptr; extern const upb_MiniTable google__api__expr__v1alpha1__Constant_msg_init; +extern const upb_MiniTable* google__api__expr__v1alpha1__Constant_msg_init_ptr; extern const upb_MiniTable google__api__expr__v1alpha1__SourceInfo_msg_init; +extern const upb_MiniTable* google__api__expr__v1alpha1__SourceInfo_msg_init_ptr; extern const upb_MiniTable google__api__expr__v1alpha1__SourceInfo__Extension_msg_init; +extern const upb_MiniTable* google__api__expr__v1alpha1__SourceInfo__Extension_msg_init_ptr; extern const upb_MiniTable google__api__expr__v1alpha1__SourceInfo__Extension__Version_msg_init; +extern const upb_MiniTable* google__api__expr__v1alpha1__SourceInfo__Extension__Version_msg_init_ptr; extern const upb_MiniTable google__api__expr__v1alpha1__SourceInfo__PositionsEntry_msg_init; +extern const upb_MiniTable* google__api__expr__v1alpha1__SourceInfo__PositionsEntry_msg_init_ptr; extern const upb_MiniTable google__api__expr__v1alpha1__SourceInfo__MacroCallsEntry_msg_init; +extern const upb_MiniTable* google__api__expr__v1alpha1__SourceInfo__MacroCallsEntry_msg_init_ptr; extern const upb_MiniTable google__api__expr__v1alpha1__SourcePosition_msg_init; +extern const upb_MiniTable* google__api__expr__v1alpha1__SourcePosition_msg_init_ptr; extern const upb_MiniTableFile google_api_expr_v1alpha1_syntax_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/google/api/http.upb.h b/src/core/ext/upb-gen/google/api/http.upb.h index fd9e2bac999..594336aac37 100644 --- a/src/core/ext/upb-gen/google/api/http.upb.h +++ b/src/core/ext/upb-gen/google/api/http.upb.h @@ -3,7 +3,8 @@ * google/api/http.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef GOOGLE_API_HTTP_PROTO_UPB_H_ #define GOOGLE_API_HTTP_PROTO_UPB_H_ @@ -67,6 +68,7 @@ UPB_INLINE void google_api_Http_clear_rules(google_api_Http* msg) { } UPB_INLINE const google_api_HttpRule* const* google_api_Http_rules(const google_api_Http* msg, size_t* size) { const upb_MiniTableField field = {1, UPB_SIZE(8, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__HttpRule_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -78,6 +80,7 @@ UPB_INLINE const google_api_HttpRule* const* google_api_Http_rules(const google_ } UPB_INLINE const upb_Array* _google_api_Http_rules_upb_array(const google_api_Http* msg, size_t* size) { const upb_MiniTableField field = {1, UPB_SIZE(8, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__HttpRule_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -86,6 +89,7 @@ UPB_INLINE const upb_Array* _google_api_Http_rules_upb_array(const google_api_Ht } UPB_INLINE upb_Array* _google_api_Http_rules_mutable_upb_array(google_api_Http* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {1, UPB_SIZE(8, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__HttpRule_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -108,6 +112,7 @@ UPB_INLINE bool google_api_Http_fully_decode_reserved_expansion(const google_api UPB_INLINE google_api_HttpRule** google_api_Http_mutable_rules(google_api_Http* msg, size_t* size) { upb_MiniTableField field = {1, UPB_SIZE(8, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__HttpRule_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -124,6 +129,7 @@ UPB_INLINE google_api_HttpRule** google_api_Http_resize_rules(google_api_Http* m } UPB_INLINE struct google_api_HttpRule* google_api_Http_add_rules(google_api_Http* msg, upb_Arena* arena) { upb_MiniTableField field = {1, UPB_SIZE(8, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__HttpRule_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -303,6 +309,7 @@ UPB_INLINE const google_api_CustomHttpPattern* google_api_HttpRule_custom(const const google_api_CustomHttpPattern* default_val = NULL; const google_api_CustomHttpPattern* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__CustomHttpPattern_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -317,6 +324,7 @@ UPB_INLINE void google_api_HttpRule_clear_additional_bindings(google_api_HttpRul } UPB_INLINE const google_api_HttpRule* const* google_api_HttpRule_additional_bindings(const google_api_HttpRule* msg, size_t* size) { const upb_MiniTableField field = {11, UPB_SIZE(12, 64), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__HttpRule_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -328,6 +336,7 @@ UPB_INLINE const google_api_HttpRule* const* google_api_HttpRule_additional_bind } UPB_INLINE const upb_Array* _google_api_HttpRule_additional_bindings_upb_array(const google_api_HttpRule* msg, size_t* size) { const upb_MiniTableField field = {11, UPB_SIZE(12, 64), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__HttpRule_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -336,6 +345,7 @@ UPB_INLINE const upb_Array* _google_api_HttpRule_additional_bindings_upb_array(c } UPB_INLINE upb_Array* _google_api_HttpRule_additional_bindings_mutable_upb_array(google_api_HttpRule* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {11, UPB_SIZE(12, 64), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__HttpRule_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -386,6 +396,7 @@ UPB_INLINE void google_api_HttpRule_set_body(google_api_HttpRule *msg, upb_Strin } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__CustomHttpPattern_msg_init); 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) { @@ -398,6 +409,7 @@ UPB_INLINE struct google_api_CustomHttpPattern* google_api_HttpRule_mutable_cust } UPB_INLINE google_api_HttpRule** google_api_HttpRule_mutable_additional_bindings(google_api_HttpRule* msg, size_t* size) { upb_MiniTableField field = {11, UPB_SIZE(12, 64), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__HttpRule_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -414,6 +426,7 @@ UPB_INLINE google_api_HttpRule** google_api_HttpRule_resize_additional_bindings( } UPB_INLINE struct google_api_HttpRule* google_api_HttpRule_add_additional_bindings(google_api_HttpRule* msg, upb_Arena* arena) { upb_MiniTableField field = {11, UPB_SIZE(12, 64), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__HttpRule_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( diff --git a/src/core/ext/upb-gen/google/api/http.upb_minitable.c b/src/core/ext/upb-gen/google/api/http.upb_minitable.c index e74f38d28c4..7c56734b00b 100644 --- a/src/core/ext/upb-gen/google/api/http.upb_minitable.c +++ b/src/core/ext/upb-gen/google/api/http.upb_minitable.c @@ -3,7 +3,8 @@ * google/api/http.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -12,8 +13,9 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub google_api_Http_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &google__api__HttpRule_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal google_api_Http_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__api__HttpRule_msg_init_ptr}, }; static const upb_MiniTableField google_api_Http__fields[2] = { @@ -36,9 +38,10 @@ const upb_MiniTable google__api__Http_msg_init = { }) }; -static const upb_MiniTableSub google_api_HttpRule_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &google__api__CustomHttpPattern_msg_init}, - {.UPB_PRIVATE(submsg) = &google__api__HttpRule_msg_init}, +const upb_MiniTable* google__api__Http_msg_init_ptr = &google__api__Http_msg_init; +static const upb_MiniTableSubInternal google_api_HttpRule_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &google__api__CustomHttpPattern_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__api__HttpRule_msg_init_ptr}, }; static const upb_MiniTableField google_api_HttpRule__fields[10] = { @@ -81,6 +84,7 @@ const upb_MiniTable google__api__HttpRule_msg_init = { }) }; +const upb_MiniTable* google__api__HttpRule_msg_init_ptr = &google__api__HttpRule_msg_init; static const upb_MiniTableField google_api_CustomHttpPattern__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)}, @@ -101,6 +105,7 @@ const upb_MiniTable google__api__CustomHttpPattern_msg_init = { }) }; +const upb_MiniTable* google__api__CustomHttpPattern_msg_init_ptr = &google__api__CustomHttpPattern_msg_init; static const upb_MiniTable *messages_layout[3] = { &google__api__Http_msg_init, &google__api__HttpRule_msg_init, diff --git a/src/core/ext/upb-gen/google/api/http.upb_minitable.h b/src/core/ext/upb-gen/google/api/http.upb_minitable.h index 83ec6172940..3df86fbdd9b 100644 --- a/src/core/ext/upb-gen/google/api/http.upb_minitable.h +++ b/src/core/ext/upb-gen/google/api/http.upb_minitable.h @@ -3,7 +3,8 @@ * google/api/http.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef GOOGLE_API_HTTP_PROTO_UPB_MINITABLE_H_ #define GOOGLE_API_HTTP_PROTO_UPB_MINITABLE_H_ @@ -18,8 +19,11 @@ extern "C" { #endif extern const upb_MiniTable google__api__Http_msg_init; +extern const upb_MiniTable* google__api__Http_msg_init_ptr; extern const upb_MiniTable google__api__HttpRule_msg_init; +extern const upb_MiniTable* google__api__HttpRule_msg_init_ptr; extern const upb_MiniTable google__api__CustomHttpPattern_msg_init; +extern const upb_MiniTable* google__api__CustomHttpPattern_msg_init_ptr; extern const upb_MiniTableFile google_api_http_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/google/api/httpbody.upb.h b/src/core/ext/upb-gen/google/api/httpbody.upb.h index 72e122a63a7..a3b257a7c98 100644 --- a/src/core/ext/upb-gen/google/api/httpbody.upb.h +++ b/src/core/ext/upb-gen/google/api/httpbody.upb.h @@ -3,7 +3,8 @@ * google/api/httpbody.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef GOOGLE_API_HTTPBODY_PROTO_UPB_H_ #define GOOGLE_API_HTTPBODY_PROTO_UPB_H_ @@ -92,6 +93,7 @@ UPB_INLINE void google_api_HttpBody_clear_extensions(google_api_HttpBody* msg) { } UPB_INLINE const struct google_protobuf_Any* const* google_api_HttpBody_extensions(const google_api_HttpBody* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -103,6 +105,7 @@ UPB_INLINE const struct google_protobuf_Any* const* google_api_HttpBody_extensio } UPB_INLINE const upb_Array* _google_api_HttpBody_extensions_upb_array(const google_api_HttpBody* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -111,6 +114,7 @@ UPB_INLINE const upb_Array* _google_api_HttpBody_extensions_upb_array(const goog } UPB_INLINE upb_Array* _google_api_HttpBody_extensions_mutable_upb_array(google_api_HttpBody* msg, size_t* size, upb_Arena* arena) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -129,6 +133,7 @@ UPB_INLINE void google_api_HttpBody_set_data(google_api_HttpBody *msg, upb_Strin } 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -145,6 +150,7 @@ UPB_INLINE struct google_protobuf_Any** google_api_HttpBody_resize_extensions(go } UPB_INLINE struct google_protobuf_Any* google_api_HttpBody_add_extensions(google_api_HttpBody* msg, upb_Arena* arena) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( diff --git a/src/core/ext/upb-gen/google/api/httpbody.upb_minitable.c b/src/core/ext/upb-gen/google/api/httpbody.upb_minitable.c index 50bf37c9afb..e30cbbcd477 100644 --- a/src/core/ext/upb-gen/google/api/httpbody.upb_minitable.c +++ b/src/core/ext/upb-gen/google/api/httpbody.upb_minitable.c @@ -3,7 +3,8 @@ * google/api/httpbody.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -13,8 +14,9 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub google_api_HttpBody_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal google_api_HttpBody_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, }; static const upb_MiniTableField google_api_HttpBody__fields[3] = { @@ -38,6 +40,7 @@ const upb_MiniTable google__api__HttpBody_msg_init = { }) }; +const upb_MiniTable* google__api__HttpBody_msg_init_ptr = &google__api__HttpBody_msg_init; static const upb_MiniTable *messages_layout[1] = { &google__api__HttpBody_msg_init, }; diff --git a/src/core/ext/upb-gen/google/api/httpbody.upb_minitable.h b/src/core/ext/upb-gen/google/api/httpbody.upb_minitable.h index 58e4859ca95..abd05f43c54 100644 --- a/src/core/ext/upb-gen/google/api/httpbody.upb_minitable.h +++ b/src/core/ext/upb-gen/google/api/httpbody.upb_minitable.h @@ -3,7 +3,8 @@ * google/api/httpbody.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef GOOGLE_API_HTTPBODY_PROTO_UPB_MINITABLE_H_ #define GOOGLE_API_HTTPBODY_PROTO_UPB_MINITABLE_H_ @@ -18,6 +19,7 @@ extern "C" { #endif extern const upb_MiniTable google__api__HttpBody_msg_init; +extern const upb_MiniTable* google__api__HttpBody_msg_init_ptr; extern const upb_MiniTableFile google_api_httpbody_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/google/protobuf/any.upb.h b/src/core/ext/upb-gen/google/protobuf/any.upb.h index 0d50f0afc57..c41272123ac 100644 --- a/src/core/ext/upb-gen/google/protobuf/any.upb.h +++ b/src/core/ext/upb-gen/google/protobuf/any.upb.h @@ -3,7 +3,8 @@ * google/protobuf/any.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef GOOGLE_PROTOBUF_ANY_PROTO_UPB_H_ #define GOOGLE_PROTOBUF_ANY_PROTO_UPB_H_ diff --git a/src/core/ext/upb-gen/google/protobuf/any.upb_minitable.c b/src/core/ext/upb-gen/google/protobuf/any.upb_minitable.c index 9b0d3c38e51..d646be4cd4b 100644 --- a/src/core/ext/upb-gen/google/protobuf/any.upb_minitable.c +++ b/src/core/ext/upb-gen/google/protobuf/any.upb_minitable.c @@ -3,7 +3,8 @@ * google/protobuf/any.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -12,6 +13,7 @@ // Must be last. #include "upb/port/def.inc" +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); static const upb_MiniTableField google_protobuf_Any__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)}, @@ -32,6 +34,7 @@ const upb_MiniTable google__protobuf__Any_msg_init = { }) }; +const upb_MiniTable* google__protobuf__Any_msg_init_ptr = &google__protobuf__Any_msg_init; static const upb_MiniTable *messages_layout[1] = { &google__protobuf__Any_msg_init, }; diff --git a/src/core/ext/upb-gen/google/protobuf/any.upb_minitable.h b/src/core/ext/upb-gen/google/protobuf/any.upb_minitable.h index 77f2ceee094..77fecd2617d 100644 --- a/src/core/ext/upb-gen/google/protobuf/any.upb_minitable.h +++ b/src/core/ext/upb-gen/google/protobuf/any.upb_minitable.h @@ -3,7 +3,8 @@ * google/protobuf/any.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef GOOGLE_PROTOBUF_ANY_PROTO_UPB_MINITABLE_H_ #define GOOGLE_PROTOBUF_ANY_PROTO_UPB_MINITABLE_H_ @@ -18,6 +19,7 @@ extern "C" { #endif extern const upb_MiniTable google__protobuf__Any_msg_init; +extern const upb_MiniTable* google__protobuf__Any_msg_init_ptr; extern const upb_MiniTableFile google_protobuf_any_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/google/protobuf/descriptor.upb.h b/src/core/ext/upb-gen/google/protobuf/descriptor.upb.h index d2a8801415f..af260e7acf7 100644 --- a/src/core/ext/upb-gen/google/protobuf/descriptor.upb.h +++ b/src/core/ext/upb-gen/google/protobuf/descriptor.upb.h @@ -3,7 +3,8 @@ * google/protobuf/descriptor.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H_ #define GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H_ @@ -230,6 +231,7 @@ UPB_INLINE void google_protobuf_FileDescriptorSet_clear_file(google_protobuf_Fil } UPB_INLINE const google_protobuf_FileDescriptorProto* const* google_protobuf_FileDescriptorSet_file(const google_protobuf_FileDescriptorSet* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FileDescriptorProto_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -241,6 +243,7 @@ UPB_INLINE const google_protobuf_FileDescriptorProto* const* google_protobuf_Fil } UPB_INLINE const upb_Array* _google_protobuf_FileDescriptorSet_file_upb_array(const google_protobuf_FileDescriptorSet* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FileDescriptorProto_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -249,6 +252,7 @@ UPB_INLINE const upb_Array* _google_protobuf_FileDescriptorSet_file_upb_array(co } UPB_INLINE upb_Array* _google_protobuf_FileDescriptorSet_file_mutable_upb_array(google_protobuf_FileDescriptorSet* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FileDescriptorProto_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -259,6 +263,7 @@ UPB_INLINE upb_Array* _google_protobuf_FileDescriptorSet_file_mutable_upb_array( UPB_INLINE google_protobuf_FileDescriptorProto** google_protobuf_FileDescriptorSet_mutable_file(google_protobuf_FileDescriptorSet* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FileDescriptorProto_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -275,6 +280,7 @@ UPB_INLINE google_protobuf_FileDescriptorProto** google_protobuf_FileDescriptorS } UPB_INLINE struct google_protobuf_FileDescriptorProto* google_protobuf_FileDescriptorSet_add_file(google_protobuf_FileDescriptorSet* msg, upb_Arena* arena) { upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FileDescriptorProto_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -394,6 +400,7 @@ UPB_INLINE void google_protobuf_FileDescriptorProto_clear_message_type(google_pr } UPB_INLINE const google_protobuf_DescriptorProto* const* google_protobuf_FileDescriptorProto_message_type(const google_protobuf_FileDescriptorProto* msg, size_t* size) { const upb_MiniTableField field = {4, UPB_SIZE(16, 56), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__DescriptorProto_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -405,6 +412,7 @@ UPB_INLINE const google_protobuf_DescriptorProto* const* google_protobuf_FileDes } UPB_INLINE const upb_Array* _google_protobuf_FileDescriptorProto_message_type_upb_array(const google_protobuf_FileDescriptorProto* msg, size_t* size) { const upb_MiniTableField field = {4, UPB_SIZE(16, 56), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__DescriptorProto_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -413,6 +421,7 @@ UPB_INLINE const upb_Array* _google_protobuf_FileDescriptorProto_message_type_up } UPB_INLINE upb_Array* _google_protobuf_FileDescriptorProto_message_type_mutable_upb_array(google_protobuf_FileDescriptorProto* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {4, UPB_SIZE(16, 56), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__DescriptorProto_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -426,6 +435,7 @@ UPB_INLINE void google_protobuf_FileDescriptorProto_clear_enum_type(google_proto } UPB_INLINE const google_protobuf_EnumDescriptorProto* const* google_protobuf_FileDescriptorProto_enum_type(const google_protobuf_FileDescriptorProto* msg, size_t* size) { const upb_MiniTableField field = {5, UPB_SIZE(20, 64), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__EnumDescriptorProto_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -437,6 +447,7 @@ UPB_INLINE const google_protobuf_EnumDescriptorProto* const* google_protobuf_Fil } UPB_INLINE const upb_Array* _google_protobuf_FileDescriptorProto_enum_type_upb_array(const google_protobuf_FileDescriptorProto* msg, size_t* size) { const upb_MiniTableField field = {5, UPB_SIZE(20, 64), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__EnumDescriptorProto_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -445,6 +456,7 @@ UPB_INLINE const upb_Array* _google_protobuf_FileDescriptorProto_enum_type_upb_a } UPB_INLINE upb_Array* _google_protobuf_FileDescriptorProto_enum_type_mutable_upb_array(google_protobuf_FileDescriptorProto* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {5, UPB_SIZE(20, 64), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__EnumDescriptorProto_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -458,6 +470,7 @@ UPB_INLINE void google_protobuf_FileDescriptorProto_clear_service(google_protobu } UPB_INLINE const google_protobuf_ServiceDescriptorProto* const* google_protobuf_FileDescriptorProto_service(const google_protobuf_FileDescriptorProto* msg, size_t* size) { const upb_MiniTableField field = {6, UPB_SIZE(24, 72), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__ServiceDescriptorProto_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -469,6 +482,7 @@ UPB_INLINE const google_protobuf_ServiceDescriptorProto* const* google_protobuf_ } UPB_INLINE const upb_Array* _google_protobuf_FileDescriptorProto_service_upb_array(const google_protobuf_FileDescriptorProto* msg, size_t* size) { const upb_MiniTableField field = {6, UPB_SIZE(24, 72), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__ServiceDescriptorProto_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -477,6 +491,7 @@ UPB_INLINE const upb_Array* _google_protobuf_FileDescriptorProto_service_upb_arr } UPB_INLINE upb_Array* _google_protobuf_FileDescriptorProto_service_mutable_upb_array(google_protobuf_FileDescriptorProto* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {6, UPB_SIZE(24, 72), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__ServiceDescriptorProto_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -490,6 +505,7 @@ UPB_INLINE void google_protobuf_FileDescriptorProto_clear_extension(google_proto } UPB_INLINE const google_protobuf_FieldDescriptorProto* const* google_protobuf_FileDescriptorProto_extension(const google_protobuf_FileDescriptorProto* msg, size_t* size) { const upb_MiniTableField field = {7, UPB_SIZE(28, 80), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FieldDescriptorProto_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -501,6 +517,7 @@ UPB_INLINE const google_protobuf_FieldDescriptorProto* const* google_protobuf_Fi } UPB_INLINE const upb_Array* _google_protobuf_FileDescriptorProto_extension_upb_array(const google_protobuf_FileDescriptorProto* msg, size_t* size) { const upb_MiniTableField field = {7, UPB_SIZE(28, 80), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FieldDescriptorProto_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -509,6 +526,7 @@ UPB_INLINE const upb_Array* _google_protobuf_FileDescriptorProto_extension_upb_a } UPB_INLINE upb_Array* _google_protobuf_FileDescriptorProto_extension_mutable_upb_array(google_protobuf_FileDescriptorProto* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {7, UPB_SIZE(28, 80), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FieldDescriptorProto_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -524,6 +542,7 @@ UPB_INLINE const google_protobuf_FileOptions* google_protobuf_FileDescriptorProt const google_protobuf_FileOptions* default_val = NULL; const google_protobuf_FileOptions* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FileOptions_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -540,6 +559,7 @@ UPB_INLINE const google_protobuf_SourceCodeInfo* google_protobuf_FileDescriptorP const google_protobuf_SourceCodeInfo* default_val = NULL; const google_protobuf_SourceCodeInfo* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__SourceCodeInfo_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -683,6 +703,7 @@ UPB_INLINE bool google_protobuf_FileDescriptorProto_add_dependency(google_protob } UPB_INLINE google_protobuf_DescriptorProto** google_protobuf_FileDescriptorProto_mutable_message_type(google_protobuf_FileDescriptorProto* msg, size_t* size) { upb_MiniTableField field = {4, UPB_SIZE(16, 56), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__DescriptorProto_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -699,6 +720,7 @@ UPB_INLINE google_protobuf_DescriptorProto** google_protobuf_FileDescriptorProto } UPB_INLINE struct google_protobuf_DescriptorProto* google_protobuf_FileDescriptorProto_add_message_type(google_protobuf_FileDescriptorProto* msg, upb_Arena* arena) { upb_MiniTableField field = {4, UPB_SIZE(16, 56), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__DescriptorProto_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -713,6 +735,7 @@ UPB_INLINE struct google_protobuf_DescriptorProto* google_protobuf_FileDescripto } UPB_INLINE google_protobuf_EnumDescriptorProto** google_protobuf_FileDescriptorProto_mutable_enum_type(google_protobuf_FileDescriptorProto* msg, size_t* size) { upb_MiniTableField field = {5, UPB_SIZE(20, 64), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__EnumDescriptorProto_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -729,6 +752,7 @@ UPB_INLINE google_protobuf_EnumDescriptorProto** google_protobuf_FileDescriptorP } UPB_INLINE struct google_protobuf_EnumDescriptorProto* google_protobuf_FileDescriptorProto_add_enum_type(google_protobuf_FileDescriptorProto* msg, upb_Arena* arena) { upb_MiniTableField field = {5, UPB_SIZE(20, 64), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__EnumDescriptorProto_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -743,6 +767,7 @@ UPB_INLINE struct google_protobuf_EnumDescriptorProto* google_protobuf_FileDescr } UPB_INLINE google_protobuf_ServiceDescriptorProto** google_protobuf_FileDescriptorProto_mutable_service(google_protobuf_FileDescriptorProto* msg, size_t* size) { upb_MiniTableField field = {6, UPB_SIZE(24, 72), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__ServiceDescriptorProto_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -759,6 +784,7 @@ UPB_INLINE google_protobuf_ServiceDescriptorProto** google_protobuf_FileDescript } UPB_INLINE struct google_protobuf_ServiceDescriptorProto* google_protobuf_FileDescriptorProto_add_service(google_protobuf_FileDescriptorProto* msg, upb_Arena* arena) { upb_MiniTableField field = {6, UPB_SIZE(24, 72), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__ServiceDescriptorProto_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -773,6 +799,7 @@ UPB_INLINE struct google_protobuf_ServiceDescriptorProto* google_protobuf_FileDe } UPB_INLINE google_protobuf_FieldDescriptorProto** google_protobuf_FileDescriptorProto_mutable_extension(google_protobuf_FileDescriptorProto* msg, size_t* size) { upb_MiniTableField field = {7, UPB_SIZE(28, 80), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FieldDescriptorProto_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -789,6 +816,7 @@ UPB_INLINE google_protobuf_FieldDescriptorProto** google_protobuf_FileDescriptor } UPB_INLINE struct google_protobuf_FieldDescriptorProto* google_protobuf_FileDescriptorProto_add_extension(google_protobuf_FileDescriptorProto* msg, upb_Arena* arena) { upb_MiniTableField field = {7, UPB_SIZE(28, 80), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FieldDescriptorProto_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -803,6 +831,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FileOptions_msg_init); 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) { @@ -815,6 +844,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__SourceCodeInfo_msg_init); 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) { @@ -948,6 +978,7 @@ UPB_INLINE void google_protobuf_DescriptorProto_clear_field(google_protobuf_Desc } UPB_INLINE const google_protobuf_FieldDescriptorProto* const* google_protobuf_DescriptorProto_field(const google_protobuf_DescriptorProto* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FieldDescriptorProto_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -959,6 +990,7 @@ UPB_INLINE const google_protobuf_FieldDescriptorProto* const* google_protobuf_De } UPB_INLINE const upb_Array* _google_protobuf_DescriptorProto_field_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FieldDescriptorProto_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -967,6 +999,7 @@ UPB_INLINE const upb_Array* _google_protobuf_DescriptorProto_field_upb_array(con } UPB_INLINE upb_Array* _google_protobuf_DescriptorProto_field_mutable_upb_array(google_protobuf_DescriptorProto* msg, size_t* size, upb_Arena* arena) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FieldDescriptorProto_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -980,6 +1013,7 @@ UPB_INLINE void google_protobuf_DescriptorProto_clear_nested_type(google_protobu } UPB_INLINE const google_protobuf_DescriptorProto* const* google_protobuf_DescriptorProto_nested_type(const google_protobuf_DescriptorProto* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__DescriptorProto_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -991,6 +1025,7 @@ UPB_INLINE const google_protobuf_DescriptorProto* const* google_protobuf_Descrip } UPB_INLINE const upb_Array* _google_protobuf_DescriptorProto_nested_type_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__DescriptorProto_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -999,6 +1034,7 @@ UPB_INLINE const upb_Array* _google_protobuf_DescriptorProto_nested_type_upb_arr } UPB_INLINE upb_Array* _google_protobuf_DescriptorProto_nested_type_mutable_upb_array(google_protobuf_DescriptorProto* msg, size_t* size, upb_Arena* arena) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__DescriptorProto_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -1012,6 +1048,7 @@ UPB_INLINE void google_protobuf_DescriptorProto_clear_enum_type(google_protobuf_ } UPB_INLINE const google_protobuf_EnumDescriptorProto* const* google_protobuf_DescriptorProto_enum_type(const google_protobuf_DescriptorProto* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__EnumDescriptorProto_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1023,6 +1060,7 @@ UPB_INLINE const google_protobuf_EnumDescriptorProto* const* google_protobuf_Des } UPB_INLINE const upb_Array* _google_protobuf_DescriptorProto_enum_type_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__EnumDescriptorProto_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -1031,6 +1069,7 @@ UPB_INLINE const upb_Array* _google_protobuf_DescriptorProto_enum_type_upb_array } UPB_INLINE upb_Array* _google_protobuf_DescriptorProto_enum_type_mutable_upb_array(google_protobuf_DescriptorProto* msg, size_t* size, upb_Arena* arena) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__EnumDescriptorProto_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -1044,6 +1083,7 @@ UPB_INLINE void google_protobuf_DescriptorProto_clear_extension_range(google_pro } UPB_INLINE const google_protobuf_DescriptorProto_ExtensionRange* const* google_protobuf_DescriptorProto_extension_range(const google_protobuf_DescriptorProto* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__DescriptorProto__ExtensionRange_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1055,6 +1095,7 @@ UPB_INLINE const google_protobuf_DescriptorProto_ExtensionRange* const* google_p } UPB_INLINE const upb_Array* _google_protobuf_DescriptorProto_extension_range_upb_array(const google_protobuf_DescriptorProto* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__DescriptorProto__ExtensionRange_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -1063,6 +1104,7 @@ UPB_INLINE const upb_Array* _google_protobuf_DescriptorProto_extension_range_upb } UPB_INLINE upb_Array* _google_protobuf_DescriptorProto_extension_range_mutable_upb_array(google_protobuf_DescriptorProto* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__DescriptorProto__ExtensionRange_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -1076,6 +1118,7 @@ UPB_INLINE void google_protobuf_DescriptorProto_clear_extension(google_protobuf_ } UPB_INLINE const google_protobuf_FieldDescriptorProto* const* google_protobuf_DescriptorProto_extension(const google_protobuf_DescriptorProto* msg, size_t* size) { const upb_MiniTableField field = {6, UPB_SIZE(28, 64), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FieldDescriptorProto_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1087,6 +1130,7 @@ UPB_INLINE const google_protobuf_FieldDescriptorProto* const* google_protobuf_De } UPB_INLINE const upb_Array* _google_protobuf_DescriptorProto_extension_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size) { const upb_MiniTableField field = {6, UPB_SIZE(28, 64), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FieldDescriptorProto_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -1095,6 +1139,7 @@ UPB_INLINE const upb_Array* _google_protobuf_DescriptorProto_extension_upb_array } UPB_INLINE upb_Array* _google_protobuf_DescriptorProto_extension_mutable_upb_array(google_protobuf_DescriptorProto* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {6, UPB_SIZE(28, 64), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FieldDescriptorProto_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -1110,6 +1155,7 @@ UPB_INLINE const google_protobuf_MessageOptions* google_protobuf_DescriptorProto const google_protobuf_MessageOptions* default_val = NULL; const google_protobuf_MessageOptions* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__MessageOptions_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1124,6 +1170,7 @@ UPB_INLINE void google_protobuf_DescriptorProto_clear_oneof_decl(google_protobuf } UPB_INLINE const google_protobuf_OneofDescriptorProto* const* google_protobuf_DescriptorProto_oneof_decl(const google_protobuf_DescriptorProto* msg, size_t* size) { const upb_MiniTableField field = {8, UPB_SIZE(36, 80), 0, 6, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__OneofDescriptorProto_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1135,6 +1182,7 @@ UPB_INLINE const google_protobuf_OneofDescriptorProto* const* google_protobuf_De } UPB_INLINE const upb_Array* _google_protobuf_DescriptorProto_oneof_decl_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size) { const upb_MiniTableField field = {8, UPB_SIZE(36, 80), 0, 6, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__OneofDescriptorProto_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -1143,6 +1191,7 @@ UPB_INLINE const upb_Array* _google_protobuf_DescriptorProto_oneof_decl_upb_arra } UPB_INLINE upb_Array* _google_protobuf_DescriptorProto_oneof_decl_mutable_upb_array(google_protobuf_DescriptorProto* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {8, UPB_SIZE(36, 80), 0, 6, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__OneofDescriptorProto_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -1156,6 +1205,7 @@ UPB_INLINE void google_protobuf_DescriptorProto_clear_reserved_range(google_prot } UPB_INLINE const google_protobuf_DescriptorProto_ReservedRange* const* google_protobuf_DescriptorProto_reserved_range(const google_protobuf_DescriptorProto* msg, size_t* size) { const upb_MiniTableField field = {9, UPB_SIZE(40, 88), 0, 7, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__DescriptorProto__ReservedRange_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1167,6 +1217,7 @@ UPB_INLINE const google_protobuf_DescriptorProto_ReservedRange* const* google_pr } UPB_INLINE const upb_Array* _google_protobuf_DescriptorProto_reserved_range_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size) { const upb_MiniTableField field = {9, UPB_SIZE(40, 88), 0, 7, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__DescriptorProto__ReservedRange_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -1175,6 +1226,7 @@ UPB_INLINE const upb_Array* _google_protobuf_DescriptorProto_reserved_range_upb_ } UPB_INLINE upb_Array* _google_protobuf_DescriptorProto_reserved_range_mutable_upb_array(google_protobuf_DescriptorProto* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {9, UPB_SIZE(40, 88), 0, 7, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__DescriptorProto__ReservedRange_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -1221,6 +1273,7 @@ UPB_INLINE void google_protobuf_DescriptorProto_set_name(google_protobuf_Descrip } 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FieldDescriptorProto_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1237,6 +1290,7 @@ UPB_INLINE google_protobuf_FieldDescriptorProto** google_protobuf_DescriptorProt } UPB_INLINE struct google_protobuf_FieldDescriptorProto* google_protobuf_DescriptorProto_add_field(google_protobuf_DescriptorProto* msg, upb_Arena* arena) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FieldDescriptorProto_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -1251,6 +1305,7 @@ UPB_INLINE struct google_protobuf_FieldDescriptorProto* google_protobuf_Descript } UPB_INLINE google_protobuf_DescriptorProto** google_protobuf_DescriptorProto_mutable_nested_type(google_protobuf_DescriptorProto* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__DescriptorProto_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1267,6 +1322,7 @@ UPB_INLINE google_protobuf_DescriptorProto** google_protobuf_DescriptorProto_res } UPB_INLINE struct google_protobuf_DescriptorProto* google_protobuf_DescriptorProto_add_nested_type(google_protobuf_DescriptorProto* msg, upb_Arena* arena) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__DescriptorProto_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -1281,6 +1337,7 @@ UPB_INLINE struct google_protobuf_DescriptorProto* google_protobuf_DescriptorPro } UPB_INLINE google_protobuf_EnumDescriptorProto** google_protobuf_DescriptorProto_mutable_enum_type(google_protobuf_DescriptorProto* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__EnumDescriptorProto_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1297,6 +1354,7 @@ UPB_INLINE google_protobuf_EnumDescriptorProto** google_protobuf_DescriptorProto } UPB_INLINE struct google_protobuf_EnumDescriptorProto* google_protobuf_DescriptorProto_add_enum_type(google_protobuf_DescriptorProto* msg, upb_Arena* arena) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__EnumDescriptorProto_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -1311,6 +1369,7 @@ UPB_INLINE struct google_protobuf_EnumDescriptorProto* google_protobuf_Descripto } UPB_INLINE google_protobuf_DescriptorProto_ExtensionRange** google_protobuf_DescriptorProto_mutable_extension_range(google_protobuf_DescriptorProto* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__DescriptorProto__ExtensionRange_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1327,6 +1386,7 @@ UPB_INLINE google_protobuf_DescriptorProto_ExtensionRange** google_protobuf_Desc } UPB_INLINE struct google_protobuf_DescriptorProto_ExtensionRange* google_protobuf_DescriptorProto_add_extension_range(google_protobuf_DescriptorProto* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__DescriptorProto__ExtensionRange_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -1341,6 +1401,7 @@ UPB_INLINE struct google_protobuf_DescriptorProto_ExtensionRange* google_protobu } UPB_INLINE google_protobuf_FieldDescriptorProto** google_protobuf_DescriptorProto_mutable_extension(google_protobuf_DescriptorProto* msg, size_t* size) { upb_MiniTableField field = {6, UPB_SIZE(28, 64), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FieldDescriptorProto_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1357,6 +1418,7 @@ UPB_INLINE google_protobuf_FieldDescriptorProto** google_protobuf_DescriptorProt } UPB_INLINE struct google_protobuf_FieldDescriptorProto* google_protobuf_DescriptorProto_add_extension(google_protobuf_DescriptorProto* msg, upb_Arena* arena) { upb_MiniTableField field = {6, UPB_SIZE(28, 64), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FieldDescriptorProto_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -1371,6 +1433,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__MessageOptions_msg_init); 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) { @@ -1383,6 +1446,7 @@ UPB_INLINE struct google_protobuf_MessageOptions* google_protobuf_DescriptorProt } UPB_INLINE google_protobuf_OneofDescriptorProto** google_protobuf_DescriptorProto_mutable_oneof_decl(google_protobuf_DescriptorProto* msg, size_t* size) { upb_MiniTableField field = {8, UPB_SIZE(36, 80), 0, 6, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__OneofDescriptorProto_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1399,6 +1463,7 @@ UPB_INLINE google_protobuf_OneofDescriptorProto** google_protobuf_DescriptorProt } UPB_INLINE struct google_protobuf_OneofDescriptorProto* google_protobuf_DescriptorProto_add_oneof_decl(google_protobuf_DescriptorProto* msg, upb_Arena* arena) { upb_MiniTableField field = {8, UPB_SIZE(36, 80), 0, 6, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__OneofDescriptorProto_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -1413,6 +1478,7 @@ UPB_INLINE struct google_protobuf_OneofDescriptorProto* google_protobuf_Descript } UPB_INLINE google_protobuf_DescriptorProto_ReservedRange** google_protobuf_DescriptorProto_mutable_reserved_range(google_protobuf_DescriptorProto* msg, size_t* size) { upb_MiniTableField field = {9, UPB_SIZE(40, 88), 0, 7, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__DescriptorProto__ReservedRange_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1429,6 +1495,7 @@ UPB_INLINE google_protobuf_DescriptorProto_ReservedRange** google_protobuf_Descr } UPB_INLINE struct google_protobuf_DescriptorProto_ReservedRange* google_protobuf_DescriptorProto_add_reserved_range(google_protobuf_DescriptorProto* msg, upb_Arena* arena) { upb_MiniTableField field = {9, UPB_SIZE(40, 88), 0, 7, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__DescriptorProto__ReservedRange_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -1546,6 +1613,7 @@ UPB_INLINE const google_protobuf_ExtensionRangeOptions* google_protobuf_Descript const google_protobuf_ExtensionRangeOptions* default_val = NULL; const google_protobuf_ExtensionRangeOptions* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__ExtensionRangeOptions_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1565,6 +1633,7 @@ UPB_INLINE void google_protobuf_DescriptorProto_ExtensionRange_set_end(google_pr } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__ExtensionRangeOptions_msg_init); 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) { @@ -1696,6 +1765,7 @@ UPB_INLINE void google_protobuf_ExtensionRangeOptions_clear_declaration(google_p } UPB_INLINE const google_protobuf_ExtensionRangeOptions_Declaration* const* google_protobuf_ExtensionRangeOptions_declaration(const google_protobuf_ExtensionRangeOptions* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__ExtensionRangeOptions__Declaration_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1707,6 +1777,7 @@ UPB_INLINE const google_protobuf_ExtensionRangeOptions_Declaration* const* googl } UPB_INLINE const upb_Array* _google_protobuf_ExtensionRangeOptions_declaration_upb_array(const google_protobuf_ExtensionRangeOptions* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__ExtensionRangeOptions__Declaration_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -1715,6 +1786,7 @@ UPB_INLINE const upb_Array* _google_protobuf_ExtensionRangeOptions_declaration_u } UPB_INLINE upb_Array* _google_protobuf_ExtensionRangeOptions_declaration_mutable_upb_array(google_protobuf_ExtensionRangeOptions* msg, size_t* size, upb_Arena* arena) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__ExtensionRangeOptions__Declaration_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -1746,6 +1818,7 @@ UPB_INLINE const google_protobuf_FeatureSet* google_protobuf_ExtensionRangeOptio const google_protobuf_FeatureSet* default_val = NULL; const google_protobuf_FeatureSet* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FeatureSet_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1760,6 +1833,7 @@ UPB_INLINE void google_protobuf_ExtensionRangeOptions_clear_uninterpreted_option } UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_ExtensionRangeOptions_uninterpreted_option(const google_protobuf_ExtensionRangeOptions* msg, size_t* size) { 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1771,6 +1845,7 @@ UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_Ext } UPB_INLINE const upb_Array* _google_protobuf_ExtensionRangeOptions_uninterpreted_option_upb_array(const google_protobuf_ExtensionRangeOptions* msg, size_t* size) { 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -1779,6 +1854,7 @@ UPB_INLINE const upb_Array* _google_protobuf_ExtensionRangeOptions_uninterpreted } UPB_INLINE upb_Array* _google_protobuf_ExtensionRangeOptions_uninterpreted_option_mutable_upb_array(google_protobuf_ExtensionRangeOptions* msg, size_t* size, upb_Arena* arena) { 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -1789,6 +1865,7 @@ UPB_INLINE upb_Array* _google_protobuf_ExtensionRangeOptions_uninterpreted_optio UPB_INLINE google_protobuf_ExtensionRangeOptions_Declaration** google_protobuf_ExtensionRangeOptions_mutable_declaration(google_protobuf_ExtensionRangeOptions* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__ExtensionRangeOptions__Declaration_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1805,6 +1882,7 @@ UPB_INLINE google_protobuf_ExtensionRangeOptions_Declaration** google_protobuf_E } UPB_INLINE struct google_protobuf_ExtensionRangeOptions_Declaration* google_protobuf_ExtensionRangeOptions_add_declaration(google_protobuf_ExtensionRangeOptions* msg, upb_Arena* arena) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__ExtensionRangeOptions__Declaration_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -1823,6 +1901,7 @@ UPB_INLINE void google_protobuf_ExtensionRangeOptions_set_verification(google_pr } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FeatureSet_msg_init); 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) { @@ -1835,6 +1914,7 @@ UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_ExtensionRangeOpti } UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_ExtensionRangeOptions_mutable_uninterpreted_option(google_protobuf_ExtensionRangeOptions* msg, size_t* size) { 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1851,6 +1931,7 @@ UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_ExtensionRangeO } UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_ExtensionRangeOptions_add_uninterpreted_option(google_protobuf_ExtensionRangeOptions* msg, upb_Arena* arena) { 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -2158,6 +2239,7 @@ UPB_INLINE const google_protobuf_FieldOptions* google_protobuf_FieldDescriptorPr const google_protobuf_FieldOptions* default_val = NULL; const google_protobuf_FieldOptions* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FieldOptions_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -2245,6 +2327,7 @@ UPB_INLINE void google_protobuf_FieldDescriptorProto_set_default_value(google_pr } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FieldOptions_msg_init); 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) { @@ -2328,6 +2411,7 @@ UPB_INLINE const google_protobuf_OneofOptions* google_protobuf_OneofDescriptorPr const google_protobuf_OneofOptions* default_val = NULL; const google_protobuf_OneofOptions* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__OneofOptions_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -2343,6 +2427,7 @@ UPB_INLINE void google_protobuf_OneofDescriptorProto_set_name(google_protobuf_On } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__OneofOptions_msg_init); 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) { @@ -2412,6 +2497,7 @@ UPB_INLINE void google_protobuf_EnumDescriptorProto_clear_value(google_protobuf_ } UPB_INLINE const google_protobuf_EnumValueDescriptorProto* const* google_protobuf_EnumDescriptorProto_value(const google_protobuf_EnumDescriptorProto* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__EnumValueDescriptorProto_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -2423,6 +2509,7 @@ UPB_INLINE const google_protobuf_EnumValueDescriptorProto* const* google_protobu } UPB_INLINE const upb_Array* _google_protobuf_EnumDescriptorProto_value_upb_array(const google_protobuf_EnumDescriptorProto* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__EnumValueDescriptorProto_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -2431,6 +2518,7 @@ UPB_INLINE const upb_Array* _google_protobuf_EnumDescriptorProto_value_upb_array } UPB_INLINE upb_Array* _google_protobuf_EnumDescriptorProto_value_mutable_upb_array(google_protobuf_EnumDescriptorProto* msg, size_t* size, upb_Arena* arena) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__EnumValueDescriptorProto_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -2446,6 +2534,7 @@ UPB_INLINE const google_protobuf_EnumOptions* google_protobuf_EnumDescriptorProt const google_protobuf_EnumOptions* default_val = NULL; const google_protobuf_EnumOptions* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__EnumOptions_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -2460,6 +2549,7 @@ UPB_INLINE void google_protobuf_EnumDescriptorProto_clear_reserved_range(google_ } UPB_INLINE const google_protobuf_EnumDescriptorProto_EnumReservedRange* const* google_protobuf_EnumDescriptorProto_reserved_range(const google_protobuf_EnumDescriptorProto* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -2471,6 +2561,7 @@ UPB_INLINE const google_protobuf_EnumDescriptorProto_EnumReservedRange* const* g } UPB_INLINE const upb_Array* _google_protobuf_EnumDescriptorProto_reserved_range_upb_array(const google_protobuf_EnumDescriptorProto* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -2479,6 +2570,7 @@ UPB_INLINE const upb_Array* _google_protobuf_EnumDescriptorProto_reserved_range_ } UPB_INLINE upb_Array* _google_protobuf_EnumDescriptorProto_reserved_range_mutable_upb_array(google_protobuf_EnumDescriptorProto* msg, size_t* size, upb_Arena* arena) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -2525,6 +2617,7 @@ UPB_INLINE void google_protobuf_EnumDescriptorProto_set_name(google_protobuf_Enu } 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__EnumValueDescriptorProto_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -2541,6 +2634,7 @@ UPB_INLINE google_protobuf_EnumValueDescriptorProto** google_protobuf_EnumDescri } UPB_INLINE struct google_protobuf_EnumValueDescriptorProto* google_protobuf_EnumDescriptorProto_add_value(google_protobuf_EnumDescriptorProto* msg, upb_Arena* arena) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__EnumValueDescriptorProto_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -2555,6 +2649,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__EnumOptions_msg_init); 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) { @@ -2567,6 +2662,7 @@ UPB_INLINE struct google_protobuf_EnumOptions* google_protobuf_EnumDescriptorPro } UPB_INLINE google_protobuf_EnumDescriptorProto_EnumReservedRange** google_protobuf_EnumDescriptorProto_mutable_reserved_range(google_protobuf_EnumDescriptorProto* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -2583,6 +2679,7 @@ UPB_INLINE google_protobuf_EnumDescriptorProto_EnumReservedRange** google_protob } UPB_INLINE struct google_protobuf_EnumDescriptorProto_EnumReservedRange* google_protobuf_EnumDescriptorProto_add_reserved_range(google_protobuf_EnumDescriptorProto* msg, upb_Arena* arena) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -2778,6 +2875,7 @@ UPB_INLINE const google_protobuf_EnumValueOptions* google_protobuf_EnumValueDesc const google_protobuf_EnumValueOptions* default_val = NULL; const google_protobuf_EnumValueOptions* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__EnumValueOptions_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -2797,6 +2895,7 @@ UPB_INLINE void google_protobuf_EnumValueDescriptorProto_set_number(google_proto } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__EnumValueOptions_msg_init); 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) { @@ -2866,6 +2965,7 @@ UPB_INLINE void google_protobuf_ServiceDescriptorProto_clear_method(google_proto } UPB_INLINE const google_protobuf_MethodDescriptorProto* const* google_protobuf_ServiceDescriptorProto_method(const google_protobuf_ServiceDescriptorProto* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__MethodDescriptorProto_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -2877,6 +2977,7 @@ UPB_INLINE const google_protobuf_MethodDescriptorProto* const* google_protobuf_S } UPB_INLINE const upb_Array* _google_protobuf_ServiceDescriptorProto_method_upb_array(const google_protobuf_ServiceDescriptorProto* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__MethodDescriptorProto_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -2885,6 +2986,7 @@ UPB_INLINE const upb_Array* _google_protobuf_ServiceDescriptorProto_method_upb_a } UPB_INLINE upb_Array* _google_protobuf_ServiceDescriptorProto_method_mutable_upb_array(google_protobuf_ServiceDescriptorProto* msg, size_t* size, upb_Arena* arena) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__MethodDescriptorProto_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -2900,6 +3002,7 @@ UPB_INLINE const google_protobuf_ServiceOptions* google_protobuf_ServiceDescript const google_protobuf_ServiceOptions* default_val = NULL; const google_protobuf_ServiceOptions* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__ServiceOptions_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -2915,6 +3018,7 @@ UPB_INLINE void google_protobuf_ServiceDescriptorProto_set_name(google_protobuf_ } 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__MethodDescriptorProto_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -2931,6 +3035,7 @@ UPB_INLINE google_protobuf_MethodDescriptorProto** google_protobuf_ServiceDescri } UPB_INLINE struct google_protobuf_MethodDescriptorProto* google_protobuf_ServiceDescriptorProto_add_method(google_protobuf_ServiceDescriptorProto* msg, upb_Arena* arena) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__MethodDescriptorProto_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -2945,6 +3050,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__ServiceOptions_msg_init); 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) { @@ -3048,6 +3154,7 @@ UPB_INLINE const google_protobuf_MethodOptions* google_protobuf_MethodDescriptor const google_protobuf_MethodOptions* default_val = NULL; const google_protobuf_MethodOptions* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__MethodOptions_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -3103,6 +3210,7 @@ UPB_INLINE void google_protobuf_MethodDescriptorProto_set_output_type(google_pro } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__MethodOptions_msg_init); 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) { @@ -3470,6 +3578,7 @@ UPB_INLINE const google_protobuf_FeatureSet* google_protobuf_FileOptions_feature const google_protobuf_FeatureSet* default_val = NULL; const google_protobuf_FeatureSet* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FeatureSet_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -3484,6 +3593,7 @@ UPB_INLINE void google_protobuf_FileOptions_clear_uninterpreted_option(google_pr } UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_FileOptions_uninterpreted_option(const google_protobuf_FileOptions* msg, size_t* size) { const upb_MiniTableField field = {999, UPB_SIZE(28, 192), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -3495,6 +3605,7 @@ UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_Fil } UPB_INLINE const upb_Array* _google_protobuf_FileOptions_uninterpreted_option_upb_array(const google_protobuf_FileOptions* msg, size_t* size) { const upb_MiniTableField field = {999, UPB_SIZE(28, 192), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -3503,6 +3614,7 @@ UPB_INLINE const upb_Array* _google_protobuf_FileOptions_uninterpreted_option_up } UPB_INLINE upb_Array* _google_protobuf_FileOptions_uninterpreted_option_mutable_upb_array(google_protobuf_FileOptions* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {999, UPB_SIZE(28, 192), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -3589,6 +3701,7 @@ UPB_INLINE void google_protobuf_FileOptions_set_ruby_package(google_protobuf_Fil } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FeatureSet_msg_init); 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) { @@ -3601,6 +3714,7 @@ UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_FileOptions_mutabl } UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_FileOptions_mutable_uninterpreted_option(google_protobuf_FileOptions* msg, size_t* size) { upb_MiniTableField field = {999, UPB_SIZE(28, 192), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -3617,6 +3731,7 @@ UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_FileOptions_res } UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_FileOptions_add_uninterpreted_option(google_protobuf_FileOptions* msg, upb_Arena* arena) { upb_MiniTableField field = {999, UPB_SIZE(28, 192), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -3754,6 +3869,7 @@ UPB_INLINE const google_protobuf_FeatureSet* google_protobuf_MessageOptions_feat const google_protobuf_FeatureSet* default_val = NULL; const google_protobuf_FeatureSet* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FeatureSet_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -3768,6 +3884,7 @@ UPB_INLINE void google_protobuf_MessageOptions_clear_uninterpreted_option(google } UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_MessageOptions_uninterpreted_option(const google_protobuf_MessageOptions* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -3779,6 +3896,7 @@ UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_Mes } UPB_INLINE const upb_Array* _google_protobuf_MessageOptions_uninterpreted_option_upb_array(const google_protobuf_MessageOptions* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -3787,6 +3905,7 @@ UPB_INLINE const upb_Array* _google_protobuf_MessageOptions_uninterpreted_option } UPB_INLINE upb_Array* _google_protobuf_MessageOptions_uninterpreted_option_mutable_upb_array(google_protobuf_MessageOptions* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -3817,6 +3936,7 @@ UPB_INLINE void google_protobuf_MessageOptions_set_deprecated_legacy_json_field_ } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FeatureSet_msg_init); 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) { @@ -3829,6 +3949,7 @@ UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_MessageOptions_mut } UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_MessageOptions_mutable_uninterpreted_option(google_protobuf_MessageOptions* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -3845,6 +3966,7 @@ UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_MessageOptions_ } UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_MessageOptions_add_uninterpreted_option(google_protobuf_MessageOptions* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -4076,6 +4198,7 @@ UPB_INLINE void google_protobuf_FieldOptions_clear_edition_defaults(google_proto } UPB_INLINE const google_protobuf_FieldOptions_EditionDefault* const* google_protobuf_FieldOptions_edition_defaults(const google_protobuf_FieldOptions* msg, size_t* size) { const upb_MiniTableField field = {20, UPB_SIZE(36, 40), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FieldOptions__EditionDefault_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -4087,6 +4210,7 @@ UPB_INLINE const google_protobuf_FieldOptions_EditionDefault* const* google_prot } UPB_INLINE const upb_Array* _google_protobuf_FieldOptions_edition_defaults_upb_array(const google_protobuf_FieldOptions* msg, size_t* size) { const upb_MiniTableField field = {20, UPB_SIZE(36, 40), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FieldOptions__EditionDefault_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -4095,6 +4219,7 @@ UPB_INLINE const upb_Array* _google_protobuf_FieldOptions_edition_defaults_upb_a } UPB_INLINE upb_Array* _google_protobuf_FieldOptions_edition_defaults_mutable_upb_array(google_protobuf_FieldOptions* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {20, UPB_SIZE(36, 40), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FieldOptions__EditionDefault_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -4110,6 +4235,7 @@ UPB_INLINE const google_protobuf_FeatureSet* google_protobuf_FieldOptions_featur const google_protobuf_FeatureSet* default_val = NULL; const google_protobuf_FeatureSet* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FeatureSet_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -4126,6 +4252,7 @@ UPB_INLINE const google_protobuf_FieldOptions_FeatureSupport* google_protobuf_Fi 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FieldOptions__FeatureSupport_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -4140,6 +4267,7 @@ UPB_INLINE void google_protobuf_FieldOptions_clear_uninterpreted_option(google_p } 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(48, 64), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -4151,6 +4279,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(48, 64), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -4159,6 +4288,7 @@ UPB_INLINE const upb_Array* _google_protobuf_FieldOptions_uninterpreted_option_u } 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(48, 64), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -4233,6 +4363,7 @@ UPB_INLINE bool google_protobuf_FieldOptions_add_targets(google_protobuf_FieldOp } UPB_INLINE google_protobuf_FieldOptions_EditionDefault** google_protobuf_FieldOptions_mutable_edition_defaults(google_protobuf_FieldOptions* msg, size_t* size) { upb_MiniTableField field = {20, UPB_SIZE(36, 40), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FieldOptions__EditionDefault_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -4249,6 +4380,7 @@ UPB_INLINE google_protobuf_FieldOptions_EditionDefault** google_protobuf_FieldOp } UPB_INLINE struct google_protobuf_FieldOptions_EditionDefault* google_protobuf_FieldOptions_add_edition_defaults(google_protobuf_FieldOptions* msg, upb_Arena* arena) { upb_MiniTableField field = {20, UPB_SIZE(36, 40), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FieldOptions__EditionDefault_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -4263,6 +4395,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FeatureSet_msg_init); 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) { @@ -4275,6 +4408,7 @@ UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_FieldOptions_mutab } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FieldOptions__FeatureSupport_msg_init); 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) { @@ -4287,6 +4421,7 @@ UPB_INLINE struct google_protobuf_FieldOptions_FeatureSupport* google_protobuf_F } UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_FieldOptions_mutable_uninterpreted_option(google_protobuf_FieldOptions* msg, size_t* size) { 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -4303,6 +4438,7 @@ UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_FieldOptions_re } 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(48, 64), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -4556,6 +4692,7 @@ UPB_INLINE const google_protobuf_FeatureSet* google_protobuf_OneofOptions_featur const google_protobuf_FeatureSet* default_val = NULL; const google_protobuf_FeatureSet* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FeatureSet_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -4570,6 +4707,7 @@ UPB_INLINE void google_protobuf_OneofOptions_clear_uninterpreted_option(google_p } UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_OneofOptions_uninterpreted_option(const google_protobuf_OneofOptions* msg, size_t* size) { const upb_MiniTableField field = {999, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -4581,6 +4719,7 @@ UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_One } UPB_INLINE const upb_Array* _google_protobuf_OneofOptions_uninterpreted_option_upb_array(const google_protobuf_OneofOptions* msg, size_t* size) { const upb_MiniTableField field = {999, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -4589,6 +4728,7 @@ UPB_INLINE const upb_Array* _google_protobuf_OneofOptions_uninterpreted_option_u } UPB_INLINE upb_Array* _google_protobuf_OneofOptions_uninterpreted_option_mutable_upb_array(google_protobuf_OneofOptions* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {999, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -4599,6 +4739,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FeatureSet_msg_init); 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) { @@ -4611,6 +4752,7 @@ UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_OneofOptions_mutab } UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_OneofOptions_mutable_uninterpreted_option(google_protobuf_OneofOptions* msg, size_t* size) { upb_MiniTableField field = {999, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -4627,6 +4769,7 @@ UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_OneofOptions_re } UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_OneofOptions_add_uninterpreted_option(google_protobuf_OneofOptions* msg, upb_Arena* arena) { upb_MiniTableField field = {999, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -4732,6 +4875,7 @@ UPB_INLINE const google_protobuf_FeatureSet* google_protobuf_EnumOptions_feature const google_protobuf_FeatureSet* default_val = NULL; const google_protobuf_FeatureSet* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FeatureSet_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -4746,6 +4890,7 @@ UPB_INLINE void google_protobuf_EnumOptions_clear_uninterpreted_option(google_pr } UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_EnumOptions_uninterpreted_option(const google_protobuf_EnumOptions* msg, size_t* size) { const upb_MiniTableField field = {999, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -4757,6 +4902,7 @@ UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_Enu } UPB_INLINE const upb_Array* _google_protobuf_EnumOptions_uninterpreted_option_upb_array(const google_protobuf_EnumOptions* msg, size_t* size) { const upb_MiniTableField field = {999, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -4765,6 +4911,7 @@ UPB_INLINE const upb_Array* _google_protobuf_EnumOptions_uninterpreted_option_up } UPB_INLINE upb_Array* _google_protobuf_EnumOptions_uninterpreted_option_mutable_upb_array(google_protobuf_EnumOptions* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {999, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -4787,6 +4934,7 @@ UPB_INLINE void google_protobuf_EnumOptions_set_deprecated_legacy_json_field_con } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FeatureSet_msg_init); 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) { @@ -4799,6 +4947,7 @@ UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_EnumOptions_mutabl } UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_EnumOptions_mutable_uninterpreted_option(google_protobuf_EnumOptions* msg, size_t* size) { upb_MiniTableField field = {999, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -4815,6 +4964,7 @@ UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_EnumOptions_res } UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_EnumOptions_add_uninterpreted_option(google_protobuf_EnumOptions* msg, upb_Arena* arena) { upb_MiniTableField field = {999, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -4888,6 +5038,7 @@ UPB_INLINE const google_protobuf_FeatureSet* google_protobuf_EnumValueOptions_fe const google_protobuf_FeatureSet* default_val = NULL; const google_protobuf_FeatureSet* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FeatureSet_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -4920,6 +5071,7 @@ UPB_INLINE const google_protobuf_FieldOptions_FeatureSupport* google_protobuf_En 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FieldOptions__FeatureSupport_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -4934,6 +5086,7 @@ UPB_INLINE void google_protobuf_EnumValueOptions_clear_uninterpreted_option(goog } 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(24, 32), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -4945,6 +5098,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(24, 32), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -4953,6 +5107,7 @@ UPB_INLINE const upb_Array* _google_protobuf_EnumValueOptions_uninterpreted_opti } 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(24, 32), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -4967,6 +5122,7 @@ UPB_INLINE void google_protobuf_EnumValueOptions_set_deprecated(google_protobuf_ } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FeatureSet_msg_init); 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) { @@ -4983,6 +5139,7 @@ UPB_INLINE void google_protobuf_EnumValueOptions_set_debug_redact(google_protobu } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FieldOptions__FeatureSupport_msg_init); 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) { @@ -4995,6 +5152,7 @@ UPB_INLINE struct google_protobuf_FieldOptions_FeatureSupport* google_protobuf_E } UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_EnumValueOptions_mutable_uninterpreted_option(google_protobuf_EnumValueOptions* msg, size_t* size) { 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -5011,6 +5169,7 @@ UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_EnumValueOption } 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(24, 32), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -5084,6 +5243,7 @@ UPB_INLINE const google_protobuf_FeatureSet* google_protobuf_ServiceOptions_feat const google_protobuf_FeatureSet* default_val = NULL; const google_protobuf_FeatureSet* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FeatureSet_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -5098,6 +5258,7 @@ UPB_INLINE void google_protobuf_ServiceOptions_clear_uninterpreted_option(google } UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_ServiceOptions_uninterpreted_option(const google_protobuf_ServiceOptions* msg, size_t* size) { const upb_MiniTableField field = {999, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -5109,6 +5270,7 @@ UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_Ser } UPB_INLINE const upb_Array* _google_protobuf_ServiceOptions_uninterpreted_option_upb_array(const google_protobuf_ServiceOptions* msg, size_t* size) { const upb_MiniTableField field = {999, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -5117,6 +5279,7 @@ UPB_INLINE const upb_Array* _google_protobuf_ServiceOptions_uninterpreted_option } UPB_INLINE upb_Array* _google_protobuf_ServiceOptions_uninterpreted_option_mutable_upb_array(google_protobuf_ServiceOptions* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {999, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -5131,6 +5294,7 @@ UPB_INLINE void google_protobuf_ServiceOptions_set_deprecated(google_protobuf_Se } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FeatureSet_msg_init); 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) { @@ -5143,6 +5307,7 @@ UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_ServiceOptions_mut } UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_ServiceOptions_mutable_uninterpreted_option(google_protobuf_ServiceOptions* msg, size_t* size) { upb_MiniTableField field = {999, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -5159,6 +5324,7 @@ UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_ServiceOptions_ } UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_ServiceOptions_add_uninterpreted_option(google_protobuf_ServiceOptions* msg, upb_Arena* arena) { upb_MiniTableField field = {999, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -5248,6 +5414,7 @@ UPB_INLINE const google_protobuf_FeatureSet* google_protobuf_MethodOptions_featu const google_protobuf_FeatureSet* default_val = NULL; const google_protobuf_FeatureSet* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FeatureSet_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -5262,6 +5429,7 @@ UPB_INLINE void google_protobuf_MethodOptions_clear_uninterpreted_option(google_ } UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_MethodOptions_uninterpreted_option(const google_protobuf_MethodOptions* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -5273,6 +5441,7 @@ UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_Met } UPB_INLINE const upb_Array* _google_protobuf_MethodOptions_uninterpreted_option_upb_array(const google_protobuf_MethodOptions* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -5281,6 +5450,7 @@ UPB_INLINE const upb_Array* _google_protobuf_MethodOptions_uninterpreted_option_ } UPB_INLINE upb_Array* _google_protobuf_MethodOptions_uninterpreted_option_mutable_upb_array(google_protobuf_MethodOptions* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -5299,6 +5469,7 @@ UPB_INLINE void google_protobuf_MethodOptions_set_idempotency_level(google_proto } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FeatureSet_msg_init); 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) { @@ -5311,6 +5482,7 @@ UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_MethodOptions_muta } UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_MethodOptions_mutable_uninterpreted_option(google_protobuf_MethodOptions* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -5327,6 +5499,7 @@ UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_MethodOptions_r } UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_MethodOptions_add_uninterpreted_option(google_protobuf_MethodOptions* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -5382,6 +5555,7 @@ UPB_INLINE void google_protobuf_UninterpretedOption_clear_name(google_protobuf_U } UPB_INLINE const google_protobuf_UninterpretedOption_NamePart* const* google_protobuf_UninterpretedOption_name(const google_protobuf_UninterpretedOption* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption__NamePart_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -5393,6 +5567,7 @@ UPB_INLINE const google_protobuf_UninterpretedOption_NamePart* const* google_pro } UPB_INLINE const upb_Array* _google_protobuf_UninterpretedOption_name_upb_array(const google_protobuf_UninterpretedOption* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption__NamePart_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -5401,6 +5576,7 @@ UPB_INLINE const upb_Array* _google_protobuf_UninterpretedOption_name_upb_array( } UPB_INLINE upb_Array* _google_protobuf_UninterpretedOption_name_mutable_upb_array(google_protobuf_UninterpretedOption* msg, size_t* size, upb_Arena* arena) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption__NamePart_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -5507,6 +5683,7 @@ UPB_INLINE bool google_protobuf_UninterpretedOption_has_aggregate_value(const go UPB_INLINE google_protobuf_UninterpretedOption_NamePart** google_protobuf_UninterpretedOption_mutable_name(google_protobuf_UninterpretedOption* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption__NamePart_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -5523,6 +5700,7 @@ UPB_INLINE google_protobuf_UninterpretedOption_NamePart** google_protobuf_Uninte } UPB_INLINE struct google_protobuf_UninterpretedOption_NamePart* google_protobuf_UninterpretedOption_add_name(google_protobuf_UninterpretedOption* msg, upb_Arena* arena) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption__NamePart_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -5838,6 +6016,7 @@ UPB_INLINE void google_protobuf_FeatureSetDefaults_clear_defaults(google_protobu } UPB_INLINE const google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* const* google_protobuf_FeatureSetDefaults_defaults(const google_protobuf_FeatureSetDefaults* msg, size_t* size) { const upb_MiniTableField field = {1, UPB_SIZE(12, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -5849,6 +6028,7 @@ UPB_INLINE const google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* co } UPB_INLINE const upb_Array* _google_protobuf_FeatureSetDefaults_defaults_upb_array(const google_protobuf_FeatureSetDefaults* msg, size_t* size) { const upb_MiniTableField field = {1, UPB_SIZE(12, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -5857,6 +6037,7 @@ UPB_INLINE const upb_Array* _google_protobuf_FeatureSetDefaults_defaults_upb_arr } UPB_INLINE upb_Array* _google_protobuf_FeatureSetDefaults_defaults_mutable_upb_array(google_protobuf_FeatureSetDefaults* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {1, UPB_SIZE(12, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -5899,6 +6080,7 @@ UPB_INLINE bool google_protobuf_FeatureSetDefaults_has_maximum_edition(const goo UPB_INLINE google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault** google_protobuf_FeatureSetDefaults_mutable_defaults(google_protobuf_FeatureSetDefaults* msg, size_t* size) { upb_MiniTableField field = {1, UPB_SIZE(12, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -5915,6 +6097,7 @@ UPB_INLINE google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault** google_ } UPB_INLINE struct google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* google_protobuf_FeatureSetDefaults_add_defaults(google_protobuf_FeatureSetDefaults* msg, upb_Arena* arena) { upb_MiniTableField field = {1, UPB_SIZE(12, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -5996,6 +6179,7 @@ UPB_INLINE const google_protobuf_FeatureSet* google_protobuf_FeatureSetDefaults_ const google_protobuf_FeatureSet* default_val = NULL; const google_protobuf_FeatureSet* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FeatureSet_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -6012,6 +6196,7 @@ UPB_INLINE const google_protobuf_FeatureSet* google_protobuf_FeatureSetDefaults_ 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FeatureSet_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -6027,6 +6212,7 @@ UPB_INLINE void google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_set_ } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FeatureSet_msg_init); upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_mutable_overridable_features(google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* msg, upb_Arena* arena) { @@ -6039,6 +6225,7 @@ UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_FeatureSetDefaults } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FeatureSet_msg_init); 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) { @@ -6092,6 +6279,7 @@ UPB_INLINE void google_protobuf_SourceCodeInfo_clear_location(google_protobuf_So } UPB_INLINE const google_protobuf_SourceCodeInfo_Location* const* google_protobuf_SourceCodeInfo_location(const google_protobuf_SourceCodeInfo* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__SourceCodeInfo__Location_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -6103,6 +6291,7 @@ UPB_INLINE const google_protobuf_SourceCodeInfo_Location* const* google_protobuf } UPB_INLINE const upb_Array* _google_protobuf_SourceCodeInfo_location_upb_array(const google_protobuf_SourceCodeInfo* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__SourceCodeInfo__Location_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -6111,6 +6300,7 @@ UPB_INLINE const upb_Array* _google_protobuf_SourceCodeInfo_location_upb_array(c } UPB_INLINE upb_Array* _google_protobuf_SourceCodeInfo_location_mutable_upb_array(google_protobuf_SourceCodeInfo* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__SourceCodeInfo__Location_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -6121,6 +6311,7 @@ UPB_INLINE upb_Array* _google_protobuf_SourceCodeInfo_location_mutable_upb_array UPB_INLINE google_protobuf_SourceCodeInfo_Location** google_protobuf_SourceCodeInfo_mutable_location(google_protobuf_SourceCodeInfo* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__SourceCodeInfo__Location_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -6137,6 +6328,7 @@ UPB_INLINE google_protobuf_SourceCodeInfo_Location** google_protobuf_SourceCodeI } UPB_INLINE struct google_protobuf_SourceCodeInfo_Location* google_protobuf_SourceCodeInfo_add_location(google_protobuf_SourceCodeInfo* msg, upb_Arena* arena) { upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__SourceCodeInfo__Location_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -6450,6 +6642,7 @@ UPB_INLINE void google_protobuf_GeneratedCodeInfo_clear_annotation(google_protob } UPB_INLINE const google_protobuf_GeneratedCodeInfo_Annotation* const* google_protobuf_GeneratedCodeInfo_annotation(const google_protobuf_GeneratedCodeInfo* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__GeneratedCodeInfo__Annotation_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -6461,6 +6654,7 @@ UPB_INLINE const google_protobuf_GeneratedCodeInfo_Annotation* const* google_pro } UPB_INLINE const upb_Array* _google_protobuf_GeneratedCodeInfo_annotation_upb_array(const google_protobuf_GeneratedCodeInfo* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__GeneratedCodeInfo__Annotation_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -6469,6 +6663,7 @@ UPB_INLINE const upb_Array* _google_protobuf_GeneratedCodeInfo_annotation_upb_ar } UPB_INLINE upb_Array* _google_protobuf_GeneratedCodeInfo_annotation_mutable_upb_array(google_protobuf_GeneratedCodeInfo* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__GeneratedCodeInfo__Annotation_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -6479,6 +6674,7 @@ UPB_INLINE upb_Array* _google_protobuf_GeneratedCodeInfo_annotation_mutable_upb_ UPB_INLINE google_protobuf_GeneratedCodeInfo_Annotation** google_protobuf_GeneratedCodeInfo_mutable_annotation(google_protobuf_GeneratedCodeInfo* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__GeneratedCodeInfo__Annotation_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -6495,6 +6691,7 @@ UPB_INLINE google_protobuf_GeneratedCodeInfo_Annotation** google_protobuf_Genera } UPB_INLINE struct google_protobuf_GeneratedCodeInfo_Annotation* google_protobuf_GeneratedCodeInfo_add_annotation(google_protobuf_GeneratedCodeInfo* msg, upb_Arena* arena) { upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__GeneratedCodeInfo__Annotation_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( diff --git a/src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.c b/src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.c index 9bd32e10876..08fa451f750 100644 --- a/src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.c +++ b/src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.c @@ -3,7 +3,8 @@ * google/protobuf/descriptor.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -12,8 +13,9 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub google_protobuf_FileDescriptorSet_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__FileDescriptorProto_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal google_protobuf_FileDescriptorSet_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__FileDescriptorProto_msg_init_ptr}, }; static const upb_MiniTableField google_protobuf_FileDescriptorSet__fields[1] = { @@ -33,13 +35,14 @@ const upb_MiniTable google__protobuf__FileDescriptorSet_msg_init = { }) }; -static const upb_MiniTableSub google_protobuf_FileDescriptorProto_submsgs[7] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__DescriptorProto_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__EnumDescriptorProto_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__ServiceDescriptorProto_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__FieldDescriptorProto_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__FileOptions_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__SourceCodeInfo_msg_init}, +const upb_MiniTable* google__protobuf__FileDescriptorSet_msg_init_ptr = &google__protobuf__FileDescriptorSet_msg_init; +static const upb_MiniTableSubInternal google_protobuf_FileDescriptorProto_submsgs[7] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__DescriptorProto_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__EnumDescriptorProto_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__ServiceDescriptorProto_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__FieldDescriptorProto_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__FileOptions_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__SourceCodeInfo_msg_init_ptr}, {.UPB_PRIVATE(subenum) = &google_protobuf_Edition_enum_init}, }; @@ -86,15 +89,16 @@ const upb_MiniTable google__protobuf__FileDescriptorProto_msg_init = { }) }; -static const upb_MiniTableSub google_protobuf_DescriptorProto_submsgs[8] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__FieldDescriptorProto_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__DescriptorProto_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__EnumDescriptorProto_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__DescriptorProto__ExtensionRange_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__FieldDescriptorProto_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__MessageOptions_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__OneofDescriptorProto_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__DescriptorProto__ReservedRange_msg_init}, +const upb_MiniTable* google__protobuf__FileDescriptorProto_msg_init_ptr = &google__protobuf__FileDescriptorProto_msg_init; +static const upb_MiniTableSubInternal google_protobuf_DescriptorProto_submsgs[8] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__FieldDescriptorProto_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__DescriptorProto_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__EnumDescriptorProto_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__DescriptorProto__ExtensionRange_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__FieldDescriptorProto_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__MessageOptions_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__OneofDescriptorProto_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__DescriptorProto__ReservedRange_msg_init_ptr}, }; static const upb_MiniTableField google_protobuf_DescriptorProto__fields[10] = { @@ -137,8 +141,9 @@ const upb_MiniTable google__protobuf__DescriptorProto_msg_init = { }) }; -static const upb_MiniTableSub google_protobuf_DescriptorProto_ExtensionRange_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__ExtensionRangeOptions_msg_init}, +const upb_MiniTable* google__protobuf__DescriptorProto_msg_init_ptr = &google__protobuf__DescriptorProto_msg_init; +static const upb_MiniTableSubInternal google_protobuf_DescriptorProto_ExtensionRange_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__ExtensionRangeOptions_msg_init_ptr}, }; static const upb_MiniTableField google_protobuf_DescriptorProto_ExtensionRange__fields[3] = { @@ -156,6 +161,7 @@ const upb_MiniTable google__protobuf__DescriptorProto__ExtensionRange_msg_init = #endif }; +const upb_MiniTable* google__protobuf__DescriptorProto__ExtensionRange_msg_init_ptr = &google__protobuf__DescriptorProto__ExtensionRange_msg_init; static const upb_MiniTableField google_protobuf_DescriptorProto_ReservedRange__fields[2] = { {1, 12, 64, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, {2, 16, 65, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, @@ -170,10 +176,11 @@ const upb_MiniTable google__protobuf__DescriptorProto__ReservedRange_msg_init = #endif }; -static const upb_MiniTableSub google_protobuf_ExtensionRangeOptions_submsgs[4] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__ExtensionRangeOptions__Declaration_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init}, +const upb_MiniTable* google__protobuf__DescriptorProto__ReservedRange_msg_init_ptr = &google__protobuf__DescriptorProto__ReservedRange_msg_init; +static const upb_MiniTableSubInternal google_protobuf_ExtensionRangeOptions_submsgs[4] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__ExtensionRangeOptions__Declaration_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init_ptr}, {.UPB_PRIVATE(subenum) = &google_protobuf_ExtensionRangeOptions_VerificationState_enum_init}, }; @@ -227,6 +234,7 @@ const upb_MiniTable google__protobuf__ExtensionRangeOptions_msg_init = { }) }; +const upb_MiniTable* google__protobuf__ExtensionRangeOptions_msg_init_ptr = &google__protobuf__ExtensionRangeOptions_msg_init; static const upb_MiniTableField google_protobuf_ExtensionRangeOptions_Declaration__fields[5] = { {1, 12, 64, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, {2, UPB_SIZE(20, 24), 65, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, @@ -244,8 +252,9 @@ const upb_MiniTable google__protobuf__ExtensionRangeOptions__Declaration_msg_ini #endif }; -static const upb_MiniTableSub google_protobuf_FieldDescriptorProto_submsgs[3] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__FieldOptions_msg_init}, +const upb_MiniTable* google__protobuf__ExtensionRangeOptions__Declaration_msg_init_ptr = &google__protobuf__ExtensionRangeOptions__Declaration_msg_init; +static const upb_MiniTableSubInternal google_protobuf_FieldDescriptorProto_submsgs[3] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__FieldOptions_msg_init_ptr}, {.UPB_PRIVATE(subenum) = &google_protobuf_FieldDescriptorProto_Label_enum_init}, {.UPB_PRIVATE(subenum) = &google_protobuf_FieldDescriptorProto_Type_enum_init}, }; @@ -273,8 +282,9 @@ const upb_MiniTable google__protobuf__FieldDescriptorProto_msg_init = { #endif }; -static const upb_MiniTableSub google_protobuf_OneofDescriptorProto_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__OneofOptions_msg_init}, +const upb_MiniTable* google__protobuf__FieldDescriptorProto_msg_init_ptr = &google__protobuf__FieldDescriptorProto_msg_init; +static const upb_MiniTableSubInternal google_protobuf_OneofDescriptorProto_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__OneofOptions_msg_init_ptr}, }; static const upb_MiniTableField google_protobuf_OneofDescriptorProto__fields[2] = { @@ -291,10 +301,11 @@ const upb_MiniTable google__protobuf__OneofDescriptorProto_msg_init = { #endif }; -static const upb_MiniTableSub google_protobuf_EnumDescriptorProto_submsgs[3] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__EnumValueDescriptorProto_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__EnumOptions_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init}, +const upb_MiniTable* google__protobuf__OneofDescriptorProto_msg_init_ptr = &google__protobuf__OneofDescriptorProto_msg_init; +static const upb_MiniTableSubInternal google_protobuf_EnumDescriptorProto_submsgs[3] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__EnumValueDescriptorProto_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__EnumOptions_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init_ptr}, }; static const upb_MiniTableField google_protobuf_EnumDescriptorProto__fields[5] = { @@ -324,6 +335,7 @@ const upb_MiniTable google__protobuf__EnumDescriptorProto_msg_init = { }) }; +const upb_MiniTable* google__protobuf__EnumDescriptorProto_msg_init_ptr = &google__protobuf__EnumDescriptorProto_msg_init; static const upb_MiniTableField google_protobuf_EnumDescriptorProto_EnumReservedRange__fields[2] = { {1, 12, 64, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, {2, 16, 65, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, @@ -338,8 +350,9 @@ const upb_MiniTable google__protobuf__EnumDescriptorProto__EnumReservedRange_msg #endif }; -static const upb_MiniTableSub google_protobuf_EnumValueDescriptorProto_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__EnumValueOptions_msg_init}, +const upb_MiniTable* google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init_ptr = &google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init; +static const upb_MiniTableSubInternal google_protobuf_EnumValueDescriptorProto_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__EnumValueOptions_msg_init_ptr}, }; static const upb_MiniTableField google_protobuf_EnumValueDescriptorProto__fields[3] = { @@ -357,9 +370,10 @@ const upb_MiniTable google__protobuf__EnumValueDescriptorProto_msg_init = { #endif }; -static const upb_MiniTableSub google_protobuf_ServiceDescriptorProto_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__MethodDescriptorProto_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__ServiceOptions_msg_init}, +const upb_MiniTable* google__protobuf__EnumValueDescriptorProto_msg_init_ptr = &google__protobuf__EnumValueDescriptorProto_msg_init; +static const upb_MiniTableSubInternal google_protobuf_ServiceDescriptorProto_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__MethodDescriptorProto_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__ServiceOptions_msg_init_ptr}, }; static const upb_MiniTableField google_protobuf_ServiceDescriptorProto__fields[3] = { @@ -383,8 +397,9 @@ const upb_MiniTable google__protobuf__ServiceDescriptorProto_msg_init = { }) }; -static const upb_MiniTableSub google_protobuf_MethodDescriptorProto_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__MethodOptions_msg_init}, +const upb_MiniTable* google__protobuf__ServiceDescriptorProto_msg_init_ptr = &google__protobuf__ServiceDescriptorProto_msg_init; +static const upb_MiniTableSubInternal google_protobuf_MethodDescriptorProto_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__MethodOptions_msg_init_ptr}, }; static const upb_MiniTableField google_protobuf_MethodDescriptorProto__fields[6] = { @@ -405,9 +420,10 @@ const upb_MiniTable google__protobuf__MethodDescriptorProto_msg_init = { #endif }; -static const upb_MiniTableSub google_protobuf_FileOptions_submsgs[3] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init}, +const upb_MiniTable* google__protobuf__MethodDescriptorProto_msg_init_ptr = &google__protobuf__MethodDescriptorProto_msg_init; +static const upb_MiniTableSubInternal google_protobuf_FileOptions_submsgs[3] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init_ptr}, {.UPB_PRIVATE(subenum) = &google_protobuf_FileOptions_OptimizeMode_enum_init}, }; @@ -478,9 +494,10 @@ const upb_MiniTable google__protobuf__FileOptions_msg_init = { }) }; -static const upb_MiniTableSub google_protobuf_MessageOptions_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init}, +const upb_MiniTable* google__protobuf__FileOptions_msg_init_ptr = &google__protobuf__FileOptions_msg_init; +static const upb_MiniTableSubInternal google_protobuf_MessageOptions_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init_ptr}, }; static const upb_MiniTableField google_protobuf_MessageOptions__fields[7] = { @@ -536,11 +553,12 @@ const upb_MiniTable google__protobuf__MessageOptions_msg_init = { }) }; -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}, +const upb_MiniTable* google__protobuf__MessageOptions_msg_init_ptr = &google__protobuf__MessageOptions_msg_init; +static const upb_MiniTableSubInternal google_protobuf_FieldOptions_submsgs[8] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__FieldOptions__EditionDefault_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__FieldOptions__FeatureSupport_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init_ptr}, {.UPB_PRIVATE(subenum) = &google_protobuf_FieldOptions_CType_enum_init}, {.UPB_PRIVATE(subenum) = &google_protobuf_FieldOptions_JSType_enum_init}, {.UPB_PRIVATE(subenum) = &google_protobuf_FieldOptions_OptionRetention_enum_init}, @@ -607,7 +625,8 @@ const upb_MiniTable google__protobuf__FieldOptions_msg_init = { }) }; -static const upb_MiniTableSub google_protobuf_FieldOptions_EditionDefault_submsgs[1] = { +const upb_MiniTable* google__protobuf__FieldOptions_msg_init_ptr = &google__protobuf__FieldOptions_msg_init; +static const upb_MiniTableSubInternal google_protobuf_FieldOptions_EditionDefault_submsgs[1] = { {.UPB_PRIVATE(subenum) = &google_protobuf_Edition_enum_init}, }; @@ -625,7 +644,8 @@ const upb_MiniTable google__protobuf__FieldOptions__EditionDefault_msg_init = { #endif }; -static const upb_MiniTableSub google_protobuf_FieldOptions_FeatureSupport_submsgs[3] = { +const upb_MiniTable* google__protobuf__FieldOptions__EditionDefault_msg_init_ptr = &google__protobuf__FieldOptions__EditionDefault_msg_init; +static const upb_MiniTableSubInternal 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}, @@ -647,9 +667,10 @@ const upb_MiniTable google__protobuf__FieldOptions__FeatureSupport_msg_init = { #endif }; -static const upb_MiniTableSub google_protobuf_OneofOptions_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init}, +const upb_MiniTable* google__protobuf__FieldOptions__FeatureSupport_msg_init_ptr = &google__protobuf__FieldOptions__FeatureSupport_msg_init; +static const upb_MiniTableSubInternal google_protobuf_OneofOptions_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init_ptr}, }; static const upb_MiniTableField google_protobuf_OneofOptions__fields[2] = { @@ -700,9 +721,10 @@ const upb_MiniTable google__protobuf__OneofOptions_msg_init = { }) }; -static const upb_MiniTableSub google_protobuf_EnumOptions_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init}, +const upb_MiniTable* google__protobuf__OneofOptions_msg_init_ptr = &google__protobuf__OneofOptions_msg_init; +static const upb_MiniTableSubInternal google_protobuf_EnumOptions_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init_ptr}, }; static const upb_MiniTableField google_protobuf_EnumOptions__fields[5] = { @@ -756,10 +778,11 @@ const upb_MiniTable google__protobuf__EnumOptions_msg_init = { }) }; -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}, +const upb_MiniTable* google__protobuf__EnumOptions_msg_init_ptr = &google__protobuf__EnumOptions_msg_init; +static const upb_MiniTableSubInternal google_protobuf_EnumValueOptions_submsgs[3] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__FieldOptions__FeatureSupport_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init_ptr}, }; static const upb_MiniTableField google_protobuf_EnumValueOptions__fields[5] = { @@ -813,9 +836,10 @@ const upb_MiniTable google__protobuf__EnumValueOptions_msg_init = { }) }; -static const upb_MiniTableSub google_protobuf_ServiceOptions_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init}, +const upb_MiniTable* google__protobuf__EnumValueOptions_msg_init_ptr = &google__protobuf__EnumValueOptions_msg_init; +static const upb_MiniTableSubInternal google_protobuf_ServiceOptions_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init_ptr}, }; static const upb_MiniTableField google_protobuf_ServiceOptions__fields[3] = { @@ -867,9 +891,10 @@ const upb_MiniTable google__protobuf__ServiceOptions_msg_init = { }) }; -static const upb_MiniTableSub google_protobuf_MethodOptions_submsgs[3] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init}, +const upb_MiniTable* google__protobuf__ServiceOptions_msg_init_ptr = &google__protobuf__ServiceOptions_msg_init; +static const upb_MiniTableSubInternal google_protobuf_MethodOptions_submsgs[3] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init_ptr}, {.UPB_PRIVATE(subenum) = &google_protobuf_MethodOptions_IdempotencyLevel_enum_init}, }; @@ -923,8 +948,9 @@ const upb_MiniTable google__protobuf__MethodOptions_msg_init = { }) }; -static const upb_MiniTableSub google_protobuf_UninterpretedOption_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption__NamePart_msg_init}, +const upb_MiniTable* google__protobuf__MethodOptions_msg_init_ptr = &google__protobuf__MethodOptions_msg_init; +static const upb_MiniTableSubInternal google_protobuf_UninterpretedOption_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption__NamePart_msg_init_ptr}, }; static const upb_MiniTableField google_protobuf_UninterpretedOption__fields[7] = { @@ -952,6 +978,7 @@ const upb_MiniTable google__protobuf__UninterpretedOption_msg_init = { }) }; +const upb_MiniTable* google__protobuf__UninterpretedOption_msg_init_ptr = &google__protobuf__UninterpretedOption_msg_init; static const upb_MiniTableField google_protobuf_UninterpretedOption_NamePart__fields[2] = { {1, UPB_SIZE(12, 16), 64, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, {2, 9, 65, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, @@ -966,7 +993,8 @@ const upb_MiniTable google__protobuf__UninterpretedOption__NamePart_msg_init = { #endif }; -static const upb_MiniTableSub google_protobuf_FeatureSet_submsgs[6] = { +const upb_MiniTable* google__protobuf__UninterpretedOption__NamePart_msg_init_ptr = &google__protobuf__UninterpretedOption__NamePart_msg_init; +static const upb_MiniTableSubInternal google_protobuf_FeatureSet_submsgs[6] = { {.UPB_PRIVATE(subenum) = &google_protobuf_FeatureSet_FieldPresence_enum_init}, {.UPB_PRIVATE(subenum) = &google_protobuf_FeatureSet_EnumType_enum_init}, {.UPB_PRIVATE(subenum) = &google_protobuf_FeatureSet_RepeatedFieldEncoding_enum_init}, @@ -993,8 +1021,9 @@ const upb_MiniTable google__protobuf__FeatureSet_msg_init = { #endif }; -static const upb_MiniTableSub google_protobuf_FeatureSetDefaults_submsgs[3] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init}, +const upb_MiniTable* google__protobuf__FeatureSet_msg_init_ptr = &google__protobuf__FeatureSet_msg_init; +static const upb_MiniTableSubInternal google_protobuf_FeatureSetDefaults_submsgs[3] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init_ptr}, {.UPB_PRIVATE(subenum) = &google_protobuf_Edition_enum_init}, {.UPB_PRIVATE(subenum) = &google_protobuf_Edition_enum_init}, }; @@ -1018,9 +1047,10 @@ const upb_MiniTable google__protobuf__FeatureSetDefaults_msg_init = { }) }; -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}, +const upb_MiniTable* google__protobuf__FeatureSetDefaults_msg_init_ptr = &google__protobuf__FeatureSetDefaults_msg_init; +static const upb_MiniTableSubInternal google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_submsgs[3] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr}, {.UPB_PRIVATE(subenum) = &google_protobuf_Edition_enum_init}, }; @@ -1039,8 +1069,9 @@ const upb_MiniTable google__protobuf__FeatureSetDefaults__FeatureSetEditionDefau #endif }; -static const upb_MiniTableSub google_protobuf_SourceCodeInfo_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__SourceCodeInfo__Location_msg_init}, +const upb_MiniTable* google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init_ptr = &google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init; +static const upb_MiniTableSubInternal google_protobuf_SourceCodeInfo_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__SourceCodeInfo__Location_msg_init_ptr}, }; static const upb_MiniTableField google_protobuf_SourceCodeInfo__fields[1] = { @@ -1060,6 +1091,7 @@ const upb_MiniTable google__protobuf__SourceCodeInfo_msg_init = { }) }; +const upb_MiniTable* google__protobuf__SourceCodeInfo_msg_init_ptr = &google__protobuf__SourceCodeInfo_msg_init; static const upb_MiniTableField google_protobuf_SourceCodeInfo_Location__fields[5] = { {1, 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)}, {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, @@ -1087,8 +1119,9 @@ const upb_MiniTable google__protobuf__SourceCodeInfo__Location_msg_init = { }) }; -static const upb_MiniTableSub google_protobuf_GeneratedCodeInfo_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__GeneratedCodeInfo__Annotation_msg_init}, +const upb_MiniTable* google__protobuf__SourceCodeInfo__Location_msg_init_ptr = &google__protobuf__SourceCodeInfo__Location_msg_init; +static const upb_MiniTableSubInternal google_protobuf_GeneratedCodeInfo_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__GeneratedCodeInfo__Annotation_msg_init_ptr}, }; static const upb_MiniTableField google_protobuf_GeneratedCodeInfo__fields[1] = { @@ -1108,7 +1141,8 @@ const upb_MiniTable google__protobuf__GeneratedCodeInfo_msg_init = { }) }; -static const upb_MiniTableSub google_protobuf_GeneratedCodeInfo_Annotation_submsgs[1] = { +const upb_MiniTable* google__protobuf__GeneratedCodeInfo_msg_init_ptr = &google__protobuf__GeneratedCodeInfo_msg_init; +static const upb_MiniTableSubInternal google_protobuf_GeneratedCodeInfo_Annotation_submsgs[1] = { {.UPB_PRIVATE(subenum) = &google_protobuf_GeneratedCodeInfo_Annotation_Semantic_enum_init}, }; @@ -1133,42 +1167,7 @@ const upb_MiniTable google__protobuf__GeneratedCodeInfo__Annotation_msg_init = { }) }; -static const upb_MiniTable *messages_layout[33] = { - &google__protobuf__FileDescriptorSet_msg_init, - &google__protobuf__FileDescriptorProto_msg_init, - &google__protobuf__DescriptorProto_msg_init, - &google__protobuf__DescriptorProto__ExtensionRange_msg_init, - &google__protobuf__DescriptorProto__ReservedRange_msg_init, - &google__protobuf__ExtensionRangeOptions_msg_init, - &google__protobuf__ExtensionRangeOptions__Declaration_msg_init, - &google__protobuf__FieldDescriptorProto_msg_init, - &google__protobuf__OneofDescriptorProto_msg_init, - &google__protobuf__EnumDescriptorProto_msg_init, - &google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init, - &google__protobuf__EnumValueDescriptorProto_msg_init, - &google__protobuf__ServiceDescriptorProto_msg_init, - &google__protobuf__MethodDescriptorProto_msg_init, - &google__protobuf__FileOptions_msg_init, - &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, - &google__protobuf__ServiceOptions_msg_init, - &google__protobuf__MethodOptions_msg_init, - &google__protobuf__UninterpretedOption_msg_init, - &google__protobuf__UninterpretedOption__NamePart_msg_init, - &google__protobuf__FeatureSet_msg_init, - &google__protobuf__FeatureSetDefaults_msg_init, - &google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init, - &google__protobuf__SourceCodeInfo_msg_init, - &google__protobuf__SourceCodeInfo__Location_msg_init, - &google__protobuf__GeneratedCodeInfo_msg_init, - &google__protobuf__GeneratedCodeInfo__Annotation_msg_init, -}; - +const upb_MiniTable* google__protobuf__GeneratedCodeInfo__Annotation_msg_init_ptr = &google__protobuf__GeneratedCodeInfo__Annotation_msg_init; const upb_MiniTableEnum google_protobuf_Edition_enum_init = { 64, 9, @@ -1331,6 +1330,42 @@ const upb_MiniTableEnum google_protobuf_MethodOptions_IdempotencyLevel_enum_init }, }; +static const upb_MiniTable *messages_layout[33] = { + &google__protobuf__FileDescriptorSet_msg_init, + &google__protobuf__FileDescriptorProto_msg_init, + &google__protobuf__DescriptorProto_msg_init, + &google__protobuf__DescriptorProto__ExtensionRange_msg_init, + &google__protobuf__DescriptorProto__ReservedRange_msg_init, + &google__protobuf__ExtensionRangeOptions_msg_init, + &google__protobuf__ExtensionRangeOptions__Declaration_msg_init, + &google__protobuf__FieldDescriptorProto_msg_init, + &google__protobuf__OneofDescriptorProto_msg_init, + &google__protobuf__EnumDescriptorProto_msg_init, + &google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init, + &google__protobuf__EnumValueDescriptorProto_msg_init, + &google__protobuf__ServiceDescriptorProto_msg_init, + &google__protobuf__MethodDescriptorProto_msg_init, + &google__protobuf__FileOptions_msg_init, + &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, + &google__protobuf__ServiceOptions_msg_init, + &google__protobuf__MethodOptions_msg_init, + &google__protobuf__UninterpretedOption_msg_init, + &google__protobuf__UninterpretedOption__NamePart_msg_init, + &google__protobuf__FeatureSet_msg_init, + &google__protobuf__FeatureSetDefaults_msg_init, + &google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init, + &google__protobuf__SourceCodeInfo_msg_init, + &google__protobuf__SourceCodeInfo__Location_msg_init, + &google__protobuf__GeneratedCodeInfo_msg_init, + &google__protobuf__GeneratedCodeInfo__Annotation_msg_init, +}; + static const upb_MiniTableEnum *enums_layout[17] = { &google_protobuf_Edition_enum_init, &google_protobuf_ExtensionRangeOptions_VerificationState_enum_init, diff --git a/src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.h b/src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.h index f48a64df658..6cb83ecedcc 100644 --- a/src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.h +++ b/src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.h @@ -3,7 +3,8 @@ * google/protobuf/descriptor.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_MINITABLE_H_ #define GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_MINITABLE_H_ @@ -18,38 +19,71 @@ extern "C" { #endif extern const upb_MiniTable google__protobuf__FileDescriptorSet_msg_init; +extern const upb_MiniTable* google__protobuf__FileDescriptorSet_msg_init_ptr; extern const upb_MiniTable google__protobuf__FileDescriptorProto_msg_init; +extern const upb_MiniTable* google__protobuf__FileDescriptorProto_msg_init_ptr; extern const upb_MiniTable google__protobuf__DescriptorProto_msg_init; +extern const upb_MiniTable* google__protobuf__DescriptorProto_msg_init_ptr; extern const upb_MiniTable google__protobuf__DescriptorProto__ExtensionRange_msg_init; +extern const upb_MiniTable* google__protobuf__DescriptorProto__ExtensionRange_msg_init_ptr; extern const upb_MiniTable google__protobuf__DescriptorProto__ReservedRange_msg_init; +extern const upb_MiniTable* google__protobuf__DescriptorProto__ReservedRange_msg_init_ptr; extern const upb_MiniTable google__protobuf__ExtensionRangeOptions_msg_init; +extern const upb_MiniTable* google__protobuf__ExtensionRangeOptions_msg_init_ptr; extern const upb_MiniTable google__protobuf__ExtensionRangeOptions__Declaration_msg_init; +extern const upb_MiniTable* google__protobuf__ExtensionRangeOptions__Declaration_msg_init_ptr; extern const upb_MiniTable google__protobuf__FieldDescriptorProto_msg_init; +extern const upb_MiniTable* google__protobuf__FieldDescriptorProto_msg_init_ptr; extern const upb_MiniTable google__protobuf__OneofDescriptorProto_msg_init; +extern const upb_MiniTable* google__protobuf__OneofDescriptorProto_msg_init_ptr; extern const upb_MiniTable google__protobuf__EnumDescriptorProto_msg_init; +extern const upb_MiniTable* google__protobuf__EnumDescriptorProto_msg_init_ptr; extern const upb_MiniTable google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init; +extern const upb_MiniTable* google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init_ptr; extern const upb_MiniTable google__protobuf__EnumValueDescriptorProto_msg_init; +extern const upb_MiniTable* google__protobuf__EnumValueDescriptorProto_msg_init_ptr; extern const upb_MiniTable google__protobuf__ServiceDescriptorProto_msg_init; +extern const upb_MiniTable* google__protobuf__ServiceDescriptorProto_msg_init_ptr; extern const upb_MiniTable google__protobuf__MethodDescriptorProto_msg_init; +extern const upb_MiniTable* google__protobuf__MethodDescriptorProto_msg_init_ptr; extern const upb_MiniTable google__protobuf__FileOptions_msg_init; +extern const upb_MiniTable* google__protobuf__FileOptions_msg_init_ptr; extern const upb_MiniTable google__protobuf__MessageOptions_msg_init; +extern const upb_MiniTable* google__protobuf__MessageOptions_msg_init_ptr; extern const upb_MiniTable google__protobuf__FieldOptions_msg_init; +extern const upb_MiniTable* google__protobuf__FieldOptions_msg_init_ptr; extern const upb_MiniTable google__protobuf__FieldOptions__EditionDefault_msg_init; +extern const upb_MiniTable* google__protobuf__FieldOptions__EditionDefault_msg_init_ptr; extern const upb_MiniTable google__protobuf__FieldOptions__FeatureSupport_msg_init; +extern const upb_MiniTable* google__protobuf__FieldOptions__FeatureSupport_msg_init_ptr; extern const upb_MiniTable google__protobuf__OneofOptions_msg_init; +extern const upb_MiniTable* google__protobuf__OneofOptions_msg_init_ptr; extern const upb_MiniTable google__protobuf__EnumOptions_msg_init; +extern const upb_MiniTable* google__protobuf__EnumOptions_msg_init_ptr; extern const upb_MiniTable google__protobuf__EnumValueOptions_msg_init; +extern const upb_MiniTable* google__protobuf__EnumValueOptions_msg_init_ptr; extern const upb_MiniTable google__protobuf__ServiceOptions_msg_init; +extern const upb_MiniTable* google__protobuf__ServiceOptions_msg_init_ptr; extern const upb_MiniTable google__protobuf__MethodOptions_msg_init; +extern const upb_MiniTable* google__protobuf__MethodOptions_msg_init_ptr; extern const upb_MiniTable google__protobuf__UninterpretedOption_msg_init; +extern const upb_MiniTable* google__protobuf__UninterpretedOption_msg_init_ptr; extern const upb_MiniTable google__protobuf__UninterpretedOption__NamePart_msg_init; +extern const upb_MiniTable* google__protobuf__UninterpretedOption__NamePart_msg_init_ptr; extern const upb_MiniTable google__protobuf__FeatureSet_msg_init; +extern const upb_MiniTable* google__protobuf__FeatureSet_msg_init_ptr; extern const upb_MiniTable google__protobuf__FeatureSetDefaults_msg_init; +extern const upb_MiniTable* google__protobuf__FeatureSetDefaults_msg_init_ptr; extern const upb_MiniTable google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init; +extern const upb_MiniTable* google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init_ptr; extern const upb_MiniTable google__protobuf__SourceCodeInfo_msg_init; +extern const upb_MiniTable* google__protobuf__SourceCodeInfo_msg_init_ptr; extern const upb_MiniTable google__protobuf__SourceCodeInfo__Location_msg_init; +extern const upb_MiniTable* google__protobuf__SourceCodeInfo__Location_msg_init_ptr; extern const upb_MiniTable google__protobuf__GeneratedCodeInfo_msg_init; +extern const upb_MiniTable* google__protobuf__GeneratedCodeInfo_msg_init_ptr; extern const upb_MiniTable google__protobuf__GeneratedCodeInfo__Annotation_msg_init; +extern const upb_MiniTable* google__protobuf__GeneratedCodeInfo__Annotation_msg_init_ptr; extern const upb_MiniTableEnum google_protobuf_Edition_enum_init; extern const upb_MiniTableEnum google_protobuf_ExtensionRangeOptions_VerificationState_enum_init; diff --git a/src/core/ext/upb-gen/google/protobuf/duration.upb.h b/src/core/ext/upb-gen/google/protobuf/duration.upb.h index 87c825cccf0..5e008707761 100644 --- a/src/core/ext/upb-gen/google/protobuf/duration.upb.h +++ b/src/core/ext/upb-gen/google/protobuf/duration.upb.h @@ -3,7 +3,8 @@ * google/protobuf/duration.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef GOOGLE_PROTOBUF_DURATION_PROTO_UPB_H_ #define GOOGLE_PROTOBUF_DURATION_PROTO_UPB_H_ diff --git a/src/core/ext/upb-gen/google/protobuf/duration.upb_minitable.c b/src/core/ext/upb-gen/google/protobuf/duration.upb_minitable.c index 75ac19d03a5..a868fded4d5 100644 --- a/src/core/ext/upb-gen/google/protobuf/duration.upb_minitable.c +++ b/src/core/ext/upb-gen/google/protobuf/duration.upb_minitable.c @@ -3,7 +3,8 @@ * google/protobuf/duration.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -12,6 +13,7 @@ // Must be last. #include "upb/port/def.inc" +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); static const upb_MiniTableField google_protobuf_Duration__fields[2] = { {1, 16, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, {2, 8, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, @@ -32,6 +34,7 @@ const upb_MiniTable google__protobuf__Duration_msg_init = { }) }; +const upb_MiniTable* google__protobuf__Duration_msg_init_ptr = &google__protobuf__Duration_msg_init; static const upb_MiniTable *messages_layout[1] = { &google__protobuf__Duration_msg_init, }; diff --git a/src/core/ext/upb-gen/google/protobuf/duration.upb_minitable.h b/src/core/ext/upb-gen/google/protobuf/duration.upb_minitable.h index 24a02156c1a..c42e329b8ca 100644 --- a/src/core/ext/upb-gen/google/protobuf/duration.upb_minitable.h +++ b/src/core/ext/upb-gen/google/protobuf/duration.upb_minitable.h @@ -3,7 +3,8 @@ * google/protobuf/duration.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef GOOGLE_PROTOBUF_DURATION_PROTO_UPB_MINITABLE_H_ #define GOOGLE_PROTOBUF_DURATION_PROTO_UPB_MINITABLE_H_ @@ -18,6 +19,7 @@ extern "C" { #endif extern const upb_MiniTable google__protobuf__Duration_msg_init; +extern const upb_MiniTable* google__protobuf__Duration_msg_init_ptr; extern const upb_MiniTableFile google_protobuf_duration_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/google/protobuf/empty.upb.h b/src/core/ext/upb-gen/google/protobuf/empty.upb.h index c2d8e5304d3..04b07d5fbec 100644 --- a/src/core/ext/upb-gen/google/protobuf/empty.upb.h +++ b/src/core/ext/upb-gen/google/protobuf/empty.upb.h @@ -3,7 +3,8 @@ * google/protobuf/empty.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef GOOGLE_PROTOBUF_EMPTY_PROTO_UPB_H_ #define GOOGLE_PROTOBUF_EMPTY_PROTO_UPB_H_ diff --git a/src/core/ext/upb-gen/google/protobuf/empty.upb_minitable.c b/src/core/ext/upb-gen/google/protobuf/empty.upb_minitable.c index 89c53e4fd87..4c5ab6256bc 100644 --- a/src/core/ext/upb-gen/google/protobuf/empty.upb_minitable.c +++ b/src/core/ext/upb-gen/google/protobuf/empty.upb_minitable.c @@ -3,7 +3,8 @@ * google/protobuf/empty.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -12,6 +13,7 @@ // Must be last. #include "upb/port/def.inc" +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); const upb_MiniTable google__protobuf__Empty_msg_init = { NULL, NULL, @@ -21,6 +23,7 @@ const upb_MiniTable google__protobuf__Empty_msg_init = { #endif }; +const upb_MiniTable* google__protobuf__Empty_msg_init_ptr = &google__protobuf__Empty_msg_init; static const upb_MiniTable *messages_layout[1] = { &google__protobuf__Empty_msg_init, }; diff --git a/src/core/ext/upb-gen/google/protobuf/empty.upb_minitable.h b/src/core/ext/upb-gen/google/protobuf/empty.upb_minitable.h index f3fcccc641a..d8fbbf178b2 100644 --- a/src/core/ext/upb-gen/google/protobuf/empty.upb_minitable.h +++ b/src/core/ext/upb-gen/google/protobuf/empty.upb_minitable.h @@ -3,7 +3,8 @@ * google/protobuf/empty.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef GOOGLE_PROTOBUF_EMPTY_PROTO_UPB_MINITABLE_H_ #define GOOGLE_PROTOBUF_EMPTY_PROTO_UPB_MINITABLE_H_ @@ -18,6 +19,7 @@ extern "C" { #endif extern const upb_MiniTable google__protobuf__Empty_msg_init; +extern const upb_MiniTable* google__protobuf__Empty_msg_init_ptr; extern const upb_MiniTableFile google_protobuf_empty_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/google/protobuf/struct.upb.h b/src/core/ext/upb-gen/google/protobuf/struct.upb.h index 19b51848dd4..3db6323079c 100644 --- a/src/core/ext/upb-gen/google/protobuf/struct.upb.h +++ b/src/core/ext/upb-gen/google/protobuf/struct.upb.h @@ -3,7 +3,8 @@ * google/protobuf/struct.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef GOOGLE_PROTOBUF_STRUCT_PROTO_UPB_H_ #define GOOGLE_PROTOBUF_STRUCT_PROTO_UPB_H_ @@ -77,22 +78,30 @@ UPB_INLINE size_t google_protobuf_Struct_fields_size(const google_protobuf_Struc } UPB_INLINE bool google_protobuf_Struct_fields_get(const google_protobuf_Struct* msg, upb_StringView key, google_protobuf_Value** val) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Struct__FieldsEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Value_msg_init); 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 google_protobuf_Struct_FieldsEntry* google_protobuf_Struct_fields_next(const google_protobuf_Struct* msg, size_t* iter) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Struct__FieldsEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Value_msg_init); const upb_Map* map = upb_Message_GetMap(UPB_UPCAST(msg), &field); if (!map) return NULL; return (const google_protobuf_Struct_FieldsEntry*)_upb_map_next(map, iter); } UPB_INLINE const upb_Map* _google_protobuf_Struct_fields_upb_map(google_protobuf_Struct* msg) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Struct__FieldsEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Value_msg_init); return upb_Message_GetMap(UPB_UPCAST(msg), &field); } UPB_INLINE upb_Map* _google_protobuf_Struct_fields_mutable_upb_map(google_protobuf_Struct* msg, upb_Arena* a) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Struct__FieldsEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Value_msg_init); return _upb_Message_GetOrCreateMutableMap(UPB_UPCAST(msg), &field, 0, sizeof(google_protobuf_Value*), a); } @@ -104,6 +113,8 @@ UPB_INLINE void google_protobuf_Struct_fields_clear(google_protobuf_Struct* msg) } UPB_INLINE bool google_protobuf_Struct_fields_set(google_protobuf_Struct* msg, upb_StringView key, google_protobuf_Value* val, upb_Arena* a) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Struct__FieldsEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Value_msg_init); 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) != @@ -117,6 +128,8 @@ UPB_INLINE bool google_protobuf_Struct_fields_delete(google_protobuf_Struct* msg } UPB_INLINE google_protobuf_Struct_FieldsEntry* google_protobuf_Struct_fields_nextmutable(google_protobuf_Struct* msg, size_t* iter) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Struct__FieldsEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Value_msg_init); upb_Map* map = (upb_Map*)upb_Message_GetMap(UPB_UPCAST(msg), &field); if (!map) return NULL; return (google_protobuf_Struct_FieldsEntry*)_upb_map_next(map, iter); @@ -265,6 +278,7 @@ UPB_INLINE const google_protobuf_Struct* google_protobuf_Value_struct_value(cons const google_protobuf_Struct* default_val = NULL; const google_protobuf_Struct* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Struct_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -281,6 +295,7 @@ UPB_INLINE const google_protobuf_ListValue* google_protobuf_Value_list_value(con const google_protobuf_ListValue* default_val = NULL; const google_protobuf_ListValue* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__ListValue_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -308,6 +323,7 @@ UPB_INLINE void google_protobuf_Value_set_bool_value(google_protobuf_Value *msg, } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Struct_msg_init); 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) { @@ -320,6 +336,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__ListValue_msg_init); 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) { @@ -373,6 +390,7 @@ UPB_INLINE void google_protobuf_ListValue_clear_values(google_protobuf_ListValue } UPB_INLINE const google_protobuf_Value* const* google_protobuf_ListValue_values(const google_protobuf_ListValue* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Value_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -384,6 +402,7 @@ UPB_INLINE const google_protobuf_Value* const* google_protobuf_ListValue_values( } UPB_INLINE const upb_Array* _google_protobuf_ListValue_values_upb_array(const google_protobuf_ListValue* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Value_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -392,6 +411,7 @@ UPB_INLINE const upb_Array* _google_protobuf_ListValue_values_upb_array(const go } UPB_INLINE upb_Array* _google_protobuf_ListValue_values_mutable_upb_array(google_protobuf_ListValue* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Value_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -402,6 +422,7 @@ UPB_INLINE upb_Array* _google_protobuf_ListValue_values_mutable_upb_array(google UPB_INLINE google_protobuf_Value** google_protobuf_ListValue_mutable_values(google_protobuf_ListValue* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Value_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -418,6 +439,7 @@ UPB_INLINE google_protobuf_Value** google_protobuf_ListValue_resize_values(googl } UPB_INLINE struct google_protobuf_Value* google_protobuf_ListValue_add_values(google_protobuf_ListValue* msg, upb_Arena* arena) { upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Value_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( diff --git a/src/core/ext/upb-gen/google/protobuf/struct.upb_minitable.c b/src/core/ext/upb-gen/google/protobuf/struct.upb_minitable.c index 514d9755bde..73f4fcb849c 100644 --- a/src/core/ext/upb-gen/google/protobuf/struct.upb_minitable.c +++ b/src/core/ext/upb-gen/google/protobuf/struct.upb_minitable.c @@ -3,7 +3,8 @@ * google/protobuf/struct.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -12,8 +13,9 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub google_protobuf_Struct_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__Struct__FieldsEntry_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal google_protobuf_Struct_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Struct__FieldsEntry_msg_init_ptr}, }; static const upb_MiniTableField google_protobuf_Struct__fields[1] = { @@ -29,8 +31,9 @@ const upb_MiniTable google__protobuf__Struct_msg_init = { #endif }; -static const upb_MiniTableSub google_protobuf_Struct_FieldsEntry_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__Value_msg_init}, +const upb_MiniTable* google__protobuf__Struct_msg_init_ptr = &google__protobuf__Struct_msg_init; +static const upb_MiniTableSubInternal google_protobuf_Struct_FieldsEntry_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Value_msg_init_ptr}, }; static const upb_MiniTableField google_protobuf_Struct_FieldsEntry__fields[2] = { @@ -51,9 +54,10 @@ const upb_MiniTable google__protobuf__Struct__FieldsEntry_msg_init = { }) }; -static const upb_MiniTableSub google_protobuf_Value_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__Struct_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__ListValue_msg_init}, +const upb_MiniTable* google__protobuf__Struct__FieldsEntry_msg_init_ptr = &google__protobuf__Struct__FieldsEntry_msg_init; +static const upb_MiniTableSubInternal google_protobuf_Value_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Struct_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__ListValue_msg_init_ptr}, }; static const upb_MiniTableField google_protobuf_Value__fields[6] = { @@ -84,8 +88,9 @@ const upb_MiniTable google__protobuf__Value_msg_init = { }) }; -static const upb_MiniTableSub google_protobuf_ListValue_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__Value_msg_init}, +const upb_MiniTable* google__protobuf__Value_msg_init_ptr = &google__protobuf__Value_msg_init; +static const upb_MiniTableSubInternal google_protobuf_ListValue_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Value_msg_init_ptr}, }; static const upb_MiniTableField google_protobuf_ListValue__fields[1] = { @@ -105,6 +110,7 @@ const upb_MiniTable google__protobuf__ListValue_msg_init = { }) }; +const upb_MiniTable* google__protobuf__ListValue_msg_init_ptr = &google__protobuf__ListValue_msg_init; static const upb_MiniTable *messages_layout[4] = { &google__protobuf__Struct_msg_init, &google__protobuf__Struct__FieldsEntry_msg_init, diff --git a/src/core/ext/upb-gen/google/protobuf/struct.upb_minitable.h b/src/core/ext/upb-gen/google/protobuf/struct.upb_minitable.h index 0f52e89b497..36250455eb6 100644 --- a/src/core/ext/upb-gen/google/protobuf/struct.upb_minitable.h +++ b/src/core/ext/upb-gen/google/protobuf/struct.upb_minitable.h @@ -3,7 +3,8 @@ * google/protobuf/struct.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef GOOGLE_PROTOBUF_STRUCT_PROTO_UPB_MINITABLE_H_ #define GOOGLE_PROTOBUF_STRUCT_PROTO_UPB_MINITABLE_H_ @@ -18,9 +19,13 @@ extern "C" { #endif extern const upb_MiniTable google__protobuf__Struct_msg_init; +extern const upb_MiniTable* google__protobuf__Struct_msg_init_ptr; extern const upb_MiniTable google__protobuf__Struct__FieldsEntry_msg_init; +extern const upb_MiniTable* google__protobuf__Struct__FieldsEntry_msg_init_ptr; extern const upb_MiniTable google__protobuf__Value_msg_init; +extern const upb_MiniTable* google__protobuf__Value_msg_init_ptr; extern const upb_MiniTable google__protobuf__ListValue_msg_init; +extern const upb_MiniTable* google__protobuf__ListValue_msg_init_ptr; extern const upb_MiniTableFile google_protobuf_struct_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/google/protobuf/timestamp.upb.h b/src/core/ext/upb-gen/google/protobuf/timestamp.upb.h index 9ac16177dc3..9a60829884a 100644 --- a/src/core/ext/upb-gen/google/protobuf/timestamp.upb.h +++ b/src/core/ext/upb-gen/google/protobuf/timestamp.upb.h @@ -3,7 +3,8 @@ * google/protobuf/timestamp.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef GOOGLE_PROTOBUF_TIMESTAMP_PROTO_UPB_H_ #define GOOGLE_PROTOBUF_TIMESTAMP_PROTO_UPB_H_ diff --git a/src/core/ext/upb-gen/google/protobuf/timestamp.upb_minitable.c b/src/core/ext/upb-gen/google/protobuf/timestamp.upb_minitable.c index c18cf11f95b..8c7c68256ce 100644 --- a/src/core/ext/upb-gen/google/protobuf/timestamp.upb_minitable.c +++ b/src/core/ext/upb-gen/google/protobuf/timestamp.upb_minitable.c @@ -3,7 +3,8 @@ * google/protobuf/timestamp.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -12,6 +13,7 @@ // Must be last. #include "upb/port/def.inc" +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); static const upb_MiniTableField google_protobuf_Timestamp__fields[2] = { {1, 16, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, {2, 8, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, @@ -32,6 +34,7 @@ const upb_MiniTable google__protobuf__Timestamp_msg_init = { }) }; +const upb_MiniTable* google__protobuf__Timestamp_msg_init_ptr = &google__protobuf__Timestamp_msg_init; static const upb_MiniTable *messages_layout[1] = { &google__protobuf__Timestamp_msg_init, }; diff --git a/src/core/ext/upb-gen/google/protobuf/timestamp.upb_minitable.h b/src/core/ext/upb-gen/google/protobuf/timestamp.upb_minitable.h index 6aaecbf6cb8..cf8d2153534 100644 --- a/src/core/ext/upb-gen/google/protobuf/timestamp.upb_minitable.h +++ b/src/core/ext/upb-gen/google/protobuf/timestamp.upb_minitable.h @@ -3,7 +3,8 @@ * google/protobuf/timestamp.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef GOOGLE_PROTOBUF_TIMESTAMP_PROTO_UPB_MINITABLE_H_ #define GOOGLE_PROTOBUF_TIMESTAMP_PROTO_UPB_MINITABLE_H_ @@ -18,6 +19,7 @@ extern "C" { #endif extern const upb_MiniTable google__protobuf__Timestamp_msg_init; +extern const upb_MiniTable* google__protobuf__Timestamp_msg_init_ptr; extern const upb_MiniTableFile google_protobuf_timestamp_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/google/protobuf/wrappers.upb.h b/src/core/ext/upb-gen/google/protobuf/wrappers.upb.h index d31a8e4d4cb..3c2e586c39f 100644 --- a/src/core/ext/upb-gen/google/protobuf/wrappers.upb.h +++ b/src/core/ext/upb-gen/google/protobuf/wrappers.upb.h @@ -3,7 +3,8 @@ * google/protobuf/wrappers.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef GOOGLE_PROTOBUF_WRAPPERS_PROTO_UPB_H_ #define GOOGLE_PROTOBUF_WRAPPERS_PROTO_UPB_H_ diff --git a/src/core/ext/upb-gen/google/protobuf/wrappers.upb_minitable.c b/src/core/ext/upb-gen/google/protobuf/wrappers.upb_minitable.c index 57a4aa75043..98d0780d2f4 100644 --- a/src/core/ext/upb-gen/google/protobuf/wrappers.upb_minitable.c +++ b/src/core/ext/upb-gen/google/protobuf/wrappers.upb_minitable.c @@ -3,7 +3,8 @@ * google/protobuf/wrappers.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -12,6 +13,7 @@ // Must be last. #include "upb/port/def.inc" +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); static const upb_MiniTableField google_protobuf_DoubleValue__fields[1] = { {1, 8, 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, }; @@ -29,6 +31,7 @@ const upb_MiniTable google__protobuf__DoubleValue_msg_init = { }) }; +const upb_MiniTable* google__protobuf__DoubleValue_msg_init_ptr = &google__protobuf__DoubleValue_msg_init; static const upb_MiniTableField google_protobuf_FloatValue__fields[1] = { {1, 8, 0, kUpb_NoSub, 2, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, }; @@ -46,6 +49,7 @@ const upb_MiniTable google__protobuf__FloatValue_msg_init = { }) }; +const upb_MiniTable* google__protobuf__FloatValue_msg_init_ptr = &google__protobuf__FloatValue_msg_init; static const upb_MiniTableField google_protobuf_Int64Value__fields[1] = { {1, 8, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, }; @@ -63,6 +67,7 @@ const upb_MiniTable google__protobuf__Int64Value_msg_init = { }) }; +const upb_MiniTable* google__protobuf__Int64Value_msg_init_ptr = &google__protobuf__Int64Value_msg_init; static const upb_MiniTableField google_protobuf_UInt64Value__fields[1] = { {1, 8, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, }; @@ -80,6 +85,7 @@ const upb_MiniTable google__protobuf__UInt64Value_msg_init = { }) }; +const upb_MiniTable* google__protobuf__UInt64Value_msg_init_ptr = &google__protobuf__UInt64Value_msg_init; static const upb_MiniTableField google_protobuf_Int32Value__fields[1] = { {1, 8, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, }; @@ -97,6 +103,7 @@ const upb_MiniTable google__protobuf__Int32Value_msg_init = { }) }; +const upb_MiniTable* google__protobuf__Int32Value_msg_init_ptr = &google__protobuf__Int32Value_msg_init; static const upb_MiniTableField google_protobuf_UInt32Value__fields[1] = { {1, 8, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, }; @@ -114,6 +121,7 @@ const upb_MiniTable google__protobuf__UInt32Value_msg_init = { }) }; +const upb_MiniTable* google__protobuf__UInt32Value_msg_init_ptr = &google__protobuf__UInt32Value_msg_init; static const upb_MiniTableField google_protobuf_BoolValue__fields[1] = { {1, 8, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, }; @@ -131,6 +139,7 @@ const upb_MiniTable google__protobuf__BoolValue_msg_init = { }) }; +const upb_MiniTable* google__protobuf__BoolValue_msg_init_ptr = &google__protobuf__BoolValue_msg_init; static const upb_MiniTableField google_protobuf_StringValue__fields[1] = { {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, }; @@ -148,6 +157,7 @@ const upb_MiniTable google__protobuf__StringValue_msg_init = { }) }; +const upb_MiniTable* google__protobuf__StringValue_msg_init_ptr = &google__protobuf__StringValue_msg_init; static const upb_MiniTableField google_protobuf_BytesValue__fields[1] = { {1, 8, 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, }; @@ -165,6 +175,7 @@ const upb_MiniTable google__protobuf__BytesValue_msg_init = { }) }; +const upb_MiniTable* google__protobuf__BytesValue_msg_init_ptr = &google__protobuf__BytesValue_msg_init; static const upb_MiniTable *messages_layout[9] = { &google__protobuf__DoubleValue_msg_init, &google__protobuf__FloatValue_msg_init, diff --git a/src/core/ext/upb-gen/google/protobuf/wrappers.upb_minitable.h b/src/core/ext/upb-gen/google/protobuf/wrappers.upb_minitable.h index 38ea22f3239..ec2393e765f 100644 --- a/src/core/ext/upb-gen/google/protobuf/wrappers.upb_minitable.h +++ b/src/core/ext/upb-gen/google/protobuf/wrappers.upb_minitable.h @@ -3,7 +3,8 @@ * google/protobuf/wrappers.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef GOOGLE_PROTOBUF_WRAPPERS_PROTO_UPB_MINITABLE_H_ #define GOOGLE_PROTOBUF_WRAPPERS_PROTO_UPB_MINITABLE_H_ @@ -18,14 +19,23 @@ extern "C" { #endif extern const upb_MiniTable google__protobuf__DoubleValue_msg_init; +extern const upb_MiniTable* google__protobuf__DoubleValue_msg_init_ptr; extern const upb_MiniTable google__protobuf__FloatValue_msg_init; +extern const upb_MiniTable* google__protobuf__FloatValue_msg_init_ptr; extern const upb_MiniTable google__protobuf__Int64Value_msg_init; +extern const upb_MiniTable* google__protobuf__Int64Value_msg_init_ptr; extern const upb_MiniTable google__protobuf__UInt64Value_msg_init; +extern const upb_MiniTable* google__protobuf__UInt64Value_msg_init_ptr; extern const upb_MiniTable google__protobuf__Int32Value_msg_init; +extern const upb_MiniTable* google__protobuf__Int32Value_msg_init_ptr; extern const upb_MiniTable google__protobuf__UInt32Value_msg_init; +extern const upb_MiniTable* google__protobuf__UInt32Value_msg_init_ptr; extern const upb_MiniTable google__protobuf__BoolValue_msg_init; +extern const upb_MiniTable* google__protobuf__BoolValue_msg_init_ptr; extern const upb_MiniTable google__protobuf__StringValue_msg_init; +extern const upb_MiniTable* google__protobuf__StringValue_msg_init_ptr; extern const upb_MiniTable google__protobuf__BytesValue_msg_init; +extern const upb_MiniTable* google__protobuf__BytesValue_msg_init_ptr; extern const upb_MiniTableFile google_protobuf_wrappers_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/google/rpc/status.upb.h b/src/core/ext/upb-gen/google/rpc/status.upb.h index 6c435f4f683..c2dcbbb9143 100644 --- a/src/core/ext/upb-gen/google/rpc/status.upb.h +++ b/src/core/ext/upb-gen/google/rpc/status.upb.h @@ -3,7 +3,8 @@ * google/rpc/status.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef GOOGLE_RPC_STATUS_PROTO_UPB_H_ #define GOOGLE_RPC_STATUS_PROTO_UPB_H_ @@ -92,6 +93,7 @@ UPB_INLINE void google_rpc_Status_clear_details(google_rpc_Status* msg) { } UPB_INLINE const struct google_protobuf_Any* const* google_rpc_Status_details(const google_rpc_Status* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -103,6 +105,7 @@ UPB_INLINE const struct google_protobuf_Any* const* google_rpc_Status_details(co } UPB_INLINE const upb_Array* _google_rpc_Status_details_upb_array(const google_rpc_Status* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -111,6 +114,7 @@ UPB_INLINE const upb_Array* _google_rpc_Status_details_upb_array(const google_rp } UPB_INLINE upb_Array* _google_rpc_Status_details_mutable_upb_array(google_rpc_Status* msg, size_t* size, upb_Arena* arena) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -129,6 +133,7 @@ UPB_INLINE void google_rpc_Status_set_message(google_rpc_Status *msg, upb_String } 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -145,6 +150,7 @@ UPB_INLINE struct google_protobuf_Any** google_rpc_Status_resize_details(google_ } UPB_INLINE struct google_protobuf_Any* google_rpc_Status_add_details(google_rpc_Status* msg, upb_Arena* arena) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( diff --git a/src/core/ext/upb-gen/google/rpc/status.upb_minitable.c b/src/core/ext/upb-gen/google/rpc/status.upb_minitable.c index 9db3b290151..120c6efd79a 100644 --- a/src/core/ext/upb-gen/google/rpc/status.upb_minitable.c +++ b/src/core/ext/upb-gen/google/rpc/status.upb_minitable.c @@ -3,7 +3,8 @@ * google/rpc/status.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -13,8 +14,9 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub google_rpc_Status_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal google_rpc_Status_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, }; static const upb_MiniTableField google_rpc_Status__fields[3] = { @@ -38,6 +40,7 @@ const upb_MiniTable google__rpc__Status_msg_init = { }) }; +const upb_MiniTable* google__rpc__Status_msg_init_ptr = &google__rpc__Status_msg_init; static const upb_MiniTable *messages_layout[1] = { &google__rpc__Status_msg_init, }; diff --git a/src/core/ext/upb-gen/google/rpc/status.upb_minitable.h b/src/core/ext/upb-gen/google/rpc/status.upb_minitable.h index bcd12d149e5..c9ef7fabab0 100644 --- a/src/core/ext/upb-gen/google/rpc/status.upb_minitable.h +++ b/src/core/ext/upb-gen/google/rpc/status.upb_minitable.h @@ -3,7 +3,8 @@ * google/rpc/status.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef GOOGLE_RPC_STATUS_PROTO_UPB_MINITABLE_H_ #define GOOGLE_RPC_STATUS_PROTO_UPB_MINITABLE_H_ @@ -18,6 +19,7 @@ extern "C" { #endif extern const upb_MiniTable google__rpc__Status_msg_init; +extern const upb_MiniTable* google__rpc__Status_msg_init_ptr; extern const upb_MiniTableFile google_rpc_status_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/opencensus/proto/trace/v1/trace_config.upb.h b/src/core/ext/upb-gen/opencensus/proto/trace/v1/trace_config.upb.h index ab7f12d2079..3c91e2f5100 100644 --- a/src/core/ext/upb-gen/opencensus/proto/trace/v1/trace_config.upb.h +++ b/src/core/ext/upb-gen/opencensus/proto/trace/v1/trace_config.upb.h @@ -3,7 +3,8 @@ * opencensus/proto/trace/v1/trace_config.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef OPENCENSUS_PROTO_TRACE_V1_TRACE_CONFIG_PROTO_UPB_H_ #define OPENCENSUS_PROTO_TRACE_V1_TRACE_CONFIG_PROTO_UPB_H_ @@ -87,6 +88,7 @@ UPB_INLINE const opencensus_proto_trace_v1_ProbabilitySampler* opencensus_proto_ const opencensus_proto_trace_v1_ProbabilitySampler* default_val = NULL; const opencensus_proto_trace_v1_ProbabilitySampler* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&opencensus__proto__trace__v1__ProbabilitySampler_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -103,6 +105,7 @@ UPB_INLINE const opencensus_proto_trace_v1_ConstantSampler* opencensus_proto_tra const opencensus_proto_trace_v1_ConstantSampler* default_val = NULL; const opencensus_proto_trace_v1_ConstantSampler* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&opencensus__proto__trace__v1__ConstantSampler_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -119,6 +122,7 @@ UPB_INLINE const opencensus_proto_trace_v1_RateLimitingSampler* opencensus_proto const opencensus_proto_trace_v1_RateLimitingSampler* default_val = NULL; const opencensus_proto_trace_v1_RateLimitingSampler* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&opencensus__proto__trace__v1__RateLimitingSampler_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -178,6 +182,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_PRIVATE(_upb_MiniTable_StrongReference)(&opencensus__proto__trace__v1__ProbabilitySampler_msg_init); 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) { @@ -190,6 +195,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_PRIVATE(_upb_MiniTable_StrongReference)(&opencensus__proto__trace__v1__ConstantSampler_msg_init); 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) { @@ -202,6 +208,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_PRIVATE(_upb_MiniTable_StrongReference)(&opencensus__proto__trace__v1__RateLimitingSampler_msg_init); 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) { diff --git a/src/core/ext/upb-gen/opencensus/proto/trace/v1/trace_config.upb_minitable.c b/src/core/ext/upb-gen/opencensus/proto/trace/v1/trace_config.upb_minitable.c index 7b7e5abba34..3b3d303cea0 100644 --- a/src/core/ext/upb-gen/opencensus/proto/trace/v1/trace_config.upb_minitable.c +++ b/src/core/ext/upb-gen/opencensus/proto/trace/v1/trace_config.upb_minitable.c @@ -3,7 +3,8 @@ * opencensus/proto/trace/v1/trace_config.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -12,10 +13,11 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub opencensus_proto_trace_v1_TraceConfig_submsgs[3] = { - {.UPB_PRIVATE(submsg) = &opencensus__proto__trace__v1__ProbabilitySampler_msg_init}, - {.UPB_PRIVATE(submsg) = &opencensus__proto__trace__v1__ConstantSampler_msg_init}, - {.UPB_PRIVATE(submsg) = &opencensus__proto__trace__v1__RateLimitingSampler_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal opencensus_proto_trace_v1_TraceConfig_submsgs[3] = { + {.UPB_PRIVATE(submsg) = &opencensus__proto__trace__v1__ProbabilitySampler_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &opencensus__proto__trace__v1__ConstantSampler_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &opencensus__proto__trace__v1__RateLimitingSampler_msg_init_ptr}, }; static const upb_MiniTableField opencensus_proto_trace_v1_TraceConfig__fields[7] = { @@ -47,6 +49,7 @@ const upb_MiniTable opencensus__proto__trace__v1__TraceConfig_msg_init = { }) }; +const upb_MiniTable* opencensus__proto__trace__v1__TraceConfig_msg_init_ptr = &opencensus__proto__trace__v1__TraceConfig_msg_init; static const upb_MiniTableField opencensus_proto_trace_v1_ProbabilitySampler__fields[1] = { {1, 8, 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, }; @@ -64,6 +67,7 @@ const upb_MiniTable opencensus__proto__trace__v1__ProbabilitySampler_msg_init = }) }; +const upb_MiniTable* opencensus__proto__trace__v1__ProbabilitySampler_msg_init_ptr = &opencensus__proto__trace__v1__ProbabilitySampler_msg_init; static const upb_MiniTableField opencensus_proto_trace_v1_ConstantSampler__fields[1] = { {1, 8, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, }; @@ -81,6 +85,7 @@ const upb_MiniTable opencensus__proto__trace__v1__ConstantSampler_msg_init = { }) }; +const upb_MiniTable* opencensus__proto__trace__v1__ConstantSampler_msg_init_ptr = &opencensus__proto__trace__v1__ConstantSampler_msg_init; static const upb_MiniTableField opencensus_proto_trace_v1_RateLimitingSampler__fields[1] = { {1, 8, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, }; @@ -98,6 +103,7 @@ const upb_MiniTable opencensus__proto__trace__v1__RateLimitingSampler_msg_init = }) }; +const upb_MiniTable* opencensus__proto__trace__v1__RateLimitingSampler_msg_init_ptr = &opencensus__proto__trace__v1__RateLimitingSampler_msg_init; static const upb_MiniTable *messages_layout[4] = { &opencensus__proto__trace__v1__TraceConfig_msg_init, &opencensus__proto__trace__v1__ProbabilitySampler_msg_init, diff --git a/src/core/ext/upb-gen/opencensus/proto/trace/v1/trace_config.upb_minitable.h b/src/core/ext/upb-gen/opencensus/proto/trace/v1/trace_config.upb_minitable.h index f781fd44a35..8e60a1cdbe5 100644 --- a/src/core/ext/upb-gen/opencensus/proto/trace/v1/trace_config.upb_minitable.h +++ b/src/core/ext/upb-gen/opencensus/proto/trace/v1/trace_config.upb_minitable.h @@ -3,7 +3,8 @@ * opencensus/proto/trace/v1/trace_config.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef OPENCENSUS_PROTO_TRACE_V1_TRACE_CONFIG_PROTO_UPB_MINITABLE_H_ #define OPENCENSUS_PROTO_TRACE_V1_TRACE_CONFIG_PROTO_UPB_MINITABLE_H_ @@ -18,9 +19,13 @@ extern "C" { #endif extern const upb_MiniTable opencensus__proto__trace__v1__TraceConfig_msg_init; +extern const upb_MiniTable* opencensus__proto__trace__v1__TraceConfig_msg_init_ptr; extern const upb_MiniTable opencensus__proto__trace__v1__ProbabilitySampler_msg_init; +extern const upb_MiniTable* opencensus__proto__trace__v1__ProbabilitySampler_msg_init_ptr; extern const upb_MiniTable opencensus__proto__trace__v1__ConstantSampler_msg_init; +extern const upb_MiniTable* opencensus__proto__trace__v1__ConstantSampler_msg_init_ptr; extern const upb_MiniTable opencensus__proto__trace__v1__RateLimitingSampler_msg_init; +extern const upb_MiniTable* opencensus__proto__trace__v1__RateLimitingSampler_msg_init_ptr; extern const upb_MiniTableFile opencensus_proto_trace_v1_trace_config_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb.h b/src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb.h index 8f872c430c1..0ada618921f 100644 --- a/src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb.h +++ b/src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb.h @@ -3,7 +3,8 @@ * src/proto/grpc/gcp/altscontext.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef SRC_PROTO_GRPC_GCP_ALTSCONTEXT_PROTO_UPB_H_ #define SRC_PROTO_GRPC_GCP_ALTSCONTEXT_PROTO_UPB_H_ @@ -131,6 +132,7 @@ UPB_INLINE const struct grpc_gcp_RpcProtocolVersions* grpc_gcp_AltsContext_peer_ const struct grpc_gcp_RpcProtocolVersions* default_val = NULL; const struct grpc_gcp_RpcProtocolVersions* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__gcp__RpcProtocolVersions_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -150,22 +152,26 @@ UPB_INLINE size_t grpc_gcp_AltsContext_peer_attributes_size(const grpc_gcp_AltsC } UPB_INLINE bool grpc_gcp_AltsContext_peer_attributes_get(const grpc_gcp_AltsContext* msg, upb_StringView key, upb_StringView* val) { const upb_MiniTableField field = {7, UPB_SIZE(20, 88), 0, 1, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__gcp__AltsContext__PeerAttributesEntry_msg_init); const upb_Map* map = upb_Message_GetMap(UPB_UPCAST(msg), &field); if (!map) return false; return _upb_Map_Get(map, &key, 0, val, 0); } UPB_INLINE const grpc_gcp_AltsContext_PeerAttributesEntry* grpc_gcp_AltsContext_peer_attributes_next(const grpc_gcp_AltsContext* msg, size_t* iter) { const upb_MiniTableField field = {7, UPB_SIZE(20, 88), 0, 1, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__gcp__AltsContext__PeerAttributesEntry_msg_init); const upb_Map* map = upb_Message_GetMap(UPB_UPCAST(msg), &field); if (!map) return NULL; return (const grpc_gcp_AltsContext_PeerAttributesEntry*)_upb_map_next(map, iter); } UPB_INLINE const upb_Map* _grpc_gcp_AltsContext_peer_attributes_upb_map(grpc_gcp_AltsContext* msg) { const upb_MiniTableField field = {7, UPB_SIZE(20, 88), 0, 1, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__gcp__AltsContext__PeerAttributesEntry_msg_init); return upb_Message_GetMap(UPB_UPCAST(msg), &field); } UPB_INLINE upb_Map* _grpc_gcp_AltsContext_peer_attributes_mutable_upb_map(grpc_gcp_AltsContext* msg, upb_Arena* a) { const upb_MiniTableField field = {7, UPB_SIZE(20, 88), 0, 1, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__gcp__AltsContext__PeerAttributesEntry_msg_init); return _upb_Message_GetOrCreateMutableMap(UPB_UPCAST(msg), &field, 0, 0, a); } @@ -191,6 +197,7 @@ UPB_INLINE void grpc_gcp_AltsContext_set_local_service_account(grpc_gcp_AltsCont } 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_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__gcp__RpcProtocolVersions_msg_init); 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) { @@ -209,6 +216,7 @@ UPB_INLINE void grpc_gcp_AltsContext_peer_attributes_clear(grpc_gcp_AltsContext* } UPB_INLINE bool grpc_gcp_AltsContext_peer_attributes_set(grpc_gcp_AltsContext* msg, upb_StringView key, upb_StringView val, upb_Arena* a) { const upb_MiniTableField field = {7, UPB_SIZE(20, 88), 0, 1, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__gcp__AltsContext__PeerAttributesEntry_msg_init); upb_Map* map = _upb_Message_GetOrCreateMutableMap(UPB_UPCAST(msg), &field, 0, 0, a); return _upb_Map_Insert(map, &key, 0, &val, 0, a) != @@ -222,6 +230,7 @@ UPB_INLINE bool grpc_gcp_AltsContext_peer_attributes_delete(grpc_gcp_AltsContext } UPB_INLINE grpc_gcp_AltsContext_PeerAttributesEntry* grpc_gcp_AltsContext_peer_attributes_nextmutable(grpc_gcp_AltsContext* msg, size_t* iter) { const upb_MiniTableField field = {7, UPB_SIZE(20, 88), 0, 1, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__gcp__AltsContext__PeerAttributesEntry_msg_init); upb_Map* map = (upb_Map*)upb_Message_GetMap(UPB_UPCAST(msg), &field); if (!map) return NULL; return (grpc_gcp_AltsContext_PeerAttributesEntry*)_upb_map_next(map, iter); diff --git a/src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb_minitable.c b/src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb_minitable.c index ebc0fdc7461..16e44fdd395 100644 --- a/src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb_minitable.c +++ b/src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb_minitable.c @@ -3,7 +3,8 @@ * src/proto/grpc/gcp/altscontext.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -13,9 +14,10 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub grpc_gcp_AltsContext_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &grpc__gcp__RpcProtocolVersions_msg_init}, - {.UPB_PRIVATE(submsg) = &grpc__gcp__AltsContext__PeerAttributesEntry_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal grpc_gcp_AltsContext_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &grpc__gcp__RpcProtocolVersions_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &grpc__gcp__AltsContext__PeerAttributesEntry_msg_init_ptr}, }; static const upb_MiniTableField grpc_gcp_AltsContext__fields[7] = { @@ -47,6 +49,7 @@ const upb_MiniTable grpc__gcp__AltsContext_msg_init = { }) }; +const upb_MiniTable* grpc__gcp__AltsContext_msg_init_ptr = &grpc__gcp__AltsContext_msg_init; static const upb_MiniTableField grpc_gcp_AltsContext_PeerAttributesEntry__fields[2] = { {1, 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)}, @@ -67,6 +70,7 @@ const upb_MiniTable grpc__gcp__AltsContext__PeerAttributesEntry_msg_init = { }) }; +const upb_MiniTable* grpc__gcp__AltsContext__PeerAttributesEntry_msg_init_ptr = &grpc__gcp__AltsContext__PeerAttributesEntry_msg_init; static const upb_MiniTable *messages_layout[2] = { &grpc__gcp__AltsContext_msg_init, &grpc__gcp__AltsContext__PeerAttributesEntry_msg_init, diff --git a/src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb_minitable.h b/src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb_minitable.h index 07231cf05c1..67da05b424c 100644 --- a/src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb_minitable.h +++ b/src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb_minitable.h @@ -3,7 +3,8 @@ * src/proto/grpc/gcp/altscontext.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef SRC_PROTO_GRPC_GCP_ALTSCONTEXT_PROTO_UPB_MINITABLE_H_ #define SRC_PROTO_GRPC_GCP_ALTSCONTEXT_PROTO_UPB_MINITABLE_H_ @@ -18,7 +19,9 @@ extern "C" { #endif extern const upb_MiniTable grpc__gcp__AltsContext_msg_init; +extern const upb_MiniTable* grpc__gcp__AltsContext_msg_init_ptr; extern const upb_MiniTable grpc__gcp__AltsContext__PeerAttributesEntry_msg_init; +extern const upb_MiniTable* grpc__gcp__AltsContext__PeerAttributesEntry_msg_init_ptr; extern const upb_MiniTableFile src_proto_grpc_gcp_altscontext_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/src/proto/grpc/gcp/handshaker.upb.h b/src/core/ext/upb-gen/src/proto/grpc/gcp/handshaker.upb.h index cdfb19f47fc..43d5aef2319 100644 --- a/src/core/ext/upb-gen/src/proto/grpc/gcp/handshaker.upb.h +++ b/src/core/ext/upb-gen/src/proto/grpc/gcp/handshaker.upb.h @@ -3,7 +3,8 @@ * src/proto/grpc/gcp/handshaker.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef SRC_PROTO_GRPC_GCP_HANDSHAKER_PROTO_UPB_H_ #define SRC_PROTO_GRPC_GCP_HANDSHAKER_PROTO_UPB_H_ @@ -224,22 +225,26 @@ UPB_INLINE size_t grpc_gcp_Identity_attributes_size(const grpc_gcp_Identity* msg } UPB_INLINE bool grpc_gcp_Identity_attributes_get(const grpc_gcp_Identity* msg, upb_StringView key, upb_StringView* val) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__gcp__Identity__AttributesEntry_msg_init); const upb_Map* map = upb_Message_GetMap(UPB_UPCAST(msg), &field); if (!map) return false; return _upb_Map_Get(map, &key, 0, val, 0); } UPB_INLINE const grpc_gcp_Identity_AttributesEntry* grpc_gcp_Identity_attributes_next(const grpc_gcp_Identity* msg, size_t* iter) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__gcp__Identity__AttributesEntry_msg_init); const upb_Map* map = upb_Message_GetMap(UPB_UPCAST(msg), &field); if (!map) return NULL; return (const grpc_gcp_Identity_AttributesEntry*)_upb_map_next(map, iter); } UPB_INLINE const upb_Map* _grpc_gcp_Identity_attributes_upb_map(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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__gcp__Identity__AttributesEntry_msg_init); return upb_Message_GetMap(UPB_UPCAST(msg), &field); } UPB_INLINE upb_Map* _grpc_gcp_Identity_attributes_mutable_upb_map(grpc_gcp_Identity* msg, upb_Arena* a) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__gcp__Identity__AttributesEntry_msg_init); return _upb_Message_GetOrCreateMutableMap(UPB_UPCAST(msg), &field, 0, 0, a); } @@ -259,6 +264,7 @@ UPB_INLINE void grpc_gcp_Identity_attributes_clear(grpc_gcp_Identity* msg) { } UPB_INLINE bool grpc_gcp_Identity_attributes_set(grpc_gcp_Identity* msg, upb_StringView key, upb_StringView val, upb_Arena* a) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__gcp__Identity__AttributesEntry_msg_init); upb_Map* map = _upb_Message_GetOrCreateMutableMap(UPB_UPCAST(msg), &field, 0, 0, a); return _upb_Map_Insert(map, &key, 0, &val, 0, a) != @@ -272,6 +278,7 @@ UPB_INLINE bool grpc_gcp_Identity_attributes_delete(grpc_gcp_Identity* msg, upb_ } UPB_INLINE grpc_gcp_Identity_AttributesEntry* grpc_gcp_Identity_attributes_nextmutable(grpc_gcp_Identity* msg, size_t* iter) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__gcp__Identity__AttributesEntry_msg_init); upb_Map* map = (upb_Map*)upb_Message_GetMap(UPB_UPCAST(msg), &field); if (!map) return NULL; return (grpc_gcp_Identity_AttributesEntry*)_upb_map_next(map, iter); @@ -412,6 +419,7 @@ UPB_INLINE void grpc_gcp_StartClientHandshakeReq_clear_target_identities(grpc_gc } UPB_INLINE const grpc_gcp_Identity* const* grpc_gcp_StartClientHandshakeReq_target_identities(const grpc_gcp_StartClientHandshakeReq* msg, size_t* size) { const upb_MiniTableField field = {4, UPB_SIZE(24, 40), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__gcp__Identity_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -423,6 +431,7 @@ UPB_INLINE const grpc_gcp_Identity* const* grpc_gcp_StartClientHandshakeReq_targ } UPB_INLINE const upb_Array* _grpc_gcp_StartClientHandshakeReq_target_identities_upb_array(const grpc_gcp_StartClientHandshakeReq* msg, size_t* size) { const upb_MiniTableField field = {4, UPB_SIZE(24, 40), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__gcp__Identity_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -431,6 +440,7 @@ UPB_INLINE const upb_Array* _grpc_gcp_StartClientHandshakeReq_target_identities_ } UPB_INLINE upb_Array* _grpc_gcp_StartClientHandshakeReq_target_identities_mutable_upb_array(grpc_gcp_StartClientHandshakeReq* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {4, UPB_SIZE(24, 40), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__gcp__Identity_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -446,6 +456,7 @@ UPB_INLINE const grpc_gcp_Identity* grpc_gcp_StartClientHandshakeReq_local_ident const grpc_gcp_Identity* default_val = NULL; const grpc_gcp_Identity* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__gcp__Identity_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -462,6 +473,7 @@ UPB_INLINE const grpc_gcp_Endpoint* grpc_gcp_StartClientHandshakeReq_local_endpo const grpc_gcp_Endpoint* default_val = NULL; const grpc_gcp_Endpoint* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__gcp__Endpoint_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -478,6 +490,7 @@ UPB_INLINE const grpc_gcp_Endpoint* grpc_gcp_StartClientHandshakeReq_remote_endp const grpc_gcp_Endpoint* default_val = NULL; const grpc_gcp_Endpoint* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__gcp__Endpoint_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -506,6 +519,7 @@ UPB_INLINE const struct grpc_gcp_RpcProtocolVersions* grpc_gcp_StartClientHandsh const struct grpc_gcp_RpcProtocolVersions* default_val = NULL; const struct grpc_gcp_RpcProtocolVersions* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__gcp__RpcProtocolVersions_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -589,6 +603,7 @@ UPB_INLINE bool grpc_gcp_StartClientHandshakeReq_add_record_protocols(grpc_gcp_S } UPB_INLINE grpc_gcp_Identity** grpc_gcp_StartClientHandshakeReq_mutable_target_identities(grpc_gcp_StartClientHandshakeReq* msg, size_t* size) { upb_MiniTableField field = {4, UPB_SIZE(24, 40), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__gcp__Identity_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -605,6 +620,7 @@ UPB_INLINE grpc_gcp_Identity** grpc_gcp_StartClientHandshakeReq_resize_target_id } UPB_INLINE struct grpc_gcp_Identity* grpc_gcp_StartClientHandshakeReq_add_target_identities(grpc_gcp_StartClientHandshakeReq* msg, upb_Arena* arena) { upb_MiniTableField field = {4, UPB_SIZE(24, 40), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__gcp__Identity_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -619,6 +635,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_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__gcp__Identity_msg_init); 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) { @@ -631,6 +648,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_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__gcp__Endpoint_msg_init); 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) { @@ -643,6 +661,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_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__gcp__Endpoint_msg_init); 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) { @@ -659,6 +678,7 @@ UPB_INLINE void grpc_gcp_StartClientHandshakeReq_set_target_name(grpc_gcp_StartC } 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_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__gcp__RpcProtocolVersions_msg_init); 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) { @@ -748,6 +768,7 @@ UPB_INLINE void grpc_gcp_ServerHandshakeParameters_clear_local_identities(grpc_g } UPB_INLINE const grpc_gcp_Identity* const* grpc_gcp_ServerHandshakeParameters_local_identities(const grpc_gcp_ServerHandshakeParameters* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__gcp__Identity_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -759,6 +780,7 @@ UPB_INLINE const grpc_gcp_Identity* const* grpc_gcp_ServerHandshakeParameters_lo } UPB_INLINE const upb_Array* _grpc_gcp_ServerHandshakeParameters_local_identities_upb_array(const grpc_gcp_ServerHandshakeParameters* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__gcp__Identity_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -767,6 +789,7 @@ UPB_INLINE const upb_Array* _grpc_gcp_ServerHandshakeParameters_local_identities } UPB_INLINE upb_Array* _grpc_gcp_ServerHandshakeParameters_local_identities_mutable_upb_array(grpc_gcp_ServerHandshakeParameters* msg, size_t* size, upb_Arena* arena) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__gcp__Identity_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -805,6 +828,7 @@ UPB_INLINE bool grpc_gcp_ServerHandshakeParameters_add_record_protocols(grpc_gcp } UPB_INLINE grpc_gcp_Identity** grpc_gcp_ServerHandshakeParameters_mutable_local_identities(grpc_gcp_ServerHandshakeParameters* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__gcp__Identity_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -821,6 +845,7 @@ UPB_INLINE grpc_gcp_Identity** grpc_gcp_ServerHandshakeParameters_resize_local_i } UPB_INLINE struct grpc_gcp_Identity* grpc_gcp_ServerHandshakeParameters_add_local_identities(grpc_gcp_ServerHandshakeParameters* msg, upb_Arena* arena) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__gcp__Identity_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -913,22 +938,30 @@ UPB_INLINE size_t grpc_gcp_StartServerHandshakeReq_handshake_parameters_size(con } UPB_INLINE bool grpc_gcp_StartServerHandshakeReq_handshake_parameters_get(const grpc_gcp_StartServerHandshakeReq* msg, int32_t key, grpc_gcp_ServerHandshakeParameters** val) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__gcp__StartServerHandshakeReq__HandshakeParametersEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__gcp__ServerHandshakeParameters_msg_init); const upb_Map* map = upb_Message_GetMap(UPB_UPCAST(msg), &field); if (!map) return false; return _upb_Map_Get(map, &key, sizeof(key), val, sizeof(*val)); } UPB_INLINE const grpc_gcp_StartServerHandshakeReq_HandshakeParametersEntry* grpc_gcp_StartServerHandshakeReq_handshake_parameters_next(const grpc_gcp_StartServerHandshakeReq* msg, size_t* iter) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__gcp__StartServerHandshakeReq__HandshakeParametersEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__gcp__ServerHandshakeParameters_msg_init); const upb_Map* map = upb_Message_GetMap(UPB_UPCAST(msg), &field); if (!map) return NULL; return (const grpc_gcp_StartServerHandshakeReq_HandshakeParametersEntry*)_upb_map_next(map, iter); } UPB_INLINE const upb_Map* _grpc_gcp_StartServerHandshakeReq_handshake_parameters_upb_map(grpc_gcp_StartServerHandshakeReq* msg) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__gcp__StartServerHandshakeReq__HandshakeParametersEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__gcp__ServerHandshakeParameters_msg_init); return upb_Message_GetMap(UPB_UPCAST(msg), &field); } UPB_INLINE upb_Map* _grpc_gcp_StartServerHandshakeReq_handshake_parameters_mutable_upb_map(grpc_gcp_StartServerHandshakeReq* msg, upb_Arena* a) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__gcp__StartServerHandshakeReq__HandshakeParametersEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__gcp__ServerHandshakeParameters_msg_init); return _upb_Message_GetOrCreateMutableMap(UPB_UPCAST(msg), &field, sizeof(int32_t), sizeof(grpc_gcp_ServerHandshakeParameters*), a); } UPB_INLINE void grpc_gcp_StartServerHandshakeReq_clear_in_bytes(grpc_gcp_StartServerHandshakeReq* msg) { @@ -951,6 +984,7 @@ UPB_INLINE const grpc_gcp_Endpoint* grpc_gcp_StartServerHandshakeReq_local_endpo const grpc_gcp_Endpoint* default_val = NULL; const grpc_gcp_Endpoint* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__gcp__Endpoint_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -967,6 +1001,7 @@ UPB_INLINE const grpc_gcp_Endpoint* grpc_gcp_StartServerHandshakeReq_remote_endp const grpc_gcp_Endpoint* default_val = NULL; const grpc_gcp_Endpoint* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__gcp__Endpoint_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -983,6 +1018,7 @@ UPB_INLINE const struct grpc_gcp_RpcProtocolVersions* grpc_gcp_StartServerHandsh const struct grpc_gcp_RpcProtocolVersions* default_val = NULL; const struct grpc_gcp_RpcProtocolVersions* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__gcp__RpcProtocolVersions_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1040,6 +1076,8 @@ UPB_INLINE void grpc_gcp_StartServerHandshakeReq_handshake_parameters_clear(grpc } UPB_INLINE bool grpc_gcp_StartServerHandshakeReq_handshake_parameters_set(grpc_gcp_StartServerHandshakeReq* msg, int32_t key, grpc_gcp_ServerHandshakeParameters* val, upb_Arena* a) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__gcp__StartServerHandshakeReq__HandshakeParametersEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__gcp__ServerHandshakeParameters_msg_init); upb_Map* map = _upb_Message_GetOrCreateMutableMap(UPB_UPCAST(msg), &field, sizeof(key), sizeof(val), a); return _upb_Map_Insert(map, &key, sizeof(key), &val, sizeof(val), a) != @@ -1053,6 +1091,8 @@ UPB_INLINE bool grpc_gcp_StartServerHandshakeReq_handshake_parameters_delete(grp } UPB_INLINE grpc_gcp_StartServerHandshakeReq_HandshakeParametersEntry* grpc_gcp_StartServerHandshakeReq_handshake_parameters_nextmutable(grpc_gcp_StartServerHandshakeReq* msg, size_t* iter) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__gcp__StartServerHandshakeReq__HandshakeParametersEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__gcp__ServerHandshakeParameters_msg_init); upb_Map* map = (upb_Map*)upb_Message_GetMap(UPB_UPCAST(msg), &field); if (!map) return NULL; return (grpc_gcp_StartServerHandshakeReq_HandshakeParametersEntry*)_upb_map_next(map, iter); @@ -1063,6 +1103,7 @@ UPB_INLINE void grpc_gcp_StartServerHandshakeReq_set_in_bytes(grpc_gcp_StartServ } 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_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__gcp__Endpoint_msg_init); 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) { @@ -1075,6 +1116,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_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__gcp__Endpoint_msg_init); 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) { @@ -1087,6 +1129,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_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__gcp__RpcProtocolVersions_msg_init); 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) { @@ -1232,6 +1275,7 @@ UPB_INLINE const grpc_gcp_StartClientHandshakeReq* grpc_gcp_HandshakerReq_client const grpc_gcp_StartClientHandshakeReq* default_val = NULL; const grpc_gcp_StartClientHandshakeReq* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__gcp__StartClientHandshakeReq_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1248,6 +1292,7 @@ UPB_INLINE const grpc_gcp_StartServerHandshakeReq* grpc_gcp_HandshakerReq_server const grpc_gcp_StartServerHandshakeReq* default_val = NULL; const grpc_gcp_StartServerHandshakeReq* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__gcp__StartServerHandshakeReq_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1264,6 +1309,7 @@ UPB_INLINE const grpc_gcp_NextHandshakeMessageReq* grpc_gcp_HandshakerReq_next(c const grpc_gcp_NextHandshakeMessageReq* default_val = NULL; const grpc_gcp_NextHandshakeMessageReq* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__gcp__NextHandshakeMessageReq_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1275,6 +1321,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_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__gcp__StartClientHandshakeReq_msg_init); 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) { @@ -1287,6 +1334,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_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__gcp__StartServerHandshakeReq_msg_init); 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) { @@ -1299,6 +1347,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_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__gcp__NextHandshakeMessageReq_msg_init); 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) { @@ -1390,6 +1439,7 @@ UPB_INLINE const grpc_gcp_Identity* grpc_gcp_HandshakerResult_peer_identity(cons const grpc_gcp_Identity* default_val = NULL; const grpc_gcp_Identity* 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_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__gcp__Identity_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1406,6 +1456,7 @@ UPB_INLINE const grpc_gcp_Identity* grpc_gcp_HandshakerResult_local_identity(con const grpc_gcp_Identity* default_val = NULL; const grpc_gcp_Identity* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__gcp__Identity_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1434,6 +1485,7 @@ UPB_INLINE const struct grpc_gcp_RpcProtocolVersions* grpc_gcp_HandshakerResult_ const struct grpc_gcp_RpcProtocolVersions* default_val = NULL; const struct grpc_gcp_RpcProtocolVersions* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__gcp__RpcProtocolVersions_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1469,6 +1521,7 @@ UPB_INLINE void grpc_gcp_HandshakerResult_set_key_data(grpc_gcp_HandshakerResult } 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_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__gcp__Identity_msg_init); 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) { @@ -1481,6 +1534,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_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__gcp__Identity_msg_init); 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) { @@ -1497,6 +1551,7 @@ UPB_INLINE void grpc_gcp_HandshakerResult_set_keep_channel_open(grpc_gcp_Handsha } 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_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__gcp__RpcProtocolVersions_msg_init); 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) { @@ -1650,6 +1705,7 @@ UPB_INLINE const grpc_gcp_HandshakerResult* grpc_gcp_HandshakerResp_result(const const grpc_gcp_HandshakerResult* default_val = NULL; const grpc_gcp_HandshakerResult* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__gcp__HandshakerResult_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1666,6 +1722,7 @@ UPB_INLINE const grpc_gcp_HandshakerStatus* grpc_gcp_HandshakerResp_status(const const grpc_gcp_HandshakerStatus* default_val = NULL; const grpc_gcp_HandshakerStatus* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__gcp__HandshakerStatus_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1685,6 +1742,7 @@ UPB_INLINE void grpc_gcp_HandshakerResp_set_bytes_consumed(grpc_gcp_HandshakerRe } 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_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__gcp__HandshakerResult_msg_init); 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) { @@ -1697,6 +1755,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_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__gcp__HandshakerStatus_msg_init); 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) { diff --git a/src/core/ext/upb-gen/src/proto/grpc/gcp/handshaker.upb_minitable.c b/src/core/ext/upb-gen/src/proto/grpc/gcp/handshaker.upb_minitable.c index fc1ebd9f43f..634ea9bbf63 100644 --- a/src/core/ext/upb-gen/src/proto/grpc/gcp/handshaker.upb_minitable.c +++ b/src/core/ext/upb-gen/src/proto/grpc/gcp/handshaker.upb_minitable.c @@ -3,7 +3,8 @@ * src/proto/grpc/gcp/handshaker.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -13,6 +14,7 @@ // Must be last. #include "upb/port/def.inc" +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); static const upb_MiniTableField grpc_gcp_Endpoint__fields[3] = { {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, {2, 8, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, @@ -34,8 +36,9 @@ const upb_MiniTable grpc__gcp__Endpoint_msg_init = { }) }; -static const upb_MiniTableSub grpc_gcp_Identity_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &grpc__gcp__Identity__AttributesEntry_msg_init}, +const upb_MiniTable* grpc__gcp__Endpoint_msg_init_ptr = &grpc__gcp__Endpoint_msg_init; +static const upb_MiniTableSubInternal grpc_gcp_Identity_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &grpc__gcp__Identity__AttributesEntry_msg_init_ptr}, }; static const upb_MiniTableField grpc_gcp_Identity__fields[3] = { @@ -59,6 +62,7 @@ const upb_MiniTable grpc__gcp__Identity_msg_init = { }) }; +const upb_MiniTable* grpc__gcp__Identity_msg_init_ptr = &grpc__gcp__Identity_msg_init; static const upb_MiniTableField grpc_gcp_Identity_AttributesEntry__fields[2] = { {1, 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)}, @@ -79,12 +83,13 @@ const upb_MiniTable grpc__gcp__Identity__AttributesEntry_msg_init = { }) }; -static const upb_MiniTableSub grpc_gcp_StartClientHandshakeReq_submsgs[5] = { - {.UPB_PRIVATE(submsg) = &grpc__gcp__Identity_msg_init}, - {.UPB_PRIVATE(submsg) = &grpc__gcp__Identity_msg_init}, - {.UPB_PRIVATE(submsg) = &grpc__gcp__Endpoint_msg_init}, - {.UPB_PRIVATE(submsg) = &grpc__gcp__Endpoint_msg_init}, - {.UPB_PRIVATE(submsg) = &grpc__gcp__RpcProtocolVersions_msg_init}, +const upb_MiniTable* grpc__gcp__Identity__AttributesEntry_msg_init_ptr = &grpc__gcp__Identity__AttributesEntry_msg_init; +static const upb_MiniTableSubInternal grpc_gcp_StartClientHandshakeReq_submsgs[5] = { + {.UPB_PRIVATE(submsg) = &grpc__gcp__Identity_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &grpc__gcp__Identity_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &grpc__gcp__Endpoint_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &grpc__gcp__Endpoint_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &grpc__gcp__RpcProtocolVersions_msg_init_ptr}, }; static const upb_MiniTableField grpc_gcp_StartClientHandshakeReq__fields[10] = { @@ -127,8 +132,9 @@ const upb_MiniTable grpc__gcp__StartClientHandshakeReq_msg_init = { }) }; -static const upb_MiniTableSub grpc_gcp_ServerHandshakeParameters_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &grpc__gcp__Identity_msg_init}, +const upb_MiniTable* grpc__gcp__StartClientHandshakeReq_msg_init_ptr = &grpc__gcp__StartClientHandshakeReq_msg_init; +static const upb_MiniTableSubInternal grpc_gcp_ServerHandshakeParameters_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &grpc__gcp__Identity_msg_init_ptr}, }; static const upb_MiniTableField grpc_gcp_ServerHandshakeParameters__fields[2] = { @@ -151,11 +157,12 @@ const upb_MiniTable grpc__gcp__ServerHandshakeParameters_msg_init = { }) }; -static const upb_MiniTableSub grpc_gcp_StartServerHandshakeReq_submsgs[4] = { - {.UPB_PRIVATE(submsg) = &grpc__gcp__StartServerHandshakeReq__HandshakeParametersEntry_msg_init}, - {.UPB_PRIVATE(submsg) = &grpc__gcp__Endpoint_msg_init}, - {.UPB_PRIVATE(submsg) = &grpc__gcp__Endpoint_msg_init}, - {.UPB_PRIVATE(submsg) = &grpc__gcp__RpcProtocolVersions_msg_init}, +const upb_MiniTable* grpc__gcp__ServerHandshakeParameters_msg_init_ptr = &grpc__gcp__ServerHandshakeParameters_msg_init; +static const upb_MiniTableSubInternal grpc_gcp_StartServerHandshakeReq_submsgs[4] = { + {.UPB_PRIVATE(submsg) = &grpc__gcp__StartServerHandshakeReq__HandshakeParametersEntry_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &grpc__gcp__Endpoint_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &grpc__gcp__Endpoint_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &grpc__gcp__RpcProtocolVersions_msg_init_ptr}, }; static const upb_MiniTableField grpc_gcp_StartServerHandshakeReq__fields[7] = { @@ -187,8 +194,9 @@ const upb_MiniTable grpc__gcp__StartServerHandshakeReq_msg_init = { }) }; -static const upb_MiniTableSub grpc_gcp_StartServerHandshakeReq_HandshakeParametersEntry_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &grpc__gcp__ServerHandshakeParameters_msg_init}, +const upb_MiniTable* grpc__gcp__StartServerHandshakeReq_msg_init_ptr = &grpc__gcp__StartServerHandshakeReq_msg_init; +static const upb_MiniTableSubInternal grpc_gcp_StartServerHandshakeReq_HandshakeParametersEntry_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &grpc__gcp__ServerHandshakeParameters_msg_init_ptr}, }; static const upb_MiniTableField grpc_gcp_StartServerHandshakeReq_HandshakeParametersEntry__fields[2] = { @@ -209,6 +217,7 @@ const upb_MiniTable grpc__gcp__StartServerHandshakeReq__HandshakeParametersEntry }) }; +const upb_MiniTable* grpc__gcp__StartServerHandshakeReq__HandshakeParametersEntry_msg_init_ptr = &grpc__gcp__StartServerHandshakeReq__HandshakeParametersEntry_msg_init; static const upb_MiniTableField grpc_gcp_NextHandshakeMessageReq__fields[1] = { {1, 8, 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, }; @@ -226,10 +235,11 @@ const upb_MiniTable grpc__gcp__NextHandshakeMessageReq_msg_init = { }) }; -static const upb_MiniTableSub grpc_gcp_HandshakerReq_submsgs[3] = { - {.UPB_PRIVATE(submsg) = &grpc__gcp__StartClientHandshakeReq_msg_init}, - {.UPB_PRIVATE(submsg) = &grpc__gcp__StartServerHandshakeReq_msg_init}, - {.UPB_PRIVATE(submsg) = &grpc__gcp__NextHandshakeMessageReq_msg_init}, +const upb_MiniTable* grpc__gcp__NextHandshakeMessageReq_msg_init_ptr = &grpc__gcp__NextHandshakeMessageReq_msg_init; +static const upb_MiniTableSubInternal grpc_gcp_HandshakerReq_submsgs[3] = { + {.UPB_PRIVATE(submsg) = &grpc__gcp__StartClientHandshakeReq_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &grpc__gcp__StartServerHandshakeReq_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &grpc__gcp__NextHandshakeMessageReq_msg_init_ptr}, }; static const upb_MiniTableField grpc_gcp_HandshakerReq__fields[3] = { @@ -253,10 +263,11 @@ const upb_MiniTable grpc__gcp__HandshakerReq_msg_init = { }) }; -static const upb_MiniTableSub grpc_gcp_HandshakerResult_submsgs[3] = { - {.UPB_PRIVATE(submsg) = &grpc__gcp__Identity_msg_init}, - {.UPB_PRIVATE(submsg) = &grpc__gcp__Identity_msg_init}, - {.UPB_PRIVATE(submsg) = &grpc__gcp__RpcProtocolVersions_msg_init}, +const upb_MiniTable* grpc__gcp__HandshakerReq_msg_init_ptr = &grpc__gcp__HandshakerReq_msg_init; +static const upb_MiniTableSubInternal grpc_gcp_HandshakerResult_submsgs[3] = { + {.UPB_PRIVATE(submsg) = &grpc__gcp__Identity_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &grpc__gcp__Identity_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &grpc__gcp__RpcProtocolVersions_msg_init_ptr}, }; static const upb_MiniTableField grpc_gcp_HandshakerResult__fields[8] = { @@ -297,6 +308,7 @@ const upb_MiniTable grpc__gcp__HandshakerResult_msg_init = { }) }; +const upb_MiniTable* grpc__gcp__HandshakerResult_msg_init_ptr = &grpc__gcp__HandshakerResult_msg_init; static const upb_MiniTableField grpc_gcp_HandshakerStatus__fields[2] = { {1, 8, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, {2, UPB_SIZE(12, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, @@ -317,9 +329,10 @@ const upb_MiniTable grpc__gcp__HandshakerStatus_msg_init = { }) }; -static const upb_MiniTableSub grpc_gcp_HandshakerResp_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &grpc__gcp__HandshakerResult_msg_init}, - {.UPB_PRIVATE(submsg) = &grpc__gcp__HandshakerStatus_msg_init}, +const upb_MiniTable* grpc__gcp__HandshakerStatus_msg_init_ptr = &grpc__gcp__HandshakerStatus_msg_init; +static const upb_MiniTableSubInternal grpc_gcp_HandshakerResp_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &grpc__gcp__HandshakerResult_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &grpc__gcp__HandshakerStatus_msg_init_ptr}, }; static const upb_MiniTableField grpc_gcp_HandshakerResp__fields[4] = { @@ -344,6 +357,7 @@ const upb_MiniTable grpc__gcp__HandshakerResp_msg_init = { }) }; +const upb_MiniTable* grpc__gcp__HandshakerResp_msg_init_ptr = &grpc__gcp__HandshakerResp_msg_init; static const upb_MiniTable *messages_layout[12] = { &grpc__gcp__Endpoint_msg_init, &grpc__gcp__Identity_msg_init, diff --git a/src/core/ext/upb-gen/src/proto/grpc/gcp/handshaker.upb_minitable.h b/src/core/ext/upb-gen/src/proto/grpc/gcp/handshaker.upb_minitable.h index 52a73951ccc..6e566cef6a6 100644 --- a/src/core/ext/upb-gen/src/proto/grpc/gcp/handshaker.upb_minitable.h +++ b/src/core/ext/upb-gen/src/proto/grpc/gcp/handshaker.upb_minitable.h @@ -3,7 +3,8 @@ * src/proto/grpc/gcp/handshaker.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef SRC_PROTO_GRPC_GCP_HANDSHAKER_PROTO_UPB_MINITABLE_H_ #define SRC_PROTO_GRPC_GCP_HANDSHAKER_PROTO_UPB_MINITABLE_H_ @@ -18,17 +19,29 @@ extern "C" { #endif extern const upb_MiniTable grpc__gcp__Endpoint_msg_init; +extern const upb_MiniTable* grpc__gcp__Endpoint_msg_init_ptr; extern const upb_MiniTable grpc__gcp__Identity_msg_init; +extern const upb_MiniTable* grpc__gcp__Identity_msg_init_ptr; extern const upb_MiniTable grpc__gcp__Identity__AttributesEntry_msg_init; +extern const upb_MiniTable* grpc__gcp__Identity__AttributesEntry_msg_init_ptr; extern const upb_MiniTable grpc__gcp__StartClientHandshakeReq_msg_init; +extern const upb_MiniTable* grpc__gcp__StartClientHandshakeReq_msg_init_ptr; extern const upb_MiniTable grpc__gcp__ServerHandshakeParameters_msg_init; +extern const upb_MiniTable* grpc__gcp__ServerHandshakeParameters_msg_init_ptr; extern const upb_MiniTable grpc__gcp__StartServerHandshakeReq_msg_init; +extern const upb_MiniTable* grpc__gcp__StartServerHandshakeReq_msg_init_ptr; extern const upb_MiniTable grpc__gcp__StartServerHandshakeReq__HandshakeParametersEntry_msg_init; +extern const upb_MiniTable* grpc__gcp__StartServerHandshakeReq__HandshakeParametersEntry_msg_init_ptr; extern const upb_MiniTable grpc__gcp__NextHandshakeMessageReq_msg_init; +extern const upb_MiniTable* grpc__gcp__NextHandshakeMessageReq_msg_init_ptr; extern const upb_MiniTable grpc__gcp__HandshakerReq_msg_init; +extern const upb_MiniTable* grpc__gcp__HandshakerReq_msg_init_ptr; extern const upb_MiniTable grpc__gcp__HandshakerResult_msg_init; +extern const upb_MiniTable* grpc__gcp__HandshakerResult_msg_init_ptr; extern const upb_MiniTable grpc__gcp__HandshakerStatus_msg_init; +extern const upb_MiniTable* grpc__gcp__HandshakerStatus_msg_init_ptr; extern const upb_MiniTable grpc__gcp__HandshakerResp_msg_init; +extern const upb_MiniTable* grpc__gcp__HandshakerResp_msg_init_ptr; extern const upb_MiniTableFile src_proto_grpc_gcp_handshaker_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/src/proto/grpc/gcp/transport_security_common.upb.h b/src/core/ext/upb-gen/src/proto/grpc/gcp/transport_security_common.upb.h index 69ad9dc44f8..c99c6facfc9 100644 --- a/src/core/ext/upb-gen/src/proto/grpc/gcp/transport_security_common.upb.h +++ b/src/core/ext/upb-gen/src/proto/grpc/gcp/transport_security_common.upb.h @@ -3,7 +3,8 @@ * src/proto/grpc/gcp/transport_security_common.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef SRC_PROTO_GRPC_GCP_TRANSPORT_SECURITY_COMMON_PROTO_UPB_H_ #define SRC_PROTO_GRPC_GCP_TRANSPORT_SECURITY_COMMON_PROTO_UPB_H_ @@ -74,6 +75,7 @@ UPB_INLINE const grpc_gcp_RpcProtocolVersions_Version* grpc_gcp_RpcProtocolVersi const grpc_gcp_RpcProtocolVersions_Version* default_val = NULL; const grpc_gcp_RpcProtocolVersions_Version* 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_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__gcp__RpcProtocolVersions__Version_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -90,6 +92,7 @@ UPB_INLINE const grpc_gcp_RpcProtocolVersions_Version* grpc_gcp_RpcProtocolVersi const grpc_gcp_RpcProtocolVersions_Version* default_val = NULL; const grpc_gcp_RpcProtocolVersions_Version* 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_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__gcp__RpcProtocolVersions__Version_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -101,6 +104,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_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__gcp__RpcProtocolVersions__Version_msg_init); 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) { @@ -113,6 +117,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_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__gcp__RpcProtocolVersions__Version_msg_init); 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) { diff --git a/src/core/ext/upb-gen/src/proto/grpc/gcp/transport_security_common.upb_minitable.c b/src/core/ext/upb-gen/src/proto/grpc/gcp/transport_security_common.upb_minitable.c index 53c38410402..a4a93054fc4 100644 --- a/src/core/ext/upb-gen/src/proto/grpc/gcp/transport_security_common.upb_minitable.c +++ b/src/core/ext/upb-gen/src/proto/grpc/gcp/transport_security_common.upb_minitable.c @@ -3,7 +3,8 @@ * src/proto/grpc/gcp/transport_security_common.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -12,9 +13,10 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub grpc_gcp_RpcProtocolVersions_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &grpc__gcp__RpcProtocolVersions__Version_msg_init}, - {.UPB_PRIVATE(submsg) = &grpc__gcp__RpcProtocolVersions__Version_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal grpc_gcp_RpcProtocolVersions_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &grpc__gcp__RpcProtocolVersions__Version_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &grpc__gcp__RpcProtocolVersions__Version_msg_init_ptr}, }; static const upb_MiniTableField grpc_gcp_RpcProtocolVersions__fields[2] = { @@ -31,6 +33,7 @@ const upb_MiniTable grpc__gcp__RpcProtocolVersions_msg_init = { #endif }; +const upb_MiniTable* grpc__gcp__RpcProtocolVersions_msg_init_ptr = &grpc__gcp__RpcProtocolVersions_msg_init; static const upb_MiniTableField grpc_gcp_RpcProtocolVersions_Version__fields[2] = { {1, 8, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, {2, 12, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, @@ -51,6 +54,7 @@ const upb_MiniTable grpc__gcp__RpcProtocolVersions__Version_msg_init = { }) }; +const upb_MiniTable* grpc__gcp__RpcProtocolVersions__Version_msg_init_ptr = &grpc__gcp__RpcProtocolVersions__Version_msg_init; static const upb_MiniTable *messages_layout[2] = { &grpc__gcp__RpcProtocolVersions_msg_init, &grpc__gcp__RpcProtocolVersions__Version_msg_init, diff --git a/src/core/ext/upb-gen/src/proto/grpc/gcp/transport_security_common.upb_minitable.h b/src/core/ext/upb-gen/src/proto/grpc/gcp/transport_security_common.upb_minitable.h index 9a667c071e4..8526731aa02 100644 --- a/src/core/ext/upb-gen/src/proto/grpc/gcp/transport_security_common.upb_minitable.h +++ b/src/core/ext/upb-gen/src/proto/grpc/gcp/transport_security_common.upb_minitable.h @@ -3,7 +3,8 @@ * src/proto/grpc/gcp/transport_security_common.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef SRC_PROTO_GRPC_GCP_TRANSPORT_SECURITY_COMMON_PROTO_UPB_MINITABLE_H_ #define SRC_PROTO_GRPC_GCP_TRANSPORT_SECURITY_COMMON_PROTO_UPB_MINITABLE_H_ @@ -18,7 +19,9 @@ extern "C" { #endif extern const upb_MiniTable grpc__gcp__RpcProtocolVersions_msg_init; +extern const upb_MiniTable* grpc__gcp__RpcProtocolVersions_msg_init_ptr; extern const upb_MiniTable grpc__gcp__RpcProtocolVersions__Version_msg_init; +extern const upb_MiniTable* grpc__gcp__RpcProtocolVersions__Version_msg_init_ptr; extern const upb_MiniTableFile src_proto_grpc_gcp_transport_security_common_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/src/proto/grpc/health/v1/health.upb.h b/src/core/ext/upb-gen/src/proto/grpc/health/v1/health.upb.h index 30b433376fb..3b6c12f8fa2 100644 --- a/src/core/ext/upb-gen/src/proto/grpc/health/v1/health.upb.h +++ b/src/core/ext/upb-gen/src/proto/grpc/health/v1/health.upb.h @@ -3,7 +3,8 @@ * src/proto/grpc/health/v1/health.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef SRC_PROTO_GRPC_HEALTH_V1_HEALTH_PROTO_UPB_H_ #define SRC_PROTO_GRPC_HEALTH_V1_HEALTH_PROTO_UPB_H_ diff --git a/src/core/ext/upb-gen/src/proto/grpc/health/v1/health.upb_minitable.c b/src/core/ext/upb-gen/src/proto/grpc/health/v1/health.upb_minitable.c index e5d5760e4d6..4be4043d1d4 100644 --- a/src/core/ext/upb-gen/src/proto/grpc/health/v1/health.upb_minitable.c +++ b/src/core/ext/upb-gen/src/proto/grpc/health/v1/health.upb_minitable.c @@ -3,7 +3,8 @@ * src/proto/grpc/health/v1/health.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -12,6 +13,7 @@ // Must be last. #include "upb/port/def.inc" +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); static const upb_MiniTableField grpc_health_v1_HealthCheckRequest__fields[1] = { {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, }; @@ -29,6 +31,7 @@ const upb_MiniTable grpc__health__v1__HealthCheckRequest_msg_init = { }) }; +const upb_MiniTable* grpc__health__v1__HealthCheckRequest_msg_init_ptr = &grpc__health__v1__HealthCheckRequest_msg_init; static const upb_MiniTableField grpc_health_v1_HealthCheckResponse__fields[1] = { {1, 8, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, }; @@ -46,6 +49,7 @@ const upb_MiniTable grpc__health__v1__HealthCheckResponse_msg_init = { }) }; +const upb_MiniTable* grpc__health__v1__HealthCheckResponse_msg_init_ptr = &grpc__health__v1__HealthCheckResponse_msg_init; static const upb_MiniTable *messages_layout[2] = { &grpc__health__v1__HealthCheckRequest_msg_init, &grpc__health__v1__HealthCheckResponse_msg_init, diff --git a/src/core/ext/upb-gen/src/proto/grpc/health/v1/health.upb_minitable.h b/src/core/ext/upb-gen/src/proto/grpc/health/v1/health.upb_minitable.h index 2980e46b791..ee52253c825 100644 --- a/src/core/ext/upb-gen/src/proto/grpc/health/v1/health.upb_minitable.h +++ b/src/core/ext/upb-gen/src/proto/grpc/health/v1/health.upb_minitable.h @@ -3,7 +3,8 @@ * src/proto/grpc/health/v1/health.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef SRC_PROTO_GRPC_HEALTH_V1_HEALTH_PROTO_UPB_MINITABLE_H_ #define SRC_PROTO_GRPC_HEALTH_V1_HEALTH_PROTO_UPB_MINITABLE_H_ @@ -18,7 +19,9 @@ extern "C" { #endif extern const upb_MiniTable grpc__health__v1__HealthCheckRequest_msg_init; +extern const upb_MiniTable* grpc__health__v1__HealthCheckRequest_msg_init_ptr; extern const upb_MiniTable grpc__health__v1__HealthCheckResponse_msg_init; +extern const upb_MiniTable* grpc__health__v1__HealthCheckResponse_msg_init_ptr; extern const upb_MiniTableFile src_proto_grpc_health_v1_health_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/src/proto/grpc/lb/v1/load_balancer.upb.h b/src/core/ext/upb-gen/src/proto/grpc/lb/v1/load_balancer.upb.h index 2008fd7137b..6940e32cf76 100644 --- a/src/core/ext/upb-gen/src/proto/grpc/lb/v1/load_balancer.upb.h +++ b/src/core/ext/upb-gen/src/proto/grpc/lb/v1/load_balancer.upb.h @@ -3,7 +3,8 @@ * src/proto/grpc/lb/v1/load_balancer.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef SRC_PROTO_GRPC_LB_V1_LOAD_BALANCER_PROTO_UPB_H_ #define SRC_PROTO_GRPC_LB_V1_LOAD_BALANCER_PROTO_UPB_H_ @@ -90,6 +91,7 @@ UPB_INLINE const grpc_lb_v1_InitialLoadBalanceRequest* grpc_lb_v1_LoadBalanceReq const grpc_lb_v1_InitialLoadBalanceRequest* default_val = NULL; const grpc_lb_v1_InitialLoadBalanceRequest* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__lb__v1__InitialLoadBalanceRequest_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -106,6 +108,7 @@ UPB_INLINE const grpc_lb_v1_ClientStats* grpc_lb_v1_LoadBalanceRequest_client_st const grpc_lb_v1_ClientStats* default_val = NULL; const grpc_lb_v1_ClientStats* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__lb__v1__ClientStats_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -117,6 +120,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_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__lb__v1__InitialLoadBalanceRequest_msg_init); 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) { @@ -129,6 +133,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_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__lb__v1__ClientStats_msg_init); 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) { @@ -308,6 +313,7 @@ UPB_INLINE const struct google_protobuf_Timestamp* grpc_lb_v1_ClientStats_timest const struct google_protobuf_Timestamp* default_val = NULL; const struct google_protobuf_Timestamp* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Timestamp_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -370,6 +376,7 @@ UPB_INLINE void grpc_lb_v1_ClientStats_clear_calls_finished_with_drop(grpc_lb_v1 } UPB_INLINE const grpc_lb_v1_ClientStatsPerToken* const* grpc_lb_v1_ClientStats_calls_finished_with_drop(const grpc_lb_v1_ClientStats* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__lb__v1__ClientStatsPerToken_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -381,6 +388,7 @@ UPB_INLINE const grpc_lb_v1_ClientStatsPerToken* const* grpc_lb_v1_ClientStats_c } UPB_INLINE const upb_Array* _grpc_lb_v1_ClientStats_calls_finished_with_drop_upb_array(const grpc_lb_v1_ClientStats* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__lb__v1__ClientStatsPerToken_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -389,6 +397,7 @@ UPB_INLINE const upb_Array* _grpc_lb_v1_ClientStats_calls_finished_with_drop_upb } UPB_INLINE upb_Array* _grpc_lb_v1_ClientStats_calls_finished_with_drop_mutable_upb_array(grpc_lb_v1_ClientStats* msg, size_t* size, upb_Arena* arena) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__lb__v1__ClientStatsPerToken_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -399,6 +408,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Timestamp_msg_init); 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) { @@ -427,6 +437,7 @@ UPB_INLINE void grpc_lb_v1_ClientStats_set_num_calls_finished_known_received(grp } 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__lb__v1__ClientStatsPerToken_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -443,6 +454,7 @@ UPB_INLINE grpc_lb_v1_ClientStatsPerToken** grpc_lb_v1_ClientStats_resize_calls_ } UPB_INLINE struct grpc_lb_v1_ClientStatsPerToken* grpc_lb_v1_ClientStats_add_calls_finished_with_drop(grpc_lb_v1_ClientStats* msg, upb_Arena* arena) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__lb__v1__ClientStatsPerToken_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -511,6 +523,7 @@ UPB_INLINE const grpc_lb_v1_InitialLoadBalanceResponse* grpc_lb_v1_LoadBalanceRe const grpc_lb_v1_InitialLoadBalanceResponse* default_val = NULL; const grpc_lb_v1_InitialLoadBalanceResponse* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__lb__v1__InitialLoadBalanceResponse_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -527,6 +540,7 @@ UPB_INLINE const grpc_lb_v1_ServerList* grpc_lb_v1_LoadBalanceResponse_server_li const grpc_lb_v1_ServerList* default_val = NULL; const grpc_lb_v1_ServerList* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__lb__v1__ServerList_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -543,6 +557,7 @@ UPB_INLINE const grpc_lb_v1_FallbackResponse* grpc_lb_v1_LoadBalanceResponse_fal const grpc_lb_v1_FallbackResponse* default_val = NULL; const grpc_lb_v1_FallbackResponse* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__lb__v1__FallbackResponse_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -554,6 +569,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_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__lb__v1__InitialLoadBalanceResponse_msg_init); 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) { @@ -566,6 +582,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_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__lb__v1__ServerList_msg_init); 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) { @@ -578,6 +595,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_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__lb__v1__FallbackResponse_msg_init); 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) { @@ -671,6 +689,7 @@ UPB_INLINE const struct google_protobuf_Duration* grpc_lb_v1_InitialLoadBalanceR const struct google_protobuf_Duration* default_val = NULL; const struct google_protobuf_Duration* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -682,6 +701,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { @@ -735,6 +755,7 @@ UPB_INLINE void grpc_lb_v1_ServerList_clear_servers(grpc_lb_v1_ServerList* msg) } UPB_INLINE const grpc_lb_v1_Server* const* grpc_lb_v1_ServerList_servers(const grpc_lb_v1_ServerList* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__lb__v1__Server_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -746,6 +767,7 @@ UPB_INLINE const grpc_lb_v1_Server* const* grpc_lb_v1_ServerList_servers(const g } UPB_INLINE const upb_Array* _grpc_lb_v1_ServerList_servers_upb_array(const grpc_lb_v1_ServerList* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__lb__v1__Server_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -754,6 +776,7 @@ UPB_INLINE const upb_Array* _grpc_lb_v1_ServerList_servers_upb_array(const grpc_ } UPB_INLINE upb_Array* _grpc_lb_v1_ServerList_servers_mutable_upb_array(grpc_lb_v1_ServerList* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__lb__v1__Server_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -764,6 +787,7 @@ UPB_INLINE upb_Array* _grpc_lb_v1_ServerList_servers_mutable_upb_array(grpc_lb_v UPB_INLINE grpc_lb_v1_Server** grpc_lb_v1_ServerList_mutable_servers(grpc_lb_v1_ServerList* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__lb__v1__Server_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -780,6 +804,7 @@ UPB_INLINE grpc_lb_v1_Server** grpc_lb_v1_ServerList_resize_servers(grpc_lb_v1_S } UPB_INLINE struct grpc_lb_v1_Server* grpc_lb_v1_ServerList_add_servers(grpc_lb_v1_ServerList* msg, upb_Arena* arena) { upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__lb__v1__Server_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( diff --git a/src/core/ext/upb-gen/src/proto/grpc/lb/v1/load_balancer.upb_minitable.c b/src/core/ext/upb-gen/src/proto/grpc/lb/v1/load_balancer.upb_minitable.c index 58da640824c..e24186525dd 100644 --- a/src/core/ext/upb-gen/src/proto/grpc/lb/v1/load_balancer.upb_minitable.c +++ b/src/core/ext/upb-gen/src/proto/grpc/lb/v1/load_balancer.upb_minitable.c @@ -3,7 +3,8 @@ * src/proto/grpc/lb/v1/load_balancer.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -14,9 +15,10 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub grpc_lb_v1_LoadBalanceRequest_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &grpc__lb__v1__InitialLoadBalanceRequest_msg_init}, - {.UPB_PRIVATE(submsg) = &grpc__lb__v1__ClientStats_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal grpc_lb_v1_LoadBalanceRequest_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &grpc__lb__v1__InitialLoadBalanceRequest_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &grpc__lb__v1__ClientStats_msg_init_ptr}, }; static const upb_MiniTableField grpc_lb_v1_LoadBalanceRequest__fields[2] = { @@ -39,6 +41,7 @@ const upb_MiniTable grpc__lb__v1__LoadBalanceRequest_msg_init = { }) }; +const upb_MiniTable* grpc__lb__v1__LoadBalanceRequest_msg_init_ptr = &grpc__lb__v1__LoadBalanceRequest_msg_init; static const upb_MiniTableField grpc_lb_v1_InitialLoadBalanceRequest__fields[1] = { {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, }; @@ -56,6 +59,7 @@ const upb_MiniTable grpc__lb__v1__InitialLoadBalanceRequest_msg_init = { }) }; +const upb_MiniTable* grpc__lb__v1__InitialLoadBalanceRequest_msg_init_ptr = &grpc__lb__v1__InitialLoadBalanceRequest_msg_init; static const upb_MiniTableField grpc_lb_v1_ClientStatsPerToken__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, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, @@ -76,9 +80,10 @@ const upb_MiniTable grpc__lb__v1__ClientStatsPerToken_msg_init = { }) }; -static const upb_MiniTableSub grpc_lb_v1_ClientStats_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init}, - {.UPB_PRIVATE(submsg) = &grpc__lb__v1__ClientStatsPerToken_msg_init}, +const upb_MiniTable* grpc__lb__v1__ClientStatsPerToken_msg_init_ptr = &grpc__lb__v1__ClientStatsPerToken_msg_init; +static const upb_MiniTableSubInternal grpc_lb_v1_ClientStats_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &grpc__lb__v1__ClientStatsPerToken_msg_init_ptr}, }; static const upb_MiniTableField grpc_lb_v1_ClientStats__fields[6] = { @@ -117,10 +122,11 @@ const upb_MiniTable grpc__lb__v1__ClientStats_msg_init = { }) }; -static const upb_MiniTableSub grpc_lb_v1_LoadBalanceResponse_submsgs[3] = { - {.UPB_PRIVATE(submsg) = &grpc__lb__v1__InitialLoadBalanceResponse_msg_init}, - {.UPB_PRIVATE(submsg) = &grpc__lb__v1__ServerList_msg_init}, - {.UPB_PRIVATE(submsg) = &grpc__lb__v1__FallbackResponse_msg_init}, +const upb_MiniTable* grpc__lb__v1__ClientStats_msg_init_ptr = &grpc__lb__v1__ClientStats_msg_init; +static const upb_MiniTableSubInternal grpc_lb_v1_LoadBalanceResponse_submsgs[3] = { + {.UPB_PRIVATE(submsg) = &grpc__lb__v1__InitialLoadBalanceResponse_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &grpc__lb__v1__ServerList_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &grpc__lb__v1__FallbackResponse_msg_init_ptr}, }; static const upb_MiniTableField grpc_lb_v1_LoadBalanceResponse__fields[3] = { @@ -144,6 +150,7 @@ const upb_MiniTable grpc__lb__v1__LoadBalanceResponse_msg_init = { }) }; +const upb_MiniTable* grpc__lb__v1__LoadBalanceResponse_msg_init_ptr = &grpc__lb__v1__LoadBalanceResponse_msg_init; const upb_MiniTable grpc__lb__v1__FallbackResponse_msg_init = { NULL, NULL, @@ -153,8 +160,9 @@ const upb_MiniTable grpc__lb__v1__FallbackResponse_msg_init = { #endif }; -static const upb_MiniTableSub grpc_lb_v1_InitialLoadBalanceResponse_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, +const upb_MiniTable* grpc__lb__v1__FallbackResponse_msg_init_ptr = &grpc__lb__v1__FallbackResponse_msg_init; +static const upb_MiniTableSubInternal grpc_lb_v1_InitialLoadBalanceResponse_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, }; static const upb_MiniTableField grpc_lb_v1_InitialLoadBalanceResponse__fields[1] = { @@ -170,8 +178,9 @@ const upb_MiniTable grpc__lb__v1__InitialLoadBalanceResponse_msg_init = { #endif }; -static const upb_MiniTableSub grpc_lb_v1_ServerList_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &grpc__lb__v1__Server_msg_init}, +const upb_MiniTable* grpc__lb__v1__InitialLoadBalanceResponse_msg_init_ptr = &grpc__lb__v1__InitialLoadBalanceResponse_msg_init; +static const upb_MiniTableSubInternal grpc_lb_v1_ServerList_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &grpc__lb__v1__Server_msg_init_ptr}, }; static const upb_MiniTableField grpc_lb_v1_ServerList__fields[1] = { @@ -191,6 +200,7 @@ const upb_MiniTable grpc__lb__v1__ServerList_msg_init = { }) }; +const upb_MiniTable* grpc__lb__v1__ServerList_msg_init_ptr = &grpc__lb__v1__ServerList_msg_init; static const upb_MiniTableField grpc_lb_v1_Server__fields[4] = { {1, 16, 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, {2, 8, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, @@ -217,6 +227,7 @@ const upb_MiniTable grpc__lb__v1__Server_msg_init = { }) }; +const upb_MiniTable* grpc__lb__v1__Server_msg_init_ptr = &grpc__lb__v1__Server_msg_init; static const upb_MiniTable *messages_layout[9] = { &grpc__lb__v1__LoadBalanceRequest_msg_init, &grpc__lb__v1__InitialLoadBalanceRequest_msg_init, diff --git a/src/core/ext/upb-gen/src/proto/grpc/lb/v1/load_balancer.upb_minitable.h b/src/core/ext/upb-gen/src/proto/grpc/lb/v1/load_balancer.upb_minitable.h index 6178f8c94a3..34a1b9accc8 100644 --- a/src/core/ext/upb-gen/src/proto/grpc/lb/v1/load_balancer.upb_minitable.h +++ b/src/core/ext/upb-gen/src/proto/grpc/lb/v1/load_balancer.upb_minitable.h @@ -3,7 +3,8 @@ * src/proto/grpc/lb/v1/load_balancer.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef SRC_PROTO_GRPC_LB_V1_LOAD_BALANCER_PROTO_UPB_MINITABLE_H_ #define SRC_PROTO_GRPC_LB_V1_LOAD_BALANCER_PROTO_UPB_MINITABLE_H_ @@ -18,14 +19,23 @@ extern "C" { #endif extern const upb_MiniTable grpc__lb__v1__LoadBalanceRequest_msg_init; +extern const upb_MiniTable* grpc__lb__v1__LoadBalanceRequest_msg_init_ptr; extern const upb_MiniTable grpc__lb__v1__InitialLoadBalanceRequest_msg_init; +extern const upb_MiniTable* grpc__lb__v1__InitialLoadBalanceRequest_msg_init_ptr; extern const upb_MiniTable grpc__lb__v1__ClientStatsPerToken_msg_init; +extern const upb_MiniTable* grpc__lb__v1__ClientStatsPerToken_msg_init_ptr; extern const upb_MiniTable grpc__lb__v1__ClientStats_msg_init; +extern const upb_MiniTable* grpc__lb__v1__ClientStats_msg_init_ptr; extern const upb_MiniTable grpc__lb__v1__LoadBalanceResponse_msg_init; +extern const upb_MiniTable* grpc__lb__v1__LoadBalanceResponse_msg_init_ptr; extern const upb_MiniTable grpc__lb__v1__FallbackResponse_msg_init; +extern const upb_MiniTable* grpc__lb__v1__FallbackResponse_msg_init_ptr; extern const upb_MiniTable grpc__lb__v1__InitialLoadBalanceResponse_msg_init; +extern const upb_MiniTable* grpc__lb__v1__InitialLoadBalanceResponse_msg_init_ptr; extern const upb_MiniTable grpc__lb__v1__ServerList_msg_init; +extern const upb_MiniTable* grpc__lb__v1__ServerList_msg_init_ptr; extern const upb_MiniTable grpc__lb__v1__Server_msg_init; +extern const upb_MiniTable* grpc__lb__v1__Server_msg_init_ptr; extern const upb_MiniTableFile src_proto_grpc_lb_v1_load_balancer_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls.upb.h b/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls.upb.h index d7ca062b2c9..860d6d9ea31 100644 --- a/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls.upb.h +++ b/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls.upb.h @@ -3,7 +3,8 @@ * src/proto/grpc/lookup/v1/rls.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef SRC_PROTO_GRPC_LOOKUP_V1_RLS_PROTO_UPB_H_ #define SRC_PROTO_GRPC_LOOKUP_V1_RLS_PROTO_UPB_H_ @@ -90,22 +91,26 @@ UPB_INLINE size_t grpc_lookup_v1_RouteLookupRequest_key_map_size(const grpc_look } UPB_INLINE bool grpc_lookup_v1_RouteLookupRequest_key_map_get(const grpc_lookup_v1_RouteLookupRequest* msg, upb_StringView key, upb_StringView* val) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__lookup__v1__RouteLookupRequest__KeyMapEntry_msg_init); const upb_Map* map = upb_Message_GetMap(UPB_UPCAST(msg), &field); if (!map) return false; return _upb_Map_Get(map, &key, 0, val, 0); } UPB_INLINE const grpc_lookup_v1_RouteLookupRequest_KeyMapEntry* grpc_lookup_v1_RouteLookupRequest_key_map_next(const grpc_lookup_v1_RouteLookupRequest* msg, size_t* iter) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__lookup__v1__RouteLookupRequest__KeyMapEntry_msg_init); const upb_Map* map = upb_Message_GetMap(UPB_UPCAST(msg), &field); if (!map) return NULL; return (const grpc_lookup_v1_RouteLookupRequest_KeyMapEntry*)_upb_map_next(map, iter); } UPB_INLINE const upb_Map* _grpc_lookup_v1_RouteLookupRequest_key_map_upb_map(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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__lookup__v1__RouteLookupRequest__KeyMapEntry_msg_init); return upb_Message_GetMap(UPB_UPCAST(msg), &field); } UPB_INLINE upb_Map* _grpc_lookup_v1_RouteLookupRequest_key_map_mutable_upb_map(grpc_lookup_v1_RouteLookupRequest* msg, upb_Arena* a) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__lookup__v1__RouteLookupRequest__KeyMapEntry_msg_init); return _upb_Message_GetOrCreateMutableMap(UPB_UPCAST(msg), &field, 0, 0, a); } UPB_INLINE void grpc_lookup_v1_RouteLookupRequest_clear_reason(grpc_lookup_v1_RouteLookupRequest* msg) { @@ -145,6 +150,7 @@ UPB_INLINE void grpc_lookup_v1_RouteLookupRequest_key_map_clear(grpc_lookup_v1_R } UPB_INLINE bool grpc_lookup_v1_RouteLookupRequest_key_map_set(grpc_lookup_v1_RouteLookupRequest* msg, upb_StringView key, upb_StringView val, upb_Arena* a) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__lookup__v1__RouteLookupRequest__KeyMapEntry_msg_init); upb_Map* map = _upb_Message_GetOrCreateMutableMap(UPB_UPCAST(msg), &field, 0, 0, a); return _upb_Map_Insert(map, &key, 0, &val, 0, a) != @@ -158,6 +164,7 @@ UPB_INLINE bool grpc_lookup_v1_RouteLookupRequest_key_map_delete(grpc_lookup_v1_ } UPB_INLINE grpc_lookup_v1_RouteLookupRequest_KeyMapEntry* grpc_lookup_v1_RouteLookupRequest_key_map_nextmutable(grpc_lookup_v1_RouteLookupRequest* msg, size_t* iter) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__lookup__v1__RouteLookupRequest__KeyMapEntry_msg_init); upb_Map* map = (upb_Map*)upb_Message_GetMap(UPB_UPCAST(msg), &field); if (!map) return NULL; return (grpc_lookup_v1_RouteLookupRequest_KeyMapEntry*)_upb_map_next(map, iter); diff --git a/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls.upb_minitable.c b/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls.upb_minitable.c index 098eefb87cd..5cf5c7798f0 100644 --- a/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls.upb_minitable.c +++ b/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls.upb_minitable.c @@ -3,7 +3,8 @@ * src/proto/grpc/lookup/v1/rls.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -12,8 +13,9 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub grpc_lookup_v1_RouteLookupRequest_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &grpc__lookup__v1__RouteLookupRequest__KeyMapEntry_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal grpc_lookup_v1_RouteLookupRequest_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &grpc__lookup__v1__RouteLookupRequest__KeyMapEntry_msg_init_ptr}, }; static const upb_MiniTableField grpc_lookup_v1_RouteLookupRequest__fields[4] = { @@ -42,6 +44,7 @@ const upb_MiniTable grpc__lookup__v1__RouteLookupRequest_msg_init = { }) }; +const upb_MiniTable* grpc__lookup__v1__RouteLookupRequest_msg_init_ptr = &grpc__lookup__v1__RouteLookupRequest_msg_init; static const upb_MiniTableField grpc_lookup_v1_RouteLookupRequest_KeyMapEntry__fields[2] = { {1, 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)}, @@ -62,6 +65,7 @@ const upb_MiniTable grpc__lookup__v1__RouteLookupRequest__KeyMapEntry_msg_init = }) }; +const upb_MiniTable* grpc__lookup__v1__RouteLookupRequest__KeyMapEntry_msg_init_ptr = &grpc__lookup__v1__RouteLookupRequest__KeyMapEntry_msg_init; static const upb_MiniTableField grpc_lookup_v1_RouteLookupResponse__fields[2] = { {2, UPB_SIZE(12, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, {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)}, @@ -82,6 +86,7 @@ const upb_MiniTable grpc__lookup__v1__RouteLookupResponse_msg_init = { }) }; +const upb_MiniTable* grpc__lookup__v1__RouteLookupResponse_msg_init_ptr = &grpc__lookup__v1__RouteLookupResponse_msg_init; static const upb_MiniTable *messages_layout[3] = { &grpc__lookup__v1__RouteLookupRequest_msg_init, &grpc__lookup__v1__RouteLookupRequest__KeyMapEntry_msg_init, diff --git a/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls.upb_minitable.h b/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls.upb_minitable.h index 2f94131cf51..c2377276ef5 100644 --- a/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls.upb_minitable.h +++ b/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls.upb_minitable.h @@ -3,7 +3,8 @@ * src/proto/grpc/lookup/v1/rls.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef SRC_PROTO_GRPC_LOOKUP_V1_RLS_PROTO_UPB_MINITABLE_H_ #define SRC_PROTO_GRPC_LOOKUP_V1_RLS_PROTO_UPB_MINITABLE_H_ @@ -18,8 +19,11 @@ extern "C" { #endif extern const upb_MiniTable grpc__lookup__v1__RouteLookupRequest_msg_init; +extern const upb_MiniTable* grpc__lookup__v1__RouteLookupRequest_msg_init_ptr; extern const upb_MiniTable grpc__lookup__v1__RouteLookupRequest__KeyMapEntry_msg_init; +extern const upb_MiniTable* grpc__lookup__v1__RouteLookupRequest__KeyMapEntry_msg_init_ptr; extern const upb_MiniTable grpc__lookup__v1__RouteLookupResponse_msg_init; +extern const upb_MiniTable* grpc__lookup__v1__RouteLookupResponse_msg_init_ptr; extern const upb_MiniTableFile src_proto_grpc_lookup_v1_rls_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls_config.upb.h b/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls_config.upb.h index 41e7aa69f3d..b038b81d988 100644 --- a/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls_config.upb.h +++ b/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls_config.upb.h @@ -3,7 +3,8 @@ * src/proto/grpc/lookup/v1/rls_config.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef SRC_PROTO_GRPC_LOOKUP_V1_RLS_CONFIG_PROTO_UPB_H_ #define SRC_PROTO_GRPC_LOOKUP_V1_RLS_CONFIG_PROTO_UPB_H_ @@ -206,6 +207,7 @@ UPB_INLINE void grpc_lookup_v1_GrpcKeyBuilder_clear_names(grpc_lookup_v1_GrpcKey } UPB_INLINE const grpc_lookup_v1_GrpcKeyBuilder_Name* const* grpc_lookup_v1_GrpcKeyBuilder_names(const grpc_lookup_v1_GrpcKeyBuilder* msg, size_t* size) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__lookup__v1__GrpcKeyBuilder__Name_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -217,6 +219,7 @@ UPB_INLINE const grpc_lookup_v1_GrpcKeyBuilder_Name* const* grpc_lookup_v1_GrpcK } UPB_INLINE const upb_Array* _grpc_lookup_v1_GrpcKeyBuilder_names_upb_array(const grpc_lookup_v1_GrpcKeyBuilder* msg, size_t* size) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__lookup__v1__GrpcKeyBuilder__Name_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -225,6 +228,7 @@ UPB_INLINE const upb_Array* _grpc_lookup_v1_GrpcKeyBuilder_names_upb_array(const } UPB_INLINE upb_Array* _grpc_lookup_v1_GrpcKeyBuilder_names_mutable_upb_array(grpc_lookup_v1_GrpcKeyBuilder* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__lookup__v1__GrpcKeyBuilder__Name_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -238,6 +242,7 @@ UPB_INLINE void grpc_lookup_v1_GrpcKeyBuilder_clear_headers(grpc_lookup_v1_GrpcK } UPB_INLINE const grpc_lookup_v1_NameMatcher* const* grpc_lookup_v1_GrpcKeyBuilder_headers(const grpc_lookup_v1_GrpcKeyBuilder* msg, size_t* size) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__lookup__v1__NameMatcher_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -249,6 +254,7 @@ UPB_INLINE const grpc_lookup_v1_NameMatcher* const* grpc_lookup_v1_GrpcKeyBuilde } UPB_INLINE const upb_Array* _grpc_lookup_v1_GrpcKeyBuilder_headers_upb_array(const grpc_lookup_v1_GrpcKeyBuilder* msg, size_t* size) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__lookup__v1__NameMatcher_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -257,6 +263,7 @@ UPB_INLINE const upb_Array* _grpc_lookup_v1_GrpcKeyBuilder_headers_upb_array(con } UPB_INLINE upb_Array* _grpc_lookup_v1_GrpcKeyBuilder_headers_mutable_upb_array(grpc_lookup_v1_GrpcKeyBuilder* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__lookup__v1__NameMatcher_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -272,6 +279,7 @@ UPB_INLINE const grpc_lookup_v1_GrpcKeyBuilder_ExtraKeys* grpc_lookup_v1_GrpcKey const grpc_lookup_v1_GrpcKeyBuilder_ExtraKeys* default_val = NULL; const grpc_lookup_v1_GrpcKeyBuilder_ExtraKeys* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__lookup__v1__GrpcKeyBuilder__ExtraKeys_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -291,27 +299,32 @@ UPB_INLINE size_t grpc_lookup_v1_GrpcKeyBuilder_constant_keys_size(const grpc_lo } UPB_INLINE bool grpc_lookup_v1_GrpcKeyBuilder_constant_keys_get(const grpc_lookup_v1_GrpcKeyBuilder* msg, upb_StringView key, upb_StringView* val) { const upb_MiniTableField field = {4, UPB_SIZE(24, 40), 0, 3, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__lookup__v1__GrpcKeyBuilder__ConstantKeysEntry_msg_init); const upb_Map* map = upb_Message_GetMap(UPB_UPCAST(msg), &field); if (!map) return false; return _upb_Map_Get(map, &key, 0, val, 0); } UPB_INLINE const grpc_lookup_v1_GrpcKeyBuilder_ConstantKeysEntry* grpc_lookup_v1_GrpcKeyBuilder_constant_keys_next(const grpc_lookup_v1_GrpcKeyBuilder* msg, size_t* iter) { const upb_MiniTableField field = {4, UPB_SIZE(24, 40), 0, 3, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__lookup__v1__GrpcKeyBuilder__ConstantKeysEntry_msg_init); const upb_Map* map = upb_Message_GetMap(UPB_UPCAST(msg), &field); if (!map) return NULL; return (const grpc_lookup_v1_GrpcKeyBuilder_ConstantKeysEntry*)_upb_map_next(map, iter); } UPB_INLINE const upb_Map* _grpc_lookup_v1_GrpcKeyBuilder_constant_keys_upb_map(grpc_lookup_v1_GrpcKeyBuilder* msg) { const upb_MiniTableField field = {4, UPB_SIZE(24, 40), 0, 3, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__lookup__v1__GrpcKeyBuilder__ConstantKeysEntry_msg_init); return upb_Message_GetMap(UPB_UPCAST(msg), &field); } UPB_INLINE upb_Map* _grpc_lookup_v1_GrpcKeyBuilder_constant_keys_mutable_upb_map(grpc_lookup_v1_GrpcKeyBuilder* msg, upb_Arena* a) { const upb_MiniTableField field = {4, UPB_SIZE(24, 40), 0, 3, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__lookup__v1__GrpcKeyBuilder__ConstantKeysEntry_msg_init); return _upb_Message_GetOrCreateMutableMap(UPB_UPCAST(msg), &field, 0, 0, a); } UPB_INLINE grpc_lookup_v1_GrpcKeyBuilder_Name** grpc_lookup_v1_GrpcKeyBuilder_mutable_names(grpc_lookup_v1_GrpcKeyBuilder* msg, size_t* size) { upb_MiniTableField field = {1, UPB_SIZE(12, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__lookup__v1__GrpcKeyBuilder__Name_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -328,6 +341,7 @@ UPB_INLINE grpc_lookup_v1_GrpcKeyBuilder_Name** grpc_lookup_v1_GrpcKeyBuilder_re } UPB_INLINE struct grpc_lookup_v1_GrpcKeyBuilder_Name* grpc_lookup_v1_GrpcKeyBuilder_add_names(grpc_lookup_v1_GrpcKeyBuilder* msg, upb_Arena* arena) { upb_MiniTableField field = {1, UPB_SIZE(12, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__lookup__v1__GrpcKeyBuilder__Name_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -342,6 +356,7 @@ UPB_INLINE struct grpc_lookup_v1_GrpcKeyBuilder_Name* grpc_lookup_v1_GrpcKeyBuil } UPB_INLINE grpc_lookup_v1_NameMatcher** grpc_lookup_v1_GrpcKeyBuilder_mutable_headers(grpc_lookup_v1_GrpcKeyBuilder* msg, size_t* size) { upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__lookup__v1__NameMatcher_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -358,6 +373,7 @@ UPB_INLINE grpc_lookup_v1_NameMatcher** grpc_lookup_v1_GrpcKeyBuilder_resize_hea } UPB_INLINE struct grpc_lookup_v1_NameMatcher* grpc_lookup_v1_GrpcKeyBuilder_add_headers(grpc_lookup_v1_GrpcKeyBuilder* msg, upb_Arena* arena) { upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__lookup__v1__NameMatcher_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -372,6 +388,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_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__lookup__v1__GrpcKeyBuilder__ExtraKeys_msg_init); 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) { @@ -390,6 +407,7 @@ UPB_INLINE void grpc_lookup_v1_GrpcKeyBuilder_constant_keys_clear(grpc_lookup_v1 } UPB_INLINE bool grpc_lookup_v1_GrpcKeyBuilder_constant_keys_set(grpc_lookup_v1_GrpcKeyBuilder* msg, upb_StringView key, upb_StringView val, upb_Arena* a) { const upb_MiniTableField field = {4, UPB_SIZE(24, 40), 0, 3, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__lookup__v1__GrpcKeyBuilder__ConstantKeysEntry_msg_init); upb_Map* map = _upb_Message_GetOrCreateMutableMap(UPB_UPCAST(msg), &field, 0, 0, a); return _upb_Map_Insert(map, &key, 0, &val, 0, a) != @@ -403,6 +421,7 @@ UPB_INLINE bool grpc_lookup_v1_GrpcKeyBuilder_constant_keys_delete(grpc_lookup_v } UPB_INLINE grpc_lookup_v1_GrpcKeyBuilder_ConstantKeysEntry* grpc_lookup_v1_GrpcKeyBuilder_constant_keys_nextmutable(grpc_lookup_v1_GrpcKeyBuilder* msg, size_t* iter) { const upb_MiniTableField field = {4, UPB_SIZE(24, 40), 0, 3, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__lookup__v1__GrpcKeyBuilder__ConstantKeysEntry_msg_init); upb_Map* map = (upb_Map*)upb_Message_GetMap(UPB_UPCAST(msg), &field); if (!map) return NULL; return (grpc_lookup_v1_GrpcKeyBuilder_ConstantKeysEntry*)_upb_map_next(map, iter); @@ -687,6 +706,7 @@ UPB_INLINE void grpc_lookup_v1_HttpKeyBuilder_clear_query_parameters(grpc_lookup } UPB_INLINE const grpc_lookup_v1_NameMatcher* const* grpc_lookup_v1_HttpKeyBuilder_query_parameters(const grpc_lookup_v1_HttpKeyBuilder* msg, size_t* size) { const upb_MiniTableField field = {3, UPB_SIZE(16, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__lookup__v1__NameMatcher_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -698,6 +718,7 @@ UPB_INLINE const grpc_lookup_v1_NameMatcher* const* grpc_lookup_v1_HttpKeyBuilde } UPB_INLINE const upb_Array* _grpc_lookup_v1_HttpKeyBuilder_query_parameters_upb_array(const grpc_lookup_v1_HttpKeyBuilder* msg, size_t* size) { const upb_MiniTableField field = {3, UPB_SIZE(16, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__lookup__v1__NameMatcher_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -706,6 +727,7 @@ UPB_INLINE const upb_Array* _grpc_lookup_v1_HttpKeyBuilder_query_parameters_upb_ } UPB_INLINE upb_Array* _grpc_lookup_v1_HttpKeyBuilder_query_parameters_mutable_upb_array(grpc_lookup_v1_HttpKeyBuilder* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {3, UPB_SIZE(16, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__lookup__v1__NameMatcher_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -719,6 +741,7 @@ UPB_INLINE void grpc_lookup_v1_HttpKeyBuilder_clear_headers(grpc_lookup_v1_HttpK } UPB_INLINE const grpc_lookup_v1_NameMatcher* const* grpc_lookup_v1_HttpKeyBuilder_headers(const grpc_lookup_v1_HttpKeyBuilder* msg, size_t* size) { const upb_MiniTableField field = {4, UPB_SIZE(20, 32), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__lookup__v1__NameMatcher_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -730,6 +753,7 @@ UPB_INLINE const grpc_lookup_v1_NameMatcher* const* grpc_lookup_v1_HttpKeyBuilde } UPB_INLINE const upb_Array* _grpc_lookup_v1_HttpKeyBuilder_headers_upb_array(const grpc_lookup_v1_HttpKeyBuilder* msg, size_t* size) { const upb_MiniTableField field = {4, UPB_SIZE(20, 32), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__lookup__v1__NameMatcher_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -738,6 +762,7 @@ UPB_INLINE const upb_Array* _grpc_lookup_v1_HttpKeyBuilder_headers_upb_array(con } UPB_INLINE upb_Array* _grpc_lookup_v1_HttpKeyBuilder_headers_mutable_upb_array(grpc_lookup_v1_HttpKeyBuilder* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {4, UPB_SIZE(20, 32), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__lookup__v1__NameMatcher_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -756,22 +781,26 @@ UPB_INLINE size_t grpc_lookup_v1_HttpKeyBuilder_constant_keys_size(const grpc_lo } UPB_INLINE bool grpc_lookup_v1_HttpKeyBuilder_constant_keys_get(const grpc_lookup_v1_HttpKeyBuilder* msg, upb_StringView key, upb_StringView* val) { const upb_MiniTableField field = {5, UPB_SIZE(24, 40), 0, 2, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__lookup__v1__HttpKeyBuilder__ConstantKeysEntry_msg_init); const upb_Map* map = upb_Message_GetMap(UPB_UPCAST(msg), &field); if (!map) return false; return _upb_Map_Get(map, &key, 0, val, 0); } UPB_INLINE const grpc_lookup_v1_HttpKeyBuilder_ConstantKeysEntry* grpc_lookup_v1_HttpKeyBuilder_constant_keys_next(const grpc_lookup_v1_HttpKeyBuilder* msg, size_t* iter) { const upb_MiniTableField field = {5, UPB_SIZE(24, 40), 0, 2, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__lookup__v1__HttpKeyBuilder__ConstantKeysEntry_msg_init); const upb_Map* map = upb_Message_GetMap(UPB_UPCAST(msg), &field); if (!map) return NULL; return (const grpc_lookup_v1_HttpKeyBuilder_ConstantKeysEntry*)_upb_map_next(map, iter); } UPB_INLINE const upb_Map* _grpc_lookup_v1_HttpKeyBuilder_constant_keys_upb_map(grpc_lookup_v1_HttpKeyBuilder* msg) { const upb_MiniTableField field = {5, UPB_SIZE(24, 40), 0, 2, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__lookup__v1__HttpKeyBuilder__ConstantKeysEntry_msg_init); return upb_Message_GetMap(UPB_UPCAST(msg), &field); } UPB_INLINE upb_Map* _grpc_lookup_v1_HttpKeyBuilder_constant_keys_mutable_upb_map(grpc_lookup_v1_HttpKeyBuilder* msg, upb_Arena* a) { const upb_MiniTableField field = {5, UPB_SIZE(24, 40), 0, 2, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__lookup__v1__HttpKeyBuilder__ConstantKeysEntry_msg_init); return _upb_Message_GetOrCreateMutableMap(UPB_UPCAST(msg), &field, 0, 0, a); } @@ -833,6 +862,7 @@ UPB_INLINE bool grpc_lookup_v1_HttpKeyBuilder_add_path_patterns(grpc_lookup_v1_H } UPB_INLINE grpc_lookup_v1_NameMatcher** grpc_lookup_v1_HttpKeyBuilder_mutable_query_parameters(grpc_lookup_v1_HttpKeyBuilder* msg, size_t* size) { upb_MiniTableField field = {3, UPB_SIZE(16, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__lookup__v1__NameMatcher_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -849,6 +879,7 @@ UPB_INLINE grpc_lookup_v1_NameMatcher** grpc_lookup_v1_HttpKeyBuilder_resize_que } UPB_INLINE struct grpc_lookup_v1_NameMatcher* grpc_lookup_v1_HttpKeyBuilder_add_query_parameters(grpc_lookup_v1_HttpKeyBuilder* msg, upb_Arena* arena) { upb_MiniTableField field = {3, UPB_SIZE(16, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__lookup__v1__NameMatcher_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -863,6 +894,7 @@ UPB_INLINE struct grpc_lookup_v1_NameMatcher* grpc_lookup_v1_HttpKeyBuilder_add_ } UPB_INLINE grpc_lookup_v1_NameMatcher** grpc_lookup_v1_HttpKeyBuilder_mutable_headers(grpc_lookup_v1_HttpKeyBuilder* msg, size_t* size) { upb_MiniTableField field = {4, UPB_SIZE(20, 32), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__lookup__v1__NameMatcher_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -879,6 +911,7 @@ UPB_INLINE grpc_lookup_v1_NameMatcher** grpc_lookup_v1_HttpKeyBuilder_resize_hea } UPB_INLINE struct grpc_lookup_v1_NameMatcher* grpc_lookup_v1_HttpKeyBuilder_add_headers(grpc_lookup_v1_HttpKeyBuilder* msg, upb_Arena* arena) { upb_MiniTableField field = {4, UPB_SIZE(20, 32), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__lookup__v1__NameMatcher_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -899,6 +932,7 @@ UPB_INLINE void grpc_lookup_v1_HttpKeyBuilder_constant_keys_clear(grpc_lookup_v1 } UPB_INLINE bool grpc_lookup_v1_HttpKeyBuilder_constant_keys_set(grpc_lookup_v1_HttpKeyBuilder* msg, upb_StringView key, upb_StringView val, upb_Arena* a) { const upb_MiniTableField field = {5, UPB_SIZE(24, 40), 0, 2, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__lookup__v1__HttpKeyBuilder__ConstantKeysEntry_msg_init); upb_Map* map = _upb_Message_GetOrCreateMutableMap(UPB_UPCAST(msg), &field, 0, 0, a); return _upb_Map_Insert(map, &key, 0, &val, 0, a) != @@ -912,6 +946,7 @@ UPB_INLINE bool grpc_lookup_v1_HttpKeyBuilder_constant_keys_delete(grpc_lookup_v } UPB_INLINE grpc_lookup_v1_HttpKeyBuilder_ConstantKeysEntry* grpc_lookup_v1_HttpKeyBuilder_constant_keys_nextmutable(grpc_lookup_v1_HttpKeyBuilder* msg, size_t* iter) { const upb_MiniTableField field = {5, UPB_SIZE(24, 40), 0, 2, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__lookup__v1__HttpKeyBuilder__ConstantKeysEntry_msg_init); upb_Map* map = (upb_Map*)upb_Message_GetMap(UPB_UPCAST(msg), &field); if (!map) return NULL; return (grpc_lookup_v1_HttpKeyBuilder_ConstantKeysEntry*)_upb_map_next(map, iter); @@ -976,6 +1011,7 @@ UPB_INLINE void grpc_lookup_v1_RouteLookupConfig_clear_http_keybuilders(grpc_loo } UPB_INLINE const grpc_lookup_v1_HttpKeyBuilder* const* grpc_lookup_v1_RouteLookupConfig_http_keybuilders(const grpc_lookup_v1_RouteLookupConfig* msg, size_t* size) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__lookup__v1__HttpKeyBuilder_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -987,6 +1023,7 @@ UPB_INLINE const grpc_lookup_v1_HttpKeyBuilder* const* grpc_lookup_v1_RouteLooku } UPB_INLINE const upb_Array* _grpc_lookup_v1_RouteLookupConfig_http_keybuilders_upb_array(const grpc_lookup_v1_RouteLookupConfig* msg, size_t* size) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__lookup__v1__HttpKeyBuilder_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -995,6 +1032,7 @@ UPB_INLINE const upb_Array* _grpc_lookup_v1_RouteLookupConfig_http_keybuilders_u } UPB_INLINE upb_Array* _grpc_lookup_v1_RouteLookupConfig_http_keybuilders_mutable_upb_array(grpc_lookup_v1_RouteLookupConfig* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__lookup__v1__HttpKeyBuilder_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -1008,6 +1046,7 @@ UPB_INLINE void grpc_lookup_v1_RouteLookupConfig_clear_grpc_keybuilders(grpc_loo } UPB_INLINE const grpc_lookup_v1_GrpcKeyBuilder* const* grpc_lookup_v1_RouteLookupConfig_grpc_keybuilders(const grpc_lookup_v1_RouteLookupConfig* msg, size_t* size) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__lookup__v1__GrpcKeyBuilder_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1019,6 +1058,7 @@ UPB_INLINE const grpc_lookup_v1_GrpcKeyBuilder* const* grpc_lookup_v1_RouteLooku } UPB_INLINE const upb_Array* _grpc_lookup_v1_RouteLookupConfig_grpc_keybuilders_upb_array(const grpc_lookup_v1_RouteLookupConfig* msg, size_t* size) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__lookup__v1__GrpcKeyBuilder_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -1027,6 +1067,7 @@ UPB_INLINE const upb_Array* _grpc_lookup_v1_RouteLookupConfig_grpc_keybuilders_u } UPB_INLINE upb_Array* _grpc_lookup_v1_RouteLookupConfig_grpc_keybuilders_mutable_upb_array(grpc_lookup_v1_RouteLookupConfig* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__lookup__v1__GrpcKeyBuilder_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -1054,6 +1095,7 @@ UPB_INLINE const struct google_protobuf_Duration* grpc_lookup_v1_RouteLookupConf const struct google_protobuf_Duration* default_val = NULL; const struct google_protobuf_Duration* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1070,6 +1112,7 @@ UPB_INLINE const struct google_protobuf_Duration* grpc_lookup_v1_RouteLookupConf const struct google_protobuf_Duration* default_val = NULL; const struct google_protobuf_Duration* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1086,6 +1129,7 @@ UPB_INLINE const struct google_protobuf_Duration* grpc_lookup_v1_RouteLookupConf const struct google_protobuf_Duration* default_val = NULL; const struct google_protobuf_Duration* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1153,6 +1197,7 @@ UPB_INLINE upb_StringView grpc_lookup_v1_RouteLookupConfig_default_target(const UPB_INLINE grpc_lookup_v1_HttpKeyBuilder** grpc_lookup_v1_RouteLookupConfig_mutable_http_keybuilders(grpc_lookup_v1_RouteLookupConfig* msg, size_t* size) { upb_MiniTableField field = {1, UPB_SIZE(12, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__lookup__v1__HttpKeyBuilder_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1169,6 +1214,7 @@ UPB_INLINE grpc_lookup_v1_HttpKeyBuilder** grpc_lookup_v1_RouteLookupConfig_resi } UPB_INLINE struct grpc_lookup_v1_HttpKeyBuilder* grpc_lookup_v1_RouteLookupConfig_add_http_keybuilders(grpc_lookup_v1_RouteLookupConfig* msg, upb_Arena* arena) { upb_MiniTableField field = {1, UPB_SIZE(12, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__lookup__v1__HttpKeyBuilder_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -1183,6 +1229,7 @@ UPB_INLINE struct grpc_lookup_v1_HttpKeyBuilder* grpc_lookup_v1_RouteLookupConfi } UPB_INLINE grpc_lookup_v1_GrpcKeyBuilder** grpc_lookup_v1_RouteLookupConfig_mutable_grpc_keybuilders(grpc_lookup_v1_RouteLookupConfig* msg, size_t* size) { upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__lookup__v1__GrpcKeyBuilder_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1199,6 +1246,7 @@ UPB_INLINE grpc_lookup_v1_GrpcKeyBuilder** grpc_lookup_v1_RouteLookupConfig_resi } UPB_INLINE struct grpc_lookup_v1_GrpcKeyBuilder* grpc_lookup_v1_RouteLookupConfig_add_grpc_keybuilders(grpc_lookup_v1_RouteLookupConfig* msg, upb_Arena* arena) { upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__lookup__v1__GrpcKeyBuilder_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -1217,6 +1265,7 @@ UPB_INLINE void grpc_lookup_v1_RouteLookupConfig_set_lookup_service(grpc_lookup_ } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { @@ -1229,6 +1278,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { @@ -1241,6 +1291,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { @@ -1332,6 +1383,7 @@ UPB_INLINE const grpc_lookup_v1_RouteLookupConfig* grpc_lookup_v1_RouteLookupClu const grpc_lookup_v1_RouteLookupConfig* default_val = NULL; const grpc_lookup_v1_RouteLookupConfig* 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_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__lookup__v1__RouteLookupConfig_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1343,6 +1395,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_PRIVATE(_upb_MiniTable_StrongReference)(&grpc__lookup__v1__RouteLookupConfig_msg_init); 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) { diff --git a/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls_config.upb_minitable.c b/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls_config.upb_minitable.c index b9d68def848..fc297d25dc4 100644 --- a/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls_config.upb_minitable.c +++ b/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls_config.upb_minitable.c @@ -3,7 +3,8 @@ * src/proto/grpc/lookup/v1/rls_config.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -13,6 +14,7 @@ // Must be last. #include "upb/port/def.inc" +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); static const upb_MiniTableField grpc_lookup_v1_NameMatcher__fields[3] = { {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, {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)}, @@ -34,11 +36,12 @@ const upb_MiniTable grpc__lookup__v1__NameMatcher_msg_init = { }) }; -static const upb_MiniTableSub grpc_lookup_v1_GrpcKeyBuilder_submsgs[4] = { - {.UPB_PRIVATE(submsg) = &grpc__lookup__v1__GrpcKeyBuilder__Name_msg_init}, - {.UPB_PRIVATE(submsg) = &grpc__lookup__v1__NameMatcher_msg_init}, - {.UPB_PRIVATE(submsg) = &grpc__lookup__v1__GrpcKeyBuilder__ExtraKeys_msg_init}, - {.UPB_PRIVATE(submsg) = &grpc__lookup__v1__GrpcKeyBuilder__ConstantKeysEntry_msg_init}, +const upb_MiniTable* grpc__lookup__v1__NameMatcher_msg_init_ptr = &grpc__lookup__v1__NameMatcher_msg_init; +static const upb_MiniTableSubInternal grpc_lookup_v1_GrpcKeyBuilder_submsgs[4] = { + {.UPB_PRIVATE(submsg) = &grpc__lookup__v1__GrpcKeyBuilder__Name_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &grpc__lookup__v1__NameMatcher_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &grpc__lookup__v1__GrpcKeyBuilder__ExtraKeys_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &grpc__lookup__v1__GrpcKeyBuilder__ConstantKeysEntry_msg_init_ptr}, }; static const upb_MiniTableField grpc_lookup_v1_GrpcKeyBuilder__fields[4] = { @@ -63,6 +66,7 @@ const upb_MiniTable grpc__lookup__v1__GrpcKeyBuilder_msg_init = { }) }; +const upb_MiniTable* grpc__lookup__v1__GrpcKeyBuilder_msg_init_ptr = &grpc__lookup__v1__GrpcKeyBuilder_msg_init; static const upb_MiniTableField grpc_lookup_v1_GrpcKeyBuilder_Name__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)}, @@ -83,6 +87,7 @@ const upb_MiniTable grpc__lookup__v1__GrpcKeyBuilder__Name_msg_init = { }) }; +const upb_MiniTable* grpc__lookup__v1__GrpcKeyBuilder__Name_msg_init_ptr = &grpc__lookup__v1__GrpcKeyBuilder__Name_msg_init; static const upb_MiniTableField grpc_lookup_v1_GrpcKeyBuilder_ExtraKeys__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)}, @@ -104,6 +109,7 @@ const upb_MiniTable grpc__lookup__v1__GrpcKeyBuilder__ExtraKeys_msg_init = { }) }; +const upb_MiniTable* grpc__lookup__v1__GrpcKeyBuilder__ExtraKeys_msg_init_ptr = &grpc__lookup__v1__GrpcKeyBuilder__ExtraKeys_msg_init; static const upb_MiniTableField grpc_lookup_v1_GrpcKeyBuilder_ConstantKeysEntry__fields[2] = { {1, 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)}, @@ -124,10 +130,11 @@ const upb_MiniTable grpc__lookup__v1__GrpcKeyBuilder__ConstantKeysEntry_msg_init }) }; -static const upb_MiniTableSub grpc_lookup_v1_HttpKeyBuilder_submsgs[3] = { - {.UPB_PRIVATE(submsg) = &grpc__lookup__v1__NameMatcher_msg_init}, - {.UPB_PRIVATE(submsg) = &grpc__lookup__v1__NameMatcher_msg_init}, - {.UPB_PRIVATE(submsg) = &grpc__lookup__v1__HttpKeyBuilder__ConstantKeysEntry_msg_init}, +const upb_MiniTable* grpc__lookup__v1__GrpcKeyBuilder__ConstantKeysEntry_msg_init_ptr = &grpc__lookup__v1__GrpcKeyBuilder__ConstantKeysEntry_msg_init; +static const upb_MiniTableSubInternal grpc_lookup_v1_HttpKeyBuilder_submsgs[3] = { + {.UPB_PRIVATE(submsg) = &grpc__lookup__v1__NameMatcher_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &grpc__lookup__v1__NameMatcher_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &grpc__lookup__v1__HttpKeyBuilder__ConstantKeysEntry_msg_init_ptr}, }; static const upb_MiniTableField grpc_lookup_v1_HttpKeyBuilder__fields[5] = { @@ -157,6 +164,7 @@ const upb_MiniTable grpc__lookup__v1__HttpKeyBuilder_msg_init = { }) }; +const upb_MiniTable* grpc__lookup__v1__HttpKeyBuilder_msg_init_ptr = &grpc__lookup__v1__HttpKeyBuilder_msg_init; static const upb_MiniTableField grpc_lookup_v1_HttpKeyBuilder_ConstantKeysEntry__fields[2] = { {1, 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)}, @@ -177,12 +185,13 @@ const upb_MiniTable grpc__lookup__v1__HttpKeyBuilder__ConstantKeysEntry_msg_init }) }; -static const upb_MiniTableSub grpc_lookup_v1_RouteLookupConfig_submsgs[5] = { - {.UPB_PRIVATE(submsg) = &grpc__lookup__v1__HttpKeyBuilder_msg_init}, - {.UPB_PRIVATE(submsg) = &grpc__lookup__v1__GrpcKeyBuilder_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, +const upb_MiniTable* grpc__lookup__v1__HttpKeyBuilder__ConstantKeysEntry_msg_init_ptr = &grpc__lookup__v1__HttpKeyBuilder__ConstantKeysEntry_msg_init; +static const upb_MiniTableSubInternal grpc_lookup_v1_RouteLookupConfig_submsgs[5] = { + {.UPB_PRIVATE(submsg) = &grpc__lookup__v1__HttpKeyBuilder_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &grpc__lookup__v1__GrpcKeyBuilder_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, }; static const upb_MiniTableField grpc_lookup_v1_RouteLookupConfig__fields[9] = { @@ -224,8 +233,9 @@ const upb_MiniTable grpc__lookup__v1__RouteLookupConfig_msg_init = { }) }; -static const upb_MiniTableSub grpc_lookup_v1_RouteLookupClusterSpecifier_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &grpc__lookup__v1__RouteLookupConfig_msg_init}, +const upb_MiniTable* grpc__lookup__v1__RouteLookupConfig_msg_init_ptr = &grpc__lookup__v1__RouteLookupConfig_msg_init; +static const upb_MiniTableSubInternal grpc_lookup_v1_RouteLookupClusterSpecifier_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &grpc__lookup__v1__RouteLookupConfig_msg_init_ptr}, }; static const upb_MiniTableField grpc_lookup_v1_RouteLookupClusterSpecifier__fields[1] = { @@ -241,6 +251,7 @@ const upb_MiniTable grpc__lookup__v1__RouteLookupClusterSpecifier_msg_init = { #endif }; +const upb_MiniTable* grpc__lookup__v1__RouteLookupClusterSpecifier_msg_init_ptr = &grpc__lookup__v1__RouteLookupClusterSpecifier_msg_init; static const upb_MiniTable *messages_layout[9] = { &grpc__lookup__v1__NameMatcher_msg_init, &grpc__lookup__v1__GrpcKeyBuilder_msg_init, diff --git a/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls_config.upb_minitable.h b/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls_config.upb_minitable.h index d56e6e943ae..e9c96e79e95 100644 --- a/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls_config.upb_minitable.h +++ b/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls_config.upb_minitable.h @@ -3,7 +3,8 @@ * src/proto/grpc/lookup/v1/rls_config.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef SRC_PROTO_GRPC_LOOKUP_V1_RLS_CONFIG_PROTO_UPB_MINITABLE_H_ #define SRC_PROTO_GRPC_LOOKUP_V1_RLS_CONFIG_PROTO_UPB_MINITABLE_H_ @@ -18,14 +19,23 @@ extern "C" { #endif extern const upb_MiniTable grpc__lookup__v1__NameMatcher_msg_init; +extern const upb_MiniTable* grpc__lookup__v1__NameMatcher_msg_init_ptr; extern const upb_MiniTable grpc__lookup__v1__GrpcKeyBuilder_msg_init; +extern const upb_MiniTable* grpc__lookup__v1__GrpcKeyBuilder_msg_init_ptr; extern const upb_MiniTable grpc__lookup__v1__GrpcKeyBuilder__Name_msg_init; +extern const upb_MiniTable* grpc__lookup__v1__GrpcKeyBuilder__Name_msg_init_ptr; extern const upb_MiniTable grpc__lookup__v1__GrpcKeyBuilder__ExtraKeys_msg_init; +extern const upb_MiniTable* grpc__lookup__v1__GrpcKeyBuilder__ExtraKeys_msg_init_ptr; extern const upb_MiniTable grpc__lookup__v1__GrpcKeyBuilder__ConstantKeysEntry_msg_init; +extern const upb_MiniTable* grpc__lookup__v1__GrpcKeyBuilder__ConstantKeysEntry_msg_init_ptr; extern const upb_MiniTable grpc__lookup__v1__HttpKeyBuilder_msg_init; +extern const upb_MiniTable* grpc__lookup__v1__HttpKeyBuilder_msg_init_ptr; extern const upb_MiniTable grpc__lookup__v1__HttpKeyBuilder__ConstantKeysEntry_msg_init; +extern const upb_MiniTable* grpc__lookup__v1__HttpKeyBuilder__ConstantKeysEntry_msg_init_ptr; extern const upb_MiniTable grpc__lookup__v1__RouteLookupConfig_msg_init; +extern const upb_MiniTable* grpc__lookup__v1__RouteLookupConfig_msg_init_ptr; extern const upb_MiniTable grpc__lookup__v1__RouteLookupClusterSpecifier_msg_init; +extern const upb_MiniTable* grpc__lookup__v1__RouteLookupClusterSpecifier_msg_init_ptr; extern const upb_MiniTableFile src_proto_grpc_lookup_v1_rls_config_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/udpa/annotations/migrate.upb.h b/src/core/ext/upb-gen/udpa/annotations/migrate.upb.h index 3af3b765d84..cbacca9367e 100644 --- a/src/core/ext/upb-gen/udpa/annotations/migrate.upb.h +++ b/src/core/ext/upb-gen/udpa/annotations/migrate.upb.h @@ -3,7 +3,8 @@ * udpa/annotations/migrate.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef UDPA_ANNOTATIONS_MIGRATE_PROTO_UPB_H_ #define UDPA_ANNOTATIONS_MIGRATE_PROTO_UPB_H_ diff --git a/src/core/ext/upb-gen/udpa/annotations/migrate.upb_minitable.c b/src/core/ext/upb-gen/udpa/annotations/migrate.upb_minitable.c index 3b63134fa14..7031450a92a 100644 --- a/src/core/ext/upb-gen/udpa/annotations/migrate.upb_minitable.c +++ b/src/core/ext/upb-gen/udpa/annotations/migrate.upb_minitable.c @@ -3,7 +3,8 @@ * udpa/annotations/migrate.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -13,6 +14,7 @@ // Must be last. #include "upb/port/def.inc" +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); static const upb_MiniTableField udpa_annotations_MigrateAnnotation__fields[1] = { {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, }; @@ -30,6 +32,7 @@ const upb_MiniTable udpa__annotations__MigrateAnnotation_msg_init = { }) }; +const upb_MiniTable* udpa__annotations__MigrateAnnotation_msg_init_ptr = &udpa__annotations__MigrateAnnotation_msg_init; static const upb_MiniTableField udpa_annotations_FieldMigrateAnnotation__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)}, @@ -50,6 +53,7 @@ const upb_MiniTable udpa__annotations__FieldMigrateAnnotation_msg_init = { }) }; +const upb_MiniTable* udpa__annotations__FieldMigrateAnnotation_msg_init_ptr = &udpa__annotations__FieldMigrateAnnotation_msg_init; static const upb_MiniTableField udpa_annotations_FileMigrateAnnotation__fields[1] = { {2, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, }; @@ -69,42 +73,48 @@ const upb_MiniTable udpa__annotations__FileMigrateAnnotation_msg_init = { }) }; -static const upb_MiniTable *messages_layout[3] = { - &udpa__annotations__MigrateAnnotation_msg_init, - &udpa__annotations__FieldMigrateAnnotation_msg_init, - &udpa__annotations__FileMigrateAnnotation_msg_init, -}; - +const upb_MiniTable* udpa__annotations__FileMigrateAnnotation_msg_init_ptr = &udpa__annotations__FileMigrateAnnotation_msg_init; +UPB_LINKARR_APPEND(upb_AllExts) const upb_MiniTableExtension udpa_annotations_message_migrate_ext = { {171962766, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, &google__protobuf__MessageOptions_msg_init, {.UPB_PRIVATE(submsg) = &udpa__annotations__MigrateAnnotation_msg_init}, }; +UPB_LINKARR_APPEND(upb_AllExts) const upb_MiniTableExtension udpa_annotations_field_migrate_ext = { {171962766, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, &google__protobuf__FieldOptions_msg_init, {.UPB_PRIVATE(submsg) = &udpa__annotations__FieldMigrateAnnotation_msg_init}, }; +UPB_LINKARR_APPEND(upb_AllExts) const upb_MiniTableExtension udpa_annotations_enum_migrate_ext = { {171962766, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, &google__protobuf__EnumOptions_msg_init, {.UPB_PRIVATE(submsg) = &udpa__annotations__MigrateAnnotation_msg_init}, }; +UPB_LINKARR_APPEND(upb_AllExts) const upb_MiniTableExtension udpa_annotations_enum_value_migrate_ext = { {171962766, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, &google__protobuf__EnumValueOptions_msg_init, {.UPB_PRIVATE(submsg) = &udpa__annotations__MigrateAnnotation_msg_init}, }; +UPB_LINKARR_APPEND(upb_AllExts) const upb_MiniTableExtension udpa_annotations_file_migrate_ext = { {171962766, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, &google__protobuf__FileOptions_msg_init, {.UPB_PRIVATE(submsg) = &udpa__annotations__FileMigrateAnnotation_msg_init}, }; +static const upb_MiniTable *messages_layout[3] = { + &udpa__annotations__MigrateAnnotation_msg_init, + &udpa__annotations__FieldMigrateAnnotation_msg_init, + &udpa__annotations__FileMigrateAnnotation_msg_init, +}; + static const upb_MiniTableExtension *extensions_layout[5] = { &udpa_annotations_message_migrate_ext, diff --git a/src/core/ext/upb-gen/udpa/annotations/migrate.upb_minitable.h b/src/core/ext/upb-gen/udpa/annotations/migrate.upb_minitable.h index 21c1a12b78d..d5e29c205cd 100644 --- a/src/core/ext/upb-gen/udpa/annotations/migrate.upb_minitable.h +++ b/src/core/ext/upb-gen/udpa/annotations/migrate.upb_minitable.h @@ -3,7 +3,8 @@ * udpa/annotations/migrate.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef UDPA_ANNOTATIONS_MIGRATE_PROTO_UPB_MINITABLE_H_ #define UDPA_ANNOTATIONS_MIGRATE_PROTO_UPB_MINITABLE_H_ @@ -18,8 +19,11 @@ extern "C" { #endif extern const upb_MiniTable udpa__annotations__MigrateAnnotation_msg_init; +extern const upb_MiniTable* udpa__annotations__MigrateAnnotation_msg_init_ptr; extern const upb_MiniTable udpa__annotations__FieldMigrateAnnotation_msg_init; +extern const upb_MiniTable* udpa__annotations__FieldMigrateAnnotation_msg_init_ptr; extern const upb_MiniTable udpa__annotations__FileMigrateAnnotation_msg_init; +extern const upb_MiniTable* udpa__annotations__FileMigrateAnnotation_msg_init_ptr; extern const upb_MiniTableExtension udpa_annotations_message_migrate_ext; extern const upb_MiniTableExtension udpa_annotations_field_migrate_ext; extern const upb_MiniTableExtension udpa_annotations_enum_migrate_ext; diff --git a/src/core/ext/upb-gen/udpa/annotations/security.upb.h b/src/core/ext/upb-gen/udpa/annotations/security.upb.h index 3b00d090b77..dc3e0cfda3f 100644 --- a/src/core/ext/upb-gen/udpa/annotations/security.upb.h +++ b/src/core/ext/upb-gen/udpa/annotations/security.upb.h @@ -3,7 +3,8 @@ * udpa/annotations/security.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef UDPA_ANNOTATIONS_SECURITY_PROTO_UPB_H_ #define UDPA_ANNOTATIONS_SECURITY_PROTO_UPB_H_ diff --git a/src/core/ext/upb-gen/udpa/annotations/security.upb_minitable.c b/src/core/ext/upb-gen/udpa/annotations/security.upb_minitable.c index af73bd4cac0..b68773d1dd1 100644 --- a/src/core/ext/upb-gen/udpa/annotations/security.upb_minitable.c +++ b/src/core/ext/upb-gen/udpa/annotations/security.upb_minitable.c @@ -3,7 +3,8 @@ * udpa/annotations/security.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -14,6 +15,7 @@ // Must be last. #include "upb/port/def.inc" +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); static const upb_MiniTableField udpa_annotations_FieldSecurityAnnotation__fields[2] = { {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)}, @@ -34,16 +36,18 @@ const upb_MiniTable udpa__annotations__FieldSecurityAnnotation_msg_init = { }) }; -static const upb_MiniTable *messages_layout[1] = { - &udpa__annotations__FieldSecurityAnnotation_msg_init, -}; - +const upb_MiniTable* udpa__annotations__FieldSecurityAnnotation_msg_init_ptr = &udpa__annotations__FieldSecurityAnnotation_msg_init; +UPB_LINKARR_APPEND(upb_AllExts) const upb_MiniTableExtension udpa_annotations_security_ext = { {11122993, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, &google__protobuf__FieldOptions_msg_init, {.UPB_PRIVATE(submsg) = &udpa__annotations__FieldSecurityAnnotation_msg_init}, }; +static const upb_MiniTable *messages_layout[1] = { + &udpa__annotations__FieldSecurityAnnotation_msg_init, +}; + static const upb_MiniTableExtension *extensions_layout[1] = { &udpa_annotations_security_ext, diff --git a/src/core/ext/upb-gen/udpa/annotations/security.upb_minitable.h b/src/core/ext/upb-gen/udpa/annotations/security.upb_minitable.h index 839106b78ca..d138b821842 100644 --- a/src/core/ext/upb-gen/udpa/annotations/security.upb_minitable.h +++ b/src/core/ext/upb-gen/udpa/annotations/security.upb_minitable.h @@ -3,7 +3,8 @@ * udpa/annotations/security.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef UDPA_ANNOTATIONS_SECURITY_PROTO_UPB_MINITABLE_H_ #define UDPA_ANNOTATIONS_SECURITY_PROTO_UPB_MINITABLE_H_ @@ -18,6 +19,7 @@ extern "C" { #endif extern const upb_MiniTable udpa__annotations__FieldSecurityAnnotation_msg_init; +extern const upb_MiniTable* udpa__annotations__FieldSecurityAnnotation_msg_init_ptr; extern const upb_MiniTableExtension udpa_annotations_security_ext; extern const upb_MiniTableFile udpa_annotations_security_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/udpa/annotations/sensitive.upb.h b/src/core/ext/upb-gen/udpa/annotations/sensitive.upb.h index 3196d9cff37..47ced77bc69 100644 --- a/src/core/ext/upb-gen/udpa/annotations/sensitive.upb.h +++ b/src/core/ext/upb-gen/udpa/annotations/sensitive.upb.h @@ -3,7 +3,8 @@ * udpa/annotations/sensitive.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef UDPA_ANNOTATIONS_SENSITIVE_PROTO_UPB_H_ #define UDPA_ANNOTATIONS_SENSITIVE_PROTO_UPB_H_ diff --git a/src/core/ext/upb-gen/udpa/annotations/sensitive.upb_minitable.c b/src/core/ext/upb-gen/udpa/annotations/sensitive.upb_minitable.c index 6ea9a555811..5f5ed154fb7 100644 --- a/src/core/ext/upb-gen/udpa/annotations/sensitive.upb_minitable.c +++ b/src/core/ext/upb-gen/udpa/annotations/sensitive.upb_minitable.c @@ -3,7 +3,8 @@ * udpa/annotations/sensitive.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -13,6 +14,8 @@ // Must be last. #include "upb/port/def.inc" +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +UPB_LINKARR_APPEND(upb_AllExts) const upb_MiniTableExtension udpa_annotations_sensitive_ext = { {76569463, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, &google__protobuf__FieldOptions_msg_init, diff --git a/src/core/ext/upb-gen/udpa/annotations/sensitive.upb_minitable.h b/src/core/ext/upb-gen/udpa/annotations/sensitive.upb_minitable.h index 90ac5b1f219..e170b43b4ba 100644 --- a/src/core/ext/upb-gen/udpa/annotations/sensitive.upb_minitable.h +++ b/src/core/ext/upb-gen/udpa/annotations/sensitive.upb_minitable.h @@ -3,7 +3,8 @@ * udpa/annotations/sensitive.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef UDPA_ANNOTATIONS_SENSITIVE_PROTO_UPB_MINITABLE_H_ #define UDPA_ANNOTATIONS_SENSITIVE_PROTO_UPB_MINITABLE_H_ diff --git a/src/core/ext/upb-gen/udpa/annotations/status.upb.h b/src/core/ext/upb-gen/udpa/annotations/status.upb.h index 95f710a5a38..7ee7316dd0e 100644 --- a/src/core/ext/upb-gen/udpa/annotations/status.upb.h +++ b/src/core/ext/upb-gen/udpa/annotations/status.upb.h @@ -3,7 +3,8 @@ * udpa/annotations/status.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef UDPA_ANNOTATIONS_STATUS_PROTO_UPB_H_ #define UDPA_ANNOTATIONS_STATUS_PROTO_UPB_H_ diff --git a/src/core/ext/upb-gen/udpa/annotations/status.upb_minitable.c b/src/core/ext/upb-gen/udpa/annotations/status.upb_minitable.c index 2eb07ceec14..d77e7fc73af 100644 --- a/src/core/ext/upb-gen/udpa/annotations/status.upb_minitable.c +++ b/src/core/ext/upb-gen/udpa/annotations/status.upb_minitable.c @@ -3,7 +3,8 @@ * udpa/annotations/status.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -13,6 +14,7 @@ // Must be last. #include "upb/port/def.inc" +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); static const upb_MiniTableField udpa_annotations_StatusAnnotation__fields[2] = { {1, 8, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, {2, 12, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, @@ -33,16 +35,18 @@ const upb_MiniTable udpa__annotations__StatusAnnotation_msg_init = { }) }; -static const upb_MiniTable *messages_layout[1] = { - &udpa__annotations__StatusAnnotation_msg_init, -}; - +const upb_MiniTable* udpa__annotations__StatusAnnotation_msg_init_ptr = &udpa__annotations__StatusAnnotation_msg_init; +UPB_LINKARR_APPEND(upb_AllExts) const upb_MiniTableExtension udpa_annotations_file_status_ext = { {222707719, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, &google__protobuf__FileOptions_msg_init, {.UPB_PRIVATE(submsg) = &udpa__annotations__StatusAnnotation_msg_init}, }; +static const upb_MiniTable *messages_layout[1] = { + &udpa__annotations__StatusAnnotation_msg_init, +}; + static const upb_MiniTableExtension *extensions_layout[1] = { &udpa_annotations_file_status_ext, diff --git a/src/core/ext/upb-gen/udpa/annotations/status.upb_minitable.h b/src/core/ext/upb-gen/udpa/annotations/status.upb_minitable.h index 67fc1275059..04aa1e84a8a 100644 --- a/src/core/ext/upb-gen/udpa/annotations/status.upb_minitable.h +++ b/src/core/ext/upb-gen/udpa/annotations/status.upb_minitable.h @@ -3,7 +3,8 @@ * udpa/annotations/status.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef UDPA_ANNOTATIONS_STATUS_PROTO_UPB_MINITABLE_H_ #define UDPA_ANNOTATIONS_STATUS_PROTO_UPB_MINITABLE_H_ @@ -18,6 +19,7 @@ extern "C" { #endif extern const upb_MiniTable udpa__annotations__StatusAnnotation_msg_init; +extern const upb_MiniTable* udpa__annotations__StatusAnnotation_msg_init_ptr; extern const upb_MiniTableExtension udpa_annotations_file_status_ext; extern const upb_MiniTableFile udpa_annotations_status_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/udpa/annotations/versioning.upb.h b/src/core/ext/upb-gen/udpa/annotations/versioning.upb.h index a9bfb48a4f8..57e780b6745 100644 --- a/src/core/ext/upb-gen/udpa/annotations/versioning.upb.h +++ b/src/core/ext/upb-gen/udpa/annotations/versioning.upb.h @@ -3,7 +3,8 @@ * udpa/annotations/versioning.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef UDPA_ANNOTATIONS_VERSIONING_PROTO_UPB_H_ #define UDPA_ANNOTATIONS_VERSIONING_PROTO_UPB_H_ diff --git a/src/core/ext/upb-gen/udpa/annotations/versioning.upb_minitable.c b/src/core/ext/upb-gen/udpa/annotations/versioning.upb_minitable.c index fcb4fdea2a5..d847c18aa57 100644 --- a/src/core/ext/upb-gen/udpa/annotations/versioning.upb_minitable.c +++ b/src/core/ext/upb-gen/udpa/annotations/versioning.upb_minitable.c @@ -3,7 +3,8 @@ * udpa/annotations/versioning.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -13,6 +14,7 @@ // Must be last. #include "upb/port/def.inc" +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); static const upb_MiniTableField udpa_annotations_VersioningAnnotation__fields[1] = { {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, }; @@ -30,16 +32,18 @@ const upb_MiniTable udpa__annotations__VersioningAnnotation_msg_init = { }) }; -static const upb_MiniTable *messages_layout[1] = { - &udpa__annotations__VersioningAnnotation_msg_init, -}; - +const upb_MiniTable* udpa__annotations__VersioningAnnotation_msg_init_ptr = &udpa__annotations__VersioningAnnotation_msg_init; +UPB_LINKARR_APPEND(upb_AllExts) const upb_MiniTableExtension udpa_annotations_versioning_ext = { {7881811, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, &google__protobuf__MessageOptions_msg_init, {.UPB_PRIVATE(submsg) = &udpa__annotations__VersioningAnnotation_msg_init}, }; +static const upb_MiniTable *messages_layout[1] = { + &udpa__annotations__VersioningAnnotation_msg_init, +}; + static const upb_MiniTableExtension *extensions_layout[1] = { &udpa_annotations_versioning_ext, diff --git a/src/core/ext/upb-gen/udpa/annotations/versioning.upb_minitable.h b/src/core/ext/upb-gen/udpa/annotations/versioning.upb_minitable.h index 752e4ae20cf..e1055ffb915 100644 --- a/src/core/ext/upb-gen/udpa/annotations/versioning.upb_minitable.h +++ b/src/core/ext/upb-gen/udpa/annotations/versioning.upb_minitable.h @@ -3,7 +3,8 @@ * udpa/annotations/versioning.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef UDPA_ANNOTATIONS_VERSIONING_PROTO_UPB_MINITABLE_H_ #define UDPA_ANNOTATIONS_VERSIONING_PROTO_UPB_MINITABLE_H_ @@ -18,6 +19,7 @@ extern "C" { #endif extern const upb_MiniTable udpa__annotations__VersioningAnnotation_msg_init; +extern const upb_MiniTable* udpa__annotations__VersioningAnnotation_msg_init_ptr; extern const upb_MiniTableExtension udpa_annotations_versioning_ext; extern const upb_MiniTableFile udpa_annotations_versioning_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/validate/validate.upb.h b/src/core/ext/upb-gen/validate/validate.upb.h index ae9329d7eae..ee9ced7076a 100644 --- a/src/core/ext/upb-gen/validate/validate.upb.h +++ b/src/core/ext/upb-gen/validate/validate.upb.h @@ -3,7 +3,8 @@ * validate/validate.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef VALIDATE_VALIDATE_PROTO_UPB_H_ #define VALIDATE_VALIDATE_PROTO_UPB_H_ @@ -133,6 +134,7 @@ UPB_INLINE const validate_FloatRules* validate_FieldRules_float(const validate_F const validate_FloatRules* default_val = NULL; const validate_FloatRules* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&validate__FloatRules_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -149,6 +151,7 @@ UPB_INLINE const validate_DoubleRules* validate_FieldRules_double(const validate const validate_DoubleRules* default_val = NULL; const validate_DoubleRules* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&validate__DoubleRules_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -165,6 +168,7 @@ UPB_INLINE const validate_Int32Rules* validate_FieldRules_int32(const validate_F const validate_Int32Rules* default_val = NULL; const validate_Int32Rules* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&validate__Int32Rules_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -181,6 +185,7 @@ UPB_INLINE const validate_Int64Rules* validate_FieldRules_int64(const validate_F const validate_Int64Rules* default_val = NULL; const validate_Int64Rules* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&validate__Int64Rules_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -197,6 +202,7 @@ UPB_INLINE const validate_UInt32Rules* validate_FieldRules_uint32(const validate const validate_UInt32Rules* default_val = NULL; const validate_UInt32Rules* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&validate__UInt32Rules_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -213,6 +219,7 @@ UPB_INLINE const validate_UInt64Rules* validate_FieldRules_uint64(const validate const validate_UInt64Rules* default_val = NULL; const validate_UInt64Rules* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&validate__UInt64Rules_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -229,6 +236,7 @@ UPB_INLINE const validate_SInt32Rules* validate_FieldRules_sint32(const validate const validate_SInt32Rules* default_val = NULL; const validate_SInt32Rules* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&validate__SInt32Rules_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -245,6 +253,7 @@ UPB_INLINE const validate_SInt64Rules* validate_FieldRules_sint64(const validate const validate_SInt64Rules* default_val = NULL; const validate_SInt64Rules* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&validate__SInt64Rules_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -261,6 +270,7 @@ UPB_INLINE const validate_Fixed32Rules* validate_FieldRules_fixed32(const valida const validate_Fixed32Rules* default_val = NULL; const validate_Fixed32Rules* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&validate__Fixed32Rules_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -277,6 +287,7 @@ UPB_INLINE const validate_Fixed64Rules* validate_FieldRules_fixed64(const valida const validate_Fixed64Rules* default_val = NULL; const validate_Fixed64Rules* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&validate__Fixed64Rules_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -293,6 +304,7 @@ UPB_INLINE const validate_SFixed32Rules* validate_FieldRules_sfixed32(const vali const validate_SFixed32Rules* default_val = NULL; const validate_SFixed32Rules* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&validate__SFixed32Rules_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -309,6 +321,7 @@ UPB_INLINE const validate_SFixed64Rules* validate_FieldRules_sfixed64(const vali const validate_SFixed64Rules* default_val = NULL; const validate_SFixed64Rules* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&validate__SFixed64Rules_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -325,6 +338,7 @@ UPB_INLINE const validate_BoolRules* validate_FieldRules_bool(const validate_Fie const validate_BoolRules* default_val = NULL; const validate_BoolRules* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&validate__BoolRules_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -341,6 +355,7 @@ UPB_INLINE const validate_StringRules* validate_FieldRules_string(const validate const validate_StringRules* default_val = NULL; const validate_StringRules* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&validate__StringRules_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -357,6 +372,7 @@ UPB_INLINE const validate_BytesRules* validate_FieldRules_bytes(const validate_F const validate_BytesRules* default_val = NULL; const validate_BytesRules* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&validate__BytesRules_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -373,6 +389,7 @@ UPB_INLINE const validate_EnumRules* validate_FieldRules_enum(const validate_Fie const validate_EnumRules* default_val = NULL; const validate_EnumRules* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&validate__EnumRules_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -389,6 +406,7 @@ UPB_INLINE const validate_MessageRules* validate_FieldRules_message(const valida const validate_MessageRules* default_val = NULL; const validate_MessageRules* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&validate__MessageRules_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -405,6 +423,7 @@ UPB_INLINE const validate_RepeatedRules* validate_FieldRules_repeated(const vali const validate_RepeatedRules* default_val = NULL; const validate_RepeatedRules* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&validate__RepeatedRules_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -421,6 +440,7 @@ UPB_INLINE const validate_MapRules* validate_FieldRules_map(const validate_Field const validate_MapRules* default_val = NULL; const validate_MapRules* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&validate__MapRules_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -437,6 +457,7 @@ UPB_INLINE const validate_AnyRules* validate_FieldRules_any(const validate_Field const validate_AnyRules* default_val = NULL; const validate_AnyRules* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&validate__AnyRules_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -453,6 +474,7 @@ UPB_INLINE const validate_DurationRules* validate_FieldRules_duration(const vali const validate_DurationRules* default_val = NULL; const validate_DurationRules* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&validate__DurationRules_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -469,6 +491,7 @@ UPB_INLINE const validate_TimestampRules* validate_FieldRules_timestamp(const va const validate_TimestampRules* default_val = NULL; const validate_TimestampRules* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&validate__TimestampRules_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -480,6 +503,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_PRIVATE(_upb_MiniTable_StrongReference)(&validate__FloatRules_msg_init); upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct validate_FloatRules* validate_FieldRules_mutable_float(validate_FieldRules* msg, upb_Arena* arena) { @@ -492,6 +516,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_PRIVATE(_upb_MiniTable_StrongReference)(&validate__DoubleRules_msg_init); upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct validate_DoubleRules* validate_FieldRules_mutable_double(validate_FieldRules* msg, upb_Arena* arena) { @@ -504,6 +529,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_PRIVATE(_upb_MiniTable_StrongReference)(&validate__Int32Rules_msg_init); upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct validate_Int32Rules* validate_FieldRules_mutable_int32(validate_FieldRules* msg, upb_Arena* arena) { @@ -516,6 +542,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_PRIVATE(_upb_MiniTable_StrongReference)(&validate__Int64Rules_msg_init); upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct validate_Int64Rules* validate_FieldRules_mutable_int64(validate_FieldRules* msg, upb_Arena* arena) { @@ -528,6 +555,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_PRIVATE(_upb_MiniTable_StrongReference)(&validate__UInt32Rules_msg_init); upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct validate_UInt32Rules* validate_FieldRules_mutable_uint32(validate_FieldRules* msg, upb_Arena* arena) { @@ -540,6 +568,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_PRIVATE(_upb_MiniTable_StrongReference)(&validate__UInt64Rules_msg_init); upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct validate_UInt64Rules* validate_FieldRules_mutable_uint64(validate_FieldRules* msg, upb_Arena* arena) { @@ -552,6 +581,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_PRIVATE(_upb_MiniTable_StrongReference)(&validate__SInt32Rules_msg_init); upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct validate_SInt32Rules* validate_FieldRules_mutable_sint32(validate_FieldRules* msg, upb_Arena* arena) { @@ -564,6 +594,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_PRIVATE(_upb_MiniTable_StrongReference)(&validate__SInt64Rules_msg_init); upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct validate_SInt64Rules* validate_FieldRules_mutable_sint64(validate_FieldRules* msg, upb_Arena* arena) { @@ -576,6 +607,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_PRIVATE(_upb_MiniTable_StrongReference)(&validate__Fixed32Rules_msg_init); upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct validate_Fixed32Rules* validate_FieldRules_mutable_fixed32(validate_FieldRules* msg, upb_Arena* arena) { @@ -588,6 +620,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_PRIVATE(_upb_MiniTable_StrongReference)(&validate__Fixed64Rules_msg_init); upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct validate_Fixed64Rules* validate_FieldRules_mutable_fixed64(validate_FieldRules* msg, upb_Arena* arena) { @@ -600,6 +633,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_PRIVATE(_upb_MiniTable_StrongReference)(&validate__SFixed32Rules_msg_init); upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct validate_SFixed32Rules* validate_FieldRules_mutable_sfixed32(validate_FieldRules* msg, upb_Arena* arena) { @@ -612,6 +646,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_PRIVATE(_upb_MiniTable_StrongReference)(&validate__SFixed64Rules_msg_init); upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct validate_SFixed64Rules* validate_FieldRules_mutable_sfixed64(validate_FieldRules* msg, upb_Arena* arena) { @@ -624,6 +659,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_PRIVATE(_upb_MiniTable_StrongReference)(&validate__BoolRules_msg_init); upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct validate_BoolRules* validate_FieldRules_mutable_bool(validate_FieldRules* msg, upb_Arena* arena) { @@ -636,6 +672,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_PRIVATE(_upb_MiniTable_StrongReference)(&validate__StringRules_msg_init); upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct validate_StringRules* validate_FieldRules_mutable_string(validate_FieldRules* msg, upb_Arena* arena) { @@ -648,6 +685,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_PRIVATE(_upb_MiniTable_StrongReference)(&validate__BytesRules_msg_init); upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct validate_BytesRules* validate_FieldRules_mutable_bytes(validate_FieldRules* msg, upb_Arena* arena) { @@ -660,6 +698,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_PRIVATE(_upb_MiniTable_StrongReference)(&validate__EnumRules_msg_init); upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct validate_EnumRules* validate_FieldRules_mutable_enum(validate_FieldRules* msg, upb_Arena* arena) { @@ -672,6 +711,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_PRIVATE(_upb_MiniTable_StrongReference)(&validate__MessageRules_msg_init); upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct validate_MessageRules* validate_FieldRules_mutable_message(validate_FieldRules* msg, upb_Arena* arena) { @@ -684,6 +724,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_PRIVATE(_upb_MiniTable_StrongReference)(&validate__RepeatedRules_msg_init); upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct validate_RepeatedRules* validate_FieldRules_mutable_repeated(validate_FieldRules* msg, upb_Arena* arena) { @@ -696,6 +737,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_PRIVATE(_upb_MiniTable_StrongReference)(&validate__MapRules_msg_init); upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct validate_MapRules* validate_FieldRules_mutable_map(validate_FieldRules* msg, upb_Arena* arena) { @@ -708,6 +750,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_PRIVATE(_upb_MiniTable_StrongReference)(&validate__AnyRules_msg_init); upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct validate_AnyRules* validate_FieldRules_mutable_any(validate_FieldRules* msg, upb_Arena* arena) { @@ -720,6 +763,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_PRIVATE(_upb_MiniTable_StrongReference)(&validate__DurationRules_msg_init); upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct validate_DurationRules* validate_FieldRules_mutable_duration(validate_FieldRules* msg, upb_Arena* arena) { @@ -732,6 +776,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_PRIVATE(_upb_MiniTable_StrongReference)(&validate__TimestampRules_msg_init); upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct validate_TimestampRules* validate_FieldRules_mutable_timestamp(validate_FieldRules* msg, upb_Arena* arena) { @@ -5570,6 +5615,7 @@ UPB_INLINE const validate_FieldRules* validate_RepeatedRules_items(const validat const validate_FieldRules* default_val = NULL; const validate_FieldRules* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&validate__FieldRules_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -5609,6 +5655,7 @@ UPB_INLINE void validate_RepeatedRules_set_unique(validate_RepeatedRules *msg, b } 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_PRIVATE(_upb_MiniTable_StrongReference)(&validate__FieldRules_msg_init); upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct validate_FieldRules* validate_RepeatedRules_mutable_items(validate_RepeatedRules* msg, upb_Arena* arena) { @@ -5716,6 +5763,7 @@ UPB_INLINE const validate_FieldRules* validate_MapRules_keys(const validate_MapR const validate_FieldRules* default_val = NULL; const validate_FieldRules* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&validate__FieldRules_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -5732,6 +5780,7 @@ UPB_INLINE const validate_FieldRules* validate_MapRules_values(const validate_Ma const validate_FieldRules* default_val = NULL; const validate_FieldRules* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&validate__FieldRules_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -5771,6 +5820,7 @@ UPB_INLINE void validate_MapRules_set_no_sparse(validate_MapRules *msg, bool val } 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_PRIVATE(_upb_MiniTable_StrongReference)(&validate__FieldRules_msg_init); upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct validate_FieldRules* validate_MapRules_mutable_keys(validate_MapRules* msg, upb_Arena* arena) { @@ -5783,6 +5833,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_PRIVATE(_upb_MiniTable_StrongReference)(&validate__FieldRules_msg_init); upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct validate_FieldRules* validate_MapRules_mutable_values(validate_MapRules* msg, upb_Arena* arena) { @@ -6036,6 +6087,7 @@ UPB_INLINE const struct google_protobuf_Duration* validate_DurationRules_const(c const struct google_protobuf_Duration* default_val = NULL; const struct google_protobuf_Duration* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -6052,6 +6104,7 @@ UPB_INLINE const struct google_protobuf_Duration* validate_DurationRules_lt(cons const struct google_protobuf_Duration* default_val = NULL; const struct google_protobuf_Duration* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -6068,6 +6121,7 @@ UPB_INLINE const struct google_protobuf_Duration* validate_DurationRules_lte(con const struct google_protobuf_Duration* default_val = NULL; const struct google_protobuf_Duration* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -6084,6 +6138,7 @@ UPB_INLINE const struct google_protobuf_Duration* validate_DurationRules_gt(cons const struct google_protobuf_Duration* default_val = NULL; const struct google_protobuf_Duration* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -6100,6 +6155,7 @@ UPB_INLINE const struct google_protobuf_Duration* validate_DurationRules_gte(con const struct google_protobuf_Duration* default_val = NULL; const struct google_protobuf_Duration* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -6114,6 +6170,7 @@ UPB_INLINE void validate_DurationRules_clear_in(validate_DurationRules* msg) { } UPB_INLINE const struct google_protobuf_Duration* const* validate_DurationRules_in(const validate_DurationRules* msg, size_t* size) { const upb_MiniTableField field = {7, UPB_SIZE(32, 56), 0, 5, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -6125,6 +6182,7 @@ UPB_INLINE const struct google_protobuf_Duration* const* validate_DurationRules_ } UPB_INLINE const upb_Array* _validate_DurationRules_in_upb_array(const validate_DurationRules* msg, size_t* size) { const upb_MiniTableField field = {7, UPB_SIZE(32, 56), 0, 5, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -6133,6 +6191,7 @@ UPB_INLINE const upb_Array* _validate_DurationRules_in_upb_array(const validate_ } UPB_INLINE upb_Array* _validate_DurationRules_in_mutable_upb_array(validate_DurationRules* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {7, UPB_SIZE(32, 56), 0, 5, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -6146,6 +6205,7 @@ UPB_INLINE void validate_DurationRules_clear_not_in(validate_DurationRules* msg) } UPB_INLINE const struct google_protobuf_Duration* const* validate_DurationRules_not_in(const validate_DurationRules* msg, size_t* size) { const upb_MiniTableField field = {8, UPB_SIZE(36, 64), 0, 6, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -6157,6 +6217,7 @@ UPB_INLINE const struct google_protobuf_Duration* const* validate_DurationRules_ } UPB_INLINE const upb_Array* _validate_DurationRules_not_in_upb_array(const validate_DurationRules* msg, size_t* size) { const upb_MiniTableField field = {8, UPB_SIZE(36, 64), 0, 6, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -6165,6 +6226,7 @@ UPB_INLINE const upb_Array* _validate_DurationRules_not_in_upb_array(const valid } UPB_INLINE upb_Array* _validate_DurationRules_not_in_mutable_upb_array(validate_DurationRules* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {8, UPB_SIZE(36, 64), 0, 6, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -6179,6 +6241,7 @@ UPB_INLINE void validate_DurationRules_set_required(validate_DurationRules *msg, } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* validate_DurationRules_mutable_const(validate_DurationRules* msg, upb_Arena* arena) { @@ -6191,6 +6254,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* validate_DurationRules_mutable_lt(validate_DurationRules* msg, upb_Arena* arena) { @@ -6203,6 +6267,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* validate_DurationRules_mutable_lte(validate_DurationRules* msg, upb_Arena* arena) { @@ -6215,6 +6280,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* validate_DurationRules_mutable_gt(validate_DurationRules* msg, upb_Arena* arena) { @@ -6227,6 +6293,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* validate_DurationRules_mutable_gte(validate_DurationRules* msg, upb_Arena* arena) { @@ -6239,6 +6306,7 @@ UPB_INLINE struct google_protobuf_Duration* validate_DurationRules_mutable_gte(v } UPB_INLINE struct google_protobuf_Duration** validate_DurationRules_mutable_in(validate_DurationRules* msg, size_t* size) { upb_MiniTableField field = {7, UPB_SIZE(32, 56), 0, 5, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -6255,6 +6323,7 @@ UPB_INLINE struct google_protobuf_Duration** validate_DurationRules_resize_in(va } UPB_INLINE struct google_protobuf_Duration* validate_DurationRules_add_in(validate_DurationRules* msg, upb_Arena* arena) { upb_MiniTableField field = {7, UPB_SIZE(32, 56), 0, 5, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -6269,6 +6338,7 @@ UPB_INLINE struct google_protobuf_Duration* validate_DurationRules_add_in(valida } UPB_INLINE struct google_protobuf_Duration** validate_DurationRules_mutable_not_in(validate_DurationRules* msg, size_t* size) { upb_MiniTableField field = {8, UPB_SIZE(36, 64), 0, 6, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -6285,6 +6355,7 @@ UPB_INLINE struct google_protobuf_Duration** validate_DurationRules_resize_not_i } UPB_INLINE struct google_protobuf_Duration* validate_DurationRules_add_not_in(validate_DurationRules* msg, upb_Arena* arena) { upb_MiniTableField field = {8, UPB_SIZE(36, 64), 0, 6, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -6358,6 +6429,7 @@ UPB_INLINE const struct google_protobuf_Timestamp* validate_TimestampRules_const const struct google_protobuf_Timestamp* default_val = NULL; const struct google_protobuf_Timestamp* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Timestamp_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -6374,6 +6446,7 @@ UPB_INLINE const struct google_protobuf_Timestamp* validate_TimestampRules_lt(co const struct google_protobuf_Timestamp* default_val = NULL; const struct google_protobuf_Timestamp* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Timestamp_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -6390,6 +6463,7 @@ UPB_INLINE const struct google_protobuf_Timestamp* validate_TimestampRules_lte(c const struct google_protobuf_Timestamp* default_val = NULL; const struct google_protobuf_Timestamp* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Timestamp_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -6406,6 +6480,7 @@ UPB_INLINE const struct google_protobuf_Timestamp* validate_TimestampRules_gt(co const struct google_protobuf_Timestamp* default_val = NULL; const struct google_protobuf_Timestamp* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Timestamp_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -6422,6 +6497,7 @@ UPB_INLINE const struct google_protobuf_Timestamp* validate_TimestampRules_gte(c const struct google_protobuf_Timestamp* default_val = NULL; const struct google_protobuf_Timestamp* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Timestamp_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -6470,6 +6546,7 @@ UPB_INLINE const struct google_protobuf_Duration* validate_TimestampRules_within const struct google_protobuf_Duration* default_val = NULL; const struct google_protobuf_Duration* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -6485,6 +6562,7 @@ UPB_INLINE void validate_TimestampRules_set_required(validate_TimestampRules *ms } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Timestamp_msg_init); upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Timestamp* validate_TimestampRules_mutable_const(validate_TimestampRules* msg, upb_Arena* arena) { @@ -6497,6 +6575,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Timestamp_msg_init); upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Timestamp* validate_TimestampRules_mutable_lt(validate_TimestampRules* msg, upb_Arena* arena) { @@ -6509,6 +6588,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Timestamp_msg_init); upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Timestamp* validate_TimestampRules_mutable_lte(validate_TimestampRules* msg, upb_Arena* arena) { @@ -6521,6 +6601,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Timestamp_msg_init); upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Timestamp* validate_TimestampRules_mutable_gt(validate_TimestampRules* msg, upb_Arena* arena) { @@ -6533,6 +6614,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Timestamp_msg_init); upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Timestamp* validate_TimestampRules_mutable_gte(validate_TimestampRules* msg, upb_Arena* arena) { @@ -6553,6 +6635,7 @@ UPB_INLINE void validate_TimestampRules_set_gt_now(validate_TimestampRules *msg, } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* validate_TimestampRules_mutable_within(validate_TimestampRules* msg, upb_Arena* arena) { diff --git a/src/core/ext/upb-gen/validate/validate.upb_minitable.c b/src/core/ext/upb-gen/validate/validate.upb_minitable.c index 66aa1f4bc88..57d4fd77092 100644 --- a/src/core/ext/upb-gen/validate/validate.upb_minitable.c +++ b/src/core/ext/upb-gen/validate/validate.upb_minitable.c @@ -3,7 +3,8 @@ * validate/validate.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -15,29 +16,30 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub validate_FieldRules_submsgs[22] = { - {.UPB_PRIVATE(submsg) = &validate__FloatRules_msg_init}, - {.UPB_PRIVATE(submsg) = &validate__DoubleRules_msg_init}, - {.UPB_PRIVATE(submsg) = &validate__Int32Rules_msg_init}, - {.UPB_PRIVATE(submsg) = &validate__Int64Rules_msg_init}, - {.UPB_PRIVATE(submsg) = &validate__UInt32Rules_msg_init}, - {.UPB_PRIVATE(submsg) = &validate__UInt64Rules_msg_init}, - {.UPB_PRIVATE(submsg) = &validate__SInt32Rules_msg_init}, - {.UPB_PRIVATE(submsg) = &validate__SInt64Rules_msg_init}, - {.UPB_PRIVATE(submsg) = &validate__Fixed32Rules_msg_init}, - {.UPB_PRIVATE(submsg) = &validate__Fixed64Rules_msg_init}, - {.UPB_PRIVATE(submsg) = &validate__SFixed32Rules_msg_init}, - {.UPB_PRIVATE(submsg) = &validate__SFixed64Rules_msg_init}, - {.UPB_PRIVATE(submsg) = &validate__BoolRules_msg_init}, - {.UPB_PRIVATE(submsg) = &validate__StringRules_msg_init}, - {.UPB_PRIVATE(submsg) = &validate__BytesRules_msg_init}, - {.UPB_PRIVATE(submsg) = &validate__EnumRules_msg_init}, - {.UPB_PRIVATE(submsg) = &validate__MessageRules_msg_init}, - {.UPB_PRIVATE(submsg) = &validate__RepeatedRules_msg_init}, - {.UPB_PRIVATE(submsg) = &validate__MapRules_msg_init}, - {.UPB_PRIVATE(submsg) = &validate__AnyRules_msg_init}, - {.UPB_PRIVATE(submsg) = &validate__DurationRules_msg_init}, - {.UPB_PRIVATE(submsg) = &validate__TimestampRules_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal validate_FieldRules_submsgs[22] = { + {.UPB_PRIVATE(submsg) = &validate__FloatRules_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &validate__DoubleRules_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &validate__Int32Rules_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &validate__Int64Rules_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &validate__UInt32Rules_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &validate__UInt64Rules_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &validate__SInt32Rules_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &validate__SInt64Rules_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &validate__Fixed32Rules_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &validate__Fixed64Rules_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &validate__SFixed32Rules_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &validate__SFixed64Rules_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &validate__BoolRules_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &validate__StringRules_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &validate__BytesRules_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &validate__EnumRules_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &validate__MessageRules_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &validate__RepeatedRules_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &validate__MapRules_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &validate__AnyRules_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &validate__DurationRules_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &validate__TimestampRules_msg_init_ptr}, }; static const upb_MiniTableField validate_FieldRules__fields[22] = { @@ -108,6 +110,7 @@ const upb_MiniTable validate__FieldRules_msg_init = { }) }; +const upb_MiniTable* validate__FieldRules_msg_init_ptr = &validate__FieldRules_msg_init; static const upb_MiniTableField validate_FloatRules__fields[8] = { {1, 12, 64, kUpb_NoSub, 2, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, {2, 16, 65, kUpb_NoSub, 2, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, @@ -138,6 +141,7 @@ const upb_MiniTable validate__FloatRules_msg_init = { }) }; +const upb_MiniTable* validate__FloatRules_msg_init_ptr = &validate__FloatRules_msg_init; static const upb_MiniTableField validate_DoubleRules__fields[8] = { {1, UPB_SIZE(24, 16), 64, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, {2, UPB_SIZE(32, 24), 65, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, @@ -168,6 +172,7 @@ const upb_MiniTable validate__DoubleRules_msg_init = { }) }; +const upb_MiniTable* validate__DoubleRules_msg_init_ptr = &validate__DoubleRules_msg_init; static const upb_MiniTableField validate_Int32Rules__fields[8] = { {1, 12, 64, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, {2, 16, 65, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, @@ -198,6 +203,7 @@ const upb_MiniTable validate__Int32Rules_msg_init = { }) }; +const upb_MiniTable* validate__Int32Rules_msg_init_ptr = &validate__Int32Rules_msg_init; static const upb_MiniTableField validate_Int64Rules__fields[8] = { {1, UPB_SIZE(24, 16), 64, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, {2, UPB_SIZE(32, 24), 65, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, @@ -228,6 +234,7 @@ const upb_MiniTable validate__Int64Rules_msg_init = { }) }; +const upb_MiniTable* validate__Int64Rules_msg_init_ptr = &validate__Int64Rules_msg_init; static const upb_MiniTableField validate_UInt32Rules__fields[8] = { {1, 12, 64, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, {2, 16, 65, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, @@ -258,6 +265,7 @@ const upb_MiniTable validate__UInt32Rules_msg_init = { }) }; +const upb_MiniTable* validate__UInt32Rules_msg_init_ptr = &validate__UInt32Rules_msg_init; static const upb_MiniTableField validate_UInt64Rules__fields[8] = { {1, UPB_SIZE(24, 16), 64, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, {2, UPB_SIZE(32, 24), 65, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, @@ -288,6 +296,7 @@ const upb_MiniTable validate__UInt64Rules_msg_init = { }) }; +const upb_MiniTable* validate__UInt64Rules_msg_init_ptr = &validate__UInt64Rules_msg_init; static const upb_MiniTableField validate_SInt32Rules__fields[8] = { {1, 12, 64, kUpb_NoSub, 17, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, {2, 16, 65, kUpb_NoSub, 17, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, @@ -318,6 +327,7 @@ const upb_MiniTable validate__SInt32Rules_msg_init = { }) }; +const upb_MiniTable* validate__SInt32Rules_msg_init_ptr = &validate__SInt32Rules_msg_init; static const upb_MiniTableField validate_SInt64Rules__fields[8] = { {1, UPB_SIZE(24, 16), 64, kUpb_NoSub, 18, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, {2, UPB_SIZE(32, 24), 65, kUpb_NoSub, 18, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, @@ -348,6 +358,7 @@ const upb_MiniTable validate__SInt64Rules_msg_init = { }) }; +const upb_MiniTable* validate__SInt64Rules_msg_init_ptr = &validate__SInt64Rules_msg_init; static const upb_MiniTableField validate_Fixed32Rules__fields[8] = { {1, 12, 64, kUpb_NoSub, 7, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, {2, 16, 65, kUpb_NoSub, 7, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, @@ -378,6 +389,7 @@ const upb_MiniTable validate__Fixed32Rules_msg_init = { }) }; +const upb_MiniTable* validate__Fixed32Rules_msg_init_ptr = &validate__Fixed32Rules_msg_init; static const upb_MiniTableField validate_Fixed64Rules__fields[8] = { {1, UPB_SIZE(24, 16), 64, kUpb_NoSub, 6, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, {2, UPB_SIZE(32, 24), 65, kUpb_NoSub, 6, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, @@ -408,6 +420,7 @@ const upb_MiniTable validate__Fixed64Rules_msg_init = { }) }; +const upb_MiniTable* validate__Fixed64Rules_msg_init_ptr = &validate__Fixed64Rules_msg_init; static const upb_MiniTableField validate_SFixed32Rules__fields[8] = { {1, 12, 64, kUpb_NoSub, 15, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, {2, 16, 65, kUpb_NoSub, 15, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, @@ -438,6 +451,7 @@ const upb_MiniTable validate__SFixed32Rules_msg_init = { }) }; +const upb_MiniTable* validate__SFixed32Rules_msg_init_ptr = &validate__SFixed32Rules_msg_init; static const upb_MiniTableField validate_SFixed64Rules__fields[8] = { {1, UPB_SIZE(24, 16), 64, kUpb_NoSub, 16, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, {2, UPB_SIZE(32, 24), 65, kUpb_NoSub, 16, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, @@ -468,6 +482,7 @@ const upb_MiniTable validate__SFixed64Rules_msg_init = { }) }; +const upb_MiniTable* validate__SFixed64Rules_msg_init_ptr = &validate__SFixed64Rules_msg_init; static const upb_MiniTableField validate_BoolRules__fields[1] = { {1, 9, 64, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, }; @@ -481,7 +496,8 @@ const upb_MiniTable validate__BoolRules_msg_init = { #endif }; -static const upb_MiniTableSub validate_StringRules_submsgs[1] = { +const upb_MiniTable* validate__BoolRules_msg_init_ptr = &validate__BoolRules_msg_init; +static const upb_MiniTableSubInternal validate_StringRules_submsgs[1] = { {.UPB_PRIVATE(subenum) = &validate_KnownRegex_enum_init}, }; @@ -557,6 +573,7 @@ const upb_MiniTable validate__StringRules_msg_init = { }) }; +const upb_MiniTable* validate__StringRules_msg_init_ptr = &validate__StringRules_msg_init; static const upb_MiniTableField validate_BytesRules__fields[14] = { {1, UPB_SIZE(28, 24), 64, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, {2, 40, 65, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, @@ -601,6 +618,7 @@ const upb_MiniTable validate__BytesRules_msg_init = { }) }; +const upb_MiniTable* validate__BytesRules_msg_init_ptr = &validate__BytesRules_msg_init; static const upb_MiniTableField validate_EnumRules__fields[4] = { {1, 12, 64, kUpb_NoSub, 5, (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)}, @@ -627,6 +645,7 @@ const upb_MiniTable validate__EnumRules_msg_init = { }) }; +const upb_MiniTable* validate__EnumRules_msg_init_ptr = &validate__EnumRules_msg_init; static const upb_MiniTableField validate_MessageRules__fields[2] = { {1, 9, 64, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, {2, 10, 65, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, @@ -641,8 +660,9 @@ const upb_MiniTable validate__MessageRules_msg_init = { #endif }; -static const upb_MiniTableSub validate_RepeatedRules_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &validate__FieldRules_msg_init}, +const upb_MiniTable* validate__MessageRules_msg_init_ptr = &validate__MessageRules_msg_init; +static const upb_MiniTableSubInternal validate_RepeatedRules_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &validate__FieldRules_msg_init_ptr}, }; static const upb_MiniTableField validate_RepeatedRules__fields[5] = { @@ -662,9 +682,10 @@ const upb_MiniTable validate__RepeatedRules_msg_init = { #endif }; -static const upb_MiniTableSub validate_MapRules_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &validate__FieldRules_msg_init}, - {.UPB_PRIVATE(submsg) = &validate__FieldRules_msg_init}, +const upb_MiniTable* validate__RepeatedRules_msg_init_ptr = &validate__RepeatedRules_msg_init; +static const upb_MiniTableSubInternal validate_MapRules_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &validate__FieldRules_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &validate__FieldRules_msg_init_ptr}, }; static const upb_MiniTableField validate_MapRules__fields[6] = { @@ -685,6 +706,7 @@ const upb_MiniTable validate__MapRules_msg_init = { #endif }; +const upb_MiniTable* validate__MapRules_msg_init_ptr = &validate__MapRules_msg_init; static const upb_MiniTableField validate_AnyRules__fields[3] = { {1, 9, 64, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, {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)}, @@ -706,14 +728,15 @@ const upb_MiniTable validate__AnyRules_msg_init = { }) }; -static const upb_MiniTableSub validate_DurationRules_submsgs[7] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, +const upb_MiniTable* validate__AnyRules_msg_init_ptr = &validate__AnyRules_msg_init; +static const upb_MiniTableSubInternal validate_DurationRules_submsgs[7] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, }; static const upb_MiniTableField validate_DurationRules__fields[8] = { @@ -754,13 +777,14 @@ const upb_MiniTable validate__DurationRules_msg_init = { }) }; -static const upb_MiniTableSub validate_TimestampRules_submsgs[6] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, +const upb_MiniTable* validate__DurationRules_msg_init_ptr = &validate__DurationRules_msg_init; +static const upb_MiniTableSubInternal validate_TimestampRules_submsgs[6] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, }; static const upb_MiniTableField validate_TimestampRules__fields[9] = { @@ -784,6 +808,44 @@ const upb_MiniTable validate__TimestampRules_msg_init = { #endif }; +const upb_MiniTable* validate__TimestampRules_msg_init_ptr = &validate__TimestampRules_msg_init; +const upb_MiniTableEnum validate_KnownRegex_enum_init = { + 64, + 0, + { + 0x7, + 0x0, + }, +}; + +UPB_LINKARR_APPEND(upb_AllExts) +const upb_MiniTableExtension validate_disabled_ext = { + {1071, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, + &google__protobuf__MessageOptions_msg_init, + {.UPB_PRIVATE(submsg) = NULL}, + +}; +UPB_LINKARR_APPEND(upb_AllExts) +const upb_MiniTableExtension validate_ignored_ext = { + {1072, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, + &google__protobuf__MessageOptions_msg_init, + {.UPB_PRIVATE(submsg) = NULL}, + +}; +UPB_LINKARR_APPEND(upb_AllExts) +const upb_MiniTableExtension validate_required_ext = { + {1071, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, + &google__protobuf__OneofOptions_msg_init, + {.UPB_PRIVATE(submsg) = NULL}, + +}; +UPB_LINKARR_APPEND(upb_AllExts) +const upb_MiniTableExtension validate_rules_ext = { + {1071, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, + &google__protobuf__FieldOptions_msg_init, + {.UPB_PRIVATE(submsg) = &validate__FieldRules_msg_init}, + +}; static const upb_MiniTable *messages_layout[23] = { &validate__FieldRules_msg_init, &validate__FloatRules_msg_init, @@ -810,30 +872,10 @@ static const upb_MiniTable *messages_layout[23] = { &validate__TimestampRules_msg_init, }; -const upb_MiniTableExtension validate_disabled_ext = { - {1071, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, - &google__protobuf__MessageOptions_msg_init, - {.UPB_PRIVATE(submsg) = NULL}, - -}; -const upb_MiniTableExtension validate_ignored_ext = { - {1072, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, - &google__protobuf__MessageOptions_msg_init, - {.UPB_PRIVATE(submsg) = NULL}, - -}; -const upb_MiniTableExtension validate_required_ext = { - {1071, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, - &google__protobuf__OneofOptions_msg_init, - {.UPB_PRIVATE(submsg) = NULL}, - +static const upb_MiniTableEnum *enums_layout[1] = { + &validate_KnownRegex_enum_init, }; -const upb_MiniTableExtension validate_rules_ext = { - {1071, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, - &google__protobuf__FieldOptions_msg_init, - {.UPB_PRIVATE(submsg) = &validate__FieldRules_msg_init}, -}; static const upb_MiniTableExtension *extensions_layout[4] = { &validate_disabled_ext, @@ -842,19 +884,6 @@ static const upb_MiniTableExtension *extensions_layout[4] = { &validate_rules_ext, }; -const upb_MiniTableEnum validate_KnownRegex_enum_init = { - 64, - 0, - { - 0x7, - 0x0, - }, -}; - -static const upb_MiniTableEnum *enums_layout[1] = { - &validate_KnownRegex_enum_init, -}; - const upb_MiniTableFile validate_validate_proto_upb_file_layout = { messages_layout, enums_layout, diff --git a/src/core/ext/upb-gen/validate/validate.upb_minitable.h b/src/core/ext/upb-gen/validate/validate.upb_minitable.h index c89f6cd4bee..7ce848fb0f1 100644 --- a/src/core/ext/upb-gen/validate/validate.upb_minitable.h +++ b/src/core/ext/upb-gen/validate/validate.upb_minitable.h @@ -3,7 +3,8 @@ * validate/validate.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef VALIDATE_VALIDATE_PROTO_UPB_MINITABLE_H_ #define VALIDATE_VALIDATE_PROTO_UPB_MINITABLE_H_ @@ -18,28 +19,51 @@ extern "C" { #endif extern const upb_MiniTable validate__FieldRules_msg_init; +extern const upb_MiniTable* validate__FieldRules_msg_init_ptr; extern const upb_MiniTable validate__FloatRules_msg_init; +extern const upb_MiniTable* validate__FloatRules_msg_init_ptr; extern const upb_MiniTable validate__DoubleRules_msg_init; +extern const upb_MiniTable* validate__DoubleRules_msg_init_ptr; extern const upb_MiniTable validate__Int32Rules_msg_init; +extern const upb_MiniTable* validate__Int32Rules_msg_init_ptr; extern const upb_MiniTable validate__Int64Rules_msg_init; +extern const upb_MiniTable* validate__Int64Rules_msg_init_ptr; extern const upb_MiniTable validate__UInt32Rules_msg_init; +extern const upb_MiniTable* validate__UInt32Rules_msg_init_ptr; extern const upb_MiniTable validate__UInt64Rules_msg_init; +extern const upb_MiniTable* validate__UInt64Rules_msg_init_ptr; extern const upb_MiniTable validate__SInt32Rules_msg_init; +extern const upb_MiniTable* validate__SInt32Rules_msg_init_ptr; extern const upb_MiniTable validate__SInt64Rules_msg_init; +extern const upb_MiniTable* validate__SInt64Rules_msg_init_ptr; extern const upb_MiniTable validate__Fixed32Rules_msg_init; +extern const upb_MiniTable* validate__Fixed32Rules_msg_init_ptr; extern const upb_MiniTable validate__Fixed64Rules_msg_init; +extern const upb_MiniTable* validate__Fixed64Rules_msg_init_ptr; extern const upb_MiniTable validate__SFixed32Rules_msg_init; +extern const upb_MiniTable* validate__SFixed32Rules_msg_init_ptr; extern const upb_MiniTable validate__SFixed64Rules_msg_init; +extern const upb_MiniTable* validate__SFixed64Rules_msg_init_ptr; extern const upb_MiniTable validate__BoolRules_msg_init; +extern const upb_MiniTable* validate__BoolRules_msg_init_ptr; extern const upb_MiniTable validate__StringRules_msg_init; +extern const upb_MiniTable* validate__StringRules_msg_init_ptr; extern const upb_MiniTable validate__BytesRules_msg_init; +extern const upb_MiniTable* validate__BytesRules_msg_init_ptr; extern const upb_MiniTable validate__EnumRules_msg_init; +extern const upb_MiniTable* validate__EnumRules_msg_init_ptr; extern const upb_MiniTable validate__MessageRules_msg_init; +extern const upb_MiniTable* validate__MessageRules_msg_init_ptr; extern const upb_MiniTable validate__RepeatedRules_msg_init; +extern const upb_MiniTable* validate__RepeatedRules_msg_init_ptr; extern const upb_MiniTable validate__MapRules_msg_init; +extern const upb_MiniTable* validate__MapRules_msg_init_ptr; extern const upb_MiniTable validate__AnyRules_msg_init; +extern const upb_MiniTable* validate__AnyRules_msg_init_ptr; extern const upb_MiniTable validate__DurationRules_msg_init; +extern const upb_MiniTable* validate__DurationRules_msg_init_ptr; extern const upb_MiniTable validate__TimestampRules_msg_init; +extern const upb_MiniTable* validate__TimestampRules_msg_init_ptr; extern const upb_MiniTableExtension validate_disabled_ext; extern const upb_MiniTableExtension validate_ignored_ext; extern const upb_MiniTableExtension validate_required_ext; diff --git a/src/core/ext/upb-gen/xds/annotations/v3/migrate.upb.h b/src/core/ext/upb-gen/xds/annotations/v3/migrate.upb.h index 9fc55da1e57..9110870cb99 100644 --- a/src/core/ext/upb-gen/xds/annotations/v3/migrate.upb.h +++ b/src/core/ext/upb-gen/xds/annotations/v3/migrate.upb.h @@ -3,7 +3,8 @@ * xds/annotations/v3/migrate.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef XDS_ANNOTATIONS_V3_MIGRATE_PROTO_UPB_H_ #define XDS_ANNOTATIONS_V3_MIGRATE_PROTO_UPB_H_ diff --git a/src/core/ext/upb-gen/xds/annotations/v3/migrate.upb_minitable.c b/src/core/ext/upb-gen/xds/annotations/v3/migrate.upb_minitable.c index 570b583b8f9..b594c78ab65 100644 --- a/src/core/ext/upb-gen/xds/annotations/v3/migrate.upb_minitable.c +++ b/src/core/ext/upb-gen/xds/annotations/v3/migrate.upb_minitable.c @@ -3,7 +3,8 @@ * xds/annotations/v3/migrate.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -13,6 +14,7 @@ // Must be last. #include "upb/port/def.inc" +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); static const upb_MiniTableField xds_annotations_v3_MigrateAnnotation__fields[1] = { {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, }; @@ -30,6 +32,7 @@ const upb_MiniTable xds__annotations__v3__MigrateAnnotation_msg_init = { }) }; +const upb_MiniTable* xds__annotations__v3__MigrateAnnotation_msg_init_ptr = &xds__annotations__v3__MigrateAnnotation_msg_init; static const upb_MiniTableField xds_annotations_v3_FieldMigrateAnnotation__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)}, @@ -50,6 +53,7 @@ const upb_MiniTable xds__annotations__v3__FieldMigrateAnnotation_msg_init = { }) }; +const upb_MiniTable* xds__annotations__v3__FieldMigrateAnnotation_msg_init_ptr = &xds__annotations__v3__FieldMigrateAnnotation_msg_init; static const upb_MiniTableField xds_annotations_v3_FileMigrateAnnotation__fields[1] = { {2, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, }; @@ -69,42 +73,48 @@ const upb_MiniTable xds__annotations__v3__FileMigrateAnnotation_msg_init = { }) }; -static const upb_MiniTable *messages_layout[3] = { - &xds__annotations__v3__MigrateAnnotation_msg_init, - &xds__annotations__v3__FieldMigrateAnnotation_msg_init, - &xds__annotations__v3__FileMigrateAnnotation_msg_init, -}; - +const upb_MiniTable* xds__annotations__v3__FileMigrateAnnotation_msg_init_ptr = &xds__annotations__v3__FileMigrateAnnotation_msg_init; +UPB_LINKARR_APPEND(upb_AllExts) const upb_MiniTableExtension xds_annotations_v3_message_migrate_ext = { {112948430, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, &google__protobuf__MessageOptions_msg_init, {.UPB_PRIVATE(submsg) = &xds__annotations__v3__MigrateAnnotation_msg_init}, }; +UPB_LINKARR_APPEND(upb_AllExts) const upb_MiniTableExtension xds_annotations_v3_field_migrate_ext = { {112948430, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, &google__protobuf__FieldOptions_msg_init, {.UPB_PRIVATE(submsg) = &xds__annotations__v3__FieldMigrateAnnotation_msg_init}, }; +UPB_LINKARR_APPEND(upb_AllExts) const upb_MiniTableExtension xds_annotations_v3_enum_migrate_ext = { {112948430, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, &google__protobuf__EnumOptions_msg_init, {.UPB_PRIVATE(submsg) = &xds__annotations__v3__MigrateAnnotation_msg_init}, }; +UPB_LINKARR_APPEND(upb_AllExts) const upb_MiniTableExtension xds_annotations_v3_enum_value_migrate_ext = { {112948430, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, &google__protobuf__EnumValueOptions_msg_init, {.UPB_PRIVATE(submsg) = &xds__annotations__v3__MigrateAnnotation_msg_init}, }; +UPB_LINKARR_APPEND(upb_AllExts) const upb_MiniTableExtension xds_annotations_v3_file_migrate_ext = { {112948430, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, &google__protobuf__FileOptions_msg_init, {.UPB_PRIVATE(submsg) = &xds__annotations__v3__FileMigrateAnnotation_msg_init}, }; +static const upb_MiniTable *messages_layout[3] = { + &xds__annotations__v3__MigrateAnnotation_msg_init, + &xds__annotations__v3__FieldMigrateAnnotation_msg_init, + &xds__annotations__v3__FileMigrateAnnotation_msg_init, +}; + static const upb_MiniTableExtension *extensions_layout[5] = { &xds_annotations_v3_message_migrate_ext, diff --git a/src/core/ext/upb-gen/xds/annotations/v3/migrate.upb_minitable.h b/src/core/ext/upb-gen/xds/annotations/v3/migrate.upb_minitable.h index 58a07e59256..864d9d2ce78 100644 --- a/src/core/ext/upb-gen/xds/annotations/v3/migrate.upb_minitable.h +++ b/src/core/ext/upb-gen/xds/annotations/v3/migrate.upb_minitable.h @@ -3,7 +3,8 @@ * xds/annotations/v3/migrate.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef XDS_ANNOTATIONS_V3_MIGRATE_PROTO_UPB_MINITABLE_H_ #define XDS_ANNOTATIONS_V3_MIGRATE_PROTO_UPB_MINITABLE_H_ @@ -18,8 +19,11 @@ extern "C" { #endif extern const upb_MiniTable xds__annotations__v3__MigrateAnnotation_msg_init; +extern const upb_MiniTable* xds__annotations__v3__MigrateAnnotation_msg_init_ptr; extern const upb_MiniTable xds__annotations__v3__FieldMigrateAnnotation_msg_init; +extern const upb_MiniTable* xds__annotations__v3__FieldMigrateAnnotation_msg_init_ptr; extern const upb_MiniTable xds__annotations__v3__FileMigrateAnnotation_msg_init; +extern const upb_MiniTable* xds__annotations__v3__FileMigrateAnnotation_msg_init_ptr; extern const upb_MiniTableExtension xds_annotations_v3_message_migrate_ext; extern const upb_MiniTableExtension xds_annotations_v3_field_migrate_ext; extern const upb_MiniTableExtension xds_annotations_v3_enum_migrate_ext; diff --git a/src/core/ext/upb-gen/xds/annotations/v3/security.upb.h b/src/core/ext/upb-gen/xds/annotations/v3/security.upb.h index fe5581455ef..4844f703df6 100644 --- a/src/core/ext/upb-gen/xds/annotations/v3/security.upb.h +++ b/src/core/ext/upb-gen/xds/annotations/v3/security.upb.h @@ -3,7 +3,8 @@ * xds/annotations/v3/security.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef XDS_ANNOTATIONS_V3_SECURITY_PROTO_UPB_H_ #define XDS_ANNOTATIONS_V3_SECURITY_PROTO_UPB_H_ diff --git a/src/core/ext/upb-gen/xds/annotations/v3/security.upb_minitable.c b/src/core/ext/upb-gen/xds/annotations/v3/security.upb_minitable.c index a411f41bd3b..8e0f8b90804 100644 --- a/src/core/ext/upb-gen/xds/annotations/v3/security.upb_minitable.c +++ b/src/core/ext/upb-gen/xds/annotations/v3/security.upb_minitable.c @@ -3,7 +3,8 @@ * xds/annotations/v3/security.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -14,6 +15,7 @@ // Must be last. #include "upb/port/def.inc" +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); static const upb_MiniTableField xds_annotations_v3_FieldSecurityAnnotation__fields[2] = { {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)}, @@ -34,16 +36,18 @@ const upb_MiniTable xds__annotations__v3__FieldSecurityAnnotation_msg_init = { }) }; -static const upb_MiniTable *messages_layout[1] = { - &xds__annotations__v3__FieldSecurityAnnotation_msg_init, -}; - +const upb_MiniTable* xds__annotations__v3__FieldSecurityAnnotation_msg_init_ptr = &xds__annotations__v3__FieldSecurityAnnotation_msg_init; +UPB_LINKARR_APPEND(upb_AllExts) const upb_MiniTableExtension xds_annotations_v3_security_ext = { {99044135, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, &google__protobuf__FieldOptions_msg_init, {.UPB_PRIVATE(submsg) = &xds__annotations__v3__FieldSecurityAnnotation_msg_init}, }; +static const upb_MiniTable *messages_layout[1] = { + &xds__annotations__v3__FieldSecurityAnnotation_msg_init, +}; + static const upb_MiniTableExtension *extensions_layout[1] = { &xds_annotations_v3_security_ext, diff --git a/src/core/ext/upb-gen/xds/annotations/v3/security.upb_minitable.h b/src/core/ext/upb-gen/xds/annotations/v3/security.upb_minitable.h index 29051672adf..790d139d818 100644 --- a/src/core/ext/upb-gen/xds/annotations/v3/security.upb_minitable.h +++ b/src/core/ext/upb-gen/xds/annotations/v3/security.upb_minitable.h @@ -3,7 +3,8 @@ * xds/annotations/v3/security.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef XDS_ANNOTATIONS_V3_SECURITY_PROTO_UPB_MINITABLE_H_ #define XDS_ANNOTATIONS_V3_SECURITY_PROTO_UPB_MINITABLE_H_ @@ -18,6 +19,7 @@ extern "C" { #endif extern const upb_MiniTable xds__annotations__v3__FieldSecurityAnnotation_msg_init; +extern const upb_MiniTable* xds__annotations__v3__FieldSecurityAnnotation_msg_init_ptr; extern const upb_MiniTableExtension xds_annotations_v3_security_ext; extern const upb_MiniTableFile xds_annotations_v3_security_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/xds/annotations/v3/sensitive.upb.h b/src/core/ext/upb-gen/xds/annotations/v3/sensitive.upb.h index 4202d1329b2..06293d2c022 100644 --- a/src/core/ext/upb-gen/xds/annotations/v3/sensitive.upb.h +++ b/src/core/ext/upb-gen/xds/annotations/v3/sensitive.upb.h @@ -3,7 +3,8 @@ * xds/annotations/v3/sensitive.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef XDS_ANNOTATIONS_V3_SENSITIVE_PROTO_UPB_H_ #define XDS_ANNOTATIONS_V3_SENSITIVE_PROTO_UPB_H_ diff --git a/src/core/ext/upb-gen/xds/annotations/v3/sensitive.upb_minitable.c b/src/core/ext/upb-gen/xds/annotations/v3/sensitive.upb_minitable.c index d7eb4b99a00..73ddc3a4341 100644 --- a/src/core/ext/upb-gen/xds/annotations/v3/sensitive.upb_minitable.c +++ b/src/core/ext/upb-gen/xds/annotations/v3/sensitive.upb_minitable.c @@ -3,7 +3,8 @@ * xds/annotations/v3/sensitive.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -13,6 +14,8 @@ // Must be last. #include "upb/port/def.inc" +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +UPB_LINKARR_APPEND(upb_AllExts) const upb_MiniTableExtension xds_annotations_v3_sensitive_ext = { {61008053, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, &google__protobuf__FieldOptions_msg_init, diff --git a/src/core/ext/upb-gen/xds/annotations/v3/sensitive.upb_minitable.h b/src/core/ext/upb-gen/xds/annotations/v3/sensitive.upb_minitable.h index 1123f0ecf5f..633fca8d232 100644 --- a/src/core/ext/upb-gen/xds/annotations/v3/sensitive.upb_minitable.h +++ b/src/core/ext/upb-gen/xds/annotations/v3/sensitive.upb_minitable.h @@ -3,7 +3,8 @@ * xds/annotations/v3/sensitive.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef XDS_ANNOTATIONS_V3_SENSITIVE_PROTO_UPB_MINITABLE_H_ #define XDS_ANNOTATIONS_V3_SENSITIVE_PROTO_UPB_MINITABLE_H_ diff --git a/src/core/ext/upb-gen/xds/annotations/v3/status.upb.h b/src/core/ext/upb-gen/xds/annotations/v3/status.upb.h index 867d46ff89d..dbcd9ea25bc 100644 --- a/src/core/ext/upb-gen/xds/annotations/v3/status.upb.h +++ b/src/core/ext/upb-gen/xds/annotations/v3/status.upb.h @@ -3,7 +3,8 @@ * xds/annotations/v3/status.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef XDS_ANNOTATIONS_V3_STATUS_PROTO_UPB_H_ #define XDS_ANNOTATIONS_V3_STATUS_PROTO_UPB_H_ diff --git a/src/core/ext/upb-gen/xds/annotations/v3/status.upb_minitable.c b/src/core/ext/upb-gen/xds/annotations/v3/status.upb_minitable.c index c8cab7e5a0c..e0da39655d9 100644 --- a/src/core/ext/upb-gen/xds/annotations/v3/status.upb_minitable.c +++ b/src/core/ext/upb-gen/xds/annotations/v3/status.upb_minitable.c @@ -3,7 +3,8 @@ * xds/annotations/v3/status.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -13,6 +14,7 @@ // Must be last. #include "upb/port/def.inc" +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); static const upb_MiniTableField xds_annotations_v3_FileStatusAnnotation__fields[1] = { {1, 8, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, }; @@ -30,6 +32,7 @@ const upb_MiniTable xds__annotations__v3__FileStatusAnnotation_msg_init = { }) }; +const upb_MiniTable* xds__annotations__v3__FileStatusAnnotation_msg_init_ptr = &xds__annotations__v3__FileStatusAnnotation_msg_init; static const upb_MiniTableField xds_annotations_v3_MessageStatusAnnotation__fields[1] = { {1, 8, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, }; @@ -47,6 +50,7 @@ const upb_MiniTable xds__annotations__v3__MessageStatusAnnotation_msg_init = { }) }; +const upb_MiniTable* xds__annotations__v3__MessageStatusAnnotation_msg_init_ptr = &xds__annotations__v3__MessageStatusAnnotation_msg_init; static const upb_MiniTableField xds_annotations_v3_FieldStatusAnnotation__fields[1] = { {1, 8, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, }; @@ -64,6 +68,7 @@ const upb_MiniTable xds__annotations__v3__FieldStatusAnnotation_msg_init = { }) }; +const upb_MiniTable* xds__annotations__v3__FieldStatusAnnotation_msg_init_ptr = &xds__annotations__v3__FieldStatusAnnotation_msg_init; static const upb_MiniTableField xds_annotations_v3_StatusAnnotation__fields[2] = { {1, 8, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, {2, 12, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, @@ -84,31 +89,35 @@ const upb_MiniTable xds__annotations__v3__StatusAnnotation_msg_init = { }) }; -static const upb_MiniTable *messages_layout[4] = { - &xds__annotations__v3__FileStatusAnnotation_msg_init, - &xds__annotations__v3__MessageStatusAnnotation_msg_init, - &xds__annotations__v3__FieldStatusAnnotation_msg_init, - &xds__annotations__v3__StatusAnnotation_msg_init, -}; - +const upb_MiniTable* xds__annotations__v3__StatusAnnotation_msg_init_ptr = &xds__annotations__v3__StatusAnnotation_msg_init; +UPB_LINKARR_APPEND(upb_AllExts) const upb_MiniTableExtension xds_annotations_v3_file_status_ext = { {226829418, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, &google__protobuf__FileOptions_msg_init, {.UPB_PRIVATE(submsg) = &xds__annotations__v3__FileStatusAnnotation_msg_init}, }; +UPB_LINKARR_APPEND(upb_AllExts) const upb_MiniTableExtension xds_annotations_v3_message_status_ext = { {226829418, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, &google__protobuf__MessageOptions_msg_init, {.UPB_PRIVATE(submsg) = &xds__annotations__v3__MessageStatusAnnotation_msg_init}, }; +UPB_LINKARR_APPEND(upb_AllExts) const upb_MiniTableExtension xds_annotations_v3_field_status_ext = { {226829418, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, &google__protobuf__FieldOptions_msg_init, {.UPB_PRIVATE(submsg) = &xds__annotations__v3__FieldStatusAnnotation_msg_init}, }; +static const upb_MiniTable *messages_layout[4] = { + &xds__annotations__v3__FileStatusAnnotation_msg_init, + &xds__annotations__v3__MessageStatusAnnotation_msg_init, + &xds__annotations__v3__FieldStatusAnnotation_msg_init, + &xds__annotations__v3__StatusAnnotation_msg_init, +}; + static const upb_MiniTableExtension *extensions_layout[3] = { &xds_annotations_v3_file_status_ext, diff --git a/src/core/ext/upb-gen/xds/annotations/v3/status.upb_minitable.h b/src/core/ext/upb-gen/xds/annotations/v3/status.upb_minitable.h index a70db6f8f2e..779ed39fa48 100644 --- a/src/core/ext/upb-gen/xds/annotations/v3/status.upb_minitable.h +++ b/src/core/ext/upb-gen/xds/annotations/v3/status.upb_minitable.h @@ -3,7 +3,8 @@ * xds/annotations/v3/status.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef XDS_ANNOTATIONS_V3_STATUS_PROTO_UPB_MINITABLE_H_ #define XDS_ANNOTATIONS_V3_STATUS_PROTO_UPB_MINITABLE_H_ @@ -18,9 +19,13 @@ extern "C" { #endif extern const upb_MiniTable xds__annotations__v3__FileStatusAnnotation_msg_init; +extern const upb_MiniTable* xds__annotations__v3__FileStatusAnnotation_msg_init_ptr; extern const upb_MiniTable xds__annotations__v3__MessageStatusAnnotation_msg_init; +extern const upb_MiniTable* xds__annotations__v3__MessageStatusAnnotation_msg_init_ptr; extern const upb_MiniTable xds__annotations__v3__FieldStatusAnnotation_msg_init; +extern const upb_MiniTable* xds__annotations__v3__FieldStatusAnnotation_msg_init_ptr; extern const upb_MiniTable xds__annotations__v3__StatusAnnotation_msg_init; +extern const upb_MiniTable* xds__annotations__v3__StatusAnnotation_msg_init_ptr; extern const upb_MiniTableExtension xds_annotations_v3_file_status_ext; extern const upb_MiniTableExtension xds_annotations_v3_message_status_ext; extern const upb_MiniTableExtension xds_annotations_v3_field_status_ext; diff --git a/src/core/ext/upb-gen/xds/annotations/v3/versioning.upb.h b/src/core/ext/upb-gen/xds/annotations/v3/versioning.upb.h index fb7184e38ed..5d79b12ad8c 100644 --- a/src/core/ext/upb-gen/xds/annotations/v3/versioning.upb.h +++ b/src/core/ext/upb-gen/xds/annotations/v3/versioning.upb.h @@ -3,7 +3,8 @@ * xds/annotations/v3/versioning.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef XDS_ANNOTATIONS_V3_VERSIONING_PROTO_UPB_H_ #define XDS_ANNOTATIONS_V3_VERSIONING_PROTO_UPB_H_ diff --git a/src/core/ext/upb-gen/xds/annotations/v3/versioning.upb_minitable.c b/src/core/ext/upb-gen/xds/annotations/v3/versioning.upb_minitable.c index 3db8d2f3432..04018770859 100644 --- a/src/core/ext/upb-gen/xds/annotations/v3/versioning.upb_minitable.c +++ b/src/core/ext/upb-gen/xds/annotations/v3/versioning.upb_minitable.c @@ -3,7 +3,8 @@ * xds/annotations/v3/versioning.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -13,6 +14,7 @@ // Must be last. #include "upb/port/def.inc" +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); static const upb_MiniTableField xds_annotations_v3_VersioningAnnotation__fields[1] = { {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, }; @@ -30,16 +32,18 @@ const upb_MiniTable xds__annotations__v3__VersioningAnnotation_msg_init = { }) }; -static const upb_MiniTable *messages_layout[1] = { - &xds__annotations__v3__VersioningAnnotation_msg_init, -}; - +const upb_MiniTable* xds__annotations__v3__VersioningAnnotation_msg_init_ptr = &xds__annotations__v3__VersioningAnnotation_msg_init; +UPB_LINKARR_APPEND(upb_AllExts) const upb_MiniTableExtension xds_annotations_v3_versioning_ext = { {92389011, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, &google__protobuf__MessageOptions_msg_init, {.UPB_PRIVATE(submsg) = &xds__annotations__v3__VersioningAnnotation_msg_init}, }; +static const upb_MiniTable *messages_layout[1] = { + &xds__annotations__v3__VersioningAnnotation_msg_init, +}; + static const upb_MiniTableExtension *extensions_layout[1] = { &xds_annotations_v3_versioning_ext, diff --git a/src/core/ext/upb-gen/xds/annotations/v3/versioning.upb_minitable.h b/src/core/ext/upb-gen/xds/annotations/v3/versioning.upb_minitable.h index 47a42b3c273..38026937395 100644 --- a/src/core/ext/upb-gen/xds/annotations/v3/versioning.upb_minitable.h +++ b/src/core/ext/upb-gen/xds/annotations/v3/versioning.upb_minitable.h @@ -3,7 +3,8 @@ * xds/annotations/v3/versioning.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef XDS_ANNOTATIONS_V3_VERSIONING_PROTO_UPB_MINITABLE_H_ #define XDS_ANNOTATIONS_V3_VERSIONING_PROTO_UPB_MINITABLE_H_ @@ -18,6 +19,7 @@ extern "C" { #endif extern const upb_MiniTable xds__annotations__v3__VersioningAnnotation_msg_init; +extern const upb_MiniTable* xds__annotations__v3__VersioningAnnotation_msg_init_ptr; extern const upb_MiniTableExtension xds_annotations_v3_versioning_ext; extern const upb_MiniTableFile xds_annotations_v3_versioning_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/xds/core/v3/authority.upb.h b/src/core/ext/upb-gen/xds/core/v3/authority.upb.h index 9355bf2bf09..bd4e7ae3b8e 100644 --- a/src/core/ext/upb-gen/xds/core/v3/authority.upb.h +++ b/src/core/ext/upb-gen/xds/core/v3/authority.upb.h @@ -3,7 +3,8 @@ * xds/core/v3/authority.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef XDS_CORE_V3_AUTHORITY_PROTO_UPB_H_ #define XDS_CORE_V3_AUTHORITY_PROTO_UPB_H_ diff --git a/src/core/ext/upb-gen/xds/core/v3/authority.upb_minitable.c b/src/core/ext/upb-gen/xds/core/v3/authority.upb_minitable.c index 64456c1e224..d647cb3a507 100644 --- a/src/core/ext/upb-gen/xds/core/v3/authority.upb_minitable.c +++ b/src/core/ext/upb-gen/xds/core/v3/authority.upb_minitable.c @@ -3,7 +3,8 @@ * xds/core/v3/authority.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -14,6 +15,7 @@ // Must be last. #include "upb/port/def.inc" +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); static const upb_MiniTableField xds_core_v3_Authority__fields[1] = { {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, }; @@ -31,6 +33,7 @@ const upb_MiniTable xds__core__v3__Authority_msg_init = { }) }; +const upb_MiniTable* xds__core__v3__Authority_msg_init_ptr = &xds__core__v3__Authority_msg_init; static const upb_MiniTable *messages_layout[1] = { &xds__core__v3__Authority_msg_init, }; diff --git a/src/core/ext/upb-gen/xds/core/v3/authority.upb_minitable.h b/src/core/ext/upb-gen/xds/core/v3/authority.upb_minitable.h index b8607ef593b..5c591ab4177 100644 --- a/src/core/ext/upb-gen/xds/core/v3/authority.upb_minitable.h +++ b/src/core/ext/upb-gen/xds/core/v3/authority.upb_minitable.h @@ -3,7 +3,8 @@ * xds/core/v3/authority.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef XDS_CORE_V3_AUTHORITY_PROTO_UPB_MINITABLE_H_ #define XDS_CORE_V3_AUTHORITY_PROTO_UPB_MINITABLE_H_ @@ -18,6 +19,7 @@ extern "C" { #endif extern const upb_MiniTable xds__core__v3__Authority_msg_init; +extern const upb_MiniTable* xds__core__v3__Authority_msg_init_ptr; extern const upb_MiniTableFile xds_core_v3_authority_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/xds/core/v3/cidr.upb.h b/src/core/ext/upb-gen/xds/core/v3/cidr.upb.h index bdecd9f387a..6d6f2376caa 100644 --- a/src/core/ext/upb-gen/xds/core/v3/cidr.upb.h +++ b/src/core/ext/upb-gen/xds/core/v3/cidr.upb.h @@ -3,7 +3,8 @@ * xds/core/v3/cidr.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef XDS_CORE_V3_CIDR_PROTO_UPB_H_ #define XDS_CORE_V3_CIDR_PROTO_UPB_H_ @@ -84,6 +85,7 @@ UPB_INLINE const struct google_protobuf_UInt32Value* xds_core_v3_CidrRange_prefi const struct google_protobuf_UInt32Value* default_val = NULL; const struct google_protobuf_UInt32Value* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -99,6 +101,7 @@ UPB_INLINE void xds_core_v3_CidrRange_set_address_prefix(xds_core_v3_CidrRange * } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UInt32Value_msg_init); 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) { diff --git a/src/core/ext/upb-gen/xds/core/v3/cidr.upb_minitable.c b/src/core/ext/upb-gen/xds/core/v3/cidr.upb_minitable.c index d9a0b22a01b..e2c6437a567 100644 --- a/src/core/ext/upb-gen/xds/core/v3/cidr.upb_minitable.c +++ b/src/core/ext/upb-gen/xds/core/v3/cidr.upb_minitable.c @@ -3,7 +3,8 @@ * xds/core/v3/cidr.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -15,8 +16,9 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub xds_core_v3_CidrRange_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal xds_core_v3_CidrRange_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, }; static const upb_MiniTableField xds_core_v3_CidrRange__fields[2] = { @@ -37,6 +39,7 @@ const upb_MiniTable xds__core__v3__CidrRange_msg_init = { }) }; +const upb_MiniTable* xds__core__v3__CidrRange_msg_init_ptr = &xds__core__v3__CidrRange_msg_init; static const upb_MiniTable *messages_layout[1] = { &xds__core__v3__CidrRange_msg_init, }; diff --git a/src/core/ext/upb-gen/xds/core/v3/cidr.upb_minitable.h b/src/core/ext/upb-gen/xds/core/v3/cidr.upb_minitable.h index c70599c9923..9939d28f77e 100644 --- a/src/core/ext/upb-gen/xds/core/v3/cidr.upb_minitable.h +++ b/src/core/ext/upb-gen/xds/core/v3/cidr.upb_minitable.h @@ -3,7 +3,8 @@ * xds/core/v3/cidr.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef XDS_CORE_V3_CIDR_PROTO_UPB_MINITABLE_H_ #define XDS_CORE_V3_CIDR_PROTO_UPB_MINITABLE_H_ @@ -18,6 +19,7 @@ extern "C" { #endif extern const upb_MiniTable xds__core__v3__CidrRange_msg_init; +extern const upb_MiniTable* xds__core__v3__CidrRange_msg_init_ptr; extern const upb_MiniTableFile xds_core_v3_cidr_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/xds/core/v3/collection_entry.upb.h b/src/core/ext/upb-gen/xds/core/v3/collection_entry.upb.h index e8329930b97..628ebd9d48f 100644 --- a/src/core/ext/upb-gen/xds/core/v3/collection_entry.upb.h +++ b/src/core/ext/upb-gen/xds/core/v3/collection_entry.upb.h @@ -3,7 +3,8 @@ * xds/core/v3/collection_entry.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef XDS_CORE_V3_COLLECTION_ENTRY_PROTO_UPB_H_ #define XDS_CORE_V3_COLLECTION_ENTRY_PROTO_UPB_H_ @@ -85,6 +86,7 @@ UPB_INLINE const struct xds_core_v3_ResourceLocator* xds_core_v3_CollectionEntry const struct xds_core_v3_ResourceLocator* default_val = NULL; const struct xds_core_v3_ResourceLocator* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&xds__core__v3__ResourceLocator_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -101,6 +103,7 @@ UPB_INLINE const xds_core_v3_CollectionEntry_InlineEntry* xds_core_v3_Collection const xds_core_v3_CollectionEntry_InlineEntry* default_val = NULL; const xds_core_v3_CollectionEntry_InlineEntry* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&xds__core__v3__CollectionEntry__InlineEntry_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -112,6 +115,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_PRIVATE(_upb_MiniTable_StrongReference)(&xds__core__v3__ResourceLocator_msg_init); 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) { @@ -124,6 +128,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_PRIVATE(_upb_MiniTable_StrongReference)(&xds__core__v3__CollectionEntry__InlineEntry_msg_init); 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) { @@ -203,6 +208,7 @@ UPB_INLINE const struct google_protobuf_Any* xds_core_v3_CollectionEntry_InlineE const struct google_protobuf_Any* default_val = NULL; const struct google_protobuf_Any* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -222,6 +228,7 @@ UPB_INLINE void xds_core_v3_CollectionEntry_InlineEntry_set_version(xds_core_v3_ } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); 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) { diff --git a/src/core/ext/upb-gen/xds/core/v3/collection_entry.upb_minitable.c b/src/core/ext/upb-gen/xds/core/v3/collection_entry.upb_minitable.c index 6c8e87593a5..212ef1653a1 100644 --- a/src/core/ext/upb-gen/xds/core/v3/collection_entry.upb_minitable.c +++ b/src/core/ext/upb-gen/xds/core/v3/collection_entry.upb_minitable.c @@ -3,7 +3,8 @@ * xds/core/v3/collection_entry.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -16,9 +17,10 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub xds_core_v3_CollectionEntry_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &xds__core__v3__ResourceLocator_msg_init}, - {.UPB_PRIVATE(submsg) = &xds__core__v3__CollectionEntry__InlineEntry_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal xds_core_v3_CollectionEntry_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &xds__core__v3__ResourceLocator_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &xds__core__v3__CollectionEntry__InlineEntry_msg_init_ptr}, }; static const upb_MiniTableField xds_core_v3_CollectionEntry__fields[2] = { @@ -41,8 +43,9 @@ const upb_MiniTable xds__core__v3__CollectionEntry_msg_init = { }) }; -static const upb_MiniTableSub xds_core_v3_CollectionEntry_InlineEntry_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init}, +const upb_MiniTable* xds__core__v3__CollectionEntry_msg_init_ptr = &xds__core__v3__CollectionEntry_msg_init; +static const upb_MiniTableSubInternal xds_core_v3_CollectionEntry_InlineEntry_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, }; static const upb_MiniTableField xds_core_v3_CollectionEntry_InlineEntry__fields[3] = { @@ -66,6 +69,7 @@ const upb_MiniTable xds__core__v3__CollectionEntry__InlineEntry_msg_init = { }) }; +const upb_MiniTable* xds__core__v3__CollectionEntry__InlineEntry_msg_init_ptr = &xds__core__v3__CollectionEntry__InlineEntry_msg_init; static const upb_MiniTable *messages_layout[2] = { &xds__core__v3__CollectionEntry_msg_init, &xds__core__v3__CollectionEntry__InlineEntry_msg_init, diff --git a/src/core/ext/upb-gen/xds/core/v3/collection_entry.upb_minitable.h b/src/core/ext/upb-gen/xds/core/v3/collection_entry.upb_minitable.h index 61a9130dac7..41190f6fb2d 100644 --- a/src/core/ext/upb-gen/xds/core/v3/collection_entry.upb_minitable.h +++ b/src/core/ext/upb-gen/xds/core/v3/collection_entry.upb_minitable.h @@ -3,7 +3,8 @@ * xds/core/v3/collection_entry.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef XDS_CORE_V3_COLLECTION_ENTRY_PROTO_UPB_MINITABLE_H_ #define XDS_CORE_V3_COLLECTION_ENTRY_PROTO_UPB_MINITABLE_H_ @@ -18,7 +19,9 @@ extern "C" { #endif extern const upb_MiniTable xds__core__v3__CollectionEntry_msg_init; +extern const upb_MiniTable* xds__core__v3__CollectionEntry_msg_init_ptr; extern const upb_MiniTable xds__core__v3__CollectionEntry__InlineEntry_msg_init; +extern const upb_MiniTable* xds__core__v3__CollectionEntry__InlineEntry_msg_init_ptr; extern const upb_MiniTableFile xds_core_v3_collection_entry_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/xds/core/v3/context_params.upb.h b/src/core/ext/upb-gen/xds/core/v3/context_params.upb.h index ceb10c88e4b..d3321320ebf 100644 --- a/src/core/ext/upb-gen/xds/core/v3/context_params.upb.h +++ b/src/core/ext/upb-gen/xds/core/v3/context_params.upb.h @@ -3,7 +3,8 @@ * xds/core/v3/context_params.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef XDS_CORE_V3_CONTEXT_PARAMS_PROTO_UPB_H_ #define XDS_CORE_V3_CONTEXT_PARAMS_PROTO_UPB_H_ @@ -73,22 +74,26 @@ UPB_INLINE size_t xds_core_v3_ContextParams_params_size(const xds_core_v3_Contex } UPB_INLINE bool xds_core_v3_ContextParams_params_get(const xds_core_v3_ContextParams* msg, upb_StringView key, upb_StringView* val) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__core__v3__ContextParams__ParamsEntry_msg_init); const upb_Map* map = upb_Message_GetMap(UPB_UPCAST(msg), &field); if (!map) return false; return _upb_Map_Get(map, &key, 0, val, 0); } UPB_INLINE const xds_core_v3_ContextParams_ParamsEntry* xds_core_v3_ContextParams_params_next(const xds_core_v3_ContextParams* msg, size_t* iter) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__core__v3__ContextParams__ParamsEntry_msg_init); const upb_Map* map = upb_Message_GetMap(UPB_UPCAST(msg), &field); if (!map) return NULL; return (const xds_core_v3_ContextParams_ParamsEntry*)_upb_map_next(map, iter); } UPB_INLINE const upb_Map* _xds_core_v3_ContextParams_params_upb_map(xds_core_v3_ContextParams* msg) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__core__v3__ContextParams__ParamsEntry_msg_init); return upb_Message_GetMap(UPB_UPCAST(msg), &field); } UPB_INLINE upb_Map* _xds_core_v3_ContextParams_params_mutable_upb_map(xds_core_v3_ContextParams* msg, upb_Arena* a) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__core__v3__ContextParams__ParamsEntry_msg_init); return _upb_Message_GetOrCreateMutableMap(UPB_UPCAST(msg), &field, 0, 0, a); } @@ -100,6 +105,7 @@ UPB_INLINE void xds_core_v3_ContextParams_params_clear(xds_core_v3_ContextParams } UPB_INLINE bool xds_core_v3_ContextParams_params_set(xds_core_v3_ContextParams* msg, upb_StringView key, upb_StringView val, upb_Arena* a) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__core__v3__ContextParams__ParamsEntry_msg_init); upb_Map* map = _upb_Message_GetOrCreateMutableMap(UPB_UPCAST(msg), &field, 0, 0, a); return _upb_Map_Insert(map, &key, 0, &val, 0, a) != @@ -113,6 +119,7 @@ UPB_INLINE bool xds_core_v3_ContextParams_params_delete(xds_core_v3_ContextParam } UPB_INLINE xds_core_v3_ContextParams_ParamsEntry* xds_core_v3_ContextParams_params_nextmutable(xds_core_v3_ContextParams* msg, size_t* iter) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__core__v3__ContextParams__ParamsEntry_msg_init); upb_Map* map = (upb_Map*)upb_Message_GetMap(UPB_UPCAST(msg), &field); if (!map) return NULL; return (xds_core_v3_ContextParams_ParamsEntry*)_upb_map_next(map, iter); diff --git a/src/core/ext/upb-gen/xds/core/v3/context_params.upb_minitable.c b/src/core/ext/upb-gen/xds/core/v3/context_params.upb_minitable.c index 4f074de292e..2456df79ab1 100644 --- a/src/core/ext/upb-gen/xds/core/v3/context_params.upb_minitable.c +++ b/src/core/ext/upb-gen/xds/core/v3/context_params.upb_minitable.c @@ -3,7 +3,8 @@ * xds/core/v3/context_params.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -13,8 +14,9 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub xds_core_v3_ContextParams_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &xds__core__v3__ContextParams__ParamsEntry_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal xds_core_v3_ContextParams_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &xds__core__v3__ContextParams__ParamsEntry_msg_init_ptr}, }; static const upb_MiniTableField xds_core_v3_ContextParams__fields[1] = { @@ -30,6 +32,7 @@ const upb_MiniTable xds__core__v3__ContextParams_msg_init = { #endif }; +const upb_MiniTable* xds__core__v3__ContextParams_msg_init_ptr = &xds__core__v3__ContextParams_msg_init; static const upb_MiniTableField xds_core_v3_ContextParams_ParamsEntry__fields[2] = { {1, 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)}, @@ -50,6 +53,7 @@ const upb_MiniTable xds__core__v3__ContextParams__ParamsEntry_msg_init = { }) }; +const upb_MiniTable* xds__core__v3__ContextParams__ParamsEntry_msg_init_ptr = &xds__core__v3__ContextParams__ParamsEntry_msg_init; static const upb_MiniTable *messages_layout[2] = { &xds__core__v3__ContextParams_msg_init, &xds__core__v3__ContextParams__ParamsEntry_msg_init, diff --git a/src/core/ext/upb-gen/xds/core/v3/context_params.upb_minitable.h b/src/core/ext/upb-gen/xds/core/v3/context_params.upb_minitable.h index 1b67d6a1001..6d9fdd2b1a5 100644 --- a/src/core/ext/upb-gen/xds/core/v3/context_params.upb_minitable.h +++ b/src/core/ext/upb-gen/xds/core/v3/context_params.upb_minitable.h @@ -3,7 +3,8 @@ * xds/core/v3/context_params.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef XDS_CORE_V3_CONTEXT_PARAMS_PROTO_UPB_MINITABLE_H_ #define XDS_CORE_V3_CONTEXT_PARAMS_PROTO_UPB_MINITABLE_H_ @@ -18,7 +19,9 @@ extern "C" { #endif extern const upb_MiniTable xds__core__v3__ContextParams_msg_init; +extern const upb_MiniTable* xds__core__v3__ContextParams_msg_init_ptr; extern const upb_MiniTable xds__core__v3__ContextParams__ParamsEntry_msg_init; +extern const upb_MiniTable* xds__core__v3__ContextParams__ParamsEntry_msg_init_ptr; extern const upb_MiniTableFile xds_core_v3_context_params_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/xds/core/v3/extension.upb.h b/src/core/ext/upb-gen/xds/core/v3/extension.upb.h index 54114711964..f562a9c0017 100644 --- a/src/core/ext/upb-gen/xds/core/v3/extension.upb.h +++ b/src/core/ext/upb-gen/xds/core/v3/extension.upb.h @@ -3,7 +3,8 @@ * xds/core/v3/extension.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef XDS_CORE_V3_EXTENSION_PROTO_UPB_H_ #define XDS_CORE_V3_EXTENSION_PROTO_UPB_H_ @@ -83,6 +84,7 @@ UPB_INLINE const struct google_protobuf_Any* xds_core_v3_TypedExtensionConfig_ty const struct google_protobuf_Any* default_val = NULL; const struct google_protobuf_Any* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -98,6 +100,7 @@ UPB_INLINE void xds_core_v3_TypedExtensionConfig_set_name(xds_core_v3_TypedExten } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); 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) { diff --git a/src/core/ext/upb-gen/xds/core/v3/extension.upb_minitable.c b/src/core/ext/upb-gen/xds/core/v3/extension.upb_minitable.c index 6ebd9117963..951a460abaa 100644 --- a/src/core/ext/upb-gen/xds/core/v3/extension.upb_minitable.c +++ b/src/core/ext/upb-gen/xds/core/v3/extension.upb_minitable.c @@ -3,7 +3,8 @@ * xds/core/v3/extension.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -14,8 +15,9 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub xds_core_v3_TypedExtensionConfig_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal xds_core_v3_TypedExtensionConfig_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, }; static const upb_MiniTableField xds_core_v3_TypedExtensionConfig__fields[2] = { @@ -36,6 +38,7 @@ const upb_MiniTable xds__core__v3__TypedExtensionConfig_msg_init = { }) }; +const upb_MiniTable* xds__core__v3__TypedExtensionConfig_msg_init_ptr = &xds__core__v3__TypedExtensionConfig_msg_init; static const upb_MiniTable *messages_layout[1] = { &xds__core__v3__TypedExtensionConfig_msg_init, }; diff --git a/src/core/ext/upb-gen/xds/core/v3/extension.upb_minitable.h b/src/core/ext/upb-gen/xds/core/v3/extension.upb_minitable.h index 600b8ea7d3d..c8b3bcfab99 100644 --- a/src/core/ext/upb-gen/xds/core/v3/extension.upb_minitable.h +++ b/src/core/ext/upb-gen/xds/core/v3/extension.upb_minitable.h @@ -3,7 +3,8 @@ * xds/core/v3/extension.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef XDS_CORE_V3_EXTENSION_PROTO_UPB_MINITABLE_H_ #define XDS_CORE_V3_EXTENSION_PROTO_UPB_MINITABLE_H_ @@ -18,6 +19,7 @@ extern "C" { #endif extern const upb_MiniTable xds__core__v3__TypedExtensionConfig_msg_init; +extern const upb_MiniTable* xds__core__v3__TypedExtensionConfig_msg_init_ptr; extern const upb_MiniTableFile xds_core_v3_extension_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/xds/core/v3/resource.upb.h b/src/core/ext/upb-gen/xds/core/v3/resource.upb.h index 3bddecbb0ac..68dcff3e663 100644 --- a/src/core/ext/upb-gen/xds/core/v3/resource.upb.h +++ b/src/core/ext/upb-gen/xds/core/v3/resource.upb.h @@ -3,7 +3,8 @@ * xds/core/v3/resource.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef XDS_CORE_V3_RESOURCE_PROTO_UPB_H_ #define XDS_CORE_V3_RESOURCE_PROTO_UPB_H_ @@ -73,6 +74,7 @@ UPB_INLINE const struct xds_core_v3_ResourceName* xds_core_v3_Resource_name(cons const struct xds_core_v3_ResourceName* default_val = NULL; const struct xds_core_v3_ResourceName* 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_PRIVATE(_upb_MiniTable_StrongReference)(&xds__core__v3__ResourceName_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -101,6 +103,7 @@ UPB_INLINE const struct google_protobuf_Any* xds_core_v3_Resource_resource(const const struct google_protobuf_Any* default_val = NULL; const struct google_protobuf_Any* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -112,6 +115,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_PRIVATE(_upb_MiniTable_StrongReference)(&xds__core__v3__ResourceName_msg_init); 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) { @@ -128,6 +132,7 @@ UPB_INLINE void xds_core_v3_Resource_set_version(xds_core_v3_Resource *msg, upb_ } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Any_msg_init); 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) { diff --git a/src/core/ext/upb-gen/xds/core/v3/resource.upb_minitable.c b/src/core/ext/upb-gen/xds/core/v3/resource.upb_minitable.c index 15ba4b9dd2e..fba9de95951 100644 --- a/src/core/ext/upb-gen/xds/core/v3/resource.upb_minitable.c +++ b/src/core/ext/upb-gen/xds/core/v3/resource.upb_minitable.c @@ -3,7 +3,8 @@ * xds/core/v3/resource.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -15,9 +16,10 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub xds_core_v3_Resource_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &xds__core__v3__ResourceName_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal xds_core_v3_Resource_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &xds__core__v3__ResourceName_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, }; static const upb_MiniTableField xds_core_v3_Resource__fields[3] = { @@ -41,6 +43,7 @@ const upb_MiniTable xds__core__v3__Resource_msg_init = { }) }; +const upb_MiniTable* xds__core__v3__Resource_msg_init_ptr = &xds__core__v3__Resource_msg_init; static const upb_MiniTable *messages_layout[1] = { &xds__core__v3__Resource_msg_init, }; diff --git a/src/core/ext/upb-gen/xds/core/v3/resource.upb_minitable.h b/src/core/ext/upb-gen/xds/core/v3/resource.upb_minitable.h index 070cfe27730..d74344dd54b 100644 --- a/src/core/ext/upb-gen/xds/core/v3/resource.upb_minitable.h +++ b/src/core/ext/upb-gen/xds/core/v3/resource.upb_minitable.h @@ -3,7 +3,8 @@ * xds/core/v3/resource.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef XDS_CORE_V3_RESOURCE_PROTO_UPB_MINITABLE_H_ #define XDS_CORE_V3_RESOURCE_PROTO_UPB_MINITABLE_H_ @@ -18,6 +19,7 @@ extern "C" { #endif extern const upb_MiniTable xds__core__v3__Resource_msg_init; +extern const upb_MiniTable* xds__core__v3__Resource_msg_init_ptr; extern const upb_MiniTableFile xds_core_v3_resource_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/xds/core/v3/resource_locator.upb.h b/src/core/ext/upb-gen/xds/core/v3/resource_locator.upb.h index a5ad60883e4..2af90d2eedf 100644 --- a/src/core/ext/upb-gen/xds/core/v3/resource_locator.upb.h +++ b/src/core/ext/upb-gen/xds/core/v3/resource_locator.upb.h @@ -3,7 +3,8 @@ * xds/core/v3/resource_locator.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef XDS_CORE_V3_RESOURCE_LOCATOR_PROTO_UPB_H_ #define XDS_CORE_V3_RESOURCE_LOCATOR_PROTO_UPB_H_ @@ -136,6 +137,7 @@ UPB_INLINE const struct xds_core_v3_ContextParams* xds_core_v3_ResourceLocator_e const struct xds_core_v3_ContextParams* default_val = NULL; const struct xds_core_v3_ContextParams* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&xds__core__v3__ContextParams_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -150,6 +152,7 @@ UPB_INLINE void xds_core_v3_ResourceLocator_clear_directives(xds_core_v3_Resourc } UPB_INLINE const xds_core_v3_ResourceLocator_Directive* const* xds_core_v3_ResourceLocator_directives(const xds_core_v3_ResourceLocator* msg, size_t* size) { const upb_MiniTableField field = {6, UPB_SIZE(16, 64), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__core__v3__ResourceLocator__Directive_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -161,6 +164,7 @@ UPB_INLINE const xds_core_v3_ResourceLocator_Directive* const* xds_core_v3_Resou } UPB_INLINE const upb_Array* _xds_core_v3_ResourceLocator_directives_upb_array(const xds_core_v3_ResourceLocator* msg, size_t* size) { const upb_MiniTableField field = {6, UPB_SIZE(16, 64), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__core__v3__ResourceLocator__Directive_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -169,6 +173,7 @@ UPB_INLINE const upb_Array* _xds_core_v3_ResourceLocator_directives_upb_array(co } UPB_INLINE upb_Array* _xds_core_v3_ResourceLocator_directives_mutable_upb_array(xds_core_v3_ResourceLocator* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {6, UPB_SIZE(16, 64), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__core__v3__ResourceLocator__Directive_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -195,6 +200,7 @@ UPB_INLINE void xds_core_v3_ResourceLocator_set_resource_type(xds_core_v3_Resour } 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_PRIVATE(_upb_MiniTable_StrongReference)(&xds__core__v3__ContextParams_msg_init); 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) { @@ -207,6 +213,7 @@ UPB_INLINE struct xds_core_v3_ContextParams* xds_core_v3_ResourceLocator_mutable } UPB_INLINE xds_core_v3_ResourceLocator_Directive** xds_core_v3_ResourceLocator_mutable_directives(xds_core_v3_ResourceLocator* msg, size_t* size) { upb_MiniTableField field = {6, UPB_SIZE(16, 64), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__core__v3__ResourceLocator__Directive_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -223,6 +230,7 @@ UPB_INLINE xds_core_v3_ResourceLocator_Directive** xds_core_v3_ResourceLocator_r } UPB_INLINE struct xds_core_v3_ResourceLocator_Directive* xds_core_v3_ResourceLocator_add_directives(xds_core_v3_ResourceLocator* msg, upb_Arena* arena) { upb_MiniTableField field = {6, UPB_SIZE(16, 64), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__core__v3__ResourceLocator__Directive_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -290,6 +298,7 @@ UPB_INLINE const xds_core_v3_ResourceLocator* xds_core_v3_ResourceLocator_Direct const xds_core_v3_ResourceLocator* default_val = NULL; const xds_core_v3_ResourceLocator* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&xds__core__v3__ResourceLocator_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -317,6 +326,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_PRIVATE(_upb_MiniTable_StrongReference)(&xds__core__v3__ResourceLocator_msg_init); 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) { diff --git a/src/core/ext/upb-gen/xds/core/v3/resource_locator.upb_minitable.c b/src/core/ext/upb-gen/xds/core/v3/resource_locator.upb_minitable.c index c46929c95d9..4bc637032e5 100644 --- a/src/core/ext/upb-gen/xds/core/v3/resource_locator.upb_minitable.c +++ b/src/core/ext/upb-gen/xds/core/v3/resource_locator.upb_minitable.c @@ -3,7 +3,8 @@ * xds/core/v3/resource_locator.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -15,9 +16,10 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub xds_core_v3_ResourceLocator_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &xds__core__v3__ContextParams_msg_init}, - {.UPB_PRIVATE(submsg) = &xds__core__v3__ResourceLocator__Directive_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal xds_core_v3_ResourceLocator_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &xds__core__v3__ContextParams_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &xds__core__v3__ResourceLocator__Directive_msg_init_ptr}, }; static const upb_MiniTableField xds_core_v3_ResourceLocator__fields[6] = { @@ -48,8 +50,9 @@ const upb_MiniTable xds__core__v3__ResourceLocator_msg_init = { }) }; -static const upb_MiniTableSub xds_core_v3_ResourceLocator_Directive_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &xds__core__v3__ResourceLocator_msg_init}, +const upb_MiniTable* xds__core__v3__ResourceLocator_msg_init_ptr = &xds__core__v3__ResourceLocator_msg_init; +static const upb_MiniTableSubInternal xds_core_v3_ResourceLocator_Directive_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &xds__core__v3__ResourceLocator_msg_init_ptr}, }; static const upb_MiniTableField xds_core_v3_ResourceLocator_Directive__fields[2] = { @@ -72,6 +75,7 @@ const upb_MiniTable xds__core__v3__ResourceLocator__Directive_msg_init = { }) }; +const upb_MiniTable* xds__core__v3__ResourceLocator__Directive_msg_init_ptr = &xds__core__v3__ResourceLocator__Directive_msg_init; static const upb_MiniTable *messages_layout[2] = { &xds__core__v3__ResourceLocator_msg_init, &xds__core__v3__ResourceLocator__Directive_msg_init, diff --git a/src/core/ext/upb-gen/xds/core/v3/resource_locator.upb_minitable.h b/src/core/ext/upb-gen/xds/core/v3/resource_locator.upb_minitable.h index c51c2ea2a8d..7917c25ebf7 100644 --- a/src/core/ext/upb-gen/xds/core/v3/resource_locator.upb_minitable.h +++ b/src/core/ext/upb-gen/xds/core/v3/resource_locator.upb_minitable.h @@ -3,7 +3,8 @@ * xds/core/v3/resource_locator.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef XDS_CORE_V3_RESOURCE_LOCATOR_PROTO_UPB_MINITABLE_H_ #define XDS_CORE_V3_RESOURCE_LOCATOR_PROTO_UPB_MINITABLE_H_ @@ -18,7 +19,9 @@ extern "C" { #endif extern const upb_MiniTable xds__core__v3__ResourceLocator_msg_init; +extern const upb_MiniTable* xds__core__v3__ResourceLocator_msg_init_ptr; extern const upb_MiniTable xds__core__v3__ResourceLocator__Directive_msg_init; +extern const upb_MiniTable* xds__core__v3__ResourceLocator__Directive_msg_init_ptr; extern const upb_MiniTableFile xds_core_v3_resource_locator_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/xds/core/v3/resource_name.upb.h b/src/core/ext/upb-gen/xds/core/v3/resource_name.upb.h index 0b99122aaab..32f2372f9a2 100644 --- a/src/core/ext/upb-gen/xds/core/v3/resource_name.upb.h +++ b/src/core/ext/upb-gen/xds/core/v3/resource_name.upb.h @@ -3,7 +3,8 @@ * xds/core/v3/resource_name.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef XDS_CORE_V3_RESOURCE_NAME_PROTO_UPB_H_ #define XDS_CORE_V3_RESOURCE_NAME_PROTO_UPB_H_ @@ -108,6 +109,7 @@ UPB_INLINE const struct xds_core_v3_ContextParams* xds_core_v3_ResourceName_cont const struct xds_core_v3_ContextParams* default_val = NULL; const struct xds_core_v3_ContextParams* 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_PRIVATE(_upb_MiniTable_StrongReference)(&xds__core__v3__ContextParams_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -131,6 +133,7 @@ UPB_INLINE void xds_core_v3_ResourceName_set_resource_type(xds_core_v3_ResourceN } 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_PRIVATE(_upb_MiniTable_StrongReference)(&xds__core__v3__ContextParams_msg_init); 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) { diff --git a/src/core/ext/upb-gen/xds/core/v3/resource_name.upb_minitable.c b/src/core/ext/upb-gen/xds/core/v3/resource_name.upb_minitable.c index abba90d31a0..990b69f355d 100644 --- a/src/core/ext/upb-gen/xds/core/v3/resource_name.upb_minitable.c +++ b/src/core/ext/upb-gen/xds/core/v3/resource_name.upb_minitable.c @@ -3,7 +3,8 @@ * xds/core/v3/resource_name.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -15,8 +16,9 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub xds_core_v3_ResourceName_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &xds__core__v3__ContextParams_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal xds_core_v3_ResourceName_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &xds__core__v3__ContextParams_msg_init_ptr}, }; static const upb_MiniTableField xds_core_v3_ResourceName__fields[4] = { @@ -41,6 +43,7 @@ const upb_MiniTable xds__core__v3__ResourceName_msg_init = { }) }; +const upb_MiniTable* xds__core__v3__ResourceName_msg_init_ptr = &xds__core__v3__ResourceName_msg_init; static const upb_MiniTable *messages_layout[1] = { &xds__core__v3__ResourceName_msg_init, }; diff --git a/src/core/ext/upb-gen/xds/core/v3/resource_name.upb_minitable.h b/src/core/ext/upb-gen/xds/core/v3/resource_name.upb_minitable.h index 2a3068ac999..f8267e3bb8a 100644 --- a/src/core/ext/upb-gen/xds/core/v3/resource_name.upb_minitable.h +++ b/src/core/ext/upb-gen/xds/core/v3/resource_name.upb_minitable.h @@ -3,7 +3,8 @@ * xds/core/v3/resource_name.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef XDS_CORE_V3_RESOURCE_NAME_PROTO_UPB_MINITABLE_H_ #define XDS_CORE_V3_RESOURCE_NAME_PROTO_UPB_MINITABLE_H_ @@ -18,6 +19,7 @@ extern "C" { #endif extern const upb_MiniTable xds__core__v3__ResourceName_msg_init; +extern const upb_MiniTable* xds__core__v3__ResourceName_msg_init_ptr; extern const upb_MiniTableFile xds_core_v3_resource_name_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/xds/data/orca/v3/orca_load_report.upb.h b/src/core/ext/upb-gen/xds/data/orca/v3/orca_load_report.upb.h index f7d3384749e..53874894366 100644 --- a/src/core/ext/upb-gen/xds/data/orca/v3/orca_load_report.upb.h +++ b/src/core/ext/upb-gen/xds/data/orca/v3/orca_load_report.upb.h @@ -3,7 +3,8 @@ * xds/data/orca/v3/orca_load_report.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef XDS_DATA_ORCA_V3_ORCA_LOAD_REPORT_PROTO_UPB_H_ #define XDS_DATA_ORCA_V3_ORCA_LOAD_REPORT_PROTO_UPB_H_ @@ -111,22 +112,26 @@ UPB_INLINE size_t xds_data_orca_v3_OrcaLoadReport_request_cost_size(const xds_da } UPB_INLINE bool xds_data_orca_v3_OrcaLoadReport_request_cost_get(const xds_data_orca_v3_OrcaLoadReport* msg, upb_StringView key, double* val) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__data__orca__v3__OrcaLoadReport__RequestCostEntry_msg_init); 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 xds_data_orca_v3_OrcaLoadReport_RequestCostEntry* xds_data_orca_v3_OrcaLoadReport_request_cost_next(const xds_data_orca_v3_OrcaLoadReport* msg, size_t* iter) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__data__orca__v3__OrcaLoadReport__RequestCostEntry_msg_init); const upb_Map* map = upb_Message_GetMap(UPB_UPCAST(msg), &field); if (!map) return NULL; return (const xds_data_orca_v3_OrcaLoadReport_RequestCostEntry*)_upb_map_next(map, iter); } UPB_INLINE const upb_Map* _xds_data_orca_v3_OrcaLoadReport_request_cost_upb_map(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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__data__orca__v3__OrcaLoadReport__RequestCostEntry_msg_init); return upb_Message_GetMap(UPB_UPCAST(msg), &field); } UPB_INLINE upb_Map* _xds_data_orca_v3_OrcaLoadReport_request_cost_mutable_upb_map(xds_data_orca_v3_OrcaLoadReport* msg, upb_Arena* a) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__data__orca__v3__OrcaLoadReport__RequestCostEntry_msg_init); return _upb_Message_GetOrCreateMutableMap(UPB_UPCAST(msg), &field, 0, sizeof(double), a); } UPB_INLINE void xds_data_orca_v3_OrcaLoadReport_clear_utilization(xds_data_orca_v3_OrcaLoadReport* msg) { @@ -140,22 +145,26 @@ UPB_INLINE size_t xds_data_orca_v3_OrcaLoadReport_utilization_size(const xds_dat } UPB_INLINE bool xds_data_orca_v3_OrcaLoadReport_utilization_get(const xds_data_orca_v3_OrcaLoadReport* msg, upb_StringView key, double* val) { const upb_MiniTableField field = {5, UPB_SIZE(12, 40), 0, 1, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__data__orca__v3__OrcaLoadReport__UtilizationEntry_msg_init); 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 xds_data_orca_v3_OrcaLoadReport_UtilizationEntry* xds_data_orca_v3_OrcaLoadReport_utilization_next(const xds_data_orca_v3_OrcaLoadReport* msg, size_t* iter) { const upb_MiniTableField field = {5, UPB_SIZE(12, 40), 0, 1, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__data__orca__v3__OrcaLoadReport__UtilizationEntry_msg_init); const upb_Map* map = upb_Message_GetMap(UPB_UPCAST(msg), &field); if (!map) return NULL; return (const xds_data_orca_v3_OrcaLoadReport_UtilizationEntry*)_upb_map_next(map, iter); } UPB_INLINE const upb_Map* _xds_data_orca_v3_OrcaLoadReport_utilization_upb_map(xds_data_orca_v3_OrcaLoadReport* msg) { const upb_MiniTableField field = {5, UPB_SIZE(12, 40), 0, 1, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__data__orca__v3__OrcaLoadReport__UtilizationEntry_msg_init); return upb_Message_GetMap(UPB_UPCAST(msg), &field); } UPB_INLINE upb_Map* _xds_data_orca_v3_OrcaLoadReport_utilization_mutable_upb_map(xds_data_orca_v3_OrcaLoadReport* msg, upb_Arena* a) { const upb_MiniTableField field = {5, UPB_SIZE(12, 40), 0, 1, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__data__orca__v3__OrcaLoadReport__UtilizationEntry_msg_init); return _upb_Message_GetOrCreateMutableMap(UPB_UPCAST(msg), &field, 0, sizeof(double), a); } UPB_INLINE void xds_data_orca_v3_OrcaLoadReport_clear_rps_fractional(xds_data_orca_v3_OrcaLoadReport* msg) { @@ -193,22 +202,26 @@ UPB_INLINE size_t xds_data_orca_v3_OrcaLoadReport_named_metrics_size(const xds_d } UPB_INLINE bool xds_data_orca_v3_OrcaLoadReport_named_metrics_get(const xds_data_orca_v3_OrcaLoadReport* msg, upb_StringView key, double* val) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__data__orca__v3__OrcaLoadReport__NamedMetricsEntry_msg_init); 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 xds_data_orca_v3_OrcaLoadReport_NamedMetricsEntry* xds_data_orca_v3_OrcaLoadReport_named_metrics_next(const xds_data_orca_v3_OrcaLoadReport* msg, size_t* iter) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__data__orca__v3__OrcaLoadReport__NamedMetricsEntry_msg_init); const upb_Map* map = upb_Message_GetMap(UPB_UPCAST(msg), &field); if (!map) return NULL; return (const xds_data_orca_v3_OrcaLoadReport_NamedMetricsEntry*)_upb_map_next(map, iter); } UPB_INLINE const upb_Map* _xds_data_orca_v3_OrcaLoadReport_named_metrics_upb_map(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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__data__orca__v3__OrcaLoadReport__NamedMetricsEntry_msg_init); return upb_Message_GetMap(UPB_UPCAST(msg), &field); } UPB_INLINE upb_Map* _xds_data_orca_v3_OrcaLoadReport_named_metrics_mutable_upb_map(xds_data_orca_v3_OrcaLoadReport* msg, upb_Arena* a) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__data__orca__v3__OrcaLoadReport__NamedMetricsEntry_msg_init); return _upb_Message_GetOrCreateMutableMap(UPB_UPCAST(msg), &field, 0, sizeof(double), a); } UPB_INLINE void xds_data_orca_v3_OrcaLoadReport_clear_application_utilization(xds_data_orca_v3_OrcaLoadReport* msg) { @@ -244,6 +257,7 @@ UPB_INLINE void xds_data_orca_v3_OrcaLoadReport_request_cost_clear(xds_data_orca } UPB_INLINE bool xds_data_orca_v3_OrcaLoadReport_request_cost_set(xds_data_orca_v3_OrcaLoadReport* msg, upb_StringView key, double val, upb_Arena* a) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__data__orca__v3__OrcaLoadReport__RequestCostEntry_msg_init); 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) != @@ -257,6 +271,7 @@ UPB_INLINE bool xds_data_orca_v3_OrcaLoadReport_request_cost_delete(xds_data_orc } UPB_INLINE xds_data_orca_v3_OrcaLoadReport_RequestCostEntry* xds_data_orca_v3_OrcaLoadReport_request_cost_nextmutable(xds_data_orca_v3_OrcaLoadReport* msg, size_t* iter) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__data__orca__v3__OrcaLoadReport__RequestCostEntry_msg_init); upb_Map* map = (upb_Map*)upb_Message_GetMap(UPB_UPCAST(msg), &field); if (!map) return NULL; return (xds_data_orca_v3_OrcaLoadReport_RequestCostEntry*)_upb_map_next(map, iter); @@ -269,6 +284,7 @@ UPB_INLINE void xds_data_orca_v3_OrcaLoadReport_utilization_clear(xds_data_orca_ } UPB_INLINE bool xds_data_orca_v3_OrcaLoadReport_utilization_set(xds_data_orca_v3_OrcaLoadReport* msg, upb_StringView key, double val, upb_Arena* a) { const upb_MiniTableField field = {5, UPB_SIZE(12, 40), 0, 1, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__data__orca__v3__OrcaLoadReport__UtilizationEntry_msg_init); 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) != @@ -282,6 +298,7 @@ UPB_INLINE bool xds_data_orca_v3_OrcaLoadReport_utilization_delete(xds_data_orca } UPB_INLINE xds_data_orca_v3_OrcaLoadReport_UtilizationEntry* xds_data_orca_v3_OrcaLoadReport_utilization_nextmutable(xds_data_orca_v3_OrcaLoadReport* msg, size_t* iter) { const upb_MiniTableField field = {5, UPB_SIZE(12, 40), 0, 1, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__data__orca__v3__OrcaLoadReport__UtilizationEntry_msg_init); upb_Map* map = (upb_Map*)upb_Message_GetMap(UPB_UPCAST(msg), &field); if (!map) return NULL; return (xds_data_orca_v3_OrcaLoadReport_UtilizationEntry*)_upb_map_next(map, iter); @@ -302,6 +319,7 @@ UPB_INLINE void xds_data_orca_v3_OrcaLoadReport_named_metrics_clear(xds_data_orc } UPB_INLINE bool xds_data_orca_v3_OrcaLoadReport_named_metrics_set(xds_data_orca_v3_OrcaLoadReport* msg, upb_StringView key, double val, upb_Arena* a) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__data__orca__v3__OrcaLoadReport__NamedMetricsEntry_msg_init); 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) != @@ -315,6 +333,7 @@ UPB_INLINE bool xds_data_orca_v3_OrcaLoadReport_named_metrics_delete(xds_data_or } UPB_INLINE xds_data_orca_v3_OrcaLoadReport_NamedMetricsEntry* xds_data_orca_v3_OrcaLoadReport_named_metrics_nextmutable(xds_data_orca_v3_OrcaLoadReport* msg, size_t* iter) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__data__orca__v3__OrcaLoadReport__NamedMetricsEntry_msg_init); upb_Map* map = (upb_Map*)upb_Message_GetMap(UPB_UPCAST(msg), &field); if (!map) return NULL; return (xds_data_orca_v3_OrcaLoadReport_NamedMetricsEntry*)_upb_map_next(map, iter); diff --git a/src/core/ext/upb-gen/xds/data/orca/v3/orca_load_report.upb_minitable.c b/src/core/ext/upb-gen/xds/data/orca/v3/orca_load_report.upb_minitable.c index ebc43f24147..ce2cd2c5df9 100644 --- a/src/core/ext/upb-gen/xds/data/orca/v3/orca_load_report.upb_minitable.c +++ b/src/core/ext/upb-gen/xds/data/orca/v3/orca_load_report.upb_minitable.c @@ -3,7 +3,8 @@ * xds/data/orca/v3/orca_load_report.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -13,10 +14,11 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub xds_data_orca_v3_OrcaLoadReport_submsgs[3] = { - {.UPB_PRIVATE(submsg) = &xds__data__orca__v3__OrcaLoadReport__RequestCostEntry_msg_init}, - {.UPB_PRIVATE(submsg) = &xds__data__orca__v3__OrcaLoadReport__UtilizationEntry_msg_init}, - {.UPB_PRIVATE(submsg) = &xds__data__orca__v3__OrcaLoadReport__NamedMetricsEntry_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal xds_data_orca_v3_OrcaLoadReport_submsgs[3] = { + {.UPB_PRIVATE(submsg) = &xds__data__orca__v3__OrcaLoadReport__RequestCostEntry_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &xds__data__orca__v3__OrcaLoadReport__UtilizationEntry_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &xds__data__orca__v3__OrcaLoadReport__NamedMetricsEntry_msg_init_ptr}, }; static const upb_MiniTableField xds_data_orca_v3_OrcaLoadReport__fields[9] = { @@ -58,6 +60,7 @@ const upb_MiniTable xds__data__orca__v3__OrcaLoadReport_msg_init = { }) }; +const upb_MiniTable* xds__data__orca__v3__OrcaLoadReport_msg_init_ptr = &xds__data__orca__v3__OrcaLoadReport_msg_init; static const upb_MiniTableField xds_data_orca_v3_OrcaLoadReport_RequestCostEntry__fields[2] = { {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, {2, 32, 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, @@ -78,6 +81,7 @@ const upb_MiniTable xds__data__orca__v3__OrcaLoadReport__RequestCostEntry_msg_in }) }; +const upb_MiniTable* xds__data__orca__v3__OrcaLoadReport__RequestCostEntry_msg_init_ptr = &xds__data__orca__v3__OrcaLoadReport__RequestCostEntry_msg_init; static const upb_MiniTableField xds_data_orca_v3_OrcaLoadReport_UtilizationEntry__fields[2] = { {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, {2, 32, 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, @@ -98,6 +102,7 @@ const upb_MiniTable xds__data__orca__v3__OrcaLoadReport__UtilizationEntry_msg_in }) }; +const upb_MiniTable* xds__data__orca__v3__OrcaLoadReport__UtilizationEntry_msg_init_ptr = &xds__data__orca__v3__OrcaLoadReport__UtilizationEntry_msg_init; static const upb_MiniTableField xds_data_orca_v3_OrcaLoadReport_NamedMetricsEntry__fields[2] = { {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, {2, 32, 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, @@ -118,6 +123,7 @@ const upb_MiniTable xds__data__orca__v3__OrcaLoadReport__NamedMetricsEntry_msg_i }) }; +const upb_MiniTable* xds__data__orca__v3__OrcaLoadReport__NamedMetricsEntry_msg_init_ptr = &xds__data__orca__v3__OrcaLoadReport__NamedMetricsEntry_msg_init; static const upb_MiniTable *messages_layout[4] = { &xds__data__orca__v3__OrcaLoadReport_msg_init, &xds__data__orca__v3__OrcaLoadReport__RequestCostEntry_msg_init, diff --git a/src/core/ext/upb-gen/xds/data/orca/v3/orca_load_report.upb_minitable.h b/src/core/ext/upb-gen/xds/data/orca/v3/orca_load_report.upb_minitable.h index 4dca993433c..26c4f1a2255 100644 --- a/src/core/ext/upb-gen/xds/data/orca/v3/orca_load_report.upb_minitable.h +++ b/src/core/ext/upb-gen/xds/data/orca/v3/orca_load_report.upb_minitable.h @@ -3,7 +3,8 @@ * xds/data/orca/v3/orca_load_report.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef XDS_DATA_ORCA_V3_ORCA_LOAD_REPORT_PROTO_UPB_MINITABLE_H_ #define XDS_DATA_ORCA_V3_ORCA_LOAD_REPORT_PROTO_UPB_MINITABLE_H_ @@ -18,9 +19,13 @@ extern "C" { #endif extern const upb_MiniTable xds__data__orca__v3__OrcaLoadReport_msg_init; +extern const upb_MiniTable* xds__data__orca__v3__OrcaLoadReport_msg_init_ptr; extern const upb_MiniTable xds__data__orca__v3__OrcaLoadReport__RequestCostEntry_msg_init; +extern const upb_MiniTable* xds__data__orca__v3__OrcaLoadReport__RequestCostEntry_msg_init_ptr; extern const upb_MiniTable xds__data__orca__v3__OrcaLoadReport__UtilizationEntry_msg_init; +extern const upb_MiniTable* xds__data__orca__v3__OrcaLoadReport__UtilizationEntry_msg_init_ptr; extern const upb_MiniTable xds__data__orca__v3__OrcaLoadReport__NamedMetricsEntry_msg_init; +extern const upb_MiniTable* xds__data__orca__v3__OrcaLoadReport__NamedMetricsEntry_msg_init_ptr; extern const upb_MiniTableFile xds_data_orca_v3_orca_load_report_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/xds/service/orca/v3/orca.upb.h b/src/core/ext/upb-gen/xds/service/orca/v3/orca.upb.h index 12515253748..d97de133d75 100644 --- a/src/core/ext/upb-gen/xds/service/orca/v3/orca.upb.h +++ b/src/core/ext/upb-gen/xds/service/orca/v3/orca.upb.h @@ -3,7 +3,8 @@ * xds/service/orca/v3/orca.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef XDS_SERVICE_ORCA_V3_ORCA_PROTO_UPB_H_ #define XDS_SERVICE_ORCA_V3_ORCA_PROTO_UPB_H_ @@ -71,6 +72,7 @@ UPB_INLINE const struct google_protobuf_Duration* xds_service_orca_v3_OrcaLoadRe 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -114,6 +116,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Duration_msg_init); 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) { diff --git a/src/core/ext/upb-gen/xds/service/orca/v3/orca.upb_minitable.c b/src/core/ext/upb-gen/xds/service/orca/v3/orca.upb_minitable.c index 9966e819578..bc29b177b97 100644 --- a/src/core/ext/upb-gen/xds/service/orca/v3/orca.upb_minitable.c +++ b/src/core/ext/upb-gen/xds/service/orca/v3/orca.upb_minitable.c @@ -3,7 +3,8 @@ * xds/service/orca/v3/orca.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -14,8 +15,9 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub xds_service_orca_v3_OrcaLoadReportRequest_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal xds_service_orca_v3_OrcaLoadReportRequest_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, }; static const upb_MiniTableField xds_service_orca_v3_OrcaLoadReportRequest__fields[2] = { @@ -38,6 +40,7 @@ const upb_MiniTable xds__service__orca__v3__OrcaLoadReportRequest_msg_init = { }) }; +const upb_MiniTable* xds__service__orca__v3__OrcaLoadReportRequest_msg_init_ptr = &xds__service__orca__v3__OrcaLoadReportRequest_msg_init; static const upb_MiniTable *messages_layout[1] = { &xds__service__orca__v3__OrcaLoadReportRequest_msg_init, }; diff --git a/src/core/ext/upb-gen/xds/service/orca/v3/orca.upb_minitable.h b/src/core/ext/upb-gen/xds/service/orca/v3/orca.upb_minitable.h index b0a75eee87f..84a45581212 100644 --- a/src/core/ext/upb-gen/xds/service/orca/v3/orca.upb_minitable.h +++ b/src/core/ext/upb-gen/xds/service/orca/v3/orca.upb_minitable.h @@ -3,7 +3,8 @@ * xds/service/orca/v3/orca.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef XDS_SERVICE_ORCA_V3_ORCA_PROTO_UPB_MINITABLE_H_ #define XDS_SERVICE_ORCA_V3_ORCA_PROTO_UPB_MINITABLE_H_ @@ -18,6 +19,7 @@ extern "C" { #endif extern const upb_MiniTable xds__service__orca__v3__OrcaLoadReportRequest_msg_init; +extern const upb_MiniTable* xds__service__orca__v3__OrcaLoadReportRequest_msg_init_ptr; extern const upb_MiniTableFile xds_service_orca_v3_orca_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/xds/type/matcher/v3/cel.upb.h b/src/core/ext/upb-gen/xds/type/matcher/v3/cel.upb.h index 59677d3bfd0..f7f399d8e20 100644 --- a/src/core/ext/upb-gen/xds/type/matcher/v3/cel.upb.h +++ b/src/core/ext/upb-gen/xds/type/matcher/v3/cel.upb.h @@ -3,7 +3,8 @@ * xds/type/matcher/v3/cel.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef XDS_TYPE_MATCHER_V3_CEL_PROTO_UPB_H_ #define XDS_TYPE_MATCHER_V3_CEL_PROTO_UPB_H_ @@ -72,6 +73,7 @@ UPB_INLINE const struct xds_type_v3_CelExpression* xds_type_matcher_v3_CelMatche const struct xds_type_v3_CelExpression* default_val = NULL; const struct xds_type_v3_CelExpression* 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_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__v3__CelExpression_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -95,6 +97,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_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__v3__CelExpression_msg_init); 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) { diff --git a/src/core/ext/upb-gen/xds/type/matcher/v3/cel.upb_minitable.c b/src/core/ext/upb-gen/xds/type/matcher/v3/cel.upb_minitable.c index cf4ef830b80..ec3d622662c 100644 --- a/src/core/ext/upb-gen/xds/type/matcher/v3/cel.upb_minitable.c +++ b/src/core/ext/upb-gen/xds/type/matcher/v3/cel.upb_minitable.c @@ -3,7 +3,8 @@ * xds/type/matcher/v3/cel.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -15,8 +16,9 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub xds_type_matcher_v3_CelMatcher_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &xds__type__v3__CelExpression_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal xds_type_matcher_v3_CelMatcher_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &xds__type__v3__CelExpression_msg_init_ptr}, }; static const upb_MiniTableField xds_type_matcher_v3_CelMatcher__fields[2] = { @@ -39,6 +41,7 @@ const upb_MiniTable xds__type__matcher__v3__CelMatcher_msg_init = { }) }; +const upb_MiniTable* xds__type__matcher__v3__CelMatcher_msg_init_ptr = &xds__type__matcher__v3__CelMatcher_msg_init; static const upb_MiniTable *messages_layout[1] = { &xds__type__matcher__v3__CelMatcher_msg_init, }; diff --git a/src/core/ext/upb-gen/xds/type/matcher/v3/cel.upb_minitable.h b/src/core/ext/upb-gen/xds/type/matcher/v3/cel.upb_minitable.h index 229c34bfcc7..069f621b005 100644 --- a/src/core/ext/upb-gen/xds/type/matcher/v3/cel.upb_minitable.h +++ b/src/core/ext/upb-gen/xds/type/matcher/v3/cel.upb_minitable.h @@ -3,7 +3,8 @@ * xds/type/matcher/v3/cel.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef XDS_TYPE_MATCHER_V3_CEL_PROTO_UPB_MINITABLE_H_ #define XDS_TYPE_MATCHER_V3_CEL_PROTO_UPB_MINITABLE_H_ @@ -18,6 +19,7 @@ extern "C" { #endif extern const upb_MiniTable xds__type__matcher__v3__CelMatcher_msg_init; +extern const upb_MiniTable* xds__type__matcher__v3__CelMatcher_msg_init_ptr; extern const upb_MiniTableFile xds_type_matcher_v3_cel_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/xds/type/matcher/v3/domain.upb.h b/src/core/ext/upb-gen/xds/type/matcher/v3/domain.upb.h index e422eb7dac6..401a2a2f54a 100644 --- a/src/core/ext/upb-gen/xds/type/matcher/v3/domain.upb.h +++ b/src/core/ext/upb-gen/xds/type/matcher/v3/domain.upb.h @@ -3,7 +3,8 @@ * xds/type/matcher/v3/domain.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef XDS_TYPE_MATCHER_V3_DOMAIN_PROTO_UPB_H_ #define XDS_TYPE_MATCHER_V3_DOMAIN_PROTO_UPB_H_ @@ -71,6 +72,7 @@ UPB_INLINE void xds_type_matcher_v3_ServerNameMatcher_clear_domain_matchers(xds_ } UPB_INLINE const xds_type_matcher_v3_ServerNameMatcher_DomainMatcher* const* xds_type_matcher_v3_ServerNameMatcher_domain_matchers(const xds_type_matcher_v3_ServerNameMatcher* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__matcher__v3__ServerNameMatcher__DomainMatcher_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -82,6 +84,7 @@ UPB_INLINE const xds_type_matcher_v3_ServerNameMatcher_DomainMatcher* const* xds } UPB_INLINE const upb_Array* _xds_type_matcher_v3_ServerNameMatcher_domain_matchers_upb_array(const xds_type_matcher_v3_ServerNameMatcher* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__matcher__v3__ServerNameMatcher__DomainMatcher_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -90,6 +93,7 @@ UPB_INLINE const upb_Array* _xds_type_matcher_v3_ServerNameMatcher_domain_matche } UPB_INLINE upb_Array* _xds_type_matcher_v3_ServerNameMatcher_domain_matchers_mutable_upb_array(xds_type_matcher_v3_ServerNameMatcher* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__matcher__v3__ServerNameMatcher__DomainMatcher_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -100,6 +104,7 @@ UPB_INLINE upb_Array* _xds_type_matcher_v3_ServerNameMatcher_domain_matchers_mut UPB_INLINE xds_type_matcher_v3_ServerNameMatcher_DomainMatcher** xds_type_matcher_v3_ServerNameMatcher_mutable_domain_matchers(xds_type_matcher_v3_ServerNameMatcher* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__matcher__v3__ServerNameMatcher__DomainMatcher_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -116,6 +121,7 @@ UPB_INLINE xds_type_matcher_v3_ServerNameMatcher_DomainMatcher** xds_type_matche } UPB_INLINE struct xds_type_matcher_v3_ServerNameMatcher_DomainMatcher* xds_type_matcher_v3_ServerNameMatcher_add_domain_matchers(xds_type_matcher_v3_ServerNameMatcher* msg, upb_Arena* arena) { upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__matcher__v3__ServerNameMatcher__DomainMatcher_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -205,6 +211,7 @@ UPB_INLINE const struct xds_type_matcher_v3_Matcher_OnMatch* xds_type_matcher_v3 const struct xds_type_matcher_v3_Matcher_OnMatch* default_val = NULL; const struct xds_type_matcher_v3_Matcher_OnMatch* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__matcher__v3__Matcher__OnMatch_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -244,6 +251,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_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__matcher__v3__Matcher__OnMatch_msg_init); 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) { diff --git a/src/core/ext/upb-gen/xds/type/matcher/v3/domain.upb_minitable.c b/src/core/ext/upb-gen/xds/type/matcher/v3/domain.upb_minitable.c index 70b99bb3c11..8aca8eb56ff 100644 --- a/src/core/ext/upb-gen/xds/type/matcher/v3/domain.upb_minitable.c +++ b/src/core/ext/upb-gen/xds/type/matcher/v3/domain.upb_minitable.c @@ -3,7 +3,8 @@ * xds/type/matcher/v3/domain.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -15,8 +16,9 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub xds_type_matcher_v3_ServerNameMatcher_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__ServerNameMatcher__DomainMatcher_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal xds_type_matcher_v3_ServerNameMatcher_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__ServerNameMatcher__DomainMatcher_msg_init_ptr}, }; static const upb_MiniTableField xds_type_matcher_v3_ServerNameMatcher__fields[1] = { @@ -36,8 +38,9 @@ const upb_MiniTable xds__type__matcher__v3__ServerNameMatcher_msg_init = { }) }; -static const upb_MiniTableSub xds_type_matcher_v3_ServerNameMatcher_DomainMatcher_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher__OnMatch_msg_init}, +const upb_MiniTable* xds__type__matcher__v3__ServerNameMatcher_msg_init_ptr = &xds__type__matcher__v3__ServerNameMatcher_msg_init; +static const upb_MiniTableSubInternal xds_type_matcher_v3_ServerNameMatcher_DomainMatcher_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher__OnMatch_msg_init_ptr}, }; static const upb_MiniTableField xds_type_matcher_v3_ServerNameMatcher_DomainMatcher__fields[2] = { @@ -58,6 +61,7 @@ const upb_MiniTable xds__type__matcher__v3__ServerNameMatcher__DomainMatcher_msg }) }; +const upb_MiniTable* xds__type__matcher__v3__ServerNameMatcher__DomainMatcher_msg_init_ptr = &xds__type__matcher__v3__ServerNameMatcher__DomainMatcher_msg_init; static const upb_MiniTable *messages_layout[2] = { &xds__type__matcher__v3__ServerNameMatcher_msg_init, &xds__type__matcher__v3__ServerNameMatcher__DomainMatcher_msg_init, diff --git a/src/core/ext/upb-gen/xds/type/matcher/v3/domain.upb_minitable.h b/src/core/ext/upb-gen/xds/type/matcher/v3/domain.upb_minitable.h index 40a7d6c72c3..8b5ed52ee47 100644 --- a/src/core/ext/upb-gen/xds/type/matcher/v3/domain.upb_minitable.h +++ b/src/core/ext/upb-gen/xds/type/matcher/v3/domain.upb_minitable.h @@ -3,7 +3,8 @@ * xds/type/matcher/v3/domain.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef XDS_TYPE_MATCHER_V3_DOMAIN_PROTO_UPB_MINITABLE_H_ #define XDS_TYPE_MATCHER_V3_DOMAIN_PROTO_UPB_MINITABLE_H_ @@ -18,7 +19,9 @@ extern "C" { #endif extern const upb_MiniTable xds__type__matcher__v3__ServerNameMatcher_msg_init; +extern const upb_MiniTable* xds__type__matcher__v3__ServerNameMatcher_msg_init_ptr; extern const upb_MiniTable xds__type__matcher__v3__ServerNameMatcher__DomainMatcher_msg_init; +extern const upb_MiniTable* xds__type__matcher__v3__ServerNameMatcher__DomainMatcher_msg_init_ptr; extern const upb_MiniTableFile xds_type_matcher_v3_domain_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/xds/type/matcher/v3/http_inputs.upb.h b/src/core/ext/upb-gen/xds/type/matcher/v3/http_inputs.upb.h index 8a84834c28a..3ddb1eb0375 100644 --- a/src/core/ext/upb-gen/xds/type/matcher/v3/http_inputs.upb.h +++ b/src/core/ext/upb-gen/xds/type/matcher/v3/http_inputs.upb.h @@ -3,7 +3,8 @@ * xds/type/matcher/v3/http_inputs.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef XDS_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPB_H_ #define XDS_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPB_H_ diff --git a/src/core/ext/upb-gen/xds/type/matcher/v3/http_inputs.upb_minitable.c b/src/core/ext/upb-gen/xds/type/matcher/v3/http_inputs.upb_minitable.c index fa192d078e1..d7e8bf32e56 100644 --- a/src/core/ext/upb-gen/xds/type/matcher/v3/http_inputs.upb_minitable.c +++ b/src/core/ext/upb-gen/xds/type/matcher/v3/http_inputs.upb_minitable.c @@ -3,7 +3,8 @@ * xds/type/matcher/v3/http_inputs.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -13,6 +14,7 @@ // Must be last. #include "upb/port/def.inc" +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); const upb_MiniTable xds__type__matcher__v3__HttpAttributesCelMatchInput_msg_init = { NULL, NULL, @@ -22,6 +24,7 @@ const upb_MiniTable xds__type__matcher__v3__HttpAttributesCelMatchInput_msg_init #endif }; +const upb_MiniTable* xds__type__matcher__v3__HttpAttributesCelMatchInput_msg_init_ptr = &xds__type__matcher__v3__HttpAttributesCelMatchInput_msg_init; static const upb_MiniTable *messages_layout[1] = { &xds__type__matcher__v3__HttpAttributesCelMatchInput_msg_init, }; diff --git a/src/core/ext/upb-gen/xds/type/matcher/v3/http_inputs.upb_minitable.h b/src/core/ext/upb-gen/xds/type/matcher/v3/http_inputs.upb_minitable.h index 11c8ca398dd..bf0e0a5883e 100644 --- a/src/core/ext/upb-gen/xds/type/matcher/v3/http_inputs.upb_minitable.h +++ b/src/core/ext/upb-gen/xds/type/matcher/v3/http_inputs.upb_minitable.h @@ -3,7 +3,8 @@ * xds/type/matcher/v3/http_inputs.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef XDS_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPB_MINITABLE_H_ #define XDS_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPB_MINITABLE_H_ @@ -18,6 +19,7 @@ extern "C" { #endif extern const upb_MiniTable xds__type__matcher__v3__HttpAttributesCelMatchInput_msg_init; +extern const upb_MiniTable* xds__type__matcher__v3__HttpAttributesCelMatchInput_msg_init_ptr; extern const upb_MiniTableFile xds_type_matcher_v3_http_inputs_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/xds/type/matcher/v3/ip.upb.h b/src/core/ext/upb-gen/xds/type/matcher/v3/ip.upb.h index 19a72d71859..c4e910435b1 100644 --- a/src/core/ext/upb-gen/xds/type/matcher/v3/ip.upb.h +++ b/src/core/ext/upb-gen/xds/type/matcher/v3/ip.upb.h @@ -3,7 +3,8 @@ * xds/type/matcher/v3/ip.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef XDS_TYPE_MATCHER_V3_IP_PROTO_UPB_H_ #define XDS_TYPE_MATCHER_V3_IP_PROTO_UPB_H_ @@ -73,6 +74,7 @@ UPB_INLINE void xds_type_matcher_v3_IPMatcher_clear_range_matchers(xds_type_matc } UPB_INLINE const xds_type_matcher_v3_IPMatcher_IPRangeMatcher* const* xds_type_matcher_v3_IPMatcher_range_matchers(const xds_type_matcher_v3_IPMatcher* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__matcher__v3__IPMatcher__IPRangeMatcher_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -84,6 +86,7 @@ UPB_INLINE const xds_type_matcher_v3_IPMatcher_IPRangeMatcher* const* xds_type_m } UPB_INLINE const upb_Array* _xds_type_matcher_v3_IPMatcher_range_matchers_upb_array(const xds_type_matcher_v3_IPMatcher* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__matcher__v3__IPMatcher__IPRangeMatcher_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -92,6 +95,7 @@ UPB_INLINE const upb_Array* _xds_type_matcher_v3_IPMatcher_range_matchers_upb_ar } UPB_INLINE upb_Array* _xds_type_matcher_v3_IPMatcher_range_matchers_mutable_upb_array(xds_type_matcher_v3_IPMatcher* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__matcher__v3__IPMatcher__IPRangeMatcher_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -102,6 +106,7 @@ UPB_INLINE upb_Array* _xds_type_matcher_v3_IPMatcher_range_matchers_mutable_upb_ UPB_INLINE xds_type_matcher_v3_IPMatcher_IPRangeMatcher** xds_type_matcher_v3_IPMatcher_mutable_range_matchers(xds_type_matcher_v3_IPMatcher* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__matcher__v3__IPMatcher__IPRangeMatcher_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -118,6 +123,7 @@ UPB_INLINE xds_type_matcher_v3_IPMatcher_IPRangeMatcher** xds_type_matcher_v3_IP } UPB_INLINE struct xds_type_matcher_v3_IPMatcher_IPRangeMatcher* xds_type_matcher_v3_IPMatcher_add_range_matchers(xds_type_matcher_v3_IPMatcher* msg, upb_Arena* arena) { upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__matcher__v3__IPMatcher__IPRangeMatcher_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -173,6 +179,7 @@ UPB_INLINE void xds_type_matcher_v3_IPMatcher_IPRangeMatcher_clear_ranges(xds_ty } UPB_INLINE const struct xds_core_v3_CidrRange* const* xds_type_matcher_v3_IPMatcher_IPRangeMatcher_ranges(const xds_type_matcher_v3_IPMatcher_IPRangeMatcher* msg, size_t* size) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__core__v3__CidrRange_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -184,6 +191,7 @@ UPB_INLINE const struct xds_core_v3_CidrRange* const* xds_type_matcher_v3_IPMatc } UPB_INLINE const upb_Array* _xds_type_matcher_v3_IPMatcher_IPRangeMatcher_ranges_upb_array(const xds_type_matcher_v3_IPMatcher_IPRangeMatcher* msg, size_t* size) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__core__v3__CidrRange_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -192,6 +200,7 @@ UPB_INLINE const upb_Array* _xds_type_matcher_v3_IPMatcher_IPRangeMatcher_ranges } UPB_INLINE upb_Array* _xds_type_matcher_v3_IPMatcher_IPRangeMatcher_ranges_mutable_upb_array(xds_type_matcher_v3_IPMatcher_IPRangeMatcher* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__core__v3__CidrRange_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -207,6 +216,7 @@ UPB_INLINE const struct xds_type_matcher_v3_Matcher_OnMatch* xds_type_matcher_v3 const struct xds_type_matcher_v3_Matcher_OnMatch* default_val = NULL; const struct xds_type_matcher_v3_Matcher_OnMatch* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__matcher__v3__Matcher__OnMatch_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -230,6 +240,7 @@ UPB_INLINE bool xds_type_matcher_v3_IPMatcher_IPRangeMatcher_exclusive(const xds UPB_INLINE struct xds_core_v3_CidrRange** xds_type_matcher_v3_IPMatcher_IPRangeMatcher_mutable_ranges(xds_type_matcher_v3_IPMatcher_IPRangeMatcher* msg, size_t* size) { upb_MiniTableField field = {1, UPB_SIZE(12, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__core__v3__CidrRange_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -246,6 +257,7 @@ UPB_INLINE struct xds_core_v3_CidrRange** xds_type_matcher_v3_IPMatcher_IPRangeM } UPB_INLINE struct xds_core_v3_CidrRange* xds_type_matcher_v3_IPMatcher_IPRangeMatcher_add_ranges(xds_type_matcher_v3_IPMatcher_IPRangeMatcher* msg, upb_Arena* arena) { upb_MiniTableField field = {1, UPB_SIZE(12, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__core__v3__CidrRange_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -260,6 +272,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_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__matcher__v3__Matcher__OnMatch_msg_init); 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) { diff --git a/src/core/ext/upb-gen/xds/type/matcher/v3/ip.upb_minitable.c b/src/core/ext/upb-gen/xds/type/matcher/v3/ip.upb_minitable.c index 7ec8ac3ee38..1a060de54dc 100644 --- a/src/core/ext/upb-gen/xds/type/matcher/v3/ip.upb_minitable.c +++ b/src/core/ext/upb-gen/xds/type/matcher/v3/ip.upb_minitable.c @@ -3,7 +3,8 @@ * xds/type/matcher/v3/ip.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -16,8 +17,9 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub xds_type_matcher_v3_IPMatcher_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__IPMatcher__IPRangeMatcher_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal xds_type_matcher_v3_IPMatcher_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__IPMatcher__IPRangeMatcher_msg_init_ptr}, }; static const upb_MiniTableField xds_type_matcher_v3_IPMatcher__fields[1] = { @@ -37,9 +39,10 @@ const upb_MiniTable xds__type__matcher__v3__IPMatcher_msg_init = { }) }; -static const upb_MiniTableSub xds_type_matcher_v3_IPMatcher_IPRangeMatcher_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &xds__core__v3__CidrRange_msg_init}, - {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher__OnMatch_msg_init}, +const upb_MiniTable* xds__type__matcher__v3__IPMatcher_msg_init_ptr = &xds__type__matcher__v3__IPMatcher_msg_init; +static const upb_MiniTableSubInternal xds_type_matcher_v3_IPMatcher_IPRangeMatcher_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &xds__core__v3__CidrRange_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher__OnMatch_msg_init_ptr}, }; static const upb_MiniTableField xds_type_matcher_v3_IPMatcher_IPRangeMatcher__fields[3] = { @@ -63,6 +66,7 @@ const upb_MiniTable xds__type__matcher__v3__IPMatcher__IPRangeMatcher_msg_init = }) }; +const upb_MiniTable* xds__type__matcher__v3__IPMatcher__IPRangeMatcher_msg_init_ptr = &xds__type__matcher__v3__IPMatcher__IPRangeMatcher_msg_init; static const upb_MiniTable *messages_layout[2] = { &xds__type__matcher__v3__IPMatcher_msg_init, &xds__type__matcher__v3__IPMatcher__IPRangeMatcher_msg_init, diff --git a/src/core/ext/upb-gen/xds/type/matcher/v3/ip.upb_minitable.h b/src/core/ext/upb-gen/xds/type/matcher/v3/ip.upb_minitable.h index c20f904848f..520d811a1f6 100644 --- a/src/core/ext/upb-gen/xds/type/matcher/v3/ip.upb_minitable.h +++ b/src/core/ext/upb-gen/xds/type/matcher/v3/ip.upb_minitable.h @@ -3,7 +3,8 @@ * xds/type/matcher/v3/ip.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef XDS_TYPE_MATCHER_V3_IP_PROTO_UPB_MINITABLE_H_ #define XDS_TYPE_MATCHER_V3_IP_PROTO_UPB_MINITABLE_H_ @@ -18,7 +19,9 @@ extern "C" { #endif extern const upb_MiniTable xds__type__matcher__v3__IPMatcher_msg_init; +extern const upb_MiniTable* xds__type__matcher__v3__IPMatcher_msg_init_ptr; extern const upb_MiniTable xds__type__matcher__v3__IPMatcher__IPRangeMatcher_msg_init; +extern const upb_MiniTable* xds__type__matcher__v3__IPMatcher__IPRangeMatcher_msg_init_ptr; extern const upb_MiniTableFile xds_type_matcher_v3_ip_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/xds/type/matcher/v3/matcher.upb.h b/src/core/ext/upb-gen/xds/type/matcher/v3/matcher.upb.h index 1a798893042..106faabaafd 100644 --- a/src/core/ext/upb-gen/xds/type/matcher/v3/matcher.upb.h +++ b/src/core/ext/upb-gen/xds/type/matcher/v3/matcher.upb.h @@ -3,7 +3,8 @@ * xds/type/matcher/v3/matcher.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef XDS_TYPE_MATCHER_V3_MATCHER_PROTO_UPB_H_ #define XDS_TYPE_MATCHER_V3_MATCHER_PROTO_UPB_H_ @@ -93,6 +94,7 @@ UPB_INLINE const xds_type_matcher_v3_Matcher_MatcherList* xds_type_matcher_v3_Ma const xds_type_matcher_v3_Matcher_MatcherList* default_val = NULL; const xds_type_matcher_v3_Matcher_MatcherList* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__matcher__v3__Matcher__MatcherList_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -109,6 +111,7 @@ UPB_INLINE const xds_type_matcher_v3_Matcher_MatcherTree* xds_type_matcher_v3_Ma const xds_type_matcher_v3_Matcher_MatcherTree* default_val = NULL; const xds_type_matcher_v3_Matcher_MatcherTree* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__matcher__v3__Matcher__MatcherTree_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -125,6 +128,7 @@ UPB_INLINE const xds_type_matcher_v3_Matcher_OnMatch* xds_type_matcher_v3_Matche const xds_type_matcher_v3_Matcher_OnMatch* default_val = NULL; const xds_type_matcher_v3_Matcher_OnMatch* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__matcher__v3__Matcher__OnMatch_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -136,6 +140,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_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__matcher__v3__Matcher__MatcherList_msg_init); 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) { @@ -148,6 +153,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_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__matcher__v3__Matcher__MatcherTree_msg_init); 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) { @@ -160,6 +166,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_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__matcher__v3__Matcher__OnMatch_msg_init); 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) { @@ -225,6 +232,7 @@ UPB_INLINE const xds_type_matcher_v3_Matcher* xds_type_matcher_v3_Matcher_OnMatc const xds_type_matcher_v3_Matcher* default_val = NULL; const xds_type_matcher_v3_Matcher* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__matcher__v3__Matcher_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -241,6 +249,7 @@ UPB_INLINE const struct xds_core_v3_TypedExtensionConfig* xds_type_matcher_v3_Ma const struct xds_core_v3_TypedExtensionConfig* default_val = NULL; const struct xds_core_v3_TypedExtensionConfig* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&xds__core__v3__TypedExtensionConfig_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -252,6 +261,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_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__matcher__v3__Matcher_msg_init); 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) { @@ -264,6 +274,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_PRIVATE(_upb_MiniTable_StrongReference)(&xds__core__v3__TypedExtensionConfig_msg_init); 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) { @@ -317,6 +328,7 @@ UPB_INLINE void xds_type_matcher_v3_Matcher_MatcherList_clear_matchers(xds_type_ } UPB_INLINE const xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher* const* xds_type_matcher_v3_Matcher_MatcherList_matchers(const xds_type_matcher_v3_Matcher_MatcherList* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__matcher__v3__Matcher__MatcherList__FieldMatcher_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -328,6 +340,7 @@ UPB_INLINE const xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher* const* xd } UPB_INLINE const upb_Array* _xds_type_matcher_v3_Matcher_MatcherList_matchers_upb_array(const xds_type_matcher_v3_Matcher_MatcherList* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__matcher__v3__Matcher__MatcherList__FieldMatcher_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -336,6 +349,7 @@ UPB_INLINE const upb_Array* _xds_type_matcher_v3_Matcher_MatcherList_matchers_up } UPB_INLINE upb_Array* _xds_type_matcher_v3_Matcher_MatcherList_matchers_mutable_upb_array(xds_type_matcher_v3_Matcher_MatcherList* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__matcher__v3__Matcher__MatcherList__FieldMatcher_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -346,6 +360,7 @@ UPB_INLINE upb_Array* _xds_type_matcher_v3_Matcher_MatcherList_matchers_mutable_ UPB_INLINE xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher** xds_type_matcher_v3_Matcher_MatcherList_mutable_matchers(xds_type_matcher_v3_Matcher_MatcherList* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__matcher__v3__Matcher__MatcherList__FieldMatcher_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -362,6 +377,7 @@ UPB_INLINE xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher** xds_type_match } UPB_INLINE struct xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher* xds_type_matcher_v3_Matcher_MatcherList_add_matchers(xds_type_matcher_v3_Matcher_MatcherList* msg, upb_Arena* arena) { upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__matcher__v3__Matcher__MatcherList__FieldMatcher_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -431,6 +447,7 @@ UPB_INLINE const xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredica const xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* default_val = NULL; const xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__matcher__v3__Matcher__MatcherList__Predicate__SinglePredicate_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -447,6 +464,7 @@ UPB_INLINE const xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList const xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* default_val = NULL; const xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__matcher__v3__Matcher__MatcherList__Predicate__PredicateList_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -463,6 +481,7 @@ UPB_INLINE const xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList const xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* default_val = NULL; const xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__matcher__v3__Matcher__MatcherList__Predicate__PredicateList_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -479,6 +498,7 @@ UPB_INLINE const xds_type_matcher_v3_Matcher_MatcherList_Predicate* xds_type_mat const xds_type_matcher_v3_Matcher_MatcherList_Predicate* default_val = NULL; const xds_type_matcher_v3_Matcher_MatcherList_Predicate* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__matcher__v3__Matcher__MatcherList__Predicate_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -490,6 +510,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_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__matcher__v3__Matcher__MatcherList__Predicate__SinglePredicate_msg_init); 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) { @@ -502,6 +523,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_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__matcher__v3__Matcher__MatcherList__Predicate__PredicateList_msg_init); 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) { @@ -514,6 +536,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_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__matcher__v3__Matcher__MatcherList__Predicate__PredicateList_msg_init); 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) { @@ -526,6 +549,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_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__matcher__v3__Matcher__MatcherList__Predicate_msg_init); 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) { @@ -591,6 +615,7 @@ UPB_INLINE const struct xds_core_v3_TypedExtensionConfig* xds_type_matcher_v3_Ma const struct xds_core_v3_TypedExtensionConfig* default_val = NULL; const struct xds_core_v3_TypedExtensionConfig* 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_PRIVATE(_upb_MiniTable_StrongReference)(&xds__core__v3__TypedExtensionConfig_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -607,6 +632,7 @@ UPB_INLINE const struct xds_type_matcher_v3_StringMatcher* xds_type_matcher_v3_M const struct xds_type_matcher_v3_StringMatcher* default_val = NULL; const struct xds_type_matcher_v3_StringMatcher* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__matcher__v3__StringMatcher_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -623,6 +649,7 @@ UPB_INLINE const struct xds_core_v3_TypedExtensionConfig* xds_type_matcher_v3_Ma const struct xds_core_v3_TypedExtensionConfig* default_val = NULL; const struct xds_core_v3_TypedExtensionConfig* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&xds__core__v3__TypedExtensionConfig_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -634,6 +661,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_PRIVATE(_upb_MiniTable_StrongReference)(&xds__core__v3__TypedExtensionConfig_msg_init); 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) { @@ -646,6 +674,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_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__matcher__v3__StringMatcher_msg_init); 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) { @@ -658,6 +687,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_PRIVATE(_upb_MiniTable_StrongReference)(&xds__core__v3__TypedExtensionConfig_msg_init); 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) { @@ -711,6 +741,7 @@ UPB_INLINE void xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_ } UPB_INLINE const xds_type_matcher_v3_Matcher_MatcherList_Predicate* const* xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_predicate(const xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__matcher__v3__Matcher__MatcherList__Predicate_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -722,6 +753,7 @@ UPB_INLINE const xds_type_matcher_v3_Matcher_MatcherList_Predicate* const* xds_t } UPB_INLINE const upb_Array* _xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_predicate_upb_array(const xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__matcher__v3__Matcher__MatcherList__Predicate_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -730,6 +762,7 @@ UPB_INLINE const upb_Array* _xds_type_matcher_v3_Matcher_MatcherList_Predicate_P } UPB_INLINE upb_Array* _xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_predicate_mutable_upb_array(xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__matcher__v3__Matcher__MatcherList__Predicate_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -740,6 +773,7 @@ UPB_INLINE upb_Array* _xds_type_matcher_v3_Matcher_MatcherList_Predicate_Predica UPB_INLINE xds_type_matcher_v3_Matcher_MatcherList_Predicate** xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_mutable_predicate(xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__matcher__v3__Matcher__MatcherList__Predicate_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -756,6 +790,7 @@ UPB_INLINE xds_type_matcher_v3_Matcher_MatcherList_Predicate** xds_type_matcher_ } UPB_INLINE struct xds_type_matcher_v3_Matcher_MatcherList_Predicate* xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_add_predicate(xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* msg, upb_Arena* arena) { upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__matcher__v3__Matcher__MatcherList__Predicate_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -813,6 +848,7 @@ UPB_INLINE const xds_type_matcher_v3_Matcher_MatcherList_Predicate* xds_type_mat const xds_type_matcher_v3_Matcher_MatcherList_Predicate* default_val = NULL; const xds_type_matcher_v3_Matcher_MatcherList_Predicate* 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_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__matcher__v3__Matcher__MatcherList__Predicate_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -829,6 +865,7 @@ UPB_INLINE const xds_type_matcher_v3_Matcher_OnMatch* xds_type_matcher_v3_Matche const xds_type_matcher_v3_Matcher_OnMatch* default_val = NULL; const xds_type_matcher_v3_Matcher_OnMatch* 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_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__matcher__v3__Matcher__OnMatch_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -840,6 +877,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_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__matcher__v3__Matcher__MatcherList__Predicate_msg_init); 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) { @@ -852,6 +890,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_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__matcher__v3__Matcher__OnMatch_msg_init); 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) { @@ -918,6 +957,7 @@ UPB_INLINE const struct xds_core_v3_TypedExtensionConfig* xds_type_matcher_v3_Ma const struct xds_core_v3_TypedExtensionConfig* default_val = NULL; const struct xds_core_v3_TypedExtensionConfig* 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_PRIVATE(_upb_MiniTable_StrongReference)(&xds__core__v3__TypedExtensionConfig_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -934,6 +974,7 @@ UPB_INLINE const xds_type_matcher_v3_Matcher_MatcherTree_MatchMap* xds_type_matc const xds_type_matcher_v3_Matcher_MatcherTree_MatchMap* default_val = NULL; const xds_type_matcher_v3_Matcher_MatcherTree_MatchMap* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__matcher__v3__Matcher__MatcherTree__MatchMap_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -950,6 +991,7 @@ UPB_INLINE const xds_type_matcher_v3_Matcher_MatcherTree_MatchMap* xds_type_matc const xds_type_matcher_v3_Matcher_MatcherTree_MatchMap* default_val = NULL; const xds_type_matcher_v3_Matcher_MatcherTree_MatchMap* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__matcher__v3__Matcher__MatcherTree__MatchMap_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -966,6 +1008,7 @@ UPB_INLINE const struct xds_core_v3_TypedExtensionConfig* xds_type_matcher_v3_Ma const struct xds_core_v3_TypedExtensionConfig* default_val = NULL; const struct xds_core_v3_TypedExtensionConfig* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&xds__core__v3__TypedExtensionConfig_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -977,6 +1020,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_PRIVATE(_upb_MiniTable_StrongReference)(&xds__core__v3__TypedExtensionConfig_msg_init); 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) { @@ -989,6 +1033,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_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__matcher__v3__Matcher__MatcherTree__MatchMap_msg_init); 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) { @@ -1001,6 +1046,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_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__matcher__v3__Matcher__MatcherTree__MatchMap_msg_init); 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) { @@ -1013,6 +1059,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_PRIVATE(_upb_MiniTable_StrongReference)(&xds__core__v3__TypedExtensionConfig_msg_init); 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) { @@ -1071,22 +1118,30 @@ UPB_INLINE size_t xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_map_size(cons } UPB_INLINE bool xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_map_get(const xds_type_matcher_v3_Matcher_MatcherTree_MatchMap* msg, upb_StringView key, xds_type_matcher_v3_Matcher_OnMatch** val) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__matcher__v3__Matcher__MatcherTree__MatchMap__MapEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__matcher__v3__Matcher__OnMatch_msg_init); 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 xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry* xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_map_next(const xds_type_matcher_v3_Matcher_MatcherTree_MatchMap* msg, size_t* iter) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__matcher__v3__Matcher__MatcherTree__MatchMap__MapEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__matcher__v3__Matcher__OnMatch_msg_init); const upb_Map* map = upb_Message_GetMap(UPB_UPCAST(msg), &field); if (!map) return NULL; return (const xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry*)_upb_map_next(map, iter); } UPB_INLINE const upb_Map* _xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_map_upb_map(xds_type_matcher_v3_Matcher_MatcherTree_MatchMap* msg) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__matcher__v3__Matcher__MatcherTree__MatchMap__MapEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__matcher__v3__Matcher__OnMatch_msg_init); return upb_Message_GetMap(UPB_UPCAST(msg), &field); } UPB_INLINE upb_Map* _xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_map_mutable_upb_map(xds_type_matcher_v3_Matcher_MatcherTree_MatchMap* msg, upb_Arena* a) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__matcher__v3__Matcher__MatcherTree__MatchMap__MapEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__matcher__v3__Matcher__OnMatch_msg_init); return _upb_Message_GetOrCreateMutableMap(UPB_UPCAST(msg), &field, 0, sizeof(xds_type_matcher_v3_Matcher_OnMatch*), a); } @@ -1098,6 +1153,8 @@ UPB_INLINE void xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_map_clear(xds_t } UPB_INLINE bool xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_map_set(xds_type_matcher_v3_Matcher_MatcherTree_MatchMap* msg, upb_StringView key, xds_type_matcher_v3_Matcher_OnMatch* val, upb_Arena* a) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__matcher__v3__Matcher__MatcherTree__MatchMap__MapEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__matcher__v3__Matcher__OnMatch_msg_init); 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) != @@ -1111,6 +1168,8 @@ UPB_INLINE bool xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_map_delete(xds_ } UPB_INLINE xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry* xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_map_nextmutable(xds_type_matcher_v3_Matcher_MatcherTree_MatchMap* msg, size_t* iter) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__matcher__v3__Matcher__MatcherTree__MatchMap__MapEntry_msg_init); + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__matcher__v3__Matcher__OnMatch_msg_init); upb_Map* map = (upb_Map*)upb_Message_GetMap(UPB_UPCAST(msg), &field); if (!map) return NULL; return (xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry*)_upb_map_next(map, iter); diff --git a/src/core/ext/upb-gen/xds/type/matcher/v3/matcher.upb_minitable.c b/src/core/ext/upb-gen/xds/type/matcher/v3/matcher.upb_minitable.c index f9abc865fd8..d2d39d6dbd2 100644 --- a/src/core/ext/upb-gen/xds/type/matcher/v3/matcher.upb_minitable.c +++ b/src/core/ext/upb-gen/xds/type/matcher/v3/matcher.upb_minitable.c @@ -3,7 +3,8 @@ * xds/type/matcher/v3/matcher.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -16,10 +17,11 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub xds_type_matcher_v3_Matcher_submsgs[3] = { - {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher__MatcherList_msg_init}, - {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher__MatcherTree_msg_init}, - {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher__OnMatch_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal xds_type_matcher_v3_Matcher_submsgs[3] = { + {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher__MatcherList_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher__MatcherTree_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher__OnMatch_msg_init_ptr}, }; static const upb_MiniTableField xds_type_matcher_v3_Matcher__fields[3] = { @@ -43,9 +45,10 @@ const upb_MiniTable xds__type__matcher__v3__Matcher_msg_init = { }) }; -static const upb_MiniTableSub xds_type_matcher_v3_Matcher_OnMatch_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher_msg_init}, - {.UPB_PRIVATE(submsg) = &xds__core__v3__TypedExtensionConfig_msg_init}, +const upb_MiniTable* xds__type__matcher__v3__Matcher_msg_init_ptr = &xds__type__matcher__v3__Matcher_msg_init; +static const upb_MiniTableSubInternal xds_type_matcher_v3_Matcher_OnMatch_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &xds__core__v3__TypedExtensionConfig_msg_init_ptr}, }; static const upb_MiniTableField xds_type_matcher_v3_Matcher_OnMatch__fields[2] = { @@ -68,8 +71,9 @@ const upb_MiniTable xds__type__matcher__v3__Matcher__OnMatch_msg_init = { }) }; -static const upb_MiniTableSub xds_type_matcher_v3_Matcher_MatcherList_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher__MatcherList__FieldMatcher_msg_init}, +const upb_MiniTable* xds__type__matcher__v3__Matcher__OnMatch_msg_init_ptr = &xds__type__matcher__v3__Matcher__OnMatch_msg_init; +static const upb_MiniTableSubInternal xds_type_matcher_v3_Matcher_MatcherList_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher__MatcherList__FieldMatcher_msg_init_ptr}, }; static const upb_MiniTableField xds_type_matcher_v3_Matcher_MatcherList__fields[1] = { @@ -89,11 +93,12 @@ const upb_MiniTable xds__type__matcher__v3__Matcher__MatcherList_msg_init = { }) }; -static const upb_MiniTableSub xds_type_matcher_v3_Matcher_MatcherList_Predicate_submsgs[4] = { - {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher__MatcherList__Predicate__SinglePredicate_msg_init}, - {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher__MatcherList__Predicate__PredicateList_msg_init}, - {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher__MatcherList__Predicate__PredicateList_msg_init}, - {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher__MatcherList__Predicate_msg_init}, +const upb_MiniTable* xds__type__matcher__v3__Matcher__MatcherList_msg_init_ptr = &xds__type__matcher__v3__Matcher__MatcherList_msg_init; +static const upb_MiniTableSubInternal xds_type_matcher_v3_Matcher_MatcherList_Predicate_submsgs[4] = { + {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher__MatcherList__Predicate__SinglePredicate_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher__MatcherList__Predicate__PredicateList_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher__MatcherList__Predicate__PredicateList_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher__MatcherList__Predicate_msg_init_ptr}, }; static const upb_MiniTableField xds_type_matcher_v3_Matcher_MatcherList_Predicate__fields[4] = { @@ -122,10 +127,11 @@ const upb_MiniTable xds__type__matcher__v3__Matcher__MatcherList__Predicate_msg_ }) }; -static const upb_MiniTableSub xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_submsgs[3] = { - {.UPB_PRIVATE(submsg) = &xds__core__v3__TypedExtensionConfig_msg_init}, - {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__StringMatcher_msg_init}, - {.UPB_PRIVATE(submsg) = &xds__core__v3__TypedExtensionConfig_msg_init}, +const upb_MiniTable* xds__type__matcher__v3__Matcher__MatcherList__Predicate_msg_init_ptr = &xds__type__matcher__v3__Matcher__MatcherList__Predicate_msg_init; +static const upb_MiniTableSubInternal xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_submsgs[3] = { + {.UPB_PRIVATE(submsg) = &xds__core__v3__TypedExtensionConfig_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__StringMatcher_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &xds__core__v3__TypedExtensionConfig_msg_init_ptr}, }; static const upb_MiniTableField xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate__fields[3] = { @@ -149,8 +155,9 @@ const upb_MiniTable xds__type__matcher__v3__Matcher__MatcherList__Predicate__Sin }) }; -static const upb_MiniTableSub xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher__MatcherList__Predicate_msg_init}, +const upb_MiniTable* xds__type__matcher__v3__Matcher__MatcherList__Predicate__SinglePredicate_msg_init_ptr = &xds__type__matcher__v3__Matcher__MatcherList__Predicate__SinglePredicate_msg_init; +static const upb_MiniTableSubInternal xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher__MatcherList__Predicate_msg_init_ptr}, }; static const upb_MiniTableField xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList__fields[1] = { @@ -170,9 +177,10 @@ const upb_MiniTable xds__type__matcher__v3__Matcher__MatcherList__Predicate__Pre }) }; -static const upb_MiniTableSub xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher__MatcherList__Predicate_msg_init}, - {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher__OnMatch_msg_init}, +const upb_MiniTable* xds__type__matcher__v3__Matcher__MatcherList__Predicate__PredicateList_msg_init_ptr = &xds__type__matcher__v3__Matcher__MatcherList__Predicate__PredicateList_msg_init; +static const upb_MiniTableSubInternal xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher__MatcherList__Predicate_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher__OnMatch_msg_init_ptr}, }; static const upb_MiniTableField xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher__fields[2] = { @@ -189,11 +197,12 @@ const upb_MiniTable xds__type__matcher__v3__Matcher__MatcherList__FieldMatcher_m #endif }; -static const upb_MiniTableSub xds_type_matcher_v3_Matcher_MatcherTree_submsgs[4] = { - {.UPB_PRIVATE(submsg) = &xds__core__v3__TypedExtensionConfig_msg_init}, - {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher__MatcherTree__MatchMap_msg_init}, - {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher__MatcherTree__MatchMap_msg_init}, - {.UPB_PRIVATE(submsg) = &xds__core__v3__TypedExtensionConfig_msg_init}, +const upb_MiniTable* xds__type__matcher__v3__Matcher__MatcherList__FieldMatcher_msg_init_ptr = &xds__type__matcher__v3__Matcher__MatcherList__FieldMatcher_msg_init; +static const upb_MiniTableSubInternal xds_type_matcher_v3_Matcher_MatcherTree_submsgs[4] = { + {.UPB_PRIVATE(submsg) = &xds__core__v3__TypedExtensionConfig_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher__MatcherTree__MatchMap_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher__MatcherTree__MatchMap_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &xds__core__v3__TypedExtensionConfig_msg_init_ptr}, }; static const upb_MiniTableField xds_type_matcher_v3_Matcher_MatcherTree__fields[4] = { @@ -222,8 +231,9 @@ const upb_MiniTable xds__type__matcher__v3__Matcher__MatcherTree_msg_init = { }) }; -static const upb_MiniTableSub xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher__MatcherTree__MatchMap__MapEntry_msg_init}, +const upb_MiniTable* xds__type__matcher__v3__Matcher__MatcherTree_msg_init_ptr = &xds__type__matcher__v3__Matcher__MatcherTree_msg_init; +static const upb_MiniTableSubInternal xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher__MatcherTree__MatchMap__MapEntry_msg_init_ptr}, }; static const upb_MiniTableField xds_type_matcher_v3_Matcher_MatcherTree_MatchMap__fields[1] = { @@ -239,8 +249,9 @@ const upb_MiniTable xds__type__matcher__v3__Matcher__MatcherTree__MatchMap_msg_i #endif }; -static const upb_MiniTableSub xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher__OnMatch_msg_init}, +const upb_MiniTable* xds__type__matcher__v3__Matcher__MatcherTree__MatchMap_msg_init_ptr = &xds__type__matcher__v3__Matcher__MatcherTree__MatchMap_msg_init; +static const upb_MiniTableSubInternal xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher__OnMatch_msg_init_ptr}, }; static const upb_MiniTableField xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry__fields[2] = { @@ -261,6 +272,7 @@ const upb_MiniTable xds__type__matcher__v3__Matcher__MatcherTree__MatchMap__MapE }) }; +const upb_MiniTable* xds__type__matcher__v3__Matcher__MatcherTree__MatchMap__MapEntry_msg_init_ptr = &xds__type__matcher__v3__Matcher__MatcherTree__MatchMap__MapEntry_msg_init; static const upb_MiniTable *messages_layout[10] = { &xds__type__matcher__v3__Matcher_msg_init, &xds__type__matcher__v3__Matcher__OnMatch_msg_init, diff --git a/src/core/ext/upb-gen/xds/type/matcher/v3/matcher.upb_minitable.h b/src/core/ext/upb-gen/xds/type/matcher/v3/matcher.upb_minitable.h index 2c7520d58bc..a4ec6a0eaa0 100644 --- a/src/core/ext/upb-gen/xds/type/matcher/v3/matcher.upb_minitable.h +++ b/src/core/ext/upb-gen/xds/type/matcher/v3/matcher.upb_minitable.h @@ -3,7 +3,8 @@ * xds/type/matcher/v3/matcher.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef XDS_TYPE_MATCHER_V3_MATCHER_PROTO_UPB_MINITABLE_H_ #define XDS_TYPE_MATCHER_V3_MATCHER_PROTO_UPB_MINITABLE_H_ @@ -18,15 +19,25 @@ extern "C" { #endif extern const upb_MiniTable xds__type__matcher__v3__Matcher_msg_init; +extern const upb_MiniTable* xds__type__matcher__v3__Matcher_msg_init_ptr; extern const upb_MiniTable xds__type__matcher__v3__Matcher__OnMatch_msg_init; +extern const upb_MiniTable* xds__type__matcher__v3__Matcher__OnMatch_msg_init_ptr; extern const upb_MiniTable xds__type__matcher__v3__Matcher__MatcherList_msg_init; +extern const upb_MiniTable* xds__type__matcher__v3__Matcher__MatcherList_msg_init_ptr; extern const upb_MiniTable xds__type__matcher__v3__Matcher__MatcherList__Predicate_msg_init; +extern const upb_MiniTable* xds__type__matcher__v3__Matcher__MatcherList__Predicate_msg_init_ptr; extern const upb_MiniTable xds__type__matcher__v3__Matcher__MatcherList__Predicate__SinglePredicate_msg_init; +extern const upb_MiniTable* xds__type__matcher__v3__Matcher__MatcherList__Predicate__SinglePredicate_msg_init_ptr; extern const upb_MiniTable xds__type__matcher__v3__Matcher__MatcherList__Predicate__PredicateList_msg_init; +extern const upb_MiniTable* xds__type__matcher__v3__Matcher__MatcherList__Predicate__PredicateList_msg_init_ptr; extern const upb_MiniTable xds__type__matcher__v3__Matcher__MatcherList__FieldMatcher_msg_init; +extern const upb_MiniTable* xds__type__matcher__v3__Matcher__MatcherList__FieldMatcher_msg_init_ptr; extern const upb_MiniTable xds__type__matcher__v3__Matcher__MatcherTree_msg_init; +extern const upb_MiniTable* xds__type__matcher__v3__Matcher__MatcherTree_msg_init_ptr; extern const upb_MiniTable xds__type__matcher__v3__Matcher__MatcherTree__MatchMap_msg_init; +extern const upb_MiniTable* xds__type__matcher__v3__Matcher__MatcherTree__MatchMap_msg_init_ptr; extern const upb_MiniTable xds__type__matcher__v3__Matcher__MatcherTree__MatchMap__MapEntry_msg_init; +extern const upb_MiniTable* xds__type__matcher__v3__Matcher__MatcherTree__MatchMap__MapEntry_msg_init_ptr; extern const upb_MiniTableFile xds_type_matcher_v3_matcher_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/xds/type/matcher/v3/range.upb.h b/src/core/ext/upb-gen/xds/type/matcher/v3/range.upb.h index d90b2630d9f..8c097770544 100644 --- a/src/core/ext/upb-gen/xds/type/matcher/v3/range.upb.h +++ b/src/core/ext/upb-gen/xds/type/matcher/v3/range.upb.h @@ -3,7 +3,8 @@ * xds/type/matcher/v3/range.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef XDS_TYPE_MATCHER_V3_RANGE_PROTO_UPB_H_ #define XDS_TYPE_MATCHER_V3_RANGE_PROTO_UPB_H_ @@ -78,6 +79,7 @@ UPB_INLINE void xds_type_matcher_v3_Int64RangeMatcher_clear_range_matchers(xds_t } UPB_INLINE const xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher* const* xds_type_matcher_v3_Int64RangeMatcher_range_matchers(const xds_type_matcher_v3_Int64RangeMatcher* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__matcher__v3__Int64RangeMatcher__RangeMatcher_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -89,6 +91,7 @@ UPB_INLINE const xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher* const* xds_ } UPB_INLINE const upb_Array* _xds_type_matcher_v3_Int64RangeMatcher_range_matchers_upb_array(const xds_type_matcher_v3_Int64RangeMatcher* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__matcher__v3__Int64RangeMatcher__RangeMatcher_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -97,6 +100,7 @@ UPB_INLINE const upb_Array* _xds_type_matcher_v3_Int64RangeMatcher_range_matcher } UPB_INLINE upb_Array* _xds_type_matcher_v3_Int64RangeMatcher_range_matchers_mutable_upb_array(xds_type_matcher_v3_Int64RangeMatcher* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__matcher__v3__Int64RangeMatcher__RangeMatcher_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -107,6 +111,7 @@ UPB_INLINE upb_Array* _xds_type_matcher_v3_Int64RangeMatcher_range_matchers_muta UPB_INLINE xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher** xds_type_matcher_v3_Int64RangeMatcher_mutable_range_matchers(xds_type_matcher_v3_Int64RangeMatcher* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__matcher__v3__Int64RangeMatcher__RangeMatcher_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -123,6 +128,7 @@ UPB_INLINE xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher** xds_type_matcher } UPB_INLINE struct xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher* xds_type_matcher_v3_Int64RangeMatcher_add_range_matchers(xds_type_matcher_v3_Int64RangeMatcher* msg, upb_Arena* arena) { upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__matcher__v3__Int64RangeMatcher__RangeMatcher_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -178,6 +184,7 @@ UPB_INLINE void xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher_clear_ranges( } UPB_INLINE const struct xds_type_v3_Int64Range* const* xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher_ranges(const xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher* msg, size_t* size) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__v3__Int64Range_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -189,6 +196,7 @@ UPB_INLINE const struct xds_type_v3_Int64Range* const* xds_type_matcher_v3_Int64 } UPB_INLINE const upb_Array* _xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher_ranges_upb_array(const xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher* msg, size_t* size) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__v3__Int64Range_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -197,6 +205,7 @@ UPB_INLINE const upb_Array* _xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher_ } UPB_INLINE upb_Array* _xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher_ranges_mutable_upb_array(xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__v3__Int64Range_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -212,6 +221,7 @@ UPB_INLINE const struct xds_type_matcher_v3_Matcher_OnMatch* xds_type_matcher_v3 const struct xds_type_matcher_v3_Matcher_OnMatch* default_val = NULL; const struct xds_type_matcher_v3_Matcher_OnMatch* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__matcher__v3__Matcher__OnMatch_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -223,6 +233,7 @@ UPB_INLINE bool xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher_has_on_match( UPB_INLINE struct xds_type_v3_Int64Range** xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher_mutable_ranges(xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher* msg, size_t* size) { upb_MiniTableField field = {1, UPB_SIZE(12, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__v3__Int64Range_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -239,6 +250,7 @@ UPB_INLINE struct xds_type_v3_Int64Range** xds_type_matcher_v3_Int64RangeMatcher } UPB_INLINE struct xds_type_v3_Int64Range* xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher_add_ranges(xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher* msg, upb_Arena* arena) { upb_MiniTableField field = {1, UPB_SIZE(12, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__v3__Int64Range_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -253,6 +265,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_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__matcher__v3__Matcher__OnMatch_msg_init); 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) { @@ -306,6 +319,7 @@ UPB_INLINE void xds_type_matcher_v3_Int32RangeMatcher_clear_range_matchers(xds_t } UPB_INLINE const xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher* const* xds_type_matcher_v3_Int32RangeMatcher_range_matchers(const xds_type_matcher_v3_Int32RangeMatcher* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__matcher__v3__Int32RangeMatcher__RangeMatcher_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -317,6 +331,7 @@ UPB_INLINE const xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher* const* xds_ } UPB_INLINE const upb_Array* _xds_type_matcher_v3_Int32RangeMatcher_range_matchers_upb_array(const xds_type_matcher_v3_Int32RangeMatcher* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__matcher__v3__Int32RangeMatcher__RangeMatcher_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -325,6 +340,7 @@ UPB_INLINE const upb_Array* _xds_type_matcher_v3_Int32RangeMatcher_range_matcher } UPB_INLINE upb_Array* _xds_type_matcher_v3_Int32RangeMatcher_range_matchers_mutable_upb_array(xds_type_matcher_v3_Int32RangeMatcher* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__matcher__v3__Int32RangeMatcher__RangeMatcher_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -335,6 +351,7 @@ UPB_INLINE upb_Array* _xds_type_matcher_v3_Int32RangeMatcher_range_matchers_muta UPB_INLINE xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher** xds_type_matcher_v3_Int32RangeMatcher_mutable_range_matchers(xds_type_matcher_v3_Int32RangeMatcher* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__matcher__v3__Int32RangeMatcher__RangeMatcher_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -351,6 +368,7 @@ UPB_INLINE xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher** xds_type_matcher } UPB_INLINE struct xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher* xds_type_matcher_v3_Int32RangeMatcher_add_range_matchers(xds_type_matcher_v3_Int32RangeMatcher* msg, upb_Arena* arena) { upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__matcher__v3__Int32RangeMatcher__RangeMatcher_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -406,6 +424,7 @@ UPB_INLINE void xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher_clear_ranges( } UPB_INLINE const struct xds_type_v3_Int32Range* const* xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher_ranges(const xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher* msg, size_t* size) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__v3__Int32Range_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -417,6 +436,7 @@ UPB_INLINE const struct xds_type_v3_Int32Range* const* xds_type_matcher_v3_Int32 } UPB_INLINE const upb_Array* _xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher_ranges_upb_array(const xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher* msg, size_t* size) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__v3__Int32Range_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -425,6 +445,7 @@ UPB_INLINE const upb_Array* _xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher_ } UPB_INLINE upb_Array* _xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher_ranges_mutable_upb_array(xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__v3__Int32Range_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -440,6 +461,7 @@ UPB_INLINE const struct xds_type_matcher_v3_Matcher_OnMatch* xds_type_matcher_v3 const struct xds_type_matcher_v3_Matcher_OnMatch* default_val = NULL; const struct xds_type_matcher_v3_Matcher_OnMatch* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__matcher__v3__Matcher__OnMatch_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -451,6 +473,7 @@ UPB_INLINE bool xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher_has_on_match( UPB_INLINE struct xds_type_v3_Int32Range** xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher_mutable_ranges(xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher* msg, size_t* size) { upb_MiniTableField field = {1, UPB_SIZE(12, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__v3__Int32Range_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -467,6 +490,7 @@ UPB_INLINE struct xds_type_v3_Int32Range** xds_type_matcher_v3_Int32RangeMatcher } UPB_INLINE struct xds_type_v3_Int32Range* xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher_add_ranges(xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher* msg, upb_Arena* arena) { upb_MiniTableField field = {1, UPB_SIZE(12, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__v3__Int32Range_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -481,6 +505,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_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__matcher__v3__Matcher__OnMatch_msg_init); 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) { @@ -534,6 +559,7 @@ UPB_INLINE void xds_type_matcher_v3_DoubleRangeMatcher_clear_range_matchers(xds_ } UPB_INLINE const xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher* const* xds_type_matcher_v3_DoubleRangeMatcher_range_matchers(const xds_type_matcher_v3_DoubleRangeMatcher* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__matcher__v3__DoubleRangeMatcher__RangeMatcher_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -545,6 +571,7 @@ UPB_INLINE const xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher* const* xds } UPB_INLINE const upb_Array* _xds_type_matcher_v3_DoubleRangeMatcher_range_matchers_upb_array(const xds_type_matcher_v3_DoubleRangeMatcher* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__matcher__v3__DoubleRangeMatcher__RangeMatcher_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -553,6 +580,7 @@ UPB_INLINE const upb_Array* _xds_type_matcher_v3_DoubleRangeMatcher_range_matche } UPB_INLINE upb_Array* _xds_type_matcher_v3_DoubleRangeMatcher_range_matchers_mutable_upb_array(xds_type_matcher_v3_DoubleRangeMatcher* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__matcher__v3__DoubleRangeMatcher__RangeMatcher_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -563,6 +591,7 @@ UPB_INLINE upb_Array* _xds_type_matcher_v3_DoubleRangeMatcher_range_matchers_mut UPB_INLINE xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher** xds_type_matcher_v3_DoubleRangeMatcher_mutable_range_matchers(xds_type_matcher_v3_DoubleRangeMatcher* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__matcher__v3__DoubleRangeMatcher__RangeMatcher_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -579,6 +608,7 @@ UPB_INLINE xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher** xds_type_matche } UPB_INLINE struct xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher* xds_type_matcher_v3_DoubleRangeMatcher_add_range_matchers(xds_type_matcher_v3_DoubleRangeMatcher* msg, upb_Arena* arena) { upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__matcher__v3__DoubleRangeMatcher__RangeMatcher_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -634,6 +664,7 @@ UPB_INLINE void xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher_clear_ranges } UPB_INLINE const struct xds_type_v3_DoubleRange* const* xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher_ranges(const xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher* msg, size_t* size) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__v3__DoubleRange_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -645,6 +676,7 @@ UPB_INLINE const struct xds_type_v3_DoubleRange* const* xds_type_matcher_v3_Doub } UPB_INLINE const upb_Array* _xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher_ranges_upb_array(const xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher* msg, size_t* size) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__v3__DoubleRange_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -653,6 +685,7 @@ UPB_INLINE const upb_Array* _xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher } UPB_INLINE upb_Array* _xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher_ranges_mutable_upb_array(xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__v3__DoubleRange_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -668,6 +701,7 @@ UPB_INLINE const struct xds_type_matcher_v3_Matcher_OnMatch* xds_type_matcher_v3 const struct xds_type_matcher_v3_Matcher_OnMatch* default_val = NULL; const struct xds_type_matcher_v3_Matcher_OnMatch* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__matcher__v3__Matcher__OnMatch_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -679,6 +713,7 @@ UPB_INLINE bool xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher_has_on_match UPB_INLINE struct xds_type_v3_DoubleRange** xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher_mutable_ranges(xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher* msg, size_t* size) { upb_MiniTableField field = {1, UPB_SIZE(12, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__v3__DoubleRange_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -695,6 +730,7 @@ UPB_INLINE struct xds_type_v3_DoubleRange** xds_type_matcher_v3_DoubleRangeMatch } UPB_INLINE struct xds_type_v3_DoubleRange* xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher_add_ranges(xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher* msg, upb_Arena* arena) { upb_MiniTableField field = {1, UPB_SIZE(12, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__v3__DoubleRange_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -709,6 +745,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_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__matcher__v3__Matcher__OnMatch_msg_init); 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) { diff --git a/src/core/ext/upb-gen/xds/type/matcher/v3/range.upb_minitable.c b/src/core/ext/upb-gen/xds/type/matcher/v3/range.upb_minitable.c index 7efdcfa5f75..22480cce486 100644 --- a/src/core/ext/upb-gen/xds/type/matcher/v3/range.upb_minitable.c +++ b/src/core/ext/upb-gen/xds/type/matcher/v3/range.upb_minitable.c @@ -3,7 +3,8 @@ * xds/type/matcher/v3/range.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -15,8 +16,9 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub xds_type_matcher_v3_Int64RangeMatcher_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Int64RangeMatcher__RangeMatcher_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal xds_type_matcher_v3_Int64RangeMatcher_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Int64RangeMatcher__RangeMatcher_msg_init_ptr}, }; static const upb_MiniTableField xds_type_matcher_v3_Int64RangeMatcher__fields[1] = { @@ -36,9 +38,10 @@ const upb_MiniTable xds__type__matcher__v3__Int64RangeMatcher_msg_init = { }) }; -static const upb_MiniTableSub xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &xds__type__v3__Int64Range_msg_init}, - {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher__OnMatch_msg_init}, +const upb_MiniTable* xds__type__matcher__v3__Int64RangeMatcher_msg_init_ptr = &xds__type__matcher__v3__Int64RangeMatcher_msg_init; +static const upb_MiniTableSubInternal xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &xds__type__v3__Int64Range_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher__OnMatch_msg_init_ptr}, }; static const upb_MiniTableField xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher__fields[2] = { @@ -59,8 +62,9 @@ const upb_MiniTable xds__type__matcher__v3__Int64RangeMatcher__RangeMatcher_msg_ }) }; -static const upb_MiniTableSub xds_type_matcher_v3_Int32RangeMatcher_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Int32RangeMatcher__RangeMatcher_msg_init}, +const upb_MiniTable* xds__type__matcher__v3__Int64RangeMatcher__RangeMatcher_msg_init_ptr = &xds__type__matcher__v3__Int64RangeMatcher__RangeMatcher_msg_init; +static const upb_MiniTableSubInternal xds_type_matcher_v3_Int32RangeMatcher_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Int32RangeMatcher__RangeMatcher_msg_init_ptr}, }; static const upb_MiniTableField xds_type_matcher_v3_Int32RangeMatcher__fields[1] = { @@ -80,9 +84,10 @@ const upb_MiniTable xds__type__matcher__v3__Int32RangeMatcher_msg_init = { }) }; -static const upb_MiniTableSub xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &xds__type__v3__Int32Range_msg_init}, - {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher__OnMatch_msg_init}, +const upb_MiniTable* xds__type__matcher__v3__Int32RangeMatcher_msg_init_ptr = &xds__type__matcher__v3__Int32RangeMatcher_msg_init; +static const upb_MiniTableSubInternal xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &xds__type__v3__Int32Range_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher__OnMatch_msg_init_ptr}, }; static const upb_MiniTableField xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher__fields[2] = { @@ -103,8 +108,9 @@ const upb_MiniTable xds__type__matcher__v3__Int32RangeMatcher__RangeMatcher_msg_ }) }; -static const upb_MiniTableSub xds_type_matcher_v3_DoubleRangeMatcher_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__DoubleRangeMatcher__RangeMatcher_msg_init}, +const upb_MiniTable* xds__type__matcher__v3__Int32RangeMatcher__RangeMatcher_msg_init_ptr = &xds__type__matcher__v3__Int32RangeMatcher__RangeMatcher_msg_init; +static const upb_MiniTableSubInternal xds_type_matcher_v3_DoubleRangeMatcher_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__DoubleRangeMatcher__RangeMatcher_msg_init_ptr}, }; static const upb_MiniTableField xds_type_matcher_v3_DoubleRangeMatcher__fields[1] = { @@ -124,9 +130,10 @@ const upb_MiniTable xds__type__matcher__v3__DoubleRangeMatcher_msg_init = { }) }; -static const upb_MiniTableSub xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &xds__type__v3__DoubleRange_msg_init}, - {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher__OnMatch_msg_init}, +const upb_MiniTable* xds__type__matcher__v3__DoubleRangeMatcher_msg_init_ptr = &xds__type__matcher__v3__DoubleRangeMatcher_msg_init; +static const upb_MiniTableSubInternal xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &xds__type__v3__DoubleRange_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher__OnMatch_msg_init_ptr}, }; static const upb_MiniTableField xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher__fields[2] = { @@ -147,6 +154,7 @@ const upb_MiniTable xds__type__matcher__v3__DoubleRangeMatcher__RangeMatcher_msg }) }; +const upb_MiniTable* xds__type__matcher__v3__DoubleRangeMatcher__RangeMatcher_msg_init_ptr = &xds__type__matcher__v3__DoubleRangeMatcher__RangeMatcher_msg_init; static const upb_MiniTable *messages_layout[6] = { &xds__type__matcher__v3__Int64RangeMatcher_msg_init, &xds__type__matcher__v3__Int64RangeMatcher__RangeMatcher_msg_init, diff --git a/src/core/ext/upb-gen/xds/type/matcher/v3/range.upb_minitable.h b/src/core/ext/upb-gen/xds/type/matcher/v3/range.upb_minitable.h index 6fee8eb6dea..04bc4f230b9 100644 --- a/src/core/ext/upb-gen/xds/type/matcher/v3/range.upb_minitable.h +++ b/src/core/ext/upb-gen/xds/type/matcher/v3/range.upb_minitable.h @@ -3,7 +3,8 @@ * xds/type/matcher/v3/range.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef XDS_TYPE_MATCHER_V3_RANGE_PROTO_UPB_MINITABLE_H_ #define XDS_TYPE_MATCHER_V3_RANGE_PROTO_UPB_MINITABLE_H_ @@ -18,11 +19,17 @@ extern "C" { #endif extern const upb_MiniTable xds__type__matcher__v3__Int64RangeMatcher_msg_init; +extern const upb_MiniTable* xds__type__matcher__v3__Int64RangeMatcher_msg_init_ptr; extern const upb_MiniTable xds__type__matcher__v3__Int64RangeMatcher__RangeMatcher_msg_init; +extern const upb_MiniTable* xds__type__matcher__v3__Int64RangeMatcher__RangeMatcher_msg_init_ptr; extern const upb_MiniTable xds__type__matcher__v3__Int32RangeMatcher_msg_init; +extern const upb_MiniTable* xds__type__matcher__v3__Int32RangeMatcher_msg_init_ptr; extern const upb_MiniTable xds__type__matcher__v3__Int32RangeMatcher__RangeMatcher_msg_init; +extern const upb_MiniTable* xds__type__matcher__v3__Int32RangeMatcher__RangeMatcher_msg_init_ptr; extern const upb_MiniTable xds__type__matcher__v3__DoubleRangeMatcher_msg_init; +extern const upb_MiniTable* xds__type__matcher__v3__DoubleRangeMatcher_msg_init_ptr; extern const upb_MiniTable xds__type__matcher__v3__DoubleRangeMatcher__RangeMatcher_msg_init; +extern const upb_MiniTable* xds__type__matcher__v3__DoubleRangeMatcher__RangeMatcher_msg_init_ptr; extern const upb_MiniTableFile xds_type_matcher_v3_range_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/xds/type/matcher/v3/regex.upb.h b/src/core/ext/upb-gen/xds/type/matcher/v3/regex.upb.h index 0c0bec69b40..7d0f74c290a 100644 --- a/src/core/ext/upb-gen/xds/type/matcher/v3/regex.upb.h +++ b/src/core/ext/upb-gen/xds/type/matcher/v3/regex.upb.h @@ -3,7 +3,8 @@ * xds/type/matcher/v3/regex.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef XDS_TYPE_MATCHER_V3_REGEX_PROTO_UPB_H_ #define XDS_TYPE_MATCHER_V3_REGEX_PROTO_UPB_H_ @@ -79,6 +80,7 @@ UPB_INLINE const xds_type_matcher_v3_RegexMatcher_GoogleRE2* xds_type_matcher_v3 const xds_type_matcher_v3_RegexMatcher_GoogleRE2* default_val = NULL; const xds_type_matcher_v3_RegexMatcher_GoogleRE2* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__matcher__v3__RegexMatcher__GoogleRE2_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -102,6 +104,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_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__matcher__v3__RegexMatcher__GoogleRE2_msg_init); 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) { diff --git a/src/core/ext/upb-gen/xds/type/matcher/v3/regex.upb_minitable.c b/src/core/ext/upb-gen/xds/type/matcher/v3/regex.upb_minitable.c index 5e59b7a8be0..cd151d6bdc7 100644 --- a/src/core/ext/upb-gen/xds/type/matcher/v3/regex.upb_minitable.c +++ b/src/core/ext/upb-gen/xds/type/matcher/v3/regex.upb_minitable.c @@ -3,7 +3,8 @@ * xds/type/matcher/v3/regex.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -13,8 +14,9 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub xds_type_matcher_v3_RegexMatcher_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__RegexMatcher__GoogleRE2_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal xds_type_matcher_v3_RegexMatcher_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__RegexMatcher__GoogleRE2_msg_init_ptr}, }; static const upb_MiniTableField xds_type_matcher_v3_RegexMatcher__fields[2] = { @@ -37,6 +39,7 @@ const upb_MiniTable xds__type__matcher__v3__RegexMatcher_msg_init = { }) }; +const upb_MiniTable* xds__type__matcher__v3__RegexMatcher_msg_init_ptr = &xds__type__matcher__v3__RegexMatcher_msg_init; const upb_MiniTable xds__type__matcher__v3__RegexMatcher__GoogleRE2_msg_init = { NULL, NULL, @@ -46,6 +49,7 @@ const upb_MiniTable xds__type__matcher__v3__RegexMatcher__GoogleRE2_msg_init = { #endif }; +const upb_MiniTable* xds__type__matcher__v3__RegexMatcher__GoogleRE2_msg_init_ptr = &xds__type__matcher__v3__RegexMatcher__GoogleRE2_msg_init; static const upb_MiniTable *messages_layout[2] = { &xds__type__matcher__v3__RegexMatcher_msg_init, &xds__type__matcher__v3__RegexMatcher__GoogleRE2_msg_init, diff --git a/src/core/ext/upb-gen/xds/type/matcher/v3/regex.upb_minitable.h b/src/core/ext/upb-gen/xds/type/matcher/v3/regex.upb_minitable.h index 826e3b04e0c..dd933ba2fb8 100644 --- a/src/core/ext/upb-gen/xds/type/matcher/v3/regex.upb_minitable.h +++ b/src/core/ext/upb-gen/xds/type/matcher/v3/regex.upb_minitable.h @@ -3,7 +3,8 @@ * xds/type/matcher/v3/regex.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef XDS_TYPE_MATCHER_V3_REGEX_PROTO_UPB_MINITABLE_H_ #define XDS_TYPE_MATCHER_V3_REGEX_PROTO_UPB_MINITABLE_H_ @@ -18,7 +19,9 @@ extern "C" { #endif extern const upb_MiniTable xds__type__matcher__v3__RegexMatcher_msg_init; +extern const upb_MiniTable* xds__type__matcher__v3__RegexMatcher_msg_init_ptr; extern const upb_MiniTable xds__type__matcher__v3__RegexMatcher__GoogleRE2_msg_init; +extern const upb_MiniTable* xds__type__matcher__v3__RegexMatcher__GoogleRE2_msg_init_ptr; extern const upb_MiniTableFile xds_type_matcher_v3_regex_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/xds/type/matcher/v3/string.upb.h b/src/core/ext/upb-gen/xds/type/matcher/v3/string.upb.h index 17a8b31abad..7e2f1abec1e 100644 --- a/src/core/ext/upb-gen/xds/type/matcher/v3/string.upb.h +++ b/src/core/ext/upb-gen/xds/type/matcher/v3/string.upb.h @@ -3,7 +3,8 @@ * xds/type/matcher/v3/string.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef XDS_TYPE_MATCHER_V3_STRING_PROTO_UPB_H_ #define XDS_TYPE_MATCHER_V3_STRING_PROTO_UPB_H_ @@ -133,6 +134,7 @@ UPB_INLINE const struct xds_type_matcher_v3_RegexMatcher* xds_type_matcher_v3_St const struct xds_type_matcher_v3_RegexMatcher* default_val = NULL; const struct xds_type_matcher_v3_RegexMatcher* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__matcher__v3__RegexMatcher_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -184,6 +186,7 @@ UPB_INLINE void xds_type_matcher_v3_StringMatcher_set_suffix(xds_type_matcher_v3 } 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_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__matcher__v3__RegexMatcher_msg_init); 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) { @@ -245,6 +248,7 @@ UPB_INLINE void xds_type_matcher_v3_ListStringMatcher_clear_patterns(xds_type_ma } UPB_INLINE const xds_type_matcher_v3_StringMatcher* const* xds_type_matcher_v3_ListStringMatcher_patterns(const xds_type_matcher_v3_ListStringMatcher* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__matcher__v3__StringMatcher_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -256,6 +260,7 @@ UPB_INLINE const xds_type_matcher_v3_StringMatcher* const* xds_type_matcher_v3_L } UPB_INLINE const upb_Array* _xds_type_matcher_v3_ListStringMatcher_patterns_upb_array(const xds_type_matcher_v3_ListStringMatcher* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__matcher__v3__StringMatcher_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -264,6 +269,7 @@ UPB_INLINE const upb_Array* _xds_type_matcher_v3_ListStringMatcher_patterns_upb_ } UPB_INLINE upb_Array* _xds_type_matcher_v3_ListStringMatcher_patterns_mutable_upb_array(xds_type_matcher_v3_ListStringMatcher* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__matcher__v3__StringMatcher_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -274,6 +280,7 @@ UPB_INLINE upb_Array* _xds_type_matcher_v3_ListStringMatcher_patterns_mutable_up UPB_INLINE xds_type_matcher_v3_StringMatcher** xds_type_matcher_v3_ListStringMatcher_mutable_patterns(xds_type_matcher_v3_ListStringMatcher* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__matcher__v3__StringMatcher_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -290,6 +297,7 @@ UPB_INLINE xds_type_matcher_v3_StringMatcher** xds_type_matcher_v3_ListStringMat } UPB_INLINE struct xds_type_matcher_v3_StringMatcher* xds_type_matcher_v3_ListStringMatcher_add_patterns(xds_type_matcher_v3_ListStringMatcher* msg, upb_Arena* arena) { upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__matcher__v3__StringMatcher_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( diff --git a/src/core/ext/upb-gen/xds/type/matcher/v3/string.upb_minitable.c b/src/core/ext/upb-gen/xds/type/matcher/v3/string.upb_minitable.c index 028473e84c2..5d2adb5f53d 100644 --- a/src/core/ext/upb-gen/xds/type/matcher/v3/string.upb_minitable.c +++ b/src/core/ext/upb-gen/xds/type/matcher/v3/string.upb_minitable.c @@ -3,7 +3,8 @@ * xds/type/matcher/v3/string.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -14,8 +15,9 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub xds_type_matcher_v3_StringMatcher_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__RegexMatcher_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal xds_type_matcher_v3_StringMatcher_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__RegexMatcher_msg_init_ptr}, }; static const upb_MiniTableField xds_type_matcher_v3_StringMatcher__fields[6] = { @@ -46,8 +48,9 @@ const upb_MiniTable xds__type__matcher__v3__StringMatcher_msg_init = { }) }; -static const upb_MiniTableSub xds_type_matcher_v3_ListStringMatcher_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__StringMatcher_msg_init}, +const upb_MiniTable* xds__type__matcher__v3__StringMatcher_msg_init_ptr = &xds__type__matcher__v3__StringMatcher_msg_init; +static const upb_MiniTableSubInternal xds_type_matcher_v3_ListStringMatcher_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__StringMatcher_msg_init_ptr}, }; static const upb_MiniTableField xds_type_matcher_v3_ListStringMatcher__fields[1] = { @@ -67,6 +70,7 @@ const upb_MiniTable xds__type__matcher__v3__ListStringMatcher_msg_init = { }) }; +const upb_MiniTable* xds__type__matcher__v3__ListStringMatcher_msg_init_ptr = &xds__type__matcher__v3__ListStringMatcher_msg_init; static const upb_MiniTable *messages_layout[2] = { &xds__type__matcher__v3__StringMatcher_msg_init, &xds__type__matcher__v3__ListStringMatcher_msg_init, diff --git a/src/core/ext/upb-gen/xds/type/matcher/v3/string.upb_minitable.h b/src/core/ext/upb-gen/xds/type/matcher/v3/string.upb_minitable.h index 407e2d72d74..06b77ab34ab 100644 --- a/src/core/ext/upb-gen/xds/type/matcher/v3/string.upb_minitable.h +++ b/src/core/ext/upb-gen/xds/type/matcher/v3/string.upb_minitable.h @@ -3,7 +3,8 @@ * xds/type/matcher/v3/string.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef XDS_TYPE_MATCHER_V3_STRING_PROTO_UPB_MINITABLE_H_ #define XDS_TYPE_MATCHER_V3_STRING_PROTO_UPB_MINITABLE_H_ @@ -18,7 +19,9 @@ extern "C" { #endif extern const upb_MiniTable xds__type__matcher__v3__StringMatcher_msg_init; +extern const upb_MiniTable* xds__type__matcher__v3__StringMatcher_msg_init_ptr; extern const upb_MiniTable xds__type__matcher__v3__ListStringMatcher_msg_init; +extern const upb_MiniTable* xds__type__matcher__v3__ListStringMatcher_msg_init_ptr; extern const upb_MiniTableFile xds_type_matcher_v3_string_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/xds/type/v3/cel.upb.h b/src/core/ext/upb-gen/xds/type/v3/cel.upb.h index 6cb6070a2eb..95678924109 100644 --- a/src/core/ext/upb-gen/xds/type/v3/cel.upb.h +++ b/src/core/ext/upb-gen/xds/type/v3/cel.upb.h @@ -3,7 +3,8 @@ * xds/type/v3/cel.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef XDS_TYPE_V3_CEL_PROTO_UPB_H_ #define XDS_TYPE_V3_CEL_PROTO_UPB_H_ @@ -87,6 +88,7 @@ UPB_INLINE const struct google_api_expr_v1alpha1_ParsedExpr* xds_type_v3_CelExpr const struct google_api_expr_v1alpha1_ParsedExpr* default_val = NULL; const struct google_api_expr_v1alpha1_ParsedExpr* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__ParsedExpr_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -103,6 +105,7 @@ UPB_INLINE const struct google_api_expr_v1alpha1_CheckedExpr* xds_type_v3_CelExp const struct google_api_expr_v1alpha1_CheckedExpr* default_val = NULL; const struct google_api_expr_v1alpha1_CheckedExpr* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__CheckedExpr_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -114,6 +117,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__ParsedExpr_msg_init); 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) { @@ -126,6 +130,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__api__expr__v1alpha1__CheckedExpr_msg_init); 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) { @@ -181,6 +186,7 @@ UPB_INLINE const xds_type_v3_CelExpression* xds_type_v3_CelExtractString_expr_ex const xds_type_v3_CelExpression* default_val = NULL; const xds_type_v3_CelExpression* 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_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__v3__CelExpression_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -197,6 +203,7 @@ UPB_INLINE const struct google_protobuf_StringValue* xds_type_v3_CelExtractStrin const struct google_protobuf_StringValue* default_val = NULL; const struct google_protobuf_StringValue* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__StringValue_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -208,6 +215,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_PRIVATE(_upb_MiniTable_StrongReference)(&xds__type__v3__CelExpression_msg_init); 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) { @@ -220,6 +228,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__StringValue_msg_init); 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) { diff --git a/src/core/ext/upb-gen/xds/type/v3/cel.upb_minitable.c b/src/core/ext/upb-gen/xds/type/v3/cel.upb_minitable.c index a4966c45611..d3b5d22c5a6 100644 --- a/src/core/ext/upb-gen/xds/type/v3/cel.upb_minitable.c +++ b/src/core/ext/upb-gen/xds/type/v3/cel.upb_minitable.c @@ -3,7 +3,8 @@ * xds/type/v3/cel.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -17,9 +18,10 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub xds_type_v3_CelExpression_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__ParsedExpr_msg_init}, - {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__CheckedExpr_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal xds_type_v3_CelExpression_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__ParsedExpr_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__CheckedExpr_msg_init_ptr}, }; static const upb_MiniTableField xds_type_v3_CelExpression__fields[2] = { @@ -42,9 +44,10 @@ const upb_MiniTable xds__type__v3__CelExpression_msg_init = { }) }; -static const upb_MiniTableSub xds_type_v3_CelExtractString_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &xds__type__v3__CelExpression_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__StringValue_msg_init}, +const upb_MiniTable* xds__type__v3__CelExpression_msg_init_ptr = &xds__type__v3__CelExpression_msg_init; +static const upb_MiniTableSubInternal xds_type_v3_CelExtractString_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &xds__type__v3__CelExpression_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__StringValue_msg_init_ptr}, }; static const upb_MiniTableField xds_type_v3_CelExtractString__fields[2] = { @@ -61,6 +64,7 @@ const upb_MiniTable xds__type__v3__CelExtractString_msg_init = { #endif }; +const upb_MiniTable* xds__type__v3__CelExtractString_msg_init_ptr = &xds__type__v3__CelExtractString_msg_init; static const upb_MiniTable *messages_layout[2] = { &xds__type__v3__CelExpression_msg_init, &xds__type__v3__CelExtractString_msg_init, diff --git a/src/core/ext/upb-gen/xds/type/v3/cel.upb_minitable.h b/src/core/ext/upb-gen/xds/type/v3/cel.upb_minitable.h index 493050da9e4..a297965182b 100644 --- a/src/core/ext/upb-gen/xds/type/v3/cel.upb_minitable.h +++ b/src/core/ext/upb-gen/xds/type/v3/cel.upb_minitable.h @@ -3,7 +3,8 @@ * xds/type/v3/cel.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef XDS_TYPE_V3_CEL_PROTO_UPB_MINITABLE_H_ #define XDS_TYPE_V3_CEL_PROTO_UPB_MINITABLE_H_ @@ -18,7 +19,9 @@ extern "C" { #endif extern const upb_MiniTable xds__type__v3__CelExpression_msg_init; +extern const upb_MiniTable* xds__type__v3__CelExpression_msg_init_ptr; extern const upb_MiniTable xds__type__v3__CelExtractString_msg_init; +extern const upb_MiniTable* xds__type__v3__CelExtractString_msg_init_ptr; extern const upb_MiniTableFile xds_type_v3_cel_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/xds/type/v3/range.upb.h b/src/core/ext/upb-gen/xds/type/v3/range.upb.h index 55515f71f18..26bfecce268 100644 --- a/src/core/ext/upb-gen/xds/type/v3/range.upb.h +++ b/src/core/ext/upb-gen/xds/type/v3/range.upb.h @@ -3,7 +3,8 @@ * xds/type/v3/range.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef XDS_TYPE_V3_RANGE_PROTO_UPB_H_ #define XDS_TYPE_V3_RANGE_PROTO_UPB_H_ diff --git a/src/core/ext/upb-gen/xds/type/v3/range.upb_minitable.c b/src/core/ext/upb-gen/xds/type/v3/range.upb_minitable.c index ea6c37beb75..36a67e09017 100644 --- a/src/core/ext/upb-gen/xds/type/v3/range.upb_minitable.c +++ b/src/core/ext/upb-gen/xds/type/v3/range.upb_minitable.c @@ -3,7 +3,8 @@ * xds/type/v3/range.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -12,6 +13,7 @@ // Must be last. #include "upb/port/def.inc" +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); static const upb_MiniTableField xds_type_v3_Int64Range__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)}, @@ -32,6 +34,7 @@ const upb_MiniTable xds__type__v3__Int64Range_msg_init = { }) }; +const upb_MiniTable* xds__type__v3__Int64Range_msg_init_ptr = &xds__type__v3__Int64Range_msg_init; static const upb_MiniTableField xds_type_v3_Int32Range__fields[2] = { {1, 8, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, {2, 12, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, @@ -52,6 +55,7 @@ const upb_MiniTable xds__type__v3__Int32Range_msg_init = { }) }; +const upb_MiniTable* xds__type__v3__Int32Range_msg_init_ptr = &xds__type__v3__Int32Range_msg_init; static const upb_MiniTableField xds_type_v3_DoubleRange__fields[2] = { {1, 8, 0, kUpb_NoSub, 1, (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)}, @@ -72,6 +76,7 @@ const upb_MiniTable xds__type__v3__DoubleRange_msg_init = { }) }; +const upb_MiniTable* xds__type__v3__DoubleRange_msg_init_ptr = &xds__type__v3__DoubleRange_msg_init; static const upb_MiniTable *messages_layout[3] = { &xds__type__v3__Int64Range_msg_init, &xds__type__v3__Int32Range_msg_init, diff --git a/src/core/ext/upb-gen/xds/type/v3/range.upb_minitable.h b/src/core/ext/upb-gen/xds/type/v3/range.upb_minitable.h index be9c19771f7..6def17ae88d 100644 --- a/src/core/ext/upb-gen/xds/type/v3/range.upb_minitable.h +++ b/src/core/ext/upb-gen/xds/type/v3/range.upb_minitable.h @@ -3,7 +3,8 @@ * xds/type/v3/range.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef XDS_TYPE_V3_RANGE_PROTO_UPB_MINITABLE_H_ #define XDS_TYPE_V3_RANGE_PROTO_UPB_MINITABLE_H_ @@ -18,8 +19,11 @@ extern "C" { #endif extern const upb_MiniTable xds__type__v3__Int64Range_msg_init; +extern const upb_MiniTable* xds__type__v3__Int64Range_msg_init_ptr; extern const upb_MiniTable xds__type__v3__Int32Range_msg_init; +extern const upb_MiniTable* xds__type__v3__Int32Range_msg_init_ptr; extern const upb_MiniTable xds__type__v3__DoubleRange_msg_init; +extern const upb_MiniTable* xds__type__v3__DoubleRange_msg_init_ptr; extern const upb_MiniTableFile xds_type_v3_range_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/xds/type/v3/typed_struct.upb.h b/src/core/ext/upb-gen/xds/type/v3/typed_struct.upb.h index 067c0051b90..e5853a59493 100644 --- a/src/core/ext/upb-gen/xds/type/v3/typed_struct.upb.h +++ b/src/core/ext/upb-gen/xds/type/v3/typed_struct.upb.h @@ -3,7 +3,8 @@ * xds/type/v3/typed_struct.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef XDS_TYPE_V3_TYPED_STRUCT_PROTO_UPB_H_ #define XDS_TYPE_V3_TYPED_STRUCT_PROTO_UPB_H_ @@ -82,6 +83,7 @@ UPB_INLINE const struct google_protobuf_Struct* xds_type_v3_TypedStruct_value(co const struct google_protobuf_Struct* default_val = NULL; const struct google_protobuf_Struct* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Struct_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -97,6 +99,7 @@ UPB_INLINE void xds_type_v3_TypedStruct_set_type_url(xds_type_v3_TypedStruct *ms } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__Struct_msg_init); 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) { diff --git a/src/core/ext/upb-gen/xds/type/v3/typed_struct.upb_minitable.c b/src/core/ext/upb-gen/xds/type/v3/typed_struct.upb_minitable.c index bb9826d214c..59b6c6bef81 100644 --- a/src/core/ext/upb-gen/xds/type/v3/typed_struct.upb_minitable.c +++ b/src/core/ext/upb-gen/xds/type/v3/typed_struct.upb_minitable.c @@ -3,7 +3,8 @@ * xds/type/v3/typed_struct.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -13,8 +14,9 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub xds_type_v3_TypedStruct_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__Struct_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal xds_type_v3_TypedStruct_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Struct_msg_init_ptr}, }; static const upb_MiniTableField xds_type_v3_TypedStruct__fields[2] = { @@ -35,6 +37,7 @@ const upb_MiniTable xds__type__v3__TypedStruct_msg_init = { }) }; +const upb_MiniTable* xds__type__v3__TypedStruct_msg_init_ptr = &xds__type__v3__TypedStruct_msg_init; static const upb_MiniTable *messages_layout[1] = { &xds__type__v3__TypedStruct_msg_init, }; diff --git a/src/core/ext/upb-gen/xds/type/v3/typed_struct.upb_minitable.h b/src/core/ext/upb-gen/xds/type/v3/typed_struct.upb_minitable.h index d3a98b59d94..810baf16a8b 100644 --- a/src/core/ext/upb-gen/xds/type/v3/typed_struct.upb_minitable.h +++ b/src/core/ext/upb-gen/xds/type/v3/typed_struct.upb_minitable.h @@ -3,7 +3,8 @@ * xds/type/v3/typed_struct.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef XDS_TYPE_V3_TYPED_STRUCT_PROTO_UPB_MINITABLE_H_ #define XDS_TYPE_V3_TYPED_STRUCT_PROTO_UPB_MINITABLE_H_ @@ -18,6 +19,7 @@ extern "C" { #endif extern const upb_MiniTable xds__type__v3__TypedStruct_msg_init; +extern const upb_MiniTable* xds__type__v3__TypedStruct_msg_init_ptr; extern const upb_MiniTableFile xds_type_v3_typed_struct_proto_upb_file_layout; diff --git a/src/core/ext/upbdefs-gen/envoy/admin/v3/certs.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/admin/v3/certs.upbdefs.c index 8f6a6748873..bc5e61dfc2b 100644 --- a/src/core/ext/upbdefs-gen/envoy/admin/v3/certs.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/admin/v3/certs.upbdefs.c @@ -3,7 +3,8 @@ * envoy/admin/v3/certs.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/admin/v3/certs.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/admin/v3/certs.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/admin/v3/certs.upbdefs.h index bca96caa606..0dc25530d46 100644 --- a/src/core/ext/upbdefs-gen/envoy/admin/v3/certs.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/admin/v3/certs.upbdefs.h @@ -3,7 +3,8 @@ * envoy/admin/v3/certs.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_ADMIN_V3_CERTS_PROTO_UPBDEFS_H_ #define ENVOY_ADMIN_V3_CERTS_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/admin/v3/clusters.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/admin/v3/clusters.upbdefs.c index ed193cd1e3c..84905ef25b8 100644 --- a/src/core/ext/upbdefs-gen/envoy/admin/v3/clusters.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/admin/v3/clusters.upbdefs.c @@ -3,7 +3,8 @@ * envoy/admin/v3/clusters.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/admin/v3/clusters.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/admin/v3/clusters.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/admin/v3/clusters.upbdefs.h index 9d35e28b262..d20a738a25b 100644 --- a/src/core/ext/upbdefs-gen/envoy/admin/v3/clusters.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/admin/v3/clusters.upbdefs.h @@ -3,7 +3,8 @@ * envoy/admin/v3/clusters.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_ADMIN_V3_CLUSTERS_PROTO_UPBDEFS_H_ #define ENVOY_ADMIN_V3_CLUSTERS_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/admin/v3/config_dump.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/admin/v3/config_dump.upbdefs.c index dfc7eef8de0..a9d4a9bd5f5 100644 --- a/src/core/ext/upbdefs-gen/envoy/admin/v3/config_dump.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/admin/v3/config_dump.upbdefs.c @@ -3,7 +3,8 @@ * envoy/admin/v3/config_dump.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/admin/v3/config_dump.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/admin/v3/config_dump.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/admin/v3/config_dump.upbdefs.h index 4dea65d4027..e3e17cf6103 100644 --- a/src/core/ext/upbdefs-gen/envoy/admin/v3/config_dump.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/admin/v3/config_dump.upbdefs.h @@ -3,7 +3,8 @@ * envoy/admin/v3/config_dump.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_ADMIN_V3_CONFIG_DUMP_PROTO_UPBDEFS_H_ #define ENVOY_ADMIN_V3_CONFIG_DUMP_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/admin/v3/config_dump_shared.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/admin/v3/config_dump_shared.upbdefs.c index 34b51a3babe..97d480373b2 100644 --- a/src/core/ext/upbdefs-gen/envoy/admin/v3/config_dump_shared.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/admin/v3/config_dump_shared.upbdefs.c @@ -3,7 +3,8 @@ * envoy/admin/v3/config_dump_shared.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/admin/v3/config_dump_shared.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/admin/v3/config_dump_shared.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/admin/v3/config_dump_shared.upbdefs.h index dab49d4ea48..39f42f94172 100644 --- a/src/core/ext/upbdefs-gen/envoy/admin/v3/config_dump_shared.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/admin/v3/config_dump_shared.upbdefs.h @@ -3,7 +3,8 @@ * envoy/admin/v3/config_dump_shared.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_ADMIN_V3_CONFIG_DUMP_SHARED_PROTO_UPBDEFS_H_ #define ENVOY_ADMIN_V3_CONFIG_DUMP_SHARED_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/admin/v3/init_dump.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/admin/v3/init_dump.upbdefs.c index 2d79ca5a3a9..0b7c55184af 100644 --- a/src/core/ext/upbdefs-gen/envoy/admin/v3/init_dump.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/admin/v3/init_dump.upbdefs.c @@ -3,7 +3,8 @@ * envoy/admin/v3/init_dump.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/admin/v3/init_dump.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/admin/v3/init_dump.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/admin/v3/init_dump.upbdefs.h index 1678cab66ce..41edace56d9 100644 --- a/src/core/ext/upbdefs-gen/envoy/admin/v3/init_dump.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/admin/v3/init_dump.upbdefs.h @@ -3,7 +3,8 @@ * envoy/admin/v3/init_dump.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_ADMIN_V3_INIT_DUMP_PROTO_UPBDEFS_H_ #define ENVOY_ADMIN_V3_INIT_DUMP_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/admin/v3/listeners.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/admin/v3/listeners.upbdefs.c index 3ed0c4ee6c5..f1d5d591ae0 100644 --- a/src/core/ext/upbdefs-gen/envoy/admin/v3/listeners.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/admin/v3/listeners.upbdefs.c @@ -3,7 +3,8 @@ * envoy/admin/v3/listeners.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/admin/v3/listeners.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/admin/v3/listeners.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/admin/v3/listeners.upbdefs.h index ccd54edafc9..8b84c569f78 100644 --- a/src/core/ext/upbdefs-gen/envoy/admin/v3/listeners.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/admin/v3/listeners.upbdefs.h @@ -3,7 +3,8 @@ * envoy/admin/v3/listeners.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_ADMIN_V3_LISTENERS_PROTO_UPBDEFS_H_ #define ENVOY_ADMIN_V3_LISTENERS_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/admin/v3/memory.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/admin/v3/memory.upbdefs.c index 0d40cd55ade..80c5dfc87de 100644 --- a/src/core/ext/upbdefs-gen/envoy/admin/v3/memory.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/admin/v3/memory.upbdefs.c @@ -3,7 +3,8 @@ * envoy/admin/v3/memory.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/admin/v3/memory.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/admin/v3/memory.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/admin/v3/memory.upbdefs.h index e8e1afc631e..4bc9bb674cb 100644 --- a/src/core/ext/upbdefs-gen/envoy/admin/v3/memory.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/admin/v3/memory.upbdefs.h @@ -3,7 +3,8 @@ * envoy/admin/v3/memory.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_ADMIN_V3_MEMORY_PROTO_UPBDEFS_H_ #define ENVOY_ADMIN_V3_MEMORY_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/admin/v3/metrics.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/admin/v3/metrics.upbdefs.c index 388ee91459f..a1db7650b2c 100644 --- a/src/core/ext/upbdefs-gen/envoy/admin/v3/metrics.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/admin/v3/metrics.upbdefs.c @@ -3,7 +3,8 @@ * envoy/admin/v3/metrics.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/admin/v3/metrics.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/admin/v3/metrics.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/admin/v3/metrics.upbdefs.h index addf3f77c72..e5b2ad86d4e 100644 --- a/src/core/ext/upbdefs-gen/envoy/admin/v3/metrics.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/admin/v3/metrics.upbdefs.h @@ -3,7 +3,8 @@ * envoy/admin/v3/metrics.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_ADMIN_V3_METRICS_PROTO_UPBDEFS_H_ #define ENVOY_ADMIN_V3_METRICS_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/admin/v3/mutex_stats.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/admin/v3/mutex_stats.upbdefs.c index 55bb5545d27..2146c9fb6cf 100644 --- a/src/core/ext/upbdefs-gen/envoy/admin/v3/mutex_stats.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/admin/v3/mutex_stats.upbdefs.c @@ -3,7 +3,8 @@ * envoy/admin/v3/mutex_stats.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/admin/v3/mutex_stats.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/admin/v3/mutex_stats.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/admin/v3/mutex_stats.upbdefs.h index 22aa33265f0..d9baa7af0dd 100644 --- a/src/core/ext/upbdefs-gen/envoy/admin/v3/mutex_stats.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/admin/v3/mutex_stats.upbdefs.h @@ -3,7 +3,8 @@ * envoy/admin/v3/mutex_stats.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_ADMIN_V3_MUTEX_STATS_PROTO_UPBDEFS_H_ #define ENVOY_ADMIN_V3_MUTEX_STATS_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/admin/v3/server_info.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/admin/v3/server_info.upbdefs.c index a6f5a44f719..09cfcd3feb7 100644 --- a/src/core/ext/upbdefs-gen/envoy/admin/v3/server_info.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/admin/v3/server_info.upbdefs.c @@ -3,7 +3,8 @@ * envoy/admin/v3/server_info.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/admin/v3/server_info.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/admin/v3/server_info.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/admin/v3/server_info.upbdefs.h index 8ae17c7578c..9540a6ed1bf 100644 --- a/src/core/ext/upbdefs-gen/envoy/admin/v3/server_info.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/admin/v3/server_info.upbdefs.h @@ -3,7 +3,8 @@ * envoy/admin/v3/server_info.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_ADMIN_V3_SERVER_INFO_PROTO_UPBDEFS_H_ #define ENVOY_ADMIN_V3_SERVER_INFO_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/admin/v3/tap.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/admin/v3/tap.upbdefs.c index 472ebda263b..45f6c870b94 100644 --- a/src/core/ext/upbdefs-gen/envoy/admin/v3/tap.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/admin/v3/tap.upbdefs.c @@ -3,7 +3,8 @@ * envoy/admin/v3/tap.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/admin/v3/tap.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/admin/v3/tap.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/admin/v3/tap.upbdefs.h index 06dc78d0f2c..c112e6d9a6b 100644 --- a/src/core/ext/upbdefs-gen/envoy/admin/v3/tap.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/admin/v3/tap.upbdefs.h @@ -3,7 +3,8 @@ * envoy/admin/v3/tap.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_ADMIN_V3_TAP_PROTO_UPBDEFS_H_ #define ENVOY_ADMIN_V3_TAP_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/annotations/deprecation.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/annotations/deprecation.upbdefs.c index 2a1cc9edfbc..3ffad012132 100644 --- a/src/core/ext/upbdefs-gen/envoy/annotations/deprecation.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/annotations/deprecation.upbdefs.c @@ -3,7 +3,8 @@ * envoy/annotations/deprecation.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/annotations/deprecation.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/annotations/deprecation.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/annotations/deprecation.upbdefs.h index 8a9e9faa48a..d8563570873 100644 --- a/src/core/ext/upbdefs-gen/envoy/annotations/deprecation.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/annotations/deprecation.upbdefs.h @@ -3,7 +3,8 @@ * envoy/annotations/deprecation.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_ANNOTATIONS_DEPRECATION_PROTO_UPBDEFS_H_ #define ENVOY_ANNOTATIONS_DEPRECATION_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/annotations/resource.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/annotations/resource.upbdefs.c index b5601d46d45..ad70e5f0e7a 100644 --- a/src/core/ext/upbdefs-gen/envoy/annotations/resource.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/annotations/resource.upbdefs.c @@ -3,7 +3,8 @@ * envoy/annotations/resource.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/annotations/resource.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/annotations/resource.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/annotations/resource.upbdefs.h index 16f0e5dd907..5dd135ccae7 100644 --- a/src/core/ext/upbdefs-gen/envoy/annotations/resource.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/annotations/resource.upbdefs.h @@ -3,7 +3,8 @@ * envoy/annotations/resource.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_ANNOTATIONS_RESOURCE_PROTO_UPBDEFS_H_ #define ENVOY_ANNOTATIONS_RESOURCE_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/config/accesslog/v3/accesslog.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/accesslog/v3/accesslog.upbdefs.c index a129c5f33f4..6a98e252ce6 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/accesslog/v3/accesslog.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/config/accesslog/v3/accesslog.upbdefs.c @@ -3,7 +3,8 @@ * envoy/config/accesslog/v3/accesslog.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/config/accesslog/v3/accesslog.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/config/accesslog/v3/accesslog.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/accesslog/v3/accesslog.upbdefs.h index 9f68deb23b4..510a16364f2 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/accesslog/v3/accesslog.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/config/accesslog/v3/accesslog.upbdefs.h @@ -3,7 +3,8 @@ * envoy/config/accesslog/v3/accesslog.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_ACCESSLOG_V3_ACCESSLOG_PROTO_UPBDEFS_H_ #define ENVOY_CONFIG_ACCESSLOG_V3_ACCESSLOG_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/config/bootstrap/v3/bootstrap.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/bootstrap/v3/bootstrap.upbdefs.c index 0d6b80ec6e2..84a5d3f9fb6 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/bootstrap/v3/bootstrap.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/config/bootstrap/v3/bootstrap.upbdefs.c @@ -3,7 +3,8 @@ * envoy/config/bootstrap/v3/bootstrap.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/config/bootstrap/v3/bootstrap.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/config/bootstrap/v3/bootstrap.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/bootstrap/v3/bootstrap.upbdefs.h index 3f79363928e..ac8f021d9ad 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/bootstrap/v3/bootstrap.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/config/bootstrap/v3/bootstrap.upbdefs.h @@ -3,7 +3,8 @@ * envoy/config/bootstrap/v3/bootstrap.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_BOOTSTRAP_V3_BOOTSTRAP_PROTO_UPBDEFS_H_ #define ENVOY_CONFIG_BOOTSTRAP_V3_BOOTSTRAP_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/config/cluster/v3/circuit_breaker.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/cluster/v3/circuit_breaker.upbdefs.c index b4c31164203..fa240dd09bd 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/cluster/v3/circuit_breaker.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/config/cluster/v3/circuit_breaker.upbdefs.c @@ -3,7 +3,8 @@ * envoy/config/cluster/v3/circuit_breaker.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/config/cluster/v3/circuit_breaker.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/config/cluster/v3/circuit_breaker.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/cluster/v3/circuit_breaker.upbdefs.h index 0c2a7755993..019956e7360 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/cluster/v3/circuit_breaker.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/config/cluster/v3/circuit_breaker.upbdefs.h @@ -3,7 +3,8 @@ * envoy/config/cluster/v3/circuit_breaker.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_CLUSTER_V3_CIRCUIT_BREAKER_PROTO_UPBDEFS_H_ #define ENVOY_CONFIG_CLUSTER_V3_CIRCUIT_BREAKER_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/config/cluster/v3/cluster.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/cluster/v3/cluster.upbdefs.c index 7fa62797ac8..fb221c5b207 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/cluster/v3/cluster.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/config/cluster/v3/cluster.upbdefs.c @@ -3,7 +3,8 @@ * envoy/config/cluster/v3/cluster.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/config/cluster/v3/cluster.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/config/cluster/v3/cluster.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/cluster/v3/cluster.upbdefs.h index fc2d1a98993..17dc4bc74b9 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/cluster/v3/cluster.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/config/cluster/v3/cluster.upbdefs.h @@ -3,7 +3,8 @@ * envoy/config/cluster/v3/cluster.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_CLUSTER_V3_CLUSTER_PROTO_UPBDEFS_H_ #define ENVOY_CONFIG_CLUSTER_V3_CLUSTER_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/config/cluster/v3/filter.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/cluster/v3/filter.upbdefs.c index 725e5954b8e..0ecde5c3db8 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/cluster/v3/filter.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/config/cluster/v3/filter.upbdefs.c @@ -3,7 +3,8 @@ * envoy/config/cluster/v3/filter.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/config/cluster/v3/filter.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/config/cluster/v3/filter.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/cluster/v3/filter.upbdefs.h index 6f95d7ad609..e3ce99adae7 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/cluster/v3/filter.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/config/cluster/v3/filter.upbdefs.h @@ -3,7 +3,8 @@ * envoy/config/cluster/v3/filter.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_CLUSTER_V3_FILTER_PROTO_UPBDEFS_H_ #define ENVOY_CONFIG_CLUSTER_V3_FILTER_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/config/cluster/v3/outlier_detection.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/cluster/v3/outlier_detection.upbdefs.c index d651d3d7ab4..d568d368ece 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/cluster/v3/outlier_detection.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/config/cluster/v3/outlier_detection.upbdefs.c @@ -3,7 +3,8 @@ * envoy/config/cluster/v3/outlier_detection.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/config/cluster/v3/outlier_detection.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/config/cluster/v3/outlier_detection.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/cluster/v3/outlier_detection.upbdefs.h index 2bff86075b8..679f51e2dcf 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/cluster/v3/outlier_detection.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/config/cluster/v3/outlier_detection.upbdefs.h @@ -3,7 +3,8 @@ * envoy/config/cluster/v3/outlier_detection.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_CLUSTER_V3_OUTLIER_DETECTION_PROTO_UPBDEFS_H_ #define ENVOY_CONFIG_CLUSTER_V3_OUTLIER_DETECTION_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/config/common/matcher/v3/matcher.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/common/matcher/v3/matcher.upbdefs.c index 1d703ca43d7..f6414330504 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/common/matcher/v3/matcher.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/config/common/matcher/v3/matcher.upbdefs.c @@ -3,7 +3,8 @@ * envoy/config/common/matcher/v3/matcher.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/config/common/matcher/v3/matcher.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/config/common/matcher/v3/matcher.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/common/matcher/v3/matcher.upbdefs.h index 93f328092b1..0ce406c241e 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/common/matcher/v3/matcher.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/config/common/matcher/v3/matcher.upbdefs.h @@ -3,7 +3,8 @@ * envoy/config/common/matcher/v3/matcher.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_COMMON_MATCHER_V3_MATCHER_PROTO_UPBDEFS_H_ #define ENVOY_CONFIG_COMMON_MATCHER_V3_MATCHER_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/config/core/v3/address.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/core/v3/address.upbdefs.c index 3b0dcf1f4b7..aa06344cde2 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/core/v3/address.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/config/core/v3/address.upbdefs.c @@ -3,7 +3,8 @@ * envoy/config/core/v3/address.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/config/core/v3/address.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/config/core/v3/address.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/core/v3/address.upbdefs.h index 1c4b2d9e165..3a1568bb448 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/core/v3/address.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/config/core/v3/address.upbdefs.h @@ -3,7 +3,8 @@ * envoy/config/core/v3/address.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_CORE_V3_ADDRESS_PROTO_UPBDEFS_H_ #define ENVOY_CONFIG_CORE_V3_ADDRESS_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/config/core/v3/backoff.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/core/v3/backoff.upbdefs.c index 492197f7f79..4d176388145 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/core/v3/backoff.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/config/core/v3/backoff.upbdefs.c @@ -3,7 +3,8 @@ * envoy/config/core/v3/backoff.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/config/core/v3/backoff.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/config/core/v3/backoff.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/core/v3/backoff.upbdefs.h index 5f137d5dda6..b4542e33f0f 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/core/v3/backoff.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/config/core/v3/backoff.upbdefs.h @@ -3,7 +3,8 @@ * envoy/config/core/v3/backoff.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_CORE_V3_BACKOFF_PROTO_UPBDEFS_H_ #define ENVOY_CONFIG_CORE_V3_BACKOFF_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/config/core/v3/base.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/core/v3/base.upbdefs.c index c493343e4c5..1b579ec1120 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/core/v3/base.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/config/core/v3/base.upbdefs.c @@ -3,7 +3,8 @@ * envoy/config/core/v3/base.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/config/core/v3/base.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/config/core/v3/base.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/core/v3/base.upbdefs.h index d70869d290b..e3fea17f1f8 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/core/v3/base.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/config/core/v3/base.upbdefs.h @@ -3,7 +3,8 @@ * envoy/config/core/v3/base.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_CORE_V3_BASE_PROTO_UPBDEFS_H_ #define ENVOY_CONFIG_CORE_V3_BASE_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/config/core/v3/config_source.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/core/v3/config_source.upbdefs.c index 3fc9ea382e5..72a34abf3eb 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/core/v3/config_source.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/config/core/v3/config_source.upbdefs.c @@ -3,7 +3,8 @@ * envoy/config/core/v3/config_source.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/config/core/v3/config_source.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/config/core/v3/config_source.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/core/v3/config_source.upbdefs.h index b43293e7c89..e293a2c7c6a 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/core/v3/config_source.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/config/core/v3/config_source.upbdefs.h @@ -3,7 +3,8 @@ * envoy/config/core/v3/config_source.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_CORE_V3_CONFIG_SOURCE_PROTO_UPBDEFS_H_ #define ENVOY_CONFIG_CORE_V3_CONFIG_SOURCE_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/config/core/v3/event_service_config.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/core/v3/event_service_config.upbdefs.c index 7d691df12fe..af07cc27a95 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/core/v3/event_service_config.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/config/core/v3/event_service_config.upbdefs.c @@ -3,7 +3,8 @@ * envoy/config/core/v3/event_service_config.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/config/core/v3/event_service_config.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/config/core/v3/event_service_config.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/core/v3/event_service_config.upbdefs.h index 0c43abf3aa1..f4aa65ec9d6 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/core/v3/event_service_config.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/config/core/v3/event_service_config.upbdefs.h @@ -3,7 +3,8 @@ * envoy/config/core/v3/event_service_config.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_CORE_V3_EVENT_SERVICE_CONFIG_PROTO_UPBDEFS_H_ #define ENVOY_CONFIG_CORE_V3_EVENT_SERVICE_CONFIG_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/config/core/v3/extension.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/core/v3/extension.upbdefs.c index 119ccab9cb3..49d78558c27 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/core/v3/extension.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/config/core/v3/extension.upbdefs.c @@ -3,7 +3,8 @@ * envoy/config/core/v3/extension.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/config/core/v3/extension.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/config/core/v3/extension.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/core/v3/extension.upbdefs.h index 5eb13eb856d..842d01c009b 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/core/v3/extension.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/config/core/v3/extension.upbdefs.h @@ -3,7 +3,8 @@ * envoy/config/core/v3/extension.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_CORE_V3_EXTENSION_PROTO_UPBDEFS_H_ #define ENVOY_CONFIG_CORE_V3_EXTENSION_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/config/core/v3/grpc_method_list.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/core/v3/grpc_method_list.upbdefs.c index ecccc67a5da..bd186baa92a 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/core/v3/grpc_method_list.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/config/core/v3/grpc_method_list.upbdefs.c @@ -3,7 +3,8 @@ * envoy/config/core/v3/grpc_method_list.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/config/core/v3/grpc_method_list.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/config/core/v3/grpc_method_list.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/core/v3/grpc_method_list.upbdefs.h index 7e041994d33..b0554f4ae27 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/core/v3/grpc_method_list.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/config/core/v3/grpc_method_list.upbdefs.h @@ -3,7 +3,8 @@ * envoy/config/core/v3/grpc_method_list.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_CORE_V3_GRPC_METHOD_LIST_PROTO_UPBDEFS_H_ #define ENVOY_CONFIG_CORE_V3_GRPC_METHOD_LIST_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/config/core/v3/grpc_service.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/core/v3/grpc_service.upbdefs.c index 39e68bb6ba8..d4790600b9f 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/core/v3/grpc_service.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/config/core/v3/grpc_service.upbdefs.c @@ -3,7 +3,8 @@ * envoy/config/core/v3/grpc_service.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/config/core/v3/grpc_service.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/config/core/v3/grpc_service.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/core/v3/grpc_service.upbdefs.h index 3385033fc6e..fa980d36823 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/core/v3/grpc_service.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/config/core/v3/grpc_service.upbdefs.h @@ -3,7 +3,8 @@ * envoy/config/core/v3/grpc_service.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_CORE_V3_GRPC_SERVICE_PROTO_UPBDEFS_H_ #define ENVOY_CONFIG_CORE_V3_GRPC_SERVICE_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/config/core/v3/health_check.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/core/v3/health_check.upbdefs.c index 2d6109ac00e..fd1088dd37b 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/core/v3/health_check.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/config/core/v3/health_check.upbdefs.c @@ -3,7 +3,8 @@ * envoy/config/core/v3/health_check.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/config/core/v3/health_check.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/config/core/v3/health_check.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/core/v3/health_check.upbdefs.h index 5179680294a..7898993f4af 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/core/v3/health_check.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/config/core/v3/health_check.upbdefs.h @@ -3,7 +3,8 @@ * envoy/config/core/v3/health_check.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_CORE_V3_HEALTH_CHECK_PROTO_UPBDEFS_H_ #define ENVOY_CONFIG_CORE_V3_HEALTH_CHECK_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/config/core/v3/http_service.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/core/v3/http_service.upbdefs.c index b285c81b45d..091dfed0ba5 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/core/v3/http_service.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/config/core/v3/http_service.upbdefs.c @@ -3,7 +3,8 @@ * envoy/config/core/v3/http_service.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/config/core/v3/http_service.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/config/core/v3/http_service.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/core/v3/http_service.upbdefs.h index 3584ee913fe..114fda0a208 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/core/v3/http_service.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/config/core/v3/http_service.upbdefs.h @@ -3,7 +3,8 @@ * envoy/config/core/v3/http_service.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_CORE_V3_HTTP_SERVICE_PROTO_UPBDEFS_H_ #define ENVOY_CONFIG_CORE_V3_HTTP_SERVICE_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/config/core/v3/http_uri.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/core/v3/http_uri.upbdefs.c index d8aec228ee6..5ee17726a9f 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/core/v3/http_uri.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/config/core/v3/http_uri.upbdefs.c @@ -3,7 +3,8 @@ * envoy/config/core/v3/http_uri.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/config/core/v3/http_uri.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/config/core/v3/http_uri.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/core/v3/http_uri.upbdefs.h index f4fba06d822..9d70352d97f 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/core/v3/http_uri.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/config/core/v3/http_uri.upbdefs.h @@ -3,7 +3,8 @@ * envoy/config/core/v3/http_uri.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_CORE_V3_HTTP_URI_PROTO_UPBDEFS_H_ #define ENVOY_CONFIG_CORE_V3_HTTP_URI_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/config/core/v3/protocol.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/core/v3/protocol.upbdefs.c index 46aa7784fa0..03947a03073 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/core/v3/protocol.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/config/core/v3/protocol.upbdefs.c @@ -3,7 +3,8 @@ * envoy/config/core/v3/protocol.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/config/core/v3/protocol.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/config/core/v3/protocol.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/core/v3/protocol.upbdefs.h index 67afcb1b07b..dc12ad47b94 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/core/v3/protocol.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/config/core/v3/protocol.upbdefs.h @@ -3,7 +3,8 @@ * envoy/config/core/v3/protocol.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_CORE_V3_PROTOCOL_PROTO_UPBDEFS_H_ #define ENVOY_CONFIG_CORE_V3_PROTOCOL_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/config/core/v3/proxy_protocol.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/core/v3/proxy_protocol.upbdefs.c index 9ddf49f9bc9..3569e78d0b6 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/core/v3/proxy_protocol.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/config/core/v3/proxy_protocol.upbdefs.c @@ -3,7 +3,8 @@ * envoy/config/core/v3/proxy_protocol.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/config/core/v3/proxy_protocol.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/config/core/v3/proxy_protocol.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/core/v3/proxy_protocol.upbdefs.h index 8b63f627a26..2d843bf102f 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/core/v3/proxy_protocol.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/config/core/v3/proxy_protocol.upbdefs.h @@ -3,7 +3,8 @@ * envoy/config/core/v3/proxy_protocol.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_CORE_V3_PROXY_PROTOCOL_PROTO_UPBDEFS_H_ #define ENVOY_CONFIG_CORE_V3_PROXY_PROTOCOL_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/config/core/v3/resolver.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/core/v3/resolver.upbdefs.c index dd563910285..265bf3f5051 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/core/v3/resolver.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/config/core/v3/resolver.upbdefs.c @@ -3,7 +3,8 @@ * envoy/config/core/v3/resolver.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/config/core/v3/resolver.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/config/core/v3/resolver.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/core/v3/resolver.upbdefs.h index d7f76526939..284b06105c8 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/core/v3/resolver.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/config/core/v3/resolver.upbdefs.h @@ -3,7 +3,8 @@ * envoy/config/core/v3/resolver.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_CORE_V3_RESOLVER_PROTO_UPBDEFS_H_ #define ENVOY_CONFIG_CORE_V3_RESOLVER_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/config/core/v3/socket_option.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/core/v3/socket_option.upbdefs.c index 53f3134013a..654594e066a 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/core/v3/socket_option.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/config/core/v3/socket_option.upbdefs.c @@ -3,7 +3,8 @@ * envoy/config/core/v3/socket_option.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/config/core/v3/socket_option.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/config/core/v3/socket_option.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/core/v3/socket_option.upbdefs.h index 94916ee222c..073e0698859 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/core/v3/socket_option.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/config/core/v3/socket_option.upbdefs.h @@ -3,7 +3,8 @@ * envoy/config/core/v3/socket_option.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_CORE_V3_SOCKET_OPTION_PROTO_UPBDEFS_H_ #define ENVOY_CONFIG_CORE_V3_SOCKET_OPTION_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/config/core/v3/substitution_format_string.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/core/v3/substitution_format_string.upbdefs.c index 08af6ee647c..7a9d903d80a 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/core/v3/substitution_format_string.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/config/core/v3/substitution_format_string.upbdefs.c @@ -3,7 +3,8 @@ * envoy/config/core/v3/substitution_format_string.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/config/core/v3/substitution_format_string.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/config/core/v3/substitution_format_string.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/core/v3/substitution_format_string.upbdefs.h index a3a96319fe7..9fdf2a878b2 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/core/v3/substitution_format_string.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/config/core/v3/substitution_format_string.upbdefs.h @@ -3,7 +3,8 @@ * envoy/config/core/v3/substitution_format_string.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_CORE_V3_SUBSTITUTION_FORMAT_STRING_PROTO_UPBDEFS_H_ #define ENVOY_CONFIG_CORE_V3_SUBSTITUTION_FORMAT_STRING_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/config/core/v3/udp_socket_config.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/core/v3/udp_socket_config.upbdefs.c index 4940161ef98..9ad35e746fe 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/core/v3/udp_socket_config.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/config/core/v3/udp_socket_config.upbdefs.c @@ -3,7 +3,8 @@ * envoy/config/core/v3/udp_socket_config.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/config/core/v3/udp_socket_config.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/config/core/v3/udp_socket_config.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/core/v3/udp_socket_config.upbdefs.h index 3bd5424748b..d58de476c71 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/core/v3/udp_socket_config.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/config/core/v3/udp_socket_config.upbdefs.h @@ -3,7 +3,8 @@ * envoy/config/core/v3/udp_socket_config.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_CORE_V3_UDP_SOCKET_CONFIG_PROTO_UPBDEFS_H_ #define ENVOY_CONFIG_CORE_V3_UDP_SOCKET_CONFIG_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/endpoint.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/endpoint.upbdefs.c index b52b451e81d..b5a71e3b113 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/endpoint.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/endpoint.upbdefs.c @@ -3,7 +3,8 @@ * envoy/config/endpoint/v3/endpoint.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/config/endpoint/v3/endpoint.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/endpoint.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/endpoint.upbdefs.h index 753a704b340..93f1ede9d7a 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/endpoint.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/endpoint.upbdefs.h @@ -3,7 +3,8 @@ * envoy/config/endpoint/v3/endpoint.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_PROTO_UPBDEFS_H_ #define ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/endpoint_components.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/endpoint_components.upbdefs.c index c8d984a85c5..8a2df040646 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/endpoint_components.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/endpoint_components.upbdefs.c @@ -3,7 +3,8 @@ * envoy/config/endpoint/v3/endpoint_components.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/config/endpoint/v3/endpoint_components.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/endpoint_components.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/endpoint_components.upbdefs.h index 338470833e5..5c6ce45fec0 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/endpoint_components.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/endpoint_components.upbdefs.h @@ -3,7 +3,8 @@ * envoy/config/endpoint/v3/endpoint_components.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_COMPONENTS_PROTO_UPBDEFS_H_ #define ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_COMPONENTS_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/load_report.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/load_report.upbdefs.c index 3fd20336507..bd37141c12f 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/load_report.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/load_report.upbdefs.c @@ -3,7 +3,8 @@ * envoy/config/endpoint/v3/load_report.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/config/endpoint/v3/load_report.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/load_report.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/load_report.upbdefs.h index f26c2d0ee1d..828c654229b 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/load_report.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/load_report.upbdefs.h @@ -3,7 +3,8 @@ * envoy/config/endpoint/v3/load_report.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_ENDPOINT_V3_LOAD_REPORT_PROTO_UPBDEFS_H_ #define ENVOY_CONFIG_ENDPOINT_V3_LOAD_REPORT_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/config/listener/v3/api_listener.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/listener/v3/api_listener.upbdefs.c index 2404f0fce56..c792fd2143b 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/listener/v3/api_listener.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/config/listener/v3/api_listener.upbdefs.c @@ -3,7 +3,8 @@ * envoy/config/listener/v3/api_listener.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/config/listener/v3/api_listener.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/config/listener/v3/api_listener.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/listener/v3/api_listener.upbdefs.h index 98ba0d6c16c..5f951394091 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/listener/v3/api_listener.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/config/listener/v3/api_listener.upbdefs.h @@ -3,7 +3,8 @@ * envoy/config/listener/v3/api_listener.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_LISTENER_V3_API_LISTENER_PROTO_UPBDEFS_H_ #define ENVOY_CONFIG_LISTENER_V3_API_LISTENER_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/config/listener/v3/listener.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/listener/v3/listener.upbdefs.c index 809842efb0f..5c0c2473c85 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/listener/v3/listener.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/config/listener/v3/listener.upbdefs.c @@ -3,7 +3,8 @@ * envoy/config/listener/v3/listener.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/config/listener/v3/listener.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/config/listener/v3/listener.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/listener/v3/listener.upbdefs.h index f58d9650028..45290231106 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/listener/v3/listener.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/config/listener/v3/listener.upbdefs.h @@ -3,7 +3,8 @@ * envoy/config/listener/v3/listener.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_LISTENER_V3_LISTENER_PROTO_UPBDEFS_H_ #define ENVOY_CONFIG_LISTENER_V3_LISTENER_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/config/listener/v3/listener_components.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/listener/v3/listener_components.upbdefs.c index 575d0a81b46..3325fda7aca 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/listener/v3/listener_components.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/config/listener/v3/listener_components.upbdefs.c @@ -3,7 +3,8 @@ * envoy/config/listener/v3/listener_components.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/config/listener/v3/listener_components.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/config/listener/v3/listener_components.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/listener/v3/listener_components.upbdefs.h index b8ae2ff05cb..aeee7425c9b 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/listener/v3/listener_components.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/config/listener/v3/listener_components.upbdefs.h @@ -3,7 +3,8 @@ * envoy/config/listener/v3/listener_components.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_LISTENER_V3_LISTENER_COMPONENTS_PROTO_UPBDEFS_H_ #define ENVOY_CONFIG_LISTENER_V3_LISTENER_COMPONENTS_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/config/listener/v3/quic_config.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/listener/v3/quic_config.upbdefs.c index 70dc8a2a80d..6b1ce34873f 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/listener/v3/quic_config.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/config/listener/v3/quic_config.upbdefs.c @@ -3,7 +3,8 @@ * envoy/config/listener/v3/quic_config.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/config/listener/v3/quic_config.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/config/listener/v3/quic_config.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/listener/v3/quic_config.upbdefs.h index fd1cbd8f6f8..abf4abd2cc7 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/listener/v3/quic_config.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/config/listener/v3/quic_config.upbdefs.h @@ -3,7 +3,8 @@ * envoy/config/listener/v3/quic_config.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_LISTENER_V3_QUIC_CONFIG_PROTO_UPBDEFS_H_ #define ENVOY_CONFIG_LISTENER_V3_QUIC_CONFIG_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/config/listener/v3/udp_listener_config.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/listener/v3/udp_listener_config.upbdefs.c index f62523979b7..8bf5467494c 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/listener/v3/udp_listener_config.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/config/listener/v3/udp_listener_config.upbdefs.c @@ -3,7 +3,8 @@ * envoy/config/listener/v3/udp_listener_config.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/config/listener/v3/udp_listener_config.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/config/listener/v3/udp_listener_config.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/listener/v3/udp_listener_config.upbdefs.h index 7684ecf4285..38f84076154 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/listener/v3/udp_listener_config.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/config/listener/v3/udp_listener_config.upbdefs.h @@ -3,7 +3,8 @@ * envoy/config/listener/v3/udp_listener_config.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_LISTENER_V3_UDP_LISTENER_CONFIG_PROTO_UPBDEFS_H_ #define ENVOY_CONFIG_LISTENER_V3_UDP_LISTENER_CONFIG_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/config/metrics/v3/metrics_service.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/metrics/v3/metrics_service.upbdefs.c index 1f04a2e5e23..50be86fba6d 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/metrics/v3/metrics_service.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/config/metrics/v3/metrics_service.upbdefs.c @@ -3,7 +3,8 @@ * envoy/config/metrics/v3/metrics_service.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/config/metrics/v3/metrics_service.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/config/metrics/v3/metrics_service.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/metrics/v3/metrics_service.upbdefs.h index ec0ff3ad01b..b44ee354510 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/metrics/v3/metrics_service.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/config/metrics/v3/metrics_service.upbdefs.h @@ -3,7 +3,8 @@ * envoy/config/metrics/v3/metrics_service.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_METRICS_V3_METRICS_SERVICE_PROTO_UPBDEFS_H_ #define ENVOY_CONFIG_METRICS_V3_METRICS_SERVICE_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/config/metrics/v3/stats.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/metrics/v3/stats.upbdefs.c index 6e4a0b0e2ff..69964d78e7e 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/metrics/v3/stats.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/config/metrics/v3/stats.upbdefs.c @@ -3,7 +3,8 @@ * envoy/config/metrics/v3/stats.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/config/metrics/v3/stats.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/config/metrics/v3/stats.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/metrics/v3/stats.upbdefs.h index 0311bd3936e..2c6e83443c3 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/metrics/v3/stats.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/config/metrics/v3/stats.upbdefs.h @@ -3,7 +3,8 @@ * envoy/config/metrics/v3/stats.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_METRICS_V3_STATS_PROTO_UPBDEFS_H_ #define ENVOY_CONFIG_METRICS_V3_STATS_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/config/overload/v3/overload.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/overload/v3/overload.upbdefs.c index 8d91bca08b4..d881e2e7941 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/overload/v3/overload.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/config/overload/v3/overload.upbdefs.c @@ -3,7 +3,8 @@ * envoy/config/overload/v3/overload.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/config/overload/v3/overload.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/config/overload/v3/overload.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/overload/v3/overload.upbdefs.h index d0fd05e222f..22eba2a893c 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/overload/v3/overload.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/config/overload/v3/overload.upbdefs.h @@ -3,7 +3,8 @@ * envoy/config/overload/v3/overload.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_OVERLOAD_V3_OVERLOAD_PROTO_UPBDEFS_H_ #define ENVOY_CONFIG_OVERLOAD_V3_OVERLOAD_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/config/rbac/v3/rbac.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/rbac/v3/rbac.upbdefs.c index c746e848174..7c7f495cd46 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/rbac/v3/rbac.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/config/rbac/v3/rbac.upbdefs.c @@ -3,7 +3,8 @@ * envoy/config/rbac/v3/rbac.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/config/rbac/v3/rbac.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/config/rbac/v3/rbac.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/rbac/v3/rbac.upbdefs.h index e9799208521..96801bf79e8 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/rbac/v3/rbac.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/config/rbac/v3/rbac.upbdefs.h @@ -3,7 +3,8 @@ * envoy/config/rbac/v3/rbac.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_RBAC_V3_RBAC_PROTO_UPBDEFS_H_ #define ENVOY_CONFIG_RBAC_V3_RBAC_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/config/route/v3/route.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/route/v3/route.upbdefs.c index df1ac0bf2fe..72732fb76ba 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/route/v3/route.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/config/route/v3/route.upbdefs.c @@ -3,7 +3,8 @@ * envoy/config/route/v3/route.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/config/route/v3/route.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/config/route/v3/route.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/route/v3/route.upbdefs.h index e84bf0a5836..18f738b2d80 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/route/v3/route.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/config/route/v3/route.upbdefs.h @@ -3,7 +3,8 @@ * envoy/config/route/v3/route.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_ROUTE_V3_ROUTE_PROTO_UPBDEFS_H_ #define ENVOY_CONFIG_ROUTE_V3_ROUTE_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/config/route/v3/route_components.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/route/v3/route_components.upbdefs.c index ad069c6320a..3c6968533d8 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/route/v3/route_components.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/config/route/v3/route_components.upbdefs.c @@ -3,7 +3,8 @@ * envoy/config/route/v3/route_components.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/config/route/v3/route_components.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/config/route/v3/route_components.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/route/v3/route_components.upbdefs.h index 53edbacde4f..6348c5fbb84 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/route/v3/route_components.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/config/route/v3/route_components.upbdefs.h @@ -3,7 +3,8 @@ * envoy/config/route/v3/route_components.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_ROUTE_V3_ROUTE_COMPONENTS_PROTO_UPBDEFS_H_ #define ENVOY_CONFIG_ROUTE_V3_ROUTE_COMPONENTS_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/config/route/v3/scoped_route.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/route/v3/scoped_route.upbdefs.c index 2aae2647e50..38158562946 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/route/v3/scoped_route.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/config/route/v3/scoped_route.upbdefs.c @@ -3,7 +3,8 @@ * envoy/config/route/v3/scoped_route.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/config/route/v3/scoped_route.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/config/route/v3/scoped_route.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/route/v3/scoped_route.upbdefs.h index 3fff779cbcf..acc666b3a02 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/route/v3/scoped_route.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/config/route/v3/scoped_route.upbdefs.h @@ -3,7 +3,8 @@ * envoy/config/route/v3/scoped_route.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_ROUTE_V3_SCOPED_ROUTE_PROTO_UPBDEFS_H_ #define ENVOY_CONFIG_ROUTE_V3_SCOPED_ROUTE_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/config/tap/v3/common.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/tap/v3/common.upbdefs.c index 1c2038af439..95c0bf037b3 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/tap/v3/common.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/config/tap/v3/common.upbdefs.c @@ -3,7 +3,8 @@ * envoy/config/tap/v3/common.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/config/tap/v3/common.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/config/tap/v3/common.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/tap/v3/common.upbdefs.h index 00676cef408..49fae22588e 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/tap/v3/common.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/config/tap/v3/common.upbdefs.h @@ -3,7 +3,8 @@ * envoy/config/tap/v3/common.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_TAP_V3_COMMON_PROTO_UPBDEFS_H_ #define ENVOY_CONFIG_TAP_V3_COMMON_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/config/trace/v3/datadog.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/datadog.upbdefs.c index 75b33079d2e..5475d4b97ba 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/trace/v3/datadog.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/datadog.upbdefs.c @@ -3,7 +3,8 @@ * envoy/config/trace/v3/datadog.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/config/trace/v3/datadog.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/config/trace/v3/datadog.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/datadog.upbdefs.h index 5d8bc2f4d92..e49b1af53f9 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/trace/v3/datadog.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/datadog.upbdefs.h @@ -3,7 +3,8 @@ * envoy/config/trace/v3/datadog.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_TRACE_V3_DATADOG_PROTO_UPBDEFS_H_ #define ENVOY_CONFIG_TRACE_V3_DATADOG_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/config/trace/v3/dynamic_ot.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/dynamic_ot.upbdefs.c index 7d1fb5c03b0..152e6fc3e40 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/trace/v3/dynamic_ot.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/dynamic_ot.upbdefs.c @@ -3,7 +3,8 @@ * envoy/config/trace/v3/dynamic_ot.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/config/trace/v3/dynamic_ot.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/config/trace/v3/dynamic_ot.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/dynamic_ot.upbdefs.h index bfb5cff3a21..3073196c8e5 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/trace/v3/dynamic_ot.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/dynamic_ot.upbdefs.h @@ -3,7 +3,8 @@ * envoy/config/trace/v3/dynamic_ot.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_TRACE_V3_DYNAMIC_OT_PROTO_UPBDEFS_H_ #define ENVOY_CONFIG_TRACE_V3_DYNAMIC_OT_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/config/trace/v3/http_tracer.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/http_tracer.upbdefs.c index 4fad20ab31b..8e91d002e1d 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/trace/v3/http_tracer.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/http_tracer.upbdefs.c @@ -3,7 +3,8 @@ * envoy/config/trace/v3/http_tracer.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/config/trace/v3/http_tracer.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/config/trace/v3/http_tracer.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/http_tracer.upbdefs.h index fb54d05ac52..5b61d6418c9 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/trace/v3/http_tracer.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/http_tracer.upbdefs.h @@ -3,7 +3,8 @@ * envoy/config/trace/v3/http_tracer.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_TRACE_V3_HTTP_TRACER_PROTO_UPBDEFS_H_ #define ENVOY_CONFIG_TRACE_V3_HTTP_TRACER_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/config/trace/v3/lightstep.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/lightstep.upbdefs.c index 59c3c42b5e1..91dfc7dc123 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/trace/v3/lightstep.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/lightstep.upbdefs.c @@ -3,7 +3,8 @@ * envoy/config/trace/v3/lightstep.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/config/trace/v3/lightstep.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/config/trace/v3/lightstep.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/lightstep.upbdefs.h index 81209abd1c1..a315c9b6eef 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/trace/v3/lightstep.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/lightstep.upbdefs.h @@ -3,7 +3,8 @@ * envoy/config/trace/v3/lightstep.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_TRACE_V3_LIGHTSTEP_PROTO_UPBDEFS_H_ #define ENVOY_CONFIG_TRACE_V3_LIGHTSTEP_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/config/trace/v3/opencensus.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/opencensus.upbdefs.c index d105d1ebb7c..4fcb0b48732 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/trace/v3/opencensus.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/opencensus.upbdefs.c @@ -3,7 +3,8 @@ * envoy/config/trace/v3/opencensus.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/config/trace/v3/opencensus.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/config/trace/v3/opencensus.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/opencensus.upbdefs.h index 33d9d7bd06a..4a09a1c624b 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/trace/v3/opencensus.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/opencensus.upbdefs.h @@ -3,7 +3,8 @@ * envoy/config/trace/v3/opencensus.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_TRACE_V3_OPENCENSUS_PROTO_UPBDEFS_H_ #define ENVOY_CONFIG_TRACE_V3_OPENCENSUS_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/config/trace/v3/opentelemetry.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/opentelemetry.upbdefs.c index be624cc1b56..1af22aa59d6 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/trace/v3/opentelemetry.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/opentelemetry.upbdefs.c @@ -3,7 +3,8 @@ * envoy/config/trace/v3/opentelemetry.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/config/trace/v3/opentelemetry.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/config/trace/v3/opentelemetry.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/opentelemetry.upbdefs.h index 1fbe3b5ada8..560d0b9097d 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/trace/v3/opentelemetry.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/opentelemetry.upbdefs.h @@ -3,7 +3,8 @@ * envoy/config/trace/v3/opentelemetry.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_TRACE_V3_OPENTELEMETRY_PROTO_UPBDEFS_H_ #define ENVOY_CONFIG_TRACE_V3_OPENTELEMETRY_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/config/trace/v3/service.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/service.upbdefs.c index 57ab06ee26d..58b0844f624 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/trace/v3/service.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/service.upbdefs.c @@ -3,7 +3,8 @@ * envoy/config/trace/v3/service.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/config/trace/v3/service.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/config/trace/v3/service.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/service.upbdefs.h index 0399bef39c4..22aed73c9b5 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/trace/v3/service.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/service.upbdefs.h @@ -3,7 +3,8 @@ * envoy/config/trace/v3/service.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_TRACE_V3_SERVICE_PROTO_UPBDEFS_H_ #define ENVOY_CONFIG_TRACE_V3_SERVICE_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/config/trace/v3/skywalking.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/skywalking.upbdefs.c index 374827888ef..dca2e5b01aa 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/trace/v3/skywalking.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/skywalking.upbdefs.c @@ -3,7 +3,8 @@ * envoy/config/trace/v3/skywalking.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/config/trace/v3/skywalking.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/config/trace/v3/skywalking.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/skywalking.upbdefs.h index 01e383e5f9e..af1307c53f2 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/trace/v3/skywalking.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/skywalking.upbdefs.h @@ -3,7 +3,8 @@ * envoy/config/trace/v3/skywalking.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_TRACE_V3_SKYWALKING_PROTO_UPBDEFS_H_ #define ENVOY_CONFIG_TRACE_V3_SKYWALKING_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/config/trace/v3/trace.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/trace.upbdefs.c index 8628a6b4b0e..c2be9df0995 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/trace/v3/trace.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/trace.upbdefs.c @@ -3,7 +3,8 @@ * envoy/config/trace/v3/trace.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/config/trace/v3/trace.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/config/trace/v3/trace.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/trace.upbdefs.h index 66de7b73775..0644987fe5d 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/trace/v3/trace.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/trace.upbdefs.h @@ -3,7 +3,8 @@ * envoy/config/trace/v3/trace.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_TRACE_V3_TRACE_PROTO_UPBDEFS_H_ #define ENVOY_CONFIG_TRACE_V3_TRACE_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/config/trace/v3/xray.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/xray.upbdefs.c index 6f1f19c108c..cf495a36e49 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/trace/v3/xray.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/xray.upbdefs.c @@ -3,7 +3,8 @@ * envoy/config/trace/v3/xray.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/config/trace/v3/xray.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/config/trace/v3/xray.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/xray.upbdefs.h index d4065f9b13d..91412241755 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/trace/v3/xray.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/xray.upbdefs.h @@ -3,7 +3,8 @@ * envoy/config/trace/v3/xray.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_TRACE_V3_XRAY_PROTO_UPBDEFS_H_ #define ENVOY_CONFIG_TRACE_V3_XRAY_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/config/trace/v3/zipkin.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/zipkin.upbdefs.c index e1bd00556bb..dcc133ac3ec 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/trace/v3/zipkin.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/zipkin.upbdefs.c @@ -3,7 +3,8 @@ * envoy/config/trace/v3/zipkin.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/config/trace/v3/zipkin.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/config/trace/v3/zipkin.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/zipkin.upbdefs.h index 2814b428c4d..f323ca4be7a 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/trace/v3/zipkin.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/zipkin.upbdefs.h @@ -3,7 +3,8 @@ * envoy/config/trace/v3/zipkin.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_CONFIG_TRACE_V3_ZIPKIN_PROTO_UPBDEFS_H_ #define ENVOY_CONFIG_TRACE_V3_ZIPKIN_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/data/accesslog/v3/accesslog.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/data/accesslog/v3/accesslog.upbdefs.c index afb001724b0..23c28790326 100644 --- a/src/core/ext/upbdefs-gen/envoy/data/accesslog/v3/accesslog.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/data/accesslog/v3/accesslog.upbdefs.c @@ -3,7 +3,8 @@ * envoy/data/accesslog/v3/accesslog.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/data/accesslog/v3/accesslog.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/data/accesslog/v3/accesslog.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/data/accesslog/v3/accesslog.upbdefs.h index 6a32db0efa5..7fe7b4ef496 100644 --- a/src/core/ext/upbdefs-gen/envoy/data/accesslog/v3/accesslog.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/data/accesslog/v3/accesslog.upbdefs.h @@ -3,7 +3,8 @@ * envoy/data/accesslog/v3/accesslog.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_DATA_ACCESSLOG_V3_ACCESSLOG_PROTO_UPBDEFS_H_ #define ENVOY_DATA_ACCESSLOG_V3_ACCESSLOG_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.c index 0e4fc786335..bb36ae650a8 100644 --- a/src/core/ext/upbdefs-gen/envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.c @@ -3,7 +3,8 @@ * envoy/extensions/clusters/aggregate/v3/cluster.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.h index 7d09e77e3e1..ffdbba56020 100644 --- a/src/core/ext/upbdefs-gen/envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.h @@ -3,7 +3,8 @@ * envoy/extensions/clusters/aggregate/v3/cluster.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_EXTENSIONS_CLUSTERS_AGGREGATE_V3_CLUSTER_PROTO_UPBDEFS_H_ #define ENVOY_EXTENSIONS_CLUSTERS_AGGREGATE_V3_CLUSTER_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/extensions/filters/common/fault/v3/fault.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/extensions/filters/common/fault/v3/fault.upbdefs.c index 6ddf9e396cf..7d344d5096c 100644 --- a/src/core/ext/upbdefs-gen/envoy/extensions/filters/common/fault/v3/fault.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/extensions/filters/common/fault/v3/fault.upbdefs.c @@ -3,7 +3,8 @@ * envoy/extensions/filters/common/fault/v3/fault.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/extensions/filters/common/fault/v3/fault.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/extensions/filters/common/fault/v3/fault.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/extensions/filters/common/fault/v3/fault.upbdefs.h index dfcb285481e..51ed4fc400e 100644 --- a/src/core/ext/upbdefs-gen/envoy/extensions/filters/common/fault/v3/fault.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/extensions/filters/common/fault/v3/fault.upbdefs.h @@ -3,7 +3,8 @@ * envoy/extensions/filters/common/fault/v3/fault.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_EXTENSIONS_FILTERS_COMMON_FAULT_V3_FAULT_PROTO_UPBDEFS_H_ #define ENVOY_EXTENSIONS_FILTERS_COMMON_FAULT_V3_FAULT_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/fault/v3/fault.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/fault/v3/fault.upbdefs.c index 27dab7a0e0e..3f773f4686a 100644 --- a/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/fault/v3/fault.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/fault/v3/fault.upbdefs.c @@ -3,7 +3,8 @@ * envoy/extensions/filters/http/fault/v3/fault.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/extensions/filters/http/fault/v3/fault.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/fault/v3/fault.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/fault/v3/fault.upbdefs.h index e613cf2c0a4..8f0eea1ba80 100644 --- a/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/fault/v3/fault.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/fault/v3/fault.upbdefs.h @@ -3,7 +3,8 @@ * envoy/extensions/filters/http/fault/v3/fault.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_EXTENSIONS_FILTERS_HTTP_FAULT_V3_FAULT_PROTO_UPBDEFS_H_ #define ENVOY_EXTENSIONS_FILTERS_HTTP_FAULT_V3_FAULT_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.upbdefs.c index 46edcb75a25..8d2d22cdb39 100644 --- a/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.upbdefs.c @@ -3,7 +3,8 @@ * envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.upbdefs.h index 54b22313e30..9fb2997625c 100644 --- a/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.upbdefs.h @@ -3,7 +3,8 @@ * envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #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_ diff --git a/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/rbac/v3/rbac.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/rbac/v3/rbac.upbdefs.c index 0014dbf9170..6b105a7f8f7 100644 --- a/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/rbac/v3/rbac.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/rbac/v3/rbac.upbdefs.c @@ -3,7 +3,8 @@ * envoy/extensions/filters/http/rbac/v3/rbac.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/extensions/filters/http/rbac/v3/rbac.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/rbac/v3/rbac.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/rbac/v3/rbac.upbdefs.h index a45351eb6e9..6bb640ef2d0 100644 --- a/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/rbac/v3/rbac.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/rbac/v3/rbac.upbdefs.h @@ -3,7 +3,8 @@ * envoy/extensions/filters/http/rbac/v3/rbac.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_EXTENSIONS_FILTERS_HTTP_RBAC_V3_RBAC_PROTO_UPBDEFS_H_ #define ENVOY_EXTENSIONS_FILTERS_HTTP_RBAC_V3_RBAC_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/router/v3/router.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/router/v3/router.upbdefs.c index ca3010adadd..4258538f841 100644 --- a/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/router/v3/router.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/router/v3/router.upbdefs.c @@ -3,7 +3,8 @@ * envoy/extensions/filters/http/router/v3/router.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/extensions/filters/http/router/v3/router.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/router/v3/router.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/router/v3/router.upbdefs.h index 4ba3cc5b461..420ae5b5f6c 100644 --- a/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/router/v3/router.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/router/v3/router.upbdefs.h @@ -3,7 +3,8 @@ * envoy/extensions/filters/http/router/v3/router.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_EXTENSIONS_FILTERS_HTTP_ROUTER_V3_ROUTER_PROTO_UPBDEFS_H_ #define ENVOY_EXTENSIONS_FILTERS_HTTP_ROUTER_V3_ROUTER_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upbdefs.c index 1ac52efcb13..6bfb83039df 100644 --- a/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upbdefs.c @@ -3,7 +3,8 @@ * envoy/extensions/filters/http/stateful_session/v3/stateful_session.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/extensions/filters/http/stateful_session/v3/stateful_session.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upbdefs.h index 5f1add6cd7f..9cd7a7b851b 100644 --- a/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upbdefs.h @@ -3,7 +3,8 @@ * envoy/extensions/filters/http/stateful_session/v3/stateful_session.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_EXTENSIONS_FILTERS_HTTP_STATEFUL_SESSION_V3_STATEFUL_SESSION_PROTO_UPBDEFS_H_ #define ENVOY_EXTENSIONS_FILTERS_HTTP_STATEFUL_SESSION_V3_STATEFUL_SESSION_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.c index 80b0d317335..3510f1cb268 100644 --- a/src/core/ext/upbdefs-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.c @@ -3,7 +3,8 @@ * envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.h index 566735d287a..3cc2dcb9bf4 100644 --- a/src/core/ext/upbdefs-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.h @@ -3,7 +3,8 @@ * envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_EXTENSIONS_FILTERS_NETWORK_HTTP_CONNECTION_MANAGER_V3_HTTP_CONNECTION_MANAGER_PROTO_UPBDEFS_H_ #define ENVOY_EXTENSIONS_FILTERS_NETWORK_HTTP_CONNECTION_MANAGER_V3_HTTP_CONNECTION_MANAGER_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upbdefs.c index 54427e9234c..d77c69830b4 100644 --- a/src/core/ext/upbdefs-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upbdefs.c @@ -3,7 +3,8 @@ * envoy/extensions/http/stateful_session/cookie/v3/cookie.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/extensions/http/stateful_session/cookie/v3/cookie.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upbdefs.h index fb51cd8b24b..c5703f3ca4a 100644 --- a/src/core/ext/upbdefs-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upbdefs.h @@ -3,7 +3,8 @@ * envoy/extensions/http/stateful_session/cookie/v3/cookie.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_EXTENSIONS_HTTP_STATEFUL_SESSION_COOKIE_V3_COOKIE_PROTO_UPBDEFS_H_ #define ENVOY_EXTENSIONS_HTTP_STATEFUL_SESSION_COOKIE_V3_COOKIE_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.c index 5f6ce4bef03..3340a45a56d 100644 --- a/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.c @@ -3,7 +3,8 @@ * envoy/extensions/transport_sockets/tls/v3/cert.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.h index d55b484141c..634f858589b 100644 --- a/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.h @@ -3,7 +3,8 @@ * envoy/extensions/transport_sockets/tls/v3/cert.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_CERT_PROTO_UPBDEFS_H_ #define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_CERT_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.c index 660411ac668..568f65370f6 100644 --- a/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.c @@ -3,7 +3,8 @@ * envoy/extensions/transport_sockets/tls/v3/common.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/extensions/transport_sockets/tls/v3/common.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.h index ad7fddf34e8..ef90ade193c 100644 --- a/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.h @@ -3,7 +3,8 @@ * envoy/extensions/transport_sockets/tls/v3/common.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_COMMON_PROTO_UPBDEFS_H_ #define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_COMMON_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.c index b4fa286c307..0fcb7ae7eb8 100644 --- a/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.c @@ -3,7 +3,8 @@ * envoy/extensions/transport_sockets/tls/v3/secret.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.h index acd4beb5ce1..4ebda2bf46e 100644 --- a/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.h @@ -3,7 +3,8 @@ * envoy/extensions/transport_sockets/tls/v3/secret.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_SECRET_PROTO_UPBDEFS_H_ #define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_SECRET_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.c index 8364d7e1edc..d3fb5fdbad9 100644 --- a/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.c @@ -3,7 +3,8 @@ * envoy/extensions/transport_sockets/tls/v3/tls.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.h index 41c7b88cc74..14da9a82c7b 100644 --- a/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.h @@ -3,7 +3,8 @@ * envoy/extensions/transport_sockets/tls/v3/tls.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_TLS_PROTO_UPBDEFS_H_ #define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_TLS_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upbdefs.c index 8c18a00c0f5..55eab8facca 100644 --- a/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upbdefs.c @@ -3,7 +3,8 @@ * envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upbdefs.h index 223affd4275..f8a6167936c 100644 --- a/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upbdefs.h @@ -3,7 +3,8 @@ * envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_TLS_SPIFFE_VALIDATOR_CONFIG_PROTO_UPBDEFS_H_ #define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_TLS_SPIFFE_VALIDATOR_CONFIG_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/extensions/upstreams/http/v3/http_protocol_options.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/extensions/upstreams/http/v3/http_protocol_options.upbdefs.c index 1f40ce54ae4..403bb7496d0 100644 --- a/src/core/ext/upbdefs-gen/envoy/extensions/upstreams/http/v3/http_protocol_options.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/extensions/upstreams/http/v3/http_protocol_options.upbdefs.c @@ -3,7 +3,8 @@ * envoy/extensions/upstreams/http/v3/http_protocol_options.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/extensions/upstreams/http/v3/http_protocol_options.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/extensions/upstreams/http/v3/http_protocol_options.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/extensions/upstreams/http/v3/http_protocol_options.upbdefs.h index 69aee159ad3..b7d2ff3bb3c 100644 --- a/src/core/ext/upbdefs-gen/envoy/extensions/upstreams/http/v3/http_protocol_options.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/extensions/upstreams/http/v3/http_protocol_options.upbdefs.h @@ -3,7 +3,8 @@ * envoy/extensions/upstreams/http/v3/http_protocol_options.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_EXTENSIONS_UPSTREAMS_HTTP_V3_HTTP_PROTOCOL_OPTIONS_PROTO_UPBDEFS_H_ #define ENVOY_EXTENSIONS_UPSTREAMS_HTTP_V3_HTTP_PROTOCOL_OPTIONS_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/service/discovery/v3/ads.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/service/discovery/v3/ads.upbdefs.c index 1b1ae9f0928..39248072e63 100644 --- a/src/core/ext/upbdefs-gen/envoy/service/discovery/v3/ads.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/service/discovery/v3/ads.upbdefs.c @@ -3,7 +3,8 @@ * envoy/service/discovery/v3/ads.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/service/discovery/v3/ads.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/service/discovery/v3/ads.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/service/discovery/v3/ads.upbdefs.h index 44fa0bffb3f..730b46139c2 100644 --- a/src/core/ext/upbdefs-gen/envoy/service/discovery/v3/ads.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/service/discovery/v3/ads.upbdefs.h @@ -3,7 +3,8 @@ * envoy/service/discovery/v3/ads.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_SERVICE_DISCOVERY_V3_ADS_PROTO_UPBDEFS_H_ #define ENVOY_SERVICE_DISCOVERY_V3_ADS_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/service/discovery/v3/discovery.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/service/discovery/v3/discovery.upbdefs.c index 0ba9e04f386..8879e0a5d36 100644 --- a/src/core/ext/upbdefs-gen/envoy/service/discovery/v3/discovery.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/service/discovery/v3/discovery.upbdefs.c @@ -3,7 +3,8 @@ * envoy/service/discovery/v3/discovery.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/service/discovery/v3/discovery.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/service/discovery/v3/discovery.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/service/discovery/v3/discovery.upbdefs.h index 5813df69d5e..649abd28873 100644 --- a/src/core/ext/upbdefs-gen/envoy/service/discovery/v3/discovery.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/service/discovery/v3/discovery.upbdefs.h @@ -3,7 +3,8 @@ * envoy/service/discovery/v3/discovery.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_SERVICE_DISCOVERY_V3_DISCOVERY_PROTO_UPBDEFS_H_ #define ENVOY_SERVICE_DISCOVERY_V3_DISCOVERY_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/service/load_stats/v3/lrs.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/service/load_stats/v3/lrs.upbdefs.c index 033b3d61a49..b5982145c38 100644 --- a/src/core/ext/upbdefs-gen/envoy/service/load_stats/v3/lrs.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/service/load_stats/v3/lrs.upbdefs.c @@ -3,7 +3,8 @@ * envoy/service/load_stats/v3/lrs.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/service/load_stats/v3/lrs.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/service/load_stats/v3/lrs.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/service/load_stats/v3/lrs.upbdefs.h index 5e704abf71a..f2ee7fad417 100644 --- a/src/core/ext/upbdefs-gen/envoy/service/load_stats/v3/lrs.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/service/load_stats/v3/lrs.upbdefs.h @@ -3,7 +3,8 @@ * envoy/service/load_stats/v3/lrs.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_SERVICE_LOAD_STATS_V3_LRS_PROTO_UPBDEFS_H_ #define ENVOY_SERVICE_LOAD_STATS_V3_LRS_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/service/status/v3/csds.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/service/status/v3/csds.upbdefs.c index 544f267a743..f51a147df4e 100644 --- a/src/core/ext/upbdefs-gen/envoy/service/status/v3/csds.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/service/status/v3/csds.upbdefs.c @@ -3,7 +3,8 @@ * envoy/service/status/v3/csds.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/service/status/v3/csds.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/service/status/v3/csds.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/service/status/v3/csds.upbdefs.h index 2e27fc55f14..4e77cf039b2 100644 --- a/src/core/ext/upbdefs-gen/envoy/service/status/v3/csds.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/service/status/v3/csds.upbdefs.h @@ -3,7 +3,8 @@ * envoy/service/status/v3/csds.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_SERVICE_STATUS_V3_CSDS_PROTO_UPBDEFS_H_ #define ENVOY_SERVICE_STATUS_V3_CSDS_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/type/http/v3/cookie.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/type/http/v3/cookie.upbdefs.c index 5895d44efee..3e41c35f09c 100644 --- a/src/core/ext/upbdefs-gen/envoy/type/http/v3/cookie.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/type/http/v3/cookie.upbdefs.c @@ -3,7 +3,8 @@ * envoy/type/http/v3/cookie.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/type/http/v3/cookie.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/type/http/v3/cookie.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/type/http/v3/cookie.upbdefs.h index b0ab17669f2..28494f58c6d 100644 --- a/src/core/ext/upbdefs-gen/envoy/type/http/v3/cookie.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/type/http/v3/cookie.upbdefs.h @@ -3,7 +3,8 @@ * envoy/type/http/v3/cookie.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_TYPE_HTTP_V3_COOKIE_PROTO_UPBDEFS_H_ #define ENVOY_TYPE_HTTP_V3_COOKIE_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/type/http/v3/path_transformation.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/type/http/v3/path_transformation.upbdefs.c index d897eae71fd..d98892bd554 100644 --- a/src/core/ext/upbdefs-gen/envoy/type/http/v3/path_transformation.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/type/http/v3/path_transformation.upbdefs.c @@ -3,7 +3,8 @@ * envoy/type/http/v3/path_transformation.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/type/http/v3/path_transformation.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/type/http/v3/path_transformation.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/type/http/v3/path_transformation.upbdefs.h index b87bb5ccad6..13260845d56 100644 --- a/src/core/ext/upbdefs-gen/envoy/type/http/v3/path_transformation.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/type/http/v3/path_transformation.upbdefs.h @@ -3,7 +3,8 @@ * envoy/type/http/v3/path_transformation.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_TYPE_HTTP_V3_PATH_TRANSFORMATION_PROTO_UPBDEFS_H_ #define ENVOY_TYPE_HTTP_V3_PATH_TRANSFORMATION_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/filter_state.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/filter_state.upbdefs.c index 2f54b89fc29..9ef7a1c5599 100644 --- a/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/filter_state.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/filter_state.upbdefs.c @@ -3,7 +3,8 @@ * envoy/type/matcher/v3/filter_state.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/type/matcher/v3/filter_state.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/filter_state.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/filter_state.upbdefs.h index 77751d27dda..ecd8b20929d 100644 --- a/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/filter_state.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/filter_state.upbdefs.h @@ -3,7 +3,8 @@ * envoy/type/matcher/v3/filter_state.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_TYPE_MATCHER_V3_FILTER_STATE_PROTO_UPBDEFS_H_ #define ENVOY_TYPE_MATCHER_V3_FILTER_STATE_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/http_inputs.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/http_inputs.upbdefs.c index b4f053fd760..0c6074ad2f3 100644 --- a/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/http_inputs.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/http_inputs.upbdefs.c @@ -3,7 +3,8 @@ * envoy/type/matcher/v3/http_inputs.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/type/matcher/v3/http_inputs.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/http_inputs.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/http_inputs.upbdefs.h index a4a8f661791..62ed58f66b2 100644 --- a/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/http_inputs.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/http_inputs.upbdefs.h @@ -3,7 +3,8 @@ * envoy/type/matcher/v3/http_inputs.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPBDEFS_H_ #define ENVOY_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/metadata.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/metadata.upbdefs.c index 204b8b71f7d..e53083907db 100644 --- a/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/metadata.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/metadata.upbdefs.c @@ -3,7 +3,8 @@ * envoy/type/matcher/v3/metadata.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/type/matcher/v3/metadata.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/metadata.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/metadata.upbdefs.h index 90e7d8b03b6..c2831b1b5a8 100644 --- a/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/metadata.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/metadata.upbdefs.h @@ -3,7 +3,8 @@ * envoy/type/matcher/v3/metadata.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_TYPE_MATCHER_V3_METADATA_PROTO_UPBDEFS_H_ #define ENVOY_TYPE_MATCHER_V3_METADATA_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/node.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/node.upbdefs.c index 827b8bdab62..a0f49d82ae6 100644 --- a/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/node.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/node.upbdefs.c @@ -3,7 +3,8 @@ * envoy/type/matcher/v3/node.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/type/matcher/v3/node.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/node.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/node.upbdefs.h index 948e29847f5..8c18041a1b0 100644 --- a/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/node.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/node.upbdefs.h @@ -3,7 +3,8 @@ * envoy/type/matcher/v3/node.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_TYPE_MATCHER_V3_NODE_PROTO_UPBDEFS_H_ #define ENVOY_TYPE_MATCHER_V3_NODE_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/number.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/number.upbdefs.c index 4f5a781f00b..fa72dc2e37a 100644 --- a/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/number.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/number.upbdefs.c @@ -3,7 +3,8 @@ * envoy/type/matcher/v3/number.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/type/matcher/v3/number.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/number.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/number.upbdefs.h index ede9f5de25a..7e8a4278473 100644 --- a/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/number.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/number.upbdefs.h @@ -3,7 +3,8 @@ * envoy/type/matcher/v3/number.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_TYPE_MATCHER_V3_NUMBER_PROTO_UPBDEFS_H_ #define ENVOY_TYPE_MATCHER_V3_NUMBER_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/path.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/path.upbdefs.c index edd2b67f40b..f07a090d3c2 100644 --- a/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/path.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/path.upbdefs.c @@ -3,7 +3,8 @@ * envoy/type/matcher/v3/path.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/type/matcher/v3/path.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/path.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/path.upbdefs.h index 80b0a11f414..f4d647ee542 100644 --- a/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/path.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/path.upbdefs.h @@ -3,7 +3,8 @@ * envoy/type/matcher/v3/path.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_TYPE_MATCHER_V3_PATH_PROTO_UPBDEFS_H_ #define ENVOY_TYPE_MATCHER_V3_PATH_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/regex.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/regex.upbdefs.c index 1ddda7e27aa..89c98f9b194 100644 --- a/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/regex.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/regex.upbdefs.c @@ -3,7 +3,8 @@ * envoy/type/matcher/v3/regex.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/type/matcher/v3/regex.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/regex.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/regex.upbdefs.h index 3a96979775c..94b570b58a2 100644 --- a/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/regex.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/regex.upbdefs.h @@ -3,7 +3,8 @@ * envoy/type/matcher/v3/regex.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_TYPE_MATCHER_V3_REGEX_PROTO_UPBDEFS_H_ #define ENVOY_TYPE_MATCHER_V3_REGEX_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/status_code_input.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/status_code_input.upbdefs.c index 97f4f8de8cf..13ffbcff90c 100644 --- a/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/status_code_input.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/status_code_input.upbdefs.c @@ -3,7 +3,8 @@ * envoy/type/matcher/v3/status_code_input.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/type/matcher/v3/status_code_input.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/status_code_input.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/status_code_input.upbdefs.h index a18438ffb71..cb2836d783e 100644 --- a/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/status_code_input.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/status_code_input.upbdefs.h @@ -3,7 +3,8 @@ * envoy/type/matcher/v3/status_code_input.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_TYPE_MATCHER_V3_STATUS_CODE_INPUT_PROTO_UPBDEFS_H_ #define ENVOY_TYPE_MATCHER_V3_STATUS_CODE_INPUT_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/string.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/string.upbdefs.c index 22d52355f6d..cd81e176b6b 100644 --- a/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/string.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/string.upbdefs.c @@ -3,7 +3,8 @@ * envoy/type/matcher/v3/string.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/type/matcher/v3/string.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/string.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/string.upbdefs.h index 6de161bdd95..d090589f275 100644 --- a/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/string.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/string.upbdefs.h @@ -3,7 +3,8 @@ * envoy/type/matcher/v3/string.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_TYPE_MATCHER_V3_STRING_PROTO_UPBDEFS_H_ #define ENVOY_TYPE_MATCHER_V3_STRING_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/struct.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/struct.upbdefs.c index 34db3612251..53c27e9e84c 100644 --- a/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/struct.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/struct.upbdefs.c @@ -3,7 +3,8 @@ * envoy/type/matcher/v3/struct.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/type/matcher/v3/struct.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/struct.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/struct.upbdefs.h index 484393c39d8..ddfb4de79c2 100644 --- a/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/struct.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/struct.upbdefs.h @@ -3,7 +3,8 @@ * envoy/type/matcher/v3/struct.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_TYPE_MATCHER_V3_STRUCT_PROTO_UPBDEFS_H_ #define ENVOY_TYPE_MATCHER_V3_STRUCT_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/value.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/value.upbdefs.c index 462a3ab356a..0891ad5fada 100644 --- a/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/value.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/value.upbdefs.c @@ -3,7 +3,8 @@ * envoy/type/matcher/v3/value.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/type/matcher/v3/value.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/value.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/value.upbdefs.h index 7bb8eb92c8c..12087eebc47 100644 --- a/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/value.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/value.upbdefs.h @@ -3,7 +3,8 @@ * envoy/type/matcher/v3/value.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_TYPE_MATCHER_V3_VALUE_PROTO_UPBDEFS_H_ #define ENVOY_TYPE_MATCHER_V3_VALUE_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/type/metadata/v3/metadata.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/type/metadata/v3/metadata.upbdefs.c index 3d48afd746d..facf82dcfbf 100644 --- a/src/core/ext/upbdefs-gen/envoy/type/metadata/v3/metadata.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/type/metadata/v3/metadata.upbdefs.c @@ -3,7 +3,8 @@ * envoy/type/metadata/v3/metadata.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/type/metadata/v3/metadata.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/type/metadata/v3/metadata.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/type/metadata/v3/metadata.upbdefs.h index e68e4edb16b..8360c54106e 100644 --- a/src/core/ext/upbdefs-gen/envoy/type/metadata/v3/metadata.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/type/metadata/v3/metadata.upbdefs.h @@ -3,7 +3,8 @@ * envoy/type/metadata/v3/metadata.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_TYPE_METADATA_V3_METADATA_PROTO_UPBDEFS_H_ #define ENVOY_TYPE_METADATA_V3_METADATA_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/type/tracing/v3/custom_tag.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/type/tracing/v3/custom_tag.upbdefs.c index 3f6701f1d10..58f61cdf19c 100644 --- a/src/core/ext/upbdefs-gen/envoy/type/tracing/v3/custom_tag.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/type/tracing/v3/custom_tag.upbdefs.c @@ -3,7 +3,8 @@ * envoy/type/tracing/v3/custom_tag.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/type/tracing/v3/custom_tag.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/type/tracing/v3/custom_tag.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/type/tracing/v3/custom_tag.upbdefs.h index 78bd04270f9..28aefb3e92d 100644 --- a/src/core/ext/upbdefs-gen/envoy/type/tracing/v3/custom_tag.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/type/tracing/v3/custom_tag.upbdefs.h @@ -3,7 +3,8 @@ * envoy/type/tracing/v3/custom_tag.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_TYPE_TRACING_V3_CUSTOM_TAG_PROTO_UPBDEFS_H_ #define ENVOY_TYPE_TRACING_V3_CUSTOM_TAG_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/type/v3/hash_policy.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/type/v3/hash_policy.upbdefs.c index c5f17553bf5..2c0fc3636a8 100644 --- a/src/core/ext/upbdefs-gen/envoy/type/v3/hash_policy.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/type/v3/hash_policy.upbdefs.c @@ -3,7 +3,8 @@ * envoy/type/v3/hash_policy.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/type/v3/hash_policy.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/type/v3/hash_policy.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/type/v3/hash_policy.upbdefs.h index 30dcd32e907..e290910b287 100644 --- a/src/core/ext/upbdefs-gen/envoy/type/v3/hash_policy.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/type/v3/hash_policy.upbdefs.h @@ -3,7 +3,8 @@ * envoy/type/v3/hash_policy.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_TYPE_V3_HASH_POLICY_PROTO_UPBDEFS_H_ #define ENVOY_TYPE_V3_HASH_POLICY_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/type/v3/http.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/type/v3/http.upbdefs.c index 045af7c785e..1c544053087 100644 --- a/src/core/ext/upbdefs-gen/envoy/type/v3/http.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/type/v3/http.upbdefs.c @@ -3,7 +3,8 @@ * envoy/type/v3/http.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/type/v3/http.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/type/v3/http.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/type/v3/http.upbdefs.h index 195b8682aba..449007fde84 100644 --- a/src/core/ext/upbdefs-gen/envoy/type/v3/http.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/type/v3/http.upbdefs.h @@ -3,7 +3,8 @@ * envoy/type/v3/http.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_TYPE_V3_HTTP_PROTO_UPBDEFS_H_ #define ENVOY_TYPE_V3_HTTP_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/type/v3/http_status.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/type/v3/http_status.upbdefs.c index f62b1e213ef..766fc5db710 100644 --- a/src/core/ext/upbdefs-gen/envoy/type/v3/http_status.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/type/v3/http_status.upbdefs.c @@ -3,7 +3,8 @@ * envoy/type/v3/http_status.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/type/v3/http_status.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/type/v3/http_status.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/type/v3/http_status.upbdefs.h index 951d4f9c283..d6e625abd31 100644 --- a/src/core/ext/upbdefs-gen/envoy/type/v3/http_status.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/type/v3/http_status.upbdefs.h @@ -3,7 +3,8 @@ * envoy/type/v3/http_status.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_TYPE_V3_HTTP_STATUS_PROTO_UPBDEFS_H_ #define ENVOY_TYPE_V3_HTTP_STATUS_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/type/v3/percent.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/type/v3/percent.upbdefs.c index dbef106d9c6..1719b4cd931 100644 --- a/src/core/ext/upbdefs-gen/envoy/type/v3/percent.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/type/v3/percent.upbdefs.c @@ -3,7 +3,8 @@ * envoy/type/v3/percent.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/type/v3/percent.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/type/v3/percent.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/type/v3/percent.upbdefs.h index 793cacf578f..02dc9e0e9ac 100644 --- a/src/core/ext/upbdefs-gen/envoy/type/v3/percent.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/type/v3/percent.upbdefs.h @@ -3,7 +3,8 @@ * envoy/type/v3/percent.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_TYPE_V3_PERCENT_PROTO_UPBDEFS_H_ #define ENVOY_TYPE_V3_PERCENT_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/type/v3/range.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/type/v3/range.upbdefs.c index 6e182349d1a..3ff793d8d64 100644 --- a/src/core/ext/upbdefs-gen/envoy/type/v3/range.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/type/v3/range.upbdefs.c @@ -3,7 +3,8 @@ * envoy/type/v3/range.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/type/v3/range.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/type/v3/range.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/type/v3/range.upbdefs.h index 333361f8168..c62b7ab0510 100644 --- a/src/core/ext/upbdefs-gen/envoy/type/v3/range.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/type/v3/range.upbdefs.h @@ -3,7 +3,8 @@ * envoy/type/v3/range.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_TYPE_V3_RANGE_PROTO_UPBDEFS_H_ #define ENVOY_TYPE_V3_RANGE_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/type/v3/ratelimit_strategy.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/type/v3/ratelimit_strategy.upbdefs.c index 77a3cf2857f..fa1b54ca935 100644 --- a/src/core/ext/upbdefs-gen/envoy/type/v3/ratelimit_strategy.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/type/v3/ratelimit_strategy.upbdefs.c @@ -3,7 +3,8 @@ * envoy/type/v3/ratelimit_strategy.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/type/v3/ratelimit_strategy.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/type/v3/ratelimit_strategy.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/type/v3/ratelimit_strategy.upbdefs.h index 3d027bf0934..b0d74d3939e 100644 --- a/src/core/ext/upbdefs-gen/envoy/type/v3/ratelimit_strategy.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/type/v3/ratelimit_strategy.upbdefs.h @@ -3,7 +3,8 @@ * envoy/type/v3/ratelimit_strategy.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_TYPE_V3_RATELIMIT_STRATEGY_PROTO_UPBDEFS_H_ #define ENVOY_TYPE_V3_RATELIMIT_STRATEGY_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/type/v3/ratelimit_unit.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/type/v3/ratelimit_unit.upbdefs.c index bef953604ff..ab6208a039b 100644 --- a/src/core/ext/upbdefs-gen/envoy/type/v3/ratelimit_unit.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/type/v3/ratelimit_unit.upbdefs.c @@ -3,7 +3,8 @@ * envoy/type/v3/ratelimit_unit.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/type/v3/ratelimit_unit.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/type/v3/ratelimit_unit.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/type/v3/ratelimit_unit.upbdefs.h index d749b34249b..5bf08976161 100644 --- a/src/core/ext/upbdefs-gen/envoy/type/v3/ratelimit_unit.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/type/v3/ratelimit_unit.upbdefs.h @@ -3,7 +3,8 @@ * envoy/type/v3/ratelimit_unit.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_TYPE_V3_RATELIMIT_UNIT_PROTO_UPBDEFS_H_ #define ENVOY_TYPE_V3_RATELIMIT_UNIT_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/type/v3/semantic_version.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/type/v3/semantic_version.upbdefs.c index 386cda22638..3d6035402f8 100644 --- a/src/core/ext/upbdefs-gen/envoy/type/v3/semantic_version.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/type/v3/semantic_version.upbdefs.c @@ -3,7 +3,8 @@ * envoy/type/v3/semantic_version.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/type/v3/semantic_version.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/type/v3/semantic_version.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/type/v3/semantic_version.upbdefs.h index 48404dcdab3..ff79caa0d42 100644 --- a/src/core/ext/upbdefs-gen/envoy/type/v3/semantic_version.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/type/v3/semantic_version.upbdefs.h @@ -3,7 +3,8 @@ * envoy/type/v3/semantic_version.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_TYPE_V3_SEMANTIC_VERSION_PROTO_UPBDEFS_H_ #define ENVOY_TYPE_V3_SEMANTIC_VERSION_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/envoy/type/v3/token_bucket.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/type/v3/token_bucket.upbdefs.c index 847262b4439..e2e37d0edd6 100644 --- a/src/core/ext/upbdefs-gen/envoy/type/v3/token_bucket.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/type/v3/token_bucket.upbdefs.c @@ -3,7 +3,8 @@ * envoy/type/v3/token_bucket.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "envoy/type/v3/token_bucket.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/envoy/type/v3/token_bucket.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/type/v3/token_bucket.upbdefs.h index 5048bb050ff..e80d50e4b9e 100644 --- a/src/core/ext/upbdefs-gen/envoy/type/v3/token_bucket.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/type/v3/token_bucket.upbdefs.h @@ -3,7 +3,8 @@ * envoy/type/v3/token_bucket.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef ENVOY_TYPE_V3_TOKEN_BUCKET_PROTO_UPBDEFS_H_ #define ENVOY_TYPE_V3_TOKEN_BUCKET_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/google/api/annotations.upbdefs.c b/src/core/ext/upbdefs-gen/google/api/annotations.upbdefs.c index 56e65c853f3..f5e32c85398 100644 --- a/src/core/ext/upbdefs-gen/google/api/annotations.upbdefs.c +++ b/src/core/ext/upbdefs-gen/google/api/annotations.upbdefs.c @@ -3,7 +3,8 @@ * google/api/annotations.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "google/api/annotations.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/google/api/annotations.upbdefs.h b/src/core/ext/upbdefs-gen/google/api/annotations.upbdefs.h index bc7b29adcad..7939a4f327b 100644 --- a/src/core/ext/upbdefs-gen/google/api/annotations.upbdefs.h +++ b/src/core/ext/upbdefs-gen/google/api/annotations.upbdefs.h @@ -3,7 +3,8 @@ * google/api/annotations.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef GOOGLE_API_ANNOTATIONS_PROTO_UPBDEFS_H_ #define GOOGLE_API_ANNOTATIONS_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/checked.upbdefs.c b/src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/checked.upbdefs.c index a973925933f..f119f2e30a1 100644 --- a/src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/checked.upbdefs.c +++ b/src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/checked.upbdefs.c @@ -3,7 +3,8 @@ * google/api/expr/v1alpha1/checked.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "google/api/expr/v1alpha1/checked.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/checked.upbdefs.h b/src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/checked.upbdefs.h index 868f18201a4..dd9f8a068be 100644 --- a/src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/checked.upbdefs.h +++ b/src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/checked.upbdefs.h @@ -3,7 +3,8 @@ * google/api/expr/v1alpha1/checked.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef GOOGLE_API_EXPR_V1ALPHA1_CHECKED_PROTO_UPBDEFS_H_ #define GOOGLE_API_EXPR_V1ALPHA1_CHECKED_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/syntax.upbdefs.c b/src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/syntax.upbdefs.c index bdf128c4c35..d6cc6e5918b 100644 --- a/src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/syntax.upbdefs.c +++ b/src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/syntax.upbdefs.c @@ -3,7 +3,8 @@ * google/api/expr/v1alpha1/syntax.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "google/api/expr/v1alpha1/syntax.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/syntax.upbdefs.h b/src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/syntax.upbdefs.h index f2c9ce39127..01c1211561f 100644 --- a/src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/syntax.upbdefs.h +++ b/src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/syntax.upbdefs.h @@ -3,7 +3,8 @@ * google/api/expr/v1alpha1/syntax.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef GOOGLE_API_EXPR_V1ALPHA1_SYNTAX_PROTO_UPBDEFS_H_ #define GOOGLE_API_EXPR_V1ALPHA1_SYNTAX_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/google/api/http.upbdefs.c b/src/core/ext/upbdefs-gen/google/api/http.upbdefs.c index af8bd971772..1e358643daa 100644 --- a/src/core/ext/upbdefs-gen/google/api/http.upbdefs.c +++ b/src/core/ext/upbdefs-gen/google/api/http.upbdefs.c @@ -3,7 +3,8 @@ * google/api/http.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "google/api/http.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/google/api/http.upbdefs.h b/src/core/ext/upbdefs-gen/google/api/http.upbdefs.h index ee0f16663f3..6af505cfeed 100644 --- a/src/core/ext/upbdefs-gen/google/api/http.upbdefs.h +++ b/src/core/ext/upbdefs-gen/google/api/http.upbdefs.h @@ -3,7 +3,8 @@ * google/api/http.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef GOOGLE_API_HTTP_PROTO_UPBDEFS_H_ #define GOOGLE_API_HTTP_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/google/api/httpbody.upbdefs.c b/src/core/ext/upbdefs-gen/google/api/httpbody.upbdefs.c index aa6c5dc51c9..643875da6ed 100644 --- a/src/core/ext/upbdefs-gen/google/api/httpbody.upbdefs.c +++ b/src/core/ext/upbdefs-gen/google/api/httpbody.upbdefs.c @@ -3,7 +3,8 @@ * google/api/httpbody.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "google/api/httpbody.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/google/api/httpbody.upbdefs.h b/src/core/ext/upbdefs-gen/google/api/httpbody.upbdefs.h index 6dc65d2ccd9..21221387ee9 100644 --- a/src/core/ext/upbdefs-gen/google/api/httpbody.upbdefs.h +++ b/src/core/ext/upbdefs-gen/google/api/httpbody.upbdefs.h @@ -3,7 +3,8 @@ * google/api/httpbody.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef GOOGLE_API_HTTPBODY_PROTO_UPBDEFS_H_ #define GOOGLE_API_HTTPBODY_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/google/protobuf/any.upbdefs.c b/src/core/ext/upbdefs-gen/google/protobuf/any.upbdefs.c index 2c58aa2862b..bbaaf0de544 100644 --- a/src/core/ext/upbdefs-gen/google/protobuf/any.upbdefs.c +++ b/src/core/ext/upbdefs-gen/google/protobuf/any.upbdefs.c @@ -3,7 +3,8 @@ * google/protobuf/any.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "google/protobuf/any.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/google/protobuf/any.upbdefs.h b/src/core/ext/upbdefs-gen/google/protobuf/any.upbdefs.h index 2b34678af1f..ec2efbc59ca 100644 --- a/src/core/ext/upbdefs-gen/google/protobuf/any.upbdefs.h +++ b/src/core/ext/upbdefs-gen/google/protobuf/any.upbdefs.h @@ -3,7 +3,8 @@ * google/protobuf/any.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef GOOGLE_PROTOBUF_ANY_PROTO_UPBDEFS_H_ #define GOOGLE_PROTOBUF_ANY_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/google/protobuf/descriptor.upbdefs.c b/src/core/ext/upbdefs-gen/google/protobuf/descriptor.upbdefs.c index 47d0623437f..9b835ab4cc2 100644 --- a/src/core/ext/upbdefs-gen/google/protobuf/descriptor.upbdefs.c +++ b/src/core/ext/upbdefs-gen/google/protobuf/descriptor.upbdefs.c @@ -3,7 +3,8 @@ * google/protobuf/descriptor.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "google/protobuf/descriptor.upbdefs.h" @@ -388,34 +389,34 @@ static const char descriptor[12268] = {'\n', ' ', 'g', 'o', 'o', 'g', 'l', 'e', '\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', +'\004', '\230', '\001', '\001', '\242', '\001', '\r', '\022', '\010', 'E', 'X', 'P', 'L', 'I', 'C', 'I', 'T', '\030', '\204', '\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', 'D', '\030', '\204', '\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', +'\004', '\230', '\001', '\001', '\242', '\001', '\r', '\022', '\010', 'E', 'X', 'P', 'A', 'N', 'D', 'E', 'D', '\030', '\204', '\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', +'N', 'E', '\030', '\204', '\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', +'\024', '\022', '\017', 'L', 'E', 'N', 'G', 'T', 'H', '_', 'P', 'R', 'E', 'F', 'I', 'X', 'E', 'D', '\030', '\204', '\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', +'L', 'E', 'G', 'A', 'C', 'Y', '_', 'B', 'E', 'S', 'T', '_', 'E', 'F', 'F', 'O', 'R', 'T', '\030', '\204', '\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', diff --git a/src/core/ext/upbdefs-gen/google/protobuf/descriptor.upbdefs.h b/src/core/ext/upbdefs-gen/google/protobuf/descriptor.upbdefs.h index 9a488b575ff..4636f5b6495 100644 --- a/src/core/ext/upbdefs-gen/google/protobuf/descriptor.upbdefs.h +++ b/src/core/ext/upbdefs-gen/google/protobuf/descriptor.upbdefs.h @@ -3,7 +3,8 @@ * google/protobuf/descriptor.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPBDEFS_H_ #define GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/google/protobuf/duration.upbdefs.c b/src/core/ext/upbdefs-gen/google/protobuf/duration.upbdefs.c index d32af46fa47..1a225935a51 100644 --- a/src/core/ext/upbdefs-gen/google/protobuf/duration.upbdefs.c +++ b/src/core/ext/upbdefs-gen/google/protobuf/duration.upbdefs.c @@ -3,7 +3,8 @@ * google/protobuf/duration.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "google/protobuf/duration.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/google/protobuf/duration.upbdefs.h b/src/core/ext/upbdefs-gen/google/protobuf/duration.upbdefs.h index aa823fc751a..5e3cba41f95 100644 --- a/src/core/ext/upbdefs-gen/google/protobuf/duration.upbdefs.h +++ b/src/core/ext/upbdefs-gen/google/protobuf/duration.upbdefs.h @@ -3,7 +3,8 @@ * google/protobuf/duration.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef GOOGLE_PROTOBUF_DURATION_PROTO_UPBDEFS_H_ #define GOOGLE_PROTOBUF_DURATION_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/google/protobuf/empty.upbdefs.c b/src/core/ext/upbdefs-gen/google/protobuf/empty.upbdefs.c index 7b783dacd6d..2fd23b8e7c7 100644 --- a/src/core/ext/upbdefs-gen/google/protobuf/empty.upbdefs.c +++ b/src/core/ext/upbdefs-gen/google/protobuf/empty.upbdefs.c @@ -3,7 +3,8 @@ * google/protobuf/empty.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "google/protobuf/empty.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/google/protobuf/empty.upbdefs.h b/src/core/ext/upbdefs-gen/google/protobuf/empty.upbdefs.h index 0505c0f7d0d..69eccefe874 100644 --- a/src/core/ext/upbdefs-gen/google/protobuf/empty.upbdefs.h +++ b/src/core/ext/upbdefs-gen/google/protobuf/empty.upbdefs.h @@ -3,7 +3,8 @@ * google/protobuf/empty.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef GOOGLE_PROTOBUF_EMPTY_PROTO_UPBDEFS_H_ #define GOOGLE_PROTOBUF_EMPTY_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/google/protobuf/struct.upbdefs.c b/src/core/ext/upbdefs-gen/google/protobuf/struct.upbdefs.c index 1ec9baec952..46cf73d0cc3 100644 --- a/src/core/ext/upbdefs-gen/google/protobuf/struct.upbdefs.c +++ b/src/core/ext/upbdefs-gen/google/protobuf/struct.upbdefs.c @@ -3,7 +3,8 @@ * google/protobuf/struct.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "google/protobuf/struct.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/google/protobuf/struct.upbdefs.h b/src/core/ext/upbdefs-gen/google/protobuf/struct.upbdefs.h index 28bfc83b0b4..887da56be73 100644 --- a/src/core/ext/upbdefs-gen/google/protobuf/struct.upbdefs.h +++ b/src/core/ext/upbdefs-gen/google/protobuf/struct.upbdefs.h @@ -3,7 +3,8 @@ * google/protobuf/struct.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef GOOGLE_PROTOBUF_STRUCT_PROTO_UPBDEFS_H_ #define GOOGLE_PROTOBUF_STRUCT_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/google/protobuf/timestamp.upbdefs.c b/src/core/ext/upbdefs-gen/google/protobuf/timestamp.upbdefs.c index 11010f4408a..2450333c197 100644 --- a/src/core/ext/upbdefs-gen/google/protobuf/timestamp.upbdefs.c +++ b/src/core/ext/upbdefs-gen/google/protobuf/timestamp.upbdefs.c @@ -3,7 +3,8 @@ * google/protobuf/timestamp.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "google/protobuf/timestamp.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/google/protobuf/timestamp.upbdefs.h b/src/core/ext/upbdefs-gen/google/protobuf/timestamp.upbdefs.h index f6187548d25..ba9e2920ad1 100644 --- a/src/core/ext/upbdefs-gen/google/protobuf/timestamp.upbdefs.h +++ b/src/core/ext/upbdefs-gen/google/protobuf/timestamp.upbdefs.h @@ -3,7 +3,8 @@ * google/protobuf/timestamp.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef GOOGLE_PROTOBUF_TIMESTAMP_PROTO_UPBDEFS_H_ #define GOOGLE_PROTOBUF_TIMESTAMP_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/google/protobuf/wrappers.upbdefs.c b/src/core/ext/upbdefs-gen/google/protobuf/wrappers.upbdefs.c index 68283c39b50..c95c74fb8b2 100644 --- a/src/core/ext/upbdefs-gen/google/protobuf/wrappers.upbdefs.c +++ b/src/core/ext/upbdefs-gen/google/protobuf/wrappers.upbdefs.c @@ -3,7 +3,8 @@ * google/protobuf/wrappers.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "google/protobuf/wrappers.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/google/protobuf/wrappers.upbdefs.h b/src/core/ext/upbdefs-gen/google/protobuf/wrappers.upbdefs.h index 039e007aa58..310247c946c 100644 --- a/src/core/ext/upbdefs-gen/google/protobuf/wrappers.upbdefs.h +++ b/src/core/ext/upbdefs-gen/google/protobuf/wrappers.upbdefs.h @@ -3,7 +3,8 @@ * google/protobuf/wrappers.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef GOOGLE_PROTOBUF_WRAPPERS_PROTO_UPBDEFS_H_ #define GOOGLE_PROTOBUF_WRAPPERS_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/google/rpc/status.upbdefs.c b/src/core/ext/upbdefs-gen/google/rpc/status.upbdefs.c index 8961336b75f..f125708515d 100644 --- a/src/core/ext/upbdefs-gen/google/rpc/status.upbdefs.c +++ b/src/core/ext/upbdefs-gen/google/rpc/status.upbdefs.c @@ -3,7 +3,8 @@ * google/rpc/status.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "google/rpc/status.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/google/rpc/status.upbdefs.h b/src/core/ext/upbdefs-gen/google/rpc/status.upbdefs.h index 7c05156833c..2dd25f9d20d 100644 --- a/src/core/ext/upbdefs-gen/google/rpc/status.upbdefs.h +++ b/src/core/ext/upbdefs-gen/google/rpc/status.upbdefs.h @@ -3,7 +3,8 @@ * google/rpc/status.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef GOOGLE_RPC_STATUS_PROTO_UPBDEFS_H_ #define GOOGLE_RPC_STATUS_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/opencensus/proto/trace/v1/trace_config.upbdefs.c b/src/core/ext/upbdefs-gen/opencensus/proto/trace/v1/trace_config.upbdefs.c index 569fd34f2b4..9d09db99287 100644 --- a/src/core/ext/upbdefs-gen/opencensus/proto/trace/v1/trace_config.upbdefs.c +++ b/src/core/ext/upbdefs-gen/opencensus/proto/trace/v1/trace_config.upbdefs.c @@ -3,7 +3,8 @@ * opencensus/proto/trace/v1/trace_config.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "opencensus/proto/trace/v1/trace_config.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/opencensus/proto/trace/v1/trace_config.upbdefs.h b/src/core/ext/upbdefs-gen/opencensus/proto/trace/v1/trace_config.upbdefs.h index 62d0171c68e..18f71d42eef 100644 --- a/src/core/ext/upbdefs-gen/opencensus/proto/trace/v1/trace_config.upbdefs.h +++ b/src/core/ext/upbdefs-gen/opencensus/proto/trace/v1/trace_config.upbdefs.h @@ -3,7 +3,8 @@ * opencensus/proto/trace/v1/trace_config.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef OPENCENSUS_PROTO_TRACE_V1_TRACE_CONFIG_PROTO_UPBDEFS_H_ #define OPENCENSUS_PROTO_TRACE_V1_TRACE_CONFIG_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/src/proto/grpc/lookup/v1/rls_config.upbdefs.c b/src/core/ext/upbdefs-gen/src/proto/grpc/lookup/v1/rls_config.upbdefs.c index 2579622d56c..9706552ebf6 100644 --- a/src/core/ext/upbdefs-gen/src/proto/grpc/lookup/v1/rls_config.upbdefs.c +++ b/src/core/ext/upbdefs-gen/src/proto/grpc/lookup/v1/rls_config.upbdefs.c @@ -3,7 +3,8 @@ * src/proto/grpc/lookup/v1/rls_config.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "src/proto/grpc/lookup/v1/rls_config.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/src/proto/grpc/lookup/v1/rls_config.upbdefs.h b/src/core/ext/upbdefs-gen/src/proto/grpc/lookup/v1/rls_config.upbdefs.h index bdb63084d34..f3121fc5162 100644 --- a/src/core/ext/upbdefs-gen/src/proto/grpc/lookup/v1/rls_config.upbdefs.h +++ b/src/core/ext/upbdefs-gen/src/proto/grpc/lookup/v1/rls_config.upbdefs.h @@ -3,7 +3,8 @@ * src/proto/grpc/lookup/v1/rls_config.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef SRC_PROTO_GRPC_LOOKUP_V1_RLS_CONFIG_PROTO_UPBDEFS_H_ #define SRC_PROTO_GRPC_LOOKUP_V1_RLS_CONFIG_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/udpa/annotations/migrate.upbdefs.c b/src/core/ext/upbdefs-gen/udpa/annotations/migrate.upbdefs.c index d0589404fbe..f30b6790c83 100644 --- a/src/core/ext/upbdefs-gen/udpa/annotations/migrate.upbdefs.c +++ b/src/core/ext/upbdefs-gen/udpa/annotations/migrate.upbdefs.c @@ -3,7 +3,8 @@ * udpa/annotations/migrate.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "udpa/annotations/migrate.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/udpa/annotations/migrate.upbdefs.h b/src/core/ext/upbdefs-gen/udpa/annotations/migrate.upbdefs.h index 704ba64029b..bc7e16bf234 100644 --- a/src/core/ext/upbdefs-gen/udpa/annotations/migrate.upbdefs.h +++ b/src/core/ext/upbdefs-gen/udpa/annotations/migrate.upbdefs.h @@ -3,7 +3,8 @@ * udpa/annotations/migrate.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef UDPA_ANNOTATIONS_MIGRATE_PROTO_UPBDEFS_H_ #define UDPA_ANNOTATIONS_MIGRATE_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/udpa/annotations/security.upbdefs.c b/src/core/ext/upbdefs-gen/udpa/annotations/security.upbdefs.c index b41a62130a9..3728a4ac9aa 100644 --- a/src/core/ext/upbdefs-gen/udpa/annotations/security.upbdefs.c +++ b/src/core/ext/upbdefs-gen/udpa/annotations/security.upbdefs.c @@ -3,7 +3,8 @@ * udpa/annotations/security.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "udpa/annotations/security.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/udpa/annotations/security.upbdefs.h b/src/core/ext/upbdefs-gen/udpa/annotations/security.upbdefs.h index 83bf930639d..f9e5c9580d5 100644 --- a/src/core/ext/upbdefs-gen/udpa/annotations/security.upbdefs.h +++ b/src/core/ext/upbdefs-gen/udpa/annotations/security.upbdefs.h @@ -3,7 +3,8 @@ * udpa/annotations/security.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef UDPA_ANNOTATIONS_SECURITY_PROTO_UPBDEFS_H_ #define UDPA_ANNOTATIONS_SECURITY_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/udpa/annotations/sensitive.upbdefs.c b/src/core/ext/upbdefs-gen/udpa/annotations/sensitive.upbdefs.c index 0f7412d47db..bd6ecafec34 100644 --- a/src/core/ext/upbdefs-gen/udpa/annotations/sensitive.upbdefs.c +++ b/src/core/ext/upbdefs-gen/udpa/annotations/sensitive.upbdefs.c @@ -3,7 +3,8 @@ * udpa/annotations/sensitive.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "udpa/annotations/sensitive.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/udpa/annotations/sensitive.upbdefs.h b/src/core/ext/upbdefs-gen/udpa/annotations/sensitive.upbdefs.h index 4e79db28527..27f1dc4538e 100644 --- a/src/core/ext/upbdefs-gen/udpa/annotations/sensitive.upbdefs.h +++ b/src/core/ext/upbdefs-gen/udpa/annotations/sensitive.upbdefs.h @@ -3,7 +3,8 @@ * udpa/annotations/sensitive.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef UDPA_ANNOTATIONS_SENSITIVE_PROTO_UPBDEFS_H_ #define UDPA_ANNOTATIONS_SENSITIVE_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/udpa/annotations/status.upbdefs.c b/src/core/ext/upbdefs-gen/udpa/annotations/status.upbdefs.c index 056281057cc..0b889c8feaa 100644 --- a/src/core/ext/upbdefs-gen/udpa/annotations/status.upbdefs.c +++ b/src/core/ext/upbdefs-gen/udpa/annotations/status.upbdefs.c @@ -3,7 +3,8 @@ * udpa/annotations/status.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "udpa/annotations/status.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/udpa/annotations/status.upbdefs.h b/src/core/ext/upbdefs-gen/udpa/annotations/status.upbdefs.h index 40b52fdb13e..fdea4a7c403 100644 --- a/src/core/ext/upbdefs-gen/udpa/annotations/status.upbdefs.h +++ b/src/core/ext/upbdefs-gen/udpa/annotations/status.upbdefs.h @@ -3,7 +3,8 @@ * udpa/annotations/status.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef UDPA_ANNOTATIONS_STATUS_PROTO_UPBDEFS_H_ #define UDPA_ANNOTATIONS_STATUS_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/udpa/annotations/versioning.upbdefs.c b/src/core/ext/upbdefs-gen/udpa/annotations/versioning.upbdefs.c index 64f08b05dfd..30e668c8aa0 100644 --- a/src/core/ext/upbdefs-gen/udpa/annotations/versioning.upbdefs.c +++ b/src/core/ext/upbdefs-gen/udpa/annotations/versioning.upbdefs.c @@ -3,7 +3,8 @@ * udpa/annotations/versioning.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "udpa/annotations/versioning.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/udpa/annotations/versioning.upbdefs.h b/src/core/ext/upbdefs-gen/udpa/annotations/versioning.upbdefs.h index aaef5c5842c..36f9b90dbea 100644 --- a/src/core/ext/upbdefs-gen/udpa/annotations/versioning.upbdefs.h +++ b/src/core/ext/upbdefs-gen/udpa/annotations/versioning.upbdefs.h @@ -3,7 +3,8 @@ * udpa/annotations/versioning.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef UDPA_ANNOTATIONS_VERSIONING_PROTO_UPBDEFS_H_ #define UDPA_ANNOTATIONS_VERSIONING_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/validate/validate.upbdefs.c b/src/core/ext/upbdefs-gen/validate/validate.upbdefs.c index cd7577f0e2a..8ec63555424 100644 --- a/src/core/ext/upbdefs-gen/validate/validate.upbdefs.c +++ b/src/core/ext/upbdefs-gen/validate/validate.upbdefs.c @@ -3,7 +3,8 @@ * validate/validate.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "validate/validate.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/validate/validate.upbdefs.h b/src/core/ext/upbdefs-gen/validate/validate.upbdefs.h index d730f0e5ec1..5028ab2071e 100644 --- a/src/core/ext/upbdefs-gen/validate/validate.upbdefs.h +++ b/src/core/ext/upbdefs-gen/validate/validate.upbdefs.h @@ -3,7 +3,8 @@ * validate/validate.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef VALIDATE_VALIDATE_PROTO_UPBDEFS_H_ #define VALIDATE_VALIDATE_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/xds/annotations/v3/migrate.upbdefs.c b/src/core/ext/upbdefs-gen/xds/annotations/v3/migrate.upbdefs.c index ad9ebb954c3..c5d8a396d99 100644 --- a/src/core/ext/upbdefs-gen/xds/annotations/v3/migrate.upbdefs.c +++ b/src/core/ext/upbdefs-gen/xds/annotations/v3/migrate.upbdefs.c @@ -3,7 +3,8 @@ * xds/annotations/v3/migrate.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "xds/annotations/v3/migrate.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/xds/annotations/v3/migrate.upbdefs.h b/src/core/ext/upbdefs-gen/xds/annotations/v3/migrate.upbdefs.h index 6ff6393b1b4..2295609edef 100644 --- a/src/core/ext/upbdefs-gen/xds/annotations/v3/migrate.upbdefs.h +++ b/src/core/ext/upbdefs-gen/xds/annotations/v3/migrate.upbdefs.h @@ -3,7 +3,8 @@ * xds/annotations/v3/migrate.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef XDS_ANNOTATIONS_V3_MIGRATE_PROTO_UPBDEFS_H_ #define XDS_ANNOTATIONS_V3_MIGRATE_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/xds/annotations/v3/security.upbdefs.c b/src/core/ext/upbdefs-gen/xds/annotations/v3/security.upbdefs.c index b1ab8e792cd..6029be48c93 100644 --- a/src/core/ext/upbdefs-gen/xds/annotations/v3/security.upbdefs.c +++ b/src/core/ext/upbdefs-gen/xds/annotations/v3/security.upbdefs.c @@ -3,7 +3,8 @@ * xds/annotations/v3/security.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "xds/annotations/v3/security.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/xds/annotations/v3/security.upbdefs.h b/src/core/ext/upbdefs-gen/xds/annotations/v3/security.upbdefs.h index a9408471e11..3722cc19537 100644 --- a/src/core/ext/upbdefs-gen/xds/annotations/v3/security.upbdefs.h +++ b/src/core/ext/upbdefs-gen/xds/annotations/v3/security.upbdefs.h @@ -3,7 +3,8 @@ * xds/annotations/v3/security.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef XDS_ANNOTATIONS_V3_SECURITY_PROTO_UPBDEFS_H_ #define XDS_ANNOTATIONS_V3_SECURITY_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/xds/annotations/v3/sensitive.upbdefs.c b/src/core/ext/upbdefs-gen/xds/annotations/v3/sensitive.upbdefs.c index d3286b2b6e2..00b49e1b245 100644 --- a/src/core/ext/upbdefs-gen/xds/annotations/v3/sensitive.upbdefs.c +++ b/src/core/ext/upbdefs-gen/xds/annotations/v3/sensitive.upbdefs.c @@ -3,7 +3,8 @@ * xds/annotations/v3/sensitive.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "xds/annotations/v3/sensitive.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/xds/annotations/v3/sensitive.upbdefs.h b/src/core/ext/upbdefs-gen/xds/annotations/v3/sensitive.upbdefs.h index 41473bc5971..68f4870a613 100644 --- a/src/core/ext/upbdefs-gen/xds/annotations/v3/sensitive.upbdefs.h +++ b/src/core/ext/upbdefs-gen/xds/annotations/v3/sensitive.upbdefs.h @@ -3,7 +3,8 @@ * xds/annotations/v3/sensitive.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef XDS_ANNOTATIONS_V3_SENSITIVE_PROTO_UPBDEFS_H_ #define XDS_ANNOTATIONS_V3_SENSITIVE_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/xds/annotations/v3/status.upbdefs.c b/src/core/ext/upbdefs-gen/xds/annotations/v3/status.upbdefs.c index e008b6c16d3..5377854a475 100644 --- a/src/core/ext/upbdefs-gen/xds/annotations/v3/status.upbdefs.c +++ b/src/core/ext/upbdefs-gen/xds/annotations/v3/status.upbdefs.c @@ -3,7 +3,8 @@ * xds/annotations/v3/status.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "xds/annotations/v3/status.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/xds/annotations/v3/status.upbdefs.h b/src/core/ext/upbdefs-gen/xds/annotations/v3/status.upbdefs.h index a746451fd21..098db82705d 100644 --- a/src/core/ext/upbdefs-gen/xds/annotations/v3/status.upbdefs.h +++ b/src/core/ext/upbdefs-gen/xds/annotations/v3/status.upbdefs.h @@ -3,7 +3,8 @@ * xds/annotations/v3/status.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef XDS_ANNOTATIONS_V3_STATUS_PROTO_UPBDEFS_H_ #define XDS_ANNOTATIONS_V3_STATUS_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/xds/annotations/v3/versioning.upbdefs.c b/src/core/ext/upbdefs-gen/xds/annotations/v3/versioning.upbdefs.c index f49fafe6aad..746831db7cc 100644 --- a/src/core/ext/upbdefs-gen/xds/annotations/v3/versioning.upbdefs.c +++ b/src/core/ext/upbdefs-gen/xds/annotations/v3/versioning.upbdefs.c @@ -3,7 +3,8 @@ * xds/annotations/v3/versioning.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "xds/annotations/v3/versioning.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/xds/annotations/v3/versioning.upbdefs.h b/src/core/ext/upbdefs-gen/xds/annotations/v3/versioning.upbdefs.h index 19961f93efd..63f26c1d348 100644 --- a/src/core/ext/upbdefs-gen/xds/annotations/v3/versioning.upbdefs.h +++ b/src/core/ext/upbdefs-gen/xds/annotations/v3/versioning.upbdefs.h @@ -3,7 +3,8 @@ * xds/annotations/v3/versioning.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef XDS_ANNOTATIONS_V3_VERSIONING_PROTO_UPBDEFS_H_ #define XDS_ANNOTATIONS_V3_VERSIONING_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/xds/core/v3/authority.upbdefs.c b/src/core/ext/upbdefs-gen/xds/core/v3/authority.upbdefs.c index 236f473b62c..af7349aea9a 100644 --- a/src/core/ext/upbdefs-gen/xds/core/v3/authority.upbdefs.c +++ b/src/core/ext/upbdefs-gen/xds/core/v3/authority.upbdefs.c @@ -3,7 +3,8 @@ * xds/core/v3/authority.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "xds/core/v3/authority.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/xds/core/v3/authority.upbdefs.h b/src/core/ext/upbdefs-gen/xds/core/v3/authority.upbdefs.h index deb3ba4578a..55100cb16c6 100644 --- a/src/core/ext/upbdefs-gen/xds/core/v3/authority.upbdefs.h +++ b/src/core/ext/upbdefs-gen/xds/core/v3/authority.upbdefs.h @@ -3,7 +3,8 @@ * xds/core/v3/authority.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef XDS_CORE_V3_AUTHORITY_PROTO_UPBDEFS_H_ #define XDS_CORE_V3_AUTHORITY_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/xds/core/v3/cidr.upbdefs.c b/src/core/ext/upbdefs-gen/xds/core/v3/cidr.upbdefs.c index 8109d0becfc..7fc41329085 100644 --- a/src/core/ext/upbdefs-gen/xds/core/v3/cidr.upbdefs.c +++ b/src/core/ext/upbdefs-gen/xds/core/v3/cidr.upbdefs.c @@ -3,7 +3,8 @@ * xds/core/v3/cidr.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "xds/core/v3/cidr.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/xds/core/v3/cidr.upbdefs.h b/src/core/ext/upbdefs-gen/xds/core/v3/cidr.upbdefs.h index 3d41b116ffc..592c10c618c 100644 --- a/src/core/ext/upbdefs-gen/xds/core/v3/cidr.upbdefs.h +++ b/src/core/ext/upbdefs-gen/xds/core/v3/cidr.upbdefs.h @@ -3,7 +3,8 @@ * xds/core/v3/cidr.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef XDS_CORE_V3_CIDR_PROTO_UPBDEFS_H_ #define XDS_CORE_V3_CIDR_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/xds/core/v3/collection_entry.upbdefs.c b/src/core/ext/upbdefs-gen/xds/core/v3/collection_entry.upbdefs.c index e4c4a4877ed..8fc24daa9c0 100644 --- a/src/core/ext/upbdefs-gen/xds/core/v3/collection_entry.upbdefs.c +++ b/src/core/ext/upbdefs-gen/xds/core/v3/collection_entry.upbdefs.c @@ -3,7 +3,8 @@ * xds/core/v3/collection_entry.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "xds/core/v3/collection_entry.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/xds/core/v3/collection_entry.upbdefs.h b/src/core/ext/upbdefs-gen/xds/core/v3/collection_entry.upbdefs.h index 3052a6e7200..10db1bfacae 100644 --- a/src/core/ext/upbdefs-gen/xds/core/v3/collection_entry.upbdefs.h +++ b/src/core/ext/upbdefs-gen/xds/core/v3/collection_entry.upbdefs.h @@ -3,7 +3,8 @@ * xds/core/v3/collection_entry.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef XDS_CORE_V3_COLLECTION_ENTRY_PROTO_UPBDEFS_H_ #define XDS_CORE_V3_COLLECTION_ENTRY_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/xds/core/v3/context_params.upbdefs.c b/src/core/ext/upbdefs-gen/xds/core/v3/context_params.upbdefs.c index 9de28ae7307..589f5fac0b8 100644 --- a/src/core/ext/upbdefs-gen/xds/core/v3/context_params.upbdefs.c +++ b/src/core/ext/upbdefs-gen/xds/core/v3/context_params.upbdefs.c @@ -3,7 +3,8 @@ * xds/core/v3/context_params.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "xds/core/v3/context_params.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/xds/core/v3/context_params.upbdefs.h b/src/core/ext/upbdefs-gen/xds/core/v3/context_params.upbdefs.h index 0e0e2b67b5d..8390a911ee2 100644 --- a/src/core/ext/upbdefs-gen/xds/core/v3/context_params.upbdefs.h +++ b/src/core/ext/upbdefs-gen/xds/core/v3/context_params.upbdefs.h @@ -3,7 +3,8 @@ * xds/core/v3/context_params.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef XDS_CORE_V3_CONTEXT_PARAMS_PROTO_UPBDEFS_H_ #define XDS_CORE_V3_CONTEXT_PARAMS_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/xds/core/v3/extension.upbdefs.c b/src/core/ext/upbdefs-gen/xds/core/v3/extension.upbdefs.c index 718c0229029..a954250cdcb 100644 --- a/src/core/ext/upbdefs-gen/xds/core/v3/extension.upbdefs.c +++ b/src/core/ext/upbdefs-gen/xds/core/v3/extension.upbdefs.c @@ -3,7 +3,8 @@ * xds/core/v3/extension.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "xds/core/v3/extension.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/xds/core/v3/extension.upbdefs.h b/src/core/ext/upbdefs-gen/xds/core/v3/extension.upbdefs.h index 95cd98def14..eeda9b711e4 100644 --- a/src/core/ext/upbdefs-gen/xds/core/v3/extension.upbdefs.h +++ b/src/core/ext/upbdefs-gen/xds/core/v3/extension.upbdefs.h @@ -3,7 +3,8 @@ * xds/core/v3/extension.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef XDS_CORE_V3_EXTENSION_PROTO_UPBDEFS_H_ #define XDS_CORE_V3_EXTENSION_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/xds/core/v3/resource.upbdefs.c b/src/core/ext/upbdefs-gen/xds/core/v3/resource.upbdefs.c index 812eaf3e30a..55fe78192e4 100644 --- a/src/core/ext/upbdefs-gen/xds/core/v3/resource.upbdefs.c +++ b/src/core/ext/upbdefs-gen/xds/core/v3/resource.upbdefs.c @@ -3,7 +3,8 @@ * xds/core/v3/resource.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "xds/core/v3/resource.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/xds/core/v3/resource.upbdefs.h b/src/core/ext/upbdefs-gen/xds/core/v3/resource.upbdefs.h index e0f9266f102..4beca8e3ed7 100644 --- a/src/core/ext/upbdefs-gen/xds/core/v3/resource.upbdefs.h +++ b/src/core/ext/upbdefs-gen/xds/core/v3/resource.upbdefs.h @@ -3,7 +3,8 @@ * xds/core/v3/resource.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef XDS_CORE_V3_RESOURCE_PROTO_UPBDEFS_H_ #define XDS_CORE_V3_RESOURCE_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/xds/core/v3/resource_locator.upbdefs.c b/src/core/ext/upbdefs-gen/xds/core/v3/resource_locator.upbdefs.c index 1b991ebcc4d..b55673a0ebe 100644 --- a/src/core/ext/upbdefs-gen/xds/core/v3/resource_locator.upbdefs.c +++ b/src/core/ext/upbdefs-gen/xds/core/v3/resource_locator.upbdefs.c @@ -3,7 +3,8 @@ * xds/core/v3/resource_locator.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "xds/core/v3/resource_locator.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/xds/core/v3/resource_locator.upbdefs.h b/src/core/ext/upbdefs-gen/xds/core/v3/resource_locator.upbdefs.h index 1984409f075..1f45931d9c5 100644 --- a/src/core/ext/upbdefs-gen/xds/core/v3/resource_locator.upbdefs.h +++ b/src/core/ext/upbdefs-gen/xds/core/v3/resource_locator.upbdefs.h @@ -3,7 +3,8 @@ * xds/core/v3/resource_locator.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef XDS_CORE_V3_RESOURCE_LOCATOR_PROTO_UPBDEFS_H_ #define XDS_CORE_V3_RESOURCE_LOCATOR_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/xds/core/v3/resource_name.upbdefs.c b/src/core/ext/upbdefs-gen/xds/core/v3/resource_name.upbdefs.c index 25f1628261f..77a0e90e6c8 100644 --- a/src/core/ext/upbdefs-gen/xds/core/v3/resource_name.upbdefs.c +++ b/src/core/ext/upbdefs-gen/xds/core/v3/resource_name.upbdefs.c @@ -3,7 +3,8 @@ * xds/core/v3/resource_name.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "xds/core/v3/resource_name.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/xds/core/v3/resource_name.upbdefs.h b/src/core/ext/upbdefs-gen/xds/core/v3/resource_name.upbdefs.h index 3233651c535..28bebb0e5fc 100644 --- a/src/core/ext/upbdefs-gen/xds/core/v3/resource_name.upbdefs.h +++ b/src/core/ext/upbdefs-gen/xds/core/v3/resource_name.upbdefs.h @@ -3,7 +3,8 @@ * xds/core/v3/resource_name.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef XDS_CORE_V3_RESOURCE_NAME_PROTO_UPBDEFS_H_ #define XDS_CORE_V3_RESOURCE_NAME_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/xds/type/matcher/v3/cel.upbdefs.c b/src/core/ext/upbdefs-gen/xds/type/matcher/v3/cel.upbdefs.c index 412db4f8fcc..a7ce7e0ce27 100644 --- a/src/core/ext/upbdefs-gen/xds/type/matcher/v3/cel.upbdefs.c +++ b/src/core/ext/upbdefs-gen/xds/type/matcher/v3/cel.upbdefs.c @@ -3,7 +3,8 @@ * xds/type/matcher/v3/cel.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "xds/type/matcher/v3/cel.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/xds/type/matcher/v3/cel.upbdefs.h b/src/core/ext/upbdefs-gen/xds/type/matcher/v3/cel.upbdefs.h index 1a58c84bf6a..8c19401d8e9 100644 --- a/src/core/ext/upbdefs-gen/xds/type/matcher/v3/cel.upbdefs.h +++ b/src/core/ext/upbdefs-gen/xds/type/matcher/v3/cel.upbdefs.h @@ -3,7 +3,8 @@ * xds/type/matcher/v3/cel.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef XDS_TYPE_MATCHER_V3_CEL_PROTO_UPBDEFS_H_ #define XDS_TYPE_MATCHER_V3_CEL_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/xds/type/matcher/v3/domain.upbdefs.c b/src/core/ext/upbdefs-gen/xds/type/matcher/v3/domain.upbdefs.c index aa58b273b72..b3924cc1203 100644 --- a/src/core/ext/upbdefs-gen/xds/type/matcher/v3/domain.upbdefs.c +++ b/src/core/ext/upbdefs-gen/xds/type/matcher/v3/domain.upbdefs.c @@ -3,7 +3,8 @@ * xds/type/matcher/v3/domain.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "xds/type/matcher/v3/domain.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/xds/type/matcher/v3/domain.upbdefs.h b/src/core/ext/upbdefs-gen/xds/type/matcher/v3/domain.upbdefs.h index e2cf28584c9..682614796a7 100644 --- a/src/core/ext/upbdefs-gen/xds/type/matcher/v3/domain.upbdefs.h +++ b/src/core/ext/upbdefs-gen/xds/type/matcher/v3/domain.upbdefs.h @@ -3,7 +3,8 @@ * xds/type/matcher/v3/domain.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef XDS_TYPE_MATCHER_V3_DOMAIN_PROTO_UPBDEFS_H_ #define XDS_TYPE_MATCHER_V3_DOMAIN_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/xds/type/matcher/v3/http_inputs.upbdefs.c b/src/core/ext/upbdefs-gen/xds/type/matcher/v3/http_inputs.upbdefs.c index 9f6212d38e2..a4ccb4b1908 100644 --- a/src/core/ext/upbdefs-gen/xds/type/matcher/v3/http_inputs.upbdefs.c +++ b/src/core/ext/upbdefs-gen/xds/type/matcher/v3/http_inputs.upbdefs.c @@ -3,7 +3,8 @@ * xds/type/matcher/v3/http_inputs.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "xds/type/matcher/v3/http_inputs.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/xds/type/matcher/v3/http_inputs.upbdefs.h b/src/core/ext/upbdefs-gen/xds/type/matcher/v3/http_inputs.upbdefs.h index d2e80063ef5..8bbd630a05e 100644 --- a/src/core/ext/upbdefs-gen/xds/type/matcher/v3/http_inputs.upbdefs.h +++ b/src/core/ext/upbdefs-gen/xds/type/matcher/v3/http_inputs.upbdefs.h @@ -3,7 +3,8 @@ * xds/type/matcher/v3/http_inputs.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef XDS_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPBDEFS_H_ #define XDS_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/xds/type/matcher/v3/ip.upbdefs.c b/src/core/ext/upbdefs-gen/xds/type/matcher/v3/ip.upbdefs.c index 86aad83753f..b4ea95db00f 100644 --- a/src/core/ext/upbdefs-gen/xds/type/matcher/v3/ip.upbdefs.c +++ b/src/core/ext/upbdefs-gen/xds/type/matcher/v3/ip.upbdefs.c @@ -3,7 +3,8 @@ * xds/type/matcher/v3/ip.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "xds/type/matcher/v3/ip.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/xds/type/matcher/v3/ip.upbdefs.h b/src/core/ext/upbdefs-gen/xds/type/matcher/v3/ip.upbdefs.h index f1c72534fff..80dfb5fcb2a 100644 --- a/src/core/ext/upbdefs-gen/xds/type/matcher/v3/ip.upbdefs.h +++ b/src/core/ext/upbdefs-gen/xds/type/matcher/v3/ip.upbdefs.h @@ -3,7 +3,8 @@ * xds/type/matcher/v3/ip.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef XDS_TYPE_MATCHER_V3_IP_PROTO_UPBDEFS_H_ #define XDS_TYPE_MATCHER_V3_IP_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/xds/type/matcher/v3/matcher.upbdefs.c b/src/core/ext/upbdefs-gen/xds/type/matcher/v3/matcher.upbdefs.c index 69d2bc942a9..d9b6a8b7cef 100644 --- a/src/core/ext/upbdefs-gen/xds/type/matcher/v3/matcher.upbdefs.c +++ b/src/core/ext/upbdefs-gen/xds/type/matcher/v3/matcher.upbdefs.c @@ -3,7 +3,8 @@ * xds/type/matcher/v3/matcher.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "xds/type/matcher/v3/matcher.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/xds/type/matcher/v3/matcher.upbdefs.h b/src/core/ext/upbdefs-gen/xds/type/matcher/v3/matcher.upbdefs.h index 998ad6fa52f..9e0f78a9eb5 100644 --- a/src/core/ext/upbdefs-gen/xds/type/matcher/v3/matcher.upbdefs.h +++ b/src/core/ext/upbdefs-gen/xds/type/matcher/v3/matcher.upbdefs.h @@ -3,7 +3,8 @@ * xds/type/matcher/v3/matcher.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef XDS_TYPE_MATCHER_V3_MATCHER_PROTO_UPBDEFS_H_ #define XDS_TYPE_MATCHER_V3_MATCHER_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/xds/type/matcher/v3/range.upbdefs.c b/src/core/ext/upbdefs-gen/xds/type/matcher/v3/range.upbdefs.c index 181008e0886..c2b0e2a3da7 100644 --- a/src/core/ext/upbdefs-gen/xds/type/matcher/v3/range.upbdefs.c +++ b/src/core/ext/upbdefs-gen/xds/type/matcher/v3/range.upbdefs.c @@ -3,7 +3,8 @@ * xds/type/matcher/v3/range.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "xds/type/matcher/v3/range.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/xds/type/matcher/v3/range.upbdefs.h b/src/core/ext/upbdefs-gen/xds/type/matcher/v3/range.upbdefs.h index 5d8cda5d698..56615f248b4 100644 --- a/src/core/ext/upbdefs-gen/xds/type/matcher/v3/range.upbdefs.h +++ b/src/core/ext/upbdefs-gen/xds/type/matcher/v3/range.upbdefs.h @@ -3,7 +3,8 @@ * xds/type/matcher/v3/range.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef XDS_TYPE_MATCHER_V3_RANGE_PROTO_UPBDEFS_H_ #define XDS_TYPE_MATCHER_V3_RANGE_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/xds/type/matcher/v3/regex.upbdefs.c b/src/core/ext/upbdefs-gen/xds/type/matcher/v3/regex.upbdefs.c index e9b0341404a..0314530f670 100644 --- a/src/core/ext/upbdefs-gen/xds/type/matcher/v3/regex.upbdefs.c +++ b/src/core/ext/upbdefs-gen/xds/type/matcher/v3/regex.upbdefs.c @@ -3,7 +3,8 @@ * xds/type/matcher/v3/regex.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "xds/type/matcher/v3/regex.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/xds/type/matcher/v3/regex.upbdefs.h b/src/core/ext/upbdefs-gen/xds/type/matcher/v3/regex.upbdefs.h index a8322f9f82d..54c68cc08ff 100644 --- a/src/core/ext/upbdefs-gen/xds/type/matcher/v3/regex.upbdefs.h +++ b/src/core/ext/upbdefs-gen/xds/type/matcher/v3/regex.upbdefs.h @@ -3,7 +3,8 @@ * xds/type/matcher/v3/regex.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef XDS_TYPE_MATCHER_V3_REGEX_PROTO_UPBDEFS_H_ #define XDS_TYPE_MATCHER_V3_REGEX_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/xds/type/matcher/v3/string.upbdefs.c b/src/core/ext/upbdefs-gen/xds/type/matcher/v3/string.upbdefs.c index 392bbab9ba5..fa564816bf9 100644 --- a/src/core/ext/upbdefs-gen/xds/type/matcher/v3/string.upbdefs.c +++ b/src/core/ext/upbdefs-gen/xds/type/matcher/v3/string.upbdefs.c @@ -3,7 +3,8 @@ * xds/type/matcher/v3/string.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "xds/type/matcher/v3/string.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/xds/type/matcher/v3/string.upbdefs.h b/src/core/ext/upbdefs-gen/xds/type/matcher/v3/string.upbdefs.h index 2e123088bd1..aba5339ea31 100644 --- a/src/core/ext/upbdefs-gen/xds/type/matcher/v3/string.upbdefs.h +++ b/src/core/ext/upbdefs-gen/xds/type/matcher/v3/string.upbdefs.h @@ -3,7 +3,8 @@ * xds/type/matcher/v3/string.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef XDS_TYPE_MATCHER_V3_STRING_PROTO_UPBDEFS_H_ #define XDS_TYPE_MATCHER_V3_STRING_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/xds/type/v3/cel.upbdefs.c b/src/core/ext/upbdefs-gen/xds/type/v3/cel.upbdefs.c index f0ff9412fe1..9d635f263b0 100644 --- a/src/core/ext/upbdefs-gen/xds/type/v3/cel.upbdefs.c +++ b/src/core/ext/upbdefs-gen/xds/type/v3/cel.upbdefs.c @@ -3,7 +3,8 @@ * xds/type/v3/cel.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "xds/type/v3/cel.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/xds/type/v3/cel.upbdefs.h b/src/core/ext/upbdefs-gen/xds/type/v3/cel.upbdefs.h index 0b7693873d9..725e8510cb5 100644 --- a/src/core/ext/upbdefs-gen/xds/type/v3/cel.upbdefs.h +++ b/src/core/ext/upbdefs-gen/xds/type/v3/cel.upbdefs.h @@ -3,7 +3,8 @@ * xds/type/v3/cel.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef XDS_TYPE_V3_CEL_PROTO_UPBDEFS_H_ #define XDS_TYPE_V3_CEL_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/xds/type/v3/range.upbdefs.c b/src/core/ext/upbdefs-gen/xds/type/v3/range.upbdefs.c index 5bef88f312a..59e198f501d 100644 --- a/src/core/ext/upbdefs-gen/xds/type/v3/range.upbdefs.c +++ b/src/core/ext/upbdefs-gen/xds/type/v3/range.upbdefs.c @@ -3,7 +3,8 @@ * xds/type/v3/range.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "xds/type/v3/range.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/xds/type/v3/range.upbdefs.h b/src/core/ext/upbdefs-gen/xds/type/v3/range.upbdefs.h index 5ea5ce6c859..7cde07bea6a 100644 --- a/src/core/ext/upbdefs-gen/xds/type/v3/range.upbdefs.h +++ b/src/core/ext/upbdefs-gen/xds/type/v3/range.upbdefs.h @@ -3,7 +3,8 @@ * xds/type/v3/range.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef XDS_TYPE_V3_RANGE_PROTO_UPBDEFS_H_ #define XDS_TYPE_V3_RANGE_PROTO_UPBDEFS_H_ diff --git a/src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.c b/src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.c index 2d0514bd7ae..7ba6ced5ef4 100644 --- a/src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.c +++ b/src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.c @@ -3,7 +3,8 @@ * xds/type/v3/typed_struct.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include "upb/reflection/def.h" #include "xds/type/v3/typed_struct.upbdefs.h" diff --git a/src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.h b/src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.h index a6af7582e28..68948ea9511 100644 --- a/src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.h +++ b/src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.h @@ -3,7 +3,8 @@ * xds/type/v3/typed_struct.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef XDS_TYPE_V3_TYPED_STRUCT_PROTO_UPBDEFS_H_ #define XDS_TYPE_V3_TYPED_STRUCT_PROTO_UPBDEFS_H_ diff --git a/src/csharp/build/dependencies.props b/src/csharp/build/dependencies.props index 29dba7a288f..46a7c2fa05f 100644 --- a/src/csharp/build/dependencies.props +++ b/src/csharp/build/dependencies.props @@ -2,6 +2,6 @@ 2.68.0-dev - 3.27.2 + 3.28.1 diff --git a/src/objective-c/!ProtoCompiler-gRPCCppPlugin.podspec b/src/objective-c/!ProtoCompiler-gRPCCppPlugin.podspec index 844e08cfcb8..8a123325b24 100644 --- a/src/objective-c/!ProtoCompiler-gRPCCppPlugin.podspec +++ b/src/objective-c/!ProtoCompiler-gRPCCppPlugin.podspec @@ -100,7 +100,7 @@ Pod::Spec.new do |s| s.preserve_paths = plugin # Restrict the protoc version to the one supported by this plugin. - s.dependency '!ProtoCompiler', '3.27.2' + s.dependency '!ProtoCompiler', '3.28.1' s.ios.deployment_target = '10.0' s.osx.deployment_target = '10.12' diff --git a/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec b/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec index 91982885509..cef1388bc1f 100644 --- a/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec +++ b/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec @@ -102,7 +102,7 @@ Pod::Spec.new do |s| s.preserve_paths = plugin # Restrict the protoc version to the one supported by this plugin. - s.dependency '!ProtoCompiler', '3.27.2' + s.dependency '!ProtoCompiler', '3.28.1' s.ios.deployment_target = '10.0' s.osx.deployment_target = '10.12' diff --git a/src/objective-c/!ProtoCompiler.podspec b/src/objective-c/!ProtoCompiler.podspec index 4acb4dfa225..9ef3483dae9 100644 --- a/src/objective-c/!ProtoCompiler.podspec +++ b/src/objective-c/!ProtoCompiler.podspec @@ -36,7 +36,7 @@ Pod::Spec.new do |s| # exclamation mark ensures that other "regular" pods will be able to find it as it'll be installed # before them. s.name = '!ProtoCompiler' - v = '3.27.2' + v = '3.28.1' s.version = v s.summary = 'The Protobuf Compiler (protoc) generates Objective-C files from .proto files' s.description = <<-DESC diff --git a/src/python/grpcio/grpc_core_dependencies.py b/src/python/grpcio/grpc_core_dependencies.py index 80b7fedb8d4..f5b68900662 100644 --- a/src/python/grpcio/grpc_core_dependencies.py +++ b/src/python/grpcio/grpc_core_dependencies.py @@ -1386,6 +1386,7 @@ CORE_SOURCE_FILES = [ 'third_party/upb/upb/message/internal/message.c', 'third_party/upb/upb/message/map.c', 'third_party/upb/upb/message/map_sorter.c', + 'third_party/upb/upb/message/merge.c', 'third_party/upb/upb/message/message.c', 'third_party/upb/upb/mini_descriptor/build_enum.c', 'third_party/upb/upb/mini_descriptor/decode.c', @@ -1413,6 +1414,7 @@ CORE_SOURCE_FILES = [ '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/text/internal/encode.c', 'third_party/upb/upb/wire/decode.c', 'third_party/upb/upb/wire/encode.c', 'third_party/upb/upb/wire/eps_copy_input_stream.c', diff --git a/third_party/protobuf b/third_party/protobuf index 63def39e881..10ef3f77683 160000 --- a/third_party/protobuf +++ b/third_party/protobuf @@ -1 +1 @@ -Subproject commit 63def39e881afa496502d9c410f4ea948e59490d +Subproject commit 10ef3f77683f77fb3c059bf47725c27b3ff41e63 diff --git a/third_party/protobuf.10007.patch b/third_party/protobuf.10007.patch deleted file mode 100644 index e64bd384ece..00000000000 --- a/third_party/protobuf.10007.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/build_defs/BUILD.bazel b/build_defs/BUILD.bazel -index 1c72eba68..176ab5a91 100644 ---- a/build_defs/BUILD.bazel -+++ b/build_defs/BUILD.bazel -@@ -14,10 +14,24 @@ package( - ) - - create_compiler_config_setting( -- name = "config_msvc", -+ name = "config_msvc_cl", - value = "msvc-cl", - ) - -+# Caveat: clang-cl support in protobuf is only best-effort / untested for now. -+create_compiler_config_setting( -+ name = "config_clang_cl", -+ value = "clang-cl", -+) -+ -+selects.config_setting_group( -+ name = "config_msvc", -+ match_any = [ -+ ":config_clang_cl", -+ ":config_msvc_cl", -+ ], -+) -+ - config_setting( - name = "aarch64", - values = {"cpu": "linux-aarch_64"}, diff --git a/third_party/protobuf.patch b/third_party/protobuf.patch index 5601451f13d..c4fe4591245 100644 --- a/third_party/protobuf.patch +++ b/third_party/protobuf.patch @@ -5,7 +5,7 @@ index 45a6c20c5..c28dd8852 100755 @@ -8,3 +8,9 @@ # Copyright 2007 Google Inc. All Rights Reserved. - __version__ = '5.27.2' + __version__ = '5.28.1' + +if __name__ != '__main__': + try: diff --git a/third_party/upb/upb/BUILD b/third_party/upb/upb/BUILD index 1e9e54ce5a0..42797dc2ecb 100644 --- a/third_party/upb/upb/BUILD +++ b/third_party/upb/upb/BUILD @@ -281,6 +281,7 @@ upb_amalgamation( "//upb/lex:lex", "//upb/mem:internal", "//upb/message:internal", + "//upb/message:iterator", "//upb/message:types", "//upb/mini_descriptor:internal", "//upb/mini_table:internal", @@ -327,6 +328,7 @@ upb_amalgamation( "//upb/lex:lex", "//upb/mem:internal", "//upb/message:internal", + "//upb/message:iterator", "//upb/message:types", "//upb/mini_descriptor:internal", "//upb/mini_table:internal", @@ -374,6 +376,7 @@ upb_amalgamation( "//upb/lex:lex", "//upb/mem:internal", "//upb/message:internal", + "//upb/message:iterator", "//upb/message:types", "//upb/mini_descriptor:internal", "//upb/mini_table:internal", @@ -492,6 +495,7 @@ filegroup( # "upb_WireType", # ], # visibility = [ +# "//third_party/bazel_rules/rules_kotlin/kotlin/native:__subpackages__", # "//third_party/kotlin/protobuf:__subpackages__", # "//upb:__subpackages__", # ], diff --git a/third_party/upb/upb/README.md b/third_party/upb/upb/README.md index a0c6849ecaf..61eaddd5549 100644 --- a/third_party/upb/upb/README.md +++ b/third_party/upb/upb/README.md @@ -8,7 +8,7 @@ in C. upb is the core runtime for protobuf languages extensions in [Ruby](https://github.com/protocolbuffers/protobuf/tree/main/ruby), [PHP](https://github.com/protocolbuffers/protobuf/tree/main/php), and -[Python](https://github.com/protocolbuffers/protobuf/tree/main/upb/python). +[Python](https://github.com/protocolbuffers/protobuf/tree/main/python). While upb offers a C API, the C API & ABI **are not stable**. For this reason, upb is not generally offered as a C library for direct consumption, and there diff --git a/third_party/upb/upb/cmake/google/protobuf/descriptor.upb.h b/third_party/upb/upb/cmake/google/protobuf/descriptor.upb.h index d2a8801415f..af260e7acf7 100644 --- a/third_party/upb/upb/cmake/google/protobuf/descriptor.upb.h +++ b/third_party/upb/upb/cmake/google/protobuf/descriptor.upb.h @@ -3,7 +3,8 @@ * google/protobuf/descriptor.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H_ #define GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H_ @@ -230,6 +231,7 @@ UPB_INLINE void google_protobuf_FileDescriptorSet_clear_file(google_protobuf_Fil } UPB_INLINE const google_protobuf_FileDescriptorProto* const* google_protobuf_FileDescriptorSet_file(const google_protobuf_FileDescriptorSet* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FileDescriptorProto_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -241,6 +243,7 @@ UPB_INLINE const google_protobuf_FileDescriptorProto* const* google_protobuf_Fil } UPB_INLINE const upb_Array* _google_protobuf_FileDescriptorSet_file_upb_array(const google_protobuf_FileDescriptorSet* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FileDescriptorProto_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -249,6 +252,7 @@ UPB_INLINE const upb_Array* _google_protobuf_FileDescriptorSet_file_upb_array(co } UPB_INLINE upb_Array* _google_protobuf_FileDescriptorSet_file_mutable_upb_array(google_protobuf_FileDescriptorSet* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FileDescriptorProto_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -259,6 +263,7 @@ UPB_INLINE upb_Array* _google_protobuf_FileDescriptorSet_file_mutable_upb_array( UPB_INLINE google_protobuf_FileDescriptorProto** google_protobuf_FileDescriptorSet_mutable_file(google_protobuf_FileDescriptorSet* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FileDescriptorProto_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -275,6 +280,7 @@ UPB_INLINE google_protobuf_FileDescriptorProto** google_protobuf_FileDescriptorS } UPB_INLINE struct google_protobuf_FileDescriptorProto* google_protobuf_FileDescriptorSet_add_file(google_protobuf_FileDescriptorSet* msg, upb_Arena* arena) { upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FileDescriptorProto_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -394,6 +400,7 @@ UPB_INLINE void google_protobuf_FileDescriptorProto_clear_message_type(google_pr } UPB_INLINE const google_protobuf_DescriptorProto* const* google_protobuf_FileDescriptorProto_message_type(const google_protobuf_FileDescriptorProto* msg, size_t* size) { const upb_MiniTableField field = {4, UPB_SIZE(16, 56), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__DescriptorProto_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -405,6 +412,7 @@ UPB_INLINE const google_protobuf_DescriptorProto* const* google_protobuf_FileDes } UPB_INLINE const upb_Array* _google_protobuf_FileDescriptorProto_message_type_upb_array(const google_protobuf_FileDescriptorProto* msg, size_t* size) { const upb_MiniTableField field = {4, UPB_SIZE(16, 56), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__DescriptorProto_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -413,6 +421,7 @@ UPB_INLINE const upb_Array* _google_protobuf_FileDescriptorProto_message_type_up } UPB_INLINE upb_Array* _google_protobuf_FileDescriptorProto_message_type_mutable_upb_array(google_protobuf_FileDescriptorProto* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {4, UPB_SIZE(16, 56), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__DescriptorProto_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -426,6 +435,7 @@ UPB_INLINE void google_protobuf_FileDescriptorProto_clear_enum_type(google_proto } UPB_INLINE const google_protobuf_EnumDescriptorProto* const* google_protobuf_FileDescriptorProto_enum_type(const google_protobuf_FileDescriptorProto* msg, size_t* size) { const upb_MiniTableField field = {5, UPB_SIZE(20, 64), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__EnumDescriptorProto_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -437,6 +447,7 @@ UPB_INLINE const google_protobuf_EnumDescriptorProto* const* google_protobuf_Fil } UPB_INLINE const upb_Array* _google_protobuf_FileDescriptorProto_enum_type_upb_array(const google_protobuf_FileDescriptorProto* msg, size_t* size) { const upb_MiniTableField field = {5, UPB_SIZE(20, 64), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__EnumDescriptorProto_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -445,6 +456,7 @@ UPB_INLINE const upb_Array* _google_protobuf_FileDescriptorProto_enum_type_upb_a } UPB_INLINE upb_Array* _google_protobuf_FileDescriptorProto_enum_type_mutable_upb_array(google_protobuf_FileDescriptorProto* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {5, UPB_SIZE(20, 64), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__EnumDescriptorProto_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -458,6 +470,7 @@ UPB_INLINE void google_protobuf_FileDescriptorProto_clear_service(google_protobu } UPB_INLINE const google_protobuf_ServiceDescriptorProto* const* google_protobuf_FileDescriptorProto_service(const google_protobuf_FileDescriptorProto* msg, size_t* size) { const upb_MiniTableField field = {6, UPB_SIZE(24, 72), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__ServiceDescriptorProto_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -469,6 +482,7 @@ UPB_INLINE const google_protobuf_ServiceDescriptorProto* const* google_protobuf_ } UPB_INLINE const upb_Array* _google_protobuf_FileDescriptorProto_service_upb_array(const google_protobuf_FileDescriptorProto* msg, size_t* size) { const upb_MiniTableField field = {6, UPB_SIZE(24, 72), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__ServiceDescriptorProto_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -477,6 +491,7 @@ UPB_INLINE const upb_Array* _google_protobuf_FileDescriptorProto_service_upb_arr } UPB_INLINE upb_Array* _google_protobuf_FileDescriptorProto_service_mutable_upb_array(google_protobuf_FileDescriptorProto* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {6, UPB_SIZE(24, 72), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__ServiceDescriptorProto_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -490,6 +505,7 @@ UPB_INLINE void google_protobuf_FileDescriptorProto_clear_extension(google_proto } UPB_INLINE const google_protobuf_FieldDescriptorProto* const* google_protobuf_FileDescriptorProto_extension(const google_protobuf_FileDescriptorProto* msg, size_t* size) { const upb_MiniTableField field = {7, UPB_SIZE(28, 80), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FieldDescriptorProto_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -501,6 +517,7 @@ UPB_INLINE const google_protobuf_FieldDescriptorProto* const* google_protobuf_Fi } UPB_INLINE const upb_Array* _google_protobuf_FileDescriptorProto_extension_upb_array(const google_protobuf_FileDescriptorProto* msg, size_t* size) { const upb_MiniTableField field = {7, UPB_SIZE(28, 80), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FieldDescriptorProto_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -509,6 +526,7 @@ UPB_INLINE const upb_Array* _google_protobuf_FileDescriptorProto_extension_upb_a } UPB_INLINE upb_Array* _google_protobuf_FileDescriptorProto_extension_mutable_upb_array(google_protobuf_FileDescriptorProto* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {7, UPB_SIZE(28, 80), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FieldDescriptorProto_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -524,6 +542,7 @@ UPB_INLINE const google_protobuf_FileOptions* google_protobuf_FileDescriptorProt const google_protobuf_FileOptions* default_val = NULL; const google_protobuf_FileOptions* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FileOptions_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -540,6 +559,7 @@ UPB_INLINE const google_protobuf_SourceCodeInfo* google_protobuf_FileDescriptorP const google_protobuf_SourceCodeInfo* default_val = NULL; const google_protobuf_SourceCodeInfo* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__SourceCodeInfo_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -683,6 +703,7 @@ UPB_INLINE bool google_protobuf_FileDescriptorProto_add_dependency(google_protob } UPB_INLINE google_protobuf_DescriptorProto** google_protobuf_FileDescriptorProto_mutable_message_type(google_protobuf_FileDescriptorProto* msg, size_t* size) { upb_MiniTableField field = {4, UPB_SIZE(16, 56), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__DescriptorProto_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -699,6 +720,7 @@ UPB_INLINE google_protobuf_DescriptorProto** google_protobuf_FileDescriptorProto } UPB_INLINE struct google_protobuf_DescriptorProto* google_protobuf_FileDescriptorProto_add_message_type(google_protobuf_FileDescriptorProto* msg, upb_Arena* arena) { upb_MiniTableField field = {4, UPB_SIZE(16, 56), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__DescriptorProto_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -713,6 +735,7 @@ UPB_INLINE struct google_protobuf_DescriptorProto* google_protobuf_FileDescripto } UPB_INLINE google_protobuf_EnumDescriptorProto** google_protobuf_FileDescriptorProto_mutable_enum_type(google_protobuf_FileDescriptorProto* msg, size_t* size) { upb_MiniTableField field = {5, UPB_SIZE(20, 64), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__EnumDescriptorProto_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -729,6 +752,7 @@ UPB_INLINE google_protobuf_EnumDescriptorProto** google_protobuf_FileDescriptorP } UPB_INLINE struct google_protobuf_EnumDescriptorProto* google_protobuf_FileDescriptorProto_add_enum_type(google_protobuf_FileDescriptorProto* msg, upb_Arena* arena) { upb_MiniTableField field = {5, UPB_SIZE(20, 64), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__EnumDescriptorProto_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -743,6 +767,7 @@ UPB_INLINE struct google_protobuf_EnumDescriptorProto* google_protobuf_FileDescr } UPB_INLINE google_protobuf_ServiceDescriptorProto** google_protobuf_FileDescriptorProto_mutable_service(google_protobuf_FileDescriptorProto* msg, size_t* size) { upb_MiniTableField field = {6, UPB_SIZE(24, 72), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__ServiceDescriptorProto_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -759,6 +784,7 @@ UPB_INLINE google_protobuf_ServiceDescriptorProto** google_protobuf_FileDescript } UPB_INLINE struct google_protobuf_ServiceDescriptorProto* google_protobuf_FileDescriptorProto_add_service(google_protobuf_FileDescriptorProto* msg, upb_Arena* arena) { upb_MiniTableField field = {6, UPB_SIZE(24, 72), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__ServiceDescriptorProto_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -773,6 +799,7 @@ UPB_INLINE struct google_protobuf_ServiceDescriptorProto* google_protobuf_FileDe } UPB_INLINE google_protobuf_FieldDescriptorProto** google_protobuf_FileDescriptorProto_mutable_extension(google_protobuf_FileDescriptorProto* msg, size_t* size) { upb_MiniTableField field = {7, UPB_SIZE(28, 80), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FieldDescriptorProto_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -789,6 +816,7 @@ UPB_INLINE google_protobuf_FieldDescriptorProto** google_protobuf_FileDescriptor } UPB_INLINE struct google_protobuf_FieldDescriptorProto* google_protobuf_FileDescriptorProto_add_extension(google_protobuf_FileDescriptorProto* msg, upb_Arena* arena) { upb_MiniTableField field = {7, UPB_SIZE(28, 80), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FieldDescriptorProto_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -803,6 +831,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FileOptions_msg_init); 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) { @@ -815,6 +844,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__SourceCodeInfo_msg_init); 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) { @@ -948,6 +978,7 @@ UPB_INLINE void google_protobuf_DescriptorProto_clear_field(google_protobuf_Desc } UPB_INLINE const google_protobuf_FieldDescriptorProto* const* google_protobuf_DescriptorProto_field(const google_protobuf_DescriptorProto* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FieldDescriptorProto_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -959,6 +990,7 @@ UPB_INLINE const google_protobuf_FieldDescriptorProto* const* google_protobuf_De } UPB_INLINE const upb_Array* _google_protobuf_DescriptorProto_field_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FieldDescriptorProto_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -967,6 +999,7 @@ UPB_INLINE const upb_Array* _google_protobuf_DescriptorProto_field_upb_array(con } UPB_INLINE upb_Array* _google_protobuf_DescriptorProto_field_mutable_upb_array(google_protobuf_DescriptorProto* msg, size_t* size, upb_Arena* arena) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FieldDescriptorProto_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -980,6 +1013,7 @@ UPB_INLINE void google_protobuf_DescriptorProto_clear_nested_type(google_protobu } UPB_INLINE const google_protobuf_DescriptorProto* const* google_protobuf_DescriptorProto_nested_type(const google_protobuf_DescriptorProto* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__DescriptorProto_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -991,6 +1025,7 @@ UPB_INLINE const google_protobuf_DescriptorProto* const* google_protobuf_Descrip } UPB_INLINE const upb_Array* _google_protobuf_DescriptorProto_nested_type_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__DescriptorProto_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -999,6 +1034,7 @@ UPB_INLINE const upb_Array* _google_protobuf_DescriptorProto_nested_type_upb_arr } UPB_INLINE upb_Array* _google_protobuf_DescriptorProto_nested_type_mutable_upb_array(google_protobuf_DescriptorProto* msg, size_t* size, upb_Arena* arena) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__DescriptorProto_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -1012,6 +1048,7 @@ UPB_INLINE void google_protobuf_DescriptorProto_clear_enum_type(google_protobuf_ } UPB_INLINE const google_protobuf_EnumDescriptorProto* const* google_protobuf_DescriptorProto_enum_type(const google_protobuf_DescriptorProto* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__EnumDescriptorProto_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1023,6 +1060,7 @@ UPB_INLINE const google_protobuf_EnumDescriptorProto* const* google_protobuf_Des } UPB_INLINE const upb_Array* _google_protobuf_DescriptorProto_enum_type_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__EnumDescriptorProto_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -1031,6 +1069,7 @@ UPB_INLINE const upb_Array* _google_protobuf_DescriptorProto_enum_type_upb_array } UPB_INLINE upb_Array* _google_protobuf_DescriptorProto_enum_type_mutable_upb_array(google_protobuf_DescriptorProto* msg, size_t* size, upb_Arena* arena) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__EnumDescriptorProto_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -1044,6 +1083,7 @@ UPB_INLINE void google_protobuf_DescriptorProto_clear_extension_range(google_pro } UPB_INLINE const google_protobuf_DescriptorProto_ExtensionRange* const* google_protobuf_DescriptorProto_extension_range(const google_protobuf_DescriptorProto* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__DescriptorProto__ExtensionRange_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1055,6 +1095,7 @@ UPB_INLINE const google_protobuf_DescriptorProto_ExtensionRange* const* google_p } UPB_INLINE const upb_Array* _google_protobuf_DescriptorProto_extension_range_upb_array(const google_protobuf_DescriptorProto* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__DescriptorProto__ExtensionRange_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -1063,6 +1104,7 @@ UPB_INLINE const upb_Array* _google_protobuf_DescriptorProto_extension_range_upb } UPB_INLINE upb_Array* _google_protobuf_DescriptorProto_extension_range_mutable_upb_array(google_protobuf_DescriptorProto* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__DescriptorProto__ExtensionRange_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -1076,6 +1118,7 @@ UPB_INLINE void google_protobuf_DescriptorProto_clear_extension(google_protobuf_ } UPB_INLINE const google_protobuf_FieldDescriptorProto* const* google_protobuf_DescriptorProto_extension(const google_protobuf_DescriptorProto* msg, size_t* size) { const upb_MiniTableField field = {6, UPB_SIZE(28, 64), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FieldDescriptorProto_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1087,6 +1130,7 @@ UPB_INLINE const google_protobuf_FieldDescriptorProto* const* google_protobuf_De } UPB_INLINE const upb_Array* _google_protobuf_DescriptorProto_extension_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size) { const upb_MiniTableField field = {6, UPB_SIZE(28, 64), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FieldDescriptorProto_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -1095,6 +1139,7 @@ UPB_INLINE const upb_Array* _google_protobuf_DescriptorProto_extension_upb_array } UPB_INLINE upb_Array* _google_protobuf_DescriptorProto_extension_mutable_upb_array(google_protobuf_DescriptorProto* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {6, UPB_SIZE(28, 64), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FieldDescriptorProto_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -1110,6 +1155,7 @@ UPB_INLINE const google_protobuf_MessageOptions* google_protobuf_DescriptorProto const google_protobuf_MessageOptions* default_val = NULL; const google_protobuf_MessageOptions* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__MessageOptions_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1124,6 +1170,7 @@ UPB_INLINE void google_protobuf_DescriptorProto_clear_oneof_decl(google_protobuf } UPB_INLINE const google_protobuf_OneofDescriptorProto* const* google_protobuf_DescriptorProto_oneof_decl(const google_protobuf_DescriptorProto* msg, size_t* size) { const upb_MiniTableField field = {8, UPB_SIZE(36, 80), 0, 6, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__OneofDescriptorProto_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1135,6 +1182,7 @@ UPB_INLINE const google_protobuf_OneofDescriptorProto* const* google_protobuf_De } UPB_INLINE const upb_Array* _google_protobuf_DescriptorProto_oneof_decl_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size) { const upb_MiniTableField field = {8, UPB_SIZE(36, 80), 0, 6, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__OneofDescriptorProto_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -1143,6 +1191,7 @@ UPB_INLINE const upb_Array* _google_protobuf_DescriptorProto_oneof_decl_upb_arra } UPB_INLINE upb_Array* _google_protobuf_DescriptorProto_oneof_decl_mutable_upb_array(google_protobuf_DescriptorProto* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {8, UPB_SIZE(36, 80), 0, 6, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__OneofDescriptorProto_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -1156,6 +1205,7 @@ UPB_INLINE void google_protobuf_DescriptorProto_clear_reserved_range(google_prot } UPB_INLINE const google_protobuf_DescriptorProto_ReservedRange* const* google_protobuf_DescriptorProto_reserved_range(const google_protobuf_DescriptorProto* msg, size_t* size) { const upb_MiniTableField field = {9, UPB_SIZE(40, 88), 0, 7, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__DescriptorProto__ReservedRange_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1167,6 +1217,7 @@ UPB_INLINE const google_protobuf_DescriptorProto_ReservedRange* const* google_pr } UPB_INLINE const upb_Array* _google_protobuf_DescriptorProto_reserved_range_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size) { const upb_MiniTableField field = {9, UPB_SIZE(40, 88), 0, 7, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__DescriptorProto__ReservedRange_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -1175,6 +1226,7 @@ UPB_INLINE const upb_Array* _google_protobuf_DescriptorProto_reserved_range_upb_ } UPB_INLINE upb_Array* _google_protobuf_DescriptorProto_reserved_range_mutable_upb_array(google_protobuf_DescriptorProto* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {9, UPB_SIZE(40, 88), 0, 7, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__DescriptorProto__ReservedRange_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -1221,6 +1273,7 @@ UPB_INLINE void google_protobuf_DescriptorProto_set_name(google_protobuf_Descrip } 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FieldDescriptorProto_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1237,6 +1290,7 @@ UPB_INLINE google_protobuf_FieldDescriptorProto** google_protobuf_DescriptorProt } UPB_INLINE struct google_protobuf_FieldDescriptorProto* google_protobuf_DescriptorProto_add_field(google_protobuf_DescriptorProto* msg, upb_Arena* arena) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FieldDescriptorProto_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -1251,6 +1305,7 @@ UPB_INLINE struct google_protobuf_FieldDescriptorProto* google_protobuf_Descript } UPB_INLINE google_protobuf_DescriptorProto** google_protobuf_DescriptorProto_mutable_nested_type(google_protobuf_DescriptorProto* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__DescriptorProto_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1267,6 +1322,7 @@ UPB_INLINE google_protobuf_DescriptorProto** google_protobuf_DescriptorProto_res } UPB_INLINE struct google_protobuf_DescriptorProto* google_protobuf_DescriptorProto_add_nested_type(google_protobuf_DescriptorProto* msg, upb_Arena* arena) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__DescriptorProto_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -1281,6 +1337,7 @@ UPB_INLINE struct google_protobuf_DescriptorProto* google_protobuf_DescriptorPro } UPB_INLINE google_protobuf_EnumDescriptorProto** google_protobuf_DescriptorProto_mutable_enum_type(google_protobuf_DescriptorProto* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__EnumDescriptorProto_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1297,6 +1354,7 @@ UPB_INLINE google_protobuf_EnumDescriptorProto** google_protobuf_DescriptorProto } UPB_INLINE struct google_protobuf_EnumDescriptorProto* google_protobuf_DescriptorProto_add_enum_type(google_protobuf_DescriptorProto* msg, upb_Arena* arena) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__EnumDescriptorProto_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -1311,6 +1369,7 @@ UPB_INLINE struct google_protobuf_EnumDescriptorProto* google_protobuf_Descripto } UPB_INLINE google_protobuf_DescriptorProto_ExtensionRange** google_protobuf_DescriptorProto_mutable_extension_range(google_protobuf_DescriptorProto* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__DescriptorProto__ExtensionRange_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1327,6 +1386,7 @@ UPB_INLINE google_protobuf_DescriptorProto_ExtensionRange** google_protobuf_Desc } UPB_INLINE struct google_protobuf_DescriptorProto_ExtensionRange* google_protobuf_DescriptorProto_add_extension_range(google_protobuf_DescriptorProto* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__DescriptorProto__ExtensionRange_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -1341,6 +1401,7 @@ UPB_INLINE struct google_protobuf_DescriptorProto_ExtensionRange* google_protobu } UPB_INLINE google_protobuf_FieldDescriptorProto** google_protobuf_DescriptorProto_mutable_extension(google_protobuf_DescriptorProto* msg, size_t* size) { upb_MiniTableField field = {6, UPB_SIZE(28, 64), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FieldDescriptorProto_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1357,6 +1418,7 @@ UPB_INLINE google_protobuf_FieldDescriptorProto** google_protobuf_DescriptorProt } UPB_INLINE struct google_protobuf_FieldDescriptorProto* google_protobuf_DescriptorProto_add_extension(google_protobuf_DescriptorProto* msg, upb_Arena* arena) { upb_MiniTableField field = {6, UPB_SIZE(28, 64), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FieldDescriptorProto_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -1371,6 +1433,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__MessageOptions_msg_init); 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) { @@ -1383,6 +1446,7 @@ UPB_INLINE struct google_protobuf_MessageOptions* google_protobuf_DescriptorProt } UPB_INLINE google_protobuf_OneofDescriptorProto** google_protobuf_DescriptorProto_mutable_oneof_decl(google_protobuf_DescriptorProto* msg, size_t* size) { upb_MiniTableField field = {8, UPB_SIZE(36, 80), 0, 6, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__OneofDescriptorProto_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1399,6 +1463,7 @@ UPB_INLINE google_protobuf_OneofDescriptorProto** google_protobuf_DescriptorProt } UPB_INLINE struct google_protobuf_OneofDescriptorProto* google_protobuf_DescriptorProto_add_oneof_decl(google_protobuf_DescriptorProto* msg, upb_Arena* arena) { upb_MiniTableField field = {8, UPB_SIZE(36, 80), 0, 6, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__OneofDescriptorProto_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -1413,6 +1478,7 @@ UPB_INLINE struct google_protobuf_OneofDescriptorProto* google_protobuf_Descript } UPB_INLINE google_protobuf_DescriptorProto_ReservedRange** google_protobuf_DescriptorProto_mutable_reserved_range(google_protobuf_DescriptorProto* msg, size_t* size) { upb_MiniTableField field = {9, UPB_SIZE(40, 88), 0, 7, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__DescriptorProto__ReservedRange_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1429,6 +1495,7 @@ UPB_INLINE google_protobuf_DescriptorProto_ReservedRange** google_protobuf_Descr } UPB_INLINE struct google_protobuf_DescriptorProto_ReservedRange* google_protobuf_DescriptorProto_add_reserved_range(google_protobuf_DescriptorProto* msg, upb_Arena* arena) { upb_MiniTableField field = {9, UPB_SIZE(40, 88), 0, 7, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__DescriptorProto__ReservedRange_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -1546,6 +1613,7 @@ UPB_INLINE const google_protobuf_ExtensionRangeOptions* google_protobuf_Descript const google_protobuf_ExtensionRangeOptions* default_val = NULL; const google_protobuf_ExtensionRangeOptions* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__ExtensionRangeOptions_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1565,6 +1633,7 @@ UPB_INLINE void google_protobuf_DescriptorProto_ExtensionRange_set_end(google_pr } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__ExtensionRangeOptions_msg_init); 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) { @@ -1696,6 +1765,7 @@ UPB_INLINE void google_protobuf_ExtensionRangeOptions_clear_declaration(google_p } UPB_INLINE const google_protobuf_ExtensionRangeOptions_Declaration* const* google_protobuf_ExtensionRangeOptions_declaration(const google_protobuf_ExtensionRangeOptions* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__ExtensionRangeOptions__Declaration_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1707,6 +1777,7 @@ UPB_INLINE const google_protobuf_ExtensionRangeOptions_Declaration* const* googl } UPB_INLINE const upb_Array* _google_protobuf_ExtensionRangeOptions_declaration_upb_array(const google_protobuf_ExtensionRangeOptions* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__ExtensionRangeOptions__Declaration_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -1715,6 +1786,7 @@ UPB_INLINE const upb_Array* _google_protobuf_ExtensionRangeOptions_declaration_u } UPB_INLINE upb_Array* _google_protobuf_ExtensionRangeOptions_declaration_mutable_upb_array(google_protobuf_ExtensionRangeOptions* msg, size_t* size, upb_Arena* arena) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__ExtensionRangeOptions__Declaration_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -1746,6 +1818,7 @@ UPB_INLINE const google_protobuf_FeatureSet* google_protobuf_ExtensionRangeOptio const google_protobuf_FeatureSet* default_val = NULL; const google_protobuf_FeatureSet* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FeatureSet_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1760,6 +1833,7 @@ UPB_INLINE void google_protobuf_ExtensionRangeOptions_clear_uninterpreted_option } UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_ExtensionRangeOptions_uninterpreted_option(const google_protobuf_ExtensionRangeOptions* msg, size_t* size) { 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1771,6 +1845,7 @@ UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_Ext } UPB_INLINE const upb_Array* _google_protobuf_ExtensionRangeOptions_uninterpreted_option_upb_array(const google_protobuf_ExtensionRangeOptions* msg, size_t* size) { 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -1779,6 +1854,7 @@ UPB_INLINE const upb_Array* _google_protobuf_ExtensionRangeOptions_uninterpreted } UPB_INLINE upb_Array* _google_protobuf_ExtensionRangeOptions_uninterpreted_option_mutable_upb_array(google_protobuf_ExtensionRangeOptions* msg, size_t* size, upb_Arena* arena) { 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -1789,6 +1865,7 @@ UPB_INLINE upb_Array* _google_protobuf_ExtensionRangeOptions_uninterpreted_optio UPB_INLINE google_protobuf_ExtensionRangeOptions_Declaration** google_protobuf_ExtensionRangeOptions_mutable_declaration(google_protobuf_ExtensionRangeOptions* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__ExtensionRangeOptions__Declaration_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1805,6 +1882,7 @@ UPB_INLINE google_protobuf_ExtensionRangeOptions_Declaration** google_protobuf_E } UPB_INLINE struct google_protobuf_ExtensionRangeOptions_Declaration* google_protobuf_ExtensionRangeOptions_add_declaration(google_protobuf_ExtensionRangeOptions* msg, upb_Arena* arena) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__ExtensionRangeOptions__Declaration_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -1823,6 +1901,7 @@ UPB_INLINE void google_protobuf_ExtensionRangeOptions_set_verification(google_pr } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FeatureSet_msg_init); 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) { @@ -1835,6 +1914,7 @@ UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_ExtensionRangeOpti } UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_ExtensionRangeOptions_mutable_uninterpreted_option(google_protobuf_ExtensionRangeOptions* msg, size_t* size) { 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1851,6 +1931,7 @@ UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_ExtensionRangeO } UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_ExtensionRangeOptions_add_uninterpreted_option(google_protobuf_ExtensionRangeOptions* msg, upb_Arena* arena) { 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -2158,6 +2239,7 @@ UPB_INLINE const google_protobuf_FieldOptions* google_protobuf_FieldDescriptorPr const google_protobuf_FieldOptions* default_val = NULL; const google_protobuf_FieldOptions* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FieldOptions_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -2245,6 +2327,7 @@ UPB_INLINE void google_protobuf_FieldDescriptorProto_set_default_value(google_pr } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FieldOptions_msg_init); 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) { @@ -2328,6 +2411,7 @@ UPB_INLINE const google_protobuf_OneofOptions* google_protobuf_OneofDescriptorPr const google_protobuf_OneofOptions* default_val = NULL; const google_protobuf_OneofOptions* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__OneofOptions_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -2343,6 +2427,7 @@ UPB_INLINE void google_protobuf_OneofDescriptorProto_set_name(google_protobuf_On } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__OneofOptions_msg_init); 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) { @@ -2412,6 +2497,7 @@ UPB_INLINE void google_protobuf_EnumDescriptorProto_clear_value(google_protobuf_ } UPB_INLINE const google_protobuf_EnumValueDescriptorProto* const* google_protobuf_EnumDescriptorProto_value(const google_protobuf_EnumDescriptorProto* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__EnumValueDescriptorProto_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -2423,6 +2509,7 @@ UPB_INLINE const google_protobuf_EnumValueDescriptorProto* const* google_protobu } UPB_INLINE const upb_Array* _google_protobuf_EnumDescriptorProto_value_upb_array(const google_protobuf_EnumDescriptorProto* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__EnumValueDescriptorProto_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -2431,6 +2518,7 @@ UPB_INLINE const upb_Array* _google_protobuf_EnumDescriptorProto_value_upb_array } UPB_INLINE upb_Array* _google_protobuf_EnumDescriptorProto_value_mutable_upb_array(google_protobuf_EnumDescriptorProto* msg, size_t* size, upb_Arena* arena) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__EnumValueDescriptorProto_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -2446,6 +2534,7 @@ UPB_INLINE const google_protobuf_EnumOptions* google_protobuf_EnumDescriptorProt const google_protobuf_EnumOptions* default_val = NULL; const google_protobuf_EnumOptions* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__EnumOptions_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -2460,6 +2549,7 @@ UPB_INLINE void google_protobuf_EnumDescriptorProto_clear_reserved_range(google_ } UPB_INLINE const google_protobuf_EnumDescriptorProto_EnumReservedRange* const* google_protobuf_EnumDescriptorProto_reserved_range(const google_protobuf_EnumDescriptorProto* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -2471,6 +2561,7 @@ UPB_INLINE const google_protobuf_EnumDescriptorProto_EnumReservedRange* const* g } UPB_INLINE const upb_Array* _google_protobuf_EnumDescriptorProto_reserved_range_upb_array(const google_protobuf_EnumDescriptorProto* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -2479,6 +2570,7 @@ UPB_INLINE const upb_Array* _google_protobuf_EnumDescriptorProto_reserved_range_ } UPB_INLINE upb_Array* _google_protobuf_EnumDescriptorProto_reserved_range_mutable_upb_array(google_protobuf_EnumDescriptorProto* msg, size_t* size, upb_Arena* arena) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -2525,6 +2617,7 @@ UPB_INLINE void google_protobuf_EnumDescriptorProto_set_name(google_protobuf_Enu } 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__EnumValueDescriptorProto_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -2541,6 +2634,7 @@ UPB_INLINE google_protobuf_EnumValueDescriptorProto** google_protobuf_EnumDescri } UPB_INLINE struct google_protobuf_EnumValueDescriptorProto* google_protobuf_EnumDescriptorProto_add_value(google_protobuf_EnumDescriptorProto* msg, upb_Arena* arena) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__EnumValueDescriptorProto_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -2555,6 +2649,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__EnumOptions_msg_init); 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) { @@ -2567,6 +2662,7 @@ UPB_INLINE struct google_protobuf_EnumOptions* google_protobuf_EnumDescriptorPro } UPB_INLINE google_protobuf_EnumDescriptorProto_EnumReservedRange** google_protobuf_EnumDescriptorProto_mutable_reserved_range(google_protobuf_EnumDescriptorProto* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -2583,6 +2679,7 @@ UPB_INLINE google_protobuf_EnumDescriptorProto_EnumReservedRange** google_protob } UPB_INLINE struct google_protobuf_EnumDescriptorProto_EnumReservedRange* google_protobuf_EnumDescriptorProto_add_reserved_range(google_protobuf_EnumDescriptorProto* msg, upb_Arena* arena) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -2778,6 +2875,7 @@ UPB_INLINE const google_protobuf_EnumValueOptions* google_protobuf_EnumValueDesc const google_protobuf_EnumValueOptions* default_val = NULL; const google_protobuf_EnumValueOptions* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__EnumValueOptions_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -2797,6 +2895,7 @@ UPB_INLINE void google_protobuf_EnumValueDescriptorProto_set_number(google_proto } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__EnumValueOptions_msg_init); 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) { @@ -2866,6 +2965,7 @@ UPB_INLINE void google_protobuf_ServiceDescriptorProto_clear_method(google_proto } UPB_INLINE const google_protobuf_MethodDescriptorProto* const* google_protobuf_ServiceDescriptorProto_method(const google_protobuf_ServiceDescriptorProto* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__MethodDescriptorProto_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -2877,6 +2977,7 @@ UPB_INLINE const google_protobuf_MethodDescriptorProto* const* google_protobuf_S } UPB_INLINE const upb_Array* _google_protobuf_ServiceDescriptorProto_method_upb_array(const google_protobuf_ServiceDescriptorProto* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__MethodDescriptorProto_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -2885,6 +2986,7 @@ UPB_INLINE const upb_Array* _google_protobuf_ServiceDescriptorProto_method_upb_a } UPB_INLINE upb_Array* _google_protobuf_ServiceDescriptorProto_method_mutable_upb_array(google_protobuf_ServiceDescriptorProto* msg, size_t* size, upb_Arena* arena) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__MethodDescriptorProto_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -2900,6 +3002,7 @@ UPB_INLINE const google_protobuf_ServiceOptions* google_protobuf_ServiceDescript const google_protobuf_ServiceOptions* default_val = NULL; const google_protobuf_ServiceOptions* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__ServiceOptions_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -2915,6 +3018,7 @@ UPB_INLINE void google_protobuf_ServiceDescriptorProto_set_name(google_protobuf_ } 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__MethodDescriptorProto_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -2931,6 +3035,7 @@ UPB_INLINE google_protobuf_MethodDescriptorProto** google_protobuf_ServiceDescri } UPB_INLINE struct google_protobuf_MethodDescriptorProto* google_protobuf_ServiceDescriptorProto_add_method(google_protobuf_ServiceDescriptorProto* msg, upb_Arena* arena) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__MethodDescriptorProto_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -2945,6 +3050,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__ServiceOptions_msg_init); 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) { @@ -3048,6 +3154,7 @@ UPB_INLINE const google_protobuf_MethodOptions* google_protobuf_MethodDescriptor const google_protobuf_MethodOptions* default_val = NULL; const google_protobuf_MethodOptions* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__MethodOptions_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -3103,6 +3210,7 @@ UPB_INLINE void google_protobuf_MethodDescriptorProto_set_output_type(google_pro } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__MethodOptions_msg_init); 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) { @@ -3470,6 +3578,7 @@ UPB_INLINE const google_protobuf_FeatureSet* google_protobuf_FileOptions_feature const google_protobuf_FeatureSet* default_val = NULL; const google_protobuf_FeatureSet* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FeatureSet_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -3484,6 +3593,7 @@ UPB_INLINE void google_protobuf_FileOptions_clear_uninterpreted_option(google_pr } UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_FileOptions_uninterpreted_option(const google_protobuf_FileOptions* msg, size_t* size) { const upb_MiniTableField field = {999, UPB_SIZE(28, 192), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -3495,6 +3605,7 @@ UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_Fil } UPB_INLINE const upb_Array* _google_protobuf_FileOptions_uninterpreted_option_upb_array(const google_protobuf_FileOptions* msg, size_t* size) { const upb_MiniTableField field = {999, UPB_SIZE(28, 192), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -3503,6 +3614,7 @@ UPB_INLINE const upb_Array* _google_protobuf_FileOptions_uninterpreted_option_up } UPB_INLINE upb_Array* _google_protobuf_FileOptions_uninterpreted_option_mutable_upb_array(google_protobuf_FileOptions* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {999, UPB_SIZE(28, 192), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -3589,6 +3701,7 @@ UPB_INLINE void google_protobuf_FileOptions_set_ruby_package(google_protobuf_Fil } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FeatureSet_msg_init); 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) { @@ -3601,6 +3714,7 @@ UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_FileOptions_mutabl } UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_FileOptions_mutable_uninterpreted_option(google_protobuf_FileOptions* msg, size_t* size) { upb_MiniTableField field = {999, UPB_SIZE(28, 192), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -3617,6 +3731,7 @@ UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_FileOptions_res } UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_FileOptions_add_uninterpreted_option(google_protobuf_FileOptions* msg, upb_Arena* arena) { upb_MiniTableField field = {999, UPB_SIZE(28, 192), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -3754,6 +3869,7 @@ UPB_INLINE const google_protobuf_FeatureSet* google_protobuf_MessageOptions_feat const google_protobuf_FeatureSet* default_val = NULL; const google_protobuf_FeatureSet* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FeatureSet_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -3768,6 +3884,7 @@ UPB_INLINE void google_protobuf_MessageOptions_clear_uninterpreted_option(google } UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_MessageOptions_uninterpreted_option(const google_protobuf_MessageOptions* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -3779,6 +3896,7 @@ UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_Mes } UPB_INLINE const upb_Array* _google_protobuf_MessageOptions_uninterpreted_option_upb_array(const google_protobuf_MessageOptions* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -3787,6 +3905,7 @@ UPB_INLINE const upb_Array* _google_protobuf_MessageOptions_uninterpreted_option } UPB_INLINE upb_Array* _google_protobuf_MessageOptions_uninterpreted_option_mutable_upb_array(google_protobuf_MessageOptions* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -3817,6 +3936,7 @@ UPB_INLINE void google_protobuf_MessageOptions_set_deprecated_legacy_json_field_ } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FeatureSet_msg_init); 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) { @@ -3829,6 +3949,7 @@ UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_MessageOptions_mut } UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_MessageOptions_mutable_uninterpreted_option(google_protobuf_MessageOptions* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -3845,6 +3966,7 @@ UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_MessageOptions_ } UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_MessageOptions_add_uninterpreted_option(google_protobuf_MessageOptions* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -4076,6 +4198,7 @@ UPB_INLINE void google_protobuf_FieldOptions_clear_edition_defaults(google_proto } UPB_INLINE const google_protobuf_FieldOptions_EditionDefault* const* google_protobuf_FieldOptions_edition_defaults(const google_protobuf_FieldOptions* msg, size_t* size) { const upb_MiniTableField field = {20, UPB_SIZE(36, 40), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FieldOptions__EditionDefault_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -4087,6 +4210,7 @@ UPB_INLINE const google_protobuf_FieldOptions_EditionDefault* const* google_prot } UPB_INLINE const upb_Array* _google_protobuf_FieldOptions_edition_defaults_upb_array(const google_protobuf_FieldOptions* msg, size_t* size) { const upb_MiniTableField field = {20, UPB_SIZE(36, 40), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FieldOptions__EditionDefault_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -4095,6 +4219,7 @@ UPB_INLINE const upb_Array* _google_protobuf_FieldOptions_edition_defaults_upb_a } UPB_INLINE upb_Array* _google_protobuf_FieldOptions_edition_defaults_mutable_upb_array(google_protobuf_FieldOptions* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {20, UPB_SIZE(36, 40), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FieldOptions__EditionDefault_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -4110,6 +4235,7 @@ UPB_INLINE const google_protobuf_FeatureSet* google_protobuf_FieldOptions_featur const google_protobuf_FeatureSet* default_val = NULL; const google_protobuf_FeatureSet* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FeatureSet_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -4126,6 +4252,7 @@ UPB_INLINE const google_protobuf_FieldOptions_FeatureSupport* google_protobuf_Fi 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FieldOptions__FeatureSupport_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -4140,6 +4267,7 @@ UPB_INLINE void google_protobuf_FieldOptions_clear_uninterpreted_option(google_p } 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(48, 64), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -4151,6 +4279,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(48, 64), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -4159,6 +4288,7 @@ UPB_INLINE const upb_Array* _google_protobuf_FieldOptions_uninterpreted_option_u } 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(48, 64), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -4233,6 +4363,7 @@ UPB_INLINE bool google_protobuf_FieldOptions_add_targets(google_protobuf_FieldOp } UPB_INLINE google_protobuf_FieldOptions_EditionDefault** google_protobuf_FieldOptions_mutable_edition_defaults(google_protobuf_FieldOptions* msg, size_t* size) { upb_MiniTableField field = {20, UPB_SIZE(36, 40), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FieldOptions__EditionDefault_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -4249,6 +4380,7 @@ UPB_INLINE google_protobuf_FieldOptions_EditionDefault** google_protobuf_FieldOp } UPB_INLINE struct google_protobuf_FieldOptions_EditionDefault* google_protobuf_FieldOptions_add_edition_defaults(google_protobuf_FieldOptions* msg, upb_Arena* arena) { upb_MiniTableField field = {20, UPB_SIZE(36, 40), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FieldOptions__EditionDefault_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -4263,6 +4395,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FeatureSet_msg_init); 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) { @@ -4275,6 +4408,7 @@ UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_FieldOptions_mutab } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FieldOptions__FeatureSupport_msg_init); 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) { @@ -4287,6 +4421,7 @@ UPB_INLINE struct google_protobuf_FieldOptions_FeatureSupport* google_protobuf_F } UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_FieldOptions_mutable_uninterpreted_option(google_protobuf_FieldOptions* msg, size_t* size) { 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -4303,6 +4438,7 @@ UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_FieldOptions_re } 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(48, 64), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -4556,6 +4692,7 @@ UPB_INLINE const google_protobuf_FeatureSet* google_protobuf_OneofOptions_featur const google_protobuf_FeatureSet* default_val = NULL; const google_protobuf_FeatureSet* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FeatureSet_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -4570,6 +4707,7 @@ UPB_INLINE void google_protobuf_OneofOptions_clear_uninterpreted_option(google_p } UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_OneofOptions_uninterpreted_option(const google_protobuf_OneofOptions* msg, size_t* size) { const upb_MiniTableField field = {999, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -4581,6 +4719,7 @@ UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_One } UPB_INLINE const upb_Array* _google_protobuf_OneofOptions_uninterpreted_option_upb_array(const google_protobuf_OneofOptions* msg, size_t* size) { const upb_MiniTableField field = {999, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -4589,6 +4728,7 @@ UPB_INLINE const upb_Array* _google_protobuf_OneofOptions_uninterpreted_option_u } UPB_INLINE upb_Array* _google_protobuf_OneofOptions_uninterpreted_option_mutable_upb_array(google_protobuf_OneofOptions* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {999, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -4599,6 +4739,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FeatureSet_msg_init); 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) { @@ -4611,6 +4752,7 @@ UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_OneofOptions_mutab } UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_OneofOptions_mutable_uninterpreted_option(google_protobuf_OneofOptions* msg, size_t* size) { upb_MiniTableField field = {999, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -4627,6 +4769,7 @@ UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_OneofOptions_re } UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_OneofOptions_add_uninterpreted_option(google_protobuf_OneofOptions* msg, upb_Arena* arena) { upb_MiniTableField field = {999, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -4732,6 +4875,7 @@ UPB_INLINE const google_protobuf_FeatureSet* google_protobuf_EnumOptions_feature const google_protobuf_FeatureSet* default_val = NULL; const google_protobuf_FeatureSet* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FeatureSet_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -4746,6 +4890,7 @@ UPB_INLINE void google_protobuf_EnumOptions_clear_uninterpreted_option(google_pr } UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_EnumOptions_uninterpreted_option(const google_protobuf_EnumOptions* msg, size_t* size) { const upb_MiniTableField field = {999, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -4757,6 +4902,7 @@ UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_Enu } UPB_INLINE const upb_Array* _google_protobuf_EnumOptions_uninterpreted_option_upb_array(const google_protobuf_EnumOptions* msg, size_t* size) { const upb_MiniTableField field = {999, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -4765,6 +4911,7 @@ UPB_INLINE const upb_Array* _google_protobuf_EnumOptions_uninterpreted_option_up } UPB_INLINE upb_Array* _google_protobuf_EnumOptions_uninterpreted_option_mutable_upb_array(google_protobuf_EnumOptions* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {999, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -4787,6 +4934,7 @@ UPB_INLINE void google_protobuf_EnumOptions_set_deprecated_legacy_json_field_con } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FeatureSet_msg_init); 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) { @@ -4799,6 +4947,7 @@ UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_EnumOptions_mutabl } UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_EnumOptions_mutable_uninterpreted_option(google_protobuf_EnumOptions* msg, size_t* size) { upb_MiniTableField field = {999, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -4815,6 +4964,7 @@ UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_EnumOptions_res } UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_EnumOptions_add_uninterpreted_option(google_protobuf_EnumOptions* msg, upb_Arena* arena) { upb_MiniTableField field = {999, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -4888,6 +5038,7 @@ UPB_INLINE const google_protobuf_FeatureSet* google_protobuf_EnumValueOptions_fe const google_protobuf_FeatureSet* default_val = NULL; const google_protobuf_FeatureSet* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FeatureSet_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -4920,6 +5071,7 @@ UPB_INLINE const google_protobuf_FieldOptions_FeatureSupport* google_protobuf_En 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FieldOptions__FeatureSupport_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -4934,6 +5086,7 @@ UPB_INLINE void google_protobuf_EnumValueOptions_clear_uninterpreted_option(goog } 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(24, 32), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -4945,6 +5098,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(24, 32), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -4953,6 +5107,7 @@ UPB_INLINE const upb_Array* _google_protobuf_EnumValueOptions_uninterpreted_opti } 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(24, 32), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -4967,6 +5122,7 @@ UPB_INLINE void google_protobuf_EnumValueOptions_set_deprecated(google_protobuf_ } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FeatureSet_msg_init); 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) { @@ -4983,6 +5139,7 @@ UPB_INLINE void google_protobuf_EnumValueOptions_set_debug_redact(google_protobu } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FieldOptions__FeatureSupport_msg_init); 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) { @@ -4995,6 +5152,7 @@ UPB_INLINE struct google_protobuf_FieldOptions_FeatureSupport* google_protobuf_E } UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_EnumValueOptions_mutable_uninterpreted_option(google_protobuf_EnumValueOptions* msg, size_t* size) { 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -5011,6 +5169,7 @@ UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_EnumValueOption } 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(24, 32), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -5084,6 +5243,7 @@ UPB_INLINE const google_protobuf_FeatureSet* google_protobuf_ServiceOptions_feat const google_protobuf_FeatureSet* default_val = NULL; const google_protobuf_FeatureSet* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FeatureSet_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -5098,6 +5258,7 @@ UPB_INLINE void google_protobuf_ServiceOptions_clear_uninterpreted_option(google } UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_ServiceOptions_uninterpreted_option(const google_protobuf_ServiceOptions* msg, size_t* size) { const upb_MiniTableField field = {999, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -5109,6 +5270,7 @@ UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_Ser } UPB_INLINE const upb_Array* _google_protobuf_ServiceOptions_uninterpreted_option_upb_array(const google_protobuf_ServiceOptions* msg, size_t* size) { const upb_MiniTableField field = {999, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -5117,6 +5279,7 @@ UPB_INLINE const upb_Array* _google_protobuf_ServiceOptions_uninterpreted_option } UPB_INLINE upb_Array* _google_protobuf_ServiceOptions_uninterpreted_option_mutable_upb_array(google_protobuf_ServiceOptions* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {999, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -5131,6 +5294,7 @@ UPB_INLINE void google_protobuf_ServiceOptions_set_deprecated(google_protobuf_Se } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FeatureSet_msg_init); 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) { @@ -5143,6 +5307,7 @@ UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_ServiceOptions_mut } UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_ServiceOptions_mutable_uninterpreted_option(google_protobuf_ServiceOptions* msg, size_t* size) { upb_MiniTableField field = {999, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -5159,6 +5324,7 @@ UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_ServiceOptions_ } UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_ServiceOptions_add_uninterpreted_option(google_protobuf_ServiceOptions* msg, upb_Arena* arena) { upb_MiniTableField field = {999, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -5248,6 +5414,7 @@ UPB_INLINE const google_protobuf_FeatureSet* google_protobuf_MethodOptions_featu const google_protobuf_FeatureSet* default_val = NULL; const google_protobuf_FeatureSet* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FeatureSet_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -5262,6 +5429,7 @@ UPB_INLINE void google_protobuf_MethodOptions_clear_uninterpreted_option(google_ } UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_MethodOptions_uninterpreted_option(const google_protobuf_MethodOptions* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -5273,6 +5441,7 @@ UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_Met } UPB_INLINE const upb_Array* _google_protobuf_MethodOptions_uninterpreted_option_upb_array(const google_protobuf_MethodOptions* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -5281,6 +5450,7 @@ UPB_INLINE const upb_Array* _google_protobuf_MethodOptions_uninterpreted_option_ } UPB_INLINE upb_Array* _google_protobuf_MethodOptions_uninterpreted_option_mutable_upb_array(google_protobuf_MethodOptions* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -5299,6 +5469,7 @@ UPB_INLINE void google_protobuf_MethodOptions_set_idempotency_level(google_proto } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FeatureSet_msg_init); 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) { @@ -5311,6 +5482,7 @@ UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_MethodOptions_muta } UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_MethodOptions_mutable_uninterpreted_option(google_protobuf_MethodOptions* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -5327,6 +5499,7 @@ UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_MethodOptions_r } UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_MethodOptions_add_uninterpreted_option(google_protobuf_MethodOptions* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -5382,6 +5555,7 @@ UPB_INLINE void google_protobuf_UninterpretedOption_clear_name(google_protobuf_U } UPB_INLINE const google_protobuf_UninterpretedOption_NamePart* const* google_protobuf_UninterpretedOption_name(const google_protobuf_UninterpretedOption* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption__NamePart_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -5393,6 +5567,7 @@ UPB_INLINE const google_protobuf_UninterpretedOption_NamePart* const* google_pro } UPB_INLINE const upb_Array* _google_protobuf_UninterpretedOption_name_upb_array(const google_protobuf_UninterpretedOption* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption__NamePart_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -5401,6 +5576,7 @@ UPB_INLINE const upb_Array* _google_protobuf_UninterpretedOption_name_upb_array( } UPB_INLINE upb_Array* _google_protobuf_UninterpretedOption_name_mutable_upb_array(google_protobuf_UninterpretedOption* msg, size_t* size, upb_Arena* arena) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption__NamePart_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -5507,6 +5683,7 @@ UPB_INLINE bool google_protobuf_UninterpretedOption_has_aggregate_value(const go UPB_INLINE google_protobuf_UninterpretedOption_NamePart** google_protobuf_UninterpretedOption_mutable_name(google_protobuf_UninterpretedOption* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption__NamePart_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -5523,6 +5700,7 @@ UPB_INLINE google_protobuf_UninterpretedOption_NamePart** google_protobuf_Uninte } UPB_INLINE struct google_protobuf_UninterpretedOption_NamePart* google_protobuf_UninterpretedOption_add_name(google_protobuf_UninterpretedOption* msg, upb_Arena* arena) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption__NamePart_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -5838,6 +6016,7 @@ UPB_INLINE void google_protobuf_FeatureSetDefaults_clear_defaults(google_protobu } UPB_INLINE const google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* const* google_protobuf_FeatureSetDefaults_defaults(const google_protobuf_FeatureSetDefaults* msg, size_t* size) { const upb_MiniTableField field = {1, UPB_SIZE(12, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -5849,6 +6028,7 @@ UPB_INLINE const google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* co } UPB_INLINE const upb_Array* _google_protobuf_FeatureSetDefaults_defaults_upb_array(const google_protobuf_FeatureSetDefaults* msg, size_t* size) { const upb_MiniTableField field = {1, UPB_SIZE(12, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -5857,6 +6037,7 @@ UPB_INLINE const upb_Array* _google_protobuf_FeatureSetDefaults_defaults_upb_arr } UPB_INLINE upb_Array* _google_protobuf_FeatureSetDefaults_defaults_mutable_upb_array(google_protobuf_FeatureSetDefaults* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {1, UPB_SIZE(12, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -5899,6 +6080,7 @@ UPB_INLINE bool google_protobuf_FeatureSetDefaults_has_maximum_edition(const goo UPB_INLINE google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault** google_protobuf_FeatureSetDefaults_mutable_defaults(google_protobuf_FeatureSetDefaults* msg, size_t* size) { upb_MiniTableField field = {1, UPB_SIZE(12, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -5915,6 +6097,7 @@ UPB_INLINE google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault** google_ } UPB_INLINE struct google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* google_protobuf_FeatureSetDefaults_add_defaults(google_protobuf_FeatureSetDefaults* msg, upb_Arena* arena) { upb_MiniTableField field = {1, UPB_SIZE(12, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -5996,6 +6179,7 @@ UPB_INLINE const google_protobuf_FeatureSet* google_protobuf_FeatureSetDefaults_ const google_protobuf_FeatureSet* default_val = NULL; const google_protobuf_FeatureSet* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FeatureSet_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -6012,6 +6196,7 @@ UPB_INLINE const google_protobuf_FeatureSet* google_protobuf_FeatureSetDefaults_ 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FeatureSet_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -6027,6 +6212,7 @@ UPB_INLINE void google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_set_ } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FeatureSet_msg_init); upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_mutable_overridable_features(google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* msg, upb_Arena* arena) { @@ -6039,6 +6225,7 @@ UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_FeatureSetDefaults } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FeatureSet_msg_init); 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) { @@ -6092,6 +6279,7 @@ UPB_INLINE void google_protobuf_SourceCodeInfo_clear_location(google_protobuf_So } UPB_INLINE const google_protobuf_SourceCodeInfo_Location* const* google_protobuf_SourceCodeInfo_location(const google_protobuf_SourceCodeInfo* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__SourceCodeInfo__Location_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -6103,6 +6291,7 @@ UPB_INLINE const google_protobuf_SourceCodeInfo_Location* const* google_protobuf } UPB_INLINE const upb_Array* _google_protobuf_SourceCodeInfo_location_upb_array(const google_protobuf_SourceCodeInfo* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__SourceCodeInfo__Location_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -6111,6 +6300,7 @@ UPB_INLINE const upb_Array* _google_protobuf_SourceCodeInfo_location_upb_array(c } UPB_INLINE upb_Array* _google_protobuf_SourceCodeInfo_location_mutable_upb_array(google_protobuf_SourceCodeInfo* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__SourceCodeInfo__Location_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -6121,6 +6311,7 @@ UPB_INLINE upb_Array* _google_protobuf_SourceCodeInfo_location_mutable_upb_array UPB_INLINE google_protobuf_SourceCodeInfo_Location** google_protobuf_SourceCodeInfo_mutable_location(google_protobuf_SourceCodeInfo* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__SourceCodeInfo__Location_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -6137,6 +6328,7 @@ UPB_INLINE google_protobuf_SourceCodeInfo_Location** google_protobuf_SourceCodeI } UPB_INLINE struct google_protobuf_SourceCodeInfo_Location* google_protobuf_SourceCodeInfo_add_location(google_protobuf_SourceCodeInfo* msg, upb_Arena* arena) { upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__SourceCodeInfo__Location_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -6450,6 +6642,7 @@ UPB_INLINE void google_protobuf_GeneratedCodeInfo_clear_annotation(google_protob } UPB_INLINE const google_protobuf_GeneratedCodeInfo_Annotation* const* google_protobuf_GeneratedCodeInfo_annotation(const google_protobuf_GeneratedCodeInfo* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__GeneratedCodeInfo__Annotation_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -6461,6 +6654,7 @@ UPB_INLINE const google_protobuf_GeneratedCodeInfo_Annotation* const* google_pro } UPB_INLINE const upb_Array* _google_protobuf_GeneratedCodeInfo_annotation_upb_array(const google_protobuf_GeneratedCodeInfo* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__GeneratedCodeInfo__Annotation_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -6469,6 +6663,7 @@ UPB_INLINE const upb_Array* _google_protobuf_GeneratedCodeInfo_annotation_upb_ar } UPB_INLINE upb_Array* _google_protobuf_GeneratedCodeInfo_annotation_mutable_upb_array(google_protobuf_GeneratedCodeInfo* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__GeneratedCodeInfo__Annotation_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -6479,6 +6674,7 @@ UPB_INLINE upb_Array* _google_protobuf_GeneratedCodeInfo_annotation_mutable_upb_ UPB_INLINE google_protobuf_GeneratedCodeInfo_Annotation** google_protobuf_GeneratedCodeInfo_mutable_annotation(google_protobuf_GeneratedCodeInfo* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__GeneratedCodeInfo__Annotation_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -6495,6 +6691,7 @@ UPB_INLINE google_protobuf_GeneratedCodeInfo_Annotation** google_protobuf_Genera } UPB_INLINE struct google_protobuf_GeneratedCodeInfo_Annotation* google_protobuf_GeneratedCodeInfo_add_annotation(google_protobuf_GeneratedCodeInfo* msg, upb_Arena* arena) { upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__GeneratedCodeInfo__Annotation_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( diff --git a/third_party/upb/upb/cmake/google/protobuf/descriptor.upb_minitable.c b/third_party/upb/upb/cmake/google/protobuf/descriptor.upb_minitable.c index 9bd32e10876..08fa451f750 100644 --- a/third_party/upb/upb/cmake/google/protobuf/descriptor.upb_minitable.c +++ b/third_party/upb/upb/cmake/google/protobuf/descriptor.upb_minitable.c @@ -3,7 +3,8 @@ * google/protobuf/descriptor.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -12,8 +13,9 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub google_protobuf_FileDescriptorSet_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__FileDescriptorProto_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal google_protobuf_FileDescriptorSet_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__FileDescriptorProto_msg_init_ptr}, }; static const upb_MiniTableField google_protobuf_FileDescriptorSet__fields[1] = { @@ -33,13 +35,14 @@ const upb_MiniTable google__protobuf__FileDescriptorSet_msg_init = { }) }; -static const upb_MiniTableSub google_protobuf_FileDescriptorProto_submsgs[7] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__DescriptorProto_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__EnumDescriptorProto_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__ServiceDescriptorProto_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__FieldDescriptorProto_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__FileOptions_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__SourceCodeInfo_msg_init}, +const upb_MiniTable* google__protobuf__FileDescriptorSet_msg_init_ptr = &google__protobuf__FileDescriptorSet_msg_init; +static const upb_MiniTableSubInternal google_protobuf_FileDescriptorProto_submsgs[7] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__DescriptorProto_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__EnumDescriptorProto_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__ServiceDescriptorProto_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__FieldDescriptorProto_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__FileOptions_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__SourceCodeInfo_msg_init_ptr}, {.UPB_PRIVATE(subenum) = &google_protobuf_Edition_enum_init}, }; @@ -86,15 +89,16 @@ const upb_MiniTable google__protobuf__FileDescriptorProto_msg_init = { }) }; -static const upb_MiniTableSub google_protobuf_DescriptorProto_submsgs[8] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__FieldDescriptorProto_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__DescriptorProto_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__EnumDescriptorProto_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__DescriptorProto__ExtensionRange_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__FieldDescriptorProto_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__MessageOptions_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__OneofDescriptorProto_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__DescriptorProto__ReservedRange_msg_init}, +const upb_MiniTable* google__protobuf__FileDescriptorProto_msg_init_ptr = &google__protobuf__FileDescriptorProto_msg_init; +static const upb_MiniTableSubInternal google_protobuf_DescriptorProto_submsgs[8] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__FieldDescriptorProto_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__DescriptorProto_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__EnumDescriptorProto_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__DescriptorProto__ExtensionRange_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__FieldDescriptorProto_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__MessageOptions_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__OneofDescriptorProto_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__DescriptorProto__ReservedRange_msg_init_ptr}, }; static const upb_MiniTableField google_protobuf_DescriptorProto__fields[10] = { @@ -137,8 +141,9 @@ const upb_MiniTable google__protobuf__DescriptorProto_msg_init = { }) }; -static const upb_MiniTableSub google_protobuf_DescriptorProto_ExtensionRange_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__ExtensionRangeOptions_msg_init}, +const upb_MiniTable* google__protobuf__DescriptorProto_msg_init_ptr = &google__protobuf__DescriptorProto_msg_init; +static const upb_MiniTableSubInternal google_protobuf_DescriptorProto_ExtensionRange_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__ExtensionRangeOptions_msg_init_ptr}, }; static const upb_MiniTableField google_protobuf_DescriptorProto_ExtensionRange__fields[3] = { @@ -156,6 +161,7 @@ const upb_MiniTable google__protobuf__DescriptorProto__ExtensionRange_msg_init = #endif }; +const upb_MiniTable* google__protobuf__DescriptorProto__ExtensionRange_msg_init_ptr = &google__protobuf__DescriptorProto__ExtensionRange_msg_init; static const upb_MiniTableField google_protobuf_DescriptorProto_ReservedRange__fields[2] = { {1, 12, 64, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, {2, 16, 65, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, @@ -170,10 +176,11 @@ const upb_MiniTable google__protobuf__DescriptorProto__ReservedRange_msg_init = #endif }; -static const upb_MiniTableSub google_protobuf_ExtensionRangeOptions_submsgs[4] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__ExtensionRangeOptions__Declaration_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init}, +const upb_MiniTable* google__protobuf__DescriptorProto__ReservedRange_msg_init_ptr = &google__protobuf__DescriptorProto__ReservedRange_msg_init; +static const upb_MiniTableSubInternal google_protobuf_ExtensionRangeOptions_submsgs[4] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__ExtensionRangeOptions__Declaration_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init_ptr}, {.UPB_PRIVATE(subenum) = &google_protobuf_ExtensionRangeOptions_VerificationState_enum_init}, }; @@ -227,6 +234,7 @@ const upb_MiniTable google__protobuf__ExtensionRangeOptions_msg_init = { }) }; +const upb_MiniTable* google__protobuf__ExtensionRangeOptions_msg_init_ptr = &google__protobuf__ExtensionRangeOptions_msg_init; static const upb_MiniTableField google_protobuf_ExtensionRangeOptions_Declaration__fields[5] = { {1, 12, 64, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, {2, UPB_SIZE(20, 24), 65, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, @@ -244,8 +252,9 @@ const upb_MiniTable google__protobuf__ExtensionRangeOptions__Declaration_msg_ini #endif }; -static const upb_MiniTableSub google_protobuf_FieldDescriptorProto_submsgs[3] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__FieldOptions_msg_init}, +const upb_MiniTable* google__protobuf__ExtensionRangeOptions__Declaration_msg_init_ptr = &google__protobuf__ExtensionRangeOptions__Declaration_msg_init; +static const upb_MiniTableSubInternal google_protobuf_FieldDescriptorProto_submsgs[3] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__FieldOptions_msg_init_ptr}, {.UPB_PRIVATE(subenum) = &google_protobuf_FieldDescriptorProto_Label_enum_init}, {.UPB_PRIVATE(subenum) = &google_protobuf_FieldDescriptorProto_Type_enum_init}, }; @@ -273,8 +282,9 @@ const upb_MiniTable google__protobuf__FieldDescriptorProto_msg_init = { #endif }; -static const upb_MiniTableSub google_protobuf_OneofDescriptorProto_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__OneofOptions_msg_init}, +const upb_MiniTable* google__protobuf__FieldDescriptorProto_msg_init_ptr = &google__protobuf__FieldDescriptorProto_msg_init; +static const upb_MiniTableSubInternal google_protobuf_OneofDescriptorProto_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__OneofOptions_msg_init_ptr}, }; static const upb_MiniTableField google_protobuf_OneofDescriptorProto__fields[2] = { @@ -291,10 +301,11 @@ const upb_MiniTable google__protobuf__OneofDescriptorProto_msg_init = { #endif }; -static const upb_MiniTableSub google_protobuf_EnumDescriptorProto_submsgs[3] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__EnumValueDescriptorProto_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__EnumOptions_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init}, +const upb_MiniTable* google__protobuf__OneofDescriptorProto_msg_init_ptr = &google__protobuf__OneofDescriptorProto_msg_init; +static const upb_MiniTableSubInternal google_protobuf_EnumDescriptorProto_submsgs[3] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__EnumValueDescriptorProto_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__EnumOptions_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init_ptr}, }; static const upb_MiniTableField google_protobuf_EnumDescriptorProto__fields[5] = { @@ -324,6 +335,7 @@ const upb_MiniTable google__protobuf__EnumDescriptorProto_msg_init = { }) }; +const upb_MiniTable* google__protobuf__EnumDescriptorProto_msg_init_ptr = &google__protobuf__EnumDescriptorProto_msg_init; static const upb_MiniTableField google_protobuf_EnumDescriptorProto_EnumReservedRange__fields[2] = { {1, 12, 64, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, {2, 16, 65, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, @@ -338,8 +350,9 @@ const upb_MiniTable google__protobuf__EnumDescriptorProto__EnumReservedRange_msg #endif }; -static const upb_MiniTableSub google_protobuf_EnumValueDescriptorProto_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__EnumValueOptions_msg_init}, +const upb_MiniTable* google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init_ptr = &google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init; +static const upb_MiniTableSubInternal google_protobuf_EnumValueDescriptorProto_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__EnumValueOptions_msg_init_ptr}, }; static const upb_MiniTableField google_protobuf_EnumValueDescriptorProto__fields[3] = { @@ -357,9 +370,10 @@ const upb_MiniTable google__protobuf__EnumValueDescriptorProto_msg_init = { #endif }; -static const upb_MiniTableSub google_protobuf_ServiceDescriptorProto_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__MethodDescriptorProto_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__ServiceOptions_msg_init}, +const upb_MiniTable* google__protobuf__EnumValueDescriptorProto_msg_init_ptr = &google__protobuf__EnumValueDescriptorProto_msg_init; +static const upb_MiniTableSubInternal google_protobuf_ServiceDescriptorProto_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__MethodDescriptorProto_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__ServiceOptions_msg_init_ptr}, }; static const upb_MiniTableField google_protobuf_ServiceDescriptorProto__fields[3] = { @@ -383,8 +397,9 @@ const upb_MiniTable google__protobuf__ServiceDescriptorProto_msg_init = { }) }; -static const upb_MiniTableSub google_protobuf_MethodDescriptorProto_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__MethodOptions_msg_init}, +const upb_MiniTable* google__protobuf__ServiceDescriptorProto_msg_init_ptr = &google__protobuf__ServiceDescriptorProto_msg_init; +static const upb_MiniTableSubInternal google_protobuf_MethodDescriptorProto_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__MethodOptions_msg_init_ptr}, }; static const upb_MiniTableField google_protobuf_MethodDescriptorProto__fields[6] = { @@ -405,9 +420,10 @@ const upb_MiniTable google__protobuf__MethodDescriptorProto_msg_init = { #endif }; -static const upb_MiniTableSub google_protobuf_FileOptions_submsgs[3] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init}, +const upb_MiniTable* google__protobuf__MethodDescriptorProto_msg_init_ptr = &google__protobuf__MethodDescriptorProto_msg_init; +static const upb_MiniTableSubInternal google_protobuf_FileOptions_submsgs[3] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init_ptr}, {.UPB_PRIVATE(subenum) = &google_protobuf_FileOptions_OptimizeMode_enum_init}, }; @@ -478,9 +494,10 @@ const upb_MiniTable google__protobuf__FileOptions_msg_init = { }) }; -static const upb_MiniTableSub google_protobuf_MessageOptions_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init}, +const upb_MiniTable* google__protobuf__FileOptions_msg_init_ptr = &google__protobuf__FileOptions_msg_init; +static const upb_MiniTableSubInternal google_protobuf_MessageOptions_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init_ptr}, }; static const upb_MiniTableField google_protobuf_MessageOptions__fields[7] = { @@ -536,11 +553,12 @@ const upb_MiniTable google__protobuf__MessageOptions_msg_init = { }) }; -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}, +const upb_MiniTable* google__protobuf__MessageOptions_msg_init_ptr = &google__protobuf__MessageOptions_msg_init; +static const upb_MiniTableSubInternal google_protobuf_FieldOptions_submsgs[8] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__FieldOptions__EditionDefault_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__FieldOptions__FeatureSupport_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init_ptr}, {.UPB_PRIVATE(subenum) = &google_protobuf_FieldOptions_CType_enum_init}, {.UPB_PRIVATE(subenum) = &google_protobuf_FieldOptions_JSType_enum_init}, {.UPB_PRIVATE(subenum) = &google_protobuf_FieldOptions_OptionRetention_enum_init}, @@ -607,7 +625,8 @@ const upb_MiniTable google__protobuf__FieldOptions_msg_init = { }) }; -static const upb_MiniTableSub google_protobuf_FieldOptions_EditionDefault_submsgs[1] = { +const upb_MiniTable* google__protobuf__FieldOptions_msg_init_ptr = &google__protobuf__FieldOptions_msg_init; +static const upb_MiniTableSubInternal google_protobuf_FieldOptions_EditionDefault_submsgs[1] = { {.UPB_PRIVATE(subenum) = &google_protobuf_Edition_enum_init}, }; @@ -625,7 +644,8 @@ const upb_MiniTable google__protobuf__FieldOptions__EditionDefault_msg_init = { #endif }; -static const upb_MiniTableSub google_protobuf_FieldOptions_FeatureSupport_submsgs[3] = { +const upb_MiniTable* google__protobuf__FieldOptions__EditionDefault_msg_init_ptr = &google__protobuf__FieldOptions__EditionDefault_msg_init; +static const upb_MiniTableSubInternal 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}, @@ -647,9 +667,10 @@ const upb_MiniTable google__protobuf__FieldOptions__FeatureSupport_msg_init = { #endif }; -static const upb_MiniTableSub google_protobuf_OneofOptions_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init}, +const upb_MiniTable* google__protobuf__FieldOptions__FeatureSupport_msg_init_ptr = &google__protobuf__FieldOptions__FeatureSupport_msg_init; +static const upb_MiniTableSubInternal google_protobuf_OneofOptions_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init_ptr}, }; static const upb_MiniTableField google_protobuf_OneofOptions__fields[2] = { @@ -700,9 +721,10 @@ const upb_MiniTable google__protobuf__OneofOptions_msg_init = { }) }; -static const upb_MiniTableSub google_protobuf_EnumOptions_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init}, +const upb_MiniTable* google__protobuf__OneofOptions_msg_init_ptr = &google__protobuf__OneofOptions_msg_init; +static const upb_MiniTableSubInternal google_protobuf_EnumOptions_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init_ptr}, }; static const upb_MiniTableField google_protobuf_EnumOptions__fields[5] = { @@ -756,10 +778,11 @@ const upb_MiniTable google__protobuf__EnumOptions_msg_init = { }) }; -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}, +const upb_MiniTable* google__protobuf__EnumOptions_msg_init_ptr = &google__protobuf__EnumOptions_msg_init; +static const upb_MiniTableSubInternal google_protobuf_EnumValueOptions_submsgs[3] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__FieldOptions__FeatureSupport_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init_ptr}, }; static const upb_MiniTableField google_protobuf_EnumValueOptions__fields[5] = { @@ -813,9 +836,10 @@ const upb_MiniTable google__protobuf__EnumValueOptions_msg_init = { }) }; -static const upb_MiniTableSub google_protobuf_ServiceOptions_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init}, +const upb_MiniTable* google__protobuf__EnumValueOptions_msg_init_ptr = &google__protobuf__EnumValueOptions_msg_init; +static const upb_MiniTableSubInternal google_protobuf_ServiceOptions_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init_ptr}, }; static const upb_MiniTableField google_protobuf_ServiceOptions__fields[3] = { @@ -867,9 +891,10 @@ const upb_MiniTable google__protobuf__ServiceOptions_msg_init = { }) }; -static const upb_MiniTableSub google_protobuf_MethodOptions_submsgs[3] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init}, +const upb_MiniTable* google__protobuf__ServiceOptions_msg_init_ptr = &google__protobuf__ServiceOptions_msg_init; +static const upb_MiniTableSubInternal google_protobuf_MethodOptions_submsgs[3] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init_ptr}, {.UPB_PRIVATE(subenum) = &google_protobuf_MethodOptions_IdempotencyLevel_enum_init}, }; @@ -923,8 +948,9 @@ const upb_MiniTable google__protobuf__MethodOptions_msg_init = { }) }; -static const upb_MiniTableSub google_protobuf_UninterpretedOption_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption__NamePart_msg_init}, +const upb_MiniTable* google__protobuf__MethodOptions_msg_init_ptr = &google__protobuf__MethodOptions_msg_init; +static const upb_MiniTableSubInternal google_protobuf_UninterpretedOption_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption__NamePart_msg_init_ptr}, }; static const upb_MiniTableField google_protobuf_UninterpretedOption__fields[7] = { @@ -952,6 +978,7 @@ const upb_MiniTable google__protobuf__UninterpretedOption_msg_init = { }) }; +const upb_MiniTable* google__protobuf__UninterpretedOption_msg_init_ptr = &google__protobuf__UninterpretedOption_msg_init; static const upb_MiniTableField google_protobuf_UninterpretedOption_NamePart__fields[2] = { {1, UPB_SIZE(12, 16), 64, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, {2, 9, 65, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, @@ -966,7 +993,8 @@ const upb_MiniTable google__protobuf__UninterpretedOption__NamePart_msg_init = { #endif }; -static const upb_MiniTableSub google_protobuf_FeatureSet_submsgs[6] = { +const upb_MiniTable* google__protobuf__UninterpretedOption__NamePart_msg_init_ptr = &google__protobuf__UninterpretedOption__NamePart_msg_init; +static const upb_MiniTableSubInternal google_protobuf_FeatureSet_submsgs[6] = { {.UPB_PRIVATE(subenum) = &google_protobuf_FeatureSet_FieldPresence_enum_init}, {.UPB_PRIVATE(subenum) = &google_protobuf_FeatureSet_EnumType_enum_init}, {.UPB_PRIVATE(subenum) = &google_protobuf_FeatureSet_RepeatedFieldEncoding_enum_init}, @@ -993,8 +1021,9 @@ const upb_MiniTable google__protobuf__FeatureSet_msg_init = { #endif }; -static const upb_MiniTableSub google_protobuf_FeatureSetDefaults_submsgs[3] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init}, +const upb_MiniTable* google__protobuf__FeatureSet_msg_init_ptr = &google__protobuf__FeatureSet_msg_init; +static const upb_MiniTableSubInternal google_protobuf_FeatureSetDefaults_submsgs[3] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init_ptr}, {.UPB_PRIVATE(subenum) = &google_protobuf_Edition_enum_init}, {.UPB_PRIVATE(subenum) = &google_protobuf_Edition_enum_init}, }; @@ -1018,9 +1047,10 @@ const upb_MiniTable google__protobuf__FeatureSetDefaults_msg_init = { }) }; -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}, +const upb_MiniTable* google__protobuf__FeatureSetDefaults_msg_init_ptr = &google__protobuf__FeatureSetDefaults_msg_init; +static const upb_MiniTableSubInternal google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_submsgs[3] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr}, {.UPB_PRIVATE(subenum) = &google_protobuf_Edition_enum_init}, }; @@ -1039,8 +1069,9 @@ const upb_MiniTable google__protobuf__FeatureSetDefaults__FeatureSetEditionDefau #endif }; -static const upb_MiniTableSub google_protobuf_SourceCodeInfo_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__SourceCodeInfo__Location_msg_init}, +const upb_MiniTable* google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init_ptr = &google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init; +static const upb_MiniTableSubInternal google_protobuf_SourceCodeInfo_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__SourceCodeInfo__Location_msg_init_ptr}, }; static const upb_MiniTableField google_protobuf_SourceCodeInfo__fields[1] = { @@ -1060,6 +1091,7 @@ const upb_MiniTable google__protobuf__SourceCodeInfo_msg_init = { }) }; +const upb_MiniTable* google__protobuf__SourceCodeInfo_msg_init_ptr = &google__protobuf__SourceCodeInfo_msg_init; static const upb_MiniTableField google_protobuf_SourceCodeInfo_Location__fields[5] = { {1, 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)}, {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, @@ -1087,8 +1119,9 @@ const upb_MiniTable google__protobuf__SourceCodeInfo__Location_msg_init = { }) }; -static const upb_MiniTableSub google_protobuf_GeneratedCodeInfo_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__GeneratedCodeInfo__Annotation_msg_init}, +const upb_MiniTable* google__protobuf__SourceCodeInfo__Location_msg_init_ptr = &google__protobuf__SourceCodeInfo__Location_msg_init; +static const upb_MiniTableSubInternal google_protobuf_GeneratedCodeInfo_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__GeneratedCodeInfo__Annotation_msg_init_ptr}, }; static const upb_MiniTableField google_protobuf_GeneratedCodeInfo__fields[1] = { @@ -1108,7 +1141,8 @@ const upb_MiniTable google__protobuf__GeneratedCodeInfo_msg_init = { }) }; -static const upb_MiniTableSub google_protobuf_GeneratedCodeInfo_Annotation_submsgs[1] = { +const upb_MiniTable* google__protobuf__GeneratedCodeInfo_msg_init_ptr = &google__protobuf__GeneratedCodeInfo_msg_init; +static const upb_MiniTableSubInternal google_protobuf_GeneratedCodeInfo_Annotation_submsgs[1] = { {.UPB_PRIVATE(subenum) = &google_protobuf_GeneratedCodeInfo_Annotation_Semantic_enum_init}, }; @@ -1133,42 +1167,7 @@ const upb_MiniTable google__protobuf__GeneratedCodeInfo__Annotation_msg_init = { }) }; -static const upb_MiniTable *messages_layout[33] = { - &google__protobuf__FileDescriptorSet_msg_init, - &google__protobuf__FileDescriptorProto_msg_init, - &google__protobuf__DescriptorProto_msg_init, - &google__protobuf__DescriptorProto__ExtensionRange_msg_init, - &google__protobuf__DescriptorProto__ReservedRange_msg_init, - &google__protobuf__ExtensionRangeOptions_msg_init, - &google__protobuf__ExtensionRangeOptions__Declaration_msg_init, - &google__protobuf__FieldDescriptorProto_msg_init, - &google__protobuf__OneofDescriptorProto_msg_init, - &google__protobuf__EnumDescriptorProto_msg_init, - &google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init, - &google__protobuf__EnumValueDescriptorProto_msg_init, - &google__protobuf__ServiceDescriptorProto_msg_init, - &google__protobuf__MethodDescriptorProto_msg_init, - &google__protobuf__FileOptions_msg_init, - &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, - &google__protobuf__ServiceOptions_msg_init, - &google__protobuf__MethodOptions_msg_init, - &google__protobuf__UninterpretedOption_msg_init, - &google__protobuf__UninterpretedOption__NamePart_msg_init, - &google__protobuf__FeatureSet_msg_init, - &google__protobuf__FeatureSetDefaults_msg_init, - &google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init, - &google__protobuf__SourceCodeInfo_msg_init, - &google__protobuf__SourceCodeInfo__Location_msg_init, - &google__protobuf__GeneratedCodeInfo_msg_init, - &google__protobuf__GeneratedCodeInfo__Annotation_msg_init, -}; - +const upb_MiniTable* google__protobuf__GeneratedCodeInfo__Annotation_msg_init_ptr = &google__protobuf__GeneratedCodeInfo__Annotation_msg_init; const upb_MiniTableEnum google_protobuf_Edition_enum_init = { 64, 9, @@ -1331,6 +1330,42 @@ const upb_MiniTableEnum google_protobuf_MethodOptions_IdempotencyLevel_enum_init }, }; +static const upb_MiniTable *messages_layout[33] = { + &google__protobuf__FileDescriptorSet_msg_init, + &google__protobuf__FileDescriptorProto_msg_init, + &google__protobuf__DescriptorProto_msg_init, + &google__protobuf__DescriptorProto__ExtensionRange_msg_init, + &google__protobuf__DescriptorProto__ReservedRange_msg_init, + &google__protobuf__ExtensionRangeOptions_msg_init, + &google__protobuf__ExtensionRangeOptions__Declaration_msg_init, + &google__protobuf__FieldDescriptorProto_msg_init, + &google__protobuf__OneofDescriptorProto_msg_init, + &google__protobuf__EnumDescriptorProto_msg_init, + &google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init, + &google__protobuf__EnumValueDescriptorProto_msg_init, + &google__protobuf__ServiceDescriptorProto_msg_init, + &google__protobuf__MethodDescriptorProto_msg_init, + &google__protobuf__FileOptions_msg_init, + &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, + &google__protobuf__ServiceOptions_msg_init, + &google__protobuf__MethodOptions_msg_init, + &google__protobuf__UninterpretedOption_msg_init, + &google__protobuf__UninterpretedOption__NamePart_msg_init, + &google__protobuf__FeatureSet_msg_init, + &google__protobuf__FeatureSetDefaults_msg_init, + &google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init, + &google__protobuf__SourceCodeInfo_msg_init, + &google__protobuf__SourceCodeInfo__Location_msg_init, + &google__protobuf__GeneratedCodeInfo_msg_init, + &google__protobuf__GeneratedCodeInfo__Annotation_msg_init, +}; + static const upb_MiniTableEnum *enums_layout[17] = { &google_protobuf_Edition_enum_init, &google_protobuf_ExtensionRangeOptions_VerificationState_enum_init, diff --git a/third_party/upb/upb/cmake/google/protobuf/descriptor.upb_minitable.h b/third_party/upb/upb/cmake/google/protobuf/descriptor.upb_minitable.h index f48a64df658..6cb83ecedcc 100644 --- a/third_party/upb/upb/cmake/google/protobuf/descriptor.upb_minitable.h +++ b/third_party/upb/upb/cmake/google/protobuf/descriptor.upb_minitable.h @@ -3,7 +3,8 @@ * google/protobuf/descriptor.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_MINITABLE_H_ #define GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_MINITABLE_H_ @@ -18,38 +19,71 @@ extern "C" { #endif extern const upb_MiniTable google__protobuf__FileDescriptorSet_msg_init; +extern const upb_MiniTable* google__protobuf__FileDescriptorSet_msg_init_ptr; extern const upb_MiniTable google__protobuf__FileDescriptorProto_msg_init; +extern const upb_MiniTable* google__protobuf__FileDescriptorProto_msg_init_ptr; extern const upb_MiniTable google__protobuf__DescriptorProto_msg_init; +extern const upb_MiniTable* google__protobuf__DescriptorProto_msg_init_ptr; extern const upb_MiniTable google__protobuf__DescriptorProto__ExtensionRange_msg_init; +extern const upb_MiniTable* google__protobuf__DescriptorProto__ExtensionRange_msg_init_ptr; extern const upb_MiniTable google__protobuf__DescriptorProto__ReservedRange_msg_init; +extern const upb_MiniTable* google__protobuf__DescriptorProto__ReservedRange_msg_init_ptr; extern const upb_MiniTable google__protobuf__ExtensionRangeOptions_msg_init; +extern const upb_MiniTable* google__protobuf__ExtensionRangeOptions_msg_init_ptr; extern const upb_MiniTable google__protobuf__ExtensionRangeOptions__Declaration_msg_init; +extern const upb_MiniTable* google__protobuf__ExtensionRangeOptions__Declaration_msg_init_ptr; extern const upb_MiniTable google__protobuf__FieldDescriptorProto_msg_init; +extern const upb_MiniTable* google__protobuf__FieldDescriptorProto_msg_init_ptr; extern const upb_MiniTable google__protobuf__OneofDescriptorProto_msg_init; +extern const upb_MiniTable* google__protobuf__OneofDescriptorProto_msg_init_ptr; extern const upb_MiniTable google__protobuf__EnumDescriptorProto_msg_init; +extern const upb_MiniTable* google__protobuf__EnumDescriptorProto_msg_init_ptr; extern const upb_MiniTable google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init; +extern const upb_MiniTable* google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init_ptr; extern const upb_MiniTable google__protobuf__EnumValueDescriptorProto_msg_init; +extern const upb_MiniTable* google__protobuf__EnumValueDescriptorProto_msg_init_ptr; extern const upb_MiniTable google__protobuf__ServiceDescriptorProto_msg_init; +extern const upb_MiniTable* google__protobuf__ServiceDescriptorProto_msg_init_ptr; extern const upb_MiniTable google__protobuf__MethodDescriptorProto_msg_init; +extern const upb_MiniTable* google__protobuf__MethodDescriptorProto_msg_init_ptr; extern const upb_MiniTable google__protobuf__FileOptions_msg_init; +extern const upb_MiniTable* google__protobuf__FileOptions_msg_init_ptr; extern const upb_MiniTable google__protobuf__MessageOptions_msg_init; +extern const upb_MiniTable* google__protobuf__MessageOptions_msg_init_ptr; extern const upb_MiniTable google__protobuf__FieldOptions_msg_init; +extern const upb_MiniTable* google__protobuf__FieldOptions_msg_init_ptr; extern const upb_MiniTable google__protobuf__FieldOptions__EditionDefault_msg_init; +extern const upb_MiniTable* google__protobuf__FieldOptions__EditionDefault_msg_init_ptr; extern const upb_MiniTable google__protobuf__FieldOptions__FeatureSupport_msg_init; +extern const upb_MiniTable* google__protobuf__FieldOptions__FeatureSupport_msg_init_ptr; extern const upb_MiniTable google__protobuf__OneofOptions_msg_init; +extern const upb_MiniTable* google__protobuf__OneofOptions_msg_init_ptr; extern const upb_MiniTable google__protobuf__EnumOptions_msg_init; +extern const upb_MiniTable* google__protobuf__EnumOptions_msg_init_ptr; extern const upb_MiniTable google__protobuf__EnumValueOptions_msg_init; +extern const upb_MiniTable* google__protobuf__EnumValueOptions_msg_init_ptr; extern const upb_MiniTable google__protobuf__ServiceOptions_msg_init; +extern const upb_MiniTable* google__protobuf__ServiceOptions_msg_init_ptr; extern const upb_MiniTable google__protobuf__MethodOptions_msg_init; +extern const upb_MiniTable* google__protobuf__MethodOptions_msg_init_ptr; extern const upb_MiniTable google__protobuf__UninterpretedOption_msg_init; +extern const upb_MiniTable* google__protobuf__UninterpretedOption_msg_init_ptr; extern const upb_MiniTable google__protobuf__UninterpretedOption__NamePart_msg_init; +extern const upb_MiniTable* google__protobuf__UninterpretedOption__NamePart_msg_init_ptr; extern const upb_MiniTable google__protobuf__FeatureSet_msg_init; +extern const upb_MiniTable* google__protobuf__FeatureSet_msg_init_ptr; extern const upb_MiniTable google__protobuf__FeatureSetDefaults_msg_init; +extern const upb_MiniTable* google__protobuf__FeatureSetDefaults_msg_init_ptr; extern const upb_MiniTable google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init; +extern const upb_MiniTable* google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init_ptr; extern const upb_MiniTable google__protobuf__SourceCodeInfo_msg_init; +extern const upb_MiniTable* google__protobuf__SourceCodeInfo_msg_init_ptr; extern const upb_MiniTable google__protobuf__SourceCodeInfo__Location_msg_init; +extern const upb_MiniTable* google__protobuf__SourceCodeInfo__Location_msg_init_ptr; extern const upb_MiniTable google__protobuf__GeneratedCodeInfo_msg_init; +extern const upb_MiniTable* google__protobuf__GeneratedCodeInfo_msg_init_ptr; extern const upb_MiniTable google__protobuf__GeneratedCodeInfo__Annotation_msg_init; +extern const upb_MiniTable* google__protobuf__GeneratedCodeInfo__Annotation_msg_init_ptr; extern const upb_MiniTableEnum google_protobuf_Edition_enum_init; extern const upb_MiniTableEnum google_protobuf_ExtensionRangeOptions_VerificationState_enum_init; diff --git a/third_party/upb/upb/io/zero_copy_stream_test.cc b/third_party/upb/upb/io/zero_copy_stream_test.cc index 392d924848b..b7378d402b6 100644 --- a/third_party/upb/upb/io/zero_copy_stream_test.cc +++ b/third_party/upb/upb/io/zero_copy_stream_test.cc @@ -45,12 +45,6 @@ class IoTest : public testing::Test { // WriteStuff() writes. void ReadStuff(upb_ZeroCopyInputStream* input, bool read_eof = true); - // Similar to WriteStuff, but performs more sophisticated testing. - int WriteStuffLarge(upb_ZeroCopyOutputStream* output); - // Reads and tests a stream that should have been written to - // via WriteStuffLarge(). - void ReadStuffLarge(upb_ZeroCopyInputStream* input); - static const int kBlockSizes[]; static const int kBlockSizeCount; }; @@ -157,35 +151,6 @@ void IoTest::ReadStuff(upb_ZeroCopyInputStream* input, bool read_eof) { } } -int IoTest::WriteStuffLarge(upb_ZeroCopyOutputStream* output) { - WriteString(output, "Hello world!\n"); - WriteString(output, "Some te"); - WriteString(output, "xt. Blah blah."); - WriteString(output, std::string(100000, 'x')); // A very long string - WriteString(output, std::string(100000, 'y')); // A very long string - WriteString(output, "01234567890123456789"); - - const int result = upb_ZeroCopyOutputStream_ByteCount(output); - EXPECT_EQ(result, 200055); - return result; -} - -// Reads text from an input stream and expects it to match what WriteStuff() -// writes. -void IoTest::ReadStuffLarge(upb_ZeroCopyInputStream* input) { - ReadString(input, "Hello world!\nSome text. "); - EXPECT_TRUE(upb_ZeroCopyInputStream_Skip(input, 5)); - ReadString(input, "blah."); - EXPECT_TRUE(upb_ZeroCopyInputStream_Skip(input, 100000 - 10)); - ReadString(input, std::string(10, 'x') + std::string(100000 - 20000, 'y')); - EXPECT_TRUE(upb_ZeroCopyInputStream_Skip(input, 20000 - 10)); - ReadString(input, "yyyyyyyyyy01234567890123456789"); - EXPECT_EQ(upb_ZeroCopyInputStream_ByteCount(input), 200055); - - uint8_t byte; - EXPECT_EQ(ReadFromInput(input, &byte, 1), 0); -} - // =================================================================== TEST_F(IoTest, ArrayIo) { diff --git a/third_party/upb/upb/json/decode.c b/third_party/upb/upb/json/decode.c index 46a122efe3b..9275bcb1af5 100644 --- a/third_party/upb/upb/json/decode.c +++ b/third_party/upb/upb/json/decode.c @@ -711,7 +711,7 @@ static upb_MessageValue jsondec_int(jsondec* d, const upb_FieldDef* f) { /* Parse UINT32 or UINT64 value. */ static upb_MessageValue jsondec_uint(jsondec* d, const upb_FieldDef* f) { - upb_MessageValue val = {0}; + upb_MessageValue val; switch (jsondec_peek(d)) { case JD_NUMBER: { @@ -748,7 +748,7 @@ static upb_MessageValue jsondec_uint(jsondec* d, const upb_FieldDef* f) { /* Parse DOUBLE or FLOAT value. */ static upb_MessageValue jsondec_double(jsondec* d, const upb_FieldDef* f) { upb_StringView str; - upb_MessageValue val = {0}; + upb_MessageValue val; switch (jsondec_peek(d)) { case JD_NUMBER: @@ -861,6 +861,7 @@ static upb_MessageValue jsondec_bool(jsondec* d, const upb_FieldDef* f) { /* Composite types (array/message/map) ****************************************/ static void jsondec_array(jsondec* d, upb_Message* msg, const upb_FieldDef* f) { + UPB_ASSERT(!upb_Message_IsFrozen(msg)); upb_Array* arr = upb_Message_Mutable(msg, f, d->arena).array; jsondec_arrstart(d); @@ -874,6 +875,7 @@ static void jsondec_array(jsondec* d, upb_Message* msg, const upb_FieldDef* f) { } static void jsondec_map(jsondec* d, upb_Message* msg, const upb_FieldDef* f) { + UPB_ASSERT(!upb_Message_IsFrozen(msg)); upb_Map* map = upb_Message_Mutable(msg, f, d->arena).map; const upb_MessageDef* entry = upb_FieldDef_MessageSubDef(f); const upb_FieldDef* key_f = upb_MessageDef_FindFieldByNumber(entry, 1); @@ -895,6 +897,7 @@ static void jsondec_map(jsondec* d, upb_Message* msg, const upb_FieldDef* f) { static void jsondec_tomsg(jsondec* d, upb_Message* msg, const upb_MessageDef* m) { + UPB_ASSERT(!upb_Message_IsFrozen(msg)); if (upb_MessageDef_WellKnownType(m) == kUpb_WellKnown_Unspecified) { jsondec_object(d, msg, m); } else { @@ -915,6 +918,7 @@ static upb_MessageValue jsondec_msg(jsondec* d, const upb_FieldDef* f) { static void jsondec_field(jsondec* d, upb_Message* msg, const upb_MessageDef* m) { + UPB_ASSERT(!upb_Message_IsFrozen(msg)); upb_StringView name; const upb_FieldDef* f; const upb_FieldDef* preserved; @@ -953,7 +957,7 @@ static void jsondec_field(jsondec* d, upb_Message* msg, } if (upb_FieldDef_RealContainingOneof(f) && - upb_Message_WhichOneof(msg, upb_FieldDef_ContainingOneof(f))) { + upb_Message_WhichOneofByDef(msg, upb_FieldDef_ContainingOneof(f))) { jsondec_err(d, "More than one field for this oneof."); } @@ -980,6 +984,7 @@ static void jsondec_field(jsondec* d, upb_Message* msg, static void jsondec_object(jsondec* d, upb_Message* msg, const upb_MessageDef* m) { + UPB_ASSERT(!upb_Message_IsFrozen(msg)); jsondec_objstart(d); while (jsondec_objnext(d)) { jsondec_field(d, msg, m); @@ -1080,6 +1085,7 @@ static int64_t jsondec_unixtime(int y, int m, int d, int h, int min, int s) { static void jsondec_timestamp(jsondec* d, upb_Message* msg, const upb_MessageDef* m) { + UPB_ASSERT(!upb_Message_IsFrozen(msg)); upb_MessageValue seconds; upb_MessageValue nanos; upb_StringView str = jsondec_string(d); @@ -1145,6 +1151,7 @@ malformed: static void jsondec_duration(jsondec* d, upb_Message* msg, const upb_MessageDef* m) { + UPB_ASSERT(!upb_Message_IsFrozen(msg)); upb_MessageValue seconds; upb_MessageValue nanos; upb_StringView str = jsondec_string(d); @@ -1177,6 +1184,7 @@ static void jsondec_duration(jsondec* d, upb_Message* msg, static void jsondec_listvalue(jsondec* d, upb_Message* msg, const upb_MessageDef* m) { + UPB_ASSERT(!upb_Message_IsFrozen(msg)); const upb_FieldDef* values_f = upb_MessageDef_FindFieldByNumber(m, 1); const upb_MessageDef* value_m = upb_FieldDef_MessageSubDef(values_f); const upb_MiniTable* value_layout = upb_MessageDef_MiniTable(value_m); @@ -1195,6 +1203,7 @@ static void jsondec_listvalue(jsondec* d, upb_Message* msg, static void jsondec_struct(jsondec* d, upb_Message* msg, const upb_MessageDef* m) { + UPB_ASSERT(!upb_Message_IsFrozen(msg)); const upb_FieldDef* fields_f = upb_MessageDef_FindFieldByNumber(m, 1); const upb_MessageDef* entry_m = upb_FieldDef_MessageSubDef(fields_f); const upb_FieldDef* value_f = upb_MessageDef_FindFieldByNumber(entry_m, 2); @@ -1217,6 +1226,7 @@ static void jsondec_struct(jsondec* d, upb_Message* msg, static void jsondec_wellknownvalue(jsondec* d, upb_Message* msg, const upb_MessageDef* m) { + UPB_ASSERT(!upb_Message_IsFrozen(msg)); upb_MessageValue val; const upb_FieldDef* f; upb_Message* submsg; @@ -1305,6 +1315,7 @@ static upb_StringView jsondec_mask(jsondec* d, const char* buf, static void jsondec_fieldmask(jsondec* d, upb_Message* msg, const upb_MessageDef* m) { + UPB_ASSERT(!upb_Message_IsFrozen(msg)); /* repeated string paths = 1; */ const upb_FieldDef* paths_f = upb_MessageDef_FindFieldByNumber(m, 1); upb_Array* arr = upb_Message_Mutable(msg, paths_f, d->arena).array; @@ -1328,6 +1339,7 @@ static void jsondec_fieldmask(jsondec* d, upb_Message* msg, static void jsondec_anyfield(jsondec* d, upb_Message* msg, const upb_MessageDef* m) { + UPB_ASSERT(!upb_Message_IsFrozen(msg)); if (upb_MessageDef_WellKnownType(m) == kUpb_WellKnown_Unspecified) { /* For regular types: {"@type": "[user type]", "f1": , "f2": } * where f1, f2, etc. are the normal fields of this type. */ @@ -1346,6 +1358,7 @@ static void jsondec_anyfield(jsondec* d, upb_Message* msg, static const upb_MessageDef* jsondec_typeurl(jsondec* d, upb_Message* msg, const upb_MessageDef* m) { + UPB_ASSERT(!upb_Message_IsFrozen(msg)); const upb_FieldDef* type_url_f = upb_MessageDef_FindFieldByNumber(m, 1); const upb_MessageDef* type_m; upb_StringView type_url = jsondec_string(d); @@ -1375,6 +1388,7 @@ static const upb_MessageDef* jsondec_typeurl(jsondec* d, upb_Message* msg, } static void jsondec_any(jsondec* d, upb_Message* msg, const upb_MessageDef* m) { + UPB_ASSERT(!upb_Message_IsFrozen(msg)); /* string type_url = 1; * bytes value = 2; */ const upb_FieldDef* value_f = upb_MessageDef_FindFieldByNumber(m, 2); @@ -1443,6 +1457,7 @@ static void jsondec_any(jsondec* d, upb_Message* msg, const upb_MessageDef* m) { static void jsondec_wrapper(jsondec* d, upb_Message* msg, const upb_MessageDef* m) { + UPB_ASSERT(!upb_Message_IsFrozen(msg)); const upb_FieldDef* value_f = upb_MessageDef_FindFieldByNumber(m, 1); upb_JsonMessageValue val = jsondec_value(d, value_f); UPB_ASSUME(val.ignore == false); // Wrapper cannot be an enum. @@ -1451,6 +1466,7 @@ static void jsondec_wrapper(jsondec* d, upb_Message* msg, static void jsondec_wellknown(jsondec* d, upb_Message* msg, const upb_MessageDef* m) { + UPB_ASSERT(!upb_Message_IsFrozen(msg)); switch (upb_MessageDef_WellKnownType(m)) { case kUpb_WellKnown_Any: jsondec_any(d, msg, m); @@ -1491,6 +1507,7 @@ static void jsondec_wellknown(jsondec* d, upb_Message* msg, static bool upb_JsonDecoder_Decode(jsondec* const d, upb_Message* const msg, const upb_MessageDef* const m) { + UPB_ASSERT(!upb_Message_IsFrozen(msg)); if (UPB_SETJMP(d->err)) return false; jsondec_tomsg(d, msg, m); diff --git a/third_party/upb/upb/json/encode.c b/third_party/upb/upb/json/encode.c index c152393ca87..66aa77f0344 100644 --- a/third_party/upb/upb/json/encode.c +++ b/third_party/upb/upb/json/encode.c @@ -47,7 +47,7 @@ static void jsonenc_value(jsonenc* e, const upb_Message* msg, UPB_NORETURN static void jsonenc_err(jsonenc* e, const char* msg) { upb_Status_SetErrorMessage(e->status, msg); - longjmp(e->err, 1); + UPB_LONGJMP(e->err, 1); } UPB_PRINTF(2, 3) @@ -56,7 +56,7 @@ UPB_NORETURN static void jsonenc_errf(jsonenc* e, const char* fmt, ...) { va_start(argp, fmt); upb_Status_VSetErrorFormat(e->status, fmt, argp); va_end(argp); - longjmp(e->err, 1); + UPB_LONGJMP(e->err, 1); } static upb_Arena* jsonenc_arena(jsonenc* e) { diff --git a/third_party/upb/upb/lex/BUILD b/third_party/upb/upb/lex/BUILD index b12e37d041e..efcf9e9e40b 100644 --- a/third_party/upb/upb/lex/BUILD +++ b/third_party/upb/upb/lex/BUILD @@ -41,6 +41,16 @@ cc_test( ], ) +cc_test( + name = "round_trip_test", + srcs = ["round_trip_test.cc"], + deps = [ + ":lex", + "@com_google_googletest//:gtest", + "@com_google_googletest//:gtest_main", + ], +) + # begin:github_only filegroup( name = "source_files", diff --git a/third_party/upb/upb/lex/round_trip.c b/third_party/upb/upb/lex/round_trip.c index 13104341b14..82818eea235 100644 --- a/third_party/upb/upb/lex/round_trip.c +++ b/third_party/upb/upb/lex/round_trip.c @@ -8,6 +8,8 @@ #include "upb/lex/round_trip.h" #include +#include +#include #include // Must be last. @@ -28,6 +30,10 @@ static void upb_FixLocale(char* p) { void _upb_EncodeRoundTripDouble(double val, char* buf, size_t size) { assert(size >= kUpb_RoundTripBufferSize); + if (isnan(val)) { + snprintf(buf, size, "%s", "nan"); + return; + } snprintf(buf, size, "%.*g", DBL_DIG, val); if (strtod(buf, NULL) != val) { snprintf(buf, size, "%.*g", DBL_DIG + 2, val); @@ -38,6 +44,10 @@ void _upb_EncodeRoundTripDouble(double val, char* buf, size_t size) { void _upb_EncodeRoundTripFloat(float val, char* buf, size_t size) { assert(size >= kUpb_RoundTripBufferSize); + if (isnan(val)) { + snprintf(buf, size, "%s", "nan"); + return; + } snprintf(buf, size, "%.*g", FLT_DIG, val); if (strtof(buf, NULL) != val) { snprintf(buf, size, "%.*g", FLT_DIG + 3, val); diff --git a/third_party/upb/upb/lex/round_trip_test.cc b/third_party/upb/upb/lex/round_trip_test.cc new file mode 100644 index 00000000000..c6fc7185223 --- /dev/null +++ b/third_party/upb/upb/lex/round_trip_test.cc @@ -0,0 +1,35 @@ +#include "upb/lex/round_trip.h" + +#include + +#include + +namespace { + +TEST(RoundTripTest, Double) { + char buf[32]; + + _upb_EncodeRoundTripDouble(0.123456789, buf, sizeof(buf)); + EXPECT_STREQ(buf, "0.123456789"); + + _upb_EncodeRoundTripDouble(0.0, buf, sizeof(buf)); + EXPECT_STREQ(buf, "0"); + + _upb_EncodeRoundTripDouble(nan(""), buf, sizeof(buf)); + EXPECT_STREQ(buf, "nan"); +} + +TEST(RoundTripTest, Float) { + char buf[32]; + + _upb_EncodeRoundTripFloat(0.123456, buf, sizeof(buf)); + EXPECT_STREQ(buf, "0.123456"); + + _upb_EncodeRoundTripFloat(0.0, buf, sizeof(buf)); + EXPECT_STREQ(buf, "0"); + + _upb_EncodeRoundTripFloat(nan(""), buf, sizeof(buf)); + EXPECT_STREQ(buf, "nan"); +} + +} // namespace diff --git a/third_party/upb/upb/mem/arena.c b/third_party/upb/upb/mem/arena.c index fc65f690139..544179228d8 100644 --- a/third_party/upb/upb/mem/arena.c +++ b/third_party/upb/upb/mem/arena.c @@ -21,6 +21,10 @@ // Must be last. #include "upb/port/def.inc" +static UPB_ATOMIC(size_t) max_block_size = 32 << 10; + +void upb_Arena_SetMaxBlockSize(size_t max) { max_block_size = max; } + typedef struct upb_MemBlock { // Atomic only for the benefit of SpaceAllocated(). UPB_ATOMIC(struct upb_MemBlock*) next; @@ -258,7 +262,14 @@ static bool _upb_Arena_AllocBlock(upb_Arena* a, size_t size) { if (!ai->block_alloc) return false; upb_MemBlock* last_block = upb_Atomic_Load(&ai->blocks, memory_order_acquire); size_t last_size = last_block != NULL ? last_block->size : 128; - size_t block_size = UPB_MAX(size, last_size * 2) + kUpb_MemblockReserve; + + // Don't naturally grow beyond the max block size. + size_t clamped_size = UPB_MIN(last_size * 2, max_block_size); + + // We may need to exceed the max block size if the user requested a large + // allocation. + size_t block_size = UPB_MAX(size, clamped_size) + kUpb_MemblockReserve; + upb_MemBlock* block = upb_malloc(_upb_ArenaInternal_BlockAlloc(ai), block_size); diff --git a/third_party/upb/upb/mem/arena.h b/third_party/upb/upb/mem/arena.h index 83f5781f839..2ad4f5d2fa5 100644 --- a/third_party/upb/upb/mem/arena.h +++ b/third_party/upb/upb/mem/arena.h @@ -58,6 +58,15 @@ UPB_API_INLINE void* upb_Arena_Malloc(struct upb_Arena* a, size_t size); UPB_API_INLINE void* upb_Arena_Realloc(upb_Arena* a, void* ptr, size_t oldsize, size_t size); +// Sets the maximum block size for all arenas. This is a global configuration +// setting that will affect all existing and future arenas. If +// upb_Arena_Malloc() is called with a size larger than this, we will exceed +// this size and allocate a larger block. +// +// This API is meant for experimentation only. It will likely be removed in +// the future. +void upb_Arena_SetMaxBlockSize(size_t max); + // Shrinks the last alloc from arena. // REQUIRES: (ptr, oldsize) was the last malloc/realloc from this arena. // We could also add a upb_Arena_TryShrinkLast() which is simply a no-op if diff --git a/third_party/upb/upb/mem/arena.hpp b/third_party/upb/upb/mem/arena.hpp index e552ceb1672..420adfa463c 100644 --- a/third_party/upb/upb/mem/arena.hpp +++ b/third_party/upb/upb/mem/arena.hpp @@ -26,7 +26,11 @@ class Arena { upb_Arena* ptr() const { return ptr_.get(); } - void Fuse(Arena& other) { upb_Arena_Fuse(ptr(), other.ptr()); } + // Fuses the arenas together. + // This operation can only be performed on arenas with no initial blocks. Will + // return false if the fuse failed due to either arena having an initial + // block. + bool Fuse(Arena& other) { return upb_Arena_Fuse(ptr(), other.ptr()); } protected: std::unique_ptr ptr_; diff --git a/third_party/upb/upb/mem/arena_test.cc b/third_party/upb/upb/mem/arena_test.cc index a7889a069b3..2f0647ff27f 100644 --- a/third_party/upb/upb/mem/arena_test.cc +++ b/third_party/upb/upb/mem/arena_test.cc @@ -171,6 +171,32 @@ TEST(ArenaTest, Contains) { upb_Arena_Free(arena2); } +TEST(ArenaTest, LargeAlloc) { + // Tests an allocation larger than the max block size. + upb_Arena* arena = upb_Arena_New(); + size_t size = 100000; + char* mem = static_cast(upb_Arena_Malloc(arena, size)); + EXPECT_NE(mem, nullptr); + for (size_t i = 0; i < size; ++i) { + mem[i] = static_cast(i); + } + for (size_t i = 0; i < size; ++i) { + EXPECT_EQ(mem[i], static_cast(i)); + } + upb_Arena_Free(arena); +} + +TEST(ArenaTest, MaxBlockSize) { + upb_Arena* arena = upb_Arena_New(); + // Perform 600 1k allocations (600k total) and ensure that the amount of + // memory allocated does not exceed 700k. + for (int i = 0; i < 600; ++i) { + upb_Arena_Malloc(arena, 1024); + } + EXPECT_LE(upb_Arena_SpaceAllocated(arena, nullptr), 700 * 1024); + upb_Arena_Free(arena); +} + #ifdef UPB_USE_C11_ATOMICS TEST(ArenaTest, FuzzFuseFreeRace) { diff --git a/third_party/upb/upb/message/BUILD b/third_party/upb/upb/message/BUILD index 4d8c795f14b..0e8b5883c9d 100644 --- a/third_party/upb/upb/message/BUILD +++ b/third_party/upb/upb/message/BUILD @@ -85,6 +85,24 @@ cc_library( ], ) +cc_library( + name = "iterator", + srcs = [ + "internal/iterator.c", + ], + hdrs = [ + "internal/iterator.h", + ], + copts = UPB_DEFAULT_COPTS, + visibility = ["//visibility:public"], + deps = [ + ":internal", + ":message", + "//upb:mini_table", + "//upb:port", + ], +) + cc_library( name = "compare", srcs = [ @@ -97,6 +115,7 @@ cc_library( visibility = ["//visibility:public"], deps = [ ":internal", + ":iterator", ":message", "//upb:base", "//upb:mini_table", @@ -109,9 +128,11 @@ cc_library( name = "copy", srcs = [ "copy.c", + "merge.c", ], hdrs = [ "copy.h", + "merge.h", ], copts = UPB_DEFAULT_COPTS, visibility = ["//visibility:public"], @@ -122,6 +143,7 @@ cc_library( "//upb:mem", "//upb:mini_table", "//upb:port", + "//upb:wire", "//upb/base:internal", "//upb/mini_table:internal", ], @@ -150,6 +172,26 @@ cc_library( ], ) +cc_test( + name = "merge_test", + srcs = ["merge_test.cc"], + deps = [ + ":copy", + ":internal", + "//upb:base", + "//upb:mem", + "//upb:message", + "//upb:mini_table", + "//upb:port", + "//upb:wire", + "//upb/test:test_messages_proto2_upb_minitable", + "//upb/test:test_messages_proto2_upb_proto", + "//upb/test:test_upb_proto", + "@com_google_googletest//:gtest", + "@com_google_googletest//:gtest_main", + ], +) + cc_library( name = "split64", hdrs = [ diff --git a/third_party/upb/upb/message/accessors.c b/third_party/upb/upb/message/accessors.c index a3184a5a21b..de142d90d4f 100644 --- a/third_party/upb/upb/message/accessors.c +++ b/third_party/upb/upb/message/accessors.c @@ -24,10 +24,8 @@ bool upb_Message_SetMapEntry(upb_Map* map, const upb_MiniTable* m, const upb_MiniTableField* f, upb_Message* map_entry_message, upb_Arena* arena) { UPB_ASSERT(!upb_Message_IsFrozen(map_entry_message)); - - // TODO: use a variant of upb_MiniTable_GetSubMessageTable() here. - const upb_MiniTable* map_entry_mini_table = upb_MiniTableSub_Message( - m->UPB_PRIVATE(subs)[f->UPB_PRIVATE(submsg_index)]); + const upb_MiniTable* map_entry_mini_table = + upb_MiniTable_MapEntrySubMessage(m, f); UPB_ASSERT(map_entry_mini_table); const upb_MiniTableField* map_entry_key_field = upb_MiniTable_MapKey(map_entry_mini_table); diff --git a/third_party/upb/upb/message/accessors.h b/third_party/upb/upb/message/accessors.h index 59ec925d797..922026ee483 100644 --- a/third_party/upb/upb/message/accessors.h +++ b/third_party/upb/upb/message/accessors.h @@ -8,24 +8,17 @@ #ifndef UPB_MESSAGE_ACCESSORS_H_ #define UPB_MESSAGE_ACCESSORS_H_ -#include -#include -#include - -#include "upb/base/descriptor_constants.h" #include "upb/base/string_view.h" #include "upb/mem/arena.h" #include "upb/message/array.h" #include "upb/message/internal/accessors.h" -#include "upb/message/internal/array.h" -#include "upb/message/internal/map.h" -#include "upb/message/internal/message.h" -#include "upb/message/internal/tagged_ptr.h" #include "upb/message/map.h" +#include "upb/message/message.h" #include "upb/message/tagged_ptr.h" #include "upb/message/value.h" -#include "upb/mini_table/enum.h" -#include "upb/mini_table/sub.h" +#include "upb/mini_table/extension.h" +#include "upb/mini_table/field.h" +#include "upb/mini_table/message.h" // Must be last. #include "upb/port/def.inc" @@ -48,419 +41,217 @@ UPB_API_INLINE void upb_Message_ClearBaseField(upb_Message* msg, UPB_API_INLINE void upb_Message_ClearExtension(upb_Message* msg, const upb_MiniTableExtension* e); +UPB_API_INLINE void upb_Message_ClearOneof(upb_Message* msg, + const upb_MiniTable* m, + const upb_MiniTableField* f); + UPB_API_INLINE bool upb_Message_HasBaseField(const upb_Message* msg, const upb_MiniTableField* f); UPB_API_INLINE bool upb_Message_HasExtension(const upb_Message* msg, const upb_MiniTableExtension* e); -UPB_API_INLINE void upb_Message_SetBaseField(upb_Message* msg, - const upb_MiniTableField* f, - const void* val); +UPB_API_INLINE upb_MessageValue +upb_Message_GetField(const upb_Message* msg, const upb_MiniTableField* f, + upb_MessageValue default_val); -UPB_API_INLINE bool upb_Message_SetExtension(upb_Message* msg, - const upb_MiniTableExtension* e, - const void* val, upb_Arena* a); +UPB_API_INLINE upb_TaggedMessagePtr upb_Message_GetTaggedMessagePtr( + const upb_Message* msg, const upb_MiniTableField* field, + upb_Message* default_val); -UPB_API_INLINE uint32_t upb_Message_WhichOneofFieldNumber( - const upb_Message* message, const upb_MiniTableField* oneof_field) { - UPB_ASSUME(upb_MiniTableField_IsInOneof(oneof_field)); - return UPB_PRIVATE(_upb_Message_GetOneofCase)(message, oneof_field); -} - -// NOTE: The default_val is only used for fields that support presence. -// For repeated/map fields, the resulting upb_Array*/upb_Map* can be NULL if a -// upb_Array/upb_Map has not been allocated yet. Array/map fields do not have -// presence, so this is semantically identical to a pointer to an empty -// array/map, and must be treated the same for all semantic purposes. -UPB_INLINE upb_MessageValue -upb_Message_GetField(const upb_Message* msg, const upb_MiniTableField* field, - upb_MessageValue default_val) { - upb_MessageValue ret; - if (upb_MiniTableField_IsExtension(field)) { - _upb_Message_GetExtensionField(msg, (upb_MiniTableExtension*)field, - &default_val, &ret); - } else { - _upb_Message_GetNonExtensionField(msg, field, &default_val, &ret); - } - return ret; -} - -// Sets the value of the given field in the given msg. The return value is true -// if the operation completed successfully, or false if memory allocation -// failed. -UPB_INLINE bool UPB_PRIVATE(_upb_Message_SetField)( - upb_Message* msg, const upb_MiniTableField* field, upb_MessageValue val, - upb_Arena* a) { - if (upb_MiniTableField_IsExtension(field)) { - const upb_MiniTableExtension* ext = (const upb_MiniTableExtension*)field; - return upb_Message_SetExtension(msg, ext, &val, a); - } else { - upb_Message_SetBaseField(msg, field, &val); - return true; - } -} +UPB_API_INLINE const upb_Array* upb_Message_GetArray( + const upb_Message* msg, const upb_MiniTableField* f); UPB_API_INLINE bool upb_Message_GetBool(const upb_Message* msg, - const upb_MiniTableField* field, - bool default_val) { - UPB_ASSUME(upb_MiniTableField_CType(field) == kUpb_CType_Bool); - UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(field) == - kUpb_FieldRep_1Byte); - UPB_ASSUME(upb_MiniTableField_IsScalar(field)); - upb_MessageValue def; - def.bool_val = default_val; - return upb_Message_GetField(msg, field, def).bool_val; -} + const upb_MiniTableField* f, + bool default_val); -UPB_API_INLINE bool upb_Message_SetBool(upb_Message* msg, - const upb_MiniTableField* field, - bool value, upb_Arena* a) { - UPB_ASSUME(upb_MiniTableField_CType(field) == kUpb_CType_Bool); - UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(field) == - kUpb_FieldRep_1Byte); - UPB_ASSUME(upb_MiniTableField_IsScalar(field)); - upb_MessageValue val; - val.bool_val = value; - return UPB_PRIVATE(_upb_Message_SetField)(msg, field, val, a); -} +UPB_API_INLINE double upb_Message_GetDouble(const upb_Message* msg, + const upb_MiniTableField* field, + double default_val); + +UPB_API_INLINE float upb_Message_GetFloat(const upb_Message* msg, + const upb_MiniTableField* f, + float default_val); UPB_API_INLINE int32_t upb_Message_GetInt32(const upb_Message* msg, - const upb_MiniTableField* field, - int32_t default_val) { - UPB_ASSUME(upb_MiniTableField_CType(field) == kUpb_CType_Int32 || - upb_MiniTableField_CType(field) == kUpb_CType_Enum); - UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(field) == - kUpb_FieldRep_4Byte); - UPB_ASSUME(upb_MiniTableField_IsScalar(field)); - - upb_MessageValue def; - def.int32_val = default_val; - return upb_Message_GetField(msg, field, def).int32_val; -} + const upb_MiniTableField* f, + int32_t default_val); -UPB_API_INLINE bool upb_Message_SetInt32(upb_Message* msg, - const upb_MiniTableField* field, - int32_t value, upb_Arena* a) { - UPB_ASSUME(upb_MiniTableField_CType(field) == kUpb_CType_Int32 || - upb_MiniTableField_CType(field) == kUpb_CType_Enum); - UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(field) == - kUpb_FieldRep_4Byte); - UPB_ASSUME(upb_MiniTableField_IsScalar(field)); - upb_MessageValue val; - val.int32_val = value; - return UPB_PRIVATE(_upb_Message_SetField)(msg, field, val, a); -} +UPB_API_INLINE int64_t upb_Message_GetInt64(const upb_Message* msg, + const upb_MiniTableField* f, + int64_t default_val); + +UPB_API_INLINE const upb_Map* upb_Message_GetMap(const upb_Message* msg, + const upb_MiniTableField* f); + +UPB_API_INLINE const upb_Message* upb_Message_GetMessage( + const upb_Message* msg, const upb_MiniTableField* f); + +UPB_API_INLINE upb_Array* upb_Message_GetMutableArray( + upb_Message* msg, const upb_MiniTableField* f); + +UPB_API_INLINE upb_Map* upb_Message_GetMutableMap(upb_Message* msg, + const upb_MiniTableField* f); + +UPB_API_INLINE upb_Message* upb_Message_GetMutableMessage( + upb_Message* msg, const upb_MiniTableField* f); + +UPB_API_INLINE upb_Array* upb_Message_GetOrCreateMutableArray( + upb_Message* msg, const upb_MiniTableField* f, upb_Arena* arena); + +UPB_API_INLINE upb_Map* upb_Message_GetOrCreateMutableMap( + upb_Message* msg, const upb_MiniTable* map_entry_mini_table, + const upb_MiniTableField* f, upb_Arena* arena); + +UPB_API_INLINE upb_Message* upb_Message_GetOrCreateMutableMessage( + upb_Message* msg, const upb_MiniTable* mini_table, + const upb_MiniTableField* f, upb_Arena* arena); + +UPB_API_INLINE upb_StringView +upb_Message_GetString(const upb_Message* msg, const upb_MiniTableField* field, + upb_StringView default_val); UPB_API_INLINE uint32_t upb_Message_GetUInt32(const upb_Message* msg, - const upb_MiniTableField* field, - uint32_t default_val) { - UPB_ASSUME(upb_MiniTableField_CType(field) == kUpb_CType_UInt32); - UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(field) == - kUpb_FieldRep_4Byte); - UPB_ASSUME(upb_MiniTableField_IsScalar(field)); - - upb_MessageValue def; - def.uint32_val = default_val; - return upb_Message_GetField(msg, field, def).uint32_val; -} + const upb_MiniTableField* f, + uint32_t default_val); -UPB_API_INLINE bool upb_Message_SetUInt32(upb_Message* msg, - const upb_MiniTableField* field, - uint32_t value, upb_Arena* a) { - UPB_ASSUME(upb_MiniTableField_CType(field) == kUpb_CType_UInt32); - UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(field) == - kUpb_FieldRep_4Byte); - UPB_ASSUME(upb_MiniTableField_IsScalar(field)); - upb_MessageValue val; - val.uint32_val = value; - return UPB_PRIVATE(_upb_Message_SetField)(msg, field, val, a); -} +UPB_API_INLINE uint64_t upb_Message_GetUInt64(const upb_Message* msg, + const upb_MiniTableField* f, + uint64_t default_val); UPB_API_INLINE void upb_Message_SetClosedEnum( upb_Message* msg, const upb_MiniTable* msg_mini_table, - const upb_MiniTableField* field, int32_t value) { - UPB_ASSERT(upb_MiniTableField_IsClosedEnum(field)); - UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(field) == - kUpb_FieldRep_4Byte); - UPB_ASSUME(upb_MiniTableField_IsScalar(field)); - UPB_ASSERT(upb_MiniTableEnum_CheckValue( - upb_MiniTable_GetSubEnumTable(msg_mini_table, field), value)); - upb_Message_SetBaseField(msg, field, &value); -} + const upb_MiniTableField* f, int32_t value); -UPB_API_INLINE int64_t upb_Message_GetInt64(const upb_Message* msg, - const upb_MiniTableField* field, - int64_t default_val) { - UPB_ASSUME(upb_MiniTableField_CType(field) == kUpb_CType_Int64); - UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(field) == - kUpb_FieldRep_8Byte); - UPB_ASSUME(upb_MiniTableField_IsScalar(field)); +// BaseField Setters /////////////////////////////////////////////////////////// - upb_MessageValue def; - def.int64_val = default_val; - return upb_Message_GetField(msg, field, def).int64_val; -} +UPB_API_INLINE void upb_Message_SetBaseField(upb_Message* msg, + const upb_MiniTableField* f, + const void* val); -UPB_API_INLINE bool upb_Message_SetInt64(upb_Message* msg, - const upb_MiniTableField* field, - int64_t value, upb_Arena* a) { - UPB_ASSUME(upb_MiniTableField_CType(field) == kUpb_CType_Int64); - UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(field) == - kUpb_FieldRep_8Byte); - UPB_ASSUME(upb_MiniTableField_IsScalar(field)); - upb_MessageValue val; - val.int64_val = value; - return UPB_PRIVATE(_upb_Message_SetField)(msg, field, val, a); -} +UPB_API_INLINE void upb_Message_SetBaseFieldBool(struct upb_Message* msg, + const upb_MiniTableField* f, + bool value); -UPB_API_INLINE uint64_t upb_Message_GetUInt64(const upb_Message* msg, - const upb_MiniTableField* field, - uint64_t default_val) { - UPB_ASSUME(upb_MiniTableField_CType(field) == kUpb_CType_UInt64); - UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(field) == - kUpb_FieldRep_8Byte); - UPB_ASSUME(upb_MiniTableField_IsScalar(field)); - - upb_MessageValue def; - def.uint64_val = default_val; - return upb_Message_GetField(msg, field, def).uint64_val; -} +UPB_API_INLINE void upb_Message_SetBaseFieldDouble(struct upb_Message* msg, + const upb_MiniTableField* f, + double value); -UPB_API_INLINE bool upb_Message_SetUInt64(upb_Message* msg, - const upb_MiniTableField* field, - uint64_t value, upb_Arena* a) { - UPB_ASSUME(upb_MiniTableField_CType(field) == kUpb_CType_UInt64); - UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(field) == - kUpb_FieldRep_8Byte); - UPB_ASSUME(upb_MiniTableField_IsScalar(field)); - upb_MessageValue val; - val.uint64_val = value; - return UPB_PRIVATE(_upb_Message_SetField)(msg, field, val, a); -} +UPB_API_INLINE void upb_Message_SetBaseFieldFloat(struct upb_Message* msg, + const upb_MiniTableField* f, + float value); -UPB_API_INLINE float upb_Message_GetFloat(const upb_Message* msg, - const upb_MiniTableField* field, - float default_val) { - UPB_ASSUME(upb_MiniTableField_CType(field) == kUpb_CType_Float); - UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(field) == - kUpb_FieldRep_4Byte); - UPB_ASSUME(upb_MiniTableField_IsScalar(field)); - - upb_MessageValue def; - def.float_val = default_val; - return upb_Message_GetField(msg, field, def).float_val; -} +UPB_API_INLINE void upb_Message_SetBaseFieldInt32(struct upb_Message* msg, + const upb_MiniTableField* f, + int32_t value); -UPB_API_INLINE bool upb_Message_SetFloat(upb_Message* msg, - const upb_MiniTableField* field, - float value, upb_Arena* a) { - UPB_ASSUME(upb_MiniTableField_CType(field) == kUpb_CType_Float); - UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(field) == - kUpb_FieldRep_4Byte); - UPB_ASSUME(upb_MiniTableField_IsScalar(field)); - upb_MessageValue val; - val.float_val = value; - return UPB_PRIVATE(_upb_Message_SetField)(msg, field, val, a); -} +UPB_API_INLINE void upb_Message_SetBaseFieldInt64(struct upb_Message* msg, + const upb_MiniTableField* f, + int64_t value); -UPB_API_INLINE double upb_Message_GetDouble(const upb_Message* msg, - const upb_MiniTableField* field, - double default_val) { - UPB_ASSUME(upb_MiniTableField_CType(field) == kUpb_CType_Double); - UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(field) == - kUpb_FieldRep_8Byte); - UPB_ASSUME(upb_MiniTableField_IsScalar(field)); +UPB_API_INLINE void upb_Message_SetBaseFieldString(struct upb_Message* msg, + const upb_MiniTableField* f, + upb_StringView value); + +UPB_API_INLINE void upb_Message_SetBaseFieldUInt32(struct upb_Message* msg, + const upb_MiniTableField* f, + uint32_t value); + +UPB_API_INLINE void upb_Message_SetBaseFieldUInt64(struct upb_Message* msg, + const upb_MiniTableField* f, + uint64_t value); + +// Extension Setters /////////////////////////////////////////////////////////// + +UPB_API_INLINE bool upb_Message_SetExtension(upb_Message* msg, + const upb_MiniTableExtension* e, + const void* value, upb_Arena* a); - upb_MessageValue def; - def.double_val = default_val; - return upb_Message_GetField(msg, field, def).double_val; -} +UPB_API_INLINE bool upb_Message_SetExtensionBool( + struct upb_Message* msg, const upb_MiniTableExtension* e, bool value, + upb_Arena* a); + +UPB_API_INLINE bool upb_Message_SetExtensionDouble( + struct upb_Message* msg, const upb_MiniTableExtension* e, double value, + upb_Arena* a); + +UPB_API_INLINE bool upb_Message_SetExtensionFloat( + struct upb_Message* msg, const upb_MiniTableExtension* e, float value, + upb_Arena* a); + +UPB_API_INLINE bool upb_Message_SetExtensionInt32( + struct upb_Message* msg, const upb_MiniTableExtension* e, int32_t value, + upb_Arena* a); + +UPB_API_INLINE bool upb_Message_SetExtensionInt64( + struct upb_Message* msg, const upb_MiniTableExtension* e, int64_t value, + upb_Arena* a); + +UPB_API_INLINE bool upb_Message_SetExtensionString( + struct upb_Message* msg, const upb_MiniTableExtension* e, + upb_StringView value, upb_Arena* a); + +UPB_API_INLINE bool upb_Message_SetExtensionUInt32( + struct upb_Message* msg, const upb_MiniTableExtension* e, uint32_t value, + upb_Arena* a); + +UPB_API_INLINE bool upb_Message_SetExtensionUInt64( + struct upb_Message* msg, const upb_MiniTableExtension* e, uint64_t value, + upb_Arena* a); + +// Universal Setters /////////////////////////////////////////////////////////// + +UPB_API_INLINE bool upb_Message_SetBool(upb_Message* msg, + const upb_MiniTableField* f, bool value, + upb_Arena* a); UPB_API_INLINE bool upb_Message_SetDouble(upb_Message* msg, - const upb_MiniTableField* field, - double value, upb_Arena* a) { - UPB_ASSUME(upb_MiniTableField_CType(field) == kUpb_CType_Double); - UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(field) == - kUpb_FieldRep_8Byte); - UPB_ASSUME(upb_MiniTableField_IsScalar(field)); - upb_MessageValue val; - val.double_val = value; - return UPB_PRIVATE(_upb_Message_SetField)(msg, field, val, a); -} + const upb_MiniTableField* f, + double value, upb_Arena* a); -UPB_API_INLINE upb_StringView -upb_Message_GetString(const upb_Message* msg, const upb_MiniTableField* field, - upb_StringView default_val) { - UPB_ASSUME(upb_MiniTableField_CType(field) == kUpb_CType_String || - upb_MiniTableField_CType(field) == kUpb_CType_Bytes); - UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(field) == - kUpb_FieldRep_StringView); - UPB_ASSUME(upb_MiniTableField_IsScalar(field)); - - upb_MessageValue def; - def.str_val = default_val; - return upb_Message_GetField(msg, field, def).str_val; -} - -// Sets the value of a `string` or `bytes` field. The bytes of the value are not -// copied, so it is the caller's responsibility to ensure that they remain valid -// for the lifetime of `msg`. That might be done by copying them into the given -// arena, or by fusing that arena with the arena the bytes live in, for example. -UPB_API_INLINE bool upb_Message_SetString(upb_Message* msg, - const upb_MiniTableField* field, - upb_StringView value, upb_Arena* a) { - UPB_ASSUME(upb_MiniTableField_CType(field) == kUpb_CType_String || - upb_MiniTableField_CType(field) == kUpb_CType_Bytes); - UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(field) == - kUpb_FieldRep_StringView); - UPB_ASSUME(upb_MiniTableField_IsScalar(field)); - upb_MessageValue val; - val.str_val = value; - return UPB_PRIVATE(_upb_Message_SetField)(msg, field, val, a); -} +UPB_API_INLINE bool upb_Message_SetFloat(upb_Message* msg, + const upb_MiniTableField* f, + float value, upb_Arena* a); -UPB_API_INLINE upb_TaggedMessagePtr upb_Message_GetTaggedMessagePtr( - const upb_Message* msg, const upb_MiniTableField* field, - upb_Message* default_val) { - UPB_ASSUME(upb_MiniTableField_CType(field) == kUpb_CType_Message); - UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(field) == - UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte)); - UPB_ASSUME(upb_MiniTableField_IsScalar(field)); - upb_TaggedMessagePtr tagged; - _upb_Message_GetNonExtensionField(msg, field, &default_val, &tagged); - return tagged; -} +UPB_API_INLINE bool upb_Message_SetInt32(upb_Message* msg, + const upb_MiniTableField* f, + int32_t value, upb_Arena* a); -UPB_API_INLINE const upb_Message* upb_Message_GetMessage( - const upb_Message* msg, const upb_MiniTableField* field) { - upb_TaggedMessagePtr tagged = - upb_Message_GetTaggedMessagePtr(msg, field, NULL); - return upb_TaggedMessagePtr_GetNonEmptyMessage(tagged); -} +UPB_API_INLINE bool upb_Message_SetInt64(upb_Message* msg, + const upb_MiniTableField* f, + int64_t value, upb_Arena* a); -UPB_API_INLINE upb_Message* upb_Message_GetMutableMessage( - upb_Message* msg, const upb_MiniTableField* field) { - return (upb_Message*)upb_Message_GetMessage(msg, field); -} - -// For internal use only; users cannot set tagged messages because only the -// parser and the message copier are allowed to directly create an empty -// message. -UPB_API_INLINE void _upb_Message_SetTaggedMessagePtr( - upb_Message* msg, const upb_MiniTable* mini_table, - const upb_MiniTableField* field, upb_TaggedMessagePtr sub_message) { - UPB_ASSUME(upb_MiniTableField_CType(field) == kUpb_CType_Message); - UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(field) == - UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte)); - UPB_ASSUME(upb_MiniTableField_IsScalar(field)); - UPB_ASSERT(upb_MiniTableSub_Message( - mini_table->UPB_PRIVATE(subs)[field->UPB_PRIVATE(submsg_index)])); - upb_Message_SetBaseField(msg, field, &sub_message); -} - -// Sets the value of a message-typed field. The `mini_table` and `field` -// parameters belong to `msg`, not `sub_message`. The mini_tables of `msg` and -// `sub_message` must have been linked for this to work correctly. UPB_API_INLINE void upb_Message_SetMessage(upb_Message* msg, - const upb_MiniTable* mini_table, - const upb_MiniTableField* field, - upb_Message* sub_message) { - _upb_Message_SetTaggedMessagePtr( - msg, mini_table, field, - UPB_PRIVATE(_upb_TaggedMessagePtr_Pack)(sub_message, false)); -} + const upb_MiniTableField* f, + upb_Message* value); -UPB_API_INLINE upb_Message* upb_Message_GetOrCreateMutableMessage( - upb_Message* msg, const upb_MiniTable* mini_table, - const upb_MiniTableField* field, upb_Arena* arena) { - UPB_ASSERT(arena); - UPB_ASSUME(upb_MiniTableField_CType(field) == kUpb_CType_Message); - upb_Message* sub_message = - *UPB_PTR_AT(msg, field->UPB_ONLYBITS(offset), upb_Message*); - if (!sub_message) { - const upb_MiniTable* sub_mini_table = upb_MiniTableSub_Message( - mini_table->UPB_PRIVATE(subs)[field->UPB_PRIVATE(submsg_index)]); - UPB_ASSERT(sub_mini_table); - sub_message = _upb_Message_New(sub_mini_table, arena); - *UPB_PTR_AT(msg, field->UPB_ONLYBITS(offset), upb_Message*) = sub_message; - UPB_PRIVATE(_upb_Message_SetPresence)(msg, field); - } - return sub_message; -} +UPB_API_INLINE bool upb_Message_SetString(upb_Message* msg, + const upb_MiniTableField* f, + upb_StringView value, upb_Arena* a); -UPB_API_INLINE const upb_Array* upb_Message_GetArray( - const upb_Message* msg, const upb_MiniTableField* field) { - UPB_PRIVATE(_upb_MiniTableField_CheckIsArray)(field); - upb_Array* ret; - const upb_Array* default_val = NULL; - _upb_Message_GetNonExtensionField(msg, field, &default_val, &ret); - return ret; -} +UPB_API_INLINE bool upb_Message_SetUInt32(upb_Message* msg, + const upb_MiniTableField* f, + uint32_t value, upb_Arena* a); -UPB_API_INLINE upb_Array* upb_Message_GetMutableArray( - upb_Message* msg, const upb_MiniTableField* field) { - UPB_PRIVATE(_upb_MiniTableField_CheckIsArray)(field); - return (upb_Array*)upb_Message_GetArray(msg, field); -} +UPB_API_INLINE bool upb_Message_SetUInt64(upb_Message* msg, + const upb_MiniTableField* f, + uint64_t value, upb_Arena* a); -UPB_API_INLINE upb_Array* upb_Message_GetOrCreateMutableArray( - upb_Message* msg, const upb_MiniTableField* field, upb_Arena* arena) { - UPB_ASSERT(arena); - UPB_PRIVATE(_upb_MiniTableField_CheckIsArray)(field); - upb_Array* array = upb_Message_GetMutableArray(msg, field); - if (!array) { - array = UPB_PRIVATE(_upb_Array_New)( - arena, 4, UPB_PRIVATE(_upb_MiniTableField_ElemSizeLg2)(field)); - // Check again due to: https://godbolt.org/z/7WfaoKG1r - UPB_PRIVATE(_upb_MiniTableField_CheckIsArray)(field); - upb_MessageValue val; - val.array_val = array; - UPB_PRIVATE(_upb_Message_SetField)(msg, field, val, arena); - } - return array; -} +//////////////////////////////////////////////////////////////////////////////// UPB_API_INLINE void* upb_Message_ResizeArrayUninitialized( - upb_Message* msg, const upb_MiniTableField* field, size_t size, - upb_Arena* arena) { - UPB_PRIVATE(_upb_MiniTableField_CheckIsArray)(field); - upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, field, arena); - if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)(arr, size, arena)) { - return NULL; - } - return upb_Array_MutableDataPtr(arr); -} - -UPB_API_INLINE const upb_Map* upb_Message_GetMap( - const upb_Message* msg, const upb_MiniTableField* field) { - UPB_PRIVATE(_upb_MiniTableField_CheckIsMap)(field); - _upb_Message_AssertMapIsUntagged(msg, field); - upb_Map* ret; - const upb_Map* default_val = NULL; - _upb_Message_GetNonExtensionField(msg, field, &default_val, &ret); - return ret; -} - -UPB_API_INLINE upb_Map* upb_Message_GetMutableMap( - upb_Message* msg, const upb_MiniTableField* field) { - return (upb_Map*)upb_Message_GetMap(msg, field); -} + upb_Message* msg, const upb_MiniTableField* f, size_t size, + upb_Arena* arena); -UPB_API_INLINE upb_Map* upb_Message_GetOrCreateMutableMap( - upb_Message* msg, const upb_MiniTable* map_entry_mini_table, - const upb_MiniTableField* field, upb_Arena* arena) { - UPB_ASSUME(upb_MiniTableField_CType(field) == kUpb_CType_Message); - const upb_MiniTableField* map_entry_key_field = - &map_entry_mini_table->UPB_ONLYBITS(fields)[0]; - const upb_MiniTableField* map_entry_value_field = - &map_entry_mini_table->UPB_ONLYBITS(fields)[1]; - return _upb_Message_GetOrCreateMutableMap( - msg, field, - _upb_Map_CTypeSize(upb_MiniTableField_CType(map_entry_key_field)), - _upb_Map_CTypeSize(upb_MiniTableField_CType(map_entry_value_field)), - arena); -} +UPB_API_INLINE uint32_t upb_Message_WhichOneofFieldNumber( + const upb_Message* message, const upb_MiniTableField* oneof_field); + +// For a field `f` which is in a oneof, return the field of that +// oneof that is actually set (or NULL if none). +UPB_API_INLINE const upb_MiniTableField* upb_Message_WhichOneof( + const upb_Message* msg, const upb_MiniTable* m, + const upb_MiniTableField* f); // Updates a map entry given an entry message. bool upb_Message_SetMapEntry(upb_Map* map, const upb_MiniTable* mini_table, diff --git a/third_party/upb/upb/message/accessors_test.cc b/third_party/upb/upb/message/accessors_test.cc index 5b0dd3638c1..014056e9fd1 100644 --- a/third_party/upb/upb/message/accessors_test.cc +++ b/third_party/upb/upb/message/accessors_test.cc @@ -179,8 +179,8 @@ TEST(GeneratedCode, ScalarsProto2) { 0, protobuf_test_messages_proto2_TestAllTypesProto2_optional_int32(msg)); EXPECT_EQ(0, upb_Message_GetInt32(UPB_UPCAST(msg), optional_int32_field, 0)); - upb_Message_SetInt32(UPB_UPCAST(msg), optional_int32_field, kTestInt32, - nullptr); + upb_Message_SetBaseFieldInt32(UPB_UPCAST(msg), optional_int32_field, + kTestInt32); EXPECT_EQ(true, upb_Message_HasBaseField(UPB_UPCAST(msg), optional_int32_field)); EXPECT_EQ(kTestInt32, @@ -196,8 +196,8 @@ TEST(GeneratedCode, ScalarsProto2) { 0, protobuf_test_messages_proto2_TestAllTypesProto2_optional_uint32(msg)); EXPECT_EQ(0, upb_Message_GetUInt32(UPB_UPCAST(msg), optional_uint32_field, 0)); - upb_Message_SetUInt32(UPB_UPCAST(msg), optional_uint32_field, kTestUInt32, - nullptr); + upb_Message_SetBaseFieldUInt32(UPB_UPCAST(msg), optional_uint32_field, + kTestUInt32); EXPECT_EQ(kTestUInt32, upb_Message_GetUInt32(UPB_UPCAST(msg), optional_uint32_field, 0)); EXPECT_EQ( @@ -219,15 +219,15 @@ TEST(GeneratedCode, ScalarProto3) { EXPECT_EQ( 0, protobuf_test_messages_proto3_TestAllTypesProto3_optional_int64(msg)); - upb_Message_SetInt64(UPB_UPCAST(msg), optional_int64_field, -1, nullptr); + upb_Message_SetBaseFieldInt64(UPB_UPCAST(msg), optional_int64_field, -1); EXPECT_EQ( -1, protobuf_test_messages_proto3_TestAllTypesProto3_optional_int64(msg)); EXPECT_EQ(-1, upb_Message_GetInt64(UPB_UPCAST(msg), optional_int64_field, 0)); EXPECT_EQ( 0, protobuf_test_messages_proto3_TestAllTypesProto3_optional_uint64(msg)); - upb_Message_SetUInt64(UPB_UPCAST(msg), optional_uint64_field, kTestUInt64, - nullptr); + upb_Message_SetBaseFieldUInt64(UPB_UPCAST(msg), optional_uint64_field, + kTestUInt64); EXPECT_EQ( kTestUInt64, protobuf_test_messages_proto3_TestAllTypesProto3_optional_uint64(msg)); @@ -265,8 +265,8 @@ TEST(GeneratedCode, Strings) { false, protobuf_test_messages_proto2_TestAllTypesProto2_has_optional_string( msg)); - upb_Message_SetString(UPB_UPCAST(msg), optional_string_field, - upb_StringView_FromString(kTestStr2), nullptr); + upb_Message_SetBaseFieldString(UPB_UPCAST(msg), optional_string_field, + upb_StringView_FromString(kTestStr2)); EXPECT_EQ(true, upb_Message_HasBaseField(UPB_UPCAST(msg), optional_string_field)); EXPECT_EQ( @@ -327,12 +327,10 @@ TEST(GeneratedCode, SubMessage) { upb_Message* new_nested_message = UPB_UPCAST( protobuf_test_messages_proto2_TestAllTypesProto2_NestedMessage_new( arena)); - upb_Message_SetInt32(new_nested_message, nested_message_a_field, 123, - nullptr); - upb_Message_SetMessage( - UPB_UPCAST(msg), - &protobuf_0test_0messages__proto2__TestAllTypesProto2_msg_init, - optional_message_field, new_nested_message); + upb_Message_SetBaseFieldInt32(new_nested_message, nested_message_a_field, + 123); + upb_Message_SetMessage(UPB_UPCAST(msg), optional_message_field, + new_nested_message); upb_Message* mutable_message = upb_Message_GetOrCreateMutableMessage( UPB_UPCAST(msg), @@ -478,4 +476,56 @@ TEST(GeneratedCode, EnumClosedCheck) { upb_Arena_Free(arena); } +TEST(GeneratedCode, OneofClear) { + upb_Arena* arena = upb_Arena_New(); + + protobuf_test_messages_proto2_TestAllTypesProto2* msg = + protobuf_test_messages_proto2_TestAllTypesProto2_new(arena); + + const upb_MiniTable* table = + &protobuf_0test_0messages__proto2__TestAllTypesProto2_msg_init; + + // oneof_uint32 + const upb_MiniTableField* oneofField = + upb_MiniTable_FindFieldByNumber(table, 111); + EXPECT_TRUE(upb_MiniTableField_IsInOneof(oneofField)); + protobuf_test_messages_proto2_TestAllTypesProto2_set_oneof_uint32(msg, 522); + EXPECT_TRUE( + protobuf_test_messages_proto2_TestAllTypesProto2_has_oneof_uint32(msg)); + + upb_Message_ClearOneof((upb_Message*)msg, table, oneofField); + EXPECT_FALSE( + protobuf_test_messages_proto2_TestAllTypesProto2_has_oneof_uint32(msg)); + + upb_Arena_Free(arena); +} + +TEST(GeneratedCode, OneofAccess) { + upb_Arena* arena = upb_Arena_New(); + + protobuf_test_messages_proto2_TestAllTypesProto2* msg = + protobuf_test_messages_proto2_TestAllTypesProto2_new(arena); + + const upb_MiniTable* table = + &protobuf_0test_0messages__proto2__TestAllTypesProto2_msg_init; + + // oneof_uint32 + const upb_MiniTableField* oneofField = + upb_MiniTable_FindFieldByNumber(table, 111); + EXPECT_TRUE(upb_MiniTableField_IsInOneof(oneofField)); + + const upb_MiniTableField* oneOfFirstFetch = + upb_Message_WhichOneof((upb_Message*)msg, table, oneofField); + // one of not set, so should initially yield nullptr + EXPECT_EQ(oneOfFirstFetch, nullptr); + + protobuf_test_messages_proto2_TestAllTypesProto2_set_oneof_uint32(msg, 522); + const upb_MiniTableField* oneOfSecondFetch = + upb_Message_WhichOneof((upb_Message*)msg, table, oneofField); + // this oneof has now been set, so should yield the MiniTableField + EXPECT_EQ(oneOfSecondFetch, oneofField); + + upb_Arena_Free(arena); +} + } // namespace diff --git a/third_party/upb/upb/message/compare.c b/third_party/upb/upb/message/compare.c index d2c88b6595c..70ad026bc49 100644 --- a/third_party/upb/upb/message/compare.c +++ b/third_party/upb/upb/message/compare.c @@ -15,6 +15,7 @@ #include "upb/message/internal/accessors.h" #include "upb/message/internal/compare_unknown.h" #include "upb/message/internal/extension.h" +#include "upb/message/internal/iterator.h" #include "upb/message/map.h" #include "upb/message/message.h" #include "upb/mini_table/extension.h" @@ -25,74 +26,18 @@ // Must be last. #include "upb/port/def.inc" -#define kUpb_BaseField_Begin ((size_t)-1) -#define kUpb_Extension_Begin ((size_t)-1) #ifdef __cplusplus extern "C" { #endif -static bool _upb_Message_NextBaseField(const upb_Message* msg, - const upb_MiniTable* m, - const upb_MiniTableField** out_f, - upb_MessageValue* out_v, size_t* iter) { - const size_t count = upb_MiniTable_FieldCount(m); - size_t i = *iter; - - while (++i < count) { - const upb_MiniTableField* f = upb_MiniTable_GetFieldByIndex(m, i); - const void* src = UPB_PRIVATE(_upb_Message_DataPtr)(msg, f); - - upb_MessageValue val; - UPB_PRIVATE(_upb_MiniTableField_DataCopy)(f, &val, src); - - // Skip field if unset or empty. - if (upb_MiniTableField_HasPresence(f)) { - if (!upb_Message_HasBaseField(msg, f)) continue; - } else { - if (UPB_PRIVATE(_upb_MiniTableField_DataIsZero)(f, src)) continue; - - if (upb_MiniTableField_IsArray(f)) { - if (upb_Array_Size(val.array_val) == 0) continue; - } else if (upb_MiniTableField_IsMap(f)) { - if (upb_Map_Size(val.map_val) == 0) continue; - } - } - - *out_f = f; - *out_v = val; - *iter = i; - return true; - } - - return false; -} - -static bool _upb_Message_NextExtension(const upb_Message* msg, - const upb_MiniTable* m, - const upb_MiniTableExtension** out_e, - upb_MessageValue* out_v, size_t* iter) { - size_t count; - const upb_Extension* exts = UPB_PRIVATE(_upb_Message_Getexts)(msg, &count); - size_t i = *iter; - - if (++i < count) { - *out_e = exts[i].ext; - *out_v = exts[i].data; - *iter = i; - return true; - } - - return false; -} - bool upb_Message_IsEmpty(const upb_Message* msg, const upb_MiniTable* m) { if (upb_Message_ExtensionCount(msg)) return false; const upb_MiniTableField* f; upb_MessageValue v; size_t iter = kUpb_BaseField_Begin; - return !_upb_Message_NextBaseField(msg, m, &f, &v, &iter); + return !UPB_PRIVATE(_upb_Message_NextBaseField)(msg, m, &f, &v, &iter); } static bool _upb_Array_IsEqual(const upb_Array* arr1, const upb_Array* arr2, @@ -154,8 +99,10 @@ static bool _upb_Message_BaseFieldsAreEqual(const upb_Message* msg1, const upb_MiniTableField *f1, *f2; upb_MessageValue val1, val2; - const bool got1 = _upb_Message_NextBaseField(msg1, m, &f1, &val1, &iter1); - const bool got2 = _upb_Message_NextBaseField(msg2, m, &f2, &val2, &iter2); + const bool got1 = + UPB_PRIVATE(_upb_Message_NextBaseField)(msg1, m, &f1, &val1, &iter1); + const bool got2 = + UPB_PRIVATE(_upb_Message_NextBaseField)(msg2, m, &f2, &val2, &iter2); if (got1 != got2) return false; // Must have identical field counts. if (!got1) return true; // Loop termination condition. @@ -195,7 +142,7 @@ static bool _upb_Message_ExtensionsAreEqual(const upb_Message* msg1, // Iterate over all extensions for msg1, and search msg2 for each extension. size_t iter1 = kUpb_Extension_Begin; - while (_upb_Message_NextExtension(msg1, m, &e, &val1, &iter1)) { + while (UPB_PRIVATE(_upb_Message_NextExtension)(msg1, m, &e, &val1, &iter1)) { const upb_Extension* ext2 = UPB_PRIVATE(_upb_Message_Getext)(msg2, e); if (!ext2) return false; diff --git a/third_party/upb/upb/message/copy.c b/third_party/upb/upb/message/copy.c index 114b92e0188..67e1b5b5030 100644 --- a/third_party/upb/upb/message/copy.c +++ b/third_party/upb/upb/message/copy.c @@ -117,9 +117,9 @@ static upb_Map* upb_Message_Map_DeepClone(const upb_Map* map, const upb_MiniTableField* f, upb_Message* clone, upb_Arena* arena) { - // TODO: use a variant of upb_MiniTable_GetSubMessageTable() here. - const upb_MiniTable* map_entry_table = upb_MiniTableSub_Message( - mini_table->UPB_PRIVATE(subs)[f->UPB_PRIVATE(submsg_index)]); + UPB_ASSERT(!upb_Message_IsFrozen(clone)); + const upb_MiniTable* map_entry_table = + upb_MiniTable_MapEntrySubMessage(mini_table, f); UPB_ASSERT(map_entry_table); const upb_MiniTableField* key_field = upb_MiniTable_MapKey(map_entry_table); @@ -161,6 +161,7 @@ static bool upb_Message_Array_DeepClone(const upb_Array* array, const upb_MiniTable* mini_table, const upb_MiniTableField* field, upb_Message* clone, upb_Arena* arena) { + UPB_ASSERT(!upb_Message_IsFrozen(clone)); UPB_PRIVATE(_upb_MiniTableField_CheckIsArray)(field); upb_Array* cloned_array = upb_Array_DeepClone( array, upb_MiniTableField_CType(field), @@ -186,6 +187,7 @@ static bool upb_Clone_ExtensionValue( upb_Message* _upb_Message_Copy(upb_Message* dst, const upb_Message* src, const upb_MiniTable* mini_table, upb_Arena* arena) { + UPB_ASSERT(!upb_Message_IsFrozen(dst)); upb_StringView empty_string = upb_StringView_FromDataAndSize(NULL, 0); // Only copy message area skipping upb_Message_Internal. memcpy(dst + 1, src + 1, mini_table->UPB_PRIVATE(size) - sizeof(upb_Message)); @@ -212,10 +214,10 @@ upb_Message* _upb_Message_Copy(upb_Message* dst, const upb_Message* src, if (dst_sub_message == NULL) { return NULL; } - _upb_Message_SetTaggedMessagePtr( - dst, mini_table, field, - UPB_PRIVATE(_upb_TaggedMessagePtr_Pack)(dst_sub_message, - is_empty)); + UPB_PRIVATE(_upb_Message_SetTaggedMessagePtr) + (dst, field, + UPB_PRIVATE(_upb_TaggedMessagePtr_Pack)(dst_sub_message, + is_empty)); } } break; case kUpb_CType_String: @@ -292,6 +294,7 @@ upb_Message* _upb_Message_Copy(upb_Message* dst, const upb_Message* src, bool upb_Message_DeepCopy(upb_Message* dst, const upb_Message* src, const upb_MiniTable* mini_table, upb_Arena* arena) { + UPB_ASSERT(!upb_Message_IsFrozen(dst)); upb_Message_Clear(dst, mini_table); return _upb_Message_Copy(dst, src, mini_table, arena) != NULL; } @@ -308,6 +311,7 @@ upb_Message* upb_Message_DeepClone(const upb_Message* msg, // Performs a shallow copy. TODO: Extend to handle unknown fields. void upb_Message_ShallowCopy(upb_Message* dst, const upb_Message* src, const upb_MiniTable* m) { + UPB_ASSERT(!upb_Message_IsFrozen(dst)); memcpy(dst, src, m->UPB_PRIVATE(size)); } diff --git a/third_party/upb/upb/message/copy_test.cc b/third_party/upb/upb/message/copy_test.cc index 8434258cb2c..1bdb3a30992 100644 --- a/third_party/upb/upb/message/copy_test.cc +++ b/third_party/upb/upb/message/copy_test.cc @@ -108,10 +108,8 @@ TEST(GeneratedCode, DeepCloneMessageSubMessage) { source_arena); protobuf_test_messages_proto2_TestAllTypesProto2_NestedMessage_set_a( nested, kTestNestedInt32); - upb_Message_SetMessage( - UPB_UPCAST(msg), - &protobuf_0test_0messages__proto2__TestAllTypesProto2_msg_init, - nested_message_field, UPB_UPCAST(nested)); + upb_Message_SetMessage(UPB_UPCAST(msg), nested_message_field, + UPB_UPCAST(nested)); upb_Arena* arena = upb_Arena_New(); protobuf_test_messages_proto2_TestAllTypesProto2* clone = (protobuf_test_messages_proto2_TestAllTypesProto2*)upb_Message_DeepClone( diff --git a/third_party/upb/upb/message/internal/accessors.h b/third_party/upb/upb/message/internal/accessors.h index bfae12e6019..5bbfb1e0bc2 100644 --- a/third_party/upb/upb/message/internal/accessors.h +++ b/third_party/upb/upb/message/internal/accessors.h @@ -12,14 +12,18 @@ #include #include +#include "upb/base/descriptor_constants.h" #include "upb/base/internal/endian.h" #include "upb/base/string_view.h" #include "upb/mem/arena.h" +#include "upb/message/internal/array.h" #include "upb/message/internal/extension.h" #include "upb/message/internal/map.h" #include "upb/message/internal/message.h" #include "upb/message/internal/tagged_ptr.h" #include "upb/message/internal/types.h" +#include "upb/message/value.h" +#include "upb/mini_table/enum.h" #include "upb/mini_table/extension.h" #include "upb/mini_table/field.h" #include "upb/mini_table/internal/field.h" @@ -112,6 +116,23 @@ UPB_INLINE bool UPB_PRIVATE(_upb_Message_ClearOneofCase)( return true; } +UPB_API_INLINE uint32_t upb_Message_WhichOneofFieldNumber( + const struct upb_Message* message, const upb_MiniTableField* oneof_field) { + UPB_ASSUME(upb_MiniTableField_IsInOneof(oneof_field)); + return UPB_PRIVATE(_upb_Message_GetOneofCase)(message, oneof_field); +} + +UPB_API_INLINE const upb_MiniTableField* upb_Message_WhichOneof( + const struct upb_Message* msg, const upb_MiniTable* m, + const upb_MiniTableField* f) { + uint32_t field_number = upb_Message_WhichOneofFieldNumber(msg, f); + if (field_number == 0) { + // No field in the oneof is set. + return NULL; + } + return upb_MiniTable_FindFieldByNumber(m, field_number); +} + // LINT.ThenChange(GoogleInternalName2) // Returns false if the message is missing any of its required fields. @@ -183,7 +204,7 @@ UPB_INLINE bool UPB_PRIVATE(_upb_MiniTableField_DataEquals)( UPB_INLINE void UPB_PRIVATE(_upb_MiniTableField_DataClear)( const upb_MiniTableField* f, void* val) { const char zero[16] = {0}; - return UPB_PRIVATE(_upb_MiniTableField_DataCopy)(f, val, zero); + UPB_PRIVATE(_upb_MiniTableField_DataCopy)(f, val, zero); } UPB_INLINE bool UPB_PRIVATE(_upb_MiniTableField_DataIsZero)( @@ -210,7 +231,6 @@ UPB_INLINE bool UPB_PRIVATE(_upb_MiniTableField_DataIsZero)( // const upb_MiniTableField* field, // bool value, upb_Arena* a) { // UPB_ASSUME(field->UPB_PRIVATE(descriptortype) == kUpb_FieldType_Bool); -// UPB_ASSUME(upb_MiniTableField_IsScalar(field)); // UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(field) == // kUpb_FieldRep_1Byte); // upb_Message_SetField(msg, field, &value, a); @@ -271,6 +291,24 @@ UPB_INLINE void _upb_Message_GetExtensionField( } } +// NOTE: The default_val is only used for fields that support presence. +// For repeated/map fields, the resulting upb_Array*/upb_Map* can be NULL if a +// upb_Array/upb_Map has not been allocated yet. Array/map fields do not have +// presence, so this is semantically identical to a pointer to an empty +// array/map, and must be treated the same for all semantic purposes. +UPB_API_INLINE upb_MessageValue upb_Message_GetField( + const struct upb_Message* msg, const upb_MiniTableField* field, + upb_MessageValue default_val) { + upb_MessageValue ret; + if (upb_MiniTableField_IsExtension(field)) { + _upb_Message_GetExtensionField(msg, (upb_MiniTableExtension*)field, + &default_val, &ret); + } else { + _upb_Message_GetNonExtensionField(msg, field, &default_val, &ret); + } + return ret; +} + UPB_API_INLINE void upb_Message_SetBaseField(struct upb_Message* msg, const upb_MiniTableField* f, const void* val) { @@ -294,6 +332,516 @@ UPB_API_INLINE bool upb_Message_SetExtension(struct upb_Message* msg, return true; } +// Sets the value of the given field in the given msg. The return value is true +// if the operation completed successfully, or false if memory allocation +// failed. +UPB_INLINE bool UPB_PRIVATE(_upb_Message_SetField)(struct upb_Message* msg, + const upb_MiniTableField* f, + upb_MessageValue val, + upb_Arena* a) { + if (upb_MiniTableField_IsExtension(f)) { + const upb_MiniTableExtension* ext = (const upb_MiniTableExtension*)f; + return upb_Message_SetExtension(msg, ext, &val, a); + } else { + upb_Message_SetBaseField(msg, f, &val); + return true; + } +} + +UPB_API_INLINE const upb_Array* upb_Message_GetArray( + const struct upb_Message* msg, const upb_MiniTableField* f) { + UPB_PRIVATE(_upb_MiniTableField_CheckIsArray)(f); + upb_Array* ret; + const upb_Array* default_val = NULL; + _upb_Message_GetNonExtensionField(msg, f, &default_val, &ret); + return ret; +} + +UPB_API_INLINE bool upb_Message_GetBool(const struct upb_Message* msg, + const upb_MiniTableField* f, + bool default_val) { + UPB_ASSUME(upb_MiniTableField_CType(f) == kUpb_CType_Bool); + UPB_ASSUME(upb_MiniTableField_IsScalar(f)); + UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(f) == kUpb_FieldRep_1Byte); + upb_MessageValue def; + def.bool_val = default_val; + return upb_Message_GetField(msg, f, def).bool_val; +} + +UPB_API_INLINE double upb_Message_GetDouble(const struct upb_Message* msg, + const upb_MiniTableField* f, + double default_val) { + UPB_ASSUME(upb_MiniTableField_CType(f) == kUpb_CType_Double); + UPB_ASSUME(upb_MiniTableField_IsScalar(f)); + UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(f) == kUpb_FieldRep_8Byte); + + upb_MessageValue def; + def.double_val = default_val; + return upb_Message_GetField(msg, f, def).double_val; +} + +UPB_API_INLINE float upb_Message_GetFloat(const struct upb_Message* msg, + const upb_MiniTableField* f, + float default_val) { + UPB_ASSUME(upb_MiniTableField_CType(f) == kUpb_CType_Float); + UPB_ASSUME(upb_MiniTableField_IsScalar(f)); + UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(f) == kUpb_FieldRep_4Byte); + + upb_MessageValue def; + def.float_val = default_val; + return upb_Message_GetField(msg, f, def).float_val; +} + +UPB_API_INLINE int32_t upb_Message_GetInt32(const struct upb_Message* msg, + const upb_MiniTableField* f, + int32_t default_val) { + UPB_ASSUME(upb_MiniTableField_CType(f) == kUpb_CType_Int32 || + upb_MiniTableField_CType(f) == kUpb_CType_Enum); + UPB_ASSUME(upb_MiniTableField_IsScalar(f)); + UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(f) == kUpb_FieldRep_4Byte); + + upb_MessageValue def; + def.int32_val = default_val; + return upb_Message_GetField(msg, f, def).int32_val; +} + +UPB_API_INLINE int64_t upb_Message_GetInt64(const struct upb_Message* msg, + const upb_MiniTableField* f, + int64_t default_val) { + UPB_ASSUME(upb_MiniTableField_CType(f) == kUpb_CType_Int64); + UPB_ASSUME(upb_MiniTableField_IsScalar(f)); + UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(f) == kUpb_FieldRep_8Byte); + + upb_MessageValue def; + def.int64_val = default_val; + return upb_Message_GetField(msg, f, def).int64_val; +} + +UPB_INLINE void UPB_PRIVATE(_upb_Message_AssertMapIsUntagged)( + const struct upb_Message* msg, const upb_MiniTableField* field) { + UPB_UNUSED(msg); + UPB_PRIVATE(_upb_MiniTableField_CheckIsMap)(field); +#ifndef NDEBUG + uintptr_t default_val = 0; + uintptr_t tagged; + _upb_Message_GetNonExtensionField(msg, field, &default_val, &tagged); + UPB_ASSERT(!upb_TaggedMessagePtr_IsEmpty(tagged)); +#endif +} + +UPB_API_INLINE const struct upb_Map* upb_Message_GetMap( + const struct upb_Message* msg, const upb_MiniTableField* f) { + UPB_PRIVATE(_upb_MiniTableField_CheckIsMap)(f); + UPB_PRIVATE(_upb_Message_AssertMapIsUntagged)(msg, f); + struct upb_Map* ret; + const struct upb_Map* default_val = NULL; + _upb_Message_GetNonExtensionField(msg, f, &default_val, &ret); + return ret; +} + +UPB_API_INLINE uintptr_t upb_Message_GetTaggedMessagePtr( + const struct upb_Message* msg, const upb_MiniTableField* f, + struct upb_Message* default_val) { + UPB_ASSUME(upb_MiniTableField_CType(f) == kUpb_CType_Message); + UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(f) == + UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte)); + UPB_ASSUME(upb_MiniTableField_IsScalar(f)); + uintptr_t tagged; + _upb_Message_GetNonExtensionField(msg, f, &default_val, &tagged); + return tagged; +} + +// For internal use only; users cannot set tagged messages because only the +// parser and the message copier are allowed to directly create an empty +// message. +UPB_INLINE void UPB_PRIVATE(_upb_Message_SetTaggedMessagePtr)( + struct upb_Message* msg, const upb_MiniTableField* f, + uintptr_t sub_message) { + UPB_ASSUME(upb_MiniTableField_CType(f) == kUpb_CType_Message); + UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(f) == + UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte)); + UPB_ASSUME(upb_MiniTableField_IsScalar(f)); + upb_Message_SetBaseField(msg, f, &sub_message); +} + +UPB_API_INLINE const struct upb_Message* upb_Message_GetMessage( + const struct upb_Message* msg, const upb_MiniTableField* f) { + uintptr_t tagged = upb_Message_GetTaggedMessagePtr(msg, f, NULL); + return upb_TaggedMessagePtr_GetNonEmptyMessage(tagged); +} + +UPB_API_INLINE upb_Array* upb_Message_GetMutableArray( + struct upb_Message* msg, const upb_MiniTableField* f) { + UPB_PRIVATE(_upb_MiniTableField_CheckIsArray)(f); + return (upb_Array*)upb_Message_GetArray(msg, f); +} + +UPB_API_INLINE struct upb_Map* upb_Message_GetMutableMap( + struct upb_Message* msg, const upb_MiniTableField* f) { + return (struct upb_Map*)upb_Message_GetMap(msg, f); +} + +UPB_API_INLINE struct upb_Message* upb_Message_GetMutableMessage( + struct upb_Message* msg, const upb_MiniTableField* f) { + return (struct upb_Message*)upb_Message_GetMessage(msg, f); +} + +UPB_API_INLINE upb_Array* upb_Message_GetOrCreateMutableArray( + struct upb_Message* msg, const upb_MiniTableField* f, upb_Arena* arena) { + UPB_ASSERT(arena); + UPB_PRIVATE(_upb_MiniTableField_CheckIsArray)(f); + upb_Array* array = upb_Message_GetMutableArray(msg, f); + if (!array) { + array = UPB_PRIVATE(_upb_Array_New)( + arena, 4, UPB_PRIVATE(_upb_MiniTableField_ElemSizeLg2)(f)); + // Check again due to: https://godbolt.org/z/7WfaoKG1r + UPB_PRIVATE(_upb_MiniTableField_CheckIsArray)(f); + upb_MessageValue val; + val.array_val = array; + UPB_PRIVATE(_upb_Message_SetField)(msg, f, val, arena); + } + return array; +} + +UPB_INLINE struct upb_Map* _upb_Message_GetOrCreateMutableMap( + struct upb_Message* msg, const upb_MiniTableField* field, size_t key_size, + size_t val_size, upb_Arena* arena) { + UPB_PRIVATE(_upb_MiniTableField_CheckIsMap)(field); + UPB_PRIVATE(_upb_Message_AssertMapIsUntagged)(msg, field); + struct upb_Map* map = NULL; + struct upb_Map* default_map_value = NULL; + _upb_Message_GetNonExtensionField(msg, field, &default_map_value, &map); + if (!map) { + map = _upb_Map_New(arena, key_size, val_size); + // Check again due to: https://godbolt.org/z/7WfaoKG1r + UPB_PRIVATE(_upb_MiniTableField_CheckIsMap)(field); + upb_Message_SetBaseField(msg, field, &map); + } + return map; +} + +UPB_API_INLINE struct upb_Map* upb_Message_GetOrCreateMutableMap( + struct upb_Message* msg, const upb_MiniTable* map_entry_mini_table, + const upb_MiniTableField* f, upb_Arena* arena) { + UPB_ASSUME(upb_MiniTableField_CType(f) == kUpb_CType_Message); + const upb_MiniTableField* map_entry_key_field = + &map_entry_mini_table->UPB_ONLYBITS(fields)[0]; + const upb_MiniTableField* map_entry_value_field = + &map_entry_mini_table->UPB_ONLYBITS(fields)[1]; + return _upb_Message_GetOrCreateMutableMap( + msg, f, _upb_Map_CTypeSize(upb_MiniTableField_CType(map_entry_key_field)), + _upb_Map_CTypeSize(upb_MiniTableField_CType(map_entry_value_field)), + arena); +} + +UPB_API_INLINE struct upb_Message* upb_Message_GetOrCreateMutableMessage( + struct upb_Message* msg, const upb_MiniTable* mini_table, + const upb_MiniTableField* f, upb_Arena* arena) { + UPB_ASSERT(arena); + UPB_ASSUME(upb_MiniTableField_CType(f) == kUpb_CType_Message); + UPB_ASSUME(!upb_MiniTableField_IsExtension(f)); + struct upb_Message* sub_message = + *UPB_PTR_AT(msg, f->UPB_ONLYBITS(offset), struct upb_Message*); + if (!sub_message) { + const upb_MiniTable* sub_mini_table = + upb_MiniTable_SubMessage(mini_table, f); + UPB_ASSERT(sub_mini_table); + sub_message = _upb_Message_New(sub_mini_table, arena); + *UPB_PTR_AT(msg, f->UPB_ONLYBITS(offset), struct upb_Message*) = + sub_message; + UPB_PRIVATE(_upb_Message_SetPresence)(msg, f); + } + return sub_message; +} + +UPB_API_INLINE upb_StringView +upb_Message_GetString(const struct upb_Message* msg, + const upb_MiniTableField* f, upb_StringView default_val) { + UPB_ASSUME(upb_MiniTableField_CType(f) == kUpb_CType_String || + upb_MiniTableField_CType(f) == kUpb_CType_Bytes); + UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(f) == + kUpb_FieldRep_StringView); + + upb_MessageValue def; + def.str_val = default_val; + return upb_Message_GetField(msg, f, def).str_val; +} + +UPB_API_INLINE uint32_t upb_Message_GetUInt32(const struct upb_Message* msg, + const upb_MiniTableField* f, + uint32_t default_val) { + UPB_ASSUME(upb_MiniTableField_CType(f) == kUpb_CType_UInt32); + UPB_ASSUME(upb_MiniTableField_IsScalar(f)); + UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(f) == kUpb_FieldRep_4Byte); + + upb_MessageValue def; + def.uint32_val = default_val; + return upb_Message_GetField(msg, f, def).uint32_val; +} + +UPB_API_INLINE uint64_t upb_Message_GetUInt64(const struct upb_Message* msg, + const upb_MiniTableField* f, + uint64_t default_val) { + UPB_ASSUME(upb_MiniTableField_CType(f) == kUpb_CType_UInt64); + UPB_ASSUME(upb_MiniTableField_IsScalar(f)); + UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(f) == kUpb_FieldRep_8Byte); + + upb_MessageValue def; + def.uint64_val = default_val; + return upb_Message_GetField(msg, f, def).uint64_val; +} + +// BaseField Setters /////////////////////////////////////////////////////////// + +UPB_API_INLINE void upb_Message_SetBaseFieldBool(struct upb_Message* msg, + const upb_MiniTableField* f, + bool value) { + UPB_ASSUME(upb_MiniTableField_CType(f) == kUpb_CType_Bool); + UPB_ASSUME(upb_MiniTableField_IsScalar(f)); + UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(f) == kUpb_FieldRep_1Byte); + upb_Message_SetBaseField(msg, f, &value); +} + +UPB_API_INLINE void upb_Message_SetBaseFieldDouble(struct upb_Message* msg, + const upb_MiniTableField* f, + double value) { + UPB_ASSUME(upb_MiniTableField_CType(f) == kUpb_CType_Double); + UPB_ASSUME(upb_MiniTableField_IsScalar(f)); + UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(f) == kUpb_FieldRep_8Byte); + upb_Message_SetBaseField(msg, f, &value); +} + +UPB_API_INLINE void upb_Message_SetBaseFieldFloat(struct upb_Message* msg, + const upb_MiniTableField* f, + float value) { + UPB_ASSUME(upb_MiniTableField_CType(f) == kUpb_CType_Float); + UPB_ASSUME(upb_MiniTableField_IsScalar(f)); + UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(f) == kUpb_FieldRep_4Byte); + upb_Message_SetBaseField(msg, f, &value); +} + +UPB_API_INLINE void upb_Message_SetBaseFieldInt32(struct upb_Message* msg, + const upb_MiniTableField* f, + int32_t value) { + UPB_ASSUME(upb_MiniTableField_CType(f) == kUpb_CType_Int32 || + upb_MiniTableField_CType(f) == kUpb_CType_Enum); + UPB_ASSUME(upb_MiniTableField_IsScalar(f)); + UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(f) == kUpb_FieldRep_4Byte); + upb_Message_SetBaseField(msg, f, &value); +} + +UPB_API_INLINE void upb_Message_SetBaseFieldInt64(struct upb_Message* msg, + const upb_MiniTableField* f, + int64_t value) { + UPB_ASSUME(upb_MiniTableField_CType(f) == kUpb_CType_Int64); + UPB_ASSUME(upb_MiniTableField_IsScalar(f)); + UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(f) == kUpb_FieldRep_8Byte); + upb_Message_SetBaseField(msg, f, &value); +} + +UPB_API_INLINE void upb_Message_SetBaseFieldString(struct upb_Message* msg, + const upb_MiniTableField* f, + upb_StringView value) { + UPB_ASSUME(upb_MiniTableField_CType(f) == kUpb_CType_String || + upb_MiniTableField_CType(f) == kUpb_CType_Bytes); + UPB_ASSUME(upb_MiniTableField_IsScalar(f)); + UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(f) == + kUpb_FieldRep_StringView); + upb_Message_SetBaseField(msg, f, &value); +} + +UPB_API_INLINE void upb_Message_SetBaseFieldUInt32(struct upb_Message* msg, + const upb_MiniTableField* f, + uint32_t value) { + UPB_ASSUME(upb_MiniTableField_CType(f) == kUpb_CType_UInt32); + UPB_ASSUME(upb_MiniTableField_IsScalar(f)); + UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(f) == kUpb_FieldRep_4Byte); + upb_Message_SetBaseField(msg, f, &value); +} + +UPB_API_INLINE void upb_Message_SetBaseFieldUInt64(struct upb_Message* msg, + const upb_MiniTableField* f, + uint64_t value) { + UPB_ASSUME(upb_MiniTableField_CType(f) == kUpb_CType_UInt64); + UPB_ASSUME(upb_MiniTableField_IsScalar(f)); + UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(f) == kUpb_FieldRep_8Byte); + upb_Message_SetBaseField(msg, f, &value); +} + +UPB_API_INLINE void upb_Message_SetClosedEnum(struct upb_Message* msg, + const upb_MiniTable* m, + const upb_MiniTableField* f, + int32_t value) { + UPB_ASSERT(upb_MiniTableField_IsClosedEnum(f)); + UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(f) == kUpb_FieldRep_4Byte); + UPB_ASSERT( + upb_MiniTableEnum_CheckValue(upb_MiniTable_GetSubEnumTable(m, f), value)); + upb_Message_SetBaseField(msg, f, &value); +} + +// Extension Setters /////////////////////////////////////////////////////////// + +UPB_API_INLINE bool upb_Message_SetExtensionBool( + struct upb_Message* msg, const upb_MiniTableExtension* e, bool value, + upb_Arena* a) { + UPB_ASSUME(upb_MiniTableExtension_CType(e) == kUpb_CType_Bool); + UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableExtension_GetRep)(e) == + kUpb_FieldRep_1Byte); + return upb_Message_SetExtension(msg, e, &value, a); +} + +UPB_API_INLINE bool upb_Message_SetExtensionDouble( + struct upb_Message* msg, const upb_MiniTableExtension* e, double value, + upb_Arena* a) { + UPB_ASSUME(upb_MiniTableExtension_CType(e) == kUpb_CType_Double); + UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableExtension_GetRep)(e) == + kUpb_FieldRep_8Byte); + return upb_Message_SetExtension(msg, e, &value, a); +} + +UPB_API_INLINE bool upb_Message_SetExtensionFloat( + struct upb_Message* msg, const upb_MiniTableExtension* e, float value, + upb_Arena* a) { + UPB_ASSUME(upb_MiniTableExtension_CType(e) == kUpb_CType_Float); + UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableExtension_GetRep)(e) == + kUpb_FieldRep_4Byte); + return upb_Message_SetExtension(msg, e, &value, a); +} + +UPB_API_INLINE bool upb_Message_SetExtensionInt32( + struct upb_Message* msg, const upb_MiniTableExtension* e, int32_t value, + upb_Arena* a) { + UPB_ASSUME(upb_MiniTableExtension_CType(e) == kUpb_CType_Int32 || + upb_MiniTableExtension_CType(e) == kUpb_CType_Enum); + UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableExtension_GetRep)(e) == + kUpb_FieldRep_4Byte); + return upb_Message_SetExtension(msg, e, &value, a); +} + +UPB_API_INLINE bool upb_Message_SetExtensionInt64( + struct upb_Message* msg, const upb_MiniTableExtension* e, int64_t value, + upb_Arena* a) { + UPB_ASSUME(upb_MiniTableExtension_CType(e) == kUpb_CType_Int64); + UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableExtension_GetRep)(e) == + kUpb_FieldRep_8Byte); + return upb_Message_SetExtension(msg, e, &value, a); +} + +UPB_API_INLINE bool upb_Message_SetExtensionString( + struct upb_Message* msg, const upb_MiniTableExtension* e, + upb_StringView value, upb_Arena* a) { + UPB_ASSUME(upb_MiniTableExtension_CType(e) == kUpb_CType_String || + upb_MiniTableExtension_CType(e) == kUpb_CType_Bytes); + UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableExtension_GetRep)(e) == + kUpb_FieldRep_StringView); + return upb_Message_SetExtension(msg, e, &value, a); +} + +UPB_API_INLINE bool upb_Message_SetExtensionUInt32( + struct upb_Message* msg, const upb_MiniTableExtension* e, uint32_t value, + upb_Arena* a) { + UPB_ASSUME(upb_MiniTableExtension_CType(e) == kUpb_CType_UInt32); + UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableExtension_GetRep)(e) == + kUpb_FieldRep_4Byte); + return upb_Message_SetExtension(msg, e, &value, a); +} + +UPB_API_INLINE bool upb_Message_SetExtensionUInt64( + struct upb_Message* msg, const upb_MiniTableExtension* e, uint64_t value, + upb_Arena* a) { + UPB_ASSUME(upb_MiniTableExtension_CType(e) == kUpb_CType_UInt64); + UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableExtension_GetRep)(e) == + kUpb_FieldRep_8Byte); + return upb_Message_SetExtension(msg, e, &value, a); +} + +// Universal Setters /////////////////////////////////////////////////////////// + +UPB_API_INLINE bool upb_Message_SetBool(struct upb_Message* msg, + const upb_MiniTableField* f, bool value, + upb_Arena* a) { + return upb_MiniTableField_IsExtension(f) + ? upb_Message_SetExtensionBool( + msg, (const upb_MiniTableExtension*)f, value, a) + : (upb_Message_SetBaseFieldBool(msg, f, value), true); +} + +UPB_API_INLINE bool upb_Message_SetDouble(struct upb_Message* msg, + const upb_MiniTableField* f, + double value, upb_Arena* a) { + return upb_MiniTableField_IsExtension(f) + ? upb_Message_SetExtensionDouble( + msg, (const upb_MiniTableExtension*)f, value, a) + : (upb_Message_SetBaseFieldDouble(msg, f, value), true); +} + +UPB_API_INLINE bool upb_Message_SetFloat(struct upb_Message* msg, + const upb_MiniTableField* f, + float value, upb_Arena* a) { + return upb_MiniTableField_IsExtension(f) + ? upb_Message_SetExtensionFloat( + msg, (const upb_MiniTableExtension*)f, value, a) + : (upb_Message_SetBaseFieldFloat(msg, f, value), true); +} + +UPB_API_INLINE bool upb_Message_SetInt32(struct upb_Message* msg, + const upb_MiniTableField* f, + int32_t value, upb_Arena* a) { + return upb_MiniTableField_IsExtension(f) + ? upb_Message_SetExtensionInt32( + msg, (const upb_MiniTableExtension*)f, value, a) + : (upb_Message_SetBaseFieldInt32(msg, f, value), true); +} + +UPB_API_INLINE bool upb_Message_SetInt64(struct upb_Message* msg, + const upb_MiniTableField* f, + int64_t value, upb_Arena* a) { + return upb_MiniTableField_IsExtension(f) + ? upb_Message_SetExtensionInt64( + msg, (const upb_MiniTableExtension*)f, value, a) + : (upb_Message_SetBaseFieldInt64(msg, f, value), true); +} + +// Sets the value of a message-typed field. The mini_tables of `msg` and +// `value` must have been linked for this to work correctly. +UPB_API_INLINE void upb_Message_SetMessage(struct upb_Message* msg, + const upb_MiniTableField* f, + struct upb_Message* value) { + UPB_PRIVATE(_upb_Message_SetTaggedMessagePtr) + (msg, f, UPB_PRIVATE(_upb_TaggedMessagePtr_Pack)(value, false)); +} + +// Sets the value of a `string` or `bytes` field. The bytes of the value are not +// copied, so it is the caller's responsibility to ensure that they remain valid +// for the lifetime of `msg`. That might be done by copying them into the given +// arena, or by fusing that arena with the arena the bytes live in, for example. +UPB_API_INLINE bool upb_Message_SetString(struct upb_Message* msg, + const upb_MiniTableField* f, + upb_StringView value, upb_Arena* a) { + return upb_MiniTableField_IsExtension(f) + ? upb_Message_SetExtensionString( + msg, (const upb_MiniTableExtension*)f, value, a) + : (upb_Message_SetBaseFieldString(msg, f, value), true); +} + +UPB_API_INLINE bool upb_Message_SetUInt32(struct upb_Message* msg, + const upb_MiniTableField* f, + uint32_t value, upb_Arena* a) { + return upb_MiniTableField_IsExtension(f) + ? upb_Message_SetExtensionUInt32( + msg, (const upb_MiniTableExtension*)f, value, a) + : (upb_Message_SetBaseFieldUInt32(msg, f, value), true); +} + +UPB_API_INLINE bool upb_Message_SetUInt64(struct upb_Message* msg, + const upb_MiniTableField* f, + uint64_t value, upb_Arena* a) { + return upb_MiniTableField_IsExtension(f) + ? upb_Message_SetExtensionUInt64( + msg, (const upb_MiniTableExtension*)f, value, a) + : (upb_Message_SetBaseFieldUInt64(msg, f, value), true); +} + UPB_API_INLINE void upb_Message_Clear(struct upb_Message* msg, const upb_MiniTable* m) { UPB_ASSERT(!upb_Message_IsFrozen(msg)); @@ -335,33 +883,30 @@ UPB_API_INLINE void upb_Message_ClearExtension( } } -UPB_INLINE void _upb_Message_AssertMapIsUntagged( - const struct upb_Message* msg, const upb_MiniTableField* field) { - UPB_UNUSED(msg); - UPB_PRIVATE(_upb_MiniTableField_CheckIsMap)(field); -#ifndef NDEBUG - uintptr_t default_val = 0; - uintptr_t tagged; - _upb_Message_GetNonExtensionField(msg, field, &default_val, &tagged); - UPB_ASSERT(!upb_TaggedMessagePtr_IsEmpty(tagged)); -#endif +UPB_API_INLINE void upb_Message_ClearOneof(struct upb_Message* msg, + const upb_MiniTable* m, + const upb_MiniTableField* f) { + UPB_ASSERT(!upb_Message_IsFrozen(msg)); + uint32_t field_number = upb_Message_WhichOneofFieldNumber(msg, f); + if (field_number == 0) { + // No field in the oneof is set. + return; + } + + const upb_MiniTableField* field = + upb_MiniTable_FindFieldByNumber(m, field_number); + upb_Message_ClearBaseField(msg, field); } -UPB_INLINE struct upb_Map* _upb_Message_GetOrCreateMutableMap( - struct upb_Message* msg, const upb_MiniTableField* field, size_t key_size, - size_t val_size, upb_Arena* arena) { - UPB_PRIVATE(_upb_MiniTableField_CheckIsMap)(field); - _upb_Message_AssertMapIsUntagged(msg, field); - struct upb_Map* map = NULL; - struct upb_Map* default_map_value = NULL; - _upb_Message_GetNonExtensionField(msg, field, &default_map_value, &map); - if (!map) { - map = _upb_Map_New(arena, key_size, val_size); - // Check again due to: https://godbolt.org/z/7WfaoKG1r - UPB_PRIVATE(_upb_MiniTableField_CheckIsMap)(field); - upb_Message_SetBaseField(msg, field, &map); +UPB_API_INLINE void* upb_Message_ResizeArrayUninitialized( + struct upb_Message* msg, const upb_MiniTableField* f, size_t size, + upb_Arena* arena) { + UPB_PRIVATE(_upb_MiniTableField_CheckIsArray)(f); + upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, f, arena); + if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)(arr, size, arena)) { + return NULL; } - return map; + return upb_Array_MutableDataPtr(arr); } #ifdef __cplusplus diff --git a/third_party/upb/upb/message/internal/extension.c b/third_party/upb/upb/message/internal/extension.c index 85a09fd2d02..f55253d495f 100644 --- a/third_party/upb/upb/message/internal/extension.c +++ b/third_party/upb/upb/message/internal/extension.c @@ -49,6 +49,7 @@ const upb_Extension* UPB_PRIVATE(_upb_Message_Getexts)( upb_Extension* UPB_PRIVATE(_upb_Message_GetOrCreateExtension)( struct upb_Message* msg, const upb_MiniTableExtension* e, upb_Arena* a) { + UPB_ASSERT(!upb_Message_IsFrozen(msg)); upb_Extension* ext = (upb_Extension*)UPB_PRIVATE(_upb_Message_Getext)(msg, e); if (ext) return ext; if (!UPB_PRIVATE(_upb_Message_Realloc)(msg, sizeof(upb_Extension), a)) diff --git a/third_party/upb/upb/message/internal/iterator.c b/third_party/upb/upb/message/internal/iterator.c new file mode 100644 index 00000000000..82f2b378b91 --- /dev/null +++ b/third_party/upb/upb/message/internal/iterator.c @@ -0,0 +1,78 @@ +// Protocol Buffers - Google's data interchange format +// Copyright 2024 Google LLC. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd + +#include "upb/message/internal/iterator.h" // IWYU pragma: keep + +#include + +#include "upb/message/accessors.h" +#include "upb/message/array.h" +#include "upb/message/internal/accessors.h" +#include "upb/message/internal/extension.h" +#include "upb/message/map.h" +#include "upb/message/message.h" +#include "upb/mini_table/extension.h" +#include "upb/mini_table/field.h" +#include "upb/mini_table/message.h" + +// Must be last. +#include "upb/port/def.inc" + +bool UPB_PRIVATE(_upb_Message_NextBaseField)(const upb_Message* msg, + const upb_MiniTable* m, + const upb_MiniTableField** out_f, + upb_MessageValue* out_v, + size_t* iter) { + const size_t count = upb_MiniTable_FieldCount(m); + size_t i = *iter; + + while (++i < count) { + const upb_MiniTableField* f = upb_MiniTable_GetFieldByIndex(m, i); + const void* src = UPB_PRIVATE(_upb_Message_DataPtr)(msg, f); + + upb_MessageValue val; + UPB_PRIVATE(_upb_MiniTableField_DataCopy)(f, &val, src); + + // Skip field if unset or empty. + if (upb_MiniTableField_HasPresence(f)) { + if (!upb_Message_HasBaseField(msg, f)) continue; + } else { + if (UPB_PRIVATE(_upb_MiniTableField_DataIsZero)(f, src)) continue; + + if (upb_MiniTableField_IsArray(f)) { + if (upb_Array_Size(val.array_val) == 0) continue; + } else if (upb_MiniTableField_IsMap(f)) { + if (upb_Map_Size(val.map_val) == 0) continue; + } + } + + *out_f = f; + *out_v = val; + *iter = i; + return true; + } + + return false; +} + +bool UPB_PRIVATE(_upb_Message_NextExtension)( + const upb_Message* msg, const upb_MiniTable* m, + const upb_MiniTableExtension** out_e, upb_MessageValue* out_v, + size_t* iter) { + size_t count; + const upb_Extension* exts = UPB_PRIVATE(_upb_Message_Getexts)(msg, &count); + size_t i = *iter; + + if (++i < count) { + *out_e = exts[i].ext; + *out_v = exts[i].data; + *iter = i; + return true; + } + + return false; +} \ No newline at end of file diff --git a/third_party/upb/upb/message/internal/iterator.h b/third_party/upb/upb/message/internal/iterator.h new file mode 100644 index 00000000000..ad080db70da --- /dev/null +++ b/third_party/upb/upb/message/internal/iterator.h @@ -0,0 +1,35 @@ +// Protocol Buffers - Google's data interchange format +// Copyright 2024 Google LLC. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd + +#ifndef THIRD_PARTY_UPB_UPB_MESSAGE_INTERNAL_ITERATOR_H_ +#define THIRD_PARTY_UPB_UPB_MESSAGE_INTERNAL_ITERATOR_H_ + +#include + +#include "upb/message/message.h" +#include "upb/message/value.h" +#include "upb/mini_table/extension.h" +#include "upb/mini_table/field.h" +#include "upb/mini_table/message.h" + +// Must be last. +#include "upb/port/def.inc" + +#define kUpb_BaseField_Begin ((size_t)-1) +#define kUpb_Extension_Begin ((size_t)-1) + +bool UPB_PRIVATE(_upb_Message_NextBaseField)(const upb_Message* msg, + const upb_MiniTable* m, + const upb_MiniTableField** out_f, + upb_MessageValue* out_v, + size_t* iter); + +bool UPB_PRIVATE(_upb_Message_NextExtension)( + const upb_Message* msg, const upb_MiniTable* m, + const upb_MiniTableExtension** out_e, upb_MessageValue* out_v, + size_t* iter); +#endif // THIRD_PARTY_UPB_UPB_MESSAGE_INTERNAL_ITERATOR_H_ diff --git a/third_party/upb/upb/message/internal/message.c b/third_party/upb/upb/message/internal/message.c index 856fc970162..57ab2d7371c 100644 --- a/third_party/upb/upb/message/internal/message.c +++ b/third_party/upb/upb/message/internal/message.c @@ -23,6 +23,7 @@ const double kUpb_NaN = NAN; bool UPB_PRIVATE(_upb_Message_Realloc)(struct upb_Message* msg, size_t need, upb_Arena* a) { + UPB_ASSERT(!upb_Message_IsFrozen(msg)); const size_t overhead = sizeof(upb_Message_Internal); upb_Message_Internal* in = UPB_PRIVATE(_upb_Message_GetInternal)(msg); @@ -59,18 +60,16 @@ bool UPB_PRIVATE(_upb_Message_Realloc)(struct upb_Message* msg, size_t need, } #if UPB_TRACING_ENABLED -static void (*_new_message_trace_handler)(const upb_MiniTable*, - const upb_Arena*); +static void (*_message_trace_handler)(const upb_MiniTable*, const upb_Arena*); -void UPB_PRIVATE(upb_Message_SetNewMessageTraceHandler)( - void (*new_message_trace_handler)(const upb_MiniTable*, const upb_Arena*)) { - _new_message_trace_handler = new_message_trace_handler; +void upb_Message_LogNewMessage(const upb_MiniTable* m, const upb_Arena* arena) { + if (_message_trace_handler) { + _message_trace_handler(m, arena); + } } -void UPB_PRIVATE(upb_Message_LogNewMessage)(const upb_MiniTable* mini_table, - const upb_Arena* arena) { - if (_new_message_trace_handler) { - _new_message_trace_handler(mini_table, arena); - } +void upb_Message_SetNewMessageTraceHandler(void (*handler)(const upb_MiniTable*, + const upb_Arena*)) { + _message_trace_handler = handler; } -#endif +#endif // UPB_TRACING_ENABLED diff --git a/third_party/upb/upb/message/internal/message.h b/third_party/upb/upb/message/internal/message.h index a81bb4f0b0d..b371bbe0c85 100644 --- a/third_party/upb/upb/message/internal/message.h +++ b/third_party/upb/upb/message/internal/message.h @@ -60,18 +60,19 @@ typedef struct upb_Message_Internal { } upb_Message_Internal; #ifdef UPB_TRACING_ENABLED -void UPB_PRIVATE(upb_Message_SetNewMessageTraceHandler)( - void (*newMessageTraceHandler)(const upb_MiniTable*, const upb_Arena*)); -void UPB_PRIVATE(upb_Message_LogNewMessage)(const upb_MiniTable* mini_table, - const upb_Arena* arena); -#endif +UPB_API void upb_Message_LogNewMessage(const upb_MiniTable* m, + const upb_Arena* arena); +UPB_API void upb_Message_SetNewMessageTraceHandler( + void (*handler)(const upb_MiniTable*, const upb_Arena*)); +#endif // UPB_TRACING_ENABLED // Inline version upb_Message_New(), for internal use. UPB_INLINE struct upb_Message* _upb_Message_New(const upb_MiniTable* m, upb_Arena* a) { #ifdef UPB_TRACING_ENABLED - UPB_PRIVATE(upb_Message_LogNewMessage)(m, a); -#endif + upb_Message_LogNewMessage(m, a); +#endif // UPB_TRACING_ENABLED + const int size = m->UPB_PRIVATE(size); struct upb_Message* msg = (struct upb_Message*)upb_Arena_Malloc(a, size); if (UPB_UNLIKELY(!msg)) return NULL; diff --git a/third_party/upb/upb/message/merge.c b/third_party/upb/upb/message/merge.c new file mode 100644 index 00000000000..1e786a829e9 --- /dev/null +++ b/third_party/upb/upb/message/merge.c @@ -0,0 +1,38 @@ +#include "upb/message/merge.h" + +#include "stddef.h" +#include "upb/mem/arena.h" +#include "upb/message/message.h" +#include "upb/mini_table/extension_registry.h" +#include "upb/mini_table/message.h" +#include "upb/wire/decode.h" +#include "upb/wire/encode.h" + +// Must be last. +#include "upb/port/def.inc" + +bool upb_Message_MergeFrom(upb_Message* dst, const upb_Message* src, + const upb_MiniTable* mt, + const upb_ExtensionRegistry* extreg, + upb_Arena* arena) { + char* buf = NULL; + size_t size = 0; + // This tmp arena is used to hold the bytes for `src` serialized. This bends + // the typical "no hidden allocations" design of upb, but under a properly + // optimized implementation this extra allocation would not be necessary and + // so we don't want to unnecessarily have the bad API or bloat the passed-in + // arena with this very-short-term allocation. + upb_Arena* encode_arena = upb_Arena_New(); + upb_EncodeStatus e_status = upb_Encode(src, mt, 0, encode_arena, &buf, &size); + if (e_status != kUpb_EncodeStatus_Ok) { + upb_Arena_Free(encode_arena); + return false; + } + upb_DecodeStatus d_status = upb_Decode(buf, size, dst, mt, extreg, 0, arena); + if (d_status != kUpb_DecodeStatus_Ok) { + upb_Arena_Free(encode_arena); + return false; + } + upb_Arena_Free(encode_arena); + return true; +} diff --git a/third_party/upb/upb/message/merge.h b/third_party/upb/upb/message/merge.h new file mode 100644 index 00000000000..353d57a7385 --- /dev/null +++ b/third_party/upb/upb/message/merge.h @@ -0,0 +1,26 @@ +#ifndef THIRD_PARTY_UPB_UPB_MESSAGE_MERGE_H_ +#define THIRD_PARTY_UPB_UPB_MESSAGE_MERGE_H_ + +#include "upb/mem/arena.h" +#include "upb/message/message.h" +#include "upb/mini_table/extension_registry.h" +#include "upb/mini_table/message.h" + +// Must be last. +#include "upb/port/def.inc" + +#ifdef __cplusplus +extern "C" { +#endif + +UPB_API bool upb_Message_MergeFrom(upb_Message* dst, const upb_Message* src, + const upb_MiniTable* mt, + const upb_ExtensionRegistry* extreg, + upb_Arena* arena); + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#include "upb/port/undef.inc" +#endif // THIRD_PARTY_UPB_UPB_MESSAGE_MERGE_H_ diff --git a/third_party/upb/upb/message/merge_test.cc b/third_party/upb/upb/message/merge_test.cc new file mode 100644 index 00000000000..5b23aea283b --- /dev/null +++ b/third_party/upb/upb/message/merge_test.cc @@ -0,0 +1,79 @@ +#include "upb/message/merge.h" + +#include +#include + +#include +#include "google/protobuf/test_messages_proto2.upb.h" +#include "google/protobuf/test_messages_proto2.upb_minitable.h" +#include "upb/base/string_view.h" +#include "upb/base/upcast.h" +#include "upb/mem/arena.h" +#include "upb/message/accessors.h" +#include "upb/mini_table/field.h" +#include "upb/mini_table/message.h" + +// Must be last. +#include "upb/port/def.inc" + +namespace { + +// Proto2 test messages field numbers used for reflective access. +const uint32_t kFieldOptionalInt32 = 1; +const uint32_t kFieldOptionalString = 14; + +const char kTestStr1[] = "Hello1"; +const int32_t kTestInt32 = 567; + +const upb_MiniTableField* find_proto2_field(int field_number) { + return upb_MiniTable_FindFieldByNumber( + &protobuf_0test_0messages__proto2__TestAllTypesProto2_msg_init, + field_number); +} + +TEST(GeneratedCode, MergeMessageScalarAndString) { + upb_Arena* source_arena = upb_Arena_New(); + protobuf_test_messages_proto2_TestAllTypesProto2* msg = + protobuf_test_messages_proto2_TestAllTypesProto2_new(source_arena); + const upb_MiniTableField* optional_int32_field = + find_proto2_field(kFieldOptionalInt32); + const upb_MiniTableField* optional_string_field = + find_proto2_field(kFieldOptionalString); + upb_Message_SetInt32(UPB_UPCAST(msg), optional_int32_field, kTestInt32, + nullptr); + char* string_in_arena = + (char*)upb_Arena_Malloc(source_arena, sizeof(kTestStr1)); + memcpy(string_in_arena, kTestStr1, sizeof(kTestStr1)); + upb_Message_SetString( + UPB_UPCAST(msg), optional_string_field, + upb_StringView_FromDataAndSize(string_in_arena, sizeof(kTestStr1) - 1), + source_arena); + upb_Arena* arena = upb_Arena_New(); + protobuf_test_messages_proto2_TestAllTypesProto2* clone = + protobuf_test_messages_proto2_TestAllTypesProto2_new(arena); + EXPECT_TRUE( + (protobuf_test_messages_proto2_TestAllTypesProto2*)upb_Message_MergeFrom( + UPB_UPCAST(clone), UPB_UPCAST(msg), + &protobuf_0test_0messages__proto2__TestAllTypesProto2_msg_init, + nullptr, arena)); + // After cloning overwrite values and destroy source arena for MSAN. + memset(string_in_arena, 0, sizeof(kTestStr1)); + upb_Arena_Free(source_arena); + EXPECT_TRUE( + upb_Message_HasBaseField(UPB_UPCAST(clone), optional_int32_field)); + EXPECT_EQ(upb_Message_GetInt32(UPB_UPCAST(clone), optional_int32_field, 0), + kTestInt32); + EXPECT_TRUE( + upb_Message_HasBaseField(UPB_UPCAST(clone), optional_string_field)); + EXPECT_EQ(upb_Message_GetString(UPB_UPCAST(clone), optional_string_field, + upb_StringView_FromDataAndSize(nullptr, 0)) + .size, + sizeof(kTestStr1) - 1); + EXPECT_TRUE(upb_StringView_IsEqual( + upb_Message_GetString(UPB_UPCAST(clone), optional_string_field, + upb_StringView_FromDataAndSize(nullptr, 0)), + upb_StringView_FromString(kTestStr1))); + upb_Arena_Free(arena); +} + +} // namespace diff --git a/third_party/upb/upb/message/message.h b/third_party/upb/upb/message/message.h index cbcca84a72d..50388fcb436 100644 --- a/third_party/upb/upb/message/message.h +++ b/third_party/upb/upb/message/message.h @@ -47,16 +47,12 @@ UPB_API void upb_Message_Freeze(upb_Message* msg, const upb_MiniTable* m); UPB_API_INLINE bool upb_Message_IsFrozen(const upb_Message* msg); #ifdef UPB_TRACING_ENABLED -UPB_INLINE void upb_Message_SetNewMessageTraceHandler( - void (*newMessageTraceHandler)(const upb_MiniTable* mini_table, - const upb_Arena* arena)) { - UPB_PRIVATE(upb_Message_SetNewMessageTraceHandler)(newMessageTraceHandler); -} -UPB_INLINE void upb_Message_LogNewMessage(const upb_MiniTable* mini_table, - const upb_Arena* arena) { - UPB_PRIVATE(upb_Message_LogNewMessage)(mini_table, arena); -} -#endif +UPB_API void upb_Message_LogNewMessage(const upb_MiniTable* m, + const upb_Arena* arena); + +UPB_API void upb_Message_SetNewMessageTraceHandler( + void (*handler)(const upb_MiniTable* m, const upb_Arena* arena)); +#endif // UPB_TRACING_ENABLED #ifdef __cplusplus } /* extern "C" */ diff --git a/third_party/upb/upb/message/promote.c b/third_party/upb/upb/message/promote.c index 51412e17814..566049245a3 100644 --- a/third_party/upb/upb/message/promote.c +++ b/third_party/upb/upb/message/promote.c @@ -67,6 +67,7 @@ static upb_UnknownToMessageRet upb_MiniTable_ParseUnknownMessage( upb_GetExtension_Status upb_Message_GetOrPromoteExtension( upb_Message* msg, const upb_MiniTableExtension* ext_table, int decode_options, upb_Arena* arena, upb_MessageValue* value) { + UPB_ASSERT(!upb_Message_IsFrozen(msg)); UPB_ASSERT(upb_MiniTableExtension_CType(ext_table) == kUpb_CType_Message); const upb_Extension* extension = UPB_PRIVATE(_upb_Message_Getext)(msg, ext_table); @@ -177,6 +178,7 @@ upb_DecodeStatus upb_Message_PromoteMessage(upb_Message* parent, int decode_options, upb_Arena* arena, upb_Message** promoted) { + UPB_ASSERT(!upb_Message_IsFrozen(parent)); const upb_MiniTable* sub_table = upb_MiniTable_GetSubMessageTable(mini_table, field); UPB_ASSERT(sub_table); @@ -186,7 +188,7 @@ upb_DecodeStatus upb_Message_PromoteMessage(upb_Message* parent, upb_Message_PromoteOne(&tagged, sub_table, decode_options, arena); if (ret == kUpb_DecodeStatus_Ok) { *promoted = upb_TaggedMessagePtr_GetNonEmptyMessage(tagged); - upb_Message_SetMessage(parent, mini_table, field, *promoted); + upb_Message_SetMessage(parent, field, *promoted); } return ret; } @@ -233,6 +235,7 @@ upb_UnknownToMessageRet upb_MiniTable_PromoteUnknownToMessage( upb_Message* msg, const upb_MiniTable* mini_table, const upb_MiniTableField* field, const upb_MiniTable* sub_mini_table, int decode_options, upb_Arena* arena) { + UPB_ASSERT(!upb_Message_IsFrozen(msg)); upb_FindUnknownRet unknown; // We need to loop and merge unknowns that have matching tag field->number. upb_Message* message = NULL; @@ -277,7 +280,7 @@ upb_UnknownToMessageRet upb_MiniTable_PromoteUnknownToMessage( if (is_oneof) { UPB_PRIVATE(_upb_Message_SetOneofCase)(msg, field); } - upb_Message_SetMessage(msg, mini_table, field, message); + upb_Message_SetMessage(msg, field, message); ret.message = message; } return ret; @@ -292,6 +295,8 @@ upb_UnknownToMessageRet upb_MiniTable_PromoteUnknownToMessage( upb_UnknownToMessage_Status upb_MiniTable_PromoteUnknownToMessageArray( upb_Message* msg, const upb_MiniTableField* field, const upb_MiniTable* mini_table, int decode_options, upb_Arena* arena) { + UPB_ASSERT(!upb_Message_IsFrozen(msg)); + upb_Array* repeated_messages = upb_Message_GetMutableArray(msg, field); // Find all unknowns with given field number and parse. upb_FindUnknownRet unknown; @@ -327,12 +332,11 @@ upb_UnknownToMessage_Status upb_MiniTable_PromoteUnknownToMessageArray( upb_UnknownToMessage_Status upb_MiniTable_PromoteUnknownToMap( upb_Message* msg, const upb_MiniTable* mini_table, const upb_MiniTableField* field, int decode_options, upb_Arena* arena) { - // TODO: use a variant of upb_MiniTable_GetSubMessageTable() here. - const upb_MiniTable* map_entry_mini_table = upb_MiniTableSub_Message( - mini_table->UPB_PRIVATE(subs)[field->UPB_PRIVATE(submsg_index)]); - UPB_ASSERT(map_entry_mini_table); + UPB_ASSERT(!upb_Message_IsFrozen(msg)); + + const upb_MiniTable* map_entry_mini_table = + upb_MiniTable_MapEntrySubMessage(mini_table, field); UPB_ASSERT(upb_MiniTable_FieldCount(map_entry_mini_table) == 2); - UPB_ASSERT(upb_MiniTableField_IsMap(field)); // Find all unknowns with given field number and parse. upb_FindUnknownRet unknown; while (1) { diff --git a/third_party/upb/upb/message/value.h b/third_party/upb/upb/message/value.h index 8b15d1d3ad0..bb1dbbdcbd5 100644 --- a/third_party/upb/upb/message/value.h +++ b/third_party/upb/upb/message/value.h @@ -12,9 +12,17 @@ #define UPB_MESSAGE_VALUE_H_ #include +#include #include "upb/base/string_view.h" +// Must be last. +#include "upb/port/def.inc" + +#ifdef __cplusplus +extern "C" { +#endif + typedef union { bool bool_val; float float_val; @@ -35,10 +43,28 @@ typedef union { uintptr_t tagged_msg_val; // upb_TaggedMessagePtr } upb_MessageValue; +UPB_API_INLINE upb_MessageValue upb_MessageValue_Zero(void) { + upb_MessageValue zero; + memset(&zero, 0, sizeof(zero)); + return zero; +} + typedef union { struct upb_Array* array; struct upb_Map* map; struct upb_Message* msg; } upb_MutableMessageValue; +UPB_API_INLINE upb_MutableMessageValue upb_MutableMessageValue_Zero(void) { + upb_MutableMessageValue zero; + memset(&zero, 0, sizeof(zero)); + return zero; +} + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#include "upb/port/undef.inc" + #endif /* UPB_MESSAGE_VALUE_H_ */ diff --git a/third_party/upb/upb/mini_descriptor/decode.c b/third_party/upb/upb/mini_descriptor/decode.c index d355112f573..1094fc0435b 100644 --- a/third_party/upb/upb/mini_descriptor/decode.c +++ b/third_party/upb/upb/mini_descriptor/decode.c @@ -27,6 +27,7 @@ #include "upb/mini_table/field.h" #include "upb/mini_table/internal/field.h" #include "upb/mini_table/internal/message.h" +#include "upb/mini_table/internal/sub.h" #include "upb/mini_table/message.h" #include "upb/mini_table/sub.h" @@ -407,11 +408,15 @@ static void upb_MtDecoder_AllocateSubs(upb_MtDecoder* d, upb_SubCounts sub_counts) { uint32_t total_count = sub_counts.submsg_count + sub_counts.subenum_count; size_t subs_bytes = sizeof(*d->table->UPB_PRIVATE(subs)) * total_count; - upb_MiniTableSub* subs = upb_Arena_Malloc(d->arena, subs_bytes); + size_t ptrs_bytes = sizeof(upb_MiniTable*) * sub_counts.submsg_count; + upb_MiniTableSubInternal* subs = upb_Arena_Malloc(d->arena, subs_bytes); + const upb_MiniTable** subs_ptrs = upb_Arena_Malloc(d->arena, ptrs_bytes); upb_MdDecoder_CheckOutOfMemory(&d->base, subs); + upb_MdDecoder_CheckOutOfMemory(&d->base, subs_ptrs); uint32_t i = 0; for (; i < sub_counts.submsg_count; i++) { - subs[i].UPB_PRIVATE(submsg) = UPB_PRIVATE(_upb_MiniTable_Empty)(); + subs_ptrs[i] = UPB_PRIVATE(_upb_MiniTable_Empty)(); + subs[i].UPB_PRIVATE(submsg) = &subs_ptrs[i]; } if (sub_counts.subenum_count) { upb_MiniTableField* f = d->fields; diff --git a/third_party/upb/upb/mini_descriptor/internal/encode_test.cc b/third_party/upb/upb/mini_descriptor/internal/encode_test.cc index 3ae2f6f56c8..a84c739bbc9 100644 --- a/third_party/upb/upb/mini_descriptor/internal/encode_test.cc +++ b/third_party/upb/upb/mini_descriptor/internal/encode_test.cc @@ -45,7 +45,7 @@ TEST_P(MiniTableTest, Empty) { upb_MiniTable* table = _upb_MiniTable_Build(nullptr, 0, GetParam(), arena.ptr(), status.ptr()); ASSERT_NE(nullptr, table); - EXPECT_EQ(0, table->UPB_PRIVATE(field_count)); + EXPECT_EQ(0, upb_MiniTable_FieldCount(table)); EXPECT_EQ(0, table->UPB_PRIVATE(required_count)); } @@ -242,11 +242,11 @@ TEST_P(MiniTableTest, SubsInitializedToEmpty) { upb_MiniTable* table = _upb_MiniTable_Build( e.data().data(), e.data().size(), GetParam(), arena.ptr(), status.ptr()); ASSERT_NE(nullptr, table); - EXPECT_EQ(table->UPB_PRIVATE(field_count), 2); - EXPECT_TRUE(UPB_PRIVATE(_upb_MiniTable_IsEmpty)( - upb_MiniTableSub_Message(table->UPB_PRIVATE(subs)[0]))); - EXPECT_TRUE(UPB_PRIVATE(_upb_MiniTable_IsEmpty)( - upb_MiniTableSub_Message(table->UPB_PRIVATE(subs)[1]))); + EXPECT_EQ(upb_MiniTable_FieldCount(table), 2); + EXPECT_FALSE(upb_MiniTable_FieldIsLinked( + table, upb_MiniTable_GetFieldByIndex(table, 0))); + EXPECT_FALSE(upb_MiniTable_FieldIsLinked( + table, upb_MiniTable_GetFieldByIndex(table, 1))); } TEST(MiniTableEnumTest, PositiveAndNegative) { diff --git a/third_party/upb/upb/mini_descriptor/link.c b/third_party/upb/upb/mini_descriptor/link.c index bc5fa2f65b7..5dec59e324a 100644 --- a/third_party/upb/upb/mini_descriptor/link.c +++ b/third_party/upb/upb/mini_descriptor/link.c @@ -9,10 +9,14 @@ #include #include +#include #include "upb/base/descriptor_constants.h" #include "upb/mini_table/enum.h" #include "upb/mini_table/field.h" +#include "upb/mini_table/internal/field.h" +#include "upb/mini_table/internal/message.h" +#include "upb/mini_table/internal/sub.h" #include "upb/mini_table/message.h" #include "upb/mini_table/sub.h" @@ -50,12 +54,12 @@ bool upb_MiniTable_SetSubMessage(upb_MiniTable* table, return false; } - upb_MiniTableSub* table_sub = - (void*)&table->UPB_PRIVATE(subs)[field->UPB_PRIVATE(submsg_index)]; + int idx = field->UPB_PRIVATE(submsg_index); + upb_MiniTableSubInternal* table_subs = (void*)table->UPB_PRIVATE(subs); // TODO: Add this assert back once YouTube is updated to not call // this function repeatedly. // UPB_ASSERT(UPB_PRIVATE(_upb_MiniTable_IsEmpty)(table_sub->submsg)); - *table_sub = upb_MiniTableSub_FromMessage(sub); + memcpy((void*)table_subs[idx].UPB_PRIVATE(submsg), &sub, sizeof(void*)); return true; } diff --git a/third_party/upb/upb/mini_table/extension_registry.c b/third_party/upb/upb/mini_table/extension_registry.c index f5b118f1854..65ac7873256 100644 --- a/third_party/upb/upb/mini_table/extension_registry.c +++ b/third_party/upb/upb/mini_table/extension_registry.c @@ -70,6 +70,24 @@ failure: return false; } +#ifdef UPB_LINKARR_DECLARE + +UPB_LINKARR_DECLARE(upb_AllExts, upb_MiniTableExtension); + +bool upb_ExtensionRegistry_AddAllLinkedExtensions(upb_ExtensionRegistry* r) { + const upb_MiniTableExtension* start = UPB_LINKARR_START(upb_AllExts); + const upb_MiniTableExtension* stop = UPB_LINKARR_STOP(upb_AllExts); + for (const upb_MiniTableExtension* p = start; p < stop; p++) { + // Windows can introduce zero padding, so we have to skip zeroes. + if (upb_MiniTableExtension_Number(p) != 0) { + if (!upb_ExtensionRegistry_Add(r, p)) return false; + } + } + return true; +} + +#endif // UPB_LINKARR_DECLARE + const upb_MiniTableExtension* upb_ExtensionRegistry_Lookup( const upb_ExtensionRegistry* r, const upb_MiniTable* t, uint32_t num) { char buf[EXTREG_KEY_SIZE]; diff --git a/third_party/upb/upb/mini_table/extension_registry.h b/third_party/upb/upb/mini_table/extension_registry.h index 0465140fdfd..9f5f81a33c5 100644 --- a/third_party/upb/upb/mini_table/extension_registry.h +++ b/third_party/upb/upb/mini_table/extension_registry.h @@ -71,6 +71,23 @@ bool upb_ExtensionRegistry_AddArray(upb_ExtensionRegistry* r, const upb_MiniTableExtension** e, size_t count); +#ifdef UPB_LINKARR_DECLARE + +// Adds all extensions linked into the binary into the registry. The set of +// linked extensions is assembled by the linker using linker arrays. This +// will likely not work properly if the extensions are split across multiple +// shared libraries. +// +// Returns true if all extensions were added successfully, false on out of +// memory or if any extensions were already present. +// +// This API is currently not available on MSVC (though it *is* available on +// Windows using clang-cl). +UPB_API bool upb_ExtensionRegistry_AddAllLinkedExtensions( + upb_ExtensionRegistry* r); + +#endif // UPB_LINKARR_DECLARE + // Looks up the extension (if any) defined for message type |t| and field // number |num|. Returns the extension if found, otherwise NULL. UPB_API const upb_MiniTableExtension* upb_ExtensionRegistry_Lookup( diff --git a/third_party/upb/upb/mini_table/internal/extension.h b/third_party/upb/upb/mini_table/internal/extension.h index e326f999973..7220c5c6e07 100644 --- a/third_party/upb/upb/mini_table/internal/extension.h +++ b/third_party/upb/upb/mini_table/internal/extension.h @@ -8,6 +8,7 @@ #ifndef UPB_MINI_TABLE_INTERNAL_EXTENSION_H_ #define UPB_MINI_TABLE_INTERNAL_EXTENSION_H_ +#include #include #include "upb/base/descriptor_constants.h" @@ -41,6 +42,9 @@ upb_MiniTableExtension_Number(const struct upb_MiniTableExtension* e) { UPB_API_INLINE const struct upb_MiniTable* upb_MiniTableExtension_GetSubMessage( const struct upb_MiniTableExtension* e) { + if (upb_MiniTableExtension_CType(e) != kUpb_CType_Message) { + return NULL; + } return upb_MiniTableSub_Message(e->UPB_PRIVATE(sub)); } @@ -49,6 +53,11 @@ UPB_API_INLINE void upb_MiniTableExtension_SetSubMessage( e->UPB_PRIVATE(sub).UPB_PRIVATE(submsg) = m; } +UPB_INLINE upb_FieldRep UPB_PRIVATE(_upb_MiniTableExtension_GetRep)( + const struct upb_MiniTableExtension* e) { + return UPB_PRIVATE(_upb_MiniTableField_GetRep)(&e->UPB_PRIVATE(field)); +} + #ifdef __cplusplus } /* extern "C" */ #endif diff --git a/third_party/upb/upb/mini_table/internal/message.c b/third_party/upb/upb/mini_table/internal/message.c index f278b365770..2f23df41184 100644 --- a/third_party/upb/upb/mini_table/internal/message.c +++ b/third_party/upb/upb/mini_table/internal/message.c @@ -14,7 +14,12 @@ // Must be last. #include "upb/port/def.inc" -// A MiniTable for an empty message, used for unlinked sub-messages. +// A MiniTable for an empty message, used for unlinked sub-messages that are +// built via MiniDescriptors. Messages that use this MiniTable may possibly +// be linked later, in which case this MiniTable will be replaced with a real +// one. This pattern is known as "dynamic tree shaking", and it introduces +// complication because sub-messages may either be the "empty" type or the +// "real" type. A tagged bit indicates the difference. const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_Empty) = { .UPB_PRIVATE(subs) = NULL, .UPB_PRIVATE(fields) = NULL, @@ -25,3 +30,18 @@ const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_Empty) = { .UPB_PRIVATE(table_mask) = -1, .UPB_PRIVATE(required_count) = 0, }; + +// A MiniTable for a statically tree shaken message. Messages that use this +// MiniTable are guaranteed to remain unlinked; unlike the empty message, this +// MiniTable is never replaced, which greatly simplifies everything, because the +// type of a sub-message is always known, without consulting a tagged bit. +const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken) = { + .UPB_PRIVATE(subs) = NULL, + .UPB_PRIVATE(fields) = NULL, + .UPB_PRIVATE(size) = sizeof(struct upb_Message), + .UPB_PRIVATE(field_count) = 0, + .UPB_PRIVATE(ext) = kUpb_ExtMode_NonExtendable, + .UPB_PRIVATE(dense_below) = 0, + .UPB_PRIVATE(table_mask) = -1, + .UPB_PRIVATE(required_count) = 0, +}; diff --git a/third_party/upb/upb/mini_table/internal/message.h b/third_party/upb/upb/mini_table/internal/message.h index e044c0e48cf..fd88e574424 100644 --- a/third_party/upb/upb/mini_table/internal/message.h +++ b/third_party/upb/upb/mini_table/internal/message.h @@ -8,8 +8,10 @@ #ifndef UPB_MINI_TABLE_INTERNAL_MESSAGE_H_ #define UPB_MINI_TABLE_INTERNAL_MESSAGE_H_ +#include #include +#include "upb/base/descriptor_constants.h" #include "upb/mini_table/internal/field.h" #include "upb/mini_table/internal/sub.h" @@ -44,7 +46,7 @@ typedef enum { // LINT.IfChange(minitable_struct_definition) struct upb_MiniTable { - const union upb_MiniTableSub* UPB_PRIVATE(subs); + const upb_MiniTableSubInternal* UPB_PRIVATE(subs); const struct upb_MiniTableField* UPB_ONLYBITS(fields); // Must be aligned to sizeof(void*). Doesn't include internal members like @@ -75,6 +77,17 @@ struct upb_MiniTable { extern "C" { #endif +UPB_INLINE const struct upb_MiniTable* UPB_PRIVATE( + _upb_MiniTable_StrongReference)(const struct upb_MiniTable* mt) { +#if defined(__GNUC__) + __asm__("" : : "r"(mt)); +#else + const struct upb_MiniTable* volatile unused = mt; + (void)&unused; // Use address to avoid an extra load of "unused". +#endif + return mt; +} + UPB_INLINE const struct upb_MiniTable* UPB_PRIVATE(_upb_MiniTable_Empty)(void) { extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_Empty); @@ -97,34 +110,46 @@ UPB_API_INLINE const struct upb_MiniTableField* upb_MiniTable_GetFieldByIndex( return &m->UPB_ONLYBITS(fields)[i]; } -UPB_INLINE const union upb_MiniTableSub* UPB_PRIVATE( - _upb_MiniTable_GetSubByIndex)(const struct upb_MiniTable* m, uint32_t i) { - return &m->UPB_PRIVATE(subs)[i]; +UPB_INLINE const struct upb_MiniTable* UPB_PRIVATE( + _upb_MiniTable_GetSubTableByIndex)(const struct upb_MiniTable* m, + uint32_t i) { + return *m->UPB_PRIVATE(subs)[i].UPB_PRIVATE(submsg); +} + +UPB_API_INLINE const struct upb_MiniTable* upb_MiniTable_SubMessage( + const struct upb_MiniTable* m, const struct upb_MiniTableField* f) { + if (upb_MiniTableField_CType(f) != kUpb_CType_Message) { + return NULL; + } + return UPB_PRIVATE(_upb_MiniTable_GetSubTableByIndex)( + m, f->UPB_PRIVATE(submsg_index)); } UPB_API_INLINE const struct upb_MiniTable* upb_MiniTable_GetSubMessageTable( const struct upb_MiniTable* m, const struct upb_MiniTableField* f) { - UPB_ASSERT(upb_MiniTableField_CType(f) == kUpb_CType_Message); - const struct upb_MiniTable* ret = upb_MiniTableSub_Message( - m->UPB_PRIVATE(subs)[f->UPB_PRIVATE(submsg_index)]); + UPB_ASSUME(upb_MiniTableField_CType(f) == kUpb_CType_Message); + const struct upb_MiniTable* ret = upb_MiniTable_SubMessage(m, f); UPB_ASSUME(ret); return UPB_PRIVATE(_upb_MiniTable_IsEmpty)(ret) ? NULL : ret; } -UPB_API_INLINE const struct upb_MiniTable* upb_MiniTable_SubMessage( +UPB_API_INLINE bool upb_MiniTable_FieldIsLinked( const struct upb_MiniTable* m, const struct upb_MiniTableField* f) { - if (upb_MiniTableField_CType(f) != kUpb_CType_Message) { - return NULL; - } - return upb_MiniTableSub_Message( - m->UPB_PRIVATE(subs)[f->UPB_PRIVATE(submsg_index)]); + return upb_MiniTable_GetSubMessageTable(m, f) != NULL; +} + +UPB_API_INLINE const struct upb_MiniTable* upb_MiniTable_MapEntrySubMessage( + const struct upb_MiniTable* m, const struct upb_MiniTableField* f) { + UPB_ASSERT(upb_MiniTable_FieldIsLinked(m, f)); // Map entries must be linked. + UPB_ASSERT(upb_MiniTableField_IsMap(f)); // Function precondition. + return upb_MiniTable_SubMessage(m, f); } UPB_API_INLINE const struct upb_MiniTableEnum* upb_MiniTable_GetSubEnumTable( const struct upb_MiniTable* m, const struct upb_MiniTableField* f) { UPB_ASSERT(upb_MiniTableField_CType(f) == kUpb_CType_Enum); - return upb_MiniTableSub_Enum( - m->UPB_PRIVATE(subs)[f->UPB_PRIVATE(submsg_index)]); + return m->UPB_PRIVATE(subs)[f->UPB_PRIVATE(submsg_index)].UPB_PRIVATE( + subenum); } UPB_API_INLINE const struct upb_MiniTableField* upb_MiniTable_MapKey( @@ -143,11 +168,6 @@ UPB_API_INLINE const struct upb_MiniTableField* upb_MiniTable_MapValue( return f; } -UPB_API_INLINE bool upb_MiniTable_FieldIsLinked( - const struct upb_MiniTable* m, const struct upb_MiniTableField* f) { - return upb_MiniTable_GetSubMessageTable(m, f) != NULL; -} - // Computes a bitmask in which the |m->required_count| lowest bits are set. // // Sample output: diff --git a/third_party/upb/upb/mini_table/internal/sub.h b/third_party/upb/upb/mini_table/internal/sub.h index 967b557ddad..4c21569ba0a 100644 --- a/third_party/upb/upb/mini_table/internal/sub.h +++ b/third_party/upb/upb/mini_table/internal/sub.h @@ -11,6 +11,11 @@ // Must be last. #include "upb/port/def.inc" +typedef union { + const struct upb_MiniTable* const* UPB_PRIVATE(submsg); + const struct upb_MiniTableEnum* UPB_PRIVATE(subenum); +} upb_MiniTableSubInternal; + union upb_MiniTableSub { const struct upb_MiniTable* UPB_PRIVATE(submsg); const struct upb_MiniTableEnum* UPB_PRIVATE(subenum); diff --git a/third_party/upb/upb/mini_table/message.h b/third_party/upb/upb/mini_table/message.h index 1ce9087b0af..6589762f4e9 100644 --- a/third_party/upb/upb/mini_table/message.h +++ b/third_party/upb/upb/mini_table/message.h @@ -34,10 +34,20 @@ UPB_API_INLINE int upb_MiniTable_FieldCount(const upb_MiniTable* m); UPB_API_INLINE const upb_MiniTable* upb_MiniTable_GetSubMessageTable( const upb_MiniTable* m, const upb_MiniTableField* f); -// Returns the MiniTable for a message field if it is a submessage. +// Returns the MiniTable for a message field if it is a submessage, otherwise +// returns NULL. +// +// WARNING: if dynamic tree shaking is in use, the return value may be the +// "empty", zero-field placeholder message instead of the real message type. +// If the message is later linked, this function will begin returning the real +// message type. UPB_API_INLINE const upb_MiniTable* upb_MiniTable_SubMessage( const upb_MiniTable* m, const upb_MiniTableField* f); +// Returns the MiniTable for a map field. The given field must refer to a map. +UPB_API_INLINE const upb_MiniTable* upb_MiniTable_MapEntrySubMessage( + const upb_MiniTable* m, const upb_MiniTableField* f); + // Returns the MiniTableEnum for a message field, NULL if the field is unlinked. UPB_API_INLINE const upb_MiniTableEnum* upb_MiniTable_GetSubEnumTable( const upb_MiniTable* m, const upb_MiniTableField* f); diff --git a/third_party/upb/upb/port/def.inc b/third_party/upb/upb/port/def.inc index 7d23d5c8b3b..6aa1835f40d 100644 --- a/third_party/upb/upb/port/def.inc +++ b/third_party/upb/upb/port/def.inc @@ -345,8 +345,79 @@ void __asan_unpoison_memory_region(void const volatile *addr, size_t size); #define UPB_DESC_MINITABLE(sym) &google__protobuf__##sym##_msg_init #endif -#ifdef UPB_TRACING_ENABLED -#ifdef NDEBUG -error UPB_TRACING_ENABLED Tracing should be disabled in production builds -#endif + +// Linker arrays combine elements from multiple translation units into a single +// array that can be iterated over at runtime. +// +// It is an alternative to pre-main "registration" functions. +// +// Usage: +// +// // In N translation units. +// UPB_LINKARR_APPEND(foo_array) static int elems[3] = {1, 2, 3}; +// +// // At runtime: +// UPB_LINKARR_DECLARE(foo_array, int); +// +// void f() { +// const int* start = UPB_LINKARR_START(foo_array); +// const int* stop = UPB_LINKARR_STOP(foo_array); +// for (const int* p = start; p < stop; p++) { +// // Windows can introduce zero padding, so we have to skip zeroes. +// if (*p != 0) { +// vec.push_back(*p); +// } +// } +// } + +#if defined(__ELF__) || defined(__wasm__) + +#define UPB_LINKARR_APPEND(name) \ + __attribute__((retain, used, section("linkarr_" #name))) +#define UPB_LINKARR_DECLARE(name, type) \ + extern type const __start_linkarr_##name; \ + extern type const __stop_linkarr_##name; \ + UPB_LINKARR_APPEND(name) type UPB_linkarr_internal_empty_##name[1] +#define UPB_LINKARR_START(name) (&__start_linkarr_##name) +#define UPB_LINKARR_STOP(name) (&__stop_linkarr_##name) + +#elif defined(__MACH__) + +/* As described in: https://stackoverflow.com/a/22366882 */ +#define UPB_LINKARR_APPEND(name) \ + __attribute__((retain, used, section("__DATA,__la_" #name))) +#define UPB_LINKARR_DECLARE(name, type) \ + extern type const __start_linkarr_##name __asm( \ + "section$start$__DATA$__la_" #name); \ + extern type const __stop_linkarr_##name __asm( \ + "section$end$__DATA$" \ + "__la_" #name); \ + UPB_LINKARR_APPEND(name) type UPB_linkarr_internal_empty_##name[1] +#define UPB_LINKARR_START(name) (&__start_linkarr_##name) +#define UPB_LINKARR_STOP(name) (&__stop_linkarr_##name) + +#elif defined(_MSC_VER) && defined(__clang__) + +/* See: + * https://devblogs.microsoft.com/oldnewthing/20181107-00/?p=100155 + * https://devblogs.microsoft.com/oldnewthing/20181108-00/?p=100165 + * https://devblogs.microsoft.com/oldnewthing/20181109-00/?p=100175 */ + +// Usage of __attribute__ here probably means this is Clang-specific, and would +// not work on MSVC. +#define UPB_LINKARR_APPEND(name) \ + __declspec(allocate("la_" #name "$j")) __attribute__((retain, used)) +#define UPB_LINKARR_DECLARE(name, type) \ + __declspec(allocate("la_" #name "$a")) type __start_linkarr_##name; \ + __declspec(allocate("la_" #name "$z")) type __stop_linkarr_##name; \ + UPB_LINKARR_APPEND(name) type UPB_linkarr_internal_empty_##name[1] = {0} +#define UPB_LINKARR_START(name) (&__start_linkarr_##name) +#define UPB_LINKARR_STOP(name) (&__stop_linkarr_##name) + +#else + +// Linker arrays are not supported on this platform. Make appends a no-op but +// don't define the other macros. +#define UPB_LINKARR_APPEND(name) + #endif diff --git a/third_party/upb/upb/port/undef.inc b/third_party/upb/upb/port/undef.inc index c715441fd15..d8453ffec16 100644 --- a/third_party/upb/upb/port/undef.inc +++ b/third_party/upb/upb/port/undef.inc @@ -56,3 +56,7 @@ #undef UPB_USE_C11_ATOMICS #undef UPB_PRIVATE #undef UPB_ONLYBITS +#undef UPB_LINKARR_DECLARE +#undef UPB_LINKARR_APPEND +#undef UPB_LINKARR_START +#undef UPB_LINKARR_STOP diff --git a/third_party/upb/upb/reflection/cmake/google/protobuf/descriptor.upb.h b/third_party/upb/upb/reflection/cmake/google/protobuf/descriptor.upb.h index d2a8801415f..af260e7acf7 100644 --- a/third_party/upb/upb/reflection/cmake/google/protobuf/descriptor.upb.h +++ b/third_party/upb/upb/reflection/cmake/google/protobuf/descriptor.upb.h @@ -3,7 +3,8 @@ * google/protobuf/descriptor.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H_ #define GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H_ @@ -230,6 +231,7 @@ UPB_INLINE void google_protobuf_FileDescriptorSet_clear_file(google_protobuf_Fil } UPB_INLINE const google_protobuf_FileDescriptorProto* const* google_protobuf_FileDescriptorSet_file(const google_protobuf_FileDescriptorSet* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FileDescriptorProto_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -241,6 +243,7 @@ UPB_INLINE const google_protobuf_FileDescriptorProto* const* google_protobuf_Fil } UPB_INLINE const upb_Array* _google_protobuf_FileDescriptorSet_file_upb_array(const google_protobuf_FileDescriptorSet* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FileDescriptorProto_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -249,6 +252,7 @@ UPB_INLINE const upb_Array* _google_protobuf_FileDescriptorSet_file_upb_array(co } UPB_INLINE upb_Array* _google_protobuf_FileDescriptorSet_file_mutable_upb_array(google_protobuf_FileDescriptorSet* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FileDescriptorProto_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -259,6 +263,7 @@ UPB_INLINE upb_Array* _google_protobuf_FileDescriptorSet_file_mutable_upb_array( UPB_INLINE google_protobuf_FileDescriptorProto** google_protobuf_FileDescriptorSet_mutable_file(google_protobuf_FileDescriptorSet* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FileDescriptorProto_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -275,6 +280,7 @@ UPB_INLINE google_protobuf_FileDescriptorProto** google_protobuf_FileDescriptorS } UPB_INLINE struct google_protobuf_FileDescriptorProto* google_protobuf_FileDescriptorSet_add_file(google_protobuf_FileDescriptorSet* msg, upb_Arena* arena) { upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FileDescriptorProto_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -394,6 +400,7 @@ UPB_INLINE void google_protobuf_FileDescriptorProto_clear_message_type(google_pr } UPB_INLINE const google_protobuf_DescriptorProto* const* google_protobuf_FileDescriptorProto_message_type(const google_protobuf_FileDescriptorProto* msg, size_t* size) { const upb_MiniTableField field = {4, UPB_SIZE(16, 56), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__DescriptorProto_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -405,6 +412,7 @@ UPB_INLINE const google_protobuf_DescriptorProto* const* google_protobuf_FileDes } UPB_INLINE const upb_Array* _google_protobuf_FileDescriptorProto_message_type_upb_array(const google_protobuf_FileDescriptorProto* msg, size_t* size) { const upb_MiniTableField field = {4, UPB_SIZE(16, 56), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__DescriptorProto_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -413,6 +421,7 @@ UPB_INLINE const upb_Array* _google_protobuf_FileDescriptorProto_message_type_up } UPB_INLINE upb_Array* _google_protobuf_FileDescriptorProto_message_type_mutable_upb_array(google_protobuf_FileDescriptorProto* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {4, UPB_SIZE(16, 56), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__DescriptorProto_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -426,6 +435,7 @@ UPB_INLINE void google_protobuf_FileDescriptorProto_clear_enum_type(google_proto } UPB_INLINE const google_protobuf_EnumDescriptorProto* const* google_protobuf_FileDescriptorProto_enum_type(const google_protobuf_FileDescriptorProto* msg, size_t* size) { const upb_MiniTableField field = {5, UPB_SIZE(20, 64), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__EnumDescriptorProto_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -437,6 +447,7 @@ UPB_INLINE const google_protobuf_EnumDescriptorProto* const* google_protobuf_Fil } UPB_INLINE const upb_Array* _google_protobuf_FileDescriptorProto_enum_type_upb_array(const google_protobuf_FileDescriptorProto* msg, size_t* size) { const upb_MiniTableField field = {5, UPB_SIZE(20, 64), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__EnumDescriptorProto_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -445,6 +456,7 @@ UPB_INLINE const upb_Array* _google_protobuf_FileDescriptorProto_enum_type_upb_a } UPB_INLINE upb_Array* _google_protobuf_FileDescriptorProto_enum_type_mutable_upb_array(google_protobuf_FileDescriptorProto* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {5, UPB_SIZE(20, 64), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__EnumDescriptorProto_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -458,6 +470,7 @@ UPB_INLINE void google_protobuf_FileDescriptorProto_clear_service(google_protobu } UPB_INLINE const google_protobuf_ServiceDescriptorProto* const* google_protobuf_FileDescriptorProto_service(const google_protobuf_FileDescriptorProto* msg, size_t* size) { const upb_MiniTableField field = {6, UPB_SIZE(24, 72), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__ServiceDescriptorProto_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -469,6 +482,7 @@ UPB_INLINE const google_protobuf_ServiceDescriptorProto* const* google_protobuf_ } UPB_INLINE const upb_Array* _google_protobuf_FileDescriptorProto_service_upb_array(const google_protobuf_FileDescriptorProto* msg, size_t* size) { const upb_MiniTableField field = {6, UPB_SIZE(24, 72), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__ServiceDescriptorProto_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -477,6 +491,7 @@ UPB_INLINE const upb_Array* _google_protobuf_FileDescriptorProto_service_upb_arr } UPB_INLINE upb_Array* _google_protobuf_FileDescriptorProto_service_mutable_upb_array(google_protobuf_FileDescriptorProto* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {6, UPB_SIZE(24, 72), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__ServiceDescriptorProto_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -490,6 +505,7 @@ UPB_INLINE void google_protobuf_FileDescriptorProto_clear_extension(google_proto } UPB_INLINE const google_protobuf_FieldDescriptorProto* const* google_protobuf_FileDescriptorProto_extension(const google_protobuf_FileDescriptorProto* msg, size_t* size) { const upb_MiniTableField field = {7, UPB_SIZE(28, 80), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FieldDescriptorProto_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -501,6 +517,7 @@ UPB_INLINE const google_protobuf_FieldDescriptorProto* const* google_protobuf_Fi } UPB_INLINE const upb_Array* _google_protobuf_FileDescriptorProto_extension_upb_array(const google_protobuf_FileDescriptorProto* msg, size_t* size) { const upb_MiniTableField field = {7, UPB_SIZE(28, 80), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FieldDescriptorProto_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -509,6 +526,7 @@ UPB_INLINE const upb_Array* _google_protobuf_FileDescriptorProto_extension_upb_a } UPB_INLINE upb_Array* _google_protobuf_FileDescriptorProto_extension_mutable_upb_array(google_protobuf_FileDescriptorProto* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {7, UPB_SIZE(28, 80), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FieldDescriptorProto_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -524,6 +542,7 @@ UPB_INLINE const google_protobuf_FileOptions* google_protobuf_FileDescriptorProt const google_protobuf_FileOptions* default_val = NULL; const google_protobuf_FileOptions* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FileOptions_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -540,6 +559,7 @@ UPB_INLINE const google_protobuf_SourceCodeInfo* google_protobuf_FileDescriptorP const google_protobuf_SourceCodeInfo* default_val = NULL; const google_protobuf_SourceCodeInfo* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__SourceCodeInfo_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -683,6 +703,7 @@ UPB_INLINE bool google_protobuf_FileDescriptorProto_add_dependency(google_protob } UPB_INLINE google_protobuf_DescriptorProto** google_protobuf_FileDescriptorProto_mutable_message_type(google_protobuf_FileDescriptorProto* msg, size_t* size) { upb_MiniTableField field = {4, UPB_SIZE(16, 56), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__DescriptorProto_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -699,6 +720,7 @@ UPB_INLINE google_protobuf_DescriptorProto** google_protobuf_FileDescriptorProto } UPB_INLINE struct google_protobuf_DescriptorProto* google_protobuf_FileDescriptorProto_add_message_type(google_protobuf_FileDescriptorProto* msg, upb_Arena* arena) { upb_MiniTableField field = {4, UPB_SIZE(16, 56), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__DescriptorProto_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -713,6 +735,7 @@ UPB_INLINE struct google_protobuf_DescriptorProto* google_protobuf_FileDescripto } UPB_INLINE google_protobuf_EnumDescriptorProto** google_protobuf_FileDescriptorProto_mutable_enum_type(google_protobuf_FileDescriptorProto* msg, size_t* size) { upb_MiniTableField field = {5, UPB_SIZE(20, 64), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__EnumDescriptorProto_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -729,6 +752,7 @@ UPB_INLINE google_protobuf_EnumDescriptorProto** google_protobuf_FileDescriptorP } UPB_INLINE struct google_protobuf_EnumDescriptorProto* google_protobuf_FileDescriptorProto_add_enum_type(google_protobuf_FileDescriptorProto* msg, upb_Arena* arena) { upb_MiniTableField field = {5, UPB_SIZE(20, 64), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__EnumDescriptorProto_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -743,6 +767,7 @@ UPB_INLINE struct google_protobuf_EnumDescriptorProto* google_protobuf_FileDescr } UPB_INLINE google_protobuf_ServiceDescriptorProto** google_protobuf_FileDescriptorProto_mutable_service(google_protobuf_FileDescriptorProto* msg, size_t* size) { upb_MiniTableField field = {6, UPB_SIZE(24, 72), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__ServiceDescriptorProto_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -759,6 +784,7 @@ UPB_INLINE google_protobuf_ServiceDescriptorProto** google_protobuf_FileDescript } UPB_INLINE struct google_protobuf_ServiceDescriptorProto* google_protobuf_FileDescriptorProto_add_service(google_protobuf_FileDescriptorProto* msg, upb_Arena* arena) { upb_MiniTableField field = {6, UPB_SIZE(24, 72), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__ServiceDescriptorProto_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -773,6 +799,7 @@ UPB_INLINE struct google_protobuf_ServiceDescriptorProto* google_protobuf_FileDe } UPB_INLINE google_protobuf_FieldDescriptorProto** google_protobuf_FileDescriptorProto_mutable_extension(google_protobuf_FileDescriptorProto* msg, size_t* size) { upb_MiniTableField field = {7, UPB_SIZE(28, 80), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FieldDescriptorProto_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -789,6 +816,7 @@ UPB_INLINE google_protobuf_FieldDescriptorProto** google_protobuf_FileDescriptor } UPB_INLINE struct google_protobuf_FieldDescriptorProto* google_protobuf_FileDescriptorProto_add_extension(google_protobuf_FileDescriptorProto* msg, upb_Arena* arena) { upb_MiniTableField field = {7, UPB_SIZE(28, 80), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FieldDescriptorProto_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -803,6 +831,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FileOptions_msg_init); 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) { @@ -815,6 +844,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__SourceCodeInfo_msg_init); 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) { @@ -948,6 +978,7 @@ UPB_INLINE void google_protobuf_DescriptorProto_clear_field(google_protobuf_Desc } UPB_INLINE const google_protobuf_FieldDescriptorProto* const* google_protobuf_DescriptorProto_field(const google_protobuf_DescriptorProto* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FieldDescriptorProto_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -959,6 +990,7 @@ UPB_INLINE const google_protobuf_FieldDescriptorProto* const* google_protobuf_De } UPB_INLINE const upb_Array* _google_protobuf_DescriptorProto_field_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FieldDescriptorProto_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -967,6 +999,7 @@ UPB_INLINE const upb_Array* _google_protobuf_DescriptorProto_field_upb_array(con } UPB_INLINE upb_Array* _google_protobuf_DescriptorProto_field_mutable_upb_array(google_protobuf_DescriptorProto* msg, size_t* size, upb_Arena* arena) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FieldDescriptorProto_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -980,6 +1013,7 @@ UPB_INLINE void google_protobuf_DescriptorProto_clear_nested_type(google_protobu } UPB_INLINE const google_protobuf_DescriptorProto* const* google_protobuf_DescriptorProto_nested_type(const google_protobuf_DescriptorProto* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__DescriptorProto_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -991,6 +1025,7 @@ UPB_INLINE const google_protobuf_DescriptorProto* const* google_protobuf_Descrip } UPB_INLINE const upb_Array* _google_protobuf_DescriptorProto_nested_type_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__DescriptorProto_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -999,6 +1034,7 @@ UPB_INLINE const upb_Array* _google_protobuf_DescriptorProto_nested_type_upb_arr } UPB_INLINE upb_Array* _google_protobuf_DescriptorProto_nested_type_mutable_upb_array(google_protobuf_DescriptorProto* msg, size_t* size, upb_Arena* arena) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__DescriptorProto_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -1012,6 +1048,7 @@ UPB_INLINE void google_protobuf_DescriptorProto_clear_enum_type(google_protobuf_ } UPB_INLINE const google_protobuf_EnumDescriptorProto* const* google_protobuf_DescriptorProto_enum_type(const google_protobuf_DescriptorProto* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__EnumDescriptorProto_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1023,6 +1060,7 @@ UPB_INLINE const google_protobuf_EnumDescriptorProto* const* google_protobuf_Des } UPB_INLINE const upb_Array* _google_protobuf_DescriptorProto_enum_type_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__EnumDescriptorProto_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -1031,6 +1069,7 @@ UPB_INLINE const upb_Array* _google_protobuf_DescriptorProto_enum_type_upb_array } UPB_INLINE upb_Array* _google_protobuf_DescriptorProto_enum_type_mutable_upb_array(google_protobuf_DescriptorProto* msg, size_t* size, upb_Arena* arena) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__EnumDescriptorProto_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -1044,6 +1083,7 @@ UPB_INLINE void google_protobuf_DescriptorProto_clear_extension_range(google_pro } UPB_INLINE const google_protobuf_DescriptorProto_ExtensionRange* const* google_protobuf_DescriptorProto_extension_range(const google_protobuf_DescriptorProto* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__DescriptorProto__ExtensionRange_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1055,6 +1095,7 @@ UPB_INLINE const google_protobuf_DescriptorProto_ExtensionRange* const* google_p } UPB_INLINE const upb_Array* _google_protobuf_DescriptorProto_extension_range_upb_array(const google_protobuf_DescriptorProto* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__DescriptorProto__ExtensionRange_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -1063,6 +1104,7 @@ UPB_INLINE const upb_Array* _google_protobuf_DescriptorProto_extension_range_upb } UPB_INLINE upb_Array* _google_protobuf_DescriptorProto_extension_range_mutable_upb_array(google_protobuf_DescriptorProto* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__DescriptorProto__ExtensionRange_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -1076,6 +1118,7 @@ UPB_INLINE void google_protobuf_DescriptorProto_clear_extension(google_protobuf_ } UPB_INLINE const google_protobuf_FieldDescriptorProto* const* google_protobuf_DescriptorProto_extension(const google_protobuf_DescriptorProto* msg, size_t* size) { const upb_MiniTableField field = {6, UPB_SIZE(28, 64), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FieldDescriptorProto_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1087,6 +1130,7 @@ UPB_INLINE const google_protobuf_FieldDescriptorProto* const* google_protobuf_De } UPB_INLINE const upb_Array* _google_protobuf_DescriptorProto_extension_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size) { const upb_MiniTableField field = {6, UPB_SIZE(28, 64), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FieldDescriptorProto_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -1095,6 +1139,7 @@ UPB_INLINE const upb_Array* _google_protobuf_DescriptorProto_extension_upb_array } UPB_INLINE upb_Array* _google_protobuf_DescriptorProto_extension_mutable_upb_array(google_protobuf_DescriptorProto* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {6, UPB_SIZE(28, 64), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FieldDescriptorProto_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -1110,6 +1155,7 @@ UPB_INLINE const google_protobuf_MessageOptions* google_protobuf_DescriptorProto const google_protobuf_MessageOptions* default_val = NULL; const google_protobuf_MessageOptions* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__MessageOptions_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1124,6 +1170,7 @@ UPB_INLINE void google_protobuf_DescriptorProto_clear_oneof_decl(google_protobuf } UPB_INLINE const google_protobuf_OneofDescriptorProto* const* google_protobuf_DescriptorProto_oneof_decl(const google_protobuf_DescriptorProto* msg, size_t* size) { const upb_MiniTableField field = {8, UPB_SIZE(36, 80), 0, 6, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__OneofDescriptorProto_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1135,6 +1182,7 @@ UPB_INLINE const google_protobuf_OneofDescriptorProto* const* google_protobuf_De } UPB_INLINE const upb_Array* _google_protobuf_DescriptorProto_oneof_decl_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size) { const upb_MiniTableField field = {8, UPB_SIZE(36, 80), 0, 6, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__OneofDescriptorProto_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -1143,6 +1191,7 @@ UPB_INLINE const upb_Array* _google_protobuf_DescriptorProto_oneof_decl_upb_arra } UPB_INLINE upb_Array* _google_protobuf_DescriptorProto_oneof_decl_mutable_upb_array(google_protobuf_DescriptorProto* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {8, UPB_SIZE(36, 80), 0, 6, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__OneofDescriptorProto_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -1156,6 +1205,7 @@ UPB_INLINE void google_protobuf_DescriptorProto_clear_reserved_range(google_prot } UPB_INLINE const google_protobuf_DescriptorProto_ReservedRange* const* google_protobuf_DescriptorProto_reserved_range(const google_protobuf_DescriptorProto* msg, size_t* size) { const upb_MiniTableField field = {9, UPB_SIZE(40, 88), 0, 7, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__DescriptorProto__ReservedRange_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1167,6 +1217,7 @@ UPB_INLINE const google_protobuf_DescriptorProto_ReservedRange* const* google_pr } UPB_INLINE const upb_Array* _google_protobuf_DescriptorProto_reserved_range_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size) { const upb_MiniTableField field = {9, UPB_SIZE(40, 88), 0, 7, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__DescriptorProto__ReservedRange_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -1175,6 +1226,7 @@ UPB_INLINE const upb_Array* _google_protobuf_DescriptorProto_reserved_range_upb_ } UPB_INLINE upb_Array* _google_protobuf_DescriptorProto_reserved_range_mutable_upb_array(google_protobuf_DescriptorProto* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {9, UPB_SIZE(40, 88), 0, 7, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__DescriptorProto__ReservedRange_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -1221,6 +1273,7 @@ UPB_INLINE void google_protobuf_DescriptorProto_set_name(google_protobuf_Descrip } 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FieldDescriptorProto_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1237,6 +1290,7 @@ UPB_INLINE google_protobuf_FieldDescriptorProto** google_protobuf_DescriptorProt } UPB_INLINE struct google_protobuf_FieldDescriptorProto* google_protobuf_DescriptorProto_add_field(google_protobuf_DescriptorProto* msg, upb_Arena* arena) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FieldDescriptorProto_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -1251,6 +1305,7 @@ UPB_INLINE struct google_protobuf_FieldDescriptorProto* google_protobuf_Descript } UPB_INLINE google_protobuf_DescriptorProto** google_protobuf_DescriptorProto_mutable_nested_type(google_protobuf_DescriptorProto* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__DescriptorProto_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1267,6 +1322,7 @@ UPB_INLINE google_protobuf_DescriptorProto** google_protobuf_DescriptorProto_res } UPB_INLINE struct google_protobuf_DescriptorProto* google_protobuf_DescriptorProto_add_nested_type(google_protobuf_DescriptorProto* msg, upb_Arena* arena) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__DescriptorProto_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -1281,6 +1337,7 @@ UPB_INLINE struct google_protobuf_DescriptorProto* google_protobuf_DescriptorPro } UPB_INLINE google_protobuf_EnumDescriptorProto** google_protobuf_DescriptorProto_mutable_enum_type(google_protobuf_DescriptorProto* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__EnumDescriptorProto_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1297,6 +1354,7 @@ UPB_INLINE google_protobuf_EnumDescriptorProto** google_protobuf_DescriptorProto } UPB_INLINE struct google_protobuf_EnumDescriptorProto* google_protobuf_DescriptorProto_add_enum_type(google_protobuf_DescriptorProto* msg, upb_Arena* arena) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__EnumDescriptorProto_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -1311,6 +1369,7 @@ UPB_INLINE struct google_protobuf_EnumDescriptorProto* google_protobuf_Descripto } UPB_INLINE google_protobuf_DescriptorProto_ExtensionRange** google_protobuf_DescriptorProto_mutable_extension_range(google_protobuf_DescriptorProto* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__DescriptorProto__ExtensionRange_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1327,6 +1386,7 @@ UPB_INLINE google_protobuf_DescriptorProto_ExtensionRange** google_protobuf_Desc } UPB_INLINE struct google_protobuf_DescriptorProto_ExtensionRange* google_protobuf_DescriptorProto_add_extension_range(google_protobuf_DescriptorProto* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__DescriptorProto__ExtensionRange_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -1341,6 +1401,7 @@ UPB_INLINE struct google_protobuf_DescriptorProto_ExtensionRange* google_protobu } UPB_INLINE google_protobuf_FieldDescriptorProto** google_protobuf_DescriptorProto_mutable_extension(google_protobuf_DescriptorProto* msg, size_t* size) { upb_MiniTableField field = {6, UPB_SIZE(28, 64), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FieldDescriptorProto_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1357,6 +1418,7 @@ UPB_INLINE google_protobuf_FieldDescriptorProto** google_protobuf_DescriptorProt } UPB_INLINE struct google_protobuf_FieldDescriptorProto* google_protobuf_DescriptorProto_add_extension(google_protobuf_DescriptorProto* msg, upb_Arena* arena) { upb_MiniTableField field = {6, UPB_SIZE(28, 64), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FieldDescriptorProto_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -1371,6 +1433,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__MessageOptions_msg_init); 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) { @@ -1383,6 +1446,7 @@ UPB_INLINE struct google_protobuf_MessageOptions* google_protobuf_DescriptorProt } UPB_INLINE google_protobuf_OneofDescriptorProto** google_protobuf_DescriptorProto_mutable_oneof_decl(google_protobuf_DescriptorProto* msg, size_t* size) { upb_MiniTableField field = {8, UPB_SIZE(36, 80), 0, 6, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__OneofDescriptorProto_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1399,6 +1463,7 @@ UPB_INLINE google_protobuf_OneofDescriptorProto** google_protobuf_DescriptorProt } UPB_INLINE struct google_protobuf_OneofDescriptorProto* google_protobuf_DescriptorProto_add_oneof_decl(google_protobuf_DescriptorProto* msg, upb_Arena* arena) { upb_MiniTableField field = {8, UPB_SIZE(36, 80), 0, 6, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__OneofDescriptorProto_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -1413,6 +1478,7 @@ UPB_INLINE struct google_protobuf_OneofDescriptorProto* google_protobuf_Descript } UPB_INLINE google_protobuf_DescriptorProto_ReservedRange** google_protobuf_DescriptorProto_mutable_reserved_range(google_protobuf_DescriptorProto* msg, size_t* size) { upb_MiniTableField field = {9, UPB_SIZE(40, 88), 0, 7, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__DescriptorProto__ReservedRange_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1429,6 +1495,7 @@ UPB_INLINE google_protobuf_DescriptorProto_ReservedRange** google_protobuf_Descr } UPB_INLINE struct google_protobuf_DescriptorProto_ReservedRange* google_protobuf_DescriptorProto_add_reserved_range(google_protobuf_DescriptorProto* msg, upb_Arena* arena) { upb_MiniTableField field = {9, UPB_SIZE(40, 88), 0, 7, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__DescriptorProto__ReservedRange_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -1546,6 +1613,7 @@ UPB_INLINE const google_protobuf_ExtensionRangeOptions* google_protobuf_Descript const google_protobuf_ExtensionRangeOptions* default_val = NULL; const google_protobuf_ExtensionRangeOptions* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__ExtensionRangeOptions_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1565,6 +1633,7 @@ UPB_INLINE void google_protobuf_DescriptorProto_ExtensionRange_set_end(google_pr } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__ExtensionRangeOptions_msg_init); 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) { @@ -1696,6 +1765,7 @@ UPB_INLINE void google_protobuf_ExtensionRangeOptions_clear_declaration(google_p } UPB_INLINE const google_protobuf_ExtensionRangeOptions_Declaration* const* google_protobuf_ExtensionRangeOptions_declaration(const google_protobuf_ExtensionRangeOptions* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__ExtensionRangeOptions__Declaration_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1707,6 +1777,7 @@ UPB_INLINE const google_protobuf_ExtensionRangeOptions_Declaration* const* googl } UPB_INLINE const upb_Array* _google_protobuf_ExtensionRangeOptions_declaration_upb_array(const google_protobuf_ExtensionRangeOptions* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__ExtensionRangeOptions__Declaration_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -1715,6 +1786,7 @@ UPB_INLINE const upb_Array* _google_protobuf_ExtensionRangeOptions_declaration_u } UPB_INLINE upb_Array* _google_protobuf_ExtensionRangeOptions_declaration_mutable_upb_array(google_protobuf_ExtensionRangeOptions* msg, size_t* size, upb_Arena* arena) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__ExtensionRangeOptions__Declaration_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -1746,6 +1818,7 @@ UPB_INLINE const google_protobuf_FeatureSet* google_protobuf_ExtensionRangeOptio const google_protobuf_FeatureSet* default_val = NULL; const google_protobuf_FeatureSet* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FeatureSet_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -1760,6 +1833,7 @@ UPB_INLINE void google_protobuf_ExtensionRangeOptions_clear_uninterpreted_option } UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_ExtensionRangeOptions_uninterpreted_option(const google_protobuf_ExtensionRangeOptions* msg, size_t* size) { 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1771,6 +1845,7 @@ UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_Ext } UPB_INLINE const upb_Array* _google_protobuf_ExtensionRangeOptions_uninterpreted_option_upb_array(const google_protobuf_ExtensionRangeOptions* msg, size_t* size) { 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -1779,6 +1854,7 @@ UPB_INLINE const upb_Array* _google_protobuf_ExtensionRangeOptions_uninterpreted } UPB_INLINE upb_Array* _google_protobuf_ExtensionRangeOptions_uninterpreted_option_mutable_upb_array(google_protobuf_ExtensionRangeOptions* msg, size_t* size, upb_Arena* arena) { 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -1789,6 +1865,7 @@ UPB_INLINE upb_Array* _google_protobuf_ExtensionRangeOptions_uninterpreted_optio UPB_INLINE google_protobuf_ExtensionRangeOptions_Declaration** google_protobuf_ExtensionRangeOptions_mutable_declaration(google_protobuf_ExtensionRangeOptions* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__ExtensionRangeOptions__Declaration_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1805,6 +1882,7 @@ UPB_INLINE google_protobuf_ExtensionRangeOptions_Declaration** google_protobuf_E } UPB_INLINE struct google_protobuf_ExtensionRangeOptions_Declaration* google_protobuf_ExtensionRangeOptions_add_declaration(google_protobuf_ExtensionRangeOptions* msg, upb_Arena* arena) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__ExtensionRangeOptions__Declaration_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -1823,6 +1901,7 @@ UPB_INLINE void google_protobuf_ExtensionRangeOptions_set_verification(google_pr } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FeatureSet_msg_init); 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) { @@ -1835,6 +1914,7 @@ UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_ExtensionRangeOpti } UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_ExtensionRangeOptions_mutable_uninterpreted_option(google_protobuf_ExtensionRangeOptions* msg, size_t* size) { 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1851,6 +1931,7 @@ UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_ExtensionRangeO } UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_ExtensionRangeOptions_add_uninterpreted_option(google_protobuf_ExtensionRangeOptions* msg, upb_Arena* arena) { 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -2158,6 +2239,7 @@ UPB_INLINE const google_protobuf_FieldOptions* google_protobuf_FieldDescriptorPr const google_protobuf_FieldOptions* default_val = NULL; const google_protobuf_FieldOptions* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FieldOptions_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -2245,6 +2327,7 @@ UPB_INLINE void google_protobuf_FieldDescriptorProto_set_default_value(google_pr } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FieldOptions_msg_init); 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) { @@ -2328,6 +2411,7 @@ UPB_INLINE const google_protobuf_OneofOptions* google_protobuf_OneofDescriptorPr const google_protobuf_OneofOptions* default_val = NULL; const google_protobuf_OneofOptions* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__OneofOptions_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -2343,6 +2427,7 @@ UPB_INLINE void google_protobuf_OneofDescriptorProto_set_name(google_protobuf_On } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__OneofOptions_msg_init); 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) { @@ -2412,6 +2497,7 @@ UPB_INLINE void google_protobuf_EnumDescriptorProto_clear_value(google_protobuf_ } UPB_INLINE const google_protobuf_EnumValueDescriptorProto* const* google_protobuf_EnumDescriptorProto_value(const google_protobuf_EnumDescriptorProto* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__EnumValueDescriptorProto_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -2423,6 +2509,7 @@ UPB_INLINE const google_protobuf_EnumValueDescriptorProto* const* google_protobu } UPB_INLINE const upb_Array* _google_protobuf_EnumDescriptorProto_value_upb_array(const google_protobuf_EnumDescriptorProto* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__EnumValueDescriptorProto_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -2431,6 +2518,7 @@ UPB_INLINE const upb_Array* _google_protobuf_EnumDescriptorProto_value_upb_array } UPB_INLINE upb_Array* _google_protobuf_EnumDescriptorProto_value_mutable_upb_array(google_protobuf_EnumDescriptorProto* msg, size_t* size, upb_Arena* arena) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__EnumValueDescriptorProto_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -2446,6 +2534,7 @@ UPB_INLINE const google_protobuf_EnumOptions* google_protobuf_EnumDescriptorProt const google_protobuf_EnumOptions* default_val = NULL; const google_protobuf_EnumOptions* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__EnumOptions_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -2460,6 +2549,7 @@ UPB_INLINE void google_protobuf_EnumDescriptorProto_clear_reserved_range(google_ } UPB_INLINE const google_protobuf_EnumDescriptorProto_EnumReservedRange* const* google_protobuf_EnumDescriptorProto_reserved_range(const google_protobuf_EnumDescriptorProto* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -2471,6 +2561,7 @@ UPB_INLINE const google_protobuf_EnumDescriptorProto_EnumReservedRange* const* g } UPB_INLINE const upb_Array* _google_protobuf_EnumDescriptorProto_reserved_range_upb_array(const google_protobuf_EnumDescriptorProto* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -2479,6 +2570,7 @@ UPB_INLINE const upb_Array* _google_protobuf_EnumDescriptorProto_reserved_range_ } UPB_INLINE upb_Array* _google_protobuf_EnumDescriptorProto_reserved_range_mutable_upb_array(google_protobuf_EnumDescriptorProto* msg, size_t* size, upb_Arena* arena) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -2525,6 +2617,7 @@ UPB_INLINE void google_protobuf_EnumDescriptorProto_set_name(google_protobuf_Enu } 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__EnumValueDescriptorProto_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -2541,6 +2634,7 @@ UPB_INLINE google_protobuf_EnumValueDescriptorProto** google_protobuf_EnumDescri } UPB_INLINE struct google_protobuf_EnumValueDescriptorProto* google_protobuf_EnumDescriptorProto_add_value(google_protobuf_EnumDescriptorProto* msg, upb_Arena* arena) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__EnumValueDescriptorProto_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -2555,6 +2649,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__EnumOptions_msg_init); 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) { @@ -2567,6 +2662,7 @@ UPB_INLINE struct google_protobuf_EnumOptions* google_protobuf_EnumDescriptorPro } UPB_INLINE google_protobuf_EnumDescriptorProto_EnumReservedRange** google_protobuf_EnumDescriptorProto_mutable_reserved_range(google_protobuf_EnumDescriptorProto* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -2583,6 +2679,7 @@ UPB_INLINE google_protobuf_EnumDescriptorProto_EnumReservedRange** google_protob } UPB_INLINE struct google_protobuf_EnumDescriptorProto_EnumReservedRange* google_protobuf_EnumDescriptorProto_add_reserved_range(google_protobuf_EnumDescriptorProto* msg, upb_Arena* arena) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -2778,6 +2875,7 @@ UPB_INLINE const google_protobuf_EnumValueOptions* google_protobuf_EnumValueDesc const google_protobuf_EnumValueOptions* default_val = NULL; const google_protobuf_EnumValueOptions* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__EnumValueOptions_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -2797,6 +2895,7 @@ UPB_INLINE void google_protobuf_EnumValueDescriptorProto_set_number(google_proto } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__EnumValueOptions_msg_init); 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) { @@ -2866,6 +2965,7 @@ UPB_INLINE void google_protobuf_ServiceDescriptorProto_clear_method(google_proto } UPB_INLINE const google_protobuf_MethodDescriptorProto* const* google_protobuf_ServiceDescriptorProto_method(const google_protobuf_ServiceDescriptorProto* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__MethodDescriptorProto_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -2877,6 +2977,7 @@ UPB_INLINE const google_protobuf_MethodDescriptorProto* const* google_protobuf_S } UPB_INLINE const upb_Array* _google_protobuf_ServiceDescriptorProto_method_upb_array(const google_protobuf_ServiceDescriptorProto* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__MethodDescriptorProto_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -2885,6 +2986,7 @@ UPB_INLINE const upb_Array* _google_protobuf_ServiceDescriptorProto_method_upb_a } UPB_INLINE upb_Array* _google_protobuf_ServiceDescriptorProto_method_mutable_upb_array(google_protobuf_ServiceDescriptorProto* msg, size_t* size, upb_Arena* arena) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__MethodDescriptorProto_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -2900,6 +3002,7 @@ UPB_INLINE const google_protobuf_ServiceOptions* google_protobuf_ServiceDescript const google_protobuf_ServiceOptions* default_val = NULL; const google_protobuf_ServiceOptions* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__ServiceOptions_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -2915,6 +3018,7 @@ UPB_INLINE void google_protobuf_ServiceDescriptorProto_set_name(google_protobuf_ } 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__MethodDescriptorProto_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -2931,6 +3035,7 @@ UPB_INLINE google_protobuf_MethodDescriptorProto** google_protobuf_ServiceDescri } UPB_INLINE struct google_protobuf_MethodDescriptorProto* google_protobuf_ServiceDescriptorProto_add_method(google_protobuf_ServiceDescriptorProto* msg, upb_Arena* arena) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__MethodDescriptorProto_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -2945,6 +3050,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__ServiceOptions_msg_init); 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) { @@ -3048,6 +3154,7 @@ UPB_INLINE const google_protobuf_MethodOptions* google_protobuf_MethodDescriptor const google_protobuf_MethodOptions* default_val = NULL; const google_protobuf_MethodOptions* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__MethodOptions_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -3103,6 +3210,7 @@ UPB_INLINE void google_protobuf_MethodDescriptorProto_set_output_type(google_pro } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__MethodOptions_msg_init); 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) { @@ -3470,6 +3578,7 @@ UPB_INLINE const google_protobuf_FeatureSet* google_protobuf_FileOptions_feature const google_protobuf_FeatureSet* default_val = NULL; const google_protobuf_FeatureSet* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FeatureSet_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -3484,6 +3593,7 @@ UPB_INLINE void google_protobuf_FileOptions_clear_uninterpreted_option(google_pr } UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_FileOptions_uninterpreted_option(const google_protobuf_FileOptions* msg, size_t* size) { const upb_MiniTableField field = {999, UPB_SIZE(28, 192), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -3495,6 +3605,7 @@ UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_Fil } UPB_INLINE const upb_Array* _google_protobuf_FileOptions_uninterpreted_option_upb_array(const google_protobuf_FileOptions* msg, size_t* size) { const upb_MiniTableField field = {999, UPB_SIZE(28, 192), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -3503,6 +3614,7 @@ UPB_INLINE const upb_Array* _google_protobuf_FileOptions_uninterpreted_option_up } UPB_INLINE upb_Array* _google_protobuf_FileOptions_uninterpreted_option_mutable_upb_array(google_protobuf_FileOptions* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {999, UPB_SIZE(28, 192), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -3589,6 +3701,7 @@ UPB_INLINE void google_protobuf_FileOptions_set_ruby_package(google_protobuf_Fil } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FeatureSet_msg_init); 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) { @@ -3601,6 +3714,7 @@ UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_FileOptions_mutabl } UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_FileOptions_mutable_uninterpreted_option(google_protobuf_FileOptions* msg, size_t* size) { upb_MiniTableField field = {999, UPB_SIZE(28, 192), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -3617,6 +3731,7 @@ UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_FileOptions_res } UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_FileOptions_add_uninterpreted_option(google_protobuf_FileOptions* msg, upb_Arena* arena) { upb_MiniTableField field = {999, UPB_SIZE(28, 192), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -3754,6 +3869,7 @@ UPB_INLINE const google_protobuf_FeatureSet* google_protobuf_MessageOptions_feat const google_protobuf_FeatureSet* default_val = NULL; const google_protobuf_FeatureSet* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FeatureSet_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -3768,6 +3884,7 @@ UPB_INLINE void google_protobuf_MessageOptions_clear_uninterpreted_option(google } UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_MessageOptions_uninterpreted_option(const google_protobuf_MessageOptions* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -3779,6 +3896,7 @@ UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_Mes } UPB_INLINE const upb_Array* _google_protobuf_MessageOptions_uninterpreted_option_upb_array(const google_protobuf_MessageOptions* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -3787,6 +3905,7 @@ UPB_INLINE const upb_Array* _google_protobuf_MessageOptions_uninterpreted_option } UPB_INLINE upb_Array* _google_protobuf_MessageOptions_uninterpreted_option_mutable_upb_array(google_protobuf_MessageOptions* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -3817,6 +3936,7 @@ UPB_INLINE void google_protobuf_MessageOptions_set_deprecated_legacy_json_field_ } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FeatureSet_msg_init); 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) { @@ -3829,6 +3949,7 @@ UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_MessageOptions_mut } UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_MessageOptions_mutable_uninterpreted_option(google_protobuf_MessageOptions* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -3845,6 +3966,7 @@ UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_MessageOptions_ } UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_MessageOptions_add_uninterpreted_option(google_protobuf_MessageOptions* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -4076,6 +4198,7 @@ UPB_INLINE void google_protobuf_FieldOptions_clear_edition_defaults(google_proto } UPB_INLINE const google_protobuf_FieldOptions_EditionDefault* const* google_protobuf_FieldOptions_edition_defaults(const google_protobuf_FieldOptions* msg, size_t* size) { const upb_MiniTableField field = {20, UPB_SIZE(36, 40), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FieldOptions__EditionDefault_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -4087,6 +4210,7 @@ UPB_INLINE const google_protobuf_FieldOptions_EditionDefault* const* google_prot } UPB_INLINE const upb_Array* _google_protobuf_FieldOptions_edition_defaults_upb_array(const google_protobuf_FieldOptions* msg, size_t* size) { const upb_MiniTableField field = {20, UPB_SIZE(36, 40), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FieldOptions__EditionDefault_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -4095,6 +4219,7 @@ UPB_INLINE const upb_Array* _google_protobuf_FieldOptions_edition_defaults_upb_a } UPB_INLINE upb_Array* _google_protobuf_FieldOptions_edition_defaults_mutable_upb_array(google_protobuf_FieldOptions* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {20, UPB_SIZE(36, 40), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FieldOptions__EditionDefault_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -4110,6 +4235,7 @@ UPB_INLINE const google_protobuf_FeatureSet* google_protobuf_FieldOptions_featur const google_protobuf_FeatureSet* default_val = NULL; const google_protobuf_FeatureSet* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FeatureSet_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -4126,6 +4252,7 @@ UPB_INLINE const google_protobuf_FieldOptions_FeatureSupport* google_protobuf_Fi 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FieldOptions__FeatureSupport_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -4140,6 +4267,7 @@ UPB_INLINE void google_protobuf_FieldOptions_clear_uninterpreted_option(google_p } 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(48, 64), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -4151,6 +4279,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(48, 64), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -4159,6 +4288,7 @@ UPB_INLINE const upb_Array* _google_protobuf_FieldOptions_uninterpreted_option_u } 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(48, 64), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -4233,6 +4363,7 @@ UPB_INLINE bool google_protobuf_FieldOptions_add_targets(google_protobuf_FieldOp } UPB_INLINE google_protobuf_FieldOptions_EditionDefault** google_protobuf_FieldOptions_mutable_edition_defaults(google_protobuf_FieldOptions* msg, size_t* size) { upb_MiniTableField field = {20, UPB_SIZE(36, 40), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FieldOptions__EditionDefault_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -4249,6 +4380,7 @@ UPB_INLINE google_protobuf_FieldOptions_EditionDefault** google_protobuf_FieldOp } UPB_INLINE struct google_protobuf_FieldOptions_EditionDefault* google_protobuf_FieldOptions_add_edition_defaults(google_protobuf_FieldOptions* msg, upb_Arena* arena) { upb_MiniTableField field = {20, UPB_SIZE(36, 40), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FieldOptions__EditionDefault_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -4263,6 +4395,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FeatureSet_msg_init); 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) { @@ -4275,6 +4408,7 @@ UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_FieldOptions_mutab } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FieldOptions__FeatureSupport_msg_init); 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) { @@ -4287,6 +4421,7 @@ UPB_INLINE struct google_protobuf_FieldOptions_FeatureSupport* google_protobuf_F } UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_FieldOptions_mutable_uninterpreted_option(google_protobuf_FieldOptions* msg, size_t* size) { 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -4303,6 +4438,7 @@ UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_FieldOptions_re } 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(48, 64), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -4556,6 +4692,7 @@ UPB_INLINE const google_protobuf_FeatureSet* google_protobuf_OneofOptions_featur const google_protobuf_FeatureSet* default_val = NULL; const google_protobuf_FeatureSet* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FeatureSet_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -4570,6 +4707,7 @@ UPB_INLINE void google_protobuf_OneofOptions_clear_uninterpreted_option(google_p } UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_OneofOptions_uninterpreted_option(const google_protobuf_OneofOptions* msg, size_t* size) { const upb_MiniTableField field = {999, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -4581,6 +4719,7 @@ UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_One } UPB_INLINE const upb_Array* _google_protobuf_OneofOptions_uninterpreted_option_upb_array(const google_protobuf_OneofOptions* msg, size_t* size) { const upb_MiniTableField field = {999, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -4589,6 +4728,7 @@ UPB_INLINE const upb_Array* _google_protobuf_OneofOptions_uninterpreted_option_u } UPB_INLINE upb_Array* _google_protobuf_OneofOptions_uninterpreted_option_mutable_upb_array(google_protobuf_OneofOptions* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {999, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -4599,6 +4739,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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FeatureSet_msg_init); 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) { @@ -4611,6 +4752,7 @@ UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_OneofOptions_mutab } UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_OneofOptions_mutable_uninterpreted_option(google_protobuf_OneofOptions* msg, size_t* size) { upb_MiniTableField field = {999, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -4627,6 +4769,7 @@ UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_OneofOptions_re } UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_OneofOptions_add_uninterpreted_option(google_protobuf_OneofOptions* msg, upb_Arena* arena) { upb_MiniTableField field = {999, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -4732,6 +4875,7 @@ UPB_INLINE const google_protobuf_FeatureSet* google_protobuf_EnumOptions_feature const google_protobuf_FeatureSet* default_val = NULL; const google_protobuf_FeatureSet* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FeatureSet_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -4746,6 +4890,7 @@ UPB_INLINE void google_protobuf_EnumOptions_clear_uninterpreted_option(google_pr } UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_EnumOptions_uninterpreted_option(const google_protobuf_EnumOptions* msg, size_t* size) { const upb_MiniTableField field = {999, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -4757,6 +4902,7 @@ UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_Enu } UPB_INLINE const upb_Array* _google_protobuf_EnumOptions_uninterpreted_option_upb_array(const google_protobuf_EnumOptions* msg, size_t* size) { const upb_MiniTableField field = {999, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -4765,6 +4911,7 @@ UPB_INLINE const upb_Array* _google_protobuf_EnumOptions_uninterpreted_option_up } UPB_INLINE upb_Array* _google_protobuf_EnumOptions_uninterpreted_option_mutable_upb_array(google_protobuf_EnumOptions* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {999, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -4787,6 +4934,7 @@ UPB_INLINE void google_protobuf_EnumOptions_set_deprecated_legacy_json_field_con } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FeatureSet_msg_init); 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) { @@ -4799,6 +4947,7 @@ UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_EnumOptions_mutabl } UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_EnumOptions_mutable_uninterpreted_option(google_protobuf_EnumOptions* msg, size_t* size) { upb_MiniTableField field = {999, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -4815,6 +4964,7 @@ UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_EnumOptions_res } UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_EnumOptions_add_uninterpreted_option(google_protobuf_EnumOptions* msg, upb_Arena* arena) { upb_MiniTableField field = {999, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -4888,6 +5038,7 @@ UPB_INLINE const google_protobuf_FeatureSet* google_protobuf_EnumValueOptions_fe const google_protobuf_FeatureSet* default_val = NULL; const google_protobuf_FeatureSet* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FeatureSet_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -4920,6 +5071,7 @@ UPB_INLINE const google_protobuf_FieldOptions_FeatureSupport* google_protobuf_En 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FieldOptions__FeatureSupport_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -4934,6 +5086,7 @@ UPB_INLINE void google_protobuf_EnumValueOptions_clear_uninterpreted_option(goog } 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(24, 32), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -4945,6 +5098,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(24, 32), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -4953,6 +5107,7 @@ UPB_INLINE const upb_Array* _google_protobuf_EnumValueOptions_uninterpreted_opti } 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(24, 32), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -4967,6 +5122,7 @@ UPB_INLINE void google_protobuf_EnumValueOptions_set_deprecated(google_protobuf_ } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FeatureSet_msg_init); 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) { @@ -4983,6 +5139,7 @@ UPB_INLINE void google_protobuf_EnumValueOptions_set_debug_redact(google_protobu } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FieldOptions__FeatureSupport_msg_init); 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) { @@ -4995,6 +5152,7 @@ UPB_INLINE struct google_protobuf_FieldOptions_FeatureSupport* google_protobuf_E } UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_EnumValueOptions_mutable_uninterpreted_option(google_protobuf_EnumValueOptions* msg, size_t* size) { 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -5011,6 +5169,7 @@ UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_EnumValueOption } 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(24, 32), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -5084,6 +5243,7 @@ UPB_INLINE const google_protobuf_FeatureSet* google_protobuf_ServiceOptions_feat const google_protobuf_FeatureSet* default_val = NULL; const google_protobuf_FeatureSet* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FeatureSet_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -5098,6 +5258,7 @@ UPB_INLINE void google_protobuf_ServiceOptions_clear_uninterpreted_option(google } UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_ServiceOptions_uninterpreted_option(const google_protobuf_ServiceOptions* msg, size_t* size) { const upb_MiniTableField field = {999, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -5109,6 +5270,7 @@ UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_Ser } UPB_INLINE const upb_Array* _google_protobuf_ServiceOptions_uninterpreted_option_upb_array(const google_protobuf_ServiceOptions* msg, size_t* size) { const upb_MiniTableField field = {999, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -5117,6 +5279,7 @@ UPB_INLINE const upb_Array* _google_protobuf_ServiceOptions_uninterpreted_option } UPB_INLINE upb_Array* _google_protobuf_ServiceOptions_uninterpreted_option_mutable_upb_array(google_protobuf_ServiceOptions* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {999, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -5131,6 +5294,7 @@ UPB_INLINE void google_protobuf_ServiceOptions_set_deprecated(google_protobuf_Se } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FeatureSet_msg_init); 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) { @@ -5143,6 +5307,7 @@ UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_ServiceOptions_mut } UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_ServiceOptions_mutable_uninterpreted_option(google_protobuf_ServiceOptions* msg, size_t* size) { upb_MiniTableField field = {999, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -5159,6 +5324,7 @@ UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_ServiceOptions_ } UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_ServiceOptions_add_uninterpreted_option(google_protobuf_ServiceOptions* msg, upb_Arena* arena) { upb_MiniTableField field = {999, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -5248,6 +5414,7 @@ UPB_INLINE const google_protobuf_FeatureSet* google_protobuf_MethodOptions_featu const google_protobuf_FeatureSet* default_val = NULL; const google_protobuf_FeatureSet* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FeatureSet_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -5262,6 +5429,7 @@ UPB_INLINE void google_protobuf_MethodOptions_clear_uninterpreted_option(google_ } UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_MethodOptions_uninterpreted_option(const google_protobuf_MethodOptions* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -5273,6 +5441,7 @@ UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_Met } UPB_INLINE const upb_Array* _google_protobuf_MethodOptions_uninterpreted_option_upb_array(const google_protobuf_MethodOptions* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -5281,6 +5450,7 @@ UPB_INLINE const upb_Array* _google_protobuf_MethodOptions_uninterpreted_option_ } UPB_INLINE upb_Array* _google_protobuf_MethodOptions_uninterpreted_option_mutable_upb_array(google_protobuf_MethodOptions* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -5299,6 +5469,7 @@ UPB_INLINE void google_protobuf_MethodOptions_set_idempotency_level(google_proto } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FeatureSet_msg_init); 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) { @@ -5311,6 +5482,7 @@ UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_MethodOptions_muta } UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_MethodOptions_mutable_uninterpreted_option(google_protobuf_MethodOptions* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -5327,6 +5499,7 @@ UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_MethodOptions_r } UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_MethodOptions_add_uninterpreted_option(google_protobuf_MethodOptions* 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -5382,6 +5555,7 @@ UPB_INLINE void google_protobuf_UninterpretedOption_clear_name(google_protobuf_U } UPB_INLINE const google_protobuf_UninterpretedOption_NamePart* const* google_protobuf_UninterpretedOption_name(const google_protobuf_UninterpretedOption* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption__NamePart_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -5393,6 +5567,7 @@ UPB_INLINE const google_protobuf_UninterpretedOption_NamePart* const* google_pro } UPB_INLINE const upb_Array* _google_protobuf_UninterpretedOption_name_upb_array(const google_protobuf_UninterpretedOption* msg, size_t* size) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption__NamePart_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -5401,6 +5576,7 @@ UPB_INLINE const upb_Array* _google_protobuf_UninterpretedOption_name_upb_array( } UPB_INLINE upb_Array* _google_protobuf_UninterpretedOption_name_mutable_upb_array(google_protobuf_UninterpretedOption* msg, size_t* size, upb_Arena* arena) { const 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption__NamePart_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -5507,6 +5683,7 @@ UPB_INLINE bool google_protobuf_UninterpretedOption_has_aggregate_value(const go UPB_INLINE google_protobuf_UninterpretedOption_NamePart** google_protobuf_UninterpretedOption_mutable_name(google_protobuf_UninterpretedOption* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption__NamePart_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -5523,6 +5700,7 @@ UPB_INLINE google_protobuf_UninterpretedOption_NamePart** google_protobuf_Uninte } UPB_INLINE struct google_protobuf_UninterpretedOption_NamePart* google_protobuf_UninterpretedOption_add_name(google_protobuf_UninterpretedOption* msg, upb_Arena* arena) { 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__UninterpretedOption__NamePart_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -5838,6 +6016,7 @@ UPB_INLINE void google_protobuf_FeatureSetDefaults_clear_defaults(google_protobu } UPB_INLINE const google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* const* google_protobuf_FeatureSetDefaults_defaults(const google_protobuf_FeatureSetDefaults* msg, size_t* size) { const upb_MiniTableField field = {1, UPB_SIZE(12, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -5849,6 +6028,7 @@ UPB_INLINE const google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* co } UPB_INLINE const upb_Array* _google_protobuf_FeatureSetDefaults_defaults_upb_array(const google_protobuf_FeatureSetDefaults* msg, size_t* size) { const upb_MiniTableField field = {1, UPB_SIZE(12, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -5857,6 +6037,7 @@ UPB_INLINE const upb_Array* _google_protobuf_FeatureSetDefaults_defaults_upb_arr } UPB_INLINE upb_Array* _google_protobuf_FeatureSetDefaults_defaults_mutable_upb_array(google_protobuf_FeatureSetDefaults* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {1, UPB_SIZE(12, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -5899,6 +6080,7 @@ UPB_INLINE bool google_protobuf_FeatureSetDefaults_has_maximum_edition(const goo UPB_INLINE google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault** google_protobuf_FeatureSetDefaults_mutable_defaults(google_protobuf_FeatureSetDefaults* msg, size_t* size) { upb_MiniTableField field = {1, UPB_SIZE(12, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -5915,6 +6097,7 @@ UPB_INLINE google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault** google_ } UPB_INLINE struct google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* google_protobuf_FeatureSetDefaults_add_defaults(google_protobuf_FeatureSetDefaults* msg, upb_Arena* arena) { upb_MiniTableField field = {1, UPB_SIZE(12, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -5996,6 +6179,7 @@ UPB_INLINE const google_protobuf_FeatureSet* google_protobuf_FeatureSetDefaults_ const google_protobuf_FeatureSet* default_val = NULL; const google_protobuf_FeatureSet* ret; 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FeatureSet_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -6012,6 +6196,7 @@ UPB_INLINE const google_protobuf_FeatureSet* google_protobuf_FeatureSetDefaults_ 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FeatureSet_msg_init); _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -6027,6 +6212,7 @@ UPB_INLINE void google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_set_ } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FeatureSet_msg_init); upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_mutable_overridable_features(google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* msg, upb_Arena* arena) { @@ -6039,6 +6225,7 @@ UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_FeatureSetDefaults } 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_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__FeatureSet_msg_init); 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) { @@ -6092,6 +6279,7 @@ UPB_INLINE void google_protobuf_SourceCodeInfo_clear_location(google_protobuf_So } UPB_INLINE const google_protobuf_SourceCodeInfo_Location* const* google_protobuf_SourceCodeInfo_location(const google_protobuf_SourceCodeInfo* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__SourceCodeInfo__Location_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -6103,6 +6291,7 @@ UPB_INLINE const google_protobuf_SourceCodeInfo_Location* const* google_protobuf } UPB_INLINE const upb_Array* _google_protobuf_SourceCodeInfo_location_upb_array(const google_protobuf_SourceCodeInfo* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__SourceCodeInfo__Location_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -6111,6 +6300,7 @@ UPB_INLINE const upb_Array* _google_protobuf_SourceCodeInfo_location_upb_array(c } UPB_INLINE upb_Array* _google_protobuf_SourceCodeInfo_location_mutable_upb_array(google_protobuf_SourceCodeInfo* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__SourceCodeInfo__Location_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -6121,6 +6311,7 @@ UPB_INLINE upb_Array* _google_protobuf_SourceCodeInfo_location_mutable_upb_array UPB_INLINE google_protobuf_SourceCodeInfo_Location** google_protobuf_SourceCodeInfo_mutable_location(google_protobuf_SourceCodeInfo* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__SourceCodeInfo__Location_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -6137,6 +6328,7 @@ UPB_INLINE google_protobuf_SourceCodeInfo_Location** google_protobuf_SourceCodeI } UPB_INLINE struct google_protobuf_SourceCodeInfo_Location* google_protobuf_SourceCodeInfo_add_location(google_protobuf_SourceCodeInfo* msg, upb_Arena* arena) { upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__SourceCodeInfo__Location_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -6450,6 +6642,7 @@ UPB_INLINE void google_protobuf_GeneratedCodeInfo_clear_annotation(google_protob } UPB_INLINE const google_protobuf_GeneratedCodeInfo_Annotation* const* google_protobuf_GeneratedCodeInfo_annotation(const google_protobuf_GeneratedCodeInfo* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__GeneratedCodeInfo__Annotation_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -6461,6 +6654,7 @@ UPB_INLINE const google_protobuf_GeneratedCodeInfo_Annotation* const* google_pro } UPB_INLINE const upb_Array* _google_protobuf_GeneratedCodeInfo_annotation_upb_array(const google_protobuf_GeneratedCodeInfo* msg, size_t* size) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__GeneratedCodeInfo__Annotation_msg_init); const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -6469,6 +6663,7 @@ UPB_INLINE const upb_Array* _google_protobuf_GeneratedCodeInfo_annotation_upb_ar } UPB_INLINE upb_Array* _google_protobuf_GeneratedCodeInfo_annotation_mutable_upb_array(google_protobuf_GeneratedCodeInfo* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__GeneratedCodeInfo__Annotation_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -6479,6 +6674,7 @@ UPB_INLINE upb_Array* _google_protobuf_GeneratedCodeInfo_annotation_mutable_upb_ UPB_INLINE google_protobuf_GeneratedCodeInfo_Annotation** google_protobuf_GeneratedCodeInfo_mutable_annotation(google_protobuf_GeneratedCodeInfo* 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)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__GeneratedCodeInfo__Annotation_msg_init); upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -6495,6 +6691,7 @@ UPB_INLINE google_protobuf_GeneratedCodeInfo_Annotation** google_protobuf_Genera } UPB_INLINE struct google_protobuf_GeneratedCodeInfo_Annotation* google_protobuf_GeneratedCodeInfo_add_annotation(google_protobuf_GeneratedCodeInfo* msg, upb_Arena* arena) { upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + UPB_PRIVATE(_upb_MiniTable_StrongReference)(&google__protobuf__GeneratedCodeInfo__Annotation_msg_init); upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( diff --git a/third_party/upb/upb/reflection/cmake/google/protobuf/descriptor.upb_minitable.c b/third_party/upb/upb/reflection/cmake/google/protobuf/descriptor.upb_minitable.c index 9bd32e10876..08fa451f750 100644 --- a/third_party/upb/upb/reflection/cmake/google/protobuf/descriptor.upb_minitable.c +++ b/third_party/upb/upb/reflection/cmake/google/protobuf/descriptor.upb_minitable.c @@ -3,7 +3,8 @@ * google/protobuf/descriptor.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #include #include "upb/generated_code_support.h" @@ -12,8 +13,9 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub google_protobuf_FileDescriptorSet_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__FileDescriptorProto_msg_init}, +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal google_protobuf_FileDescriptorSet_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__FileDescriptorProto_msg_init_ptr}, }; static const upb_MiniTableField google_protobuf_FileDescriptorSet__fields[1] = { @@ -33,13 +35,14 @@ const upb_MiniTable google__protobuf__FileDescriptorSet_msg_init = { }) }; -static const upb_MiniTableSub google_protobuf_FileDescriptorProto_submsgs[7] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__DescriptorProto_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__EnumDescriptorProto_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__ServiceDescriptorProto_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__FieldDescriptorProto_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__FileOptions_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__SourceCodeInfo_msg_init}, +const upb_MiniTable* google__protobuf__FileDescriptorSet_msg_init_ptr = &google__protobuf__FileDescriptorSet_msg_init; +static const upb_MiniTableSubInternal google_protobuf_FileDescriptorProto_submsgs[7] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__DescriptorProto_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__EnumDescriptorProto_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__ServiceDescriptorProto_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__FieldDescriptorProto_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__FileOptions_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__SourceCodeInfo_msg_init_ptr}, {.UPB_PRIVATE(subenum) = &google_protobuf_Edition_enum_init}, }; @@ -86,15 +89,16 @@ const upb_MiniTable google__protobuf__FileDescriptorProto_msg_init = { }) }; -static const upb_MiniTableSub google_protobuf_DescriptorProto_submsgs[8] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__FieldDescriptorProto_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__DescriptorProto_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__EnumDescriptorProto_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__DescriptorProto__ExtensionRange_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__FieldDescriptorProto_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__MessageOptions_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__OneofDescriptorProto_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__DescriptorProto__ReservedRange_msg_init}, +const upb_MiniTable* google__protobuf__FileDescriptorProto_msg_init_ptr = &google__protobuf__FileDescriptorProto_msg_init; +static const upb_MiniTableSubInternal google_protobuf_DescriptorProto_submsgs[8] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__FieldDescriptorProto_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__DescriptorProto_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__EnumDescriptorProto_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__DescriptorProto__ExtensionRange_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__FieldDescriptorProto_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__MessageOptions_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__OneofDescriptorProto_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__DescriptorProto__ReservedRange_msg_init_ptr}, }; static const upb_MiniTableField google_protobuf_DescriptorProto__fields[10] = { @@ -137,8 +141,9 @@ const upb_MiniTable google__protobuf__DescriptorProto_msg_init = { }) }; -static const upb_MiniTableSub google_protobuf_DescriptorProto_ExtensionRange_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__ExtensionRangeOptions_msg_init}, +const upb_MiniTable* google__protobuf__DescriptorProto_msg_init_ptr = &google__protobuf__DescriptorProto_msg_init; +static const upb_MiniTableSubInternal google_protobuf_DescriptorProto_ExtensionRange_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__ExtensionRangeOptions_msg_init_ptr}, }; static const upb_MiniTableField google_protobuf_DescriptorProto_ExtensionRange__fields[3] = { @@ -156,6 +161,7 @@ const upb_MiniTable google__protobuf__DescriptorProto__ExtensionRange_msg_init = #endif }; +const upb_MiniTable* google__protobuf__DescriptorProto__ExtensionRange_msg_init_ptr = &google__protobuf__DescriptorProto__ExtensionRange_msg_init; static const upb_MiniTableField google_protobuf_DescriptorProto_ReservedRange__fields[2] = { {1, 12, 64, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, {2, 16, 65, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, @@ -170,10 +176,11 @@ const upb_MiniTable google__protobuf__DescriptorProto__ReservedRange_msg_init = #endif }; -static const upb_MiniTableSub google_protobuf_ExtensionRangeOptions_submsgs[4] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__ExtensionRangeOptions__Declaration_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init}, +const upb_MiniTable* google__protobuf__DescriptorProto__ReservedRange_msg_init_ptr = &google__protobuf__DescriptorProto__ReservedRange_msg_init; +static const upb_MiniTableSubInternal google_protobuf_ExtensionRangeOptions_submsgs[4] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__ExtensionRangeOptions__Declaration_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init_ptr}, {.UPB_PRIVATE(subenum) = &google_protobuf_ExtensionRangeOptions_VerificationState_enum_init}, }; @@ -227,6 +234,7 @@ const upb_MiniTable google__protobuf__ExtensionRangeOptions_msg_init = { }) }; +const upb_MiniTable* google__protobuf__ExtensionRangeOptions_msg_init_ptr = &google__protobuf__ExtensionRangeOptions_msg_init; static const upb_MiniTableField google_protobuf_ExtensionRangeOptions_Declaration__fields[5] = { {1, 12, 64, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, {2, UPB_SIZE(20, 24), 65, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, @@ -244,8 +252,9 @@ const upb_MiniTable google__protobuf__ExtensionRangeOptions__Declaration_msg_ini #endif }; -static const upb_MiniTableSub google_protobuf_FieldDescriptorProto_submsgs[3] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__FieldOptions_msg_init}, +const upb_MiniTable* google__protobuf__ExtensionRangeOptions__Declaration_msg_init_ptr = &google__protobuf__ExtensionRangeOptions__Declaration_msg_init; +static const upb_MiniTableSubInternal google_protobuf_FieldDescriptorProto_submsgs[3] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__FieldOptions_msg_init_ptr}, {.UPB_PRIVATE(subenum) = &google_protobuf_FieldDescriptorProto_Label_enum_init}, {.UPB_PRIVATE(subenum) = &google_protobuf_FieldDescriptorProto_Type_enum_init}, }; @@ -273,8 +282,9 @@ const upb_MiniTable google__protobuf__FieldDescriptorProto_msg_init = { #endif }; -static const upb_MiniTableSub google_protobuf_OneofDescriptorProto_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__OneofOptions_msg_init}, +const upb_MiniTable* google__protobuf__FieldDescriptorProto_msg_init_ptr = &google__protobuf__FieldDescriptorProto_msg_init; +static const upb_MiniTableSubInternal google_protobuf_OneofDescriptorProto_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__OneofOptions_msg_init_ptr}, }; static const upb_MiniTableField google_protobuf_OneofDescriptorProto__fields[2] = { @@ -291,10 +301,11 @@ const upb_MiniTable google__protobuf__OneofDescriptorProto_msg_init = { #endif }; -static const upb_MiniTableSub google_protobuf_EnumDescriptorProto_submsgs[3] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__EnumValueDescriptorProto_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__EnumOptions_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init}, +const upb_MiniTable* google__protobuf__OneofDescriptorProto_msg_init_ptr = &google__protobuf__OneofDescriptorProto_msg_init; +static const upb_MiniTableSubInternal google_protobuf_EnumDescriptorProto_submsgs[3] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__EnumValueDescriptorProto_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__EnumOptions_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init_ptr}, }; static const upb_MiniTableField google_protobuf_EnumDescriptorProto__fields[5] = { @@ -324,6 +335,7 @@ const upb_MiniTable google__protobuf__EnumDescriptorProto_msg_init = { }) }; +const upb_MiniTable* google__protobuf__EnumDescriptorProto_msg_init_ptr = &google__protobuf__EnumDescriptorProto_msg_init; static const upb_MiniTableField google_protobuf_EnumDescriptorProto_EnumReservedRange__fields[2] = { {1, 12, 64, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, {2, 16, 65, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, @@ -338,8 +350,9 @@ const upb_MiniTable google__protobuf__EnumDescriptorProto__EnumReservedRange_msg #endif }; -static const upb_MiniTableSub google_protobuf_EnumValueDescriptorProto_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__EnumValueOptions_msg_init}, +const upb_MiniTable* google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init_ptr = &google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init; +static const upb_MiniTableSubInternal google_protobuf_EnumValueDescriptorProto_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__EnumValueOptions_msg_init_ptr}, }; static const upb_MiniTableField google_protobuf_EnumValueDescriptorProto__fields[3] = { @@ -357,9 +370,10 @@ const upb_MiniTable google__protobuf__EnumValueDescriptorProto_msg_init = { #endif }; -static const upb_MiniTableSub google_protobuf_ServiceDescriptorProto_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__MethodDescriptorProto_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__ServiceOptions_msg_init}, +const upb_MiniTable* google__protobuf__EnumValueDescriptorProto_msg_init_ptr = &google__protobuf__EnumValueDescriptorProto_msg_init; +static const upb_MiniTableSubInternal google_protobuf_ServiceDescriptorProto_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__MethodDescriptorProto_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__ServiceOptions_msg_init_ptr}, }; static const upb_MiniTableField google_protobuf_ServiceDescriptorProto__fields[3] = { @@ -383,8 +397,9 @@ const upb_MiniTable google__protobuf__ServiceDescriptorProto_msg_init = { }) }; -static const upb_MiniTableSub google_protobuf_MethodDescriptorProto_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__MethodOptions_msg_init}, +const upb_MiniTable* google__protobuf__ServiceDescriptorProto_msg_init_ptr = &google__protobuf__ServiceDescriptorProto_msg_init; +static const upb_MiniTableSubInternal google_protobuf_MethodDescriptorProto_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__MethodOptions_msg_init_ptr}, }; static const upb_MiniTableField google_protobuf_MethodDescriptorProto__fields[6] = { @@ -405,9 +420,10 @@ const upb_MiniTable google__protobuf__MethodDescriptorProto_msg_init = { #endif }; -static const upb_MiniTableSub google_protobuf_FileOptions_submsgs[3] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init}, +const upb_MiniTable* google__protobuf__MethodDescriptorProto_msg_init_ptr = &google__protobuf__MethodDescriptorProto_msg_init; +static const upb_MiniTableSubInternal google_protobuf_FileOptions_submsgs[3] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init_ptr}, {.UPB_PRIVATE(subenum) = &google_protobuf_FileOptions_OptimizeMode_enum_init}, }; @@ -478,9 +494,10 @@ const upb_MiniTable google__protobuf__FileOptions_msg_init = { }) }; -static const upb_MiniTableSub google_protobuf_MessageOptions_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init}, +const upb_MiniTable* google__protobuf__FileOptions_msg_init_ptr = &google__protobuf__FileOptions_msg_init; +static const upb_MiniTableSubInternal google_protobuf_MessageOptions_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init_ptr}, }; static const upb_MiniTableField google_protobuf_MessageOptions__fields[7] = { @@ -536,11 +553,12 @@ const upb_MiniTable google__protobuf__MessageOptions_msg_init = { }) }; -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}, +const upb_MiniTable* google__protobuf__MessageOptions_msg_init_ptr = &google__protobuf__MessageOptions_msg_init; +static const upb_MiniTableSubInternal google_protobuf_FieldOptions_submsgs[8] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__FieldOptions__EditionDefault_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__FieldOptions__FeatureSupport_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init_ptr}, {.UPB_PRIVATE(subenum) = &google_protobuf_FieldOptions_CType_enum_init}, {.UPB_PRIVATE(subenum) = &google_protobuf_FieldOptions_JSType_enum_init}, {.UPB_PRIVATE(subenum) = &google_protobuf_FieldOptions_OptionRetention_enum_init}, @@ -607,7 +625,8 @@ const upb_MiniTable google__protobuf__FieldOptions_msg_init = { }) }; -static const upb_MiniTableSub google_protobuf_FieldOptions_EditionDefault_submsgs[1] = { +const upb_MiniTable* google__protobuf__FieldOptions_msg_init_ptr = &google__protobuf__FieldOptions_msg_init; +static const upb_MiniTableSubInternal google_protobuf_FieldOptions_EditionDefault_submsgs[1] = { {.UPB_PRIVATE(subenum) = &google_protobuf_Edition_enum_init}, }; @@ -625,7 +644,8 @@ const upb_MiniTable google__protobuf__FieldOptions__EditionDefault_msg_init = { #endif }; -static const upb_MiniTableSub google_protobuf_FieldOptions_FeatureSupport_submsgs[3] = { +const upb_MiniTable* google__protobuf__FieldOptions__EditionDefault_msg_init_ptr = &google__protobuf__FieldOptions__EditionDefault_msg_init; +static const upb_MiniTableSubInternal 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}, @@ -647,9 +667,10 @@ const upb_MiniTable google__protobuf__FieldOptions__FeatureSupport_msg_init = { #endif }; -static const upb_MiniTableSub google_protobuf_OneofOptions_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init}, +const upb_MiniTable* google__protobuf__FieldOptions__FeatureSupport_msg_init_ptr = &google__protobuf__FieldOptions__FeatureSupport_msg_init; +static const upb_MiniTableSubInternal google_protobuf_OneofOptions_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init_ptr}, }; static const upb_MiniTableField google_protobuf_OneofOptions__fields[2] = { @@ -700,9 +721,10 @@ const upb_MiniTable google__protobuf__OneofOptions_msg_init = { }) }; -static const upb_MiniTableSub google_protobuf_EnumOptions_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init}, +const upb_MiniTable* google__protobuf__OneofOptions_msg_init_ptr = &google__protobuf__OneofOptions_msg_init; +static const upb_MiniTableSubInternal google_protobuf_EnumOptions_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init_ptr}, }; static const upb_MiniTableField google_protobuf_EnumOptions__fields[5] = { @@ -756,10 +778,11 @@ const upb_MiniTable google__protobuf__EnumOptions_msg_init = { }) }; -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}, +const upb_MiniTable* google__protobuf__EnumOptions_msg_init_ptr = &google__protobuf__EnumOptions_msg_init; +static const upb_MiniTableSubInternal google_protobuf_EnumValueOptions_submsgs[3] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__FieldOptions__FeatureSupport_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init_ptr}, }; static const upb_MiniTableField google_protobuf_EnumValueOptions__fields[5] = { @@ -813,9 +836,10 @@ const upb_MiniTable google__protobuf__EnumValueOptions_msg_init = { }) }; -static const upb_MiniTableSub google_protobuf_ServiceOptions_submsgs[2] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init}, +const upb_MiniTable* google__protobuf__EnumValueOptions_msg_init_ptr = &google__protobuf__EnumValueOptions_msg_init; +static const upb_MiniTableSubInternal google_protobuf_ServiceOptions_submsgs[2] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init_ptr}, }; static const upb_MiniTableField google_protobuf_ServiceOptions__fields[3] = { @@ -867,9 +891,10 @@ const upb_MiniTable google__protobuf__ServiceOptions_msg_init = { }) }; -static const upb_MiniTableSub google_protobuf_MethodOptions_submsgs[3] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init}, - {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init}, +const upb_MiniTable* google__protobuf__ServiceOptions_msg_init_ptr = &google__protobuf__ServiceOptions_msg_init; +static const upb_MiniTableSubInternal google_protobuf_MethodOptions_submsgs[3] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init_ptr}, {.UPB_PRIVATE(subenum) = &google_protobuf_MethodOptions_IdempotencyLevel_enum_init}, }; @@ -923,8 +948,9 @@ const upb_MiniTable google__protobuf__MethodOptions_msg_init = { }) }; -static const upb_MiniTableSub google_protobuf_UninterpretedOption_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption__NamePart_msg_init}, +const upb_MiniTable* google__protobuf__MethodOptions_msg_init_ptr = &google__protobuf__MethodOptions_msg_init; +static const upb_MiniTableSubInternal google_protobuf_UninterpretedOption_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption__NamePart_msg_init_ptr}, }; static const upb_MiniTableField google_protobuf_UninterpretedOption__fields[7] = { @@ -952,6 +978,7 @@ const upb_MiniTable google__protobuf__UninterpretedOption_msg_init = { }) }; +const upb_MiniTable* google__protobuf__UninterpretedOption_msg_init_ptr = &google__protobuf__UninterpretedOption_msg_init; static const upb_MiniTableField google_protobuf_UninterpretedOption_NamePart__fields[2] = { {1, UPB_SIZE(12, 16), 64, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, {2, 9, 65, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, @@ -966,7 +993,8 @@ const upb_MiniTable google__protobuf__UninterpretedOption__NamePart_msg_init = { #endif }; -static const upb_MiniTableSub google_protobuf_FeatureSet_submsgs[6] = { +const upb_MiniTable* google__protobuf__UninterpretedOption__NamePart_msg_init_ptr = &google__protobuf__UninterpretedOption__NamePart_msg_init; +static const upb_MiniTableSubInternal google_protobuf_FeatureSet_submsgs[6] = { {.UPB_PRIVATE(subenum) = &google_protobuf_FeatureSet_FieldPresence_enum_init}, {.UPB_PRIVATE(subenum) = &google_protobuf_FeatureSet_EnumType_enum_init}, {.UPB_PRIVATE(subenum) = &google_protobuf_FeatureSet_RepeatedFieldEncoding_enum_init}, @@ -993,8 +1021,9 @@ const upb_MiniTable google__protobuf__FeatureSet_msg_init = { #endif }; -static const upb_MiniTableSub google_protobuf_FeatureSetDefaults_submsgs[3] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init}, +const upb_MiniTable* google__protobuf__FeatureSet_msg_init_ptr = &google__protobuf__FeatureSet_msg_init; +static const upb_MiniTableSubInternal google_protobuf_FeatureSetDefaults_submsgs[3] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init_ptr}, {.UPB_PRIVATE(subenum) = &google_protobuf_Edition_enum_init}, {.UPB_PRIVATE(subenum) = &google_protobuf_Edition_enum_init}, }; @@ -1018,9 +1047,10 @@ const upb_MiniTable google__protobuf__FeatureSetDefaults_msg_init = { }) }; -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}, +const upb_MiniTable* google__protobuf__FeatureSetDefaults_msg_init_ptr = &google__protobuf__FeatureSetDefaults_msg_init; +static const upb_MiniTableSubInternal google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_submsgs[3] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr}, + {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr}, {.UPB_PRIVATE(subenum) = &google_protobuf_Edition_enum_init}, }; @@ -1039,8 +1069,9 @@ const upb_MiniTable google__protobuf__FeatureSetDefaults__FeatureSetEditionDefau #endif }; -static const upb_MiniTableSub google_protobuf_SourceCodeInfo_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__SourceCodeInfo__Location_msg_init}, +const upb_MiniTable* google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init_ptr = &google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init; +static const upb_MiniTableSubInternal google_protobuf_SourceCodeInfo_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__SourceCodeInfo__Location_msg_init_ptr}, }; static const upb_MiniTableField google_protobuf_SourceCodeInfo__fields[1] = { @@ -1060,6 +1091,7 @@ const upb_MiniTable google__protobuf__SourceCodeInfo_msg_init = { }) }; +const upb_MiniTable* google__protobuf__SourceCodeInfo_msg_init_ptr = &google__protobuf__SourceCodeInfo_msg_init; static const upb_MiniTableField google_protobuf_SourceCodeInfo_Location__fields[5] = { {1, 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)}, {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, @@ -1087,8 +1119,9 @@ const upb_MiniTable google__protobuf__SourceCodeInfo__Location_msg_init = { }) }; -static const upb_MiniTableSub google_protobuf_GeneratedCodeInfo_submsgs[1] = { - {.UPB_PRIVATE(submsg) = &google__protobuf__GeneratedCodeInfo__Annotation_msg_init}, +const upb_MiniTable* google__protobuf__SourceCodeInfo__Location_msg_init_ptr = &google__protobuf__SourceCodeInfo__Location_msg_init; +static const upb_MiniTableSubInternal google_protobuf_GeneratedCodeInfo_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__GeneratedCodeInfo__Annotation_msg_init_ptr}, }; static const upb_MiniTableField google_protobuf_GeneratedCodeInfo__fields[1] = { @@ -1108,7 +1141,8 @@ const upb_MiniTable google__protobuf__GeneratedCodeInfo_msg_init = { }) }; -static const upb_MiniTableSub google_protobuf_GeneratedCodeInfo_Annotation_submsgs[1] = { +const upb_MiniTable* google__protobuf__GeneratedCodeInfo_msg_init_ptr = &google__protobuf__GeneratedCodeInfo_msg_init; +static const upb_MiniTableSubInternal google_protobuf_GeneratedCodeInfo_Annotation_submsgs[1] = { {.UPB_PRIVATE(subenum) = &google_protobuf_GeneratedCodeInfo_Annotation_Semantic_enum_init}, }; @@ -1133,42 +1167,7 @@ const upb_MiniTable google__protobuf__GeneratedCodeInfo__Annotation_msg_init = { }) }; -static const upb_MiniTable *messages_layout[33] = { - &google__protobuf__FileDescriptorSet_msg_init, - &google__protobuf__FileDescriptorProto_msg_init, - &google__protobuf__DescriptorProto_msg_init, - &google__protobuf__DescriptorProto__ExtensionRange_msg_init, - &google__protobuf__DescriptorProto__ReservedRange_msg_init, - &google__protobuf__ExtensionRangeOptions_msg_init, - &google__protobuf__ExtensionRangeOptions__Declaration_msg_init, - &google__protobuf__FieldDescriptorProto_msg_init, - &google__protobuf__OneofDescriptorProto_msg_init, - &google__protobuf__EnumDescriptorProto_msg_init, - &google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init, - &google__protobuf__EnumValueDescriptorProto_msg_init, - &google__protobuf__ServiceDescriptorProto_msg_init, - &google__protobuf__MethodDescriptorProto_msg_init, - &google__protobuf__FileOptions_msg_init, - &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, - &google__protobuf__ServiceOptions_msg_init, - &google__protobuf__MethodOptions_msg_init, - &google__protobuf__UninterpretedOption_msg_init, - &google__protobuf__UninterpretedOption__NamePart_msg_init, - &google__protobuf__FeatureSet_msg_init, - &google__protobuf__FeatureSetDefaults_msg_init, - &google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init, - &google__protobuf__SourceCodeInfo_msg_init, - &google__protobuf__SourceCodeInfo__Location_msg_init, - &google__protobuf__GeneratedCodeInfo_msg_init, - &google__protobuf__GeneratedCodeInfo__Annotation_msg_init, -}; - +const upb_MiniTable* google__protobuf__GeneratedCodeInfo__Annotation_msg_init_ptr = &google__protobuf__GeneratedCodeInfo__Annotation_msg_init; const upb_MiniTableEnum google_protobuf_Edition_enum_init = { 64, 9, @@ -1331,6 +1330,42 @@ const upb_MiniTableEnum google_protobuf_MethodOptions_IdempotencyLevel_enum_init }, }; +static const upb_MiniTable *messages_layout[33] = { + &google__protobuf__FileDescriptorSet_msg_init, + &google__protobuf__FileDescriptorProto_msg_init, + &google__protobuf__DescriptorProto_msg_init, + &google__protobuf__DescriptorProto__ExtensionRange_msg_init, + &google__protobuf__DescriptorProto__ReservedRange_msg_init, + &google__protobuf__ExtensionRangeOptions_msg_init, + &google__protobuf__ExtensionRangeOptions__Declaration_msg_init, + &google__protobuf__FieldDescriptorProto_msg_init, + &google__protobuf__OneofDescriptorProto_msg_init, + &google__protobuf__EnumDescriptorProto_msg_init, + &google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init, + &google__protobuf__EnumValueDescriptorProto_msg_init, + &google__protobuf__ServiceDescriptorProto_msg_init, + &google__protobuf__MethodDescriptorProto_msg_init, + &google__protobuf__FileOptions_msg_init, + &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, + &google__protobuf__ServiceOptions_msg_init, + &google__protobuf__MethodOptions_msg_init, + &google__protobuf__UninterpretedOption_msg_init, + &google__protobuf__UninterpretedOption__NamePart_msg_init, + &google__protobuf__FeatureSet_msg_init, + &google__protobuf__FeatureSetDefaults_msg_init, + &google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init, + &google__protobuf__SourceCodeInfo_msg_init, + &google__protobuf__SourceCodeInfo__Location_msg_init, + &google__protobuf__GeneratedCodeInfo_msg_init, + &google__protobuf__GeneratedCodeInfo__Annotation_msg_init, +}; + static const upb_MiniTableEnum *enums_layout[17] = { &google_protobuf_Edition_enum_init, &google_protobuf_ExtensionRangeOptions_VerificationState_enum_init, diff --git a/third_party/upb/upb/reflection/cmake/google/protobuf/descriptor.upb_minitable.h b/third_party/upb/upb/reflection/cmake/google/protobuf/descriptor.upb_minitable.h index f48a64df658..6cb83ecedcc 100644 --- a/third_party/upb/upb/reflection/cmake/google/protobuf/descriptor.upb_minitable.h +++ b/third_party/upb/upb/reflection/cmake/google/protobuf/descriptor.upb_minitable.h @@ -3,7 +3,8 @@ * google/protobuf/descriptor.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_MINITABLE_H_ #define GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_MINITABLE_H_ @@ -18,38 +19,71 @@ extern "C" { #endif extern const upb_MiniTable google__protobuf__FileDescriptorSet_msg_init; +extern const upb_MiniTable* google__protobuf__FileDescriptorSet_msg_init_ptr; extern const upb_MiniTable google__protobuf__FileDescriptorProto_msg_init; +extern const upb_MiniTable* google__protobuf__FileDescriptorProto_msg_init_ptr; extern const upb_MiniTable google__protobuf__DescriptorProto_msg_init; +extern const upb_MiniTable* google__protobuf__DescriptorProto_msg_init_ptr; extern const upb_MiniTable google__protobuf__DescriptorProto__ExtensionRange_msg_init; +extern const upb_MiniTable* google__protobuf__DescriptorProto__ExtensionRange_msg_init_ptr; extern const upb_MiniTable google__protobuf__DescriptorProto__ReservedRange_msg_init; +extern const upb_MiniTable* google__protobuf__DescriptorProto__ReservedRange_msg_init_ptr; extern const upb_MiniTable google__protobuf__ExtensionRangeOptions_msg_init; +extern const upb_MiniTable* google__protobuf__ExtensionRangeOptions_msg_init_ptr; extern const upb_MiniTable google__protobuf__ExtensionRangeOptions__Declaration_msg_init; +extern const upb_MiniTable* google__protobuf__ExtensionRangeOptions__Declaration_msg_init_ptr; extern const upb_MiniTable google__protobuf__FieldDescriptorProto_msg_init; +extern const upb_MiniTable* google__protobuf__FieldDescriptorProto_msg_init_ptr; extern const upb_MiniTable google__protobuf__OneofDescriptorProto_msg_init; +extern const upb_MiniTable* google__protobuf__OneofDescriptorProto_msg_init_ptr; extern const upb_MiniTable google__protobuf__EnumDescriptorProto_msg_init; +extern const upb_MiniTable* google__protobuf__EnumDescriptorProto_msg_init_ptr; extern const upb_MiniTable google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init; +extern const upb_MiniTable* google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init_ptr; extern const upb_MiniTable google__protobuf__EnumValueDescriptorProto_msg_init; +extern const upb_MiniTable* google__protobuf__EnumValueDescriptorProto_msg_init_ptr; extern const upb_MiniTable google__protobuf__ServiceDescriptorProto_msg_init; +extern const upb_MiniTable* google__protobuf__ServiceDescriptorProto_msg_init_ptr; extern const upb_MiniTable google__protobuf__MethodDescriptorProto_msg_init; +extern const upb_MiniTable* google__protobuf__MethodDescriptorProto_msg_init_ptr; extern const upb_MiniTable google__protobuf__FileOptions_msg_init; +extern const upb_MiniTable* google__protobuf__FileOptions_msg_init_ptr; extern const upb_MiniTable google__protobuf__MessageOptions_msg_init; +extern const upb_MiniTable* google__protobuf__MessageOptions_msg_init_ptr; extern const upb_MiniTable google__protobuf__FieldOptions_msg_init; +extern const upb_MiniTable* google__protobuf__FieldOptions_msg_init_ptr; extern const upb_MiniTable google__protobuf__FieldOptions__EditionDefault_msg_init; +extern const upb_MiniTable* google__protobuf__FieldOptions__EditionDefault_msg_init_ptr; extern const upb_MiniTable google__protobuf__FieldOptions__FeatureSupport_msg_init; +extern const upb_MiniTable* google__protobuf__FieldOptions__FeatureSupport_msg_init_ptr; extern const upb_MiniTable google__protobuf__OneofOptions_msg_init; +extern const upb_MiniTable* google__protobuf__OneofOptions_msg_init_ptr; extern const upb_MiniTable google__protobuf__EnumOptions_msg_init; +extern const upb_MiniTable* google__protobuf__EnumOptions_msg_init_ptr; extern const upb_MiniTable google__protobuf__EnumValueOptions_msg_init; +extern const upb_MiniTable* google__protobuf__EnumValueOptions_msg_init_ptr; extern const upb_MiniTable google__protobuf__ServiceOptions_msg_init; +extern const upb_MiniTable* google__protobuf__ServiceOptions_msg_init_ptr; extern const upb_MiniTable google__protobuf__MethodOptions_msg_init; +extern const upb_MiniTable* google__protobuf__MethodOptions_msg_init_ptr; extern const upb_MiniTable google__protobuf__UninterpretedOption_msg_init; +extern const upb_MiniTable* google__protobuf__UninterpretedOption_msg_init_ptr; extern const upb_MiniTable google__protobuf__UninterpretedOption__NamePart_msg_init; +extern const upb_MiniTable* google__protobuf__UninterpretedOption__NamePart_msg_init_ptr; extern const upb_MiniTable google__protobuf__FeatureSet_msg_init; +extern const upb_MiniTable* google__protobuf__FeatureSet_msg_init_ptr; extern const upb_MiniTable google__protobuf__FeatureSetDefaults_msg_init; +extern const upb_MiniTable* google__protobuf__FeatureSetDefaults_msg_init_ptr; extern const upb_MiniTable google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init; +extern const upb_MiniTable* google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init_ptr; extern const upb_MiniTable google__protobuf__SourceCodeInfo_msg_init; +extern const upb_MiniTable* google__protobuf__SourceCodeInfo_msg_init_ptr; extern const upb_MiniTable google__protobuf__SourceCodeInfo__Location_msg_init; +extern const upb_MiniTable* google__protobuf__SourceCodeInfo__Location_msg_init_ptr; extern const upb_MiniTable google__protobuf__GeneratedCodeInfo_msg_init; +extern const upb_MiniTable* google__protobuf__GeneratedCodeInfo_msg_init_ptr; extern const upb_MiniTable google__protobuf__GeneratedCodeInfo__Annotation_msg_init; +extern const upb_MiniTable* google__protobuf__GeneratedCodeInfo__Annotation_msg_init_ptr; extern const upb_MiniTableEnum google_protobuf_Edition_enum_init; extern const upb_MiniTableEnum google_protobuf_ExtensionRangeOptions_VerificationState_enum_init; diff --git a/third_party/upb/upb/reflection/def.hpp b/third_party/upb/upb/reflection/def.hpp index 206f5db7442..452ddc6e326 100644 --- a/third_party/upb/upb/reflection/def.hpp +++ b/third_party/upb/upb/reflection/def.hpp @@ -61,6 +61,13 @@ class FieldDefPtr { return upb_FieldDef_MiniTable(ptr_); } + std::string MiniDescriptorEncode() const { + upb::Arena arena; + upb_StringView md; + upb_FieldDef_MiniDescriptorEncode(ptr_, arena.ptr(), &md); + return std::string(md.data, md.size); + } + const UPB_DESC(FieldOptions) * options() const { return upb_FieldDef_Options(ptr_); } @@ -105,6 +112,7 @@ class FieldDefPtr { OneofDefPtr real_containing_oneof() const; // Convenient field type tests. + bool IsEnum() const { return upb_FieldDef_IsEnum(ptr_); } bool IsSubMessage() const { return upb_FieldDef_IsSubMessage(ptr_); } bool IsString() const { return upb_FieldDef_IsString(ptr_); } bool IsSequence() const { return upb_FieldDef_IsRepeated(ptr_); } diff --git a/third_party/upb/upb/reflection/field_def.c b/third_party/upb/upb/reflection/field_def.c index 6bc636ad7d9..9f2775b8699 100644 --- a/third_party/upb/upb/reflection/field_def.c +++ b/third_party/upb/upb/reflection/field_def.c @@ -208,11 +208,11 @@ upb_MessageValue upb_FieldDef_Default(const upb_FieldDef* f) { } const upb_MessageDef* upb_FieldDef_MessageSubDef(const upb_FieldDef* f) { - return upb_FieldDef_CType(f) == kUpb_CType_Message ? f->sub.msgdef : NULL; + return upb_FieldDef_IsSubMessage(f) ? f->sub.msgdef : NULL; } const upb_EnumDef* upb_FieldDef_EnumSubDef(const upb_FieldDef* f) { - return upb_FieldDef_CType(f) == kUpb_CType_Enum ? f->sub.enumdef : NULL; + return upb_FieldDef_IsEnum(f) ? f->sub.enumdef : NULL; } const upb_MiniTableField* upb_FieldDef_MiniTable(const upb_FieldDef* f) { @@ -309,8 +309,11 @@ bool upb_FieldDef_HasDefault(const upb_FieldDef* f) { return f->has_default; } bool upb_FieldDef_HasPresence(const upb_FieldDef* f) { return f->has_presence; } bool upb_FieldDef_HasSubDef(const upb_FieldDef* f) { - return upb_FieldDef_IsSubMessage(f) || - upb_FieldDef_CType(f) == kUpb_CType_Enum; + return upb_FieldDef_IsSubMessage(f) || upb_FieldDef_IsEnum(f); +} + +bool upb_FieldDef_IsEnum(const upb_FieldDef* f) { + return upb_FieldDef_CType(f) == kUpb_CType_Enum; } bool upb_FieldDef_IsMap(const upb_FieldDef* f) { @@ -645,7 +648,7 @@ static void _upb_FieldDef_Create(upb_DefBuilder* ctx, const char* prefix, f->full_name); } - if (oneof_index >= upb_MessageDef_OneofCount(m)) { + if (oneof_index < 0 || oneof_index >= upb_MessageDef_OneofCount(m)) { _upb_DefBuilder_Errf(ctx, "oneof_index out of range (%s)", f->full_name); } diff --git a/third_party/upb/upb/reflection/field_def.h b/third_party/upb/upb/reflection/field_def.h index a4019a0aa02..98f4a875d05 100644 --- a/third_party/upb/upb/reflection/field_def.h +++ b/third_party/upb/upb/reflection/field_def.h @@ -45,6 +45,7 @@ bool upb_FieldDef_HasOptions(const upb_FieldDef* f); UPB_API bool upb_FieldDef_HasPresence(const upb_FieldDef* f); bool upb_FieldDef_HasSubDef(const upb_FieldDef* f); uint32_t upb_FieldDef_Index(const upb_FieldDef* f); +UPB_API bool upb_FieldDef_IsEnum(const upb_FieldDef* f); bool upb_FieldDef_IsExtension(const upb_FieldDef* f); UPB_API bool upb_FieldDef_IsMap(const upb_FieldDef* f); bool upb_FieldDef_IsOptional(const upb_FieldDef* f); diff --git a/third_party/upb/upb/reflection/internal/upb_edition_defaults.h b/third_party/upb/upb/reflection/internal/upb_edition_defaults.h index 9c87e3c3816..2ccfb533862 100644 --- a/third_party/upb/upb/reflection/internal/upb_edition_defaults.h +++ b/third_party/upb/upb/reflection/internal/upb_edition_defaults.h @@ -13,7 +13,7 @@ // features. This is used for feature resolution under Editions. // NOLINTBEGIN // clang-format off -#define UPB_INTERNAL_UPB_EDITION_DEFAULTS "\n\023\030\346\007\"\000*\014\010\001\020\002\030\002 \003(\0010\002\n\023\030\347\007\"\000*\014\010\002\020\001\030\001 \002(\0010\001\n\023\030\350\007\"\014\010\001\020\001\030\001 \002(\0010\001*\000 \346\007(\350\007" +#define UPB_INTERNAL_UPB_EDITION_DEFAULTS "\n\023\030\204\007\"\000*\014\010\001\020\002\030\002 \003(\0010\002\n\023\030\347\007\"\000*\014\010\002\020\001\030\001 \002(\0010\001\n\023\030\350\007\"\014\010\001\020\001\030\001 \002(\0010\001*\000 \346\007(\350\007" // clang-format on // NOLINTEND diff --git a/third_party/upb/upb/reflection/message.c b/third_party/upb/upb/reflection/message.c index b0c4a401c31..43c7578a87d 100644 --- a/third_party/upb/upb/reflection/message.c +++ b/third_party/upb/upb/reflection/message.c @@ -41,8 +41,8 @@ bool upb_Message_HasFieldByDef(const upb_Message* msg, const upb_FieldDef* f) { } } -const upb_FieldDef* upb_Message_WhichOneof(const upb_Message* msg, - const upb_OneofDef* o) { +const upb_FieldDef* upb_Message_WhichOneofByDef(const upb_Message* msg, + const upb_OneofDef* o) { const upb_FieldDef* f = upb_OneofDef_Field(o, 0); if (upb_OneofDef_IsSynthetic(o)) { UPB_ASSERT(upb_OneofDef_FieldCount(o) == 1); @@ -65,6 +65,7 @@ upb_MessageValue upb_Message_GetFieldByDef(const upb_Message* msg, upb_MutableMessageValue upb_Message_Mutable(upb_Message* msg, const upb_FieldDef* f, upb_Arena* a) { + UPB_ASSERT(!upb_Message_IsFrozen(msg)); UPB_ASSERT(upb_FieldDef_IsSubMessage(f) || upb_FieldDef_IsRepeated(f)); if (upb_FieldDef_HasPresence(f) && !upb_Message_HasFieldByDef(msg, f)) { // We need to skip the upb_Message_GetFieldByDef() call in this case. @@ -103,6 +104,7 @@ make: bool upb_Message_SetFieldByDef(upb_Message* msg, const upb_FieldDef* f, upb_MessageValue val, upb_Arena* a) { + UPB_ASSERT(!upb_Message_IsFrozen(msg)); const upb_MiniTableField* m_f = upb_FieldDef_MiniTable(f); if (upb_MiniTableField_IsExtension(m_f)) { @@ -115,6 +117,7 @@ bool upb_Message_SetFieldByDef(upb_Message* msg, const upb_FieldDef* f, } void upb_Message_ClearFieldByDef(upb_Message* msg, const upb_FieldDef* f) { + UPB_ASSERT(!upb_Message_IsFrozen(msg)); const upb_MiniTableField* m_f = upb_FieldDef_MiniTable(f); if (upb_MiniTableField_IsExtension(m_f)) { @@ -125,6 +128,7 @@ void upb_Message_ClearFieldByDef(upb_Message* msg, const upb_FieldDef* f) { } void upb_Message_ClearByDef(upb_Message* msg, const upb_MessageDef* m) { + UPB_ASSERT(!upb_Message_IsFrozen(msg)); upb_Message_Clear(msg, upb_MessageDef_MiniTable(m)); } @@ -134,7 +138,7 @@ bool upb_Message_Next(const upb_Message* msg, const upb_MessageDef* m, const upb_MiniTable* mt = upb_MessageDef_MiniTable(m); size_t i = *iter; size_t n = upb_MiniTable_FieldCount(mt); - const upb_MessageValue zero = {0}; + upb_MessageValue zero = upb_MessageValue_Zero(); UPB_UNUSED(ext_pool); // Iterate over normal fields, returning the first one that is set. @@ -186,6 +190,7 @@ bool upb_Message_Next(const upb_Message* msg, const upb_MessageDef* m, bool _upb_Message_DiscardUnknown(upb_Message* msg, const upb_MessageDef* m, int depth) { + UPB_ASSERT(!upb_Message_IsFrozen(msg)); size_t iter = kUpb_Message_Begin; const upb_FieldDef* f; upb_MessageValue val; diff --git a/third_party/upb/upb/reflection/message.h b/third_party/upb/upb/reflection/message.h index b3b52d7ace5..fbe34f4d042 100644 --- a/third_party/upb/upb/reflection/message.h +++ b/third_party/upb/upb/reflection/message.h @@ -30,8 +30,8 @@ UPB_API upb_MutableMessageValue upb_Message_Mutable(upb_Message* msg, upb_Arena* a); // Returns the field that is set in the oneof, or NULL if none are set. -UPB_API const upb_FieldDef* upb_Message_WhichOneof(const upb_Message* msg, - const upb_OneofDef* o); +UPB_API const upb_FieldDef* upb_Message_WhichOneofByDef(const upb_Message* msg, + const upb_OneofDef* o); // Clear all data and unknown fields. void upb_Message_ClearByDef(upb_Message* msg, const upb_MessageDef* m); diff --git a/third_party/upb/upb/reflection/stage0/google/protobuf/descriptor.upb.h b/third_party/upb/upb/reflection/stage0/google/protobuf/descriptor.upb.h index f67d54c0a36..00f24b862a0 100644 --- a/third_party/upb/upb/reflection/stage0/google/protobuf/descriptor.upb.h +++ b/third_party/upb/upb/reflection/stage0/google/protobuf/descriptor.upb.h @@ -3,7 +3,8 @@ * google/protobuf/descriptor.proto * * Do not edit -- your changes will be discarded when the file is - * regenerated. */ + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ #ifndef GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H_ #define GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H_ diff --git a/third_party/upb/upb/test/BUILD b/third_party/upb/upb/test/BUILD index 98d00e12363..d85f03e9cae 100644 --- a/third_party/upb/upb/test/BUILD +++ b/third_party/upb/upb/test/BUILD @@ -68,7 +68,7 @@ proto_library( name = "test_proto", testonly = 1, srcs = ["test.proto"], - visibility = ["//upb:__subpackages__"], + visibility = ["//visibility:private"], ) upb_minitable_proto_library( diff --git a/third_party/upb/upb/text/BUILD b/third_party/upb/upb/text/BUILD index 0f96b2db7df..8b79887ef3b 100644 --- a/third_party/upb/upb/text/BUILD +++ b/third_party/upb/upb/text/BUILD @@ -14,23 +14,95 @@ cc_library( ], hdrs = [ "encode.h", + "options.h", ], copts = UPB_DEFAULT_COPTS, visibility = ["//visibility:public"], deps = [ - "//third_party/utf8_range", + ":internal", "//upb:base", "//upb:eps_copy_input_stream", "//upb:message", "//upb:port", "//upb:reflection", - "//upb:wire_reader", "//upb/lex", "//upb/message:internal", "//upb/message:types", ], ) +cc_library( + name = "debug", + srcs = [ + "debug_string.c", + ], + hdrs = [ + "debug_string.h", + "options.h", + ], + copts = UPB_DEFAULT_COPTS, + visibility = ["//visibility:public"], + deps = [ + ":internal", + "//upb:base", + "//upb:eps_copy_input_stream", + "//upb:message", + "//upb:mini_table", + "//upb:port", + "//upb/lex", + "//upb/message:internal", + "//upb/message:iterator", + "//upb/message:types", + "//upb/mini_table:internal", + ], +) + +cc_library( + name = "internal", + srcs = [ + "internal/encode.c", + ], + hdrs = [ + "internal/encode.h", + "options.h", + ], + copts = UPB_DEFAULT_COPTS, + visibility = ["//visibility:public"], + deps = [ + "//third_party/utf8_range", + "//upb:base", + "//upb:eps_copy_input_stream", + "//upb:message", + "//upb:port", + "//upb:wire_reader", + "//upb/lex", + "//upb/message:internal", + ], +) + +cc_test( + name = "encode_debug_test", + srcs = [ + "encode_debug_test.cc", + ], + deps = [ + ":debug", + "//upb:base", + "//upb:eps_copy_input_stream", + "//upb:mem", + "//upb:message", + "//upb:mini_table", + "//upb:port", + "//upb:wire_reader", + "//upb/message:internal", + "//upb/test:test_proto_upb_minitable", + "//upb/test:test_upb_proto", + "@com_google_absl//absl/log:absl_log", + "@com_google_googletest//:gtest", + "@com_google_googletest//:gtest_main", + ], +) + # begin:github_only filegroup( name = "source_files", diff --git a/third_party/upb/upb/text/debug_string.c b/third_party/upb/upb/text/debug_string.c new file mode 100644 index 00000000000..731cd1cfe0d --- /dev/null +++ b/third_party/upb/upb/text/debug_string.c @@ -0,0 +1,235 @@ +// Protocol Buffers - Google's data interchange format +// Copyright 2024 Google LLC. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd + +#include "upb/text/debug_string.h" + +#include +#include +#include +#include +#include + +#include "upb/base/descriptor_constants.h" +#include "upb/message/array.h" +#include "upb/message/internal/iterator.h" +#include "upb/message/internal/map_entry.h" +#include "upb/message/internal/map_sorter.h" +#include "upb/message/map.h" +#include "upb/message/message.h" +#include "upb/message/value.h" +#include "upb/mini_table/extension.h" +#include "upb/mini_table/field.h" +#include "upb/mini_table/internal/field.h" +#include "upb/mini_table/internal/message.h" +#include "upb/mini_table/message.h" +#include "upb/text/internal/encode.h" +#include "upb/wire/eps_copy_input_stream.h" + +// Must be last. +#include "upb/port/def.inc" + +static void _upb_MessageDebugString(txtenc* e, const upb_Message* msg, + const upb_MiniTable* mt); + +static void _upb_FieldDebugString(txtenc* e, upb_MessageValue val, + const upb_MiniTableField* f, + const upb_MiniTable* mt, const char* label, + const upb_MiniTableExtension* ext) { + UPB_PRIVATE(_upb_TextEncode_Indent)(e); + const upb_CType ctype = upb_MiniTableField_CType(f); + const bool is_ext = upb_MiniTableField_IsExtension(f); + char number[10]; // A 32-bit integer can hold up to 10 digits. + snprintf(number, sizeof(number), "%" PRIu32, upb_MiniTableField_Number(f)); + // label is to pass down whether we're dealing with a "key" of a map or + // a "value" of a map. + if (!label) label = number; + + if (is_ext) { + UPB_PRIVATE(_upb_TextEncode_Printf)(e, "[%s]", label); + } else { + UPB_PRIVATE(_upb_TextEncode_Printf)(e, "%s", label); + } + + if (ctype == kUpb_CType_Message) { + UPB_PRIVATE(_upb_TextEncode_Printf)(e, " {"); + UPB_PRIVATE(_upb_TextEncode_EndField)(e); + e->indent_depth++; + const upb_MiniTable* subm = ext ? upb_MiniTableExtension_GetSubMessage(ext) + : upb_MiniTable_SubMessage(mt, f); + _upb_MessageDebugString(e, val.msg_val, subm); + e->indent_depth--; + UPB_PRIVATE(_upb_TextEncode_Indent)(e); + UPB_PRIVATE(_upb_TextEncode_PutStr)(e, "}"); + UPB_PRIVATE(_upb_TextEncode_EndField)(e); + return; + } + + UPB_PRIVATE(_upb_TextEncode_Printf)(e, ": "); + + if (ctype == + kUpb_CType_Enum) { // Enum has to be processed separately because of + // divergent behavior between encoders + UPB_PRIVATE(_upb_TextEncode_Printf)(e, "%" PRId32, val.int32_val); + } else { + UPB_PRIVATE(_upb_TextEncode_Scalar)(e, val, ctype); + } + + UPB_PRIVATE(_upb_TextEncode_EndField)(e); +} + +/* + * Arrays print as simple repeated elements, eg. + * + * 5: 1 + * 5: 2 + * 5: 3 + */ +static void _upb_ArrayDebugString(txtenc* e, const upb_Array* arr, + const upb_MiniTableField* f, + const upb_MiniTable* mt, + const upb_MiniTableExtension* ext) { + for (size_t i = 0, n = upb_Array_Size(arr); i < n; i++) { + _upb_FieldDebugString(e, upb_Array_Get(arr, i), f, mt, NULL, ext); + } +} + +static void _upb_MapEntryDebugString(txtenc* e, upb_MessageValue key, + upb_MessageValue val, + const upb_MiniTableField* f, + const upb_MiniTable* mt) { + const upb_MiniTable* entry = upb_MiniTable_SubMessage(mt, f); + const upb_MiniTableField* key_f = upb_MiniTable_MapKey(entry); + const upb_MiniTableField* val_f = upb_MiniTable_MapValue(entry); + + UPB_PRIVATE(_upb_TextEncode_Indent)(e); + UPB_PRIVATE(_upb_TextEncode_Printf)(e, "%u {", upb_MiniTableField_Number(f)); + UPB_PRIVATE(_upb_TextEncode_EndField)(e); + e->indent_depth++; + + _upb_FieldDebugString(e, key, key_f, entry, "key", NULL); + _upb_FieldDebugString(e, val, val_f, entry, "value", NULL); + + e->indent_depth--; + UPB_PRIVATE(_upb_TextEncode_Indent)(e); + UPB_PRIVATE(_upb_TextEncode_PutStr)(e, "}"); + UPB_PRIVATE(_upb_TextEncode_EndField)(e); +} + +/* + * Maps print as messages of key/value, etc. + * + * 1 { + * key: "abc" + * value: 123 + * } + * 2 { + * key: "def" + * value: 456 + * } + */ +static void _upb_MapDebugString(txtenc* e, const upb_Map* map, + const upb_MiniTableField* f, + const upb_MiniTable* mt) { + if (e->options & UPB_TXTENC_NOSORT) { + size_t iter = kUpb_Map_Begin; + upb_MessageValue key, val; + while (upb_Map_Next(map, &key, &val, &iter)) { + _upb_MapEntryDebugString(e, key, val, f, mt); + } + } else { + if (upb_Map_Size(map) == 0) return; + + const upb_MiniTable* entry = upb_MiniTable_SubMessage(mt, f); + const upb_MiniTableField* key_f = upb_MiniTable_GetFieldByIndex(entry, 0); + _upb_sortedmap sorted; + upb_MapEntry ent; + + _upb_mapsorter_pushmap(&e->sorter, upb_MiniTableField_Type(key_f), map, + &sorted); + while (_upb_sortedmap_next(&e->sorter, map, &sorted, &ent)) { + upb_MessageValue key, val; + memcpy(&key, &ent.k, sizeof(key)); + memcpy(&val, &ent.v, sizeof(val)); + _upb_MapEntryDebugString(e, key, val, f, mt); + } + _upb_mapsorter_popmap(&e->sorter, &sorted); + } +} + +static void _upb_MessageDebugString(txtenc* e, const upb_Message* msg, + const upb_MiniTable* mt) { + size_t iter = kUpb_BaseField_Begin; + const upb_MiniTableField* f; + upb_MessageValue val; + + // Base fields will be printed out first, followed by extension fields, and + // finally unknown fields. + + while (UPB_PRIVATE(_upb_Message_NextBaseField)(msg, mt, &f, &val, &iter)) { + if (upb_MiniTableField_IsMap(f)) { + _upb_MapDebugString(e, val.map_val, f, mt); + } else if (upb_MiniTableField_IsArray(f)) { + // ext set to NULL as we're not dealing with extensions yet + _upb_ArrayDebugString(e, val.array_val, f, mt, NULL); + } else { + // ext set to NULL as we're not dealing with extensions yet + // label set to NULL as we're not currently working with a MapEntry + _upb_FieldDebugString(e, val, f, mt, NULL, NULL); + } + } + + const upb_MiniTableExtension* ext; + upb_MessageValue val_ext; + iter = kUpb_Extension_Begin; + while ( + UPB_PRIVATE(_upb_Message_NextExtension)(msg, mt, &ext, &val_ext, &iter)) { + const upb_MiniTableField* f = &ext->UPB_PRIVATE(field); + // It is not sufficient to only pass |f| as we lose valuable information + // about sub-messages. It is required that we pass |ext|. + if (upb_MiniTableField_IsMap(f)) { + UPB_UNREACHABLE(); // Maps cannot be extensions. + break; + } else if (upb_MiniTableField_IsArray(f)) { + _upb_ArrayDebugString(e, val_ext.array_val, f, mt, ext); + } else { + // label set to NULL as we're not currently working with a MapEntry + _upb_FieldDebugString(e, val_ext, f, mt, NULL, ext); + } + } + + if ((e->options & UPB_TXTENC_SKIPUNKNOWN) == 0) { + size_t size; + const char* ptr = upb_Message_GetUnknown(msg, &size); + if (size != 0) { + char* start = e->ptr; + upb_EpsCopyInputStream stream; + upb_EpsCopyInputStream_Init(&stream, &ptr, size, true); + if (!UPB_PRIVATE(_upb_TextEncode_Unknown)(e, ptr, &stream, -1)) { + /* Unknown failed to parse, back up and don't print it at all. */ + e->ptr = start; + } + } + } +} + +size_t upb_DebugString(const upb_Message* msg, const upb_MiniTable* mt, + int options, char* buf, size_t size) { + txtenc e; + + e.buf = buf; + e.ptr = buf; + e.end = UPB_PTRADD(buf, size); + e.overflow = 0; + e.indent_depth = 0; + e.options = options; + e.ext_pool = NULL; + _upb_mapsorter_init(&e.sorter); + + _upb_MessageDebugString(&e, msg, mt); + _upb_mapsorter_destroy(&e.sorter); + return UPB_PRIVATE(_upb_TextEncode_Nullz)(&e, size); +} diff --git a/third_party/upb/upb/text/debug_string.h b/third_party/upb/upb/text/debug_string.h new file mode 100644 index 00000000000..cef8ad5231d --- /dev/null +++ b/third_party/upb/upb/text/debug_string.h @@ -0,0 +1,42 @@ +// Protocol Buffers - Google's data interchange format +// Copyright 2024 Google LLC. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd + +#ifndef UPB_TEXT_ENCODE_DEBUG_H_ +#define UPB_TEXT_ENCODE_DEBUG_H_ + +#include + +#include "upb/message/message.h" +#include "upb/mini_table/message.h" +#include "upb/text/options.h" // IWYU pragma: export + +// Must be last. +#include "upb/port/def.inc" + +#ifdef __cplusplus +extern "C" { +#endif + +/* Encodes the given |msg| to a psuedo-text format: Instead of printing field + * name to value entries, it will print field number to value entries; much like + * how unknown fields are printed in upb_TextEncode in this directory's + * encode.h. |mt| should correspond to the |msg|'s minitable. + * + * Output is placed in the given buffer, and always NULL-terminated. The output + * size (excluding NULL) iss returned. This means that a return value >= |size| + * implies that the output was truncated. (These are the same semantics as + * snprintf()). */ +UPB_API size_t upb_DebugString(const upb_Message* msg, const upb_MiniTable* mt, + int options, char* buf, size_t size); + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#include "upb/port/undef.inc" + +#endif /* UPB_TEXT_ENCODE_DEBUG_H_ */ diff --git a/third_party/upb/upb/text/encode.c b/third_party/upb/upb/text/encode.c index 055d005f580..9e3a5356c52 100644 --- a/third_party/upb/upb/text/encode.c +++ b/third_party/upb/upb/text/encode.c @@ -7,10 +7,9 @@ #include "upb/text/encode.h" -#include -#include #include #include +#include #include #include @@ -23,213 +22,32 @@ #include "upb/message/map.h" #include "upb/message/message.h" #include "upb/message/value.h" -#include "upb/port/vsnprintf_compat.h" #include "upb/reflection/def.h" #include "upb/reflection/message.h" +#include "upb/text/internal/encode.h" #include "upb/wire/eps_copy_input_stream.h" -#include "upb/wire/reader.h" -#include "upb/wire/types.h" -#include "utf8_range.h" // Must be last. #include "upb/port/def.inc" -typedef struct { - char *buf, *ptr, *end; - size_t overflow; - int indent_depth; - int options; - const upb_DefPool* ext_pool; - _upb_mapsorter sorter; -} txtenc; +static void _upb_TextEncode_Msg(txtenc* e, const upb_Message* msg, + const upb_MessageDef* m); -static void txtenc_msg(txtenc* e, const upb_Message* msg, - const upb_MessageDef* m); - -static void txtenc_putbytes(txtenc* e, const void* data, size_t len) { - size_t have = e->end - e->ptr; - if (UPB_LIKELY(have >= len)) { - memcpy(e->ptr, data, len); - e->ptr += len; - } else { - if (have) { - memcpy(e->ptr, data, have); - e->ptr += have; - } - e->overflow += (len - have); - } -} - -static void txtenc_putstr(txtenc* e, const char* str) { - txtenc_putbytes(e, str, strlen(str)); -} - -static void txtenc_printf(txtenc* e, const char* fmt, ...) { - size_t n; - size_t have = e->end - e->ptr; - va_list args; - - va_start(args, fmt); - n = _upb_vsnprintf(e->ptr, have, fmt, args); - va_end(args); - - if (UPB_LIKELY(have > n)) { - e->ptr += n; - } else { - e->ptr = UPB_PTRADD(e->ptr, have); - e->overflow += (n - have); - } -} - -static void txtenc_indent(txtenc* e) { - if ((e->options & UPB_TXTENC_SINGLELINE) == 0) { - int i = e->indent_depth; - while (i-- > 0) { - txtenc_putstr(e, " "); - } - } -} - -static void txtenc_endfield(txtenc* e) { - if (e->options & UPB_TXTENC_SINGLELINE) { - txtenc_putstr(e, " "); - } else { - txtenc_putstr(e, "\n"); - } -} - -static void txtenc_enum(int32_t val, const upb_FieldDef* f, txtenc* e) { +static void _upb_TextEncode_Enum(int32_t val, const upb_FieldDef* f, + txtenc* e) { const upb_EnumDef* e_def = upb_FieldDef_EnumSubDef(f); const upb_EnumValueDef* ev = upb_EnumDef_FindValueByNumber(e_def, val); if (ev) { - txtenc_printf(e, "%s", upb_EnumValueDef_Name(ev)); + UPB_PRIVATE(_upb_TextEncode_Printf)(e, "%s", upb_EnumValueDef_Name(ev)); } else { - txtenc_printf(e, "%" PRId32, val); - } -} - -static void txtenc_escaped(txtenc* e, unsigned char ch) { - switch (ch) { - case '\n': - txtenc_putstr(e, "\\n"); - break; - case '\r': - txtenc_putstr(e, "\\r"); - break; - case '\t': - txtenc_putstr(e, "\\t"); - break; - case '\"': - txtenc_putstr(e, "\\\""); - break; - case '\'': - txtenc_putstr(e, "\\'"); - break; - case '\\': - txtenc_putstr(e, "\\\\"); - break; - default: - txtenc_printf(e, "\\%03o", ch); - break; - } -} - -// Returns true if `ch` needs to be escaped in TextFormat, independent of any -// UTF-8 validity issues. -static bool upb_DefinitelyNeedsEscape(unsigned char ch) { - if (ch < 32) return true; - switch (ch) { - case '\"': - case '\'': - case '\\': - case 127: - return true; - } - return false; -} - -static bool upb_AsciiIsPrint(unsigned char ch) { return ch >= 32 && ch < 127; } - -// Returns true if this is a high byte that requires UTF-8 validation. If the -// UTF-8 validation fails, we must escape the byte. -static bool upb_NeedsUtf8Validation(unsigned char ch) { return ch > 127; } - -// Returns the number of bytes in the prefix of `val` that do not need escaping. -// This is like utf8_range::SpanStructurallyValid(), except that it also -// terminates at any ASCII char that needs to be escaped in TextFormat (any char -// that has `DefinitelyNeedsEscape(ch) == true`). -// -// If we could get a variant of utf8_range::SpanStructurallyValid() that could -// terminate on any of these chars, that might be more efficient, but it would -// be much more complicated to modify that heavily SIMD code. -static size_t SkipPassthroughBytes(const char* ptr, size_t size) { - for (size_t i = 0; i < size; i++) { - unsigned char uc = ptr[i]; - if (upb_DefinitelyNeedsEscape(uc)) return i; - if (upb_NeedsUtf8Validation(uc)) { - // Find the end of this region of consecutive high bytes, so that we only - // give high bytes to the UTF-8 checker. This avoids needing to perform - // a second scan of the ASCII characters looking for characters that - // need escaping. - // - // We assume that high bytes are less frequent than plain, printable ASCII - // bytes, so we accept the double-scan of high bytes. - size_t end = i + 1; - for (; end < size; end++) { - if (!upb_NeedsUtf8Validation(ptr[end])) break; - } - size_t n = end - i; - size_t ok = utf8_range_ValidPrefix(ptr + i, n); - if (ok != n) return i + ok; - i += ok - 1; - } - } - return size; -} - -static void upb_HardenedPrintString(txtenc* e, const char* ptr, size_t len) { - // Print as UTF-8, while guarding against any invalid UTF-8 in the string - // field. - // - // If in the future we have a guaranteed invariant that invalid UTF-8 will - // never be present, we could avoid the UTF-8 check here. - txtenc_putstr(e, "\""); - const char* end = ptr + len; - while (ptr < end) { - size_t n = SkipPassthroughBytes(ptr, end - ptr); - if (n != 0) { - txtenc_putbytes(e, ptr, n); - ptr += n; - if (ptr == end) break; - } - - // If repeated calls to CEscape() and PrintString() are expensive, we could - // consider batching them, at the cost of some complexity. - txtenc_escaped(e, *ptr); - ptr++; - } - txtenc_putstr(e, "\""); -} - -static void txtenc_bytes(txtenc* e, upb_StringView data) { - const char* ptr = data.data; - const char* end = ptr + data.size; - txtenc_putstr(e, "\""); - for (; ptr < end; ptr++) { - unsigned char uc = *ptr; - if (upb_AsciiIsPrint(uc)) { - txtenc_putbytes(e, ptr, 1); - } else { - txtenc_escaped(e, uc); - } + UPB_PRIVATE(_upb_TextEncode_Printf)(e, "%" PRId32, val); } - txtenc_putstr(e, "\""); } -static void txtenc_field(txtenc* e, upb_MessageValue val, - const upb_FieldDef* f) { - txtenc_indent(e); +static void _upb_TextEncode_Field(txtenc* e, upb_MessageValue val, + const upb_FieldDef* f) { + UPB_PRIVATE(_upb_TextEncode_Indent)(e); const upb_CType ctype = upb_FieldDef_CType(f); const bool is_ext = upb_FieldDef_IsExtension(f); const char* full = upb_FieldDef_FullName(f); @@ -244,68 +62,33 @@ static void txtenc_field(txtenc* e, upb_MessageValue val, // } // end:google_only if (is_ext) { - txtenc_printf(e, "[%s] {", full); + UPB_PRIVATE(_upb_TextEncode_Printf)(e, "[%s] {", full); } else { - txtenc_printf(e, "%s {", name); + UPB_PRIVATE(_upb_TextEncode_Printf)(e, "%s {", name); } - txtenc_endfield(e); + UPB_PRIVATE(_upb_TextEncode_EndField)(e); e->indent_depth++; - txtenc_msg(e, val.msg_val, upb_FieldDef_MessageSubDef(f)); + _upb_TextEncode_Msg(e, val.msg_val, upb_FieldDef_MessageSubDef(f)); e->indent_depth--; - txtenc_indent(e); - txtenc_putstr(e, "}"); - txtenc_endfield(e); + UPB_PRIVATE(_upb_TextEncode_Indent)(e); + UPB_PRIVATE(_upb_TextEncode_PutStr)(e, "}"); + UPB_PRIVATE(_upb_TextEncode_EndField)(e); return; } if (is_ext) { - txtenc_printf(e, "[%s]: ", full); + UPB_PRIVATE(_upb_TextEncode_Printf)(e, "[%s]: ", full); } else { - txtenc_printf(e, "%s: ", name); + UPB_PRIVATE(_upb_TextEncode_Printf)(e, "%s: ", name); } - switch (ctype) { - case kUpb_CType_Bool: - txtenc_putstr(e, val.bool_val ? "true" : "false"); - break; - case kUpb_CType_Float: { - char buf[32]; - _upb_EncodeRoundTripFloat(val.float_val, buf, sizeof(buf)); - txtenc_putstr(e, buf); - break; - } - case kUpb_CType_Double: { - char buf[32]; - _upb_EncodeRoundTripDouble(val.double_val, buf, sizeof(buf)); - txtenc_putstr(e, buf); - break; - } - case kUpb_CType_Int32: - txtenc_printf(e, "%" PRId32, val.int32_val); - break; - case kUpb_CType_UInt32: - txtenc_printf(e, "%" PRIu32, val.uint32_val); - break; - case kUpb_CType_Int64: - txtenc_printf(e, "%" PRId64, val.int64_val); - break; - case kUpb_CType_UInt64: - txtenc_printf(e, "%" PRIu64, val.uint64_val); - break; - case kUpb_CType_String: - upb_HardenedPrintString(e, val.str_val.data, val.str_val.size); - break; - case kUpb_CType_Bytes: - txtenc_bytes(e, val.str_val); - break; - case kUpb_CType_Enum: - txtenc_enum(val.int32_val, f, e); - break; - default: - UPB_UNREACHABLE(); + if (ctype == kUpb_CType_Enum) { + _upb_TextEncode_Enum(val.int32_val, f, e); + } else { + UPB_PRIVATE(_upb_TextEncode_Scalar)(e, val, ctype); } - txtenc_endfield(e); + UPB_PRIVATE(_upb_TextEncode_EndField)(e); } /* @@ -315,33 +98,34 @@ static void txtenc_field(txtenc* e, upb_MessageValue val, * foo_field: 2 * foo_field: 3 */ -static void txtenc_array(txtenc* e, const upb_Array* arr, - const upb_FieldDef* f) { +static void _upb_TextEncode_Array(txtenc* e, const upb_Array* arr, + const upb_FieldDef* f) { size_t i; size_t size = upb_Array_Size(arr); for (i = 0; i < size; i++) { - txtenc_field(e, upb_Array_Get(arr, i), f); + _upb_TextEncode_Field(e, upb_Array_Get(arr, i), f); } } -static void txtenc_mapentry(txtenc* e, upb_MessageValue key, - upb_MessageValue val, const upb_FieldDef* f) { +static void _upb_TextEncode_MapEntry(txtenc* e, upb_MessageValue key, + upb_MessageValue val, + const upb_FieldDef* f) { const upb_MessageDef* entry = upb_FieldDef_MessageSubDef(f); const upb_FieldDef* key_f = upb_MessageDef_Field(entry, 0); const upb_FieldDef* val_f = upb_MessageDef_Field(entry, 1); - txtenc_indent(e); - txtenc_printf(e, "%s {", upb_FieldDef_Name(f)); - txtenc_endfield(e); + UPB_PRIVATE(_upb_TextEncode_Indent)(e); + UPB_PRIVATE(_upb_TextEncode_Printf)(e, "%s {", upb_FieldDef_Name(f)); + UPB_PRIVATE(_upb_TextEncode_EndField)(e); e->indent_depth++; - txtenc_field(e, key, key_f); - txtenc_field(e, val, val_f); + _upb_TextEncode_Field(e, key, key_f); + _upb_TextEncode_Field(e, val, val_f); e->indent_depth--; - txtenc_indent(e); - txtenc_putstr(e, "}"); - txtenc_endfield(e); + UPB_PRIVATE(_upb_TextEncode_Indent)(e); + UPB_PRIVATE(_upb_TextEncode_PutStr)(e, "}"); + UPB_PRIVATE(_upb_TextEncode_EndField)(e); } /* @@ -356,12 +140,13 @@ static void txtenc_mapentry(txtenc* e, upb_MessageValue key, * value: 456 * } */ -static void txtenc_map(txtenc* e, const upb_Map* map, const upb_FieldDef* f) { +static void _upb_TextEncode_Map(txtenc* e, const upb_Map* map, + const upb_FieldDef* f) { if (e->options & UPB_TXTENC_NOSORT) { size_t iter = kUpb_Map_Begin; upb_MessageValue key, val; while (upb_Map_Next(map, &key, &val, &iter)) { - txtenc_mapentry(e, key, val, f); + _upb_TextEncode_MapEntry(e, key, val, f); } } else { if (upb_Map_Size(map) == 0) return; @@ -376,135 +161,25 @@ static void txtenc_map(txtenc* e, const upb_Map* map, const upb_FieldDef* f) { upb_MessageValue key, val; memcpy(&key, &ent.k, sizeof(key)); memcpy(&val, &ent.v, sizeof(val)); - txtenc_mapentry(e, key, val, f); + _upb_TextEncode_MapEntry(e, key, val, f); } _upb_mapsorter_popmap(&e->sorter, &sorted); } } -#define CHK(x) \ - do { \ - if (!(x)) { \ - return false; \ - } \ - } while (0) - -/* - * Unknown fields are printed by number. - * - * 1001: 123 - * 1002: "hello" - * 1006: 0xdeadbeef - * 1003: { - * 1: 111 - * } - */ -static const char* txtenc_unknown(txtenc* e, const char* ptr, - upb_EpsCopyInputStream* stream, - int groupnum) { - // We are guaranteed that the unknown data is valid wire format, and will not - // contain tag zero. - uint32_t end_group = groupnum > 0 - ? ((groupnum << kUpb_WireReader_WireTypeBits) | - kUpb_WireType_EndGroup) - : 0; - - while (!upb_EpsCopyInputStream_IsDone(stream, &ptr)) { - uint32_t tag; - CHK(ptr = upb_WireReader_ReadTag(ptr, &tag)); - if (tag == end_group) return ptr; - - txtenc_indent(e); - txtenc_printf(e, "%d: ", (int)upb_WireReader_GetFieldNumber(tag)); - - switch (upb_WireReader_GetWireType(tag)) { - case kUpb_WireType_Varint: { - uint64_t val; - CHK(ptr = upb_WireReader_ReadVarint(ptr, &val)); - txtenc_printf(e, "%" PRIu64, val); - break; - } - case kUpb_WireType_32Bit: { - uint32_t val; - ptr = upb_WireReader_ReadFixed32(ptr, &val); - txtenc_printf(e, "0x%08" PRIu32, val); - break; - } - case kUpb_WireType_64Bit: { - uint64_t val; - ptr = upb_WireReader_ReadFixed64(ptr, &val); - txtenc_printf(e, "0x%016" PRIu64, val); - break; - } - case kUpb_WireType_Delimited: { - int size; - char* start = e->ptr; - size_t start_overflow = e->overflow; - CHK(ptr = upb_WireReader_ReadSize(ptr, &size)); - CHK(upb_EpsCopyInputStream_CheckDataSizeAvailable(stream, ptr, size)); - - // Speculatively try to parse as message. - txtenc_putstr(e, "{"); - txtenc_endfield(e); - - // EpsCopyInputStream can't back up, so create a sub-stream for the - // speculative parse. - upb_EpsCopyInputStream sub_stream; - const char* sub_ptr = upb_EpsCopyInputStream_GetAliasedPtr(stream, ptr); - upb_EpsCopyInputStream_Init(&sub_stream, &sub_ptr, size, true); - - e->indent_depth++; - if (txtenc_unknown(e, sub_ptr, &sub_stream, -1)) { - ptr = upb_EpsCopyInputStream_Skip(stream, ptr, size); - e->indent_depth--; - txtenc_indent(e); - txtenc_putstr(e, "}"); - } else { - // Didn't work out, print as raw bytes. - e->indent_depth--; - e->ptr = start; - e->overflow = start_overflow; - const char* str = ptr; - ptr = upb_EpsCopyInputStream_ReadString(stream, &str, size, NULL); - UPB_ASSERT(ptr); - txtenc_bytes(e, (upb_StringView){.data = str, .size = size}); - } - break; - } - case kUpb_WireType_StartGroup: - txtenc_putstr(e, "{"); - txtenc_endfield(e); - e->indent_depth++; - CHK(ptr = txtenc_unknown(e, ptr, stream, - upb_WireReader_GetFieldNumber(tag))); - e->indent_depth--; - txtenc_indent(e); - txtenc_putstr(e, "}"); - break; - default: - return NULL; - } - txtenc_endfield(e); - } - - return end_group == 0 && !upb_EpsCopyInputStream_IsError(stream) ? ptr : NULL; -} - -#undef CHK - -static void txtenc_msg(txtenc* e, const upb_Message* msg, - const upb_MessageDef* m) { +static void _upb_TextEncode_Msg(txtenc* e, const upb_Message* msg, + const upb_MessageDef* m) { size_t iter = kUpb_Message_Begin; const upb_FieldDef* f; upb_MessageValue val; while (upb_Message_Next(msg, m, e->ext_pool, &f, &val, &iter)) { if (upb_FieldDef_IsMap(f)) { - txtenc_map(e, val.map_val, f); + _upb_TextEncode_Map(e, val.map_val, f); } else if (upb_FieldDef_IsRepeated(f)) { - txtenc_array(e, val.array_val, f); + _upb_TextEncode_Array(e, val.array_val, f); } else { - txtenc_field(e, val, f); + _upb_TextEncode_Field(e, val, f); } } @@ -515,7 +190,7 @@ static void txtenc_msg(txtenc* e, const upb_Message* msg, char* start = e->ptr; upb_EpsCopyInputStream stream; upb_EpsCopyInputStream_Init(&stream, &ptr, size, true); - if (!txtenc_unknown(e, ptr, &stream, -1)) { + if (!UPB_PRIVATE(_upb_TextEncode_Unknown)(e, ptr, &stream, -1)) { /* Unknown failed to parse, back up and don't print it at all. */ e->ptr = start; } @@ -523,17 +198,6 @@ static void txtenc_msg(txtenc* e, const upb_Message* msg, } } -size_t txtenc_nullz(txtenc* e, size_t size) { - size_t ret = e->ptr - e->buf + e->overflow; - - if (size > 0) { - if (e->ptr == e->end) e->ptr--; - *e->ptr = '\0'; - } - - return ret; -} - size_t upb_TextEncode(const upb_Message* msg, const upb_MessageDef* m, const upb_DefPool* ext_pool, int options, char* buf, size_t size) { @@ -548,7 +212,7 @@ size_t upb_TextEncode(const upb_Message* msg, const upb_MessageDef* m, e.ext_pool = ext_pool; _upb_mapsorter_init(&e.sorter); - txtenc_msg(&e, msg, m); + _upb_TextEncode_Msg(&e, msg, m); _upb_mapsorter_destroy(&e.sorter); - return txtenc_nullz(&e, size); + return UPB_PRIVATE(_upb_TextEncode_Nullz)(&e, size); } diff --git a/third_party/upb/upb/text/encode.h b/third_party/upb/upb/text/encode.h index 9374dc3d30a..7aea54c5511 100644 --- a/third_party/upb/upb/text/encode.h +++ b/third_party/upb/upb/text/encode.h @@ -9,6 +9,7 @@ #define UPB_TEXT_ENCODE_H_ #include "upb/reflection/def.h" +#include "upb/text/options.h" // IWYU pragma: export // Must be last. #include "upb/port/def.inc" @@ -17,17 +18,6 @@ extern "C" { #endif -enum { - // When set, prints everything on a single line. - UPB_TXTENC_SINGLELINE = 1, - - // When set, unknown fields are not printed. - UPB_TXTENC_SKIPUNKNOWN = 2, - - // When set, maps are *not* sorted (this avoids allocating tmp mem). - UPB_TXTENC_NOSORT = 4 -}; - /* Encodes the given |msg| to text format. The message's reflection is given in * |m|. The symtab in |symtab| is used to find extensions (if NULL, extensions * will not be printed). diff --git a/third_party/upb/upb/text/encode_debug_test.cc b/third_party/upb/upb/text/encode_debug_test.cc new file mode 100644 index 00000000000..b8820141a49 --- /dev/null +++ b/third_party/upb/upb/text/encode_debug_test.cc @@ -0,0 +1,63 @@ +// Protocol Buffers - Google's data interchange format +// Copyright 2024 Google LLC. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd + +#include + +#include + +#include +#include "absl/log/absl_log.h" +#include "upb/base/string_view.h" +#include "upb/base/upcast.h" +#include "upb/mem/arena.h" +#include "upb/message/message.h" +#include "upb/mini_table/message.h" +#include "upb/test/test.upb.h" +#include "upb/test/test.upb_minitable.h" +#include "upb/text/debug_string.h" + +TEST(TextNoReflection, Extensions) { + const upb_MiniTable* mt_main = upb_0test__ModelWithExtensions_msg_init_ptr; + upb_Arena* arena = upb_Arena_New(); + + upb_test_ModelExtension1* extension1 = upb_test_ModelExtension1_new(arena); + upb_test_ModelExtension1_set_str(extension1, + upb_StringView_FromString("Hello")); + + upb_test_ModelExtension2* extension2 = upb_test_ModelExtension2_new(arena); + upb_test_ModelExtension2_set_i(extension2, 5); + + upb_test_ModelWithExtensions* msg = upb_test_ModelWithExtensions_new(arena); + + upb_test_ModelExtension1_set_model_ext(msg, extension1, arena); + upb_test_ModelExtension2_set_model_ext(msg, extension2, arena); + + // Convert to a type of upb_Message* + upb_Message* input = UPB_UPCAST(msg); + // Resizing/reallocation of the buffer is not necessary since we're only + // testing that we get the expected debug string. + char* buf = new char[100]; + int options = + UPB_TXTENC_NOSORT; // Does not matter, but maps will not be sorted. + size_t size = 100; + size_t real_size = upb_DebugString(input, mt_main, options, buf, size); + ABSL_LOG(INFO) << "Buffer: \n" + << buf << "\n" + << "Size:" << real_size << "\n"; + std::string golden = R"([4135] { + 9: 5 +} +[1547] { + 25: "Hello" +} +)"; + ASSERT_EQ(buf[real_size], '\0'); + std::string str(buf); + ASSERT_EQ(buf, golden); + delete[] buf; + upb_Arena_Free(arena); +} \ No newline at end of file diff --git a/third_party/upb/upb/text/internal/encode.c b/third_party/upb/upb/text/internal/encode.c new file mode 100644 index 00000000000..fc9cc6fd273 --- /dev/null +++ b/third_party/upb/upb/text/internal/encode.c @@ -0,0 +1,180 @@ +// Protocol Buffers - Google's data interchange format +// Copyright 2024 Google LLC. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd + +#include "upb/text/internal/encode.h" + +#include +#include +#include + +#include "upb/base/descriptor_constants.h" +#include "upb/base/string_view.h" +#include "upb/lex/round_trip.h" +#include "upb/message/array.h" +#include "upb/wire/eps_copy_input_stream.h" +#include "upb/wire/reader.h" +#include "upb/wire/types.h" + +// Must be last. +#include "upb/port/def.inc" + +#define CHK(x) \ + do { \ + if (!(x)) { \ + return false; \ + } \ + } while (0) + +/* + * Unknown fields are printed by number. + * + * 1001: 123 + * 1002: "hello" + * 1006: 0xdeadbeef + * 1003: { + * 1: 111 + * } + */ +const char* UPB_PRIVATE(_upb_TextEncode_Unknown)(txtenc* e, const char* ptr, + upb_EpsCopyInputStream* stream, + int groupnum) { + // We are guaranteed that the unknown data is valid wire format, and will not + // contain tag zero. + uint32_t end_group = groupnum > 0 + ? ((groupnum << kUpb_WireReader_WireTypeBits) | + kUpb_WireType_EndGroup) + : 0; + + while (!upb_EpsCopyInputStream_IsDone(stream, &ptr)) { + uint32_t tag; + CHK(ptr = upb_WireReader_ReadTag(ptr, &tag)); + if (tag == end_group) return ptr; + + UPB_PRIVATE(_upb_TextEncode_Indent)(e); + UPB_PRIVATE(_upb_TextEncode_Printf) + (e, "%d: ", (int)upb_WireReader_GetFieldNumber(tag)); + + switch (upb_WireReader_GetWireType(tag)) { + case kUpb_WireType_Varint: { + uint64_t val; + CHK(ptr = upb_WireReader_ReadVarint(ptr, &val)); + UPB_PRIVATE(_upb_TextEncode_Printf)(e, "%" PRIu64, val); + break; + } + case kUpb_WireType_32Bit: { + uint32_t val; + ptr = upb_WireReader_ReadFixed32(ptr, &val); + UPB_PRIVATE(_upb_TextEncode_Printf)(e, "0x%08" PRIu32, val); + break; + } + case kUpb_WireType_64Bit: { + uint64_t val; + ptr = upb_WireReader_ReadFixed64(ptr, &val); + UPB_PRIVATE(_upb_TextEncode_Printf)(e, "0x%016" PRIu64, val); + break; + } + case kUpb_WireType_Delimited: { + int size; + char* start = e->ptr; + size_t start_overflow = e->overflow; + CHK(ptr = upb_WireReader_ReadSize(ptr, &size)); + CHK(upb_EpsCopyInputStream_CheckDataSizeAvailable(stream, ptr, size)); + + // Speculatively try to parse as message. + UPB_PRIVATE(_upb_TextEncode_PutStr)(e, "{"); + UPB_PRIVATE(_upb_TextEncode_EndField)(e); + + // EpsCopyInputStream can't back up, so create a sub-stream for the + // speculative parse. + upb_EpsCopyInputStream sub_stream; + const char* sub_ptr = upb_EpsCopyInputStream_GetAliasedPtr(stream, ptr); + upb_EpsCopyInputStream_Init(&sub_stream, &sub_ptr, size, true); + + e->indent_depth++; + if (UPB_PRIVATE(_upb_TextEncode_Unknown)(e, sub_ptr, &sub_stream, -1)) { + ptr = upb_EpsCopyInputStream_Skip(stream, ptr, size); + e->indent_depth--; + UPB_PRIVATE(_upb_TextEncode_Indent)(e); + UPB_PRIVATE(_upb_TextEncode_PutStr)(e, "}"); + } else { + // Didn't work out, print as raw bytes. + e->indent_depth--; + e->ptr = start; + e->overflow = start_overflow; + const char* str = ptr; + ptr = upb_EpsCopyInputStream_ReadString(stream, &str, size, NULL); + UPB_ASSERT(ptr); + UPB_PRIVATE(_upb_TextEncode_Bytes) + (e, (upb_StringView){.data = str, .size = size}); + } + break; + } + case kUpb_WireType_StartGroup: + UPB_PRIVATE(_upb_TextEncode_PutStr)(e, "{"); + UPB_PRIVATE(_upb_TextEncode_EndField)(e); + e->indent_depth++; + CHK(ptr = UPB_PRIVATE(_upb_TextEncode_Unknown)( + e, ptr, stream, upb_WireReader_GetFieldNumber(tag))); + e->indent_depth--; + UPB_PRIVATE(_upb_TextEncode_Indent)(e); + UPB_PRIVATE(_upb_TextEncode_PutStr)(e, "}"); + break; + default: + return NULL; + } + UPB_PRIVATE(_upb_TextEncode_EndField)(e); + } + + return end_group == 0 && !upb_EpsCopyInputStream_IsError(stream) ? ptr : NULL; +} + +#undef CHK + +void UPB_PRIVATE(_upb_TextEncode_Scalar)(txtenc* e, upb_MessageValue val, + upb_CType ctype) { + switch (ctype) { + case kUpb_CType_Bool: + UPB_PRIVATE(_upb_TextEncode_PutStr)(e, val.bool_val ? "true" : "false"); + break; + case kUpb_CType_Float: { + char buf[32]; + _upb_EncodeRoundTripFloat(val.float_val, buf, sizeof(buf)); + UPB_PRIVATE(_upb_TextEncode_PutStr)(e, buf); + break; + } + case kUpb_CType_Double: { + char buf[32]; + _upb_EncodeRoundTripDouble(val.double_val, buf, sizeof(buf)); + UPB_PRIVATE(_upb_TextEncode_PutStr)(e, buf); + break; + } + case kUpb_CType_Int32: + UPB_PRIVATE(_upb_TextEncode_Printf)(e, "%" PRId32, val.int32_val); + break; + case kUpb_CType_UInt32: + UPB_PRIVATE(_upb_TextEncode_Printf)(e, "%" PRIu32, val.uint32_val); + break; + case kUpb_CType_Int64: + UPB_PRIVATE(_upb_TextEncode_Printf)(e, "%" PRId64, val.int64_val); + break; + case kUpb_CType_UInt64: + UPB_PRIVATE(_upb_TextEncode_Printf)(e, "%" PRIu64, val.uint64_val); + break; + case kUpb_CType_String: + UPB_PRIVATE(_upb_HardenedPrintString) + (e, val.str_val.data, val.str_val.size); + break; + case kUpb_CType_Bytes: + UPB_PRIVATE(_upb_TextEncode_Bytes)(e, val.str_val); + break; + case kUpb_CType_Enum: + UPB_ASSERT(false); // handled separately in each encoder + break; + default: + UPB_UNREACHABLE(); + } +} \ No newline at end of file diff --git a/third_party/upb/upb/text/internal/encode.h b/third_party/upb/upb/text/internal/encode.h new file mode 100644 index 00000000000..598b2a0c45c --- /dev/null +++ b/third_party/upb/upb/text/internal/encode.h @@ -0,0 +1,240 @@ +// Protocol Buffers - Google's data interchange format +// Copyright 2023 Google LLC. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd + +#ifndef UPB_TEXT_ENCODE_INTERNAL_H_ +#define UPB_TEXT_ENCODE_INTERNAL_H_ + +#include +#include + +#include "upb/base/descriptor_constants.h" +#include "upb/base/string_view.h" +#include "upb/message/array.h" +#include "upb/message/internal/map_sorter.h" +#include "upb/port/vsnprintf_compat.h" +#include "upb/text/options.h" +#include "upb/wire/eps_copy_input_stream.h" +#include "utf8_range.h" + +// Must be last. +#include "upb/port/def.inc" + +typedef struct { + char *buf, *ptr, *end; + size_t overflow; + int indent_depth; + int options; + const struct upb_DefPool* ext_pool; + _upb_mapsorter sorter; +} txtenc; + +UPB_INLINE void UPB_PRIVATE(_upb_TextEncode_PutBytes)(txtenc* e, + const void* data, + size_t len) { + size_t have = e->end - e->ptr; + if (UPB_LIKELY(have >= len)) { + memcpy(e->ptr, data, len); + e->ptr += len; + } else { + if (have) { + memcpy(e->ptr, data, have); + e->ptr += have; + } + e->overflow += (len - have); + } +} + +UPB_INLINE void UPB_PRIVATE(_upb_TextEncode_PutStr)(txtenc* e, + const char* str) { + UPB_PRIVATE(_upb_TextEncode_PutBytes)(e, str, strlen(str)); +} + +UPB_INLINE void UPB_PRIVATE(_upb_TextEncode_Printf)(txtenc* e, const char* fmt, + ...) { + size_t n; + size_t have = e->end - e->ptr; + va_list args; + + va_start(args, fmt); + n = _upb_vsnprintf(e->ptr, have, fmt, args); + va_end(args); + + if (UPB_LIKELY(have > n)) { + e->ptr += n; + } else { + e->ptr = UPB_PTRADD(e->ptr, have); + e->overflow += (n - have); + } +} + +UPB_INLINE void UPB_PRIVATE(_upb_TextEncode_Indent)(txtenc* e) { + if ((e->options & UPB_TXTENC_SINGLELINE) == 0) { + int i = e->indent_depth; + while (i-- > 0) { + UPB_PRIVATE(_upb_TextEncode_PutStr)(e, " "); + } + } +} + +UPB_INLINE void UPB_PRIVATE(_upb_TextEncode_EndField)(txtenc* e) { + if (e->options & UPB_TXTENC_SINGLELINE) { + UPB_PRIVATE(_upb_TextEncode_PutStr)(e, " "); + } else { + UPB_PRIVATE(_upb_TextEncode_PutStr)(e, "\n"); + } +} + +UPB_INLINE void UPB_PRIVATE(_upb_TextEncode_Escaped)(txtenc* e, + unsigned char ch) { + switch (ch) { + case '\n': + UPB_PRIVATE(_upb_TextEncode_PutStr)(e, "\\n"); + break; + case '\r': + UPB_PRIVATE(_upb_TextEncode_PutStr)(e, "\\r"); + break; + case '\t': + UPB_PRIVATE(_upb_TextEncode_PutStr)(e, "\\t"); + break; + case '\"': + UPB_PRIVATE(_upb_TextEncode_PutStr)(e, "\\\""); + break; + case '\'': + UPB_PRIVATE(_upb_TextEncode_PutStr)(e, "\\'"); + break; + case '\\': + UPB_PRIVATE(_upb_TextEncode_PutStr)(e, "\\\\"); + break; + default: + UPB_PRIVATE(_upb_TextEncode_Printf)(e, "\\%03o", ch); + break; + } +} + +// Returns true if `ch` needs to be escaped in TextFormat, independent of any +// UTF-8 validity issues. +UPB_INLINE bool UPB_PRIVATE(_upb_DefinitelyNeedsEscape)(unsigned char ch) { + if (ch < 32) return true; + switch (ch) { + case '\"': + case '\'': + case '\\': + case 127: + return true; + } + return false; +} + +UPB_INLINE bool UPB_PRIVATE(_upb_AsciiIsPrint)(unsigned char ch) { + return ch >= 32 && ch < 127; +} + +// Returns true if this is a high byte that requires UTF-8 validation. If the +// UTF-8 validation fails, we must escape the byte. +UPB_INLINE bool UPB_PRIVATE(_upb_NeedsUtf8Validation)(unsigned char ch) { + return ch > 127; +} + +// Returns the number of bytes in the prefix of `val` that do not need escaping. +// This is like utf8_range::SpanStructurallyValid(), except that it also +// terminates at any ASCII char that needs to be escaped in TextFormat (any char +// that has `DefinitelyNeedsEscape(ch) == true`). +// +// If we could get a variant of utf8_range::SpanStructurallyValid() that could +// terminate on any of these chars, that might be more efficient, but it would +// be much more complicated to modify that heavily SIMD code. +UPB_INLINE size_t UPB_PRIVATE(_SkipPassthroughBytes)(const char* ptr, + size_t size) { + for (size_t i = 0; i < size; i++) { + unsigned char uc = ptr[i]; + if (UPB_PRIVATE(_upb_DefinitelyNeedsEscape)(uc)) return i; + if (UPB_PRIVATE(_upb_NeedsUtf8Validation)(uc)) { + // Find the end of this region of consecutive high bytes, so that we only + // give high bytes to the UTF-8 checker. This avoids needing to perform + // a second scan of the ASCII characters looking for characters that + // need escaping. + // + // We assume that high bytes are less frequent than plain, printable ASCII + // bytes, so we accept the double-scan of high bytes. + size_t end = i + 1; + for (; end < size; end++) { + if (!UPB_PRIVATE(_upb_NeedsUtf8Validation)(ptr[end])) break; + } + size_t n = end - i; + size_t ok = utf8_range_ValidPrefix(ptr + i, n); + if (ok != n) return i + ok; + i += ok - 1; + } + } + return size; +} + +UPB_INLINE void UPB_PRIVATE(_upb_HardenedPrintString)(txtenc* e, + const char* ptr, + size_t len) { + // Print as UTF-8, while guarding against any invalid UTF-8 in the string + // field. + // + // If in the future we have a guaranteed invariant that invalid UTF-8 will + // never be present, we could avoid the UTF-8 check here. + UPB_PRIVATE(_upb_TextEncode_PutStr)(e, "\""); + const char* end = ptr + len; + while (ptr < end) { + size_t n = UPB_PRIVATE(_SkipPassthroughBytes)(ptr, end - ptr); + if (n != 0) { + UPB_PRIVATE(_upb_TextEncode_PutBytes)(e, ptr, n); + ptr += n; + if (ptr == end) break; + } + + // If repeated calls to CEscape() and PrintString() are expensive, we could + // consider batching them, at the cost of some complexity. + UPB_PRIVATE(_upb_TextEncode_Escaped)(e, *ptr); + ptr++; + } + UPB_PRIVATE(_upb_TextEncode_PutStr)(e, "\""); +} + +UPB_INLINE void UPB_PRIVATE(_upb_TextEncode_Bytes)(txtenc* e, + upb_StringView data) { + const char* ptr = data.data; + const char* end = ptr + data.size; + UPB_PRIVATE(_upb_TextEncode_PutStr)(e, "\""); + for (; ptr < end; ptr++) { + unsigned char uc = *ptr; + if (UPB_PRIVATE(_upb_AsciiIsPrint)(uc)) { + UPB_PRIVATE(_upb_TextEncode_PutBytes)(e, ptr, 1); + } else { + UPB_PRIVATE(_upb_TextEncode_Escaped)(e, uc); + } + } + UPB_PRIVATE(_upb_TextEncode_PutStr)(e, "\""); +} + +UPB_INLINE size_t UPB_PRIVATE(_upb_TextEncode_Nullz)(txtenc* e, size_t size) { + size_t ret = e->ptr - e->buf + e->overflow; + + if (size > 0) { + if (e->ptr == e->end) e->ptr--; + *e->ptr = '\0'; + } + + return ret; +} + +const char* UPB_PRIVATE(_upb_TextEncode_Unknown)(txtenc* e, const char* ptr, + upb_EpsCopyInputStream* stream, + int groupnum); + +// Must not be called for ctype = kUpb_CType_Enum, as they require different +// handling depending on whether or not we're doing reflection-based encoding. +void UPB_PRIVATE(_upb_TextEncode_Scalar)(txtenc* e, upb_MessageValue val, + upb_CType ctype); + +#include "upb/port/undef.inc" + +#endif // UPB_TEXT_ENCODE_INTERNAL_H_ diff --git a/third_party/upb/upb/text/options.h b/third_party/upb/upb/text/options.h new file mode 100644 index 00000000000..dcaa8bd7d23 --- /dev/null +++ b/third_party/upb/upb/text/options.h @@ -0,0 +1,22 @@ +// Protocol Buffers - Google's data interchange format +// Copyright 2024 Google LLC. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd + +#ifndef UPB_TEXT_OPTIONS_H_ +#define UPB_TEXT_OPTIONS_H_ + +enum { + // When set, prints everything on a single line. + UPB_TXTENC_SINGLELINE = 1, + + // When set, unknown fields are not printed. + UPB_TXTENC_SKIPUNKNOWN = 2, + + // When set, maps are *not* sorted (this avoids allocating tmp mem). + UPB_TXTENC_NOSORT = 4 +}; + +#endif // UPB_TEXT_OPTIONS_H_ diff --git a/third_party/upb/upb/util/def_to_proto_test.cc b/third_party/upb/upb/util/def_to_proto_test.cc index 0c7b2038f4b..e14b8c4d154 100644 --- a/third_party/upb/upb/util/def_to_proto_test.cc +++ b/third_party/upb/upb/util/def_to_proto_test.cc @@ -333,4 +333,15 @@ TEST(FuzzTest, RoundTripDescriptorRegressionOneofSameName) { })pb")); } +TEST(FuzzTest, NegativeOneofIndex) { + RoundTripDescriptor(ParseTextProtoOrDie( + R"pb(file { + message_type { + name: "A" + field { name: "A" number: 0 type_name: "" oneof_index: -1 } + } + } + )pb")); +} + } // namespace upb_test diff --git a/third_party/upb/upb/wire/decode.c b/third_party/upb/upb/wire/decode.c index c703a4cd327..2cb1a44913f 100644 --- a/third_party/upb/upb/wire/decode.c +++ b/third_party/upb/upb/wire/decode.c @@ -35,7 +35,7 @@ #include "upb/mini_table/field.h" #include "upb/mini_table/internal/field.h" #include "upb/mini_table/internal/message.h" -#include "upb/mini_table/internal/size_log2.h" +#include "upb/mini_table/internal/sub.h" #include "upb/mini_table/message.h" #include "upb/mini_table/sub.h" #include "upb/port/atomic.h" @@ -97,15 +97,15 @@ typedef union { // Returns the MiniTable corresponding to a given MiniTableField // from an array of MiniTableSubs. static const upb_MiniTable* _upb_MiniTableSubs_MessageByField( - const upb_MiniTableSub* subs, const upb_MiniTableField* field) { - return upb_MiniTableSub_Message(subs[field->UPB_PRIVATE(submsg_index)]); + const upb_MiniTableSubInternal* subs, const upb_MiniTableField* field) { + return *subs[field->UPB_PRIVATE(submsg_index)].UPB_PRIVATE(submsg); } // Returns the MiniTableEnum corresponding to a given MiniTableField // from an array of MiniTableSub. static const upb_MiniTableEnum* _upb_MiniTableSubs_EnumByField( - const upb_MiniTableSub* subs, const upb_MiniTableField* field) { - return upb_MiniTableSub_Enum(subs[field->UPB_PRIVATE(submsg_index)]); + const upb_MiniTableSubInternal* subs, const upb_MiniTableField* field) { + return subs[field->UPB_PRIVATE(submsg_index)].UPB_PRIVATE(subenum); } static const char* _upb_Decoder_DecodeMessage(upb_Decoder* d, const char* ptr, @@ -240,11 +240,10 @@ static void _upb_Decoder_Munge(int type, wireval* val) { } } -static upb_Message* _upb_Decoder_NewSubMessage(upb_Decoder* d, - const upb_MiniTableSub* subs, - const upb_MiniTableField* field, - upb_TaggedMessagePtr* target) { - const upb_MiniTable* subl = _upb_MiniTableSubs_MessageByField(subs, field); +static upb_Message* _upb_Decoder_NewSubMessage2(upb_Decoder* d, + const upb_MiniTable* subl, + const upb_MiniTableField* field, + upb_TaggedMessagePtr* target) { UPB_ASSERT(subl); upb_Message* msg = _upb_Message_New(subl, &d->arena); if (!msg) _upb_Decoder_ErrorJmp(d, kUpb_DecodeStatus_OutOfMemory); @@ -265,8 +264,15 @@ static upb_Message* _upb_Decoder_NewSubMessage(upb_Decoder* d, return msg; } +static upb_Message* _upb_Decoder_NewSubMessage( + upb_Decoder* d, const upb_MiniTableSubInternal* subs, + const upb_MiniTableField* field, upb_TaggedMessagePtr* target) { + const upb_MiniTable* subl = _upb_MiniTableSubs_MessageByField(subs, field); + return _upb_Decoder_NewSubMessage2(d, subl, field, target); +} + static upb_Message* _upb_Decoder_ReuseSubMessage( - upb_Decoder* d, const upb_MiniTableSub* subs, + upb_Decoder* d, const upb_MiniTableSubInternal* subs, const upb_MiniTableField* field, upb_TaggedMessagePtr* target) { upb_TaggedMessagePtr tagged = *target; const upb_MiniTable* subl = _upb_MiniTableSubs_MessageByField(subs, field); @@ -319,7 +325,7 @@ const char* _upb_Decoder_RecurseSubMessage(upb_Decoder* d, const char* ptr, UPB_FORCEINLINE const char* _upb_Decoder_DecodeSubMessage(upb_Decoder* d, const char* ptr, upb_Message* submsg, - const upb_MiniTableSub* subs, + const upb_MiniTableSubInternal* subs, const upb_MiniTableField* field, int size) { int saved_delta = upb_EpsCopyInputStream_PushLimit(&d->input, ptr, size); @@ -352,7 +358,7 @@ const char* _upb_Decoder_DecodeUnknownGroup(upb_Decoder* d, const char* ptr, UPB_FORCEINLINE const char* _upb_Decoder_DecodeKnownGroup(upb_Decoder* d, const char* ptr, upb_Message* submsg, - const upb_MiniTableSub* subs, + const upb_MiniTableSubInternal* subs, const upb_MiniTableField* field) { const upb_MiniTable* subl = _upb_MiniTableSubs_MessageByField(subs, field); UPB_ASSERT(subl); @@ -403,12 +409,10 @@ bool _upb_Decoder_CheckEnum(upb_Decoder* d, const char* ptr, upb_Message* msg, } UPB_NOINLINE -static const char* _upb_Decoder_DecodeEnumArray(upb_Decoder* d, const char* ptr, - upb_Message* msg, - upb_Array* arr, - const upb_MiniTableSub* subs, - const upb_MiniTableField* field, - wireval* val) { +static const char* _upb_Decoder_DecodeEnumArray( + upb_Decoder* d, const char* ptr, upb_Message* msg, upb_Array* arr, + const upb_MiniTableSubInternal* subs, const upb_MiniTableField* field, + wireval* val) { const upb_MiniTableEnum* e = _upb_MiniTableSubs_EnumByField(subs, field); if (!_upb_Decoder_CheckEnum(d, ptr, msg, e, field, val)) return ptr; void* mem = UPB_PTR_AT(upb_Array_MutableDataPtr(arr), @@ -484,7 +488,7 @@ const char* _upb_Decoder_DecodeVarintPacked(upb_Decoder* d, const char* ptr, UPB_NOINLINE static const char* _upb_Decoder_DecodeEnumPacked( upb_Decoder* d, const char* ptr, upb_Message* msg, upb_Array* arr, - const upb_MiniTableSub* subs, const upb_MiniTableField* field, + const upb_MiniTableSubInternal* subs, const upb_MiniTableField* field, wireval* val) { const upb_MiniTableEnum* e = _upb_MiniTableSubs_EnumByField(subs, field); int saved_limit = upb_EpsCopyInputStream_PushLimit(&d->input, ptr, val->size); @@ -518,11 +522,10 @@ static upb_Array* _upb_Decoder_CreateArray(upb_Decoder* d, return ret; } -static const char* _upb_Decoder_DecodeToArray(upb_Decoder* d, const char* ptr, - upb_Message* msg, - const upb_MiniTableSub* subs, - const upb_MiniTableField* field, - wireval* val, int op) { +static const char* _upb_Decoder_DecodeToArray( + upb_Decoder* d, const char* ptr, upb_Message* msg, + const upb_MiniTableSubInternal* subs, const upb_MiniTableField* field, + wireval* val, int op) { upb_Array** arrp = UPB_PTR_AT(msg, field->UPB_PRIVATE(offset), void); upb_Array* arr = *arrp; void* mem; @@ -623,11 +626,10 @@ static upb_Map* _upb_Decoder_CreateMap(upb_Decoder* d, return ret; } -static const char* _upb_Decoder_DecodeToMap(upb_Decoder* d, const char* ptr, - upb_Message* msg, - const upb_MiniTableSub* subs, - const upb_MiniTableField* field, - wireval* val) { +static const char* _upb_Decoder_DecodeToMap( + upb_Decoder* d, const char* ptr, upb_Message* msg, + const upb_MiniTableSubInternal* subs, const upb_MiniTableField* field, + wireval* val) { upb_Map** map_p = UPB_PTR_AT(msg, field->UPB_PRIVATE(offset), upb_Map*); upb_Map* map = *map_p; upb_MapEntry ent; @@ -688,8 +690,8 @@ static const char* _upb_Decoder_DecodeToMap(upb_Decoder* d, const char* ptr, static const char* _upb_Decoder_DecodeToSubMessage( upb_Decoder* d, const char* ptr, upb_Message* msg, - const upb_MiniTableSub* subs, const upb_MiniTableField* field, wireval* val, - int op) { + const upb_MiniTableSubInternal* subs, const upb_MiniTableField* field, + wireval* val, int op) { void* mem = UPB_PTR_AT(msg, field->UPB_PRIVATE(offset), void); int type = field->UPB_PRIVATE(descriptortype); @@ -819,9 +821,9 @@ static void upb_Decoder_AddKnownMessageSetItem( if (UPB_UNLIKELY(!ext)) { _upb_Decoder_ErrorJmp(d, kUpb_DecodeStatus_OutOfMemory); } - upb_Message* submsg = _upb_Decoder_NewSubMessage( - d, &ext->ext->UPB_PRIVATE(sub), &ext->ext->UPB_PRIVATE(field), - (upb_TaggedMessagePtr*)&ext->data); + upb_Message* submsg = _upb_Decoder_NewSubMessage2( + d, ext->ext->UPB_PRIVATE(sub).UPB_PRIVATE(submsg), + &ext->ext->UPB_PRIVATE(field), (upb_TaggedMessagePtr*)&ext->data); upb_DecodeStatus status = upb_Decode( data, size, submsg, upb_MiniTableExtension_GetSubMessage(item_mt), d->extreg, d->options, &d->arena); @@ -1022,8 +1024,9 @@ void _upb_Decoder_CheckUnlinked(upb_Decoder* d, const upb_MiniTable* mt, // unlinked. do { UPB_ASSERT(upb_MiniTableField_CType(oneof) == kUpb_CType_Message); - const upb_MiniTableSub* oneof_sub = - &mt->UPB_PRIVATE(subs)[oneof->UPB_PRIVATE(submsg_index)]; + const upb_MiniTable* oneof_sub = + *mt->UPB_PRIVATE(subs)[oneof->UPB_PRIVATE(submsg_index)].UPB_PRIVATE( + submsg); UPB_ASSERT(!oneof_sub); } while (upb_MiniTable_NextOneofField(mt, &oneof)); } @@ -1161,8 +1164,9 @@ const char* _upb_Decoder_DecodeKnownField(upb_Decoder* d, const char* ptr, const upb_MiniTable* layout, const upb_MiniTableField* field, int op, wireval* val) { - const upb_MiniTableSub* subs = layout->UPB_PRIVATE(subs); + const upb_MiniTableSubInternal* subs = layout->UPB_PRIVATE(subs); uint8_t mode = field->UPB_PRIVATE(mode); + upb_MiniTableSubInternal ext_sub; if (UPB_UNLIKELY(mode & kUpb_LabelFlags_IsExtension)) { const upb_MiniTableExtension* ext_layout = @@ -1174,7 +1178,14 @@ const char* _upb_Decoder_DecodeKnownField(upb_Decoder* d, const char* ptr, } d->unknown_msg = msg; msg = (upb_Message*)&ext->data; - subs = &ext->ext->UPB_PRIVATE(sub); + if (upb_MiniTableField_IsSubMessage(&ext->ext->UPB_PRIVATE(field))) { + ext_sub.UPB_PRIVATE(submsg) = + &ext->ext->UPB_PRIVATE(sub).UPB_PRIVATE(submsg); + } else { + ext_sub.UPB_PRIVATE(subenum) = + ext->ext->UPB_PRIVATE(sub).UPB_PRIVATE(subenum); + } + subs = &ext_sub; } switch (mode & kUpb_FieldMode_Mask) { @@ -1429,5 +1440,26 @@ upb_DecodeStatus upb_DecodeLengthPrefixed(const char* buf, size_t size, return upb_Decode(buf, msg_len, msg, mt, extreg, options, arena); } +const char* upb_DecodeStatus_String(upb_DecodeStatus status) { + switch (status) { + case kUpb_DecodeStatus_Ok: + return "Ok"; + case kUpb_DecodeStatus_Malformed: + return "Wire format was corrupt"; + case kUpb_DecodeStatus_OutOfMemory: + return "Arena alloc failed"; + case kUpb_DecodeStatus_BadUtf8: + return "String field had bad UTF-8"; + case kUpb_DecodeStatus_MaxDepthExceeded: + return "Exceeded upb_DecodeOptions_MaxDepth"; + case kUpb_DecodeStatus_MissingRequired: + return "Missing required field"; + case kUpb_DecodeStatus_UnlinkedSubMessage: + return "Unlinked sub-message field was present"; + default: + return "Unknown decode status"; + } +} + #undef OP_FIXPCK_LG2 #undef OP_VARPCK_LG2 diff --git a/third_party/upb/upb/wire/decode.h b/third_party/upb/upb/wire/decode.h index b459e62443e..cc72f4f86eb 100644 --- a/third_party/upb/upb/wire/decode.h +++ b/third_party/upb/upb/wire/decode.h @@ -143,6 +143,9 @@ UPB_API upb_DecodeStatus upb_DecodeLengthPrefixed( const upb_MiniTable* mt, const upb_ExtensionRegistry* extreg, int options, upb_Arena* arena); +// Utility function for wrapper languages to get an error string from a +// upb_DecodeStatus. +UPB_API const char* upb_DecodeStatus_String(upb_DecodeStatus status); #ifdef __cplusplus } /* extern "C" */ #endif diff --git a/third_party/upb/upb/wire/encode.c b/third_party/upb/upb/wire/encode.c index da35f73b119..5764199e44f 100644 --- a/third_party/upb/upb/wire/encode.c +++ b/third_party/upb/upb/wire/encode.c @@ -35,14 +35,21 @@ #include "upb/mini_table/field.h" #include "upb/mini_table/internal/field.h" #include "upb/mini_table/internal/message.h" +#include "upb/mini_table/internal/sub.h" #include "upb/mini_table/message.h" -#include "upb/mini_table/sub.h" #include "upb/wire/internal/constants.h" #include "upb/wire/types.h" // Must be last. #include "upb/port/def.inc" +// Returns the MiniTable corresponding to a given MiniTableField +// from an array of MiniTableSubs. +static const upb_MiniTable* _upb_Encoder_GetSubMiniTable( + const upb_MiniTableSubInternal* subs, const upb_MiniTableField* field) { + return *subs[field->UPB_PRIVATE(submsg_index)].UPB_PRIVATE(submsg); +} + #define UPB_PB_VARINT_MAX_LEN 10 UPB_NOINLINE @@ -224,7 +231,7 @@ static void encode_TaggedMessagePtr(upb_encstate* e, } static void encode_scalar(upb_encstate* e, const void* _field_mem, - const upb_MiniTableSub* subs, + const upb_MiniTableSubInternal* subs, const upb_MiniTableField* f) { const char* field_mem = _field_mem; int wire_type; @@ -273,8 +280,7 @@ static void encode_scalar(upb_encstate* e, const void* _field_mem, case kUpb_FieldType_Group: { size_t size; upb_TaggedMessagePtr submsg = *(upb_TaggedMessagePtr*)field_mem; - const upb_MiniTable* subm = - upb_MiniTableSub_Message(subs[f->UPB_PRIVATE(submsg_index)]); + const upb_MiniTable* subm = _upb_Encoder_GetSubMiniTable(subs, f); if (submsg == 0) { return; } @@ -288,8 +294,7 @@ static void encode_scalar(upb_encstate* e, const void* _field_mem, case kUpb_FieldType_Message: { size_t size; upb_TaggedMessagePtr submsg = *(upb_TaggedMessagePtr*)field_mem; - const upb_MiniTable* subm = - upb_MiniTableSub_Message(subs[f->UPB_PRIVATE(submsg_index)]); + const upb_MiniTable* subm = _upb_Encoder_GetSubMiniTable(subs, f); if (submsg == 0) { return; } @@ -309,7 +314,7 @@ static void encode_scalar(upb_encstate* e, const void* _field_mem, } static void encode_array(upb_encstate* e, const upb_Message* msg, - const upb_MiniTableSub* subs, + const upb_MiniTableSubInternal* subs, const upb_MiniTableField* f) { const upb_Array* arr = *UPB_PTR_AT(msg, f->UPB_PRIVATE(offset), upb_Array*); bool packed = upb_MiniTableField_IsPacked(f); @@ -379,8 +384,7 @@ static void encode_array(upb_encstate* e, const upb_Message* msg, case kUpb_FieldType_Group: { const upb_TaggedMessagePtr* start = upb_Array_DataPtr(arr); const upb_TaggedMessagePtr* ptr = start + upb_Array_Size(arr); - const upb_MiniTable* subm = - upb_MiniTableSub_Message(subs[f->UPB_PRIVATE(submsg_index)]); + const upb_MiniTable* subm = _upb_Encoder_GetSubMiniTable(subs, f); if (--e->depth == 0) encode_err(e, kUpb_EncodeStatus_MaxDepthExceeded); do { size_t size; @@ -395,8 +399,7 @@ static void encode_array(upb_encstate* e, const upb_Message* msg, case kUpb_FieldType_Message: { const upb_TaggedMessagePtr* start = upb_Array_DataPtr(arr); const upb_TaggedMessagePtr* ptr = start + upb_Array_Size(arr); - const upb_MiniTable* subm = - upb_MiniTableSub_Message(subs[f->UPB_PRIVATE(submsg_index)]); + const upb_MiniTable* subm = _upb_Encoder_GetSubMiniTable(subs, f); if (--e->depth == 0) encode_err(e, kUpb_EncodeStatus_MaxDepthExceeded); do { size_t size; @@ -432,11 +435,10 @@ static void encode_mapentry(upb_encstate* e, uint32_t number, } static void encode_map(upb_encstate* e, const upb_Message* msg, - const upb_MiniTableSub* subs, + const upb_MiniTableSubInternal* subs, const upb_MiniTableField* f) { const upb_Map* map = *UPB_PTR_AT(msg, f->UPB_PRIVATE(offset), const upb_Map*); - const upb_MiniTable* layout = - upb_MiniTableSub_Message(subs[f->UPB_PRIVATE(submsg_index)]); + const upb_MiniTable* layout = _upb_Encoder_GetSubMiniTable(subs, f); UPB_ASSERT(upb_MiniTable_FieldCount(layout) == 2); if (!map || !upb_Map_Size(map)) return; @@ -465,7 +467,6 @@ static void encode_map(upb_encstate* e, const upb_Message* msg, } static bool encode_shouldencode(upb_encstate* e, const upb_Message* msg, - const upb_MiniTableSub* subs, const upb_MiniTableField* f) { if (f->presence == 0) { // Proto3 presence or map/array. @@ -504,7 +505,7 @@ static bool encode_shouldencode(upb_encstate* e, const upb_Message* msg, } static void encode_field(upb_encstate* e, const upb_Message* msg, - const upb_MiniTableSub* subs, + const upb_MiniTableSubInternal* subs, const upb_MiniTableField* field) { switch (UPB_PRIVATE(_upb_MiniTableField_Mode)(field)) { case kUpb_FieldMode_Array: @@ -539,7 +540,14 @@ static void encode_ext(upb_encstate* e, const upb_Extension* ext, if (UPB_UNLIKELY(is_message_set)) { encode_msgset_item(e, ext); } else { - encode_field(e, (upb_Message*)&ext->data, &ext->ext->UPB_PRIVATE(sub), + upb_MiniTableSubInternal sub; + if (upb_MiniTableField_IsSubMessage(&ext->ext->UPB_PRIVATE(field))) { + sub.UPB_PRIVATE(submsg) = &ext->ext->UPB_PRIVATE(sub).UPB_PRIVATE(submsg); + } else { + sub.UPB_PRIVATE(subenum) = + ext->ext->UPB_PRIVATE(sub).UPB_PRIVATE(subenum); + } + encode_field(e, (upb_Message*)&ext->data, &sub, &ext->ext->UPB_PRIVATE(field)); } } @@ -595,7 +603,7 @@ static void encode_message(upb_encstate* e, const upb_Message* msg, const upb_MiniTableField* first = &m->UPB_PRIVATE(fields)[0]; while (f != first) { f--; - if (encode_shouldencode(e, msg, m->UPB_PRIVATE(subs), f)) { + if (encode_shouldencode(e, msg, f)) { encode_field(e, msg, m->UPB_PRIVATE(subs), f); } } @@ -668,3 +676,18 @@ upb_EncodeStatus upb_EncodeLengthPrefixed(const upb_Message* msg, size_t* size) { return _upb_Encode(msg, l, options, arena, buf, size, true); } + +const char* upb_EncodeStatus_String(upb_EncodeStatus status) { + switch (status) { + case kUpb_EncodeStatus_Ok: + return "Ok"; + case kUpb_EncodeStatus_MissingRequired: + return "Missing required field"; + case kUpb_EncodeStatus_MaxDepthExceeded: + return "Max depth exceeded"; + case kUpb_EncodeStatus_OutOfMemory: + return "Arena alloc failed"; + default: + return "Unknown encode status"; + } +} diff --git a/third_party/upb/upb/wire/encode.h b/third_party/upb/upb/wire/encode.h index 76d90d98544..77b122341e1 100644 --- a/third_party/upb/upb/wire/encode.h +++ b/third_party/upb/upb/wire/encode.h @@ -75,6 +75,9 @@ UPB_API upb_EncodeStatus upb_EncodeLengthPrefixed(const upb_Message* msg, const upb_MiniTable* l, int options, upb_Arena* arena, char** buf, size_t* size); +// Utility function for wrapper languages to get an error string from a +// upb_EncodeStatus. +UPB_API const char* upb_EncodeStatus_String(upb_EncodeStatus status); #ifdef __cplusplus } /* extern "C" */ diff --git a/third_party/upb/upb/wire/eps_copy_input_stream_test.cc b/third_party/upb/upb/wire/eps_copy_input_stream_test.cc index c28d1457e47..c1c5dc76cc5 100644 --- a/third_party/upb/upb/wire/eps_copy_input_stream_test.cc +++ b/third_party/upb/upb/wire/eps_copy_input_stream_test.cc @@ -281,7 +281,7 @@ TEST(EpsCopyInputStreamTest, ZeroSize) { // } // // // Test with: -// // $ blaze run --config=fuzztest third_party/upb:eps_copy_input_stream_test \ +// // $ bazel run --config=fuzztest third_party/upb:eps_copy_input_stream_test // // -- --gunit_fuzz= // FUZZ_TEST(EpsCopyFuzzTest, TestAgainstFakeStream) // .WithDomains(ArbitraryEpsCopyTestScript()); diff --git a/third_party/upb/upb/wire/internal/decode_fast.c b/third_party/upb/upb/wire/internal/decode_fast.c index 67be4135c4e..726f65ad244 100644 --- a/third_party/upb/upb/wire/internal/decode_fast.c +++ b/third_party/upb/upb/wire/internal/decode_fast.c @@ -231,6 +231,7 @@ UPB_FORCEINLINE void* fastdecode_getfield(upb_Decoder* d, const char* ptr, upb_Message* msg, uint64_t* data, uint64_t* hasbits, fastdecode_arr* farr, int valbytes, upb_card card) { + UPB_ASSERT(!upb_Message_IsFrozen(msg)); switch (card) { case CARD_s: { uint8_t hasbit_index = *data >> 24; @@ -606,6 +607,7 @@ UPB_NOINLINE static const char* fastdecode_verifyutf8(upb_Decoder* d, const char* ptr, upb_Message* msg, intptr_t table, uint64_t hasbits, uint64_t data) { + UPB_ASSERT(!upb_Message_IsFrozen(msg)); upb_StringView* dst = (upb_StringView*)data; if (!_upb_Decoder_VerifyUtf8Inline(dst->data, dst->size)) { _upb_FastDecoder_ErrorJmp(d, kUpb_DecodeStatus_BadUtf8); @@ -651,6 +653,7 @@ UPB_NOINLINE static const char* fastdecode_longstring_noutf8( struct upb_Decoder* d, const char* ptr, upb_Message* msg, intptr_t table, uint64_t hasbits, uint64_t data) { + UPB_ASSERT(!upb_Message_IsFrozen(msg)); upb_StringView* dst = (upb_StringView*)data; FASTDECODE_LONGSTRING(d, ptr, msg, table, hasbits, dst, false); } diff --git a/third_party/utf8_range/CMakeLists.txt b/third_party/utf8_range/CMakeLists.txt index 8d7a6e15c6c..4276b972908 100644 --- a/third_party/utf8_range/CMakeLists.txt +++ b/third_party/utf8_range/CMakeLists.txt @@ -11,13 +11,13 @@ option (utf8_range_ENABLE_INSTALL "Configure installation" ON) ## # Create the lightweight C library -add_library (utf8_range STATIC +add_library (utf8_range utf8_range.c ) ## # A heavier-weight C++ wrapper that supports Abseil. -add_library (utf8_validity STATIC utf8_validity.cc utf8_range.c) +add_library (utf8_validity utf8_validity.cc utf8_range.c) # Load Abseil dependency. if (NOT TARGET absl::strings) diff --git a/tools/distrib/python/grpc_version.py b/tools/distrib/python/grpc_version.py index 2bc64495fe9..8cec1e10eca 100644 --- a/tools/distrib/python/grpc_version.py +++ b/tools/distrib/python/grpc_version.py @@ -15,4 +15,4 @@ # AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/distrib/python/grpcio_tools/grpc_version.py.template`!!! VERSION = '1.68.0.dev0' -PROTOBUF_VERSION = '3.27.2' +PROTOBUF_VERSION = '3.28.1' diff --git a/tools/distrib/python/grpcio_tools/grpc_version.py b/tools/distrib/python/grpcio_tools/grpc_version.py index 66dd7d524fd..c495da77933 100644 --- a/tools/distrib/python/grpcio_tools/grpc_version.py +++ b/tools/distrib/python/grpcio_tools/grpc_version.py @@ -15,4 +15,4 @@ # AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/distrib/python/grpcio_tools/grpc_version.py.template`!!! VERSION = '1.68.0.dev0' -PROTOBUF_VERSION = '3.27.2' +PROTOBUF_VERSION = '3.28.1' diff --git a/tools/distrib/python/grpcio_tools/protoc_lib_deps.py b/tools/distrib/python/grpcio_tools/protoc_lib_deps.py index ee2f8179e2c..2caad754ab6 100644 --- a/tools/distrib/python/grpcio_tools/protoc_lib_deps.py +++ b/tools/distrib/python/grpcio_tools/protoc_lib_deps.py @@ -246,7 +246,7 @@ CC_FILES=[ 'third_party/protobuf/src/google/protobuf/compiler/ruby/ruby_generator.cc', 'third_party/protobuf/src/google/protobuf/compiler/rust/accessors/accessor_case.cc', 'third_party/protobuf/src/google/protobuf/compiler/rust/accessors/accessors.cc', - 'third_party/protobuf/src/google/protobuf/compiler/rust/accessors/helpers.cc', + 'third_party/protobuf/src/google/protobuf/compiler/rust/accessors/default_value.cc', 'third_party/protobuf/src/google/protobuf/compiler/rust/accessors/map.cc', 'third_party/protobuf/src/google/protobuf/compiler/rust/accessors/repeated_field.cc', 'third_party/protobuf/src/google/protobuf/compiler/rust/accessors/singular_message.cc', @@ -340,4 +340,4 @@ CC_INCLUDES=[ ] PROTO_INCLUDE='third_party/protobuf/src' -PROTOBUF_SUBMODULE_VERSION="63def39e881afa496502d9c410f4ea948e59490d" +PROTOBUF_SUBMODULE_VERSION="10ef3f77683f77fb3c059bf47725c27b3ff41e63" diff --git a/tools/distrib/python/xds_protos/grpc_version.py b/tools/distrib/python/xds_protos/grpc_version.py index ccf4716adfa..7add68a0e24 100644 --- a/tools/distrib/python/xds_protos/grpc_version.py +++ b/tools/distrib/python/xds_protos/grpc_version.py @@ -15,4 +15,4 @@ # AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/distrib/python/grpcio_tools/grpc_version.py.template`!!! VERSION = '1.68.0.dev0' -PROTOBUF_VERSION = '3.27.2' +PROTOBUF_VERSION = '3.28.1' diff --git a/tools/run_tests/sanity/check_submodules.sh b/tools/run_tests/sanity/check_submodules.sh index 7e5245b963b..c2d0e3c4194 100755 --- a/tools/run_tests/sanity/check_submodules.sh +++ b/tools/run_tests/sanity/check_submodules.sh @@ -36,7 +36,7 @@ third_party/googletest 2dd1c131950043a8ad5ab0d2dda0e0970596586a third_party/opencensus-proto 4aa53e15cbf1a47bc9087e6cfdca214c1eea4e89 third_party/opentelemetry 60fa8754d890b5c55949a8c68dcfd7ab5c2395df third_party/opentelemetry-cpp 4bd64c9a336fd438d6c4c9dad2e6b61b0585311f -third_party/protobuf 63def39e881afa496502d9c410f4ea948e59490d +third_party/protobuf 10ef3f77683f77fb3c059bf47725c27b3ff41e63 third_party/protoc-gen-validate fab737efbb4b4d03e7c771393708f75594b121e4 third_party/re2 0c5616df9c0aaa44c9440d87422012423d91c7d1 third_party/xds 3a472e524827f72d1ad621c4983dd5af54c46776 From 2c09f14f0ddec3e32d50c1c50d319be4f6c50766 Mon Sep 17 00:00:00 2001 From: Tanvi Jagtap Date: Tue, 24 Sep 2024 21:10:49 -0700 Subject: [PATCH 25/75] [Gpr_To_Absl_Logging] Remove allow listed log. It is not used anymore PiperOrigin-RevId: 678512344 --- test/core/end2end/tests/no_logging.cc | 2 -- 1 file changed, 2 deletions(-) diff --git a/test/core/end2end/tests/no_logging.cc b/test/core/end2end/tests/no_logging.cc index 976c198ecb8..e144dda3d1d 100644 --- a/test/core/end2end/tests/no_logging.cc +++ b/test/core/end2end/tests/no_logging.cc @@ -93,8 +93,6 @@ class VerifyLogNoiseLogSink : public absl::LogSink { static const auto* const allowed_logs_by_module = new std::map( {{"cq_verifier.cc", std::regex("^Verify .* for [0-9]+ms")}, - {"chttp2_transport.cc", - std::regex("Sending goaway.*Channel Destroyed")}, {"chaotic_good_server.cc", std::regex("Failed to bind some addresses for.*")}, {"log.cc", From 95e1ab6267a8a1d605cbcf17846a00b22419c8fc Mon Sep 17 00:00:00 2001 From: Sourabh Singh Date: Wed, 25 Sep 2024 08:47:32 -0700 Subject: [PATCH 26/75] unit testing setup and unit-tests script (#37070) 1. Added script to install all dependencies then run all unit tests for python grpcio. Closes #37070 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37070 from sourabhsinghs:feature/developer-setup-script 954892f20a8852ddb02090ef77e095359c089fea PiperOrigin-RevId: 678718224 --- tools/distrib/install_all_python_modules.sh | 73 ++++++++++--------- .../install_python_modules_and_run_tests.sh | 25 +++++++ tools/distrib/python_tooling_tests.sh | 28 +++++++ .../linux/grpc_toolingtests_python.sh | 26 +++++++ .../pull_request/grpc_toolingtests_python.cfg | 26 +++++++ 5 files changed, 144 insertions(+), 34 deletions(-) create mode 100755 tools/distrib/install_python_modules_and_run_tests.sh create mode 100755 tools/distrib/python_tooling_tests.sh create mode 100755 tools/internal_ci/linux/grpc_toolingtests_python.sh create mode 100644 tools/internal_ci/linux/pull_request/grpc_toolingtests_python.cfg diff --git a/tools/distrib/install_all_python_modules.sh b/tools/distrib/install_all_python_modules.sh index b389df48377..b23b38cc624 100755 --- a/tools/distrib/install_all_python_modules.sh +++ b/tools/distrib/install_all_python_modules.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2020 The gRPC Authors +# Copyright 2024 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. @@ -13,45 +13,50 @@ # See the License for the specific language governing permissions and # limitations under the License. -# TODO: Integrate this into CI to avoid bitrot. +set -ex -echo "It's recommended that you run this script from a virtual environment." +BASEDIR=$(dirname "$0")/../.. +PACKAGES="grpcio_channelz grpcio_csds grpcio_admin grpcio_health_checking grpcio_reflection grpcio_status grpcio_testing grpcio_csm_observability grpcio_tests" + +# Change to grpc repo root +cd "$BASEDIR"; +# unit-tests setup starts from here function maybe_run_command () { - if python setup.py --help-commands | grep "$1" &>/dev/null; then - python setup.py "$1"; + if python3 setup.py --help-commands | grep "$1" &>/dev/null; then + python3 setup.py "$1"; fi } -set -e +python3 -m pip install --upgrade "cython<4.0.0rc1"; +python3 setup.py install; -BASEDIR=$(dirname "$0") -BASEDIR=$(realpath "$BASEDIR")/../.. +# Build and install grpcio_tools +pushd tools/distrib/python/grpcio_tools; + ../make_grpcio_tools.py + GRPC_PYTHON_BUILD_WITH_CYTHON=1 pip install . +popd; -PACKAGES="grpcio_channelz grpcio_csds grpcio_admin grpcio_health_checking grpcio_reflection grpcio_status grpcio_testing grpcio_csm_observability grpcio_tests" +# Build and install grpcio_observability +pushd src/python/grpcio_observability; + ./make_grpcio_observability.py + GRPC_PYTHON_BUILD_WITH_CYTHON=1 pip install . +popd; + +# Install xds_protos +pushd tools/distrib/python/xds_protos; + GRPC_PYTHON_BUILD_WITH_CYTHON=1 pip install . +popd; + +# Build and install individual gRPC packages +pushd src/python; + for PACKAGE in ${PACKAGES}; do + pushd "${PACKAGE}"; + python3 setup.py clean; + maybe_run_command preprocess + maybe_run_command build_package_protos + python3 -m pip install .; + popd; + done +popd; -(cd "$BASEDIR"; - pip install --upgrade "cython<3.0.0rc1"; - python setup.py install; - pushd tools/distrib/python/grpcio_tools; - ../make_grpcio_tools.py - GRPC_PYTHON_BUILD_WITH_CYTHON=1 pip install . - popd; - pushd src/python/grpcio_observability; - ./make_grpcio_observability.py - GRPC_PYTHON_BUILD_WITH_CYTHON=1 pip install . - popd; - pushd tools/distrib/python/xds_protos; - GRPC_PYTHON_BUILD_WITH_CYTHON=1 pip install . - popd; - pushd src/python; - for PACKAGE in ${PACKAGES}; do - pushd "${PACKAGE}"; - python setup.py clean; - maybe_run_command preprocess - maybe_run_command build_package_protos - python -m pip install .; - popd; - done - popd; -) diff --git a/tools/distrib/install_python_modules_and_run_tests.sh b/tools/distrib/install_python_modules_and_run_tests.sh new file mode 100755 index 00000000000..d15c809db95 --- /dev/null +++ b/tools/distrib/install_python_modules_and_run_tests.sh @@ -0,0 +1,25 @@ +#!/bin/bash +# Copyright 2024 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. + +set -ex + +BASEDIR=$(dirname "$0")/../.. +cd "$BASEDIR"; + +# install python all modules +./tools/distrib/install_all_python_modules.sh + +# run python tooling tests +./tools/distrib/python_tooling_tests.sh \ No newline at end of file diff --git a/tools/distrib/python_tooling_tests.sh b/tools/distrib/python_tooling_tests.sh new file mode 100755 index 00000000000..69007844241 --- /dev/null +++ b/tools/distrib/python_tooling_tests.sh @@ -0,0 +1,28 @@ +#!/bin/bash +# Copyright 2024 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. + +set -ex + +BASEDIR=$(dirname "$0")/../.. +cd "$BASEDIR"; + +# Run tests for grpcio_tests +pushd src/python/grpcio_tests; + python3 setup.py test_lite + python3 setup.py test_aio + python3 setup.py test_py3_only +popd; + +chmod -R 755 src/ diff --git a/tools/internal_ci/linux/grpc_toolingtests_python.sh b/tools/internal_ci/linux/grpc_toolingtests_python.sh new file mode 100755 index 00000000000..13a7bd5a211 --- /dev/null +++ b/tools/internal_ci/linux/grpc_toolingtests_python.sh @@ -0,0 +1,26 @@ +#!/bin/bash +# Copyright 2024 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. + +set -ex +# Enter the gRPC repo root +cd $(dirname $0)/../../.. + +source tools/internal_ci/helper_scripts/prepare_build_linux_rc + +export DOCKERFILE_DIR=tools/dockerfile/distribtest/python_dev_ubuntu2204_x64 +export DOCKER_RUN_SCRIPT=tools/distrib/install_python_modules_and_run_tests.sh +export GRPC_TEST_REPORT_BASE_DIR=reports + +exec tools/run_tests/dockerize/build_and_run_docker.sh diff --git a/tools/internal_ci/linux/pull_request/grpc_toolingtests_python.cfg b/tools/internal_ci/linux/pull_request/grpc_toolingtests_python.cfg new file mode 100644 index 00000000000..41458d81748 --- /dev/null +++ b/tools/internal_ci/linux/pull_request/grpc_toolingtests_python.cfg @@ -0,0 +1,26 @@ +# Copyright 2024 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. + +# Config file for the internal CI (in protobuf text format) + +# Location of the continuous shell script in repository. +build_file: "grpc/tools/internal_ci/linux/grpc_toolingtests_python.sh" +timeout_mins: 240 +action { + define_artifacts { + regex: "**/*sponge_log.*" + regex: "github/grpc/reports/**" + regex: "github/grpc/artifacts/**" + } +} From 72c7cf88f9bc086aedf4d2ed51f1ceb2e038f151 Mon Sep 17 00:00:00 2001 From: erm-g <110920239+erm-g@users.noreply.github.com> Date: Wed, 25 Sep 2024 09:54:07 -0700 Subject: [PATCH 27/75] [security] Change security level classification for local connections (#37266) Set security level to NONE for LOCAL_TCP type, Privacy&Integrity for UDS. Closes #37266 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37266 from erm-g:local_creds 2f11125548ee4b433ba2ebc6f6f109788c33b71e PiperOrigin-RevId: 678741239 --- CMakeLists.txt | 52 +++++++ bazel/experiments.bzl | 8 + build_autogenerated.yaml | 29 ++++ src/core/BUILD | 1 + src/core/lib/experiments/experiments.cc | 18 +++ src/core/lib/experiments/experiments.h | 8 + src/core/lib/experiments/experiments.yaml | 5 + src/core/lib/experiments/rollouts.yaml | 2 + .../local/local_security_connector.cc | 12 +- .../unit/_contextvars_propagation_test.py | 31 ++-- test/core/end2end/end2end_test_suites.cc | 7 +- test/core/end2end/end2end_tests.h | 6 + test/core/end2end/tests/call_creds.cc | 6 + test/core/security/BUILD | 17 ++ .../security/local_security_connector_test.cc | 147 ++++++++++++++++++ tools/run_tests/generated/tests.json | 24 +++ 16 files changed, 357 insertions(+), 16 deletions(-) create mode 100644 test/core/security/local_security_connector_test.cc diff --git a/CMakeLists.txt b/CMakeLists.txt index 8d2f36a6df8..14bceea8d0b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1220,6 +1220,7 @@ if(gRPC_BUILD_TESTS) endif() add_dependencies(buildtests_cxx load_config_test) add_dependencies(buildtests_cxx load_file_test) + add_dependencies(buildtests_cxx local_security_connector_test) if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) add_dependencies(buildtests_cxx log_too_many_open_files_test) endif() @@ -19669,6 +19670,57 @@ target_link_libraries(load_file_test ) +endif() +if(gRPC_BUILD_TESTS) + +add_executable(local_security_connector_test + test/core/security/local_security_connector_test.cc + test/core/test_util/cmdline.cc + test/core/test_util/fuzzer_util.cc + test/core/test_util/grpc_profiler.cc + test/core/test_util/histogram.cc + test/core/test_util/mock_endpoint.cc + test/core/test_util/parse_hexstring.cc + test/core/test_util/resolve_localhost_ip46.cc + test/core/test_util/slice_splitter.cc + test/core/test_util/tracer_util.cc +) +if(WIN32 AND MSVC) + if(BUILD_SHARED_LIBS) + target_compile_definitions(local_security_connector_test + PRIVATE + "GPR_DLL_IMPORTS" + "GRPC_DLL_IMPORTS" + ) + endif() +endif() +target_compile_features(local_security_connector_test PUBLIC cxx_std_14) +target_include_directories(local_security_connector_test + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_RE2_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_XXHASH_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} +) + +target_link_libraries(local_security_connector_test + ${_gRPC_ALLTARGETS_LIBRARIES} + gtest + grpc_test_util +) + + endif() if(gRPC_BUILD_TESTS) if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) diff --git a/bazel/experiments.bzl b/bazel/experiments.bzl index 1fc7f607ea8..0709155657e 100644 --- a/bazel/experiments.bzl +++ b/bazel/experiments.bzl @@ -25,6 +25,7 @@ EXPERIMENT_ENABLES = { "event_engine_dns": "event_engine_dns", "event_engine_listener": "event_engine_listener", "free_large_allocator": "free_large_allocator", + "local_connector_secure": "local_connector_secure", "max_pings_wo_data_throttle": "max_pings_wo_data_throttle", "monitoring_experiment": "monitoring_experiment", "multiping": "multiping", @@ -52,6 +53,9 @@ EXPERIMENTS = { "dbg": { }, "off": { + "core_end2end_test": [ + "local_connector_secure", + ], "endpoint_test": [ "tcp_frame_size_tuning", "tcp_rcv_lowat", @@ -98,6 +102,9 @@ EXPERIMENTS = { "dbg": { }, "off": { + "core_end2end_test": [ + "local_connector_secure", + ], "endpoint_test": [ "tcp_frame_size_tuning", "tcp_rcv_lowat", @@ -130,6 +137,7 @@ EXPERIMENTS = { "off": { "core_end2end_test": [ "event_engine_client", + "local_connector_secure", "work_serializer_dispatch", ], "cpp_end2end_test": [ diff --git a/build_autogenerated.yaml b/build_autogenerated.yaml index e56a980757b..bc395b7e0e4 100644 --- a/build_autogenerated.yaml +++ b/build_autogenerated.yaml @@ -12978,6 +12978,35 @@ targets: - gtest - grpc_test_util uses_polling: false +- name: local_security_connector_test + gtest: true + build: test + language: c++ + headers: + - test/core/test_util/cmdline.h + - test/core/test_util/evaluate_args_test_util.h + - test/core/test_util/fuzzer_util.h + - test/core/test_util/grpc_profiler.h + - test/core/test_util/histogram.h + - test/core/test_util/mock_endpoint.h + - test/core/test_util/parse_hexstring.h + - test/core/test_util/resolve_localhost_ip46.h + - test/core/test_util/slice_splitter.h + - test/core/test_util/tracer_util.h + src: + - test/core/security/local_security_connector_test.cc + - test/core/test_util/cmdline.cc + - test/core/test_util/fuzzer_util.cc + - test/core/test_util/grpc_profiler.cc + - test/core/test_util/histogram.cc + - test/core/test_util/mock_endpoint.cc + - test/core/test_util/parse_hexstring.cc + - test/core/test_util/resolve_localhost_ip46.cc + - test/core/test_util/slice_splitter.cc + - test/core/test_util/tracer_util.cc + deps: + - gtest + - grpc_test_util - name: log_too_many_open_files_test gtest: true build: test diff --git a/src/core/BUILD b/src/core/BUILD index 9483e15f051..dccdf45962d 100644 --- a/src/core/BUILD +++ b/src/core/BUILD @@ -4099,6 +4099,7 @@ grpc_cc_library( "channel_args", "closure", "error", + "experiments", "grpc_sockaddr", "iomgr_fwd", "resolved_address", diff --git a/src/core/lib/experiments/experiments.cc b/src/core/lib/experiments/experiments.cc index 96a2c734308..7a6522410d7 100644 --- a/src/core/lib/experiments/experiments.cc +++ b/src/core/lib/experiments/experiments.cc @@ -47,6 +47,10 @@ 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_local_connector_secure = + "Local security connector uses TSI_SECURITY_NONE for LOCAL_TCP " + "connections."; +const char* const additional_constraints_local_connector_secure = "{}"; 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 " @@ -122,6 +126,8 @@ 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}, + {"local_connector_secure", description_local_connector_secure, + additional_constraints_local_connector_secure, nullptr, 0, false, true}, {"max_pings_wo_data_throttle", description_max_pings_wo_data_throttle, additional_constraints_max_pings_wo_data_throttle, nullptr, 0, false, true}, @@ -190,6 +196,10 @@ 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_local_connector_secure = + "Local security connector uses TSI_SECURITY_NONE for LOCAL_TCP " + "connections."; +const char* const additional_constraints_local_connector_secure = "{}"; 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 " @@ -265,6 +275,8 @@ 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}, + {"local_connector_secure", description_local_connector_secure, + additional_constraints_local_connector_secure, nullptr, 0, false, true}, {"max_pings_wo_data_throttle", description_max_pings_wo_data_throttle, additional_constraints_max_pings_wo_data_throttle, nullptr, 0, false, true}, @@ -333,6 +345,10 @@ 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_local_connector_secure = + "Local security connector uses TSI_SECURITY_NONE for LOCAL_TCP " + "connections."; +const char* const additional_constraints_local_connector_secure = "{}"; 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 " @@ -408,6 +424,8 @@ 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}, + {"local_connector_secure", description_local_connector_secure, + additional_constraints_local_connector_secure, nullptr, 0, false, true}, {"max_pings_wo_data_throttle", description_max_pings_wo_data_throttle, additional_constraints_max_pings_wo_data_throttle, nullptr, 0, false, true}, diff --git a/src/core/lib/experiments/experiments.h b/src/core/lib/experiments/experiments.h index b6fb4257c58..ca6c0734a81 100644 --- a/src/core/lib/experiments/experiments.h +++ b/src/core/lib/experiments/experiments.h @@ -67,6 +67,7 @@ inline bool IsEventEngineClientEnabled() { return false; } inline bool IsEventEngineDnsEnabled() { return false; } inline bool IsEventEngineListenerEnabled() { return false; } inline bool IsFreeLargeAllocatorEnabled() { return false; } +inline bool IsLocalConnectorSecureEnabled() { return false; } inline bool IsMaxPingsWoDataThrottleEnabled() { return false; } #define GRPC_EXPERIMENT_IS_INCLUDED_MONITORING_EXPERIMENT inline bool IsMonitoringExperimentEnabled() { return true; } @@ -101,6 +102,7 @@ inline bool IsEventEngineDnsEnabled() { return true; } #define GRPC_EXPERIMENT_IS_INCLUDED_EVENT_ENGINE_LISTENER inline bool IsEventEngineListenerEnabled() { return true; } inline bool IsFreeLargeAllocatorEnabled() { return false; } +inline bool IsLocalConnectorSecureEnabled() { return false; } inline bool IsMaxPingsWoDataThrottleEnabled() { return false; } #define GRPC_EXPERIMENT_IS_INCLUDED_MONITORING_EXPERIMENT inline bool IsMonitoringExperimentEnabled() { return true; } @@ -134,6 +136,7 @@ inline bool IsEventEngineDnsEnabled() { return true; } #define GRPC_EXPERIMENT_IS_INCLUDED_EVENT_ENGINE_LISTENER inline bool IsEventEngineListenerEnabled() { return true; } inline bool IsFreeLargeAllocatorEnabled() { return false; } +inline bool IsLocalConnectorSecureEnabled() { return false; } inline bool IsMaxPingsWoDataThrottleEnabled() { return false; } #define GRPC_EXPERIMENT_IS_INCLUDED_MONITORING_EXPERIMENT inline bool IsMonitoringExperimentEnabled() { return true; } @@ -165,6 +168,7 @@ enum ExperimentIds { kExperimentIdEventEngineDns, kExperimentIdEventEngineListener, kExperimentIdFreeLargeAllocator, + kExperimentIdLocalConnectorSecure, kExperimentIdMaxPingsWoDataThrottle, kExperimentIdMonitoringExperiment, kExperimentIdMultiping, @@ -213,6 +217,10 @@ inline bool IsEventEngineListenerEnabled() { inline bool IsFreeLargeAllocatorEnabled() { return IsExperimentEnabled(); } +#define GRPC_EXPERIMENT_IS_INCLUDED_LOCAL_CONNECTOR_SECURE +inline bool IsLocalConnectorSecureEnabled() { + return IsExperimentEnabled(); +} #define GRPC_EXPERIMENT_IS_INCLUDED_MAX_PINGS_WO_DATA_THROTTLE inline bool IsMaxPingsWoDataThrottleEnabled() { return IsExperimentEnabled(); diff --git a/src/core/lib/experiments/experiments.yaml b/src/core/lib/experiments/experiments.yaml index d4115e8f5e9..ff4bf3869d4 100644 --- a/src/core/lib/experiments/experiments.yaml +++ b/src/core/lib/experiments/experiments.yaml @@ -88,6 +88,11 @@ expiry: 2024/12/01 owner: alishananda@google.com test_tags: [resource_quota_test] +- name: local_connector_secure + description: Local security connector uses TSI_SECURITY_NONE for LOCAL_TCP connections. + expiry: 2024/10/30 + owner: aermolov@google.com + test_tags: ["core_end2end_test"] - name: max_pings_wo_data_throttle description: Experiment to throttle pings to a period of 1 min when diff --git a/src/core/lib/experiments/rollouts.yaml b/src/core/lib/experiments/rollouts.yaml index 661539b1029..36ef43d8b40 100644 --- a/src/core/lib/experiments/rollouts.yaml +++ b/src/core/lib/experiments/rollouts.yaml @@ -75,6 +75,8 @@ windows: true - name: free_large_allocator default: false +- name: local_connector_secure + default: false - name: max_pings_wo_data_throttle default: false - name: monitoring_experiment diff --git a/src/core/lib/security/security_connector/local/local_security_connector.cc b/src/core/lib/security/security_connector/local/local_security_connector.cc index c118f330923..a61dc6aa4d0 100644 --- a/src/core/lib/security/security_connector/local/local_security_connector.cc +++ b/src/core/lib/security/security_connector/local/local_security_connector.cc @@ -43,6 +43,7 @@ #include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/channel/channel_args.h" +#include "src/core/lib/experiments/experiments.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/error.h" @@ -143,9 +144,14 @@ void local_check_peer(tsi_peer peer, grpc_endpoint* ep, } if (peer.properties != nullptr) gpr_free(peer.properties); peer.properties = new_properties; - // TODO(yihuazhang): Set security level of local TCP to TSI_SECURITY_NONE. - const char* security_level = - tsi_security_level_to_string(TSI_PRIVACY_AND_INTEGRITY); + // Set security level to PRIVACY_AND_INTEGRITY for UDS, or NONE otherwise. + const char* security_level; + if (grpc_core::IsLocalConnectorSecureEnabled()) { + security_level = tsi_security_level_to_string( + type == UDS ? TSI_PRIVACY_AND_INTEGRITY : TSI_SECURITY_NONE); + } else { + security_level = tsi_security_level_to_string(TSI_PRIVACY_AND_INTEGRITY); + } tsi_result result = tsi_construct_string_peer_property_from_cstring( TSI_SECURITY_LEVEL_PEER_PROPERTY, security_level, &peer.properties[peer.property_count]); diff --git a/src/python/grpcio_tests/tests/unit/_contextvars_propagation_test.py b/src/python/grpcio_tests/tests/unit/_contextvars_propagation_test.py index 88c521a4467..36a971be684 100644 --- a/src/python/grpcio_tests/tests/unit/_contextvars_propagation_test.py +++ b/src/python/grpcio_tests/tests/unit/_contextvars_propagation_test.py @@ -28,6 +28,7 @@ from tests.unit import test_common _SERVICE_NAME = "test" _UNARY_UNARY = "UnaryUnary" _REQUEST = b"0000" +_UDS_PATH = "/tmp/grpc_fullstack_test.sock" def _unary_unary_handler(request, context): @@ -52,13 +53,17 @@ _METHOD_HANDLERS = { def _server(): try: server = test_common.test_server() - target = "localhost:0" - port = server.add_insecure_port(target) server.add_registered_method_handlers(_SERVICE_NAME, _METHOD_HANDLERS) + server_creds = grpc.local_server_credentials( + grpc.LocalConnectionType.UDS + ) + server.add_secure_port(f"unix:{_UDS_PATH}", server_creds) server.start() - yield port + yield _UDS_PATH finally: server.stop(None) + if os.path.exists(_UDS_PATH): + os.remove(_UDS_PATH) if contextvars_supported(): @@ -103,9 +108,10 @@ else: class ContextVarsPropagationTest(unittest.TestCase): def test_propagation_to_auth_plugin(self): set_up_expected_context() - with _server() as port: - target = "localhost:{}".format(port) - local_credentials = grpc.local_channel_credentials() + with _server() as uds_path: + local_credentials = grpc.local_channel_credentials( + grpc.LocalConnectionType.UDS + ) test_call_credentials = TestCallCredentials() call_credentials = grpc.metadata_call_credentials( test_call_credentials, "test call credentials" @@ -113,7 +119,9 @@ class ContextVarsPropagationTest(unittest.TestCase): composite_credentials = grpc.composite_channel_credentials( local_credentials, call_credentials ) - with grpc.secure_channel(target, composite_credentials) as channel: + with grpc.secure_channel( + f"unix:{uds_path}", composite_credentials + ) as channel: stub = channel.unary_unary( grpc._common.fully_qualified_method( _SERVICE_NAME, _UNARY_UNARY @@ -128,9 +136,10 @@ class ContextVarsPropagationTest(unittest.TestCase): _RPC_COUNT = 32 set_up_expected_context() - with _server() as port: - target = "localhost:{}".format(port) - local_credentials = grpc.local_channel_credentials() + with _server() as uds_path: + local_credentials = grpc.local_channel_credentials( + grpc.LocalConnectionType.UDS + ) test_call_credentials = TestCallCredentials() call_credentials = grpc.metadata_call_credentials( test_call_credentials, "test call credentials" @@ -143,7 +152,7 @@ class ContextVarsPropagationTest(unittest.TestCase): def _run_on_thread(exception_queue): try: with grpc.secure_channel( - target, composite_credentials + f"unix:{uds_path}", composite_credentials ) as channel: stub = channel.unary_unary( grpc._common.fully_qualified_method( diff --git a/test/core/end2end/end2end_test_suites.cc b/test/core/end2end/end2end_test_suites.cc index 70553f9782f..4b74ff032be 100644 --- a/test/core/end2end/end2end_test_suites.cc +++ b/test/core/end2end/end2end_test_suites.cc @@ -637,12 +637,14 @@ std::vector DefaultConfigs() { UDS); }}, #endif + CoreTestConfiguration{"Chttp2FullstackLocalIpv4", FEATURE_MASK_SUPPORTS_CLIENT_CHANNEL | FEATURE_MASK_SUPPORTS_PER_CALL_CREDENTIALS | FEATURE_MASK_IS_HTTP2 | FEATURE_MASK_DO_NOT_FUZZ | - FEATURE_MASK_EXCLUDE_FROM_EXPERIMENT_RUNS, + FEATURE_MASK_EXCLUDE_FROM_EXPERIMENT_RUNS | + FEATURE_MASK_IS_LOCAL_TCP_CREDS, nullptr, [](const ChannelArgs& /*client_args*/, const ChannelArgs& /*server_args*/) { @@ -655,7 +657,8 @@ std::vector DefaultConfigs() { FEATURE_MASK_SUPPORTS_PER_CALL_CREDENTIALS | FEATURE_MASK_IS_HTTP2 | FEATURE_MASK_DO_NOT_FUZZ | - FEATURE_MASK_EXCLUDE_FROM_EXPERIMENT_RUNS, + FEATURE_MASK_EXCLUDE_FROM_EXPERIMENT_RUNS | + FEATURE_MASK_IS_LOCAL_TCP_CREDS, nullptr, [](const ChannelArgs& /*client_args*/, const ChannelArgs& /*server_args*/) { diff --git a/test/core/end2end/end2end_tests.h b/test/core/end2end/end2end_tests.h index 12ddb76abbe..9dc89e93a87 100644 --- a/test/core/end2end/end2end_tests.h +++ b/test/core/end2end/end2end_tests.h @@ -84,6 +84,7 @@ // Exclude this fixture from experiment runs #define FEATURE_MASK_EXCLUDE_FROM_EXPERIMENT_RUNS (1 << 14) #define FEATURE_MASK_IS_CALL_V3 (1 << 15) +#define FEATURE_MASK_IS_LOCAL_TCP_CREDS (1 << 16) #define FAIL_AUTH_CHECK_SERVER_ARG_NAME "fail_auth_check" @@ -683,6 +684,11 @@ class CoreEnd2endTestRegistry { GTEST_SKIP() << "Disabled for initial v3 testing"; \ } +#define SKIP_IF_LOCAL_TCP_CREDS() \ + if (GetParam()->feature_mask & FEATURE_MASK_IS_LOCAL_TCP_CREDS) { \ + GTEST_SKIP() << "Disabled for Local TCP Connection"; \ + } + #define CORE_END2END_TEST(suite, name) \ class CoreEnd2endTest_##suite##_##name : public grpc_core::suite { \ public: \ diff --git a/test/core/end2end/tests/call_creds.cc b/test/core/end2end/tests/call_creds.cc index 6448243374e..b19d555005b 100644 --- a/test/core/end2end/tests/call_creds.cc +++ b/test/core/end2end/tests/call_creds.cc @@ -264,11 +264,17 @@ CORE_END2END_TEST(PerCallCredsOnInsecureTest, } CORE_END2END_TEST(PerCallCredsTest, RequestResponseWithPayloadAndCallCreds) { + if (IsLocalConnectorSecureEnabled()) { + SKIP_IF_LOCAL_TCP_CREDS(); + } TestRequestResponseWithPayloadAndCallCreds(*this, true); } CORE_END2END_TEST(PerCallCredsTest, RequestResponseWithPayloadAndOverriddenCallCreds) { + if (IsLocalConnectorSecureEnabled()) { + SKIP_IF_LOCAL_TCP_CREDS(); + } TestRequestResponseWithPayloadAndOverriddenCallCreds(*this, true); } diff --git a/test/core/security/BUILD b/test/core/security/BUILD index 62e4b5ef811..0824e81eea5 100644 --- a/test/core/security/BUILD +++ b/test/core/security/BUILD @@ -382,6 +382,23 @@ grpc_cc_test( ], ) +grpc_cc_test( + name = "local_security_connector_test", + srcs = ["local_security_connector_test.cc"], + external_deps = [ + "absl/log:check", + "gtest", + ], + language = "C++", + deps = [ + "//:gpr", + "//:grpc", + "//src/core:channel_args", + "//test/core/test_util:grpc_test_util", + "//test/core/test_util:grpc_test_util_base", + ], +) + grpc_cc_test( name = "grpc_tls_credentials_options_test", srcs = ["grpc_tls_credentials_options_test.cc"], diff --git a/test/core/security/local_security_connector_test.cc b/test/core/security/local_security_connector_test.cc new file mode 100644 index 00000000000..0470cd3bc1d --- /dev/null +++ b/test/core/security/local_security_connector_test.cc @@ -0,0 +1,147 @@ +// +// +// 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 + +#include "src/core/client_channel/client_channel_filter.h" +#include "src/core/lib/security/context/security_context.h" +#include "src/core/tsi/transport_security.h" +#include "test/core/test_util/test_config.h" + +namespace grpc_core { +namespace testing { +namespace { + +absl::string_view GetLocalUnixAddress(grpc_endpoint* /*ep*/) { return "unix:"; } + +const grpc_endpoint_vtable kUnixEndpointVtable = { + nullptr, nullptr, nullptr, nullptr, + nullptr, nullptr, nullptr, GetLocalUnixAddress, + nullptr, nullptr}; + +absl::string_view GetLocalTcpAddress(grpc_endpoint* /*ep*/) { + return "ipv4:127.0.0.1:12667"; +} + +const grpc_endpoint_vtable kTcpEndpointVtable = { + nullptr, nullptr, nullptr, nullptr, + nullptr, nullptr, nullptr, GetLocalTcpAddress, + nullptr, nullptr}; + +std::string GetSecurityLevelForServer(grpc_local_connect_type connect_type, + grpc_endpoint& ep) { + grpc_server_credentials* server_creds = + grpc_local_server_credentials_create(connect_type); + ChannelArgs args; + RefCountedPtr connector = + server_creds->create_security_connector(args); + tsi_peer peer; + CHECK(tsi_construct_peer(0, &peer) == TSI_OK); + + RefCountedPtr auth_context; + connector->check_peer(peer, &ep, args, &auth_context, nullptr); + tsi_peer_destruct(&peer); + auto 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); + std::string actual_level; + if (prop != nullptr) { + actual_level = std::string(prop->value, prop->value_length); + } + connector.reset(); + auth_context.reset(); + grpc_server_credentials_release(server_creds); + return actual_level; +} + +std::string GetSecurityLevelForChannel(grpc_local_connect_type connect_type, + grpc_endpoint& ep) { + grpc_channel_credentials* channel_creds = + grpc_local_credentials_create(connect_type); + ChannelArgs args; + args = args.Set((char*)GRPC_ARG_SERVER_URI, (char*)"unix:"); + RefCountedPtr connector = + channel_creds->create_security_connector(nullptr, "unix:", &args); + tsi_peer peer; + CHECK(tsi_construct_peer(0, &peer) == TSI_OK); + RefCountedPtr auth_context; + connector->check_peer(peer, &ep, args, &auth_context, nullptr); + tsi_peer_destruct(&peer); + auto 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); + std::string actual_level; + if (prop != nullptr) { + actual_level = std::string(prop->value, prop->value_length); + } + connector.reset(); + auth_context.reset(); + grpc_channel_credentials_release(channel_creds); + return actual_level; +} + +TEST(LocalSecurityConnectorTest, CheckSecurityLevelOfUdsConnectionServer) { + grpc_endpoint ep; + ep.vtable = &kUnixEndpointVtable; + std::string actual_level = GetSecurityLevelForServer(UDS, ep); + ASSERT_EQ(actual_level, + tsi_security_level_to_string(TSI_PRIVACY_AND_INTEGRITY)); +} + +TEST(LocalSecurityConnectorTest, SecurityLevelOfTcpConnectionServer) { + grpc_endpoint ep; + ep.vtable = &kTcpEndpointVtable; + std::string actual_level = GetSecurityLevelForServer(LOCAL_TCP, ep); + ASSERT_EQ(actual_level, + IsLocalConnectorSecureEnabled() + ? tsi_security_level_to_string(TSI_SECURITY_NONE) + : tsi_security_level_to_string(TSI_PRIVACY_AND_INTEGRITY)); +} + +TEST(LocalSecurityConnectorTest, CheckSecurityLevelOfUdsConnectionChannel) { + grpc_endpoint ep; + ep.vtable = &kUnixEndpointVtable; + std::string actual_level = GetSecurityLevelForChannel(UDS, ep); + ASSERT_EQ(actual_level, + tsi_security_level_to_string(TSI_PRIVACY_AND_INTEGRITY)); +} + +TEST(LocalSecurityConnectorTest, SecurityLevelOfTcpConnectionChannel) { + grpc_endpoint ep; + ep.vtable = &kTcpEndpointVtable; + std::string actual_level = GetSecurityLevelForChannel(LOCAL_TCP, ep); + ASSERT_EQ(actual_level, + IsLocalConnectorSecureEnabled() + ? tsi_security_level_to_string(TSI_SECURITY_NONE) + : tsi_security_level_to_string(TSI_PRIVACY_AND_INTEGRITY)); +} + +} // namespace +} // namespace testing +} // namespace grpc_core + +int main(int argc, char** argv) { + grpc::testing::TestEnvironment env(&argc, argv); + ::testing::InitGoogleTest(&argc, argv); + grpc_init(); + int ret = RUN_ALL_TESTS(); + grpc_shutdown(); + return ret; +} diff --git a/tools/run_tests/generated/tests.json b/tools/run_tests/generated/tests.json index 6253d9f900c..98ffb7f4c19 100644 --- a/tools/run_tests/generated/tests.json +++ b/tools/run_tests/generated/tests.json @@ -5779,6 +5779,30 @@ ], "uses_polling": false }, + { + "args": [], + "benchmark": false, + "ci_platforms": [ + "linux", + "mac", + "posix", + "windows" + ], + "cpu_cost": 1.0, + "exclude_configs": [], + "exclude_iomgrs": [], + "flaky": false, + "gtest": true, + "language": "c++", + "name": "local_security_connector_test", + "platforms": [ + "linux", + "mac", + "posix", + "windows" + ], + "uses_polling": true + }, { "args": [], "benchmark": false, From dc123961259133433023e357cc55e72dbc6b68bf Mon Sep 17 00:00:00 2001 From: Sourabh Singh Date: Wed, 25 Sep 2024 09:58:22 -0700 Subject: [PATCH 28/75] Added excessive logging threshold test (#37274) * Added excessive logging threshold tests * Excessive logs sample: ``` Warning: Excessive error output detected (7 lines): WARNING: All log messages before absl::InitializeLog() is called are written to STDERR I0000 00:00:1724852923.140229 45 chttp2_transport.cc:1182] ipv6:%5B::1%5D:45545: Got goaway [2] err=UNAVAILABLE:GOAWAY received; Error code: 2; Debug Text: Cancelling all calls {file:"src/core/ext/transport/chttp2/transport/chttp2_transport.cc", file_line:1171, created_time:"2024-08-28T13:48:43.140192497+00:00", http2_error:2, grpc_status:14} ``` Closes #37274 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37274 from sourabhsinghs:unittest/logging-threshold 09a87693d04153cddab8a6d2495b7c172f3f8cfb PiperOrigin-RevId: 678742613 --- bazel/BUILD | 10 ++ bazel/_logging_threshold_test_main.py | 93 +++++++++++++++++++ bazel/_single_module_tester.py | 54 +++++++++++ bazel/internal_python_rules.bzl | 3 + bazel/logging_threshold_test.bzl | 73 +++++++++++++++ .../tests/unit/_signal_handling_test.py | 8 +- 6 files changed, 239 insertions(+), 2 deletions(-) create mode 100644 bazel/_logging_threshold_test_main.py create mode 100644 bazel/_single_module_tester.py create mode 100644 bazel/logging_threshold_test.bzl diff --git a/bazel/BUILD b/bazel/BUILD index 3fe42fc7e7d..149a1f32d98 100644 --- a/bazel/BUILD +++ b/bazel/BUILD @@ -20,7 +20,17 @@ licenses(["notice"]) package(default_visibility = ["//:__subpackages__"]) +filegroup( + name = "_single_module_tester", + srcs = ["_single_module_tester.py"], +) + filegroup( name = "_gevent_test_main", srcs = ["_gevent_test_main.py"], ) + +filegroup( + name = "_logging_threshold_test_main", + srcs = ["_logging_threshold_test_main.py"], +) diff --git a/bazel/_logging_threshold_test_main.py b/bazel/_logging_threshold_test_main.py new file mode 100644 index 00000000000..61cf1a2ba8b --- /dev/null +++ b/bazel/_logging_threshold_test_main.py @@ -0,0 +1,93 @@ +# 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. + +import os +import re +import subprocess +import sys +import tempfile + +_OK_TEST_REGEX = r"^-+.*Ran ([\d]+) tests* in ([\d.]+)s.*OK(?: \(skipped=(\d+)\))?\n$" + +# Tests with known exception logs. +# TODO(sourabhsinghs): Investigate and enable _rpc_part_1_test and _rpc_part_2_test tests. +_SKIP_TESTS = [ + "_rpc_part_1_test", + "_server_shutdown_test", + "_xds_credentials_test", + "_server_test", + "_invalid_metadata_test", + "_reconnect_test", + "_channel_close_test", + "_rpc_part_2_test", + "_invocation_defects_test", + "_dynamic_stubs_test", + "_channel_connectivity_test", +] + +if __name__ == "__main__": + if len(sys.argv) != 3: + print(f"USAGE: {sys.argv[0]} TARGET_MODULE", file=sys.stderr) + sys.exit(1) + + test_script = sys.argv[1] + target_module = sys.argv[2] + + if target_module in _SKIP_TESTS: + print(f"Skipping {target_module}") + sys.exit(0) + + command = [ + sys.executable, + os.path.realpath(test_script), + target_module, + os.path.dirname(os.path.relpath(__file__)), + ] + + with tempfile.TemporaryFile(mode="w+") as stdout_file: + with tempfile.TemporaryFile(mode="w+") as stderr_file: + result = subprocess.run( + command, + stdout=stdout_file, + stderr=stderr_file, + text=True, + check=True, + ) + + stdout_file.seek(0) + stderr_file.seek(0) + + stdout_count = len(stdout_file.readlines()) + stderr_count = len(stderr_file.readlines()) + + if result.returncode != 0: + sys.exit("Test failure") + + stderr_file.seek(0) + if not re.fullmatch(_OK_TEST_REGEX, stderr_file.read(), re.DOTALL): + print( + f"Warning: Excessive error output detected ({stderr_count} lines):" + ) + stderr_file.seek(0) + for line in stderr_file: + print(line) + + if stdout_count > 0: + print( + f"Warning: Unexpected output detected ({stdout_count} lines):" + ) + stdout_file.seek(0) + for line in stdout_file: + print(line) + diff --git a/bazel/_single_module_tester.py b/bazel/_single_module_tester.py new file mode 100644 index 00000000000..4b8e4b3cdd4 --- /dev/null +++ b/bazel/_single_module_tester.py @@ -0,0 +1,54 @@ +# 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. + +from typing import Sequence, Optional + +import unittest +import sys +import pkgutil + + +class SingleLoader(object): + def __init__(self, pattern: str, unittest_path: str): + loader = unittest.TestLoader() + self.suite = unittest.TestSuite() + tests = [] + + for importer, module_name, is_package in pkgutil.walk_packages([unittest_path]): + if pattern in module_name: + module = importer.find_module(module_name).load_module(module_name) + tests.append(loader.loadTestsFromModule(module)) + if len(tests) != 1: + raise AssertionError("Expected only 1 test module. Found {}".format(tests)) + self.suite.addTest(tests[0]) + + def loadTestsFromNames(self, names: Sequence[str], module: Optional[str] = None) -> unittest.TestSuite: + return self.suite + +if __name__ == "__main__": + + if len(sys.argv) != 3: + print(f"USAGE: {sys.argv[0]} TARGET_MODULE", file=sys.stderr) + sys.exit(1) + + + target_module = sys.argv[1] + unittest_path = sys.argv[2] + + loader = SingleLoader(target_module, unittest_path) + runner = unittest.TextTestRunner(verbosity=0) + result = runner.run(loader.suite) + + if not result.wasSuccessful(): + sys.exit("Test failure.") \ No newline at end of file diff --git a/bazel/internal_python_rules.bzl b/bazel/internal_python_rules.bzl index b2a506c6ae4..a6c4e18ef81 100644 --- a/bazel/internal_python_rules.bzl +++ b/bazel/internal_python_rules.bzl @@ -14,6 +14,7 @@ """Python-related rules intended only for use internal to the repo.""" load("//bazel:gevent_test.bzl", "py_grpc_gevent_test") +load("//bazel:logging_threshold_test.bzl", "py_grpc_logging_threshold_test") def internal_py_grpc_test(name, **kwargs): """Runs a test under all supported environments. @@ -28,6 +29,7 @@ def internal_py_grpc_test(name, **kwargs): **kwargs ) py_grpc_gevent_test(name, **kwargs) + py_grpc_logging_threshold_test(name, **kwargs) suite_kwargs = {} if "visibility" in kwargs: @@ -38,6 +40,7 @@ def internal_py_grpc_test(name, **kwargs): tests = [ name + ".native", name + ".gevent", + name + ".logging_threshold", ], **suite_kwargs ) diff --git a/bazel/logging_threshold_test.bzl b/bazel/logging_threshold_test.bzl new file mode 100644 index 00000000000..7ffc1ec0400 --- /dev/null +++ b/bazel/logging_threshold_test.bzl @@ -0,0 +1,73 @@ +# Copyright 2024 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. +""" +Houses py_grpc_logging_threshold_test. +""" + +_COPIED_MAIN_SUFFIX = ".logging_threshold.main" + +def py_grpc_logging_threshold_test( + name, + srcs, + main = None, + deps = None, + data = None, + **kwargs): + """Runs a Python unit test and checks amount of logging against a threshold. + + Args: + name: The name of the test. + srcs: The source files. + main: The main file of the test. + deps: The dependencies of the test. + data: The data dependencies of the test. + **kwargs: Any other test arguments. + """ + if main == None: + if len(srcs) != 1: + fail("When main is not provided, srcs must be of size 1.") + main = srcs[0] + deps = [] if deps == None else deps + data = [] if data == None else data + + lib_name = name + ".logging_threshold.lib" + native.py_library( + name = lib_name, + srcs = srcs, + ) + augmented_deps = deps + [ + ":{}".format(lib_name), + ] + + # The main file needs to be in the same package as the test file. + copied_main_name = name + _COPIED_MAIN_SUFFIX + copied_main_filename = copied_main_name + ".py" + native.genrule( + name = copied_main_name, + srcs = ["//bazel:_logging_threshold_test_main.py"], + outs = [copied_main_filename], + cmd = "cp $< $@", + ) + + native.py_test( + name = name + ".logging_threshold", + args = ["$(location //bazel:_single_module_tester)", name], + data = data + ["//bazel:_single_module_tester"], + deps = augmented_deps, + srcs = [copied_main_filename], + main = copied_main_filename, + python_version = "PY3", + flaky = False, + **kwargs + ) diff --git a/src/python/grpcio_tests/tests/unit/_signal_handling_test.py b/src/python/grpcio_tests/tests/unit/_signal_handling_test.py index 41bcc2bddb3..3b63d8f03ba 100644 --- a/src/python/grpcio_tests/tests/unit/_signal_handling_test.py +++ b/src/python/grpcio_tests/tests/unit/_signal_handling_test.py @@ -208,8 +208,12 @@ class SignalHandlingTest(unittest.TestCase): self._handler.await_connected_client() client.send_signal(signal.SIGINT) client.wait() - print(_read_stream(client_stderr)) - self.assertEqual(0, client.returncode) + client_stderr_output = _read_stream(client_stderr) + try: + self.assertEqual(0, client.returncode) + except AssertionError: + print(client_stderr_output, file=sys.stderr) + raise if __name__ == "__main__": From f188fe4587a31bddcb575011f570767370e1444a Mon Sep 17 00:00:00 2001 From: Paulo Castello da Costa Date: Wed, 25 Sep 2024 10:36:42 -0700 Subject: [PATCH 29/75] [benchmark] Restore python to OSS benchmarks. (#37635) Closes #37635 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37635 from paulosjca:python 503f8ed5c85bebd50560780b2f2e848d2a5a136d PiperOrigin-RevId: 678757734 --- tools/internal_ci/linux/grpc_e2e_performance_gke.sh | 1 + tools/internal_ci/linux/grpc_e2e_performance_gke_experiment.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/tools/internal_ci/linux/grpc_e2e_performance_gke.sh b/tools/internal_ci/linux/grpc_e2e_performance_gke.sh index e2e8fe13e93..16b8307f602 100755 --- a/tools/internal_ci/linux/grpc_e2e_performance_gke.sh +++ b/tools/internal_ci/linux/grpc_e2e_performance_gke.sh @@ -127,6 +127,7 @@ declare -A useLanguage=( [go]=1 [java]=1 [node]=1 + [python]=1 [ruby]=1 ) diff --git a/tools/internal_ci/linux/grpc_e2e_performance_gke_experiment.sh b/tools/internal_ci/linux/grpc_e2e_performance_gke_experiment.sh index d2c17d3d381..c07042527e2 100755 --- a/tools/internal_ci/linux/grpc_e2e_performance_gke_experiment.sh +++ b/tools/internal_ci/linux/grpc_e2e_performance_gke_experiment.sh @@ -122,6 +122,7 @@ declare -A useLanguage=( [go]=1 [java]=1 [node]=1 + [python]=1 [ruby]=1 ) From ac31fb0f61fd056ef6c36968812267b0d598d150 Mon Sep 17 00:00:00 2001 From: Xuan Wang Date: Wed, 25 Sep 2024 10:43:15 -0700 Subject: [PATCH 30/75] [Python example] Fix version in generated code in example folder (#37665) Fix: https://github.com/grpc/grpc/issues/37610 --- examples/python/helloworld/helloworld_pb2_grpc.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/python/helloworld/helloworld_pb2_grpc.py b/examples/python/helloworld/helloworld_pb2_grpc.py index da98363226a..88e6adf4e42 100644 --- a/examples/python/helloworld/helloworld_pb2_grpc.py +++ b/examples/python/helloworld/helloworld_pb2_grpc.py @@ -5,7 +5,7 @@ import warnings import helloworld_pb2 as helloworld__pb2 -GRPC_GENERATED_VERSION = '1.67.0.dev0' +GRPC_GENERATED_VERSION = '1.66.0' GRPC_VERSION = grpc.__version__ _version_not_supported = False From f2ffbb89a2f7456b897e5556782e8639d161a6f6 Mon Sep 17 00:00:00 2001 From: Sreenithi Sridharan <19sreenithi98@gmail.com> Date: Wed, 25 Sep 2024 20:11:10 -0700 Subject: [PATCH 31/75] Add templating and support for Python 3.13 (#37643) This PR adds templating for Python versions and updates the maximum supported Python version to 3.13. The following major changes related to templating are added: - Minimum supported Python version and list of supported versions in `setup.py` are fetched using new template generated files called `python_version.py` - Dockerfiles for the different Python Linux builds are now template generated. - The "Supported Python Versions" section from READMEs of ancillary and main packages have been removed Note: All the `python_version.py` files and Linux build `Dockerfiles` except `tools/dockerfile/grpc_artifact_python_linux_armv7/Dockerfile` in the PR are generated from the respective templates. Further non-templated additions to add support for Python 3.13: - install scripts and artifacts for windows, macos and linux are added manually. Later, these can be templated as well. - updated cython bounds to 3.x - updated twine version to solve [cgi module import error](https://github.com/pypa/twine/issues/1046) - the twine update introduces a dependency on cryptography>=2.0. But the cryptography package doesn't support 32-bit Linux images and hence `twine check` has been disabled for x86 manylinux and x86 musllinux artifacts. Closes #37643 PiperOrigin-RevId: 678954495 --- PYTHON-MANIFEST.in | 1 + WORKSPACE | 2 +- bazel/grpc_python_deps.bzl | 6 +- black.toml | 1 + build_handwritten.yaml | 7 +++ setup.py | 27 +++++---- src/python/grpcio/README.rst | 3 - src/python/grpcio/python_version.py | 20 +++++++ src/python/grpcio_admin/MANIFEST.in | 1 + src/python/grpcio_admin/python_version.py | 20 +++++++ src/python/grpcio_admin/setup.py | 5 +- src/python/grpcio_channelz/MANIFEST.in | 1 + src/python/grpcio_channelz/README.rst | 3 - src/python/grpcio_channelz/grpc_version.py | 2 +- src/python/grpcio_channelz/python_version.py | 20 +++++++ src/python/grpcio_channelz/setup.py | 29 ++++++---- src/python/grpcio_csds/MANIFEST.in | 1 + src/python/grpcio_csds/python_version.py | 20 +++++++ src/python/grpcio_csds/setup.py | 4 +- .../grpcio_csm_observability/MANIFEST.in | 1 + .../grpcio_csm_observability/README.rst | 3 - .../python_version.py | 20 +++++++ src/python/grpcio_csm_observability/setup.py | 4 +- src/python/grpcio_health_checking/MANIFEST.in | 1 + src/python/grpcio_health_checking/README.rst | 3 - .../grpcio_health_checking/python_version.py | 20 +++++++ src/python/grpcio_health_checking/setup.py | 27 +++++---- src/python/grpcio_observability/MANIFEST.in | 1 + src/python/grpcio_observability/README.rst | 3 - .../grpcio_observability/python_version.py | 20 +++++++ src/python/grpcio_observability/setup.py | 3 +- src/python/grpcio_reflection/MANIFEST.in | 1 + src/python/grpcio_reflection/README.rst | 3 - .../grpcio_reflection/python_version.py | 20 +++++++ src/python/grpcio_reflection/setup.py | 27 +++++---- src/python/grpcio_status/MANIFEST.in | 1 + src/python/grpcio_status/README.rst | 3 - src/python/grpcio_status/python_version.py | 20 +++++++ src/python/grpcio_status/setup.py | 27 +++++---- src/python/grpcio_testing/README.rst | 3 - .../python/grpcio/python_version.py.template | 22 +++++++ .../grpcio_admin/python_version.py.template | 22 +++++++ .../grpcio_channelz/grpc_version.py.template | 2 +- .../python_version.py.template | 22 +++++++ .../grpcio_csds/python_version.py.template | 22 +++++++ .../python_version.py.template | 22 +++++++ .../python_version.py.template | 22 +++++++ .../python_version.py.template | 22 +++++++ .../python_version.py.template | 22 +++++++ .../grpcio_status/python_version.py.template | 22 +++++++ .../distrib/python/grpc_version.py.template | 2 +- .../grpc_tools/python_version.py.template | 22 +++++++ .../grpcio_tools/python_version.py.template | 22 +++++++ .../xds_protos/grpc_version.py.template | 2 +- .../xds_protos/python_version.py.template | 22 +++++++ .../dockerfile/ccache_crosscompile.include | 14 +++++ .../dockerfile/compile_python_313.include | 21 +++++++ templates/tools/dockerfile/git_config.include | 22 +++++++ .../Dockerfile.template | 57 +++++++++++++++++++ .../Dockerfile.template | 28 +++++++++ .../Dockerfile.template | 33 +++++++++++ .../Dockerfile.template | 34 +++++++++++ .../Dockerfile.template | 27 +++++++++ .../Dockerfile.template | 25 ++++++++ .../dockerfile/python_pip_builds.include | 8 +++ .../Dockerfile.template | 1 + test/distrib/bazel/python/WORKSPACE | 2 +- .../dockerimage_current_versions.bzl | 14 ++--- tools/bazelify_tests/test/BUILD | 8 +-- ... build_artifact_python_linux_x64_cp313.sh} | 4 +- .../expand_supported_python_versions.py | 33 +++++++++++ tools/distrib/install_all_python_modules.sh | 1 - tools/distrib/python/grpc_version.py | 2 +- tools/distrib/python/grpcio_tools/MANIFEST.in | 2 + .../grpcio_tools/grpc_tools/python_version.py | 20 +++++++ .../python/grpcio_tools/python_version.py | 20 +++++++ tools/distrib/python/grpcio_tools/setup.py | 3 +- tools/distrib/python/xds_protos/MANIFEST.in | 1 + .../distrib/python/xds_protos/grpc_version.py | 2 +- .../python/xds_protos/python_version.py | 20 +++++++ tools/distrib/python/xds_protos/setup.py | 4 +- tools/dockerfile/README.md | 4 ++ ...rtifact_python_linux_armv7.current_version | 2 +- .../Dockerfile | 40 ++++++++++--- ...stall_python_for_wheel_crosscompilation.sh | 2 +- ...thon_manylinux2014_aarch64.current_version | 2 +- .../Dockerfile | 50 +++++++++++----- ...t_python_manylinux2014_x64.current_version | 2 +- .../Dockerfile | 48 +++++++++++----- ...t_python_manylinux2014_x86.current_version | 2 +- .../Dockerfile | 48 +++++++++++----- ...t_python_musllinux_1_1_x64.current_version | 2 +- .../Dockerfile | 52 ++++++++++++----- ...t_python_musllinux_1_1_x86.current_version | 2 +- .../Dockerfile | 50 +++++++++++----- ...ython_debian11_default_x64.current_version | 2 +- .../python_debian11_default_x64/Dockerfile | 22 +++++++ .../install_python_interpreters.ps1 | 17 ++++++ .../helper_scripts/prepare_build_macos_rc | 8 +++ .../helper_scripts/requirements.macos.txt | 2 +- .../macos/grpc_distribtests_python.sh | 12 ++-- tools/run_tests/artifacts/artifact_targets.py | 32 ++++++++--- .../artifacts/build_artifact_python.bat | 2 +- .../artifacts/build_artifact_python.sh | 5 +- tools/run_tests/run_tests.py | 10 ++++ 105 files changed, 1260 insertions(+), 218 deletions(-) create mode 100644 src/python/grpcio/python_version.py create mode 100644 src/python/grpcio_admin/python_version.py create mode 100644 src/python/grpcio_channelz/python_version.py create mode 100644 src/python/grpcio_csds/python_version.py create mode 100644 src/python/grpcio_csm_observability/python_version.py create mode 100644 src/python/grpcio_health_checking/python_version.py create mode 100644 src/python/grpcio_observability/python_version.py create mode 100644 src/python/grpcio_reflection/python_version.py create mode 100644 src/python/grpcio_status/python_version.py create mode 100644 templates/src/python/grpcio/python_version.py.template create mode 100644 templates/src/python/grpcio_admin/python_version.py.template create mode 100644 templates/src/python/grpcio_channelz/python_version.py.template create mode 100644 templates/src/python/grpcio_csds/python_version.py.template create mode 100644 templates/src/python/grpcio_csm_observability/python_version.py.template create mode 100644 templates/src/python/grpcio_health_checking/python_version.py.template create mode 100644 templates/src/python/grpcio_observability/python_version.py.template create mode 100644 templates/src/python/grpcio_reflection/python_version.py.template create mode 100644 templates/src/python/grpcio_status/python_version.py.template create mode 100644 templates/tools/distrib/python/grpcio_tools/grpc_tools/python_version.py.template create mode 100644 templates/tools/distrib/python/grpcio_tools/python_version.py.template create mode 100644 templates/tools/distrib/python/xds_protos/python_version.py.template create mode 100644 templates/tools/dockerfile/ccache_crosscompile.include create mode 100644 templates/tools/dockerfile/compile_python_313.include create mode 100644 templates/tools/dockerfile/git_config.include create mode 100644 templates/tools/dockerfile/grpc_artifact_python_linux_armv7/Dockerfile.template create mode 100644 templates/tools/dockerfile/grpc_artifact_python_manylinux2014_aarch64/Dockerfile.template create mode 100644 templates/tools/dockerfile/grpc_artifact_python_manylinux2014_x64/Dockerfile.template create mode 100644 templates/tools/dockerfile/grpc_artifact_python_manylinux2014_x86/Dockerfile.template create mode 100644 templates/tools/dockerfile/grpc_artifact_python_musllinux_1_1_x64/Dockerfile.template create mode 100644 templates/tools/dockerfile/grpc_artifact_python_musllinux_1_1_x86/Dockerfile.template create mode 100644 templates/tools/dockerfile/python_pip_builds.include rename tools/bazelify_tests/test/{build_artifact_python_linux_x64_cp312.sh => build_artifact_python_linux_x64_cp313.sh} (93%) create mode 100644 tools/buildgen/plugins/expand_supported_python_versions.py create mode 100644 tools/distrib/python/grpcio_tools/grpc_tools/python_version.py create mode 100644 tools/distrib/python/grpcio_tools/python_version.py create mode 100644 tools/distrib/python/xds_protos/python_version.py diff --git a/PYTHON-MANIFEST.in b/PYTHON-MANIFEST.in index dd76dbcf756..b8ab04726ed 100644 --- a/PYTHON-MANIFEST.in +++ b/PYTHON-MANIFEST.in @@ -17,6 +17,7 @@ include src/python/grpcio/_parallel_compile_patch.py include src/python/grpcio/_spawn_patch.py include src/python/grpcio/commands.py include src/python/grpcio/grpc_version.py +include src/python/grpcio/python_version.py include src/python/grpcio/grpc_core_dependencies.py include src/python/grpcio/precompiled.py include src/python/grpcio/support.py diff --git a/WORKSPACE b/WORKSPACE index f88a7790594..675233b2eb1 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -89,7 +89,7 @@ load("@com_google_protobuf//bazel:system_python.bzl", "system_python") system_python( name = "system_python", - minimum_python_version = "3.7", + minimum_python_version = "3.8", ) load("@system_python//:pip.bzl", system_pip_parse = "pip_parse") diff --git a/bazel/grpc_python_deps.bzl b/bazel/grpc_python_deps.bzl index dbfff526a11..44eca11f671 100644 --- a/bazel/grpc_python_deps.bzl +++ b/bazel/grpc_python_deps.bzl @@ -38,9 +38,9 @@ def grpc_python_deps(): http_archive( name = "cython", build_file = "@com_github_grpc_grpc//third_party:cython.BUILD", - sha256 = "a2da56cc22be823acf49741b9aa3aa116d4f07fa8e8b35a3cb08b8447b37c607", - strip_prefix = "cython-0.29.35", + sha256 = "2ec7d66d23d6da2328fb24f5c1bec6c63a59ec2e91027766ab904f417e1078aa", + strip_prefix = "cython-3.0.11", urls = [ - "https://github.com/cython/cython/archive/0.29.35.tar.gz", + "https://github.com/cython/cython/archive/3.0.11.tar.gz", ], ) diff --git a/black.toml b/black.toml index e655f7f8e7e..1a397fea579 100644 --- a/black.toml +++ b/black.toml @@ -15,6 +15,7 @@ extend-exclude = ''' | test/cpp/naming/resolver_component_tests_runner.py # AUTO-GENERATED # AUTO-GENERATED from a template: | grpc_version.py + | python_version.py | src/python/grpcio/grpc_core_dependencies.py | src/python/grpcio/grpc/_grpcio_metadata.py # AUTO-GENERATED BY make_grpcio_tools.py diff --git a/build_handwritten.yaml b/build_handwritten.yaml index 61e73166122..3c0d694d77c 100644 --- a/build_handwritten.yaml +++ b/build_handwritten.yaml @@ -16,6 +16,13 @@ settings: csharp_major_version: 2 g_stands_for: groovy protobuf_version: 3.28.1 + supported_python_versions: + - '3.8' + - '3.9' + - '3.10' + - '3.11' + - '3.12' + - '3.13' version: 1.68.0-dev configs: asan: diff --git a/setup.py b/setup.py index b93637215ff..48bfefe4dba 100644 --- a/setup.py +++ b/setup.py @@ -88,6 +88,7 @@ sys.path.insert(0, os.path.abspath(PYTHON_STEM)) import _parallel_compile_patch import _spawn_patch import grpc_core_dependencies +import python_version import commands import grpc_version @@ -95,19 +96,21 @@ import grpc_version _parallel_compile_patch.monkeypatch_compile_maybe() _spawn_patch.monkeypatch_spawn() + LICENSE = "Apache License 2.0" -CLASSIFIERS = [ - "Development Status :: 5 - Production/Stable", - "Programming Language :: Python", - "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.8", - "Programming Language :: Python :: 3.9", - "Programming Language :: Python :: 3.10", - "Programming Language :: Python :: 3.11", - "Programming Language :: Python :: 3.12", - "License :: OSI Approved :: Apache Software License", -] +CLASSIFIERS = ( + [ + "Development Status :: 5 - Production/Stable", + "Programming Language :: Python", + "Programming Language :: Python :: 3", + ] + + [ + f"Programming Language :: Python :: {x}" + for x in python_version.SUPPORTED_PYTHON_VERSIONS + ] + + ["License :: OSI Approved :: Apache Software License"] +) def _env_bool_value(env_name, default): @@ -596,7 +599,7 @@ setuptools.setup( packages=list(PACKAGES), package_dir=PACKAGE_DIRECTORIES, package_data=PACKAGE_DATA, - python_requires=">=3.8", + python_requires=f">={python_version.MIN_PYTHON_VERSION}", install_requires=INSTALL_REQUIRES, extras_require=EXTRAS_REQUIRES, setup_requires=SETUP_REQUIRES, diff --git a/src/python/grpcio/README.rst b/src/python/grpcio/README.rst index eb2e8a9aa59..cd529ad54f7 100644 --- a/src/python/grpcio/README.rst +++ b/src/python/grpcio/README.rst @@ -8,9 +8,6 @@ Package for gRPC Python. .. |compat_check_pypi| image:: https://python-compatibility-tools.appspot.com/one_badge_image?package=grpcio :target: https://python-compatibility-tools.appspot.com/one_badge_target?package=grpcio -Supported Python Versions -------------------------- -Python >= 3.8 Installation ------------ diff --git a/src/python/grpcio/python_version.py b/src/python/grpcio/python_version.py new file mode 100644 index 00000000000..4faab63465c --- /dev/null +++ b/src/python/grpcio/python_version.py @@ -0,0 +1,20 @@ +# 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. + +# AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio/python_version.py.template`!!! + +SUPPORTED_PYTHON_VERSIONS = ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13'] + +MIN_PYTHON_VERSION = 3.8 +MAX_PYTHON_VERSION = 3.13 diff --git a/src/python/grpcio_admin/MANIFEST.in b/src/python/grpcio_admin/MANIFEST.in index eb7e029a4ba..3cb62658770 100644 --- a/src/python/grpcio_admin/MANIFEST.in +++ b/src/python/grpcio_admin/MANIFEST.in @@ -1,4 +1,5 @@ include grpc_version.py +include python_version.py recursive-include grpc_admin *.py global-exclude *.pyc include LICENSE diff --git a/src/python/grpcio_admin/python_version.py b/src/python/grpcio_admin/python_version.py new file mode 100644 index 00000000000..d47284cb06f --- /dev/null +++ b/src/python/grpcio_admin/python_version.py @@ -0,0 +1,20 @@ +# 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. + +# AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_admin/python_version.py.template`!!! + +SUPPORTED_PYTHON_VERSIONS = ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13'] + +MIN_PYTHON_VERSION = 3.8 +MAX_PYTHON_VERSION = 3.13 diff --git a/src/python/grpcio_admin/setup.py b/src/python/grpcio_admin/setup.py index 4e6bdbc8dd5..30d0ca62a14 100644 --- a/src/python/grpcio_admin/setup.py +++ b/src/python/grpcio_admin/setup.py @@ -25,6 +25,8 @@ _README_PATH = os.path.join(_PACKAGE_PATH, "README.rst") os.chdir(os.path.dirname(os.path.abspath(__file__))) # Break import-style to ensure we can actually find our local modules. +import python_version + import grpc_version CLASSIFIERS = [ @@ -44,6 +46,7 @@ INSTALL_REQUIRES = ( ) SETUP_REQUIRES = INSTALL_REQUIRES + setuptools.setup( name="grpcio-admin", version=grpc_version.VERSION, @@ -56,7 +59,7 @@ setuptools.setup( url="https://grpc.io", package_dir=PACKAGE_DIRECTORIES, packages=setuptools.find_packages("."), - python_requires=">=3.8", + python_requires=f">={python_version.MIN_PYTHON_VERSION}", install_requires=INSTALL_REQUIRES, setup_requires=SETUP_REQUIRES, ) diff --git a/src/python/grpcio_channelz/MANIFEST.in b/src/python/grpcio_channelz/MANIFEST.in index 7354bef4235..14089064dce 100644 --- a/src/python/grpcio_channelz/MANIFEST.in +++ b/src/python/grpcio_channelz/MANIFEST.in @@ -1,4 +1,5 @@ include grpc_version.py +include python_version.py recursive-include grpc_channelz *.py *.pyi global-exclude *.pyc include LICENSE diff --git a/src/python/grpcio_channelz/README.rst b/src/python/grpcio_channelz/README.rst index 027c0d9e10c..26056422143 100644 --- a/src/python/grpcio_channelz/README.rst +++ b/src/python/grpcio_channelz/README.rst @@ -3,9 +3,6 @@ gRPC Python Channelz package Channelz is a live debug tool in gRPC Python. -Supported Python Versions -------------------------- -Python >= 3.8 Dependencies ------------ diff --git a/src/python/grpcio_channelz/grpc_version.py b/src/python/grpcio_channelz/grpc_version.py index de5e63dddcf..fff1849540e 100644 --- a/src/python/grpcio_channelz/grpc_version.py +++ b/src/python/grpcio_channelz/grpc_version.py @@ -12,6 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -# AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_channelz/grpc_version.py.template`!!! +# AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_channelz/python_version.py.template`!!! VERSION = '1.68.0.dev0' diff --git a/src/python/grpcio_channelz/python_version.py b/src/python/grpcio_channelz/python_version.py new file mode 100644 index 00000000000..74755fdb1a9 --- /dev/null +++ b/src/python/grpcio_channelz/python_version.py @@ -0,0 +1,20 @@ +# 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. + +# AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_channelz/python_version.py.template`!!! + +SUPPORTED_PYTHON_VERSIONS = ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13'] + +MIN_PYTHON_VERSION = 3.8 +MAX_PYTHON_VERSION = 3.13 diff --git a/src/python/grpcio_channelz/setup.py b/src/python/grpcio_channelz/setup.py index 034ed814829..222a0d30ca3 100644 --- a/src/python/grpcio_channelz/setup.py +++ b/src/python/grpcio_channelz/setup.py @@ -25,6 +25,8 @@ _README_PATH = os.path.join(_PACKAGE_PATH, "README.rst") os.chdir(os.path.dirname(os.path.abspath(__file__))) # Break import-style to ensure we can actually find our local modules. +import python_version + import grpc_version @@ -44,17 +46,19 @@ class _NoOpCommand(setuptools.Command): pass -CLASSIFIERS = [ - "Development Status :: 5 - Production/Stable", - "Programming Language :: Python", - "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.8", - "Programming Language :: Python :: 3.9", - "Programming Language :: Python :: 3.10", - "Programming Language :: Python :: 3.11", - "Programming Language :: Python :: 3.12", - "License :: OSI Approved :: Apache Software License", -] +CLASSIFIERS = ( + [ + "Development Status :: 5 - Production/Stable", + "Programming Language :: Python", + "Programming Language :: Python :: 3", + ] + + [ + f"Programming Language :: Python :: {x}" + for x in python_version.SUPPORTED_PYTHON_VERSIONS + ] + + ["License :: OSI Approved :: Apache Software License"] +) + PACKAGE_DIRECTORIES = { "": ".", @@ -85,6 +89,7 @@ except ImportError: "build_package_protos": _NoOpCommand, } + setuptools.setup( name="grpcio-channelz", version=grpc_version.VERSION, @@ -97,7 +102,7 @@ setuptools.setup( url="https://grpc.io", package_dir=PACKAGE_DIRECTORIES, packages=setuptools.find_packages("."), - python_requires=">=3.8", + python_requires=f">={python_version.MIN_PYTHON_VERSION}", install_requires=INSTALL_REQUIRES, setup_requires=SETUP_REQUIRES, cmdclass=COMMAND_CLASS, diff --git a/src/python/grpcio_csds/MANIFEST.in b/src/python/grpcio_csds/MANIFEST.in index 4ecdf7428ed..3df9cc3cac2 100644 --- a/src/python/grpcio_csds/MANIFEST.in +++ b/src/python/grpcio_csds/MANIFEST.in @@ -1,4 +1,5 @@ include grpc_version.py +include python_version.py recursive-include grpc_csds *.py global-exclude *.pyc include LICENSE diff --git a/src/python/grpcio_csds/python_version.py b/src/python/grpcio_csds/python_version.py new file mode 100644 index 00000000000..5d9e6b076ea --- /dev/null +++ b/src/python/grpcio_csds/python_version.py @@ -0,0 +1,20 @@ +# 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. + +# AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_csds/python_version.py.template`!!! + +SUPPORTED_PYTHON_VERSIONS = ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13'] + +MIN_PYTHON_VERSION = 3.8 +MAX_PYTHON_VERSION = 3.13 diff --git a/src/python/grpcio_csds/setup.py b/src/python/grpcio_csds/setup.py index 8fb4dab5341..1dc40333f03 100644 --- a/src/python/grpcio_csds/setup.py +++ b/src/python/grpcio_csds/setup.py @@ -25,6 +25,8 @@ _README_PATH = os.path.join(_PACKAGE_PATH, "README.rst") os.chdir(os.path.dirname(os.path.abspath(__file__))) # Break import-style to ensure we can actually find our local modules. +import python_version + import grpc_version CLASSIFIERS = [ @@ -57,7 +59,7 @@ setuptools.setup( url="https://grpc.io", package_dir=PACKAGE_DIRECTORIES, packages=setuptools.find_packages("."), - python_requires=">=3.8", + python_requires=f">={python_version.MIN_PYTHON_VERSION}", install_requires=INSTALL_REQUIRES, setup_requires=SETUP_REQUIRES, ) diff --git a/src/python/grpcio_csm_observability/MANIFEST.in b/src/python/grpcio_csm_observability/MANIFEST.in index 754eb1d7e13..afaf3464883 100644 --- a/src/python/grpcio_csm_observability/MANIFEST.in +++ b/src/python/grpcio_csm_observability/MANIFEST.in @@ -1,4 +1,5 @@ graft src/python/grpcio_csm_observability/grpc_csm_observability.egg-info graft grpc_csm_observability include grpc_version.py +include python_version.py include README.rst diff --git a/src/python/grpcio_csm_observability/README.rst b/src/python/grpcio_csm_observability/README.rst index f2c549afdb1..4725f758140 100644 --- a/src/python/grpcio_csm_observability/README.rst +++ b/src/python/grpcio_csm_observability/README.rst @@ -3,9 +3,6 @@ gRPC Python CSM Observability Package for gRPC Python CSM Observability. -Supported Python Versions -------------------------- -Python >= 3.8 Installation ------------ diff --git a/src/python/grpcio_csm_observability/python_version.py b/src/python/grpcio_csm_observability/python_version.py new file mode 100644 index 00000000000..4309c6a3ce0 --- /dev/null +++ b/src/python/grpcio_csm_observability/python_version.py @@ -0,0 +1,20 @@ +# 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. + +# AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_csm_observability/python_version.py.template`!!! + +SUPPORTED_PYTHON_VERSIONS = ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13'] + +MIN_PYTHON_VERSION = 3.8 +MAX_PYTHON_VERSION = 3.13 diff --git a/src/python/grpcio_csm_observability/setup.py b/src/python/grpcio_csm_observability/setup.py index c9a26db1ed5..ce4ec398a1d 100644 --- a/src/python/grpcio_csm_observability/setup.py +++ b/src/python/grpcio_csm_observability/setup.py @@ -22,6 +22,8 @@ _README_PATH = os.path.join(_PACKAGE_PATH, "README.rst") # Ensure we're in the proper directory whether or not we're being used by pip. os.chdir(os.path.dirname(os.path.abspath(__file__))) +import python_version + import grpc_version CLASSIFIERS = [ @@ -58,6 +60,6 @@ setuptools.setup( classifiers=CLASSIFIERS, package_dir=PACKAGE_DIRECTORIES, packages=setuptools.find_packages("."), - python_requires=">=3.8", + python_requires=f">={python_version.MIN_PYTHON_VERSION}", install_requires=INSTALL_REQUIRES, ) diff --git a/src/python/grpcio_health_checking/MANIFEST.in b/src/python/grpcio_health_checking/MANIFEST.in index 6644074dc22..f68d10ad183 100644 --- a/src/python/grpcio_health_checking/MANIFEST.in +++ b/src/python/grpcio_health_checking/MANIFEST.in @@ -1,4 +1,5 @@ include grpc_version.py +include python_version.py recursive-include grpc_health *.py *.pyi global-exclude *.pyc include LICENSE diff --git a/src/python/grpcio_health_checking/README.rst b/src/python/grpcio_health_checking/README.rst index d13e671eae4..388fe3148fe 100644 --- a/src/python/grpcio_health_checking/README.rst +++ b/src/python/grpcio_health_checking/README.rst @@ -3,9 +3,6 @@ gRPC Python Health Checking Reference package for GRPC Python health checking. -Supported Python Versions -------------------------- -Python >= 3.8 Dependencies ------------ diff --git a/src/python/grpcio_health_checking/python_version.py b/src/python/grpcio_health_checking/python_version.py new file mode 100644 index 00000000000..96e4e2f0e06 --- /dev/null +++ b/src/python/grpcio_health_checking/python_version.py @@ -0,0 +1,20 @@ +# 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. + +# AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_health_checking/python_version.py.template`!!! + +SUPPORTED_PYTHON_VERSIONS = ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13'] + +MIN_PYTHON_VERSION = 3.8 +MAX_PYTHON_VERSION = 3.13 diff --git a/src/python/grpcio_health_checking/setup.py b/src/python/grpcio_health_checking/setup.py index 97a40723097..7d451e63ee6 100644 --- a/src/python/grpcio_health_checking/setup.py +++ b/src/python/grpcio_health_checking/setup.py @@ -24,6 +24,8 @@ _README_PATH = os.path.join(_PACKAGE_PATH, "README.rst") os.chdir(os.path.dirname(os.path.abspath(__file__))) # Break import-style to ensure we can actually find our local modules. +import python_version + import grpc_version @@ -43,17 +45,18 @@ class _NoOpCommand(setuptools.Command): pass -CLASSIFIERS = [ - "Development Status :: 5 - Production/Stable", - "Programming Language :: Python", - "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.8", - "Programming Language :: Python :: 3.9", - "Programming Language :: Python :: 3.10", - "Programming Language :: Python :: 3.11", - "Programming Language :: Python :: 3.12", - "License :: OSI Approved :: Apache Software License", -] +CLASSIFIERS = ( + [ + "Development Status :: 5 - Production/Stable", + "Programming Language :: Python", + "Programming Language :: Python :: 3", + ] + + [ + f"Programming Language :: Python :: {x}" + for x in python_version.SUPPORTED_PYTHON_VERSIONS + ] + + ["License :: OSI Approved :: Apache Software License"] +) PACKAGE_DIRECTORIES = { "": ".", @@ -96,7 +99,7 @@ setuptools.setup( classifiers=CLASSIFIERS, package_dir=PACKAGE_DIRECTORIES, packages=setuptools.find_packages("."), - python_requires=">=3.8", + python_requires=f">={python_version.MIN_PYTHON_VERSION}", install_requires=INSTALL_REQUIRES, setup_requires=SETUP_REQUIRES, cmdclass=COMMAND_CLASS, diff --git a/src/python/grpcio_observability/MANIFEST.in b/src/python/grpcio_observability/MANIFEST.in index 8efdc8f6f21..ffd7f861231 100644 --- a/src/python/grpcio_observability/MANIFEST.in +++ b/src/python/grpcio_observability/MANIFEST.in @@ -4,5 +4,6 @@ graft grpc_root graft third_party include _parallel_compile_patch.py include grpc_version.py +include python_version.py include observability_lib_deps.py include README.rst diff --git a/src/python/grpcio_observability/README.rst b/src/python/grpcio_observability/README.rst index 11ba92f90f5..513ebe02112 100644 --- a/src/python/grpcio_observability/README.rst +++ b/src/python/grpcio_observability/README.rst @@ -17,9 +17,6 @@ Note that while this approach enhances efficiency, it will introduce a slight de time the data is collected and the time it becomes available through Python exporters. -Supported Python Versions -------------------------- -Python >= 3.8 Installation ------------ diff --git a/src/python/grpcio_observability/python_version.py b/src/python/grpcio_observability/python_version.py new file mode 100644 index 00000000000..aca7367b65c --- /dev/null +++ b/src/python/grpcio_observability/python_version.py @@ -0,0 +1,20 @@ +# 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. + +# AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_observability/python_version.py.template`!!! + +SUPPORTED_PYTHON_VERSIONS = ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13'] + +MIN_PYTHON_VERSION = 3.8 +MAX_PYTHON_VERSION = 3.13 diff --git a/src/python/grpcio_observability/setup.py b/src/python/grpcio_observability/setup.py index 60be8deee92..1bf43a8170f 100644 --- a/src/python/grpcio_observability/setup.py +++ b/src/python/grpcio_observability/setup.py @@ -34,6 +34,7 @@ sys.path.insert(0, os.path.abspath(".")) import _parallel_compile_patch import observability_lib_deps +import python_version import grpc_version @@ -287,7 +288,7 @@ setuptools.setup( classifiers=CLASSIFIERS, ext_modules=extension_modules(), packages=list(PACKAGES), - python_requires=">=3.8", + python_requires=f">={python_version.MIN_PYTHON_VERSION}", install_requires=[ "grpcio=={version}".format(version=grpc_version.VERSION), "setuptools>=59.6.0", diff --git a/src/python/grpcio_reflection/MANIFEST.in b/src/python/grpcio_reflection/MANIFEST.in index eefb53d31f8..547bdd27597 100644 --- a/src/python/grpcio_reflection/MANIFEST.in +++ b/src/python/grpcio_reflection/MANIFEST.in @@ -1,4 +1,5 @@ include grpc_version.py +include python_version.py recursive-include grpc_reflection *.py *.pyi global-exclude *.pyc include LICENSE diff --git a/src/python/grpcio_reflection/README.rst b/src/python/grpcio_reflection/README.rst index b954108cc45..abb54a57f14 100644 --- a/src/python/grpcio_reflection/README.rst +++ b/src/python/grpcio_reflection/README.rst @@ -3,9 +3,6 @@ gRPC Python Reflection package Reference package for reflection in GRPC Python. -Supported Python Versions -------------------------- -Python >= 3.8 Dependencies ------------ diff --git a/src/python/grpcio_reflection/python_version.py b/src/python/grpcio_reflection/python_version.py new file mode 100644 index 00000000000..e94e725d14d --- /dev/null +++ b/src/python/grpcio_reflection/python_version.py @@ -0,0 +1,20 @@ +# 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. + +# AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_reflection/python_version.py.template`!!! + +SUPPORTED_PYTHON_VERSIONS = ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13'] + +MIN_PYTHON_VERSION = 3.8 +MAX_PYTHON_VERSION = 3.13 diff --git a/src/python/grpcio_reflection/setup.py b/src/python/grpcio_reflection/setup.py index fd2cd7eb872..ca7e23219fd 100644 --- a/src/python/grpcio_reflection/setup.py +++ b/src/python/grpcio_reflection/setup.py @@ -25,6 +25,8 @@ _README_PATH = os.path.join(_PACKAGE_PATH, "README.rst") os.chdir(os.path.dirname(os.path.abspath(__file__))) # Break import-style to ensure we can actually find our local modules. +import python_version + import grpc_version @@ -44,17 +46,18 @@ class _NoOpCommand(setuptools.Command): pass -CLASSIFIERS = [ - "Development Status :: 5 - Production/Stable", - "Programming Language :: Python", - "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.8", - "Programming Language :: Python :: 3.9", - "Programming Language :: Python :: 3.10", - "Programming Language :: Python :: 3.11", - "Programming Language :: Python :: 3.12", - "License :: OSI Approved :: Apache Software License", -] +CLASSIFIERS = ( + [ + "Development Status :: 5 - Production/Stable", + "Programming Language :: Python", + "Programming Language :: Python :: 3", + ] + + [ + f"Programming Language :: Python :: {x}" + for x in python_version.SUPPORTED_PYTHON_VERSIONS + ] + + ["License :: OSI Approved :: Apache Software License"] +) PACKAGE_DIRECTORIES = { "": ".", @@ -97,7 +100,7 @@ setuptools.setup( url="https://grpc.io", package_dir=PACKAGE_DIRECTORIES, packages=setuptools.find_packages("."), - python_requires=">=3.8", + python_requires=f">={python_version.MIN_PYTHON_VERSION}", install_requires=INSTALL_REQUIRES, setup_requires=SETUP_REQUIRES, cmdclass=COMMAND_CLASS, diff --git a/src/python/grpcio_status/MANIFEST.in b/src/python/grpcio_status/MANIFEST.in index 3ecc88ec2dd..62439177f19 100644 --- a/src/python/grpcio_status/MANIFEST.in +++ b/src/python/grpcio_status/MANIFEST.in @@ -1,4 +1,5 @@ include grpc_version.py +include python_version.py include grpc_status/google/rpc/status.proto recursive-include grpc_status *.py global-exclude *.pyc diff --git a/src/python/grpcio_status/README.rst b/src/python/grpcio_status/README.rst index bfc753c799e..c2c8efcc0c7 100644 --- a/src/python/grpcio_status/README.rst +++ b/src/python/grpcio_status/README.rst @@ -3,9 +3,6 @@ gRPC Python Status Proto Reference package for GRPC Python status proto mapping. -Supported Python Versions -------------------------- -Python >= 3.8 Dependencies ------------ diff --git a/src/python/grpcio_status/python_version.py b/src/python/grpcio_status/python_version.py new file mode 100644 index 00000000000..02de6673e4b --- /dev/null +++ b/src/python/grpcio_status/python_version.py @@ -0,0 +1,20 @@ +# 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. + +# AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_status/python_version.py.template`!!! + +SUPPORTED_PYTHON_VERSIONS = ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13'] + +MIN_PYTHON_VERSION = 3.8 +MAX_PYTHON_VERSION = 3.13 diff --git a/src/python/grpcio_status/setup.py b/src/python/grpcio_status/setup.py index f70013774c9..f98032d28b1 100644 --- a/src/python/grpcio_status/setup.py +++ b/src/python/grpcio_status/setup.py @@ -24,6 +24,8 @@ _README_PATH = os.path.join(_PACKAGE_PATH, "README.rst") os.chdir(os.path.dirname(os.path.abspath(__file__))) # Break import-style to ensure we can actually find our local modules. +import python_version + import grpc_version @@ -43,17 +45,18 @@ class _NoOpCommand(setuptools.Command): pass -CLASSIFIERS = [ - "Development Status :: 5 - Production/Stable", - "Programming Language :: Python", - "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.8", - "Programming Language :: Python :: 3.9", - "Programming Language :: Python :: 3.10", - "Programming Language :: Python :: 3.11", - "Programming Language :: Python :: 3.12", - "License :: OSI Approved :: Apache Software License", -] +CLASSIFIERS = ( + [ + "Development Status :: 5 - Production/Stable", + "Programming Language :: Python", + "Programming Language :: Python :: 3", + ] + + [ + f"Programming Language :: Python :: {x}" + for x in python_version.SUPPORTED_PYTHON_VERSIONS + ] + + ["License :: OSI Approved :: Apache Software License"] +) PACKAGE_DIRECTORIES = { "": ".", @@ -93,7 +96,7 @@ setuptools.setup( classifiers=CLASSIFIERS, package_dir=PACKAGE_DIRECTORIES, packages=setuptools.find_packages("."), - python_requires=">=3.8", + python_requires=f">={python_version.MIN_PYTHON_VERSION}", install_requires=INSTALL_REQUIRES, cmdclass=COMMAND_CLASS, ) diff --git a/src/python/grpcio_testing/README.rst b/src/python/grpcio_testing/README.rst index 1b8de5dca19..34fe05be9dc 100644 --- a/src/python/grpcio_testing/README.rst +++ b/src/python/grpcio_testing/README.rst @@ -3,9 +3,6 @@ gRPC Python Testing Package Testing utilities for gRPC Python -Supported Python Versions -------------------------- -Python >= 3.8 Dependencies ------------ diff --git a/templates/src/python/grpcio/python_version.py.template b/templates/src/python/grpcio/python_version.py.template new file mode 100644 index 00000000000..8c8da439184 --- /dev/null +++ b/templates/src/python/grpcio/python_version.py.template @@ -0,0 +1,22 @@ +%YAML 1.2 +--- | + # 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. + + # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio/python_version.py.template`!!! + + SUPPORTED_PYTHON_VERSIONS = ${settings.supported_python_versions} + + MIN_PYTHON_VERSION = ${settings.min_python_version} + MAX_PYTHON_VERSION = ${settings.max_python_version} diff --git a/templates/src/python/grpcio_admin/python_version.py.template b/templates/src/python/grpcio_admin/python_version.py.template new file mode 100644 index 00000000000..d904c1d7228 --- /dev/null +++ b/templates/src/python/grpcio_admin/python_version.py.template @@ -0,0 +1,22 @@ +%YAML 1.2 +--- | + # 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. + + # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_admin/python_version.py.template`!!! + + SUPPORTED_PYTHON_VERSIONS = ${settings.supported_python_versions} + + MIN_PYTHON_VERSION = ${settings.min_python_version} + MAX_PYTHON_VERSION = ${settings.max_python_version} diff --git a/templates/src/python/grpcio_channelz/grpc_version.py.template b/templates/src/python/grpcio_channelz/grpc_version.py.template index 75d510cd17b..999c1025257 100644 --- a/templates/src/python/grpcio_channelz/grpc_version.py.template +++ b/templates/src/python/grpcio_channelz/grpc_version.py.template @@ -14,6 +14,6 @@ # See the License for the specific language governing permissions and # limitations under the License. - # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_channelz/grpc_version.py.template`!!! + # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_channelz/python_version.py.template`!!! VERSION = '${settings.python_version.pep440()}' diff --git a/templates/src/python/grpcio_channelz/python_version.py.template b/templates/src/python/grpcio_channelz/python_version.py.template new file mode 100644 index 00000000000..e0630bb7aa1 --- /dev/null +++ b/templates/src/python/grpcio_channelz/python_version.py.template @@ -0,0 +1,22 @@ +%YAML 1.2 +--- | + # 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. + + # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_channelz/python_version.py.template`!!! + + SUPPORTED_PYTHON_VERSIONS = ${settings.supported_python_versions} + + MIN_PYTHON_VERSION = ${settings.min_python_version} + MAX_PYTHON_VERSION = ${settings.max_python_version} diff --git a/templates/src/python/grpcio_csds/python_version.py.template b/templates/src/python/grpcio_csds/python_version.py.template new file mode 100644 index 00000000000..a5cc8627ecb --- /dev/null +++ b/templates/src/python/grpcio_csds/python_version.py.template @@ -0,0 +1,22 @@ +%YAML 1.2 +--- | + # 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. + + # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_csds/python_version.py.template`!!! + + SUPPORTED_PYTHON_VERSIONS = ${settings.supported_python_versions} + + MIN_PYTHON_VERSION = ${settings.min_python_version} + MAX_PYTHON_VERSION = ${settings.max_python_version} diff --git a/templates/src/python/grpcio_csm_observability/python_version.py.template b/templates/src/python/grpcio_csm_observability/python_version.py.template new file mode 100644 index 00000000000..2aa52d73111 --- /dev/null +++ b/templates/src/python/grpcio_csm_observability/python_version.py.template @@ -0,0 +1,22 @@ +%YAML 1.2 +--- | + # 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. + + # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_csm_observability/python_version.py.template`!!! + + SUPPORTED_PYTHON_VERSIONS = ${settings.supported_python_versions} + + MIN_PYTHON_VERSION = ${settings.min_python_version} + MAX_PYTHON_VERSION = ${settings.max_python_version} diff --git a/templates/src/python/grpcio_health_checking/python_version.py.template b/templates/src/python/grpcio_health_checking/python_version.py.template new file mode 100644 index 00000000000..6646f69979a --- /dev/null +++ b/templates/src/python/grpcio_health_checking/python_version.py.template @@ -0,0 +1,22 @@ +%YAML 1.2 +--- | + # 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. + + # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_health_checking/python_version.py.template`!!! + + SUPPORTED_PYTHON_VERSIONS = ${settings.supported_python_versions} + + MIN_PYTHON_VERSION = ${settings.min_python_version} + MAX_PYTHON_VERSION = ${settings.max_python_version} diff --git a/templates/src/python/grpcio_observability/python_version.py.template b/templates/src/python/grpcio_observability/python_version.py.template new file mode 100644 index 00000000000..f82b1c2d7a5 --- /dev/null +++ b/templates/src/python/grpcio_observability/python_version.py.template @@ -0,0 +1,22 @@ +%YAML 1.2 +--- | + # 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. + + # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_observability/python_version.py.template`!!! + + SUPPORTED_PYTHON_VERSIONS = ${settings.supported_python_versions} + + MIN_PYTHON_VERSION = ${settings.min_python_version} + MAX_PYTHON_VERSION = ${settings.max_python_version} diff --git a/templates/src/python/grpcio_reflection/python_version.py.template b/templates/src/python/grpcio_reflection/python_version.py.template new file mode 100644 index 00000000000..29d9d47cffc --- /dev/null +++ b/templates/src/python/grpcio_reflection/python_version.py.template @@ -0,0 +1,22 @@ +%YAML 1.2 +--- | + # 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. + + # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_reflection/python_version.py.template`!!! + + SUPPORTED_PYTHON_VERSIONS = ${settings.supported_python_versions} + + MIN_PYTHON_VERSION = ${settings.min_python_version} + MAX_PYTHON_VERSION = ${settings.max_python_version} diff --git a/templates/src/python/grpcio_status/python_version.py.template b/templates/src/python/grpcio_status/python_version.py.template new file mode 100644 index 00000000000..cb6aeda5a05 --- /dev/null +++ b/templates/src/python/grpcio_status/python_version.py.template @@ -0,0 +1,22 @@ +%YAML 1.2 +--- | + # 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. + + # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_status/python_version.py.template`!!! + + SUPPORTED_PYTHON_VERSIONS = ${settings.supported_python_versions} + + MIN_PYTHON_VERSION = ${settings.min_python_version} + MAX_PYTHON_VERSION = ${settings.max_python_version} diff --git a/templates/tools/distrib/python/grpc_version.py.template b/templates/tools/distrib/python/grpc_version.py.template index 5031353b871..0d36735631d 100644 --- a/templates/tools/distrib/python/grpc_version.py.template +++ b/templates/tools/distrib/python/grpc_version.py.template @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. - # AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/distrib/python/grpcio_tools/grpc_version.py.template`!!! + # AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/distrib/python/grpc_version.py.template`!!! VERSION = '${settings.python_version.pep440()}' PROTOBUF_VERSION = '${settings.protobuf_version}' diff --git a/templates/tools/distrib/python/grpcio_tools/grpc_tools/python_version.py.template b/templates/tools/distrib/python/grpcio_tools/grpc_tools/python_version.py.template new file mode 100644 index 00000000000..6e06a5a4bb8 --- /dev/null +++ b/templates/tools/distrib/python/grpcio_tools/grpc_tools/python_version.py.template @@ -0,0 +1,22 @@ +%YAML 1.2 +--- | + # 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. + + # AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/distrib/python/grpcio_tools/grpc_tools/python_version.py.template`!!! + + SUPPORTED_PYTHON_VERSIONS = ${settings.supported_python_versions} + + MIN_PYTHON_VERSION = ${settings.min_python_version} + MAX_PYTHON_VERSION = ${settings.max_python_version} diff --git a/templates/tools/distrib/python/grpcio_tools/python_version.py.template b/templates/tools/distrib/python/grpcio_tools/python_version.py.template new file mode 100644 index 00000000000..a40390110d8 --- /dev/null +++ b/templates/tools/distrib/python/grpcio_tools/python_version.py.template @@ -0,0 +1,22 @@ +%YAML 1.2 +--- | + # 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. + + # AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/distrib/python/grpcio_tools/python_version.py.template`!!! + + SUPPORTED_PYTHON_VERSIONS = ${settings.supported_python_versions} + + MIN_PYTHON_VERSION = ${settings.min_python_version} + MAX_PYTHON_VERSION = ${settings.max_python_version} diff --git a/templates/tools/distrib/python/xds_protos/grpc_version.py.template b/templates/tools/distrib/python/xds_protos/grpc_version.py.template index 7808e28e219..ba301d6b865 100644 --- a/templates/tools/distrib/python/xds_protos/grpc_version.py.template +++ b/templates/tools/distrib/python/xds_protos/grpc_version.py.template @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. - # AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/distrib/python/grpcio_tools/grpc_version.py.template`!!! + # AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/distrib/python/xds_protos/grpc_version.py.template`!!! VERSION = '${settings.python_version.pep440()}' PROTOBUF_VERSION = '${settings.protobuf_version}' diff --git a/templates/tools/distrib/python/xds_protos/python_version.py.template b/templates/tools/distrib/python/xds_protos/python_version.py.template new file mode 100644 index 00000000000..6f9d0562f32 --- /dev/null +++ b/templates/tools/distrib/python/xds_protos/python_version.py.template @@ -0,0 +1,22 @@ +%YAML 1.2 +--- | + # 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. + + # AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/distrib/python/xds_protos/python_version.py.template`!!! + + SUPPORTED_PYTHON_VERSIONS = ${settings.supported_python_versions} + + MIN_PYTHON_VERSION = ${settings.min_python_version} + MAX_PYTHON_VERSION = ${settings.max_python_version} diff --git a/templates/tools/dockerfile/ccache_crosscompile.include b/templates/tools/dockerfile/ccache_crosscompile.include new file mode 100644 index 00000000000..04136e01b53 --- /dev/null +++ b/templates/tools/dockerfile/ccache_crosscompile.include @@ -0,0 +1,14 @@ +#================= +# Install ccache + +# Install ccache from source since ccache 3.x packaged with most linux distributions +# does not support Redis backend for caching. +RUN unset CMAKE_TOOLCHAIN_FILE && unset AS AR CC CPP CXX LD STRIP OBJCOPY ${'\\'} + && curl -sSL -o ccache.tar.gz https://github.com/ccache/ccache/releases/download/v4.7.5/ccache-4.7.5.tar.gz ${'\\'} + && tar -zxf ccache.tar.gz ${'\\'} + && cd ccache-4.7.5 ${'\\'} + && mkdir build && cd build ${'\\'} + && cmake -DCMAKE_BUILD_TYPE=Release -DZSTD_FROM_INTERNET=ON -DHIREDIS_FROM_INTERNET=ON .. ${'\\'} + && make -j4 && make install ${'\\'} + && cd ../.. ${'\\'} + && rm -rf ccache-4.7.5 ccache.tar.gz diff --git a/templates/tools/dockerfile/compile_python_313.include b/templates/tools/dockerfile/compile_python_313.include new file mode 100644 index 00000000000..e7d4bd38a9b --- /dev/null +++ b/templates/tools/dockerfile/compile_python_313.include @@ -0,0 +1,21 @@ +#================= +# Compile CPython 3.13.0rc2 from source + +RUN apt-get update && apt-get install -y zlib1g-dev libssl-dev libsqlite3-dev && apt-get clean +RUN apt-get update && apt-get install -y jq build-essential libffi-dev && apt-get clean + +RUN cd /tmp && ${'\\'} + wget -q https://www.python.org/ftp/python/3.13.0/Python-3.13.0rc2.tgz && ${'\\'} + tar xzvf Python-3.13.0rc2.tgz && ${'\\'} + cd Python-3.13.0rc2 && ${'\\'} + ./configure && ${'\\'} + make -j4 && ${'\\'} + make install + + +RUN cd /tmp && ${'\\'} + echo "ad7f44153649e27ec385e7633e853e03 Python-3.13.0rc2.tgz" > checksum.md5 && ${'\\'} + md5sum -c checksum.md5 + +RUN python3.13 -m ensurepip && ${'\\'} + python3.13 -m pip install coverage diff --git a/templates/tools/dockerfile/git_config.include b/templates/tools/dockerfile/git_config.include new file mode 100644 index 00000000000..ad2ed5f3614 --- /dev/null +++ b/templates/tools/dockerfile/git_config.include @@ -0,0 +1,22 @@ +# TODO: simplify the list of third_party modules list +# NOTE: git>=2.46 allows leading paths like third_party/* to include all subdirectories +# current docker base images use git versions lower than 2.46 and hence require separate configs for each submodule +RUN git config --global --add safe.directory /var/local/jenkins/grpc +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/bloaty +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/xds +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/googleapis +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/googletest +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/opentelemetry +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/opencensus-proto +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/boringssl-with-bazel +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/envoy-api +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/protobuf +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/zlib +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/benchmark +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/re2 +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/abseil-cpp +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/opentelemetry-cpp +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/protoc-gen-validate +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/cares/cares +RUN git config --global protocol.file.allow always \ No newline at end of file diff --git a/templates/tools/dockerfile/grpc_artifact_python_linux_armv7/Dockerfile.template b/templates/tools/dockerfile/grpc_artifact_python_linux_armv7/Dockerfile.template new file mode 100644 index 00000000000..94671a0a585 --- /dev/null +++ b/templates/tools/dockerfile/grpc_artifact_python_linux_armv7/Dockerfile.template @@ -0,0 +1,57 @@ +%YAML 1.2 +--- | + # Copyright 2024 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. + + # The aarch64 wheels are being crosscompiled to allow running the build + # on x64 machine. The dockcross/linux-armv7 image is a x86_64 + # image with crosscompilation toolchain installed + + # AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/dockerfile/grpc_artifact_python_linux_armv7/Dockerfile.template`!!! + FROM dockcross/linux-armv7 + + <%text>RUN apt update && apt install -y build-essential zlib1g-dev libncurses5-dev libgdbm-dev \ + libnss3-dev libssl-dev libreadline-dev libffi-dev && apt-get clean + + ADD install_python_for_wheel_crosscompilation.sh /scripts/install_python_for_wheel_crosscompilation.sh + + RUN /scripts/install_python_for_wheel_crosscompilation.sh "3.8.8" "3.8.8" /opt/python/cp38-cp38 + RUN /scripts/install_python_for_wheel_crosscompilation.sh "3.9.2" "3.9.2" /opt/python/cp39-cp39 + RUN /scripts/install_python_for_wheel_crosscompilation.sh "3.10.0" "3.10.0rc1" /opt/python/cp310-cp310 + RUN /scripts/install_python_for_wheel_crosscompilation.sh "3.11.0" "3.11.0rc1" /opt/python/cp311-cp311 + RUN /scripts/install_python_for_wheel_crosscompilation.sh "3.12.0" "3.12.0rc2" /opt/python/cp312-cp312 + RUN /scripts/install_python_for_wheel_crosscompilation.sh "3.13.0" "3.13.0rc2" /opt/python/cp313-cp313 + + ENV AUDITWHEEL_ARCH armv7l + ENV AUDITWHEEL_PLAT linux_armv7l + + <%include file="../ccache_crosscompile.include"/> + + # The dockcross base of this image sets CC and CXX to absolute paths, which makes it impossible to redirect their invocations + # to ccache via a symlink. Use relative paths instead. + <%text> + ENV CC ${CROSS_TRIPLE}-gcc + ENV CXX ${CROSS_TRIPLE}-g++ + + + # For historical reasons, task_runner.py the script under docker container using "bash -l" + # which loads /etc/profile on startup. dockcross/linux-armv7 is based on an image where + # /etc/profile overwrites contents of PATH (for security reasons) when run as root. + # That causes the crosscompiler binaries located under /usr/xcc/armv7-unknown-linux-gnueabi/bin + # to be removed from PATH. Since in our builds we don't need the /etc/profile for anything, we can just + # truncate it. + # TODO(jtattermusch): Remove this hack when possible. + RUN echo "# file contents removed to avoid resetting PATH set by the docker image" >/etc/profile + + <%include file="../git_config.include"/> diff --git a/templates/tools/dockerfile/grpc_artifact_python_manylinux2014_aarch64/Dockerfile.template b/templates/tools/dockerfile/grpc_artifact_python_manylinux2014_aarch64/Dockerfile.template new file mode 100644 index 00000000000..31c1be4aed5 --- /dev/null +++ b/templates/tools/dockerfile/grpc_artifact_python_manylinux2014_aarch64/Dockerfile.template @@ -0,0 +1,28 @@ +%YAML 1.2 +--- | + # Copyright 2024 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. + + # AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/dockerfile/grpc_artifact_python_manylinux2014_aarch64/Dockerfile.template`!!! + + FROM dockcross/manylinux2014-aarch64:20240812-60fa1b0 + + # manylinux_2_17 is the preferred alias of manylinux2014 + ENV AUDITWHEEL_PLAT manylinux_2_17_$AUDITWHEEL_ARCH + + <%include file="../python_pip_builds.include"/> + + <%include file="../ccache_crosscompile.include"/> + + <%include file="../git_config.include"/> diff --git a/templates/tools/dockerfile/grpc_artifact_python_manylinux2014_x64/Dockerfile.template b/templates/tools/dockerfile/grpc_artifact_python_manylinux2014_x64/Dockerfile.template new file mode 100644 index 00000000000..cf68868594e --- /dev/null +++ b/templates/tools/dockerfile/grpc_artifact_python_manylinux2014_x64/Dockerfile.template @@ -0,0 +1,33 @@ +%YAML 1.2 +--- | + # Copyright 2024 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. + + # Docker file for building gRPC manylinux Python artifacts. + + # AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/dockerfile/grpc_artifact_python_manylinux2014_x64/Dockerfile.template`!!! + + FROM quay.io/pypa/manylinux2014_x86_64:2024-09-09-f386546 + + # manylinux_2_17 is the preferred alias of manylinux2014 + ENV AUDITWHEEL_PLAT manylinux_2_17_$AUDITWHEEL_ARCH + + # TODO(jtattermusch): revisit which of the deps are really required + RUN yum update -y && yum install -y curl-devel expat-devel gettext-devel openssl-devel zlib-devel + + <%include file="../python_pip_builds.include"/> + + <%include file="../ccache.include"/> + + <%include file="../git_config.include"/> \ No newline at end of file diff --git a/templates/tools/dockerfile/grpc_artifact_python_manylinux2014_x86/Dockerfile.template b/templates/tools/dockerfile/grpc_artifact_python_manylinux2014_x86/Dockerfile.template new file mode 100644 index 00000000000..d681fd47354 --- /dev/null +++ b/templates/tools/dockerfile/grpc_artifact_python_manylinux2014_x86/Dockerfile.template @@ -0,0 +1,34 @@ +%YAML 1.2 +--- | + # Copyright 2024 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. + + # Docker file for building gRPC manylinux Python artifacts. + + # AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/dockerfile/grpc_artifact_python_manylinux2014_x86/Dockerfile.template`!!! + + FROM quay.io/pypa/manylinux2014_i686:2024-09-09-f386546 + + # manylinux_2_17 is the preferred alias of manylinux2014 + ENV AUDITWHEEL_PLAT manylinux_2_17_$AUDITWHEEL_ARCH + + # TODO(jtattermusch): revisit which of the deps are really required + RUN yum update -y && yum install -y curl-devel expat-devel gettext-devel openssl-devel zlib-devel + + <%include file="../python_pip_builds.include"/> + + <%include file="../ccache.include"/> + + + <%include file="../git_config.include"/> \ No newline at end of file diff --git a/templates/tools/dockerfile/grpc_artifact_python_musllinux_1_1_x64/Dockerfile.template b/templates/tools/dockerfile/grpc_artifact_python_musllinux_1_1_x64/Dockerfile.template new file mode 100644 index 00000000000..dfb62902711 --- /dev/null +++ b/templates/tools/dockerfile/grpc_artifact_python_musllinux_1_1_x64/Dockerfile.template @@ -0,0 +1,27 @@ +%YAML 1.2 +--- | + # Copyright 2024 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. + + # AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/dockerfile/grpc_artifact_python_musllinux_1_1_x64/Dockerfile.template`!!! + + FROM quay.io/pypa/musllinux_1_1_x86_64:2024-09-09-f386546 + + <%include file="../python_pip_builds.include"/> + + <%include file="../ccache.include"/> + + <%include file="../git_config.include"/> + + RUN apk add openssl openssl-dev \ No newline at end of file diff --git a/templates/tools/dockerfile/grpc_artifact_python_musllinux_1_1_x86/Dockerfile.template b/templates/tools/dockerfile/grpc_artifact_python_musllinux_1_1_x86/Dockerfile.template new file mode 100644 index 00000000000..6f7ca5a52a8 --- /dev/null +++ b/templates/tools/dockerfile/grpc_artifact_python_musllinux_1_1_x86/Dockerfile.template @@ -0,0 +1,25 @@ +%YAML 1.2 +--- | + # Copyright 2024 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. + + # AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/dockerfile/grpc_artifact_python_musllinux_1_1_x86/Dockerfile.template`!!! + + FROM quay.io/pypa/musllinux_1_1_i686:2024-09-09-f386546 + + <%include file="../python_pip_builds.include"/> + + <%include file="../ccache.include"/> + + <%include file="../git_config.include"/> diff --git a/templates/tools/dockerfile/python_pip_builds.include b/templates/tools/dockerfile/python_pip_builds.include new file mode 100644 index 00000000000..e573a063338 --- /dev/null +++ b/templates/tools/dockerfile/python_pip_builds.include @@ -0,0 +1,8 @@ +#=================================== +# Install Python build requirements +RUN /opt/python/cp38-cp38/bin/pip install --upgrade 'cython<4.0.0rc1' +RUN /opt/python/cp39-cp39/bin/pip install --upgrade 'cython<4.0.0rc1' +RUN /opt/python/cp310-cp310/bin/pip install --upgrade 'cython<4.0.0rc1' +RUN /opt/python/cp311-cp311/bin/pip install --upgrade 'cython<4.0.0rc1' +RUN /opt/python/cp312-cp312/bin/pip install --upgrade 'cython<4.0.0rc1' +RUN /opt/python/cp313-cp313/bin/pip install --upgrade 'cython<4.0.0rc1' \ No newline at end of file diff --git a/templates/tools/dockerfile/test/python_debian11_default_x64/Dockerfile.template b/templates/tools/dockerfile/test/python_debian11_default_x64/Dockerfile.template index 0981763f21d..a385ec8d602 100644 --- a/templates/tools/dockerfile/test/python_debian11_default_x64/Dockerfile.template +++ b/templates/tools/dockerfile/test/python_debian11_default_x64/Dockerfile.template @@ -24,6 +24,7 @@ <%include file="../../compile_python_310.include"/> <%include file="../../compile_python_311.include"/> <%include file="../../compile_python_312.include"/> + <%include file="../../compile_python_313.include"/> # Python test coverage requires libsqlite3, and it have # to be installed before Python. diff --git a/test/distrib/bazel/python/WORKSPACE b/test/distrib/bazel/python/WORKSPACE index 3567f8a2ac0..b56055fa741 100644 --- a/test/distrib/bazel/python/WORKSPACE +++ b/test/distrib/bazel/python/WORKSPACE @@ -29,7 +29,7 @@ load("@com_google_protobuf//bazel:system_python.bzl", "system_python") system_python( name = "system_python", - minimum_python_version = "3.7", + minimum_python_version = "3.8", ) load("@system_python//:pip.bzl", "pip_parse") diff --git a/tools/bazelify_tests/dockerimage_current_versions.bzl b/tools/bazelify_tests/dockerimage_current_versions.bzl index 5a349762058..973a649dfe5 100644 --- a/tools/bazelify_tests/dockerimage_current_versions.bzl +++ b/tools/bazelify_tests/dockerimage_current_versions.bzl @@ -63,12 +63,12 @@ DOCKERIMAGE_CURRENT_VERSIONS = { "tools/dockerfile/grpc_artifact_centos6_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_artifact_centos6_x64@sha256:3285047265ea2b7c5d4df4c769b2d05f56288d947c75e16d27ae2dee693f791b", "tools/dockerfile/grpc_artifact_centos6_x86.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_artifact_centos6_x86@sha256:19783239da92208f0f39cf563529cd02e889920497ef81c60d20391fa998af62", "tools/dockerfile/grpc_artifact_protoc_aarch64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_artifact_protoc_aarch64@sha256:a0f6b544c1b2fa75f73b26cb28281917153304e9df2789e93de0732494e6b651", - "tools/dockerfile/grpc_artifact_python_linux_armv7.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_artifact_python_linux_armv7@sha256:f109d6c22cadb053f6843a66ee827d74f34d6cbf75a32f455a9da099ed1bdc9c", - "tools/dockerfile/grpc_artifact_python_manylinux2014_aarch64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_artifact_python_manylinux2014_aarch64@sha256:3f0407d4db904b35a7665c2222db039994cd0c9bdb1a073a653ff8e6940081c9", - "tools/dockerfile/grpc_artifact_python_manylinux2014_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_artifact_python_manylinux2014_x64@sha256:89329900ec7fedc57cd89690acd34d07d726f6b896f60df987867737d0a0f5a8", - "tools/dockerfile/grpc_artifact_python_manylinux2014_x86.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_artifact_python_manylinux2014_x86@sha256:8fce8e094b00935dc1f2640b4c2b10216c5a8711c0f4444efbafcd8c355a75a8", - "tools/dockerfile/grpc_artifact_python_musllinux_1_1_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_artifact_python_musllinux_1_1_x64@sha256:c8e8eb24942a2910197cf5481d61e7cbce68b57bd6f35fae878b043b1f2c38bb", - "tools/dockerfile/grpc_artifact_python_musllinux_1_1_x86.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_artifact_python_musllinux_1_1_x86@sha256:c288f83435186ee675d004ee52c93195a51201bf2b5fe92581584d977a2499a3", + "tools/dockerfile/grpc_artifact_python_linux_armv7.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_artifact_python_linux_armv7@sha256:137616275fe59bf89849f7503779f9a5d9668dbf395fcc79a8221a8c38fa5bac", + "tools/dockerfile/grpc_artifact_python_manylinux2014_aarch64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_artifact_python_manylinux2014_aarch64@sha256:ad3233be3c3ad9e0c4b60f0176a853713a35e5c84ec9d9703996c67fa3e811b6", + "tools/dockerfile/grpc_artifact_python_manylinux2014_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_artifact_python_manylinux2014_x64@sha256:0e102df67f31aeb6afe68250603288c2f1c98ccf360d1c42d751b8451da94b48", + "tools/dockerfile/grpc_artifact_python_manylinux2014_x86.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_artifact_python_manylinux2014_x86@sha256:527e2e9ec4db0c52a53b50abfd59907a1b7e221168dc401686f6a48d33bddc5c", + "tools/dockerfile/grpc_artifact_python_musllinux_1_1_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_artifact_python_musllinux_1_1_x64@sha256:94b57e5ea31ebc29af734474bcaff3074770778e5d27557cdc06d755ee8bc7ed", + "tools/dockerfile/grpc_artifact_python_musllinux_1_1_x86.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_artifact_python_musllinux_1_1_x86@sha256:edf4a0c8333c9309e52f323aa7315bbc0e5643216613cab4ecd2bce3d1ec26c0", "tools/dockerfile/interoptest/grpc_interop_aspnetcore.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_interop_aspnetcore@sha256:8e2e732e78724a8382c340dca72e7653c5f82c251a3110fa2874cc00ba538878", "tools/dockerfile/interoptest/grpc_interop_cxx.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_interop_cxx@sha256:e5a474d33773d52ec6a8abbe2d61ee0c2a9c2b5f48793a5ea3b82c4445becf3f", "tools/dockerfile/interoptest/grpc_interop_dart.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_interop_dart@sha256:4915a280788126dad029858eb384dbbef2dc18cadccb434df6450dfd7a4929f2", @@ -109,7 +109,7 @@ DOCKERIMAGE_CURRENT_VERSIONS = { "tools/dockerfile/test/php7_debian11_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/php7_debian11_x64@sha256:34b02fd66832ebf49601bef95632753e6710a75755401c21332d50056ccd52d2", "tools/dockerfile/test/python_alpine_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/python_alpine_x64@sha256:0a4e3c166fb676d85ea26d9fffec3858d59a2f243a3acc1c2f9bd293a590a98c", "tools/dockerfile/test/python_debian11_default_arm64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/python_debian11_default_arm64@sha256:fccca33a655c7aa89dd7ebd9492cbcc1f636bd2a004cd939d1982cfce3d68326", - "tools/dockerfile/test/python_debian11_default_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/python_debian11_default_x64@sha256:4c539fc93d343324309939c2964204c90f4054cd9eeed093af315cb0f0ef7c26", + "tools/dockerfile/test/python_debian11_default_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/python_debian11_default_x64@sha256:8beca964d6bbb80a8cb4c4628c25e9702b007c97113e74e589fa50c15000738d", "tools/dockerfile/test/rbe_ubuntu2004.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/rbe_ubuntu2004@sha256:b3eb1a17b7b091e3c5648a803076b2c40601242ff91c04d55997af6641305f68", "tools/dockerfile/test/ruby_debian11_arm64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/ruby_debian11_arm64@sha256:d2e79919b2e2d4cc36a29682ecb5170641df4fb506cfb453978ffdeb8a841bd9", "tools/dockerfile/test/ruby_debian11_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/ruby_debian11_x64@sha256:6e8b4696ba0661f11a31ed0992a94d2efcd889a018f57160f0e2fb62963f3593", diff --git a/tools/bazelify_tests/test/BUILD b/tools/bazelify_tests/test/BUILD index 4aefd22e325..dee1d5172aa 100644 --- a/tools/bazelify_tests/test/BUILD +++ b/tools/bazelify_tests/test/BUILD @@ -269,8 +269,8 @@ grpc_build_artifact_task( # Python artifact build tasks grpc_build_artifact_task( - name = "artifact_python_linux_x64_manylinux2014_cp312", - build_script = "build_artifact_python_linux_x64_cp312.sh", + name = "artifact_python_linux_x64_manylinux2014_cp313", + build_script = "build_artifact_python_linux_x64_cp313.sh", docker_image_version = "tools/dockerfile/grpc_artifact_python_manylinux2014_x64.current_version", ) @@ -287,7 +287,7 @@ grpc_build_artifact_task( name = "package_python_linux", # TODO(jtattermusch): add more python artifacts once they are migrated from artifact_targets.py artifact_deps = [ - "artifact_python_linux_x64_manylinux2014_cp312", + "artifact_python_linux_x64_manylinux2014_cp313", "artifact_python_linux_x64_manylinux2014_cp39", ], build_script = "build_package_python_linux.sh", @@ -421,7 +421,7 @@ test_suite( ":artifact_protoc_linux_aarch64_build_test", ":artifact_protoc_linux_x64_build_test", ":artifact_protoc_linux_x86_build_test", - ":artifact_python_linux_x64_manylinux2014_cp312_build_test", + ":artifact_python_linux_x64_manylinux2014_cp313_build_test", ":artifact_python_linux_x64_manylinux2014_cp39_build_test", ":package_csharp_linux_build_test", ":package_python_linux_build_test", diff --git a/tools/bazelify_tests/test/build_artifact_python_linux_x64_cp312.sh b/tools/bazelify_tests/test/build_artifact_python_linux_x64_cp313.sh similarity index 93% rename from tools/bazelify_tests/test/build_artifact_python_linux_x64_cp312.sh rename to tools/bazelify_tests/test/build_artifact_python_linux_x64_cp313.sh index 8604176c82e..d8a0b6b2ec2 100755 --- a/tools/bazelify_tests/test/build_artifact_python_linux_x64_cp312.sh +++ b/tools/bazelify_tests/test/build_artifact_python_linux_x64_cp313.sh @@ -17,8 +17,8 @@ set -ex # env variable values extracted from PythonArtifact in tools/run_tests/artifacts/artifact_targets.py # TODO(jtattermusch): find a better way of configuring the python artifact build (the current approach mostly serves as a demonstration) -export PYTHON=/opt/python/cp312-cp312/bin/python -export PIP=/opt/python/cp312-cp312/bin/pip +export PYTHON=/opt/python/cp313-cp313/bin/python +export PIP=/opt/python/cp313-cp313/bin/pip export GRPC_SKIP_PIP_CYTHON_UPGRADE=TRUE export GRPC_RUN_AUDITWHEEL_REPAIR=TRUE export GRPC_BUILD_GRPCIO_TOOLS_DEPENDENTS=TRUE diff --git a/tools/buildgen/plugins/expand_supported_python_versions.py b/tools/buildgen/plugins/expand_supported_python_versions.py new file mode 100644 index 00000000000..8cc4e814d74 --- /dev/null +++ b/tools/buildgen/plugins/expand_supported_python_versions.py @@ -0,0 +1,33 @@ +# 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. +"""Buildgen python version plugin + +This parses the list of supported python versions from the yaml build file, and +creates custom strings for the minimum and maximum supported python versions. + +""" + + +def mako_plugin(dictionary): + """Expand version numbers: + - for each language, ensure there's a language_version tag in + settings (defaulting to the master version tag) + - expand version strings to major, minor, patch, and tag + """ + + settings = dictionary["settings"] + + supported_python_versions = settings["supported_python_versions"] + settings["min_python_version"] = supported_python_versions[0] + settings["max_python_version"] = supported_python_versions[-1] diff --git a/tools/distrib/install_all_python_modules.sh b/tools/distrib/install_all_python_modules.sh index b23b38cc624..ab5823b9553 100755 --- a/tools/distrib/install_all_python_modules.sh +++ b/tools/distrib/install_all_python_modules.sh @@ -59,4 +59,3 @@ pushd src/python; popd; done popd; - diff --git a/tools/distrib/python/grpc_version.py b/tools/distrib/python/grpc_version.py index 8cec1e10eca..28f793690ef 100644 --- a/tools/distrib/python/grpc_version.py +++ b/tools/distrib/python/grpc_version.py @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -# AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/distrib/python/grpcio_tools/grpc_version.py.template`!!! +# AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/distrib/python/grpc_version.py.template`!!! VERSION = '1.68.0.dev0' PROTOBUF_VERSION = '3.28.1' diff --git a/tools/distrib/python/grpcio_tools/MANIFEST.in b/tools/distrib/python/grpcio_tools/MANIFEST.in index 1393de652a8..e74fde44b91 100644 --- a/tools/distrib/python/grpcio_tools/MANIFEST.in +++ b/tools/distrib/python/grpcio_tools/MANIFEST.in @@ -1,10 +1,12 @@ include _parallel_compile_patch.py include _spawn_patch.py include grpc_version.py +include python_version.py include protoc_deps.py include protoc_lib_deps.py include README.rst include grpc_tools/grpc_version.py +include grpc_tools/python_version.py graft grpc_tools graft grpc_root graft third_party diff --git a/tools/distrib/python/grpcio_tools/grpc_tools/python_version.py b/tools/distrib/python/grpcio_tools/grpc_tools/python_version.py new file mode 100644 index 00000000000..0dcc71c1fda --- /dev/null +++ b/tools/distrib/python/grpcio_tools/grpc_tools/python_version.py @@ -0,0 +1,20 @@ +# 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. + +# AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/distrib/python/grpcio_tools/grpc_tools/python_version.py.template`!!! + +SUPPORTED_PYTHON_VERSIONS = ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13'] + +MIN_PYTHON_VERSION = 3.8 +MAX_PYTHON_VERSION = 3.13 diff --git a/tools/distrib/python/grpcio_tools/python_version.py b/tools/distrib/python/grpcio_tools/python_version.py new file mode 100644 index 00000000000..fc59f030fbb --- /dev/null +++ b/tools/distrib/python/grpcio_tools/python_version.py @@ -0,0 +1,20 @@ +# 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. + +# AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/distrib/python/grpcio_tools/python_version.py.template`!!! + +SUPPORTED_PYTHON_VERSIONS = ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13'] + +MIN_PYTHON_VERSION = 3.8 +MAX_PYTHON_VERSION = 3.13 diff --git a/tools/distrib/python/grpcio_tools/setup.py b/tools/distrib/python/grpcio_tools/setup.py index d0173a61658..5e19b6314ed 100644 --- a/tools/distrib/python/grpcio_tools/setup.py +++ b/tools/distrib/python/grpcio_tools/setup.py @@ -39,6 +39,7 @@ sys.path.insert(0, os.path.abspath(".")) import _parallel_compile_patch import _spawn_patch import protoc_lib_deps +import python_version import grpc_version @@ -329,7 +330,7 @@ setuptools.setup( classifiers=CLASSIFIERS, ext_modules=extension_modules(), packages=setuptools.find_packages("."), - python_requires=">=3.8", + python_requires=f">={python_version.MIN_PYTHON_VERSION}", install_requires=[ "protobuf>=5.26.1,<6.0dev", "grpcio>={version}".format(version=grpc_version.VERSION), diff --git a/tools/distrib/python/xds_protos/MANIFEST.in b/tools/distrib/python/xds_protos/MANIFEST.in index d83c49b9186..3fea17ba661 100644 --- a/tools/distrib/python/xds_protos/MANIFEST.in +++ b/tools/distrib/python/xds_protos/MANIFEST.in @@ -1 +1,2 @@ include grpc_version.py +include python_version.py \ No newline at end of file diff --git a/tools/distrib/python/xds_protos/grpc_version.py b/tools/distrib/python/xds_protos/grpc_version.py index 7add68a0e24..170b505959b 100644 --- a/tools/distrib/python/xds_protos/grpc_version.py +++ b/tools/distrib/python/xds_protos/grpc_version.py @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -# AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/distrib/python/grpcio_tools/grpc_version.py.template`!!! +# AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/distrib/python/xds_protos/grpc_version.py.template`!!! VERSION = '1.68.0.dev0' PROTOBUF_VERSION = '3.28.1' diff --git a/tools/distrib/python/xds_protos/python_version.py b/tools/distrib/python/xds_protos/python_version.py new file mode 100644 index 00000000000..80cce2eb4c5 --- /dev/null +++ b/tools/distrib/python/xds_protos/python_version.py @@ -0,0 +1,20 @@ +# 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. + +# AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/distrib/python/xds_protos/python_version.py.template`!!! + +SUPPORTED_PYTHON_VERSIONS = ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13'] + +MIN_PYTHON_VERSION = 3.8 +MAX_PYTHON_VERSION = 3.13 diff --git a/tools/distrib/python/xds_protos/setup.py b/tools/distrib/python/xds_protos/setup.py index f1c7247cc4b..53a6fbdfecb 100644 --- a/tools/distrib/python/xds_protos/setup.py +++ b/tools/distrib/python/xds_protos/setup.py @@ -19,6 +19,7 @@ import os import setuptools import grpc_version +import python_version WORK_DIR = os.path.dirname(os.path.abspath(__file__)) @@ -44,6 +45,7 @@ INSTALL_REQUIRES = [ SETUP_REQUIRES = INSTALL_REQUIRES + ["grpcio-tools>=1.49.0"] + setuptools.setup( name="xds-protos", version=grpc_version.VERSION, @@ -55,7 +57,7 @@ setuptools.setup( author_email="grpc-io@googlegroups.com", url="https://grpc.io", license="Apache License 2.0", - python_requires=">=3.8", + python_requires=f">={python_version.MIN_PYTHON_VERSION}", install_requires=INSTALL_REQUIRES, setup_requires=SETUP_REQUIRES, classifiers=CLASSIFIERS, diff --git a/tools/dockerfile/README.md b/tools/dockerfile/README.md index 89c599d6079..fbdc872f70f 100644 --- a/tools/dockerfile/README.md +++ b/tools/dockerfile/README.md @@ -37,6 +37,7 @@ If you've made modifications to a dockerfile, you can upload the new version of registry as follows: If you haven't configured authentication in Docker for us-docker.pkg.dev previously, run: + ``` gcloud auth configure-docker us-docker.pkg.dev gcloud auth login @@ -45,6 +46,7 @@ gcloud auth login Rebuild the docker images that have been modified locally and upload the docker images to artifact registry (note that this won't overwrite the "old" versions of the docker image that are already in artifact registry) + ``` # Install qemu, binformat, and configure binfmt interpreters sudo apt-get install binfmt-support qemu-user-static @@ -58,6 +60,7 @@ tools/dockerfile/push_testing_images.sh Build modified docker images locally and don't push to artifact registry. This option is very useful for quick local experiments. The script is much faster if it doesn't have to interact with artifact registry: + ``` # very useful for local experiments LOCAL_ONLY_MODE=true tools/dockerfile/push_testing_images.sh @@ -69,6 +72,7 @@ In the past, our testing docker images were [hosted on dockerhub](https://hub.do but we are in the process of migrating them artifact registry now. This temporary feature might simplify the migration: + ``` # try pull existing images from dockerhub instead of building the from scratch locally. TRANSFER_FROM_DOCKERHUB=true tools/dockerfile/push_testing_images.sh diff --git a/tools/dockerfile/grpc_artifact_python_linux_armv7.current_version b/tools/dockerfile/grpc_artifact_python_linux_armv7.current_version index 2ddbcc9ba32..0a992570421 100644 --- a/tools/dockerfile/grpc_artifact_python_linux_armv7.current_version +++ b/tools/dockerfile/grpc_artifact_python_linux_armv7.current_version @@ -1 +1 @@ -us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_artifact_python_linux_armv7:0b87638ab97b433c6818be5124dcd89d479b3a8b@sha256:f109d6c22cadb053f6843a66ee827d74f34d6cbf75a32f455a9da099ed1bdc9c \ No newline at end of file +us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_artifact_python_linux_armv7:3523bf4a67fa9100deb8f48ee4833cb5a5e97697@sha256:137616275fe59bf89849f7503779f9a5d9668dbf395fcc79a8221a8c38fa5bac \ No newline at end of file diff --git a/tools/dockerfile/grpc_artifact_python_linux_armv7/Dockerfile b/tools/dockerfile/grpc_artifact_python_linux_armv7/Dockerfile index 40a22e6fe54..03aacb23b49 100644 --- a/tools/dockerfile/grpc_artifact_python_linux_armv7/Dockerfile +++ b/tools/dockerfile/grpc_artifact_python_linux_armv7/Dockerfile @@ -1,4 +1,4 @@ -# Copyright 2020 The gRPC Authors +# Copyright 2024 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. @@ -15,6 +15,8 @@ # The aarch64 wheels are being crosscompiled to allow running the build # on x64 machine. The dockcross/linux-armv7 image is a x86_64 # image with crosscompilation toolchain installed + +# AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/dockerfile/grpc_artifact_python_linux_armv7/Dockerfile.template`!!! FROM dockcross/linux-armv7 RUN apt update && apt install -y build-essential zlib1g-dev libncurses5-dev libgdbm-dev \ @@ -22,37 +24,39 @@ RUN apt update && apt install -y build-essential zlib1g-dev libncurses5-dev libg ADD install_python_for_wheel_crosscompilation.sh /scripts/install_python_for_wheel_crosscompilation.sh -RUN /scripts/install_python_for_wheel_crosscompilation.sh "3.6.13" "3.6.13" /opt/python/cp36-cp36m -RUN /scripts/install_python_for_wheel_crosscompilation.sh "3.7.10" "3.7.10" /opt/python/cp37-cp37m RUN /scripts/install_python_for_wheel_crosscompilation.sh "3.8.8" "3.8.8" /opt/python/cp38-cp38 RUN /scripts/install_python_for_wheel_crosscompilation.sh "3.9.2" "3.9.2" /opt/python/cp39-cp39 RUN /scripts/install_python_for_wheel_crosscompilation.sh "3.10.0" "3.10.0rc1" /opt/python/cp310-cp310 RUN /scripts/install_python_for_wheel_crosscompilation.sh "3.11.0" "3.11.0rc1" /opt/python/cp311-cp311 RUN /scripts/install_python_for_wheel_crosscompilation.sh "3.12.0" "3.12.0rc2" /opt/python/cp312-cp312 +RUN /scripts/install_python_for_wheel_crosscompilation.sh "3.13.0" "3.13.0rc2" /opt/python/cp313-cp313 ENV AUDITWHEEL_ARCH armv7l ENV AUDITWHEEL_PLAT linux_armv7l #================= -# Install ccache +# Install ccache # Install ccache from source since ccache 3.x packaged with most linux distributions # does not support Redis backend for caching. -RUN unset CMAKE_TOOLCHAIN_FILE && unset AS AR CC CPP CXX LD \ - && curl -sSL -o ccache.tar.gz https://github.com/ccache/ccache/releases/download/v4.5.1/ccache-4.5.1.tar.gz \ +RUN unset CMAKE_TOOLCHAIN_FILE && unset AS AR CC CPP CXX LD STRIP OBJCOPY \ + && curl -sSL -o ccache.tar.gz https://github.com/ccache/ccache/releases/download/v4.7.5/ccache-4.7.5.tar.gz \ && tar -zxf ccache.tar.gz \ - && cd ccache-4.5.1 \ + && cd ccache-4.7.5 \ && mkdir build && cd build \ && cmake -DCMAKE_BUILD_TYPE=Release -DZSTD_FROM_INTERNET=ON -DHIREDIS_FROM_INTERNET=ON .. \ && make -j4 && make install \ && cd ../.. \ - && rm -rf ccache-4.5.1 ccache.tar.gz + && rm -rf ccache-4.7.5 ccache.tar.gz + # The dockcross base of this image sets CC and CXX to absolute paths, which makes it impossible to redirect their invocations # to ccache via a symlink. Use relative paths instead. + ENV CC ${CROSS_TRIPLE}-gcc ENV CXX ${CROSS_TRIPLE}-g++ + # For historical reasons, task_runner.py the script under docker container using "bash -l" # which loads /etc/profile on startup. dockcross/linux-armv7 is based on an image where # /etc/profile overwrites contents of PATH (for security reasons) when run as root. @@ -62,5 +66,25 @@ ENV CXX ${CROSS_TRIPLE}-g++ # TODO(jtattermusch): Remove this hack when possible. RUN echo "# file contents removed to avoid resetting PATH set by the docker image" >/etc/profile +# TODO: simplify the list of third_party modules list +# NOTE: git>=2.46 allows leading paths like third_party/* to include all subdirectories +# current docker base images use git versions lower than 2.46 and hence require separate configs for each submodule RUN git config --global --add safe.directory /var/local/jenkins/grpc +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/bloaty +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/xds +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/googleapis +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/googletest +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/opentelemetry +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/opencensus-proto +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/boringssl-with-bazel +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/envoy-api +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/protobuf +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/zlib +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/benchmark +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/re2 +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/abseil-cpp +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/opentelemetry-cpp +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/protoc-gen-validate +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/cares/cares RUN git config --global protocol.file.allow always diff --git a/tools/dockerfile/grpc_artifact_python_linux_armv7/install_python_for_wheel_crosscompilation.sh b/tools/dockerfile/grpc_artifact_python_linux_armv7/install_python_for_wheel_crosscompilation.sh index 08c6439d36a..f1f1d39509e 100755 --- a/tools/dockerfile/grpc_artifact_python_linux_armv7/install_python_for_wheel_crosscompilation.sh +++ b/tools/dockerfile/grpc_artifact_python_linux_armv7/install_python_for_wheel_crosscompilation.sh @@ -44,4 +44,4 @@ popd rm -rf "Python-${PYTHON_VERSION}" # install cython and wheel -"${PYTHON_PREFIX}/bin/python3" -m pip install --upgrade 'cython<3.0.0rc1' wheel +"${PYTHON_PREFIX}/bin/python3" -m pip install --upgrade 'cython<4.0.0rc1' wheel diff --git a/tools/dockerfile/grpc_artifact_python_manylinux2014_aarch64.current_version b/tools/dockerfile/grpc_artifact_python_manylinux2014_aarch64.current_version index cdce8e543b4..cf67b251907 100644 --- a/tools/dockerfile/grpc_artifact_python_manylinux2014_aarch64.current_version +++ b/tools/dockerfile/grpc_artifact_python_manylinux2014_aarch64.current_version @@ -1 +1 @@ -us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_artifact_python_manylinux2014_aarch64:cfc9fe0cb36bb4ec8425982fd7f07e4e14bf3941@sha256:3f0407d4db904b35a7665c2222db039994cd0c9bdb1a073a653ff8e6940081c9 \ No newline at end of file +us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_artifact_python_manylinux2014_aarch64:377f694f92dd1b56dff0b0a0f47d6e731200953c@sha256:ad3233be3c3ad9e0c4b60f0176a853713a35e5c84ec9d9703996c67fa3e811b6 \ No newline at end of file diff --git a/tools/dockerfile/grpc_artifact_python_manylinux2014_aarch64/Dockerfile b/tools/dockerfile/grpc_artifact_python_manylinux2014_aarch64/Dockerfile index 8e1c0751a8a..e4c3f8f306c 100644 --- a/tools/dockerfile/grpc_artifact_python_manylinux2014_aarch64/Dockerfile +++ b/tools/dockerfile/grpc_artifact_python_manylinux2014_aarch64/Dockerfile @@ -1,4 +1,4 @@ -# Copyright 2020 The gRPC Authors +# Copyright 2024 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. @@ -12,35 +12,57 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM dockcross/manylinux2014-aarch64:20230905-7b2d74f +# AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/dockerfile/grpc_artifact_python_manylinux2014_aarch64/Dockerfile.template`!!! + +FROM dockcross/manylinux2014-aarch64:20240812-60fa1b0 # manylinux_2_17 is the preferred alias of manylinux2014 ENV AUDITWHEEL_PLAT manylinux_2_17_$AUDITWHEEL_ARCH -################################### +#=================================== # Install Python build requirements -RUN /opt/python/cp36-cp36m/bin/pip install --upgrade 'cython<3.0.0rc1' -RUN /opt/python/cp37-cp37m/bin/pip install --upgrade 'cython<3.0.0rc1' -RUN /opt/python/cp38-cp38/bin/pip install --upgrade 'cython<3.0.0rc1' -RUN /opt/python/cp39-cp39/bin/pip install --upgrade 'cython<3.0.0rc1' -RUN /opt/python/cp310-cp310/bin/pip install --upgrade 'cython<3.0.0rc1' -RUN /opt/python/cp311-cp311/bin/pip install --upgrade 'cython<3.0.0rc1' -RUN /opt/python/cp312-cp312/bin/pip install --upgrade 'cython<3.0.0rc1' +RUN /opt/python/cp38-cp38/bin/pip install --upgrade 'cython<4.0.0rc1' +RUN /opt/python/cp39-cp39/bin/pip install --upgrade 'cython<4.0.0rc1' +RUN /opt/python/cp310-cp310/bin/pip install --upgrade 'cython<4.0.0rc1' +RUN /opt/python/cp311-cp311/bin/pip install --upgrade 'cython<4.0.0rc1' +RUN /opt/python/cp312-cp312/bin/pip install --upgrade 'cython<4.0.0rc1' +RUN /opt/python/cp313-cp313/bin/pip install --upgrade 'cython<4.0.0rc1' #================= -# Install ccache +# Install ccache # Install ccache from source since ccache 3.x packaged with most linux distributions # does not support Redis backend for caching. RUN unset CMAKE_TOOLCHAIN_FILE && unset AS AR CC CPP CXX LD STRIP OBJCOPY \ - && curl -sSL -o ccache.tar.gz https://github.com/ccache/ccache/releases/download/v4.5.1/ccache-4.5.1.tar.gz \ + && curl -sSL -o ccache.tar.gz https://github.com/ccache/ccache/releases/download/v4.7.5/ccache-4.7.5.tar.gz \ && tar -zxf ccache.tar.gz \ - && cd ccache-4.5.1 \ + && cd ccache-4.7.5 \ && mkdir build && cd build \ && cmake -DCMAKE_BUILD_TYPE=Release -DZSTD_FROM_INTERNET=ON -DHIREDIS_FROM_INTERNET=ON .. \ && make -j4 && make install \ && cd ../.. \ - && rm -rf ccache-4.5.1 ccache.tar.gz + && rm -rf ccache-4.7.5 ccache.tar.gz + +# TODO: simplify the list of third_party modules list +# NOTE: git>=2.46 allows leading paths like third_party/* to include all subdirectories +# current docker base images use git versions lower than 2.46 and hence require separate configs for each submodule RUN git config --global --add safe.directory /var/local/jenkins/grpc +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/bloaty +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/xds +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/googleapis +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/googletest +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/opentelemetry +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/opencensus-proto +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/boringssl-with-bazel +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/envoy-api +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/protobuf +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/zlib +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/benchmark +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/re2 +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/abseil-cpp +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/opentelemetry-cpp +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/protoc-gen-validate +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/cares/cares RUN git config --global protocol.file.allow always diff --git a/tools/dockerfile/grpc_artifact_python_manylinux2014_x64.current_version b/tools/dockerfile/grpc_artifact_python_manylinux2014_x64.current_version index c6f58ea8034..b99340a7285 100644 --- a/tools/dockerfile/grpc_artifact_python_manylinux2014_x64.current_version +++ b/tools/dockerfile/grpc_artifact_python_manylinux2014_x64.current_version @@ -1 +1 @@ -us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_artifact_python_manylinux2014_x64:e81af0c6d454929785e8126fc993cbd93da5c014@sha256:89329900ec7fedc57cd89690acd34d07d726f6b896f60df987867737d0a0f5a8 \ No newline at end of file +us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_artifact_python_manylinux2014_x64:379c3240e9fd68b7c13a3b6cb24307a272558494@sha256:0e102df67f31aeb6afe68250603288c2f1c98ccf360d1c42d751b8451da94b48 \ No newline at end of file diff --git a/tools/dockerfile/grpc_artifact_python_manylinux2014_x64/Dockerfile b/tools/dockerfile/grpc_artifact_python_manylinux2014_x64/Dockerfile index ae959de2db4..ea75ed3af7c 100644 --- a/tools/dockerfile/grpc_artifact_python_manylinux2014_x64/Dockerfile +++ b/tools/dockerfile/grpc_artifact_python_manylinux2014_x64/Dockerfile @@ -1,4 +1,4 @@ -# Copyright 2020 The gRPC Authors +# Copyright 2024 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. @@ -14,7 +14,9 @@ # Docker file for building gRPC manylinux Python artifacts. -FROM quay.io/pypa/manylinux2014_x86_64:2023-09-17-ae90a16 +# AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/dockerfile/grpc_artifact_python_manylinux2014_x64/Dockerfile.template`!!! + +FROM quay.io/pypa/manylinux2014_x86_64:2024-09-09-f386546 # manylinux_2_17 is the preferred alias of manylinux2014 ENV AUDITWHEEL_PLAT manylinux_2_17_$AUDITWHEEL_ARCH @@ -22,29 +24,49 @@ ENV AUDITWHEEL_PLAT manylinux_2_17_$AUDITWHEEL_ARCH # TODO(jtattermusch): revisit which of the deps are really required RUN yum update -y && yum install -y curl-devel expat-devel gettext-devel openssl-devel zlib-devel -################################### +#=================================== # Install Python build requirements -RUN /opt/python/cp36-cp36m/bin/pip install --upgrade 'cython<3.0.0rc1' -RUN /opt/python/cp37-cp37m/bin/pip install --upgrade 'cython<3.0.0rc1' -RUN /opt/python/cp38-cp38/bin/pip install --upgrade 'cython<3.0.0rc1' -RUN /opt/python/cp39-cp39/bin/pip install --upgrade 'cython<3.0.0rc1' -RUN /opt/python/cp310-cp310/bin/pip install --upgrade 'cython<3.0.0rc1' -RUN /opt/python/cp311-cp311/bin/pip install --upgrade 'cython<3.0.0rc1' -RUN /opt/python/cp312-cp312/bin/pip install --upgrade 'cython<3.0.0rc1' +RUN /opt/python/cp38-cp38/bin/pip install --upgrade 'cython<4.0.0rc1' +RUN /opt/python/cp39-cp39/bin/pip install --upgrade 'cython<4.0.0rc1' +RUN /opt/python/cp310-cp310/bin/pip install --upgrade 'cython<4.0.0rc1' +RUN /opt/python/cp311-cp311/bin/pip install --upgrade 'cython<4.0.0rc1' +RUN /opt/python/cp312-cp312/bin/pip install --upgrade 'cython<4.0.0rc1' +RUN /opt/python/cp313-cp313/bin/pip install --upgrade 'cython<4.0.0rc1' #================= # Install ccache # Install ccache from source since ccache 3.x packaged with most linux distributions # does not support Redis backend for caching. -RUN curl -sSL -o ccache.tar.gz https://github.com/ccache/ccache/releases/download/v4.5.1/ccache-4.5.1.tar.gz \ +RUN curl -sSL -o ccache.tar.gz https://github.com/ccache/ccache/releases/download/v4.7.5/ccache-4.7.5.tar.gz \ && tar -zxf ccache.tar.gz \ - && cd ccache-4.5.1 \ + && cd ccache-4.7.5 \ && mkdir build && cd build \ && cmake -DCMAKE_BUILD_TYPE=Release -DZSTD_FROM_INTERNET=ON -DHIREDIS_FROM_INTERNET=ON .. \ && make -j4 && make install \ && cd ../.. \ - && rm -rf ccache-4.5.1 ccache.tar.gz + && rm -rf ccache-4.7.5 ccache.tar.gz + +# TODO: simplify the list of third_party modules list +# NOTE: git>=2.46 allows leading paths like third_party/* to include all subdirectories +# current docker base images use git versions lower than 2.46 and hence require separate configs for each submodule RUN git config --global --add safe.directory /var/local/jenkins/grpc +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/bloaty +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/xds +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/googleapis +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/googletest +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/opentelemetry +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/opencensus-proto +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/boringssl-with-bazel +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/envoy-api +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/protobuf +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/zlib +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/benchmark +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/re2 +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/abseil-cpp +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/opentelemetry-cpp +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/protoc-gen-validate +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/cares/cares RUN git config --global protocol.file.allow always \ No newline at end of file diff --git a/tools/dockerfile/grpc_artifact_python_manylinux2014_x86.current_version b/tools/dockerfile/grpc_artifact_python_manylinux2014_x86.current_version index efbb3c35dbe..67a5533afbd 100644 --- a/tools/dockerfile/grpc_artifact_python_manylinux2014_x86.current_version +++ b/tools/dockerfile/grpc_artifact_python_manylinux2014_x86.current_version @@ -1 +1 @@ -us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_artifact_python_manylinux2014_x86:fda00560d600eed356f8d6bef2cc8416d0a6b790@sha256:8fce8e094b00935dc1f2640b4c2b10216c5a8711c0f4444efbafcd8c355a75a8 \ No newline at end of file +us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_artifact_python_manylinux2014_x86:28eec3c9e027fd42f5852f696ed3e47aec91229b@sha256:527e2e9ec4db0c52a53b50abfd59907a1b7e221168dc401686f6a48d33bddc5c \ No newline at end of file diff --git a/tools/dockerfile/grpc_artifact_python_manylinux2014_x86/Dockerfile b/tools/dockerfile/grpc_artifact_python_manylinux2014_x86/Dockerfile index 7736403f098..3ffa2f46bbb 100644 --- a/tools/dockerfile/grpc_artifact_python_manylinux2014_x86/Dockerfile +++ b/tools/dockerfile/grpc_artifact_python_manylinux2014_x86/Dockerfile @@ -1,4 +1,4 @@ -# Copyright 2020 The gRPC Authors +# Copyright 2024 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. @@ -14,7 +14,9 @@ # Docker file for building gRPC manylinux Python artifacts. -FROM quay.io/pypa/manylinux2014_i686:2023-09-17-ae90a16 +# AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/dockerfile/grpc_artifact_python_manylinux2014_x86/Dockerfile.template`!!! + +FROM quay.io/pypa/manylinux2014_i686:2024-09-09-f386546 # manylinux_2_17 is the preferred alias of manylinux2014 ENV AUDITWHEEL_PLAT manylinux_2_17_$AUDITWHEEL_ARCH @@ -22,30 +24,50 @@ ENV AUDITWHEEL_PLAT manylinux_2_17_$AUDITWHEEL_ARCH # TODO(jtattermusch): revisit which of the deps are really required RUN yum update -y && yum install -y curl-devel expat-devel gettext-devel openssl-devel zlib-devel -################################### +#=================================== # Install Python build requirements -RUN /opt/python/cp36-cp36m/bin/pip install --upgrade 'cython<3.0.0rc1' -RUN /opt/python/cp37-cp37m/bin/pip install --upgrade 'cython<3.0.0rc1' -RUN /opt/python/cp38-cp38/bin/pip install --upgrade 'cython<3.0.0rc1' -RUN /opt/python/cp39-cp39/bin/pip install --upgrade 'cython<3.0.0rc1' -RUN /opt/python/cp310-cp310/bin/pip install --upgrade 'cython<3.0.0rc1' -RUN /opt/python/cp311-cp311/bin/pip install --upgrade 'cython<3.0.0rc1' -RUN /opt/python/cp312-cp312/bin/pip install --upgrade 'cython<3.0.0rc1' +RUN /opt/python/cp38-cp38/bin/pip install --upgrade 'cython<4.0.0rc1' +RUN /opt/python/cp39-cp39/bin/pip install --upgrade 'cython<4.0.0rc1' +RUN /opt/python/cp310-cp310/bin/pip install --upgrade 'cython<4.0.0rc1' +RUN /opt/python/cp311-cp311/bin/pip install --upgrade 'cython<4.0.0rc1' +RUN /opt/python/cp312-cp312/bin/pip install --upgrade 'cython<4.0.0rc1' +RUN /opt/python/cp313-cp313/bin/pip install --upgrade 'cython<4.0.0rc1' #================= # Install ccache # Install ccache from source since ccache 3.x packaged with most linux distributions # does not support Redis backend for caching. -RUN curl -sSL -o ccache.tar.gz https://github.com/ccache/ccache/releases/download/v4.5.1/ccache-4.5.1.tar.gz \ +RUN curl -sSL -o ccache.tar.gz https://github.com/ccache/ccache/releases/download/v4.7.5/ccache-4.7.5.tar.gz \ && tar -zxf ccache.tar.gz \ - && cd ccache-4.5.1 \ + && cd ccache-4.7.5 \ && mkdir build && cd build \ && cmake -DCMAKE_BUILD_TYPE=Release -DZSTD_FROM_INTERNET=ON -DHIREDIS_FROM_INTERNET=ON .. \ && make -j4 && make install \ && cd ../.. \ - && rm -rf ccache-4.5.1 ccache.tar.gz + && rm -rf ccache-4.7.5 ccache.tar.gz + +# TODO: simplify the list of third_party modules list +# NOTE: git>=2.46 allows leading paths like third_party/* to include all subdirectories +# current docker base images use git versions lower than 2.46 and hence require separate configs for each submodule RUN git config --global --add safe.directory /var/local/jenkins/grpc +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/bloaty +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/xds +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/googleapis +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/googletest +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/opentelemetry +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/opencensus-proto +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/boringssl-with-bazel +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/envoy-api +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/protobuf +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/zlib +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/benchmark +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/re2 +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/abseil-cpp +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/opentelemetry-cpp +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/protoc-gen-validate +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/cares/cares RUN git config --global protocol.file.allow always \ No newline at end of file diff --git a/tools/dockerfile/grpc_artifact_python_musllinux_1_1_x64.current_version b/tools/dockerfile/grpc_artifact_python_musllinux_1_1_x64.current_version index 5365ea4a4be..af23ed31a5c 100644 --- a/tools/dockerfile/grpc_artifact_python_musllinux_1_1_x64.current_version +++ b/tools/dockerfile/grpc_artifact_python_musllinux_1_1_x64.current_version @@ -1 +1 @@ -us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_artifact_python_musllinux_1_1_x64:2f56fcee2e4964359dddcd57bb9b066ceb8331ec@sha256:c8e8eb24942a2910197cf5481d61e7cbce68b57bd6f35fae878b043b1f2c38bb \ No newline at end of file +us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_artifact_python_musllinux_1_1_x64:1bc8405880fdad2b22f8a6422cd6198b0b54838a@sha256:94b57e5ea31ebc29af734474bcaff3074770778e5d27557cdc06d755ee8bc7ed \ No newline at end of file diff --git a/tools/dockerfile/grpc_artifact_python_musllinux_1_1_x64/Dockerfile b/tools/dockerfile/grpc_artifact_python_musllinux_1_1_x64/Dockerfile index a6eff9bbe71..dc16c9133b7 100644 --- a/tools/dockerfile/grpc_artifact_python_musllinux_1_1_x64/Dockerfile +++ b/tools/dockerfile/grpc_artifact_python_musllinux_1_1_x64/Dockerfile @@ -1,4 +1,4 @@ -# Copyright 2021 The gRPC Authors +# Copyright 2024 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. @@ -12,31 +12,55 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM quay.io/pypa/musllinux_1_1_x86_64:2023-09-17-ae90a16 +# AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/dockerfile/grpc_artifact_python_musllinux_1_1_x64/Dockerfile.template`!!! -################################### +FROM quay.io/pypa/musllinux_1_1_x86_64:2024-09-09-f386546 + +#=================================== # Install Python build requirements -RUN /opt/python/cp36-cp36m/bin/pip install --upgrade 'cython<3.0.0rc1' -RUN /opt/python/cp37-cp37m/bin/pip install --upgrade 'cython<3.0.0rc1' -RUN /opt/python/cp38-cp38/bin/pip install --upgrade 'cython<3.0.0rc1' -RUN /opt/python/cp39-cp39/bin/pip install --upgrade 'cython<3.0.0rc1' -RUN /opt/python/cp310-cp310/bin/pip install --upgrade 'cython<3.0.0rc1' -RUN /opt/python/cp311-cp311/bin/pip install --upgrade 'cython<3.0.0rc1' -RUN /opt/python/cp312-cp312/bin/pip install --upgrade 'cython<3.0.0rc1' +RUN /opt/python/cp38-cp38/bin/pip install --upgrade 'cython<4.0.0rc1' +RUN /opt/python/cp39-cp39/bin/pip install --upgrade 'cython<4.0.0rc1' +RUN /opt/python/cp310-cp310/bin/pip install --upgrade 'cython<4.0.0rc1' +RUN /opt/python/cp311-cp311/bin/pip install --upgrade 'cython<4.0.0rc1' +RUN /opt/python/cp312-cp312/bin/pip install --upgrade 'cython<4.0.0rc1' +RUN /opt/python/cp313-cp313/bin/pip install --upgrade 'cython<4.0.0rc1' #================= # Install ccache # Install ccache from source since ccache 3.x packaged with most linux distributions # does not support Redis backend for caching. -RUN curl -sSL -o ccache.tar.gz https://github.com/ccache/ccache/releases/download/v4.5.1/ccache-4.5.1.tar.gz \ +RUN curl -sSL -o ccache.tar.gz https://github.com/ccache/ccache/releases/download/v4.7.5/ccache-4.7.5.tar.gz \ && tar -zxf ccache.tar.gz \ - && cd ccache-4.5.1 \ + && cd ccache-4.7.5 \ && mkdir build && cd build \ && cmake -DCMAKE_BUILD_TYPE=Release -DZSTD_FROM_INTERNET=ON -DHIREDIS_FROM_INTERNET=ON .. \ && make -j4 && make install \ && cd ../.. \ - && rm -rf ccache-4.5.1 ccache.tar.gz + && rm -rf ccache-4.7.5 ccache.tar.gz + +# TODO: simplify the list of third_party modules list +# NOTE: git>=2.46 allows leading paths like third_party/* to include all subdirectories +# current docker base images use git versions lower than 2.46 and hence require separate configs for each submodule RUN git config --global --add safe.directory /var/local/jenkins/grpc -RUN git config --global protocol.file.allow always \ No newline at end of file +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/bloaty +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/xds +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/googleapis +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/googletest +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/opentelemetry +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/opencensus-proto +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/boringssl-with-bazel +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/envoy-api +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/protobuf +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/zlib +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/benchmark +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/re2 +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/abseil-cpp +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/opentelemetry-cpp +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/protoc-gen-validate +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/cares/cares +RUN git config --global protocol.file.allow always + +RUN apk add openssl openssl-dev \ No newline at end of file diff --git a/tools/dockerfile/grpc_artifact_python_musllinux_1_1_x86.current_version b/tools/dockerfile/grpc_artifact_python_musllinux_1_1_x86.current_version index c30b39b356a..ba2e0cac19a 100644 --- a/tools/dockerfile/grpc_artifact_python_musllinux_1_1_x86.current_version +++ b/tools/dockerfile/grpc_artifact_python_musllinux_1_1_x86.current_version @@ -1 +1 @@ -us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_artifact_python_musllinux_1_1_x86:9308dccacd76fb1782a43d97e6f5062b5b58576d@sha256:c288f83435186ee675d004ee52c93195a51201bf2b5fe92581584d977a2499a3 \ No newline at end of file +us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_artifact_python_musllinux_1_1_x86:358044420e0991fe284f49848145d5145cff42ac@sha256:edf4a0c8333c9309e52f323aa7315bbc0e5643216613cab4ecd2bce3d1ec26c0 \ No newline at end of file diff --git a/tools/dockerfile/grpc_artifact_python_musllinux_1_1_x86/Dockerfile b/tools/dockerfile/grpc_artifact_python_musllinux_1_1_x86/Dockerfile index c7ac549e98f..6509ab15003 100644 --- a/tools/dockerfile/grpc_artifact_python_musllinux_1_1_x86/Dockerfile +++ b/tools/dockerfile/grpc_artifact_python_musllinux_1_1_x86/Dockerfile @@ -1,4 +1,4 @@ -# Copyright 2021 The gRPC Authors +# Copyright 2024 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. @@ -12,31 +12,53 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM quay.io/pypa/musllinux_1_1_i686:2023-09-17-ae90a16 +# AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/dockerfile/grpc_artifact_python_musllinux_1_1_x86/Dockerfile.template`!!! -################################### +FROM quay.io/pypa/musllinux_1_1_i686:2024-09-09-f386546 + +#=================================== # Install Python build requirements -RUN /opt/python/cp36-cp36m/bin/pip install --upgrade 'cython<3.0.0rc1' -RUN /opt/python/cp37-cp37m/bin/pip install --upgrade 'cython<3.0.0rc1' -RUN /opt/python/cp38-cp38/bin/pip install --upgrade 'cython<3.0.0rc1' -RUN /opt/python/cp39-cp39/bin/pip install --upgrade 'cython<3.0.0rc1' -RUN /opt/python/cp310-cp310/bin/pip install --upgrade 'cython<3.0.0rc1' -RUN /opt/python/cp311-cp311/bin/pip install --upgrade 'cython<3.0.0rc1' -RUN /opt/python/cp312-cp312/bin/pip install --upgrade 'cython<3.0.0rc1' +RUN /opt/python/cp38-cp38/bin/pip install --upgrade 'cython<4.0.0rc1' +RUN /opt/python/cp39-cp39/bin/pip install --upgrade 'cython<4.0.0rc1' +RUN /opt/python/cp310-cp310/bin/pip install --upgrade 'cython<4.0.0rc1' +RUN /opt/python/cp311-cp311/bin/pip install --upgrade 'cython<4.0.0rc1' +RUN /opt/python/cp312-cp312/bin/pip install --upgrade 'cython<4.0.0rc1' +RUN /opt/python/cp313-cp313/bin/pip install --upgrade 'cython<4.0.0rc1' #================= # Install ccache # Install ccache from source since ccache 3.x packaged with most linux distributions # does not support Redis backend for caching. -RUN curl -sSL -o ccache.tar.gz https://github.com/ccache/ccache/releases/download/v4.5.1/ccache-4.5.1.tar.gz \ +RUN curl -sSL -o ccache.tar.gz https://github.com/ccache/ccache/releases/download/v4.7.5/ccache-4.7.5.tar.gz \ && tar -zxf ccache.tar.gz \ - && cd ccache-4.5.1 \ + && cd ccache-4.7.5 \ && mkdir build && cd build \ && cmake -DCMAKE_BUILD_TYPE=Release -DZSTD_FROM_INTERNET=ON -DHIREDIS_FROM_INTERNET=ON .. \ && make -j4 && make install \ && cd ../.. \ - && rm -rf ccache-4.5.1 ccache.tar.gz + && rm -rf ccache-4.7.5 ccache.tar.gz + +# TODO: simplify the list of third_party modules list +# NOTE: git>=2.46 allows leading paths like third_party/* to include all subdirectories +# current docker base images use git versions lower than 2.46 and hence require separate configs for each submodule RUN git config --global --add safe.directory /var/local/jenkins/grpc -RUN git config --global protocol.file.allow always \ No newline at end of file +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/bloaty +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/xds +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/googleapis +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/googletest +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/opentelemetry +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/opencensus-proto +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/boringssl-with-bazel +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/envoy-api +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/protobuf +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/zlib +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/benchmark +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/re2 +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/abseil-cpp +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/opentelemetry-cpp +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/protoc-gen-validate +RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/cares/cares +RUN git config --global protocol.file.allow always diff --git a/tools/dockerfile/test/python_debian11_default_x64.current_version b/tools/dockerfile/test/python_debian11_default_x64.current_version index 70b0383e90a..8b82524dba6 100644 --- a/tools/dockerfile/test/python_debian11_default_x64.current_version +++ b/tools/dockerfile/test/python_debian11_default_x64.current_version @@ -1 +1 @@ -us-docker.pkg.dev/grpc-testing/testing-images-public/python_debian11_default_x64:05951fbd0e77e8ba072d270ad08f0d4b6ac00841@sha256:4c539fc93d343324309939c2964204c90f4054cd9eeed093af315cb0f0ef7c26 \ No newline at end of file +us-docker.pkg.dev/grpc-testing/testing-images-public/python_debian11_default_x64:224d8dc6c8287ee247378888ac93b9fe9e36ec8c@sha256:8beca964d6bbb80a8cb4c4628c25e9702b007c97113e74e589fa50c15000738d \ No newline at end of file diff --git a/tools/dockerfile/test/python_debian11_default_x64/Dockerfile b/tools/dockerfile/test/python_debian11_default_x64/Dockerfile index 2ba17722bce..e7c2c9a658d 100644 --- a/tools/dockerfile/test/python_debian11_default_x64/Dockerfile +++ b/tools/dockerfile/test/python_debian11_default_x64/Dockerfile @@ -173,6 +173,28 @@ RUN cd /tmp && \ RUN python3.12 -m ensurepip && \ python3.12 -m pip install coverage +#================= +# Compile CPython 3.13.0rc2 from source + +RUN apt-get update && apt-get install -y zlib1g-dev libssl-dev libsqlite3-dev && apt-get clean +RUN apt-get update && apt-get install -y jq build-essential libffi-dev && apt-get clean + +RUN cd /tmp && \ + wget -q https://www.python.org/ftp/python/3.13.0/Python-3.13.0rc2.tgz && \ + tar xzvf Python-3.13.0rc2.tgz && \ + cd Python-3.13.0rc2 && \ + ./configure && \ + make -j4 && \ + make install + + +RUN cd /tmp && \ + echo "ad7f44153649e27ec385e7633e853e03 Python-3.13.0rc2.tgz" > checksum.md5 && \ + md5sum -c checksum.md5 + +RUN python3.13 -m ensurepip && \ + python3.13 -m pip install coverage + # Python test coverage requires libsqlite3, and it have # to be installed before Python. diff --git a/tools/internal_ci/helper_scripts/install_python_interpreters.ps1 b/tools/internal_ci/helper_scripts/install_python_interpreters.ps1 index 902fa3b0965..ddeaad711f8 100644 --- a/tools/internal_ci/helper_scripts/install_python_interpreters.ps1 +++ b/tools/internal_ci/helper_scripts/install_python_interpreters.ps1 @@ -149,3 +149,20 @@ $Python312x64Config = @{ PythonInstallerHash = "ea1993b5227fa4c8f45a06f5fbdd23b3" } Install-Python @Python312x64Config + +# Python 3.13 +$Python313x86Config = @{ + PythonVersion = "3.13.0" + PythonInstaller = "python-3.13.0rc2" + PythonInstallPath = "C:\Python313_32bit" + PythonInstallerHash = "647f429b5584d9ee2dd02fdc9c61a38e" +} +Install-Python @Python313x86Config + +$Python313x64Config = @{ + PythonVersion = "3.13.0" + PythonInstaller = "python-3.13.0rc2-amd64" + PythonInstallPath = "C:\Python313" + PythonInstallerHash = "0af5ad8734962267323ef45f384de3aa" +} +Install-Python @Python313x64Config \ No newline at end of file diff --git a/tools/internal_ci/helper_scripts/prepare_build_macos_rc b/tools/internal_ci/helper_scripts/prepare_build_macos_rc index 8b3de1ab8ff..1cfd4cba7ce 100644 --- a/tools/internal_ci/helper_scripts/prepare_build_macos_rc +++ b/tools/internal_ci/helper_scripts/prepare_build_macos_rc @@ -176,6 +176,14 @@ then shasum -c /tmp/python_installer_checksum.sha256 time sudo installer -pkg ./python-3.12.0rc2-macos11.pkg -target / fi + + # Install Python 3.13 if it doesn't exist + if [ ! -f "/usr/local/bin/python3.13" ]; then + time curl -O https://www.python.org/ftp/python/3.13.0/python-3.13.0rc2-macos11.pkg + echo "75579065f9ee5c25207353fbe0f79275123ff556 python-3.13.0rc2-macos11.pkg" > /tmp/python_installer_checksum.sha256 + shasum -c /tmp/python_installer_checksum.sha256 + time sudo installer -pkg ./python-3.13.0rc2-macos11.pkg -target / + fi fi if [ "${PREPARE_BUILD_INSTALL_DEPS_CSHARP}" == "true" ] diff --git a/tools/internal_ci/helper_scripts/requirements.macos.txt b/tools/internal_ci/helper_scripts/requirements.macos.txt index 59a759b0ce2..57c4fb7abf5 100644 --- a/tools/internal_ci/helper_scripts/requirements.macos.txt +++ b/tools/internal_ci/helper_scripts/requirements.macos.txt @@ -1,4 +1,4 @@ -cython<3.0.0rc1 +cython<4.0.0rc1 cryptography==3.4.6 PyJWT==2.0.1 pyOpenSSL==20.0.1 diff --git a/tools/internal_ci/macos/grpc_distribtests_python.sh b/tools/internal_ci/macos/grpc_distribtests_python.sh index 8bd18de2e1d..fa651af4e8a 100644 --- a/tools/internal_ci/macos/grpc_distribtests_python.sh +++ b/tools/internal_ci/macos/grpc_distribtests_python.sh @@ -26,12 +26,12 @@ source tools/internal_ci/helper_scripts/prepare_build_macos_rc # TODO(jtattermusch): cleanup this prepare build step (needed for python artifact build) # install cython for all python versions -python3.7 -m pip install -U 'cython<3.0.0rc1' setuptools==65.4.1 wheel --user -python3.8 -m pip install -U 'cython<3.0.0rc1' setuptools==65.4.1 wheel --user -python3.9 -m pip install -U 'cython<3.0.0rc1' setuptools==65.4.1 wheel --user -python3.10 -m pip install -U 'cython<3.0.0rc1' setuptools==65.4.1 wheel --user -python3.11 -m pip install -U 'cython<3.0.0rc1' setuptools==65.4.1 wheel --user -python3.12 -m pip install -U 'cython<3.0.0rc1' setuptools==65.4.1 wheel --user +python3.8 -m pip install -U 'cython<4.0.0rc1' setuptools==65.4.1 wheel --user +python3.9 -m pip install -U 'cython<4.0.0rc1' setuptools==65.4.1 wheel --user +python3.10 -m pip install -U 'cython<4.0.0rc1' setuptools==65.4.1 wheel --user +python3.11 -m pip install -U 'cython<4.0.0rc1' setuptools==65.4.1 wheel --user +python3.12 -m pip install -U 'cython<4.0.0rc1' setuptools==65.4.1 wheel --user +python3.13 -m pip install -U 'cython<4.0.0rc1' setuptools==65.4.1 wheel --user # Build all python macos artifacts (this step actually builds all the binary wheels and source archives) tools/run_tests/task_runner.py -f artifact macos python ${TASK_RUNNER_EXTRA_FILTERS} -j 2 -x build_artifacts/sponge_log.xml || FAILED="true" diff --git a/tools/run_tests/artifacts/artifact_targets.py b/tools/run_tests/artifacts/artifact_targets.py index 3146af9266a..6f00c17fa03 100644 --- a/tools/run_tests/artifacts/artifact_targets.py +++ b/tools/run_tests/artifacts/artifact_targets.py @@ -165,6 +165,7 @@ class PythonArtifact: elif "manylinux" in self.platform: if self.arch == "x86": environ["SETARCH_CMD"] = "linux32" + environ["GRPC_SKIP_TWINE_CHECK"] = "TRUE" # Inside the manylinux container, the python installations are located in # special places... environ["PYTHON"] = "/opt/python/{}/bin/python".format( @@ -201,6 +202,10 @@ class PythonArtifact: environ["GRPC_SKIP_PIP_CYTHON_UPGRADE"] = "TRUE" environ["GRPC_RUN_AUDITWHEEL_REPAIR"] = "TRUE" environ["GRPC_PYTHON_BUILD_WITH_STATIC_LIBSTDCXX"] = "TRUE" + + if self.arch == "x86": + environ["GRPC_SKIP_TWINE_CHECK"] = "TRUE" + return create_docker_jobspec( self.name, "tools/dockerfile/grpc_artifact_python_%s_%s" @@ -401,15 +406,17 @@ def targets(): PythonArtifact("manylinux2014", "x64", "cp39-cp39", presubmit=True), PythonArtifact("manylinux2014", "x64", "cp310-cp310"), PythonArtifact("manylinux2014", "x64", "cp311-cp311"), + PythonArtifact("manylinux2014", "x64", "cp312-cp312"), PythonArtifact( - "manylinux2014", "x64", "cp312-cp312", presubmit=True + "manylinux2014", "x64", "cp313-cp313", presubmit=True ), PythonArtifact("manylinux2014", "x86", "cp38-cp38", presubmit=True), PythonArtifact("manylinux2014", "x86", "cp39-cp39", presubmit=True), PythonArtifact("manylinux2014", "x86", "cp310-cp310"), PythonArtifact("manylinux2014", "x86", "cp311-cp311"), + PythonArtifact("manylinux2014", "x86", "cp312-cp312"), PythonArtifact( - "manylinux2014", "x86", "cp312-cp312", presubmit=True + "manylinux2014", "x86", "cp313-cp313", presubmit=True ), PythonArtifact( "manylinux2014", "aarch64", "cp38-cp38", presubmit=True @@ -417,45 +424,52 @@ def targets(): PythonArtifact("manylinux2014", "aarch64", "cp39-cp39"), PythonArtifact("manylinux2014", "aarch64", "cp310-cp310"), PythonArtifact("manylinux2014", "aarch64", "cp311-cp311"), + PythonArtifact("manylinux2014", "aarch64", "cp312-cp312"), PythonArtifact( - "manylinux2014", "aarch64", "cp312-cp312", presubmit=True + "manylinux2014", "aarch64", "cp313-cp313", presubmit=True ), PythonArtifact("linux_extra", "armv7", "cp38-cp38", presubmit=True), PythonArtifact("linux_extra", "armv7", "cp39-cp39"), PythonArtifact("linux_extra", "armv7", "cp310-cp310"), PythonArtifact("linux_extra", "armv7", "cp311-cp311"), + PythonArtifact("linux_extra", "armv7", "cp312-cp312"), PythonArtifact( - "linux_extra", "armv7", "cp312-cp312", presubmit=True + "linux_extra", "armv7", "cp313-cp313", presubmit=True ), PythonArtifact("musllinux_1_1", "x64", "cp38-cp38", presubmit=True), PythonArtifact("musllinux_1_1", "x64", "cp39-cp39"), PythonArtifact("musllinux_1_1", "x64", "cp310-cp310"), PythonArtifact("musllinux_1_1", "x64", "cp311-cp311"), + PythonArtifact("musllinux_1_1", "x64", "cp312-cp312"), PythonArtifact( - "musllinux_1_1", "x64", "cp312-cp312", presubmit=True + "musllinux_1_1", "x64", "cp313-cp313", presubmit=True ), PythonArtifact("musllinux_1_1", "x86", "cp38-cp38", presubmit=True), PythonArtifact("musllinux_1_1", "x86", "cp39-cp39"), PythonArtifact("musllinux_1_1", "x86", "cp310-cp310"), PythonArtifact("musllinux_1_1", "x86", "cp311-cp311"), + PythonArtifact("musllinux_1_1", "x86", "cp312-cp312"), PythonArtifact( - "musllinux_1_1", "x86", "cp312-cp312", presubmit=True + "musllinux_1_1", "x86", "cp313-cp313", presubmit=True ), PythonArtifact("macos", "x64", "python3.8", presubmit=True), PythonArtifact("macos", "x64", "python3.9"), PythonArtifact("macos", "x64", "python3.10"), PythonArtifact("macos", "x64", "python3.11"), - PythonArtifact("macos", "x64", "python3.12", presubmit=True), + PythonArtifact("macos", "x64", "python3.12"), + PythonArtifact("macos", "x64", "python3.13", presubmit=True), PythonArtifact("windows", "x86", "Python38_32bit", presubmit=True), PythonArtifact("windows", "x86", "Python39_32bit"), PythonArtifact("windows", "x86", "Python310_32bit"), PythonArtifact("windows", "x86", "Python311_32bit"), - PythonArtifact("windows", "x86", "Python312_32bit", presubmit=True), + PythonArtifact("windows", "x86", "Python312_32bit"), + PythonArtifact("windows", "x86", "Python313_32bit", presubmit=True), PythonArtifact("windows", "x64", "Python38", presubmit=True), PythonArtifact("windows", "x64", "Python39"), PythonArtifact("windows", "x64", "Python310"), PythonArtifact("windows", "x64", "Python311"), - PythonArtifact("windows", "x64", "Python312", presubmit=True), + PythonArtifact("windows", "x64", "Python312"), + PythonArtifact("windows", "x64", "Python313", presubmit=True), RubyArtifact("linux", "x86-mingw32", presubmit=True), RubyArtifact("linux", "x64-mingw32", presubmit=True), RubyArtifact("linux", "x64-mingw-ucrt", presubmit=True), diff --git a/tools/run_tests/artifacts/build_artifact_python.bat b/tools/run_tests/artifacts/build_artifact_python.bat index ee17381bc1b..4ac49183af4 100644 --- a/tools/run_tests/artifacts/build_artifact_python.bat +++ b/tools/run_tests/artifacts/build_artifact_python.bat @@ -56,7 +56,7 @@ python setup.py bdist_wheel || goto :error popd @rem Ensure the generate artifacts are valid. -python -m pip install packaging==21.3 twine==3.8.0 +python -m pip install packaging==21.3 twine==5.0.0 python -m twine check dist\* tools\distrib\python\grpcio_tools\dist\* || goto :error xcopy /Y /I /S dist\* %ARTIFACT_DIR% || goto :error diff --git a/tools/run_tests/artifacts/build_artifact_python.sh b/tools/run_tests/artifacts/build_artifact_python.sh index 1598d2edc18..b00ae1e372c 100755 --- a/tools/run_tests/artifacts/build_artifact_python.sh +++ b/tools/run_tests/artifacts/build_artifact_python.sh @@ -39,7 +39,7 @@ then # Any installation step is a potential source of breakages, # so we are trying to perform as few download-and-install operations # as possible. - "${PYTHON}" -m pip install --upgrade 'cython<3.0.0rc1' + "${PYTHON}" -m pip install --upgrade 'cython<4.0.0rc1' fi # Allow build_ext to build C/C++ files in parallel @@ -167,7 +167,8 @@ then "${PYTHON}" -m pip install virtualenv "${PYTHON}" -m virtualenv venv || { "${PYTHON}" -m pip install virtualenv==20.0.23 && "${PYTHON}" -m virtualenv venv; } # Ensure the generated artifacts are valid using "twine check" - venv/bin/python -m pip install "twine<=2.0" "readme_renderer<40.0" + # pinning twine's dependency package `cryptography` version to 3.3.2 (last version without Rust dependency) + venv/bin/python -m pip install "cryptography==3.3.2" "twine==5.0.0" "readme_renderer<40.0" venv/bin/python -m twine check dist/* tools/distrib/python/grpcio_tools/dist/* if [ "$GRPC_BUILD_MAC" == "" ]; then venv/bin/python -m twine check src/python/grpcio_observability/dist/* diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py index 16f05533882..90073bb8e2c 100755 --- a/tools/run_tests/run_tests.py +++ b/tools/run_tests/run_tests.py @@ -844,6 +844,13 @@ class PythonLanguage(object): bits=bits, config_vars=config_vars, ) + python313_config = _python_config_generator( + name="py313", + major="3", + minor="13", + bits=bits, + config_vars=config_vars, + ) pypy27_config = _pypy_config_generator( name="pypy", major="2", config_vars=config_vars ) @@ -880,6 +887,8 @@ class PythonLanguage(object): return (python311_config,) elif args.compiler == "python3.12": return (python312_config,) + elif args.compiler == "python3.13": + return (python313_config,) elif args.compiler == "pypy": return (pypy27_config,) elif args.compiler == "pypy3": @@ -893,6 +902,7 @@ class PythonLanguage(object): python310_config, python311_config, python312_config, + python313_config, ) else: raise Exception("Compiler %s not supported." % args.compiler) From f6f13ccaec188339a69d96b91186c15b217d3e0c Mon Sep 17 00:00:00 2001 From: Tanvi Jagtap <139093547+tanvi-jagtap@users.noreply.github.com> Date: Thu, 26 Sep 2024 10:37:01 -0700 Subject: [PATCH 32/75] [PH2][Refactor][internal.h] Split file. Add stream_lists.h (#37775) Moving out related code into a separate file. `internal.h -> stream_lists.h` Closes #37775 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37775 from tanvi-jagtap:ph2_stream_lists_h 13b6030cebcf00abecf1f010e21773490c6d08d2 PiperOrigin-RevId: 679205824 --- BUILD | 1 + Package.swift | 1 + build_autogenerated.yaml | 2 + gRPC-C++.podspec | 2 + gRPC-Core.podspec | 2 + grpc.gemspec | 1 + package.xml | 1 + .../chttp2/transport/chttp2_transport.cc | 1 + .../chttp2/transport/frame_window_update.cc | 1 + .../ext/transport/chttp2/transport/internal.h | 41 ------------ .../chttp2/transport/stream_lists.cc | 2 + .../transport/chttp2/transport/stream_lists.h | 65 +++++++++++++++++++ .../ext/transport/chttp2/transport/writing.cc | 1 + tools/doxygen/Doxyfile.c++.internal | 1 + tools/doxygen/Doxyfile.core.internal | 1 + 15 files changed, 82 insertions(+), 41 deletions(-) create mode 100644 src/core/ext/transport/chttp2/transport/stream_lists.h diff --git a/BUILD b/BUILD index 093cddb95af..36c3c47497f 100644 --- a/BUILD +++ b/BUILD @@ -4779,6 +4779,7 @@ grpc_cc_library( "//src/core:ext/transport/chttp2/transport/frame_settings.h", "//src/core:ext/transport/chttp2/transport/frame_window_update.h", "//src/core:ext/transport/chttp2/transport/internal.h", + "//src/core:ext/transport/chttp2/transport/stream_lists.h", ], external_deps = [ "absl/base:core_headers", diff --git a/Package.swift b/Package.swift index d9411aed0ec..988f1e7abe7 100644 --- a/Package.swift +++ b/Package.swift @@ -256,6 +256,7 @@ let package = Package( "src/core/ext/transport/chttp2/transport/ping_rate_policy.cc", "src/core/ext/transport/chttp2/transport/ping_rate_policy.h", "src/core/ext/transport/chttp2/transport/stream_lists.cc", + "src/core/ext/transport/chttp2/transport/stream_lists.h", "src/core/ext/transport/chttp2/transport/varint.cc", "src/core/ext/transport/chttp2/transport/varint.h", "src/core/ext/transport/chttp2/transport/write_size_policy.cc", diff --git a/build_autogenerated.yaml b/build_autogenerated.yaml index bc395b7e0e4..e7c5b7684c3 100644 --- a/build_autogenerated.yaml +++ b/build_autogenerated.yaml @@ -291,6 +291,7 @@ libs: - src/core/ext/transport/chttp2/transport/ping_abuse_policy.h - src/core/ext/transport/chttp2/transport/ping_callbacks.h - src/core/ext/transport/chttp2/transport/ping_rate_policy.h + - src/core/ext/transport/chttp2/transport/stream_lists.h - src/core/ext/transport/chttp2/transport/varint.h - src/core/ext/transport/chttp2/transport/write_size_policy.h - src/core/ext/transport/inproc/inproc_transport.h @@ -2313,6 +2314,7 @@ libs: - src/core/ext/transport/chttp2/transport/ping_abuse_policy.h - src/core/ext/transport/chttp2/transport/ping_callbacks.h - src/core/ext/transport/chttp2/transport/ping_rate_policy.h + - src/core/ext/transport/chttp2/transport/stream_lists.h - src/core/ext/transport/chttp2/transport/varint.h - src/core/ext/transport/chttp2/transport/write_size_policy.h - src/core/ext/transport/inproc/inproc_transport.h diff --git a/gRPC-C++.podspec b/gRPC-C++.podspec index 4862b8ee10e..9d37c6cbe39 100644 --- a/gRPC-C++.podspec +++ b/gRPC-C++.podspec @@ -380,6 +380,7 @@ Pod::Spec.new do |s| 'src/core/ext/transport/chttp2/transport/ping_abuse_policy.h', 'src/core/ext/transport/chttp2/transport/ping_callbacks.h', 'src/core/ext/transport/chttp2/transport/ping_rate_policy.h', + 'src/core/ext/transport/chttp2/transport/stream_lists.h', 'src/core/ext/transport/chttp2/transport/varint.h', 'src/core/ext/transport/chttp2/transport/write_size_policy.h', 'src/core/ext/transport/inproc/inproc_transport.h', @@ -1681,6 +1682,7 @@ Pod::Spec.new do |s| 'src/core/ext/transport/chttp2/transport/ping_abuse_policy.h', 'src/core/ext/transport/chttp2/transport/ping_callbacks.h', 'src/core/ext/transport/chttp2/transport/ping_rate_policy.h', + 'src/core/ext/transport/chttp2/transport/stream_lists.h', 'src/core/ext/transport/chttp2/transport/varint.h', 'src/core/ext/transport/chttp2/transport/write_size_policy.h', 'src/core/ext/transport/inproc/inproc_transport.h', diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec index f953ca34e73..15080faf737 100644 --- a/gRPC-Core.podspec +++ b/gRPC-Core.podspec @@ -376,6 +376,7 @@ Pod::Spec.new do |s| 'src/core/ext/transport/chttp2/transport/ping_rate_policy.cc', 'src/core/ext/transport/chttp2/transport/ping_rate_policy.h', 'src/core/ext/transport/chttp2/transport/stream_lists.cc', + 'src/core/ext/transport/chttp2/transport/stream_lists.h', 'src/core/ext/transport/chttp2/transport/varint.cc', 'src/core/ext/transport/chttp2/transport/varint.h', 'src/core/ext/transport/chttp2/transport/write_size_policy.cc', @@ -2467,6 +2468,7 @@ Pod::Spec.new do |s| 'src/core/ext/transport/chttp2/transport/ping_abuse_policy.h', 'src/core/ext/transport/chttp2/transport/ping_callbacks.h', 'src/core/ext/transport/chttp2/transport/ping_rate_policy.h', + 'src/core/ext/transport/chttp2/transport/stream_lists.h', 'src/core/ext/transport/chttp2/transport/varint.h', 'src/core/ext/transport/chttp2/transport/write_size_policy.h', 'src/core/ext/transport/inproc/inproc_transport.h', diff --git a/grpc.gemspec b/grpc.gemspec index 83b134b50fe..f7829369b0e 100644 --- a/grpc.gemspec +++ b/grpc.gemspec @@ -262,6 +262,7 @@ Gem::Specification.new do |s| s.files += %w( src/core/ext/transport/chttp2/transport/ping_rate_policy.cc ) s.files += %w( src/core/ext/transport/chttp2/transport/ping_rate_policy.h ) s.files += %w( src/core/ext/transport/chttp2/transport/stream_lists.cc ) + s.files += %w( src/core/ext/transport/chttp2/transport/stream_lists.h ) s.files += %w( src/core/ext/transport/chttp2/transport/varint.cc ) s.files += %w( src/core/ext/transport/chttp2/transport/varint.h ) s.files += %w( src/core/ext/transport/chttp2/transport/write_size_policy.cc ) diff --git a/package.xml b/package.xml index 67c1e56e75a..4bd5a7a2f8c 100644 --- a/package.xml +++ b/package.xml @@ -244,6 +244,7 @@ + diff --git a/src/core/ext/transport/chttp2/transport/chttp2_transport.cc b/src/core/ext/transport/chttp2/transport/chttp2_transport.cc index 02fffbf41ca..fef7fb92d0b 100644 --- a/src/core/ext/transport/chttp2/transport/chttp2_transport.cc +++ b/src/core/ext/transport/chttp2/transport/chttp2_transport.cc @@ -68,6 +68,7 @@ #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" +#include "src/core/ext/transport/chttp2/transport/stream_lists.h" #include "src/core/ext/transport/chttp2/transport/varint.h" #include "src/core/ext/transport/chttp2/transport/write_size_policy.h" #include "src/core/lib/channel/channel_args.h" diff --git a/src/core/ext/transport/chttp2/transport/frame_window_update.cc b/src/core/ext/transport/chttp2/transport/frame_window_update.cc index 6dafd5318b2..20cddebd5ca 100644 --- a/src/core/ext/transport/chttp2/transport/frame_window_update.cc +++ b/src/core/ext/transport/chttp2/transport/frame_window_update.cc @@ -29,6 +29,7 @@ #include "src/core/ext/transport/chttp2/transport/flow_control.h" #include "src/core/ext/transport/chttp2/transport/internal.h" +#include "src/core/ext/transport/chttp2/transport/stream_lists.h" grpc_slice grpc_chttp2_window_update_create( uint32_t id, uint32_t window_delta, diff --git a/src/core/ext/transport/chttp2/transport/internal.h b/src/core/ext/transport/chttp2/transport/internal.h index 80e214ca1f2..bdbbd6890c7 100644 --- a/src/core/ext/transport/chttp2/transport/internal.h +++ b/src/core/ext/transport/chttp2/transport/internal.h @@ -769,47 +769,6 @@ absl::variant grpc_chttp2_perform_read( grpc_chttp2_transport* t, const grpc_slice& slice, size_t& requests_started); -bool grpc_chttp2_list_add_writable_stream(grpc_chttp2_transport* t, - grpc_chttp2_stream* s); -/// Get a writable stream -/// returns non-zero if there was a stream available -bool grpc_chttp2_list_pop_writable_stream(grpc_chttp2_transport* t, - grpc_chttp2_stream** s); -bool grpc_chttp2_list_remove_writable_stream(grpc_chttp2_transport* t, - grpc_chttp2_stream* s); - -bool grpc_chttp2_list_add_writing_stream(grpc_chttp2_transport* t, - grpc_chttp2_stream* s); -bool grpc_chttp2_list_have_writing_streams(grpc_chttp2_transport* t); -bool grpc_chttp2_list_pop_writing_stream(grpc_chttp2_transport* t, - grpc_chttp2_stream** s); - -void grpc_chttp2_list_add_written_stream(grpc_chttp2_transport* t, - grpc_chttp2_stream* s); -bool grpc_chttp2_list_pop_written_stream(grpc_chttp2_transport* t, - grpc_chttp2_stream** s); - -void grpc_chttp2_list_add_waiting_for_concurrency(grpc_chttp2_transport* t, - grpc_chttp2_stream* s); -bool grpc_chttp2_list_pop_waiting_for_concurrency(grpc_chttp2_transport* t, - grpc_chttp2_stream** s); -void grpc_chttp2_list_remove_waiting_for_concurrency(grpc_chttp2_transport* t, - grpc_chttp2_stream* s); - -void grpc_chttp2_list_add_stalled_by_transport(grpc_chttp2_transport* t, - grpc_chttp2_stream* s); -bool grpc_chttp2_list_pop_stalled_by_transport(grpc_chttp2_transport* t, - grpc_chttp2_stream** s); -void grpc_chttp2_list_remove_stalled_by_transport(grpc_chttp2_transport* t, - grpc_chttp2_stream* s); - -void grpc_chttp2_list_add_stalled_by_stream(grpc_chttp2_transport* t, - grpc_chttp2_stream* s); -bool grpc_chttp2_list_pop_stalled_by_stream(grpc_chttp2_transport* t, - grpc_chttp2_stream** s); -bool grpc_chttp2_list_remove_stalled_by_stream(grpc_chttp2_transport* t, - grpc_chttp2_stream* s); - //******** Flow Control ************** // Takes in a flow control action and performs all the needed operations. diff --git a/src/core/ext/transport/chttp2/transport/stream_lists.cc b/src/core/ext/transport/chttp2/transport/stream_lists.cc index f4ee3e58eb8..14039a614b7 100644 --- a/src/core/ext/transport/chttp2/transport/stream_lists.cc +++ b/src/core/ext/transport/chttp2/transport/stream_lists.cc @@ -16,6 +16,8 @@ // // +#include "src/core/ext/transport/chttp2/transport/stream_lists.h" + #include "absl/log/check.h" #include "absl/log/log.h" diff --git a/src/core/ext/transport/chttp2/transport/stream_lists.h b/src/core/ext/transport/chttp2/transport/stream_lists.h new file mode 100644 index 00000000000..f415fe73704 --- /dev/null +++ b/src/core/ext/transport/chttp2/transport/stream_lists.h @@ -0,0 +1,65 @@ +// +// +// 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_TRANSPORT_CHTTP2_TRANSPORT_STREAM_LISTS_H +#define GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_STREAM_LISTS_H + +#include "src/core/ext/transport/chttp2/transport/internal.h" + +bool grpc_chttp2_list_add_writable_stream(grpc_chttp2_transport* t, + grpc_chttp2_stream* s); +/// Get a writable stream +/// returns non-zero if there was a stream available +bool grpc_chttp2_list_pop_writable_stream(grpc_chttp2_transport* t, + grpc_chttp2_stream** s); +bool grpc_chttp2_list_remove_writable_stream(grpc_chttp2_transport* t, + grpc_chttp2_stream* s); + +bool grpc_chttp2_list_add_writing_stream(grpc_chttp2_transport* t, + grpc_chttp2_stream* s); +bool grpc_chttp2_list_have_writing_streams(grpc_chttp2_transport* t); +bool grpc_chttp2_list_pop_writing_stream(grpc_chttp2_transport* t, + grpc_chttp2_stream** s); + +void grpc_chttp2_list_add_written_stream(grpc_chttp2_transport* t, + grpc_chttp2_stream* s); +bool grpc_chttp2_list_pop_written_stream(grpc_chttp2_transport* t, + grpc_chttp2_stream** s); + +void grpc_chttp2_list_add_waiting_for_concurrency(grpc_chttp2_transport* t, + grpc_chttp2_stream* s); +bool grpc_chttp2_list_pop_waiting_for_concurrency(grpc_chttp2_transport* t, + grpc_chttp2_stream** s); +void grpc_chttp2_list_remove_waiting_for_concurrency(grpc_chttp2_transport* t, + grpc_chttp2_stream* s); + +void grpc_chttp2_list_add_stalled_by_transport(grpc_chttp2_transport* t, + grpc_chttp2_stream* s); +bool grpc_chttp2_list_pop_stalled_by_transport(grpc_chttp2_transport* t, + grpc_chttp2_stream** s); +void grpc_chttp2_list_remove_stalled_by_transport(grpc_chttp2_transport* t, + grpc_chttp2_stream* s); + +void grpc_chttp2_list_add_stalled_by_stream(grpc_chttp2_transport* t, + grpc_chttp2_stream* s); +bool grpc_chttp2_list_pop_stalled_by_stream(grpc_chttp2_transport* t, + grpc_chttp2_stream** s); +bool grpc_chttp2_list_remove_stalled_by_stream(grpc_chttp2_transport* t, + grpc_chttp2_stream* s); + +#endif // GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_STREAM_LISTS_H diff --git a/src/core/ext/transport/chttp2/transport/writing.cc b/src/core/ext/transport/chttp2/transport/writing.cc index 13797c1f1b5..d5678956f51 100644 --- a/src/core/ext/transport/chttp2/transport/writing.cc +++ b/src/core/ext/transport/chttp2/transport/writing.cc @@ -51,6 +51,7 @@ #include "src/core/ext/transport/chttp2/transport/legacy_frame.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/stream_lists.h" #include "src/core/ext/transport/chttp2/transport/write_size_policy.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/experiments/experiments.h" diff --git a/tools/doxygen/Doxyfile.c++.internal b/tools/doxygen/Doxyfile.c++.internal index 3688a568841..994e038c983 100644 --- a/tools/doxygen/Doxyfile.c++.internal +++ b/tools/doxygen/Doxyfile.c++.internal @@ -1267,6 +1267,7 @@ src/core/ext/transport/chttp2/transport/ping_callbacks.h \ src/core/ext/transport/chttp2/transport/ping_rate_policy.cc \ src/core/ext/transport/chttp2/transport/ping_rate_policy.h \ src/core/ext/transport/chttp2/transport/stream_lists.cc \ +src/core/ext/transport/chttp2/transport/stream_lists.h \ src/core/ext/transport/chttp2/transport/varint.cc \ src/core/ext/transport/chttp2/transport/varint.h \ src/core/ext/transport/chttp2/transport/write_size_policy.cc \ diff --git a/tools/doxygen/Doxyfile.core.internal b/tools/doxygen/Doxyfile.core.internal index 9b118d61fd8..3725bd86978 100644 --- a/tools/doxygen/Doxyfile.core.internal +++ b/tools/doxygen/Doxyfile.core.internal @@ -1034,6 +1034,7 @@ src/core/ext/transport/chttp2/transport/ping_callbacks.h \ src/core/ext/transport/chttp2/transport/ping_rate_policy.cc \ src/core/ext/transport/chttp2/transport/ping_rate_policy.h \ src/core/ext/transport/chttp2/transport/stream_lists.cc \ +src/core/ext/transport/chttp2/transport/stream_lists.h \ src/core/ext/transport/chttp2/transport/varint.cc \ src/core/ext/transport/chttp2/transport/varint.h \ src/core/ext/transport/chttp2/transport/write_size_policy.cc \ From 2030231e3227c1c5b6b11ae1013a2374e6be6b7d Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Thu, 26 Sep 2024 12:06:32 -0700 Subject: [PATCH 33/75] [gcc7] Build fix (#37796) Closes #37796 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37796 from ctiller:buildy 363eca118abf339899a8114019027d579747385e PiperOrigin-RevId: 679243010 --- src/core/call/request_buffer.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/core/call/request_buffer.cc b/src/core/call/request_buffer.cc index 257743cbb90..ee0878603c0 100644 --- a/src/core/call/request_buffer.cc +++ b/src/core/call/request_buffer.cc @@ -117,7 +117,7 @@ RequestBuffer::Reader::PollPullClientInitialMetadata() { pulled_client_initial_metadata_ = true; auto result = ClaimObject(buffering->initial_metadata); buffer_->MaybeSwitchToStreaming(); - return result; + return std::move(result); } if (auto* buffered = absl::get_if(&buffer_->state_)) { pulled_client_initial_metadata_ = true; @@ -142,7 +142,7 @@ RequestBuffer::Reader::PollPullMessage() { auto result = ClaimObject(buffering->messages[idx]); ++message_index_; buffer_->MaybeSwitchToStreaming(); - return result; + return std::move(result); } if (auto* buffered = absl::get_if(&buffer_->state_)) { if (message_index_ == buffered->messages.size()) return absl::nullopt; @@ -159,7 +159,7 @@ RequestBuffer::Reader::PollPullMessage() { auto waker = std::move(buffer_->push_waker_); lock.Release(); waker.Wakeup(); - return msg; + return std::move(msg); } error_ = absl::get(buffer_->state_).error; return Failure{}; From 992b3aea8aaaa1285ed74f0ff3e3843765d1e197 Mon Sep 17 00:00:00 2001 From: Sourabh Singh Date: Fri, 27 Sep 2024 08:41:13 -0700 Subject: [PATCH 34/75] remove logging_threshold tests (#37806) Closes #37806 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37806 from sourabhsinghs:unittest/logging-threshold d501d38dc0c487fe2019fd4b0db6b61d831df45f PiperOrigin-RevId: 679604228 --- bazel/internal_python_rules.bzl | 3 --- 1 file changed, 3 deletions(-) diff --git a/bazel/internal_python_rules.bzl b/bazel/internal_python_rules.bzl index a6c4e18ef81..b2a506c6ae4 100644 --- a/bazel/internal_python_rules.bzl +++ b/bazel/internal_python_rules.bzl @@ -14,7 +14,6 @@ """Python-related rules intended only for use internal to the repo.""" load("//bazel:gevent_test.bzl", "py_grpc_gevent_test") -load("//bazel:logging_threshold_test.bzl", "py_grpc_logging_threshold_test") def internal_py_grpc_test(name, **kwargs): """Runs a test under all supported environments. @@ -29,7 +28,6 @@ def internal_py_grpc_test(name, **kwargs): **kwargs ) py_grpc_gevent_test(name, **kwargs) - py_grpc_logging_threshold_test(name, **kwargs) suite_kwargs = {} if "visibility" in kwargs: @@ -40,7 +38,6 @@ def internal_py_grpc_test(name, **kwargs): tests = [ name + ".native", name + ".gevent", - name + ".logging_threshold", ], **suite_kwargs ) From f2e3636303a66408cc67b61e8660cc51e9c1fbb3 Mon Sep 17 00:00:00 2001 From: Sreenithi Sridharan <19sreenithi98@gmail.com> Date: Fri, 27 Sep 2024 08:53:41 -0700 Subject: [PATCH 35/75] increased timeout for armv7 artifact build to 2 hours (#37807) Building armv7 artifacts after adding Python 3.13 is failing with a timeout. Hence increasing timeout to 2 hours. Closes #37807 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37807 from sreenithi:increase_armv7_artifact_build_timeout 60034378f585e7a7af5de8879fe32a04c9a3ccaa PiperOrigin-RevId: 679608393 --- tools/run_tests/artifacts/artifact_targets.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/run_tests/artifacts/artifact_targets.py b/tools/run_tests/artifacts/artifact_targets.py index 6f00c17fa03..2695500eae8 100644 --- a/tools/run_tests/artifacts/artifact_targets.py +++ b/tools/run_tests/artifacts/artifact_targets.py @@ -160,7 +160,7 @@ class PythonArtifact: ), "tools/run_tests/artifacts/build_artifact_python.sh", environ=environ, - timeout_seconds=60 * 60, + timeout_seconds=60 * 60 * 2, ) elif "manylinux" in self.platform: if self.arch == "x86": From 6ba3b4a71764c4a837cbfff3072b60d5e8d32f76 Mon Sep 17 00:00:00 2001 From: "Mark D. Roth" Date: Fri, 27 Sep 2024 10:39:05 -0700 Subject: [PATCH 36/75] [xDS] ORCA to LRS propagation changes (#37467) Implements gRFC A85 (https://github.com/grpc/proposal/pull/454). Closes #37467 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37467 from markdroth:orca_lrs_propagation_changes 0c1e889bb70b422899bda04166524c678d628c70 PiperOrigin-RevId: 679646192 --- BUILD | 2 + CMakeLists.txt | 1 + Makefile | 1 + Package.swift | 2 + build_autogenerated.yaml | 2 + config.m4 | 1 + config.w32 | 1 + gRPC-C++.podspec | 2 + gRPC-Core.podspec | 3 + grpc.gemspec | 2 + package.xml | 2 + src/core/BUILD | 24 ++ .../load_balancing/xds/xds_cluster_impl.cc | 13 +- src/core/xds/grpc/xds_cluster.cc | 5 + src/core/xds/grpc/xds_cluster.h | 15 + src/core/xds/grpc/xds_cluster_parser.cc | 27 ++ src/core/xds/xds_client/lrs_client.cc | 145 ++++++-- src/core/xds/xds_client/lrs_client.h | 63 +++- .../xds_backend_metric_propagation.cc | 64 ++++ .../xds_backend_metric_propagation.h | 60 ++++ src/proto/grpc/testing/xds/v3/cluster.proto | 15 + .../grpc/testing/xds/v3/load_report.proto | 25 +- src/python/grpcio/grpc_core_dependencies.py | 1 + .../xds/xds_cluster_resource_type_test.cc | 88 ++++- .../end2end/xds/xds_cluster_end2end_test.cc | 319 ++++++++++++++++++ test/cpp/end2end/xds/xds_end2end_test_lib.h | 12 + test/cpp/end2end/xds/xds_server.h | 30 +- tools/doxygen/Doxyfile.c++.internal | 2 + tools/doxygen/Doxyfile.core.internal | 2 + 29 files changed, 872 insertions(+), 57 deletions(-) create mode 100644 src/core/xds/xds_client/xds_backend_metric_propagation.cc create mode 100644 src/core/xds/xds_client/xds_backend_metric_propagation.h diff --git a/BUILD b/BUILD index 36c3c47497f..17b278b61e6 100644 --- a/BUILD +++ b/BUILD @@ -4462,6 +4462,7 @@ grpc_cc_library( "//src/core:default_event_engine", "//src/core:dual_ref_counted", "//src/core:env", + "//src/core:grpc_backend_metric_data", "//src/core:json", "//src/core:per_cpu", "//src/core:ref_counted", @@ -4469,6 +4470,7 @@ grpc_cc_library( "//src/core:time", "//src/core:upb_utils", "//src/core:useful", + "//src/core:xds_backend_metric_propagation", ], ) diff --git a/CMakeLists.txt b/CMakeLists.txt index 14bceea8d0b..3836f7beac9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2665,6 +2665,7 @@ add_library(grpc src/core/xds/grpc/xds_transport_grpc.cc src/core/xds/xds_client/lrs_client.cc src/core/xds/xds_client/xds_api.cc + src/core/xds/xds_client/xds_backend_metric_propagation.cc src/core/xds/xds_client/xds_bootstrap.cc src/core/xds/xds_client/xds_client.cc ) diff --git a/Makefile b/Makefile index 08ae5d181c1..70828125ba2 100644 --- a/Makefile +++ b/Makefile @@ -1517,6 +1517,7 @@ LIBGRPC_SRC = \ src/core/xds/grpc/xds_transport_grpc.cc \ src/core/xds/xds_client/lrs_client.cc \ src/core/xds/xds_client/xds_api.cc \ + src/core/xds/xds_client/xds_backend_metric_propagation.cc \ src/core/xds/xds_client/xds_bootstrap.cc \ src/core/xds/xds_client/xds_client.cc \ third_party/abseil-cpp/absl/base/internal/cycleclock.cc \ diff --git a/Package.swift b/Package.swift index 988f1e7abe7..8b1ae1392cc 100644 --- a/Package.swift +++ b/Package.swift @@ -2036,6 +2036,8 @@ let package = Package( "src/core/xds/xds_client/lrs_client.h", "src/core/xds/xds_client/xds_api.cc", "src/core/xds/xds_client/xds_api.h", + "src/core/xds/xds_client/xds_backend_metric_propagation.cc", + "src/core/xds/xds_client/xds_backend_metric_propagation.h", "src/core/xds/xds_client/xds_bootstrap.cc", "src/core/xds/xds_client/xds_bootstrap.h", "src/core/xds/xds_client/xds_channel_args.h", diff --git a/build_autogenerated.yaml b/build_autogenerated.yaml index e7c5b7684c3..33b9da00c33 100644 --- a/build_autogenerated.yaml +++ b/build_autogenerated.yaml @@ -1259,6 +1259,7 @@ libs: - src/core/xds/grpc/xds_transport_grpc.h - src/core/xds/xds_client/lrs_client.h - src/core/xds/xds_client/xds_api.h + - src/core/xds/xds_client/xds_backend_metric_propagation.h - src/core/xds/xds_client/xds_bootstrap.h - src/core/xds/xds_client/xds_channel_args.h - src/core/xds/xds_client/xds_client.h @@ -2080,6 +2081,7 @@ libs: - src/core/xds/grpc/xds_transport_grpc.cc - src/core/xds/xds_client/lrs_client.cc - src/core/xds/xds_client/xds_api.cc + - src/core/xds/xds_client/xds_backend_metric_propagation.cc - src/core/xds/xds_client/xds_bootstrap.cc - src/core/xds/xds_client/xds_client.cc deps: diff --git a/config.m4 b/config.m4 index 6a870a7d474..a5d57181f70 100644 --- a/config.m4 +++ b/config.m4 @@ -892,6 +892,7 @@ if test "$PHP_GRPC" != "no"; then src/core/xds/grpc/xds_transport_grpc.cc \ src/core/xds/xds_client/lrs_client.cc \ src/core/xds/xds_client/xds_api.cc \ + src/core/xds/xds_client/xds_backend_metric_propagation.cc \ src/core/xds/xds_client/xds_bootstrap.cc \ src/core/xds/xds_client/xds_client.cc \ src/php/ext/grpc/byte_buffer.c \ diff --git a/config.w32 b/config.w32 index 05a181a2cb1..c0acf9bfb23 100644 --- a/config.w32 +++ b/config.w32 @@ -857,6 +857,7 @@ if (PHP_GRPC != "no") { "src\\core\\xds\\grpc\\xds_transport_grpc.cc " + "src\\core\\xds\\xds_client\\lrs_client.cc " + "src\\core\\xds\\xds_client\\xds_api.cc " + + "src\\core\\xds\\xds_client\\xds_backend_metric_propagation.cc " + "src\\core\\xds\\xds_client\\xds_bootstrap.cc " + "src\\core\\xds\\xds_client\\xds_client.cc " + "src\\php\\ext\\grpc\\byte_buffer.c " + diff --git a/gRPC-C++.podspec b/gRPC-C++.podspec index 9d37c6cbe39..481f51c2ea4 100644 --- a/gRPC-C++.podspec +++ b/gRPC-C++.podspec @@ -1373,6 +1373,7 @@ Pod::Spec.new do |s| 'src/core/xds/grpc/xds_transport_grpc.h', 'src/core/xds/xds_client/lrs_client.h', 'src/core/xds/xds_client/xds_api.h', + 'src/core/xds/xds_client/xds_backend_metric_propagation.h', 'src/core/xds/xds_client/xds_bootstrap.h', 'src/core/xds/xds_client/xds_channel_args.h', 'src/core/xds/xds_client/xds_client.h', @@ -2675,6 +2676,7 @@ Pod::Spec.new do |s| 'src/core/xds/grpc/xds_transport_grpc.h', 'src/core/xds/xds_client/lrs_client.h', 'src/core/xds/xds_client/xds_api.h', + 'src/core/xds/xds_client/xds_backend_metric_propagation.h', 'src/core/xds/xds_client/xds_bootstrap.h', 'src/core/xds/xds_client/xds_channel_args.h', 'src/core/xds/xds_client/xds_client.h', diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec index 15080faf737..2867cb57323 100644 --- a/gRPC-Core.podspec +++ b/gRPC-Core.podspec @@ -2152,6 +2152,8 @@ Pod::Spec.new do |s| 'src/core/xds/xds_client/lrs_client.h', 'src/core/xds/xds_client/xds_api.cc', 'src/core/xds/xds_client/xds_api.h', + 'src/core/xds/xds_client/xds_backend_metric_propagation.cc', + 'src/core/xds/xds_client/xds_backend_metric_propagation.h', 'src/core/xds/xds_client/xds_bootstrap.cc', 'src/core/xds/xds_client/xds_bootstrap.h', 'src/core/xds/xds_client/xds_channel_args.h', @@ -3460,6 +3462,7 @@ Pod::Spec.new do |s| 'src/core/xds/grpc/xds_transport_grpc.h', 'src/core/xds/xds_client/lrs_client.h', 'src/core/xds/xds_client/xds_api.h', + 'src/core/xds/xds_client/xds_backend_metric_propagation.h', 'src/core/xds/xds_client/xds_bootstrap.h', 'src/core/xds/xds_client/xds_channel_args.h', 'src/core/xds/xds_client/xds_client.h', diff --git a/grpc.gemspec b/grpc.gemspec index f7829369b0e..bd39eda2bda 100644 --- a/grpc.gemspec +++ b/grpc.gemspec @@ -2038,6 +2038,8 @@ Gem::Specification.new do |s| s.files += %w( src/core/xds/xds_client/lrs_client.h ) s.files += %w( src/core/xds/xds_client/xds_api.cc ) s.files += %w( src/core/xds/xds_client/xds_api.h ) + s.files += %w( src/core/xds/xds_client/xds_backend_metric_propagation.cc ) + s.files += %w( src/core/xds/xds_client/xds_backend_metric_propagation.h ) s.files += %w( src/core/xds/xds_client/xds_bootstrap.cc ) s.files += %w( src/core/xds/xds_client/xds_bootstrap.h ) s.files += %w( src/core/xds/xds_client/xds_channel_args.h ) diff --git a/package.xml b/package.xml index 4bd5a7a2f8c..befa4e97aa3 100644 --- a/package.xml +++ b/package.xml @@ -2020,6 +2020,8 @@ + + diff --git a/src/core/BUILD b/src/core/BUILD index dccdf45962d..13091d6bd38 100644 --- a/src/core/BUILD +++ b/src/core/BUILD @@ -5619,6 +5619,7 @@ grpc_cc_library( "json_writer", "match", "time", + "xds_backend_metric_propagation", "xds_common_types", "xds_health_status", "xds_metadata", @@ -5651,6 +5652,28 @@ grpc_cc_library( ], ) +grpc_cc_library( + name = "xds_backend_metric_propagation", + srcs = [ + "xds/xds_client/xds_backend_metric_propagation.cc", + ], + hdrs = [ + "xds/xds_client/xds_backend_metric_propagation.h", + ], + external_deps = [ + "absl/container:flat_hash_set", + "absl/strings", + ], + language = "c++", + tags = ["nofixdeps"], + visibility = ["@grpc:xds_client_core"], + deps = [ + "ref_counted", + "useful", + "//:ref_counted_ptr", + ], +) + # TODO(roth): Split this up into individual targets. grpc_cc_library( name = "grpc_xds_client", @@ -5827,6 +5850,7 @@ grpc_cc_library( "upb_utils", "useful", "validation_errors", + "xds_backend_metric_propagation", "xds_certificate_provider", "xds_certificate_provider_store", "xds_cluster", diff --git a/src/core/load_balancing/xds/xds_cluster_impl.cc b/src/core/load_balancing/xds/xds_cluster_impl.cc index eb1a4b3259a..380ed7b108a 100644 --- a/src/core/load_balancing/xds/xds_cluster_impl.cc +++ b/src/core/load_balancing/xds/xds_cluster_impl.cc @@ -362,13 +362,9 @@ class XdsClusterImplLb::Picker::SubchannelCallTracker final } // Record call completion for load reporting. if (locality_stats_ != nullptr) { - auto* backend_metric_data = - args.backend_metric_accessor->GetBackendMetricData(); - const std::map* named_metrics = nullptr; - if (backend_metric_data != nullptr) { - named_metrics = &backend_metric_data->named_metrics; - } - locality_stats_->AddCallFinished(named_metrics, !args.status.ok()); + locality_stats_->AddCallFinished( + args.backend_metric_accessor->GetBackendMetricData(), + !args.status.ok()); } // Decrement number of calls in flight. call_counter_->Decrement(); @@ -826,7 +822,8 @@ RefCountedPtr XdsClusterImplLb::Helper::CreateSubchannel( parent()->xds_client_->lrs_client().AddClusterLocalityStats( parent()->cluster_resource_->lrs_load_reporting_server, parent()->config_->cluster_name(), - GetEdsResourceName(*parent()->cluster_resource_), locality_name); + GetEdsResourceName(*parent()->cluster_resource_), locality_name, + parent()->cluster_resource_->lrs_backend_metric_propagation); if (locality_stats == nullptr) { LOG(ERROR) << "[xds_cluster_impl_lb " << parent() diff --git a/src/core/xds/grpc/xds_cluster.cc b/src/core/xds/grpc/xds_cluster.cc index 2d4c2834ff0..09a7454d80f 100644 --- a/src/core/xds/grpc/xds_cluster.cc +++ b/src/core/xds/grpc/xds_cluster.cc @@ -53,6 +53,11 @@ std::string XdsClusterResource::ToString() const { contents.push_back(absl::StrCat("lrs_load_reporting_server_name=", lrs_load_reporting_server->server_uri())); } + if (lrs_backend_metric_propagation != nullptr) { + contents.push_back( + absl::StrCat("lrs_backend_metric_propagation=", + lrs_backend_metric_propagation->AsString())); + } if (!common_tls_context.Empty()) { contents.push_back( absl::StrCat("common_tls_context=", common_tls_context.ToString())); diff --git a/src/core/xds/grpc/xds_cluster.h b/src/core/xds/grpc/xds_cluster.h index f733a9328f8..7eea5d0b0fd 100644 --- a/src/core/xds/grpc/xds_cluster.h +++ b/src/core/xds/grpc/xds_cluster.h @@ -30,6 +30,7 @@ #include "src/core/xds/grpc/xds_health_status.h" #include "src/core/xds/grpc/xds_metadata.h" #include "src/core/xds/grpc/xds_server_grpc.h" +#include "src/core/xds/xds_client/xds_backend_metric_propagation.h" #include "src/core/xds/xds_client/xds_resource_type.h" #include "src/core/xds/xds_client/xds_resource_type_impl.h" @@ -44,6 +45,15 @@ inline bool LrsServersEqual( return *lrs_server1 == *lrs_server2; } +inline bool LrsBackendMetricPropagationEqual( + const RefCountedPtr& p1, + const RefCountedPtr& p2) { + if (p1 == nullptr) return p2 == nullptr; + if (p2 == nullptr) return false; + // Neither one is null, so compare them. + return *p1 == *p2; +} + struct XdsClusterResource : public XdsResourceType::ResourceData { struct Eds { // If empty, defaults to the cluster name. @@ -82,6 +92,8 @@ struct XdsClusterResource : public XdsResourceType::ResourceData { // The LRS server to use for load reporting. // If null, load reporting will be disabled. std::shared_ptr lrs_load_reporting_server; + // The set of metrics to propagate from ORCA to LRS. + RefCountedPtr lrs_backend_metric_propagation; // Tls Context used by clients CommonTlsContext common_tls_context; @@ -103,6 +115,9 @@ struct XdsClusterResource : public XdsResourceType::ResourceData { return type == other.type && lb_policy_config == other.lb_policy_config && LrsServersEqual(lrs_load_reporting_server, other.lrs_load_reporting_server) && + LrsBackendMetricPropagationEqual( + lrs_backend_metric_propagation, + other.lrs_backend_metric_propagation) && common_tls_context == other.common_tls_context && connection_idle_timeout == other.connection_idle_timeout && max_concurrent_requests == other.max_concurrent_requests && diff --git a/src/core/xds/grpc/xds_cluster_parser.cc b/src/core/xds/grpc/xds_cluster_parser.cc index 4b0f2683f10..1a6bbc2e2b6 100644 --- a/src/core/xds/grpc/xds_cluster_parser.cc +++ b/src/core/xds/grpc/xds_cluster_parser.cc @@ -59,6 +59,8 @@ #include "src/core/xds/grpc/xds_common_types_parser.h" #include "src/core/xds/grpc/xds_lb_policy_registry.h" #include "src/core/xds/grpc/xds_metadata_parser.h" +#include "src/core/xds/xds_client/lrs_client.h" +#include "src/core/xds/xds_client/xds_backend_metric_propagation.h" namespace grpc_core { @@ -457,6 +459,31 @@ absl::StatusOr> CdsResourceParse( cds_update->lrs_load_reporting_server = std::make_shared( static_cast(context.server)); } + // Record LRS metric propagation. + auto propagation = MakeRefCounted(); + if (XdsOrcaLrsPropagationChangesEnabled()) { + size_t size; + upb_StringView const* metrics = + envoy_config_cluster_v3_Cluster_lrs_report_endpoint_metrics(cluster, + &size); + for (size_t i = 0; i < size; ++i) { + absl::string_view metric_name = UpbStringToAbsl(metrics[i]); + if (metric_name == "cpu_utilization") { + propagation->propagation_bits |= propagation->kCpuUtilization; + } else if (metric_name == "mem_utilization") { + propagation->propagation_bits |= propagation->kMemUtilization; + } else if (metric_name == "application_utilization") { + propagation->propagation_bits |= propagation->kApplicationUtilization; + } else if (absl::ConsumePrefix(&metric_name, "named_metrics.")) { + if (metric_name == "*") { + propagation->propagation_bits |= propagation->kNamedMetricsAll; + } else { + propagation->named_metric_keys.emplace(metric_name); + } + } + } + } + cds_update->lrs_backend_metric_propagation = std::move(propagation); // Protocol options. auto* upstream_config = envoy_config_cluster_v3_Cluster_upstream_config(cluster); diff --git a/src/core/xds/xds_client/lrs_client.cc b/src/core/xds/xds_client/lrs_client.cc index b1767a0e037..d8059321d9e 100644 --- a/src/core/xds/xds_client/lrs_client.cc +++ b/src/core/xds/xds_client/lrs_client.cc @@ -42,8 +42,10 @@ #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/util/backoff.h" #include "src/core/util/debug_location.h" +#include "src/core/util/env.h" #include "src/core/util/orphanable.h" #include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/string.h" #include "src/core/util/sync.h" #include "src/core/util/upb_utils.h" #include "src/core/util/uri.h" @@ -61,6 +63,15 @@ namespace grpc_core { using ::grpc_event_engine::experimental::EventEngine; +// TODO(roth): Remove this once the feature passes interop tests. +bool XdsOrcaLrsPropagationChangesEnabled() { + auto value = GetEnv("GRPC_EXPERIMENTAL_XDS_ORCA_LRS_PROPAGATION"); + if (!value.has_value()) return false; + bool parsed_value; + bool parse_succeeded = gpr_parse_bool_value(value->c_str(), &parsed_value); + return parse_succeeded && parsed_value; +} + namespace { uint64_t GetAndResetCounter(std::atomic* from) { @@ -124,7 +135,8 @@ void LrsClient::ClusterDropStats::AddCallDropped(const std::string& category) { LrsClient::ClusterLocalityStats::ClusterLocalityStats( RefCountedPtr lrs_client, absl::string_view lrs_server, absl::string_view cluster_name, absl::string_view eds_service_name, - RefCountedPtr name) + RefCountedPtr name, + RefCountedPtr backend_metric_propagation) : RefCounted(GRPC_TRACE_FLAG_ENABLED(xds_client_refcount) ? "ClusterLocalityStats" : nullptr), @@ -132,13 +144,14 @@ LrsClient::ClusterLocalityStats::ClusterLocalityStats( lrs_server_(lrs_server), cluster_name_(cluster_name), eds_service_name_(eds_service_name), - name_(std::move(name)) { + name_(std::move(name)), + backend_metric_propagation_(std::move(backend_metric_propagation)) { GRPC_TRACE_LOG(xds_client, INFO) << "[lrs_client " << lrs_client_.get() << "] created locality stats " << this << " for {" << lrs_server_ << ", " << cluster_name_ << ", " << eds_service_name_ << ", " << (name_ == nullptr ? "" : name_->human_readable_string().c_str()) - << "}"; + << ", propagation=" << backend_metric_propagation_->AsString() << "}"; } LrsClient::ClusterLocalityStats::~ClusterLocalityStats() { @@ -147,9 +160,10 @@ LrsClient::ClusterLocalityStats::~ClusterLocalityStats() { << this << " for {" << lrs_server_ << ", " << cluster_name_ << ", " << eds_service_name_ << ", " << (name_ == nullptr ? "" : name_->human_readable_string().c_str()) - << "}"; + << ", propagation=" << backend_metric_propagation_->AsString() << "}"; lrs_client_->RemoveClusterLocalityStats(lrs_server_, cluster_name_, - eds_service_name_, name_, this); + eds_service_name_, name_, + backend_metric_propagation_, this); lrs_client_.reset(DEBUG_LOCATION, "ClusterLocalityStats"); } @@ -164,9 +178,16 @@ LrsClient::ClusterLocalityStats::GetSnapshotAndReset() { percpu_stats.total_requests_in_progress.load(std::memory_order_relaxed), GetAndResetCounter(&percpu_stats.total_error_requests), GetAndResetCounter(&percpu_stats.total_issued_requests), + {}, + {}, + {}, {}}; { MutexLock lock(&percpu_stats.backend_metrics_mu); + percpu_snapshot.cpu_utilization = std::move(percpu_stats.cpu_utilization); + percpu_snapshot.mem_utilization = std::move(percpu_stats.mem_utilization); + percpu_snapshot.application_utilization = + std::move(percpu_stats.application_utilization); percpu_snapshot.backend_metrics = std::move(percpu_stats.backend_metrics); } snapshot += percpu_snapshot; @@ -181,16 +202,44 @@ void LrsClient::ClusterLocalityStats::AddCallStarted() { } void LrsClient::ClusterLocalityStats::AddCallFinished( - const std::map* named_metrics, bool fail) { + const BackendMetricData* backend_metrics, bool fail) { Stats& stats = stats_.this_cpu(); std::atomic& to_increment = fail ? stats.total_error_requests : stats.total_successful_requests; to_increment.fetch_add(1, std::memory_order_relaxed); stats.total_requests_in_progress.fetch_add(-1, std::memory_order_acq_rel); - if (named_metrics == nullptr) return; + if (backend_metrics == nullptr) return; MutexLock lock(&stats.backend_metrics_mu); - for (const auto& m : *named_metrics) { - stats.backend_metrics[std::string(m.first)] += BackendMetric{1, m.second}; + if (!XdsOrcaLrsPropagationChangesEnabled()) { + for (const auto& m : backend_metrics->named_metrics) { + stats.backend_metrics[std::string(m.first)] += BackendMetric(1, m.second); + } + return; + } + if (backend_metric_propagation_->propagation_bits & + BackendMetricPropagation::kCpuUtilization) { + stats.cpu_utilization += BackendMetric(1, backend_metrics->cpu_utilization); + } + if (backend_metric_propagation_->propagation_bits & + BackendMetricPropagation::kMemUtilization) { + stats.mem_utilization += BackendMetric(1, backend_metrics->mem_utilization); + } + if (backend_metric_propagation_->propagation_bits & + BackendMetricPropagation::kApplicationUtilization) { + stats.application_utilization += + BackendMetric(1, backend_metrics->application_utilization); + } + if (backend_metric_propagation_->propagation_bits & + BackendMetricPropagation::kNamedMetricsAll || + !backend_metric_propagation_->named_metric_keys.empty()) { + for (const auto& m : backend_metrics->named_metrics) { + if (backend_metric_propagation_->propagation_bits & + BackendMetricPropagation::kNamedMetricsAll || + backend_metric_propagation_->named_metric_keys.contains(m.first)) { + stats.backend_metrics[absl::StrCat("named_metrics.", m.first)] += + BackendMetric(1, m.second); + } + } } } @@ -825,7 +874,8 @@ RefCountedPtr LrsClient::AddClusterLocalityStats( std::shared_ptr lrs_server, absl::string_view cluster_name, absl::string_view eds_service_name, - RefCountedPtr locality) { + RefCountedPtr locality, + RefCountedPtr backend_metric_propagation) { auto key = std::make_pair(std::string(cluster_name), std::string(eds_service_name)); RefCountedPtr cluster_locality_stats; @@ -847,20 +897,22 @@ LrsClient::AddClusterLocalityStats( LoadReportState& load_report_state = load_report_it->second; LoadReportState::LocalityState& locality_state = load_report_state.locality_stats[locality]; - if (locality_state.locality_stats != nullptr) { - cluster_locality_stats = locality_state.locality_stats->RefIfNonZero(); + ClusterLocalityStats*& locality_stats = + locality_state.propagation_stats[backend_metric_propagation]; + if (locality_stats != nullptr) { + cluster_locality_stats = locality_stats->RefIfNonZero(); } if (cluster_locality_stats == nullptr) { - if (locality_state.locality_stats != nullptr) { + if (locality_stats != nullptr) { locality_state.deleted_locality_stats += - locality_state.locality_stats->GetSnapshotAndReset(); + locality_stats->GetSnapshotAndReset(); } cluster_locality_stats = MakeRefCounted( Ref(DEBUG_LOCATION, "LocalityStats"), server_it->first /*lrs_server*/, load_report_it->first.first /*cluster_name*/, load_report_it->first.second /*eds_service_name*/, - std::move(locality)); - locality_state.locality_stats = cluster_locality_stats.get(); + std::move(locality), std::move(backend_metric_propagation)); + locality_stats = cluster_locality_stats.get(); } server_it->second.lrs_channel->MaybeStartLrsCall(); } @@ -871,6 +923,8 @@ void LrsClient::RemoveClusterLocalityStats( absl::string_view lrs_server_key, absl::string_view cluster_name, absl::string_view eds_service_name, const RefCountedPtr& locality, + const RefCountedPtr& + backend_metric_propagation, ClusterLocalityStats* cluster_locality_stats) { MutexLock lock(&mu_); auto server_it = load_report_map_.find(lrs_server_key); @@ -882,12 +936,16 @@ void LrsClient::RemoveClusterLocalityStats( auto locality_it = load_report_state.locality_stats.find(locality); if (locality_it == load_report_state.locality_stats.end()) return; LoadReportState::LocalityState& locality_state = locality_it->second; - if (locality_state.locality_stats == cluster_locality_stats) { + auto propagation_it = + locality_state.propagation_stats.find(backend_metric_propagation); + if (propagation_it == locality_state.propagation_stats.end()) return; + ClusterLocalityStats* locality_stats = propagation_it->second; + if (locality_stats == cluster_locality_stats) { // Record final snapshot in deleted_locality_stats, which will be // added to the next load report. locality_state.deleted_locality_stats += - locality_state.locality_stats->GetSnapshotAndReset(); - locality_state.locality_stats = nullptr; + locality_stats->GetSnapshotAndReset(); + locality_state.propagation_stats.erase(propagation_it); } } @@ -940,19 +998,22 @@ LrsClient::ClusterLoadReportMap LrsClient::BuildLoadReportSnapshotLocked( ClusterLocalityStats::Snapshot& locality_snapshot = snapshot.locality_stats[locality_name]; locality_snapshot = std::move(locality_state.deleted_locality_stats); - if (locality_state.locality_stats != nullptr) { - locality_snapshot += - locality_state.locality_stats->GetSnapshotAndReset(); - GRPC_TRACE_LOG(xds_client, INFO) - << "[lrs_client " << this - << "] cluster=" << cluster_key.first.c_str() - << " eds_service_name=" << cluster_key.second.c_str() - << " locality=" << locality_name->human_readable_string().c_str() - << " locality_stats=" << locality_state.locality_stats; + for (const auto& p : locality_state.propagation_stats) { + ClusterLocalityStats* locality_stats = p.second; + if (locality_stats != nullptr) { + locality_snapshot += locality_stats->GetSnapshotAndReset(); + GRPC_TRACE_LOG(xds_client, INFO) + << "[lrs_client " << this + << "] cluster=" << cluster_key.first.c_str() + << " eds_service_name=" << cluster_key.second.c_str() + << " locality=" << locality_name->human_readable_string().c_str() + << " propagation=" << p.first->AsString() + << " locality_stats=" << locality_stats; + } } // If the only thing left in this entry was final snapshots from // deleted locality stats objects, remove the entry. - if (locality_state.locality_stats == nullptr) { + if (locality_state.propagation_stats.empty()) { it = load_report.locality_stats.erase(it); } else { ++it; @@ -1034,6 +1095,20 @@ std::string LrsClient::CreateLrsInitialRequest() { namespace { +void MaybeAddUnnamedMetric( + const LrsApiContext& context, + const LrsClient::ClusterLocalityStats::BackendMetric& backend_metric, + envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats* (*add_field)( + envoy_config_endpoint_v3_UpstreamLocalityStats*, upb_Arena*), + envoy_config_endpoint_v3_UpstreamLocalityStats* output) { + if (backend_metric.IsZero()) return; + auto* metric_proto = add_field(output, context.arena); + envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats_set_num_requests_finished_with_metric( + metric_proto, backend_metric.num_requests_finished_with_metric); + envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats_set_total_metric_value( + metric_proto, backend_metric.total_metric_value); +} + void LocalityStatsPopulate( const LrsApiContext& context, envoy_config_endpoint_v3_UpstreamLocalityStats* output, @@ -1065,6 +1140,18 @@ void LocalityStatsPopulate( envoy_config_endpoint_v3_UpstreamLocalityStats_set_total_issued_requests( output, snapshot.total_issued_requests); // Add backend metrics. + MaybeAddUnnamedMetric( + context, snapshot.cpu_utilization, + envoy_config_endpoint_v3_UpstreamLocalityStats_mutable_cpu_utilization, + output); + MaybeAddUnnamedMetric( + context, snapshot.mem_utilization, + envoy_config_endpoint_v3_UpstreamLocalityStats_mutable_mem_utilization, + output); + MaybeAddUnnamedMetric( + context, snapshot.application_utilization, + envoy_config_endpoint_v3_UpstreamLocalityStats_mutable_application_utilization, + output); for (const auto& p : snapshot.backend_metrics) { const std::string& metric_name = p.first; const LrsClient::ClusterLocalityStats::BackendMetric& metric_value = diff --git a/src/core/xds/xds_client/lrs_client.h b/src/core/xds/xds_client/lrs_client.h index 7bda6f68799..36fabc56fe3 100644 --- a/src/core/xds/xds_client/lrs_client.h +++ b/src/core/xds/xds_client/lrs_client.h @@ -33,6 +33,7 @@ #include #include "src/core/lib/debug/trace.h" +#include "src/core/load_balancing/backend_metric_data.h" #include "src/core/util/dual_ref_counted.h" #include "src/core/util/orphanable.h" #include "src/core/util/per_cpu.h" @@ -43,6 +44,7 @@ #include "src/core/util/uri.h" #include "src/core/util/work_serializer.h" #include "src/core/xds/xds_client/xds_api.h" +#include "src/core/xds/xds_client/xds_backend_metric_propagation.h" #include "src/core/xds/xds_client/xds_bootstrap.h" #include "src/core/xds/xds_client/xds_locality.h" #include "src/core/xds/xds_client/xds_metrics.h" @@ -51,6 +53,8 @@ namespace grpc_core { +bool XdsOrcaLrsPropagationChangesEnabled(); + class LrsClient : public DualRefCounted { public: // Drop stats for an xds cluster. @@ -114,6 +118,24 @@ class LrsClient : public DualRefCounted { uint64_t num_requests_finished_with_metric = 0; double total_metric_value = 0; + BackendMetric() = default; + + BackendMetric(uint64_t num_requests_finished, double value) + : num_requests_finished_with_metric(num_requests_finished), + total_metric_value(value) {} + + BackendMetric(BackendMetric&& other) noexcept + : num_requests_finished_with_metric( + std::exchange(other.num_requests_finished_with_metric, 0)), + total_metric_value(std::exchange(other.total_metric_value, 0)) {} + + BackendMetric& operator=(BackendMetric&& other) noexcept { + num_requests_finished_with_metric = + std::exchange(other.num_requests_finished_with_metric, 0); + total_metric_value = std::exchange(other.total_metric_value, 0); + return *this; + } + BackendMetric& operator+=(const BackendMetric& other) { num_requests_finished_with_metric += other.num_requests_finished_with_metric; @@ -132,6 +154,9 @@ class LrsClient : public DualRefCounted { uint64_t total_requests_in_progress = 0; uint64_t total_error_requests = 0; uint64_t total_issued_requests = 0; + BackendMetric cpu_utilization; + BackendMetric mem_utilization; + BackendMetric application_utilization; std::map backend_metrics; Snapshot& operator+=(const Snapshot& other) { @@ -139,6 +164,9 @@ class LrsClient : public DualRefCounted { total_requests_in_progress += other.total_requests_in_progress; total_error_requests += other.total_error_requests; total_issued_requests += other.total_issued_requests; + cpu_utilization += other.cpu_utilization; + mem_utilization += other.mem_utilization; + application_utilization += other.application_utilization; for (const auto& p : other.backend_metrics) { backend_metrics[p.first] += p.second; } @@ -147,7 +175,9 @@ class LrsClient : public DualRefCounted { bool IsZero() const { if (total_successful_requests != 0 || total_requests_in_progress != 0 || - total_error_requests != 0 || total_issued_requests != 0) { + total_error_requests != 0 || total_issued_requests != 0 || + !cpu_utilization.IsZero() || !mem_utilization.IsZero() || + !application_utilization.IsZero()) { return false; } for (const auto& p : backend_metrics) { @@ -161,16 +191,17 @@ class LrsClient : public DualRefCounted { absl::string_view lrs_server, absl::string_view cluster_name, absl::string_view eds_service_name, - RefCountedPtr name); + RefCountedPtr name, + RefCountedPtr + backend_metric_propagation); ~ClusterLocalityStats() override; // Returns a snapshot of this instance and resets all the counters. Snapshot GetSnapshotAndReset(); void AddCallStarted(); - void AddCallFinished( - const std::map* named_metrics, - bool fail = false); + void AddCallFinished(const BackendMetricData* backend_metrics, + bool fail = false); XdsLocalityName* locality_name() const { return name_.get(); } @@ -181,10 +212,10 @@ class LrsClient : public DualRefCounted { std::atomic total_error_requests{0}; std::atomic total_issued_requests{0}; - // Protects backend_metrics. A mutex is necessary because the length of - // backend_metrics_ can be accessed by both the callback intercepting the - // call's recv_trailing_metadata and the load reporting thread. Mutex backend_metrics_mu; + BackendMetric cpu_utilization ABSL_GUARDED_BY(backend_metrics_mu); + BackendMetric mem_utilization ABSL_GUARDED_BY(backend_metrics_mu); + BackendMetric application_utilization ABSL_GUARDED_BY(backend_metrics_mu); std::map backend_metrics ABSL_GUARDED_BY(backend_metrics_mu); }; @@ -194,6 +225,7 @@ class LrsClient : public DualRefCounted { absl::string_view cluster_name_; absl::string_view eds_service_name_; RefCountedPtr name_; + RefCountedPtr backend_metric_propagation_; PerCpu stats_{PerCpuOptions().SetMaxShards(32).SetCpusPerShard(4)}; }; @@ -204,17 +236,18 @@ class LrsClient : public DualRefCounted { std::shared_ptr engine); ~LrsClient() override; - // Adds and removes drop stats for cluster_name and eds_service_name. + // Adds drop stats for cluster_name and eds_service_name. RefCountedPtr AddClusterDropStats( std::shared_ptr lrs_server, absl::string_view cluster_name, absl::string_view eds_service_name); - // Adds and removes locality stats for cluster_name and eds_service_name - // for the specified locality. + // Adds locality stats for cluster_name and eds_service_name for the + // specified locality with the specified backend metric propagation. RefCountedPtr AddClusterLocalityStats( std::shared_ptr lrs_server, absl::string_view cluster_name, absl::string_view eds_service_name, - RefCountedPtr locality); + RefCountedPtr locality, + RefCountedPtr backend_metric_propagation); // Resets connection backoff state. void ResetBackoff(); @@ -267,7 +300,9 @@ class LrsClient : public DualRefCounted { struct LoadReportState { struct LocalityState { - ClusterLocalityStats* locality_stats = nullptr; + std::map, + ClusterLocalityStats*, BackendMetricPropagation::Less> + propagation_stats; ClusterLocalityStats::Snapshot deleted_locality_stats; }; @@ -321,6 +356,8 @@ class LrsClient : public DualRefCounted { absl::string_view lrs_server, absl::string_view cluster_name, absl::string_view eds_service_name, const RefCountedPtr& locality, + const RefCountedPtr& + backend_metric_propagation, ClusterLocalityStats* cluster_locality_stats); // Creates an initial LRS request. diff --git a/src/core/xds/xds_client/xds_backend_metric_propagation.cc b/src/core/xds/xds_client/xds_backend_metric_propagation.cc new file mode 100644 index 00000000000..1d514a0f25c --- /dev/null +++ b/src/core/xds/xds_client/xds_backend_metric_propagation.cc @@ -0,0 +1,64 @@ +// +// 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/xds/xds_client/xds_backend_metric_propagation.h" + +#include + +#include "absl/strings/str_cat.h" +#include "absl/strings/str_join.h" + +#include "src/core/util/useful.h" + +namespace grpc_core { + +std::string BackendMetricPropagation::AsString() const { + std::vector parts; + if (propagation_bits & kCpuUtilization) parts.push_back("cpu_utilization"); + if (propagation_bits & kMemUtilization) parts.push_back("mem_utilization"); + if (propagation_bits & kApplicationUtilization) { + parts.push_back("application_utilization"); + } + if (propagation_bits & kNamedMetricsAll) { + parts.push_back("named_metrics.*"); + } else { + // Output keys in sorted order for consistency. + std::vector keys(named_metric_keys.begin(), + named_metric_keys.end()); + std::sort(keys.begin(), keys.end()); + for (const auto& key : keys) { + parts.push_back(absl::StrCat("named_metrics.", key)); + } + } + return absl::StrCat("{", absl::StrJoin(parts, ","), "}"); +} + +bool BackendMetricPropagation::operator<( + const BackendMetricPropagation& other) const { + int c = QsortCompare(propagation_bits, other.propagation_bits); + if (c != 0) return c == -1; + auto other_it = other.named_metric_keys.begin(); + for (auto it = named_metric_keys.begin(); it != named_metric_keys.end(); + ++it) { + if (other_it == other.named_metric_keys.end()) return false; + c = QsortCompare(*it, *other_it); + if (c != 0) return c == -1; + ++other_it; + } + return false; +} + +} // namespace grpc_core diff --git a/src/core/xds/xds_client/xds_backend_metric_propagation.h b/src/core/xds/xds_client/xds_backend_metric_propagation.h new file mode 100644 index 00000000000..4216c0ac47e --- /dev/null +++ b/src/core/xds/xds_client/xds_backend_metric_propagation.h @@ -0,0 +1,60 @@ +// +// 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_XDS_XDS_CLIENT_XDS_BACKEND_METRIC_PROPAGATION_H +#define GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_BACKEND_METRIC_PROPAGATION_H + +#include + +#include "absl/container/flat_hash_set.h" + +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" + +namespace grpc_core { + +struct BackendMetricPropagation : public RefCounted { + static constexpr uint8_t kCpuUtilization = 1; + static constexpr uint8_t kMemUtilization = 2; + static constexpr uint8_t kApplicationUtilization = 4; + static constexpr uint8_t kNamedMetricsAll = 8; + + uint8_t propagation_bits = 0; + absl::flat_hash_set named_metric_keys; + + std::string AsString() const; + + bool operator==(const BackendMetricPropagation& other) const { + return propagation_bits == other.propagation_bits && + named_metric_keys == other.named_metric_keys; + } + + bool operator<(const BackendMetricPropagation& other) const; + + // Sorting functor for RefCountedPtr. + struct Less { + bool operator()( + const RefCountedPtr& p1, + const RefCountedPtr& p2) const { + if (p1 == nullptr || p2 == nullptr) return p1.get() < p2.get(); + return *p1 < *p2; + } + }; +}; + +} // namespace grpc_core + +#endif // GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_BACKEND_METRIC_PROPAGATION_H diff --git a/src/proto/grpc/testing/xds/v3/cluster.proto b/src/proto/grpc/testing/xds/v3/cluster.proto index a7c438399a4..bc4325e378a 100644 --- a/src/proto/grpc/testing/xds/v3/cluster.proto +++ b/src/proto/grpc/testing/xds/v3/cluster.proto @@ -252,6 +252,21 @@ message Cluster { // from the LRS stream here.] core.v3.ConfigSource lrs_server = 42; + // A list of metric names from ORCA load reports to propagate to LRS. + // + // For map fields in the ORCA proto, the string will be of the form ``.``. + // For example, the string ``named_metrics.foo`` will mean to look for the key ``foo`` in the ORCA + // ``named_metrics`` field. + // + // The special map key ``*`` means to report all entries in the map (e.g., ``named_metrics.*`` means to + // report all entries in the ORCA named_metrics field). Note that this should be used only with trusted + // backends. + // + // The metric names in LRS will follow the same semantics as this field. In other words, if this field + // contains ``named_metrics.foo``, then the LRS load report will include the data with that same string + // as the key. + repeated string lrs_report_endpoint_metrics = 57; + // The Metadata field can be used to provide additional information about the // cluster. It can be used for stats, logging, and varying filter behavior. // Fields should use reverse DNS notation to denote which entity within Envoy diff --git a/src/proto/grpc/testing/xds/v3/load_report.proto b/src/proto/grpc/testing/xds/v3/load_report.proto index b8ee86fb485..a62e7835050 100644 --- a/src/proto/grpc/testing/xds/v3/load_report.proto +++ b/src/proto/grpc/testing/xds/v3/load_report.proto @@ -51,7 +51,20 @@ message UpstreamLocalityStats { // upstream endpoints in the locality. uint64 total_issued_requests = 8; - // Stats for multi-dimensional load balancing. + // CPU utilization stats for multi-dimensional load balancing. + // This typically comes from endpoint metrics reported via ORCA. + UnnamedEndpointLoadMetricStats cpu_utilization = 12; + + // Memory utilization for multi-dimensional load balancing. + // This typically comes from endpoint metrics reported via ORCA. + UnnamedEndpointLoadMetricStats mem_utilization = 13; + + // Blended application-defined utilization for multi-dimensional load balancing. + // This typically comes from endpoint metrics reported via ORCA. + UnnamedEndpointLoadMetricStats application_utilization = 14; + + // Named stats for multi-dimensional load balancing. + // These typically come from endpoint metrics reported via ORCA. repeated EndpointLoadMetricStats load_metric_stats = 5; // Endpoint granularity stats information for this locality. This information @@ -117,6 +130,16 @@ message EndpointLoadMetricStats { double total_metric_value = 3; } +// Same as EndpointLoadMetricStats, except without the metric_name field. +message UnnamedEndpointLoadMetricStats { + // Number of calls that finished and included this metric. + uint64 num_requests_finished_with_metric = 1; + + // Sum of metric values across all calls that finished with this metric for + // load_reporting_interval. + double total_metric_value = 2; +} + // Per cluster load stats. Envoy reports these stats a management server in a // :ref:`LoadStatsRequest` // [#not-implemented-hide:] Not configuration. TBD how to doc proto APIs. diff --git a/src/python/grpcio/grpc_core_dependencies.py b/src/python/grpcio/grpc_core_dependencies.py index f5b68900662..c7e8f2b4c9f 100644 --- a/src/python/grpcio/grpc_core_dependencies.py +++ b/src/python/grpcio/grpc_core_dependencies.py @@ -866,6 +866,7 @@ CORE_SOURCE_FILES = [ 'src/core/xds/grpc/xds_transport_grpc.cc', 'src/core/xds/xds_client/lrs_client.cc', 'src/core/xds/xds_client/xds_api.cc', + 'src/core/xds/xds_client/xds_backend_metric_propagation.cc', 'src/core/xds/xds_client/xds_bootstrap.cc', 'src/core/xds/xds_client/xds_client.cc', 'third_party/abseil-cpp/absl/base/internal/cycleclock.cc', diff --git a/test/core/xds/xds_cluster_resource_type_test.cc b/test/core/xds/xds_cluster_resource_type_test.cc index fed2848dc65..804241913e8 100644 --- a/test/core/xds/xds_cluster_resource_type_test.cc +++ b/test/core/xds/xds_cluster_resource_type_test.cc @@ -1113,7 +1113,7 @@ TEST_F(TlsConfigTest, CaCertProviderUnset) { } // -// LRS server tests +// LRS tests // using LrsTest = XdsClusterTest; @@ -1160,6 +1160,92 @@ TEST_F(LrsTest, NotSelfConfigSource) { << decode_result.resource.status(); } +TEST_F(LrsTest, IgnoresPropagationWithoutEnvVar) { + Cluster cluster; + cluster.set_name("foo"); + cluster.set_type(cluster.EDS); + cluster.mutable_eds_cluster_config()->mutable_eds_config()->mutable_self(); + cluster.mutable_lrs_server()->mutable_self(); + cluster.add_lrs_report_endpoint_metrics("named_metrics.foo"); + cluster.add_lrs_report_endpoint_metrics("cpu_utilization"); + std::string serialized_resource; + ASSERT_TRUE(cluster.SerializeToString(&serialized_resource)); + auto* resource_type = XdsClusterResourceType::Get(); + auto decode_result = + resource_type->Decode(decode_context_, serialized_resource); + ASSERT_TRUE(decode_result.resource.ok()) << decode_result.resource.status(); + ASSERT_TRUE(decode_result.name.has_value()); + EXPECT_EQ(*decode_result.name, "foo"); + auto& resource = + static_cast(**decode_result.resource); + ASSERT_NE(resource.lrs_load_reporting_server, nullptr); + EXPECT_EQ(*resource.lrs_load_reporting_server, + *xds_client_->bootstrap().servers().front()); + ASSERT_NE(resource.lrs_backend_metric_propagation, nullptr); + EXPECT_EQ(resource.lrs_backend_metric_propagation->AsString(), "{}"); +} + +TEST_F(LrsTest, Propagation) { + ScopedExperimentalEnvVar env_var( + "GRPC_EXPERIMENTAL_XDS_ORCA_LRS_PROPAGATION"); + Cluster cluster; + cluster.set_name("foo"); + cluster.set_type(cluster.EDS); + cluster.mutable_eds_cluster_config()->mutable_eds_config()->mutable_self(); + cluster.mutable_lrs_server()->mutable_self(); + cluster.add_lrs_report_endpoint_metrics("named_metrics.foo"); + cluster.add_lrs_report_endpoint_metrics("named_metrics.bar"); + cluster.add_lrs_report_endpoint_metrics("cpu_utilization"); + cluster.add_lrs_report_endpoint_metrics("mem_utilization"); + cluster.add_lrs_report_endpoint_metrics("application_utilization"); + cluster.add_lrs_report_endpoint_metrics("unknown_field"); + std::string serialized_resource; + ASSERT_TRUE(cluster.SerializeToString(&serialized_resource)); + auto* resource_type = XdsClusterResourceType::Get(); + auto decode_result = + resource_type->Decode(decode_context_, serialized_resource); + ASSERT_TRUE(decode_result.resource.ok()) << decode_result.resource.status(); + ASSERT_TRUE(decode_result.name.has_value()); + EXPECT_EQ(*decode_result.name, "foo"); + auto& resource = + static_cast(**decode_result.resource); + ASSERT_NE(resource.lrs_load_reporting_server, nullptr); + EXPECT_EQ(*resource.lrs_load_reporting_server, + *xds_client_->bootstrap().servers().front()); + ASSERT_NE(resource.lrs_backend_metric_propagation, nullptr); + EXPECT_EQ(resource.lrs_backend_metric_propagation->AsString(), + "{cpu_utilization,mem_utilization,application_utilization," + "named_metrics.bar,named_metrics.foo}"); +} + +TEST_F(LrsTest, PropagationNamedMetricsAll) { + ScopedExperimentalEnvVar env_var( + "GRPC_EXPERIMENTAL_XDS_ORCA_LRS_PROPAGATION"); + Cluster cluster; + cluster.set_name("foo"); + cluster.set_type(cluster.EDS); + cluster.mutable_eds_cluster_config()->mutable_eds_config()->mutable_self(); + cluster.mutable_lrs_server()->mutable_self(); + cluster.add_lrs_report_endpoint_metrics("named_metrics.*"); + cluster.add_lrs_report_endpoint_metrics("cpu_utilization"); + std::string serialized_resource; + ASSERT_TRUE(cluster.SerializeToString(&serialized_resource)); + auto* resource_type = XdsClusterResourceType::Get(); + auto decode_result = + resource_type->Decode(decode_context_, serialized_resource); + ASSERT_TRUE(decode_result.resource.ok()) << decode_result.resource.status(); + ASSERT_TRUE(decode_result.name.has_value()); + EXPECT_EQ(*decode_result.name, "foo"); + auto& resource = + static_cast(**decode_result.resource); + ASSERT_NE(resource.lrs_load_reporting_server, nullptr); + EXPECT_EQ(*resource.lrs_load_reporting_server, + *xds_client_->bootstrap().servers().front()); + ASSERT_NE(resource.lrs_backend_metric_propagation, nullptr); + EXPECT_EQ(resource.lrs_backend_metric_propagation->AsString(), + "{cpu_utilization,named_metrics.*}"); +} + // // upstream config tests // diff --git a/test/cpp/end2end/xds/xds_cluster_end2end_test.cc b/test/cpp/end2end/xds/xds_cluster_end2end_test.cc index 24398adf7f3..c10f22d4851 100644 --- a/test/cpp/end2end/xds/xds_cluster_end2end_test.cc +++ b/test/cpp/end2end/xds/xds_cluster_end2end_test.cc @@ -1724,6 +1724,325 @@ TEST_P(ClientLoadReportingTest, Vanilla) { EXPECT_EQ(1U, balancer_->lrs_service()->response_count()); } +// Tests ORCA to LRS propagation. +TEST_P(ClientLoadReportingTest, OrcaPropagation) { + grpc_core::testing::ScopedExperimentalEnvVar env( + "GRPC_EXPERIMENTAL_XDS_ORCA_LRS_PROPAGATION"); + CreateAndStartBackends(4); + const size_t kNumRpcsPerAddress = 10; + const size_t kNumFailuresPerAddress = 3; + Cluster cluster = default_cluster_; + cluster.add_lrs_report_endpoint_metrics("named_metrics.foo"); + cluster.add_lrs_report_endpoint_metrics("cpu_utilization"); + cluster.add_lrs_report_endpoint_metrics("mem_utilization"); + cluster.add_lrs_report_endpoint_metrics("application_utilization"); + cluster.add_lrs_report_endpoint_metrics("unknown_field"); + balancer_->ads_service()->SetCdsResource(cluster); + EdsResourceArgs args({ + {"locality0", CreateEndpointsForBackends(0, 2)}, + {"locality1", CreateEndpointsForBackends(2, 4)}, + }); + balancer_->ads_service()->SetEdsResource(BuildEdsResource(args)); + // Wait until all backends are ready. + size_t num_warmup_rpcs = + WaitForAllBackends(DEBUG_LOCATION, 0, 4, /*check_status=*/nullptr, + WaitForBackendOptions().set_reset_counters(false)); + // Send kNumRpcsPerAddress RPCs per server with named metrics. + xds::data::orca::v3::OrcaLoadReport backend_metrics; + backend_metrics.set_cpu_utilization(0.8); + backend_metrics.set_mem_utilization(0.6); + backend_metrics.set_application_utilization(0.4); + auto& named_metrics = (*backend_metrics.mutable_named_metrics()); + named_metrics["foo"] = 1.0; + named_metrics["bar"] = 2.0; // Not propagated. + CheckRpcSendOk(DEBUG_LOCATION, kNumRpcsPerAddress * backends_.size(), + RpcOptions().set_backend_metrics(backend_metrics)); + backend_metrics.set_cpu_utilization(0.4); + backend_metrics.set_mem_utilization(0.3); + backend_metrics.set_application_utilization(0.2); + named_metrics["foo"] = 0.3; + named_metrics["bar"] = 0.4; // Not propagated. + for (size_t i = 0; i < kNumFailuresPerAddress * backends_.size(); ++i) { + CheckRpcSendFailure(DEBUG_LOCATION, StatusCode::FAILED_PRECONDITION, "", + RpcOptions().set_server_fail(true).set_backend_metrics( + backend_metrics)); + } + const size_t total_successful_rpcs_sent = + (kNumRpcsPerAddress * backends_.size()) + num_warmup_rpcs; + const size_t total_failed_rpcs_sent = + kNumFailuresPerAddress * backends_.size(); + // Check that the backends got the right number of requests. + size_t total_rpcs_sent = 0; + for (const auto& backend : backends_) { + total_rpcs_sent += backend->backend_service()->request_count(); + } + EXPECT_EQ(total_rpcs_sent, + total_successful_rpcs_sent + total_failed_rpcs_sent); + // The load report received at the balancer should be correct. + std::vector load_report = + balancer_->lrs_service()->WaitForLoadReport(); + ASSERT_EQ(load_report.size(), 1UL); + ClientStats& client_stats = load_report.front(); + EXPECT_EQ(client_stats.cluster_name(), kDefaultClusterName); + EXPECT_EQ(client_stats.eds_service_name(), kDefaultEdsServiceName); + EXPECT_EQ(total_successful_rpcs_sent, + client_stats.total_successful_requests()); + EXPECT_EQ(0U, client_stats.total_requests_in_progress()); + EXPECT_EQ(total_rpcs_sent, client_stats.total_issued_requests()); + EXPECT_EQ(total_failed_rpcs_sent, client_stats.total_error_requests()); + EXPECT_EQ(0U, client_stats.total_dropped_requests()); + ASSERT_THAT( + client_stats.locality_stats(), + ::testing::ElementsAre(::testing::Pair("locality0", ::testing::_), + ::testing::Pair("locality1", ::testing::_))); + size_t num_successful_rpcs = 0; + size_t num_failed_rpcs = 0; + ClientStats::LocalityStats::LoadMetric cpu_utilization; + ClientStats::LocalityStats::LoadMetric mem_utilization; + ClientStats::LocalityStats::LoadMetric application_utilization; + std::map + named_metrics_total; + for (const auto& p : client_stats.locality_stats()) { + EXPECT_EQ(p.second.total_requests_in_progress, 0U); + EXPECT_EQ( + p.second.total_issued_requests, + p.second.total_successful_requests + p.second.total_error_requests); + num_successful_rpcs += p.second.total_successful_requests; + num_failed_rpcs += p.second.total_error_requests; + cpu_utilization += p.second.cpu_utilization; + mem_utilization += p.second.mem_utilization; + application_utilization += p.second.application_utilization; + for (const auto& s : p.second.load_metrics) { + named_metrics_total[s.first] += s.second; + } + } + EXPECT_EQ(num_successful_rpcs, total_successful_rpcs_sent); + EXPECT_EQ(num_failed_rpcs, total_failed_rpcs_sent); + EXPECT_EQ(num_successful_rpcs + num_failed_rpcs, total_rpcs_sent); + EXPECT_THAT( + cpu_utilization, + LoadMetricEq( + (kNumRpcsPerAddress + kNumFailuresPerAddress) * backends_.size(), + (kNumRpcsPerAddress * backends_.size()) * 0.8 + + (kNumFailuresPerAddress * backends_.size()) * 0.4)); + EXPECT_THAT( + mem_utilization, + LoadMetricEq( + (kNumRpcsPerAddress + kNumFailuresPerAddress) * backends_.size(), + (kNumRpcsPerAddress * backends_.size()) * 0.6 + + (kNumFailuresPerAddress * backends_.size()) * 0.3)); + EXPECT_THAT( + application_utilization, + LoadMetricEq( + (kNumRpcsPerAddress + kNumFailuresPerAddress) * backends_.size(), + (kNumRpcsPerAddress * backends_.size()) * 0.4 + + (kNumFailuresPerAddress * backends_.size()) * 0.2)); + EXPECT_THAT( + named_metrics_total, + ::testing::UnorderedElementsAre(::testing::Pair( + "named_metrics.foo", + LoadMetricEq( + (kNumRpcsPerAddress + kNumFailuresPerAddress) * backends_.size(), + (kNumRpcsPerAddress * backends_.size()) * 1.0 + + (kNumFailuresPerAddress * backends_.size()) * 0.3)))); + // The LRS service got a single request, and sent a single response. + EXPECT_EQ(1U, balancer_->lrs_service()->request_count()); + EXPECT_EQ(1U, balancer_->lrs_service()->response_count()); +} + +TEST_P(ClientLoadReportingTest, OrcaPropagationNamedMetricsAll) { + grpc_core::testing::ScopedExperimentalEnvVar env( + "GRPC_EXPERIMENTAL_XDS_ORCA_LRS_PROPAGATION"); + CreateAndStartBackends(4); + const size_t kNumRpcsPerAddress = 10; + const size_t kNumFailuresPerAddress = 3; + Cluster cluster = default_cluster_; + cluster.add_lrs_report_endpoint_metrics("named_metrics.*"); + balancer_->ads_service()->SetCdsResource(cluster); + EdsResourceArgs args({ + {"locality0", CreateEndpointsForBackends(0, 2)}, + {"locality1", CreateEndpointsForBackends(2, 4)}, + }); + balancer_->ads_service()->SetEdsResource(BuildEdsResource(args)); + // Wait until all backends are ready. + size_t num_warmup_rpcs = + WaitForAllBackends(DEBUG_LOCATION, 0, 4, /*check_status=*/nullptr, + WaitForBackendOptions().set_reset_counters(false)); + // Send kNumRpcsPerAddress RPCs per server with named metrics. + xds::data::orca::v3::OrcaLoadReport backend_metrics; + backend_metrics.set_cpu_utilization(0.8); + backend_metrics.set_mem_utilization(0.6); + backend_metrics.set_application_utilization(0.4); + auto& named_metrics = (*backend_metrics.mutable_named_metrics()); + named_metrics["foo"] = 1.0; + named_metrics["bar"] = 2.0; + CheckRpcSendOk(DEBUG_LOCATION, kNumRpcsPerAddress * backends_.size(), + RpcOptions().set_backend_metrics(backend_metrics)); + backend_metrics.set_cpu_utilization(0.4); + backend_metrics.set_mem_utilization(0.3); + backend_metrics.set_application_utilization(0.2); + named_metrics["foo"] = 0.3; + named_metrics["bar"] = 0.4; + for (size_t i = 0; i < kNumFailuresPerAddress * backends_.size(); ++i) { + CheckRpcSendFailure(DEBUG_LOCATION, StatusCode::FAILED_PRECONDITION, "", + RpcOptions().set_server_fail(true).set_backend_metrics( + backend_metrics)); + } + const size_t total_successful_rpcs_sent = + (kNumRpcsPerAddress * backends_.size()) + num_warmup_rpcs; + const size_t total_failed_rpcs_sent = + kNumFailuresPerAddress * backends_.size(); + // Check that the backends got the right number of requests. + size_t total_rpcs_sent = 0; + for (const auto& backend : backends_) { + total_rpcs_sent += backend->backend_service()->request_count(); + } + EXPECT_EQ(total_rpcs_sent, + total_successful_rpcs_sent + total_failed_rpcs_sent); + // The load report received at the balancer should be correct. + std::vector load_report = + balancer_->lrs_service()->WaitForLoadReport(); + ASSERT_EQ(load_report.size(), 1UL); + ClientStats& client_stats = load_report.front(); + EXPECT_EQ(client_stats.cluster_name(), kDefaultClusterName); + EXPECT_EQ(client_stats.eds_service_name(), kDefaultEdsServiceName); + EXPECT_EQ(total_successful_rpcs_sent, + client_stats.total_successful_requests()); + EXPECT_EQ(0U, client_stats.total_requests_in_progress()); + EXPECT_EQ(total_rpcs_sent, client_stats.total_issued_requests()); + EXPECT_EQ(total_failed_rpcs_sent, client_stats.total_error_requests()); + EXPECT_EQ(0U, client_stats.total_dropped_requests()); + ASSERT_THAT( + client_stats.locality_stats(), + ::testing::ElementsAre(::testing::Pair("locality0", ::testing::_), + ::testing::Pair("locality1", ::testing::_))); + size_t num_successful_rpcs = 0; + size_t num_failed_rpcs = 0; + std::map + named_metrics_total; + for (const auto& p : client_stats.locality_stats()) { + EXPECT_EQ(p.second.total_requests_in_progress, 0U); + EXPECT_EQ( + p.second.total_issued_requests, + p.second.total_successful_requests + p.second.total_error_requests); + num_successful_rpcs += p.second.total_successful_requests; + num_failed_rpcs += p.second.total_error_requests; + for (const auto& s : p.second.load_metrics) { + named_metrics_total[s.first] += s.second; + } + } + EXPECT_EQ(num_successful_rpcs, total_successful_rpcs_sent); + EXPECT_EQ(num_failed_rpcs, total_failed_rpcs_sent); + EXPECT_EQ(num_successful_rpcs + num_failed_rpcs, total_rpcs_sent); + EXPECT_THAT( + named_metrics_total, + ::testing::UnorderedElementsAre( + ::testing::Pair( + "named_metrics.foo", + LoadMetricEq( + (kNumRpcsPerAddress + kNumFailuresPerAddress) * + backends_.size(), + (kNumRpcsPerAddress * backends_.size()) * 1.0 + + (kNumFailuresPerAddress * backends_.size()) * 0.3)), + ::testing::Pair( + "named_metrics.bar", + LoadMetricEq( + (kNumRpcsPerAddress + kNumFailuresPerAddress) * + backends_.size(), + (kNumRpcsPerAddress * backends_.size()) * 2.0 + + (kNumFailuresPerAddress * backends_.size()) * 0.4)))); + // The LRS service got a single request, and sent a single response. + EXPECT_EQ(1U, balancer_->lrs_service()->request_count()); + EXPECT_EQ(1U, balancer_->lrs_service()->response_count()); +} + +TEST_P(ClientLoadReportingTest, OrcaPropagationNotConfigured) { + grpc_core::testing::ScopedExperimentalEnvVar env( + "GRPC_EXPERIMENTAL_XDS_ORCA_LRS_PROPAGATION"); + CreateAndStartBackends(4); + const size_t kNumRpcsPerAddress = 10; + const size_t kNumFailuresPerAddress = 3; + EdsResourceArgs args({ + {"locality0", CreateEndpointsForBackends(0, 2)}, + {"locality1", CreateEndpointsForBackends(2, 4)}, + }); + balancer_->ads_service()->SetEdsResource(BuildEdsResource(args)); + // Wait until all backends are ready. + size_t num_warmup_rpcs = + WaitForAllBackends(DEBUG_LOCATION, 0, 4, /*check_status=*/nullptr, + WaitForBackendOptions().set_reset_counters(false)); + // Send kNumRpcsPerAddress RPCs per server with named metrics. + xds::data::orca::v3::OrcaLoadReport backend_metrics; + backend_metrics.set_cpu_utilization(0.8); + backend_metrics.set_mem_utilization(0.6); + backend_metrics.set_application_utilization(0.4); + auto& named_metrics = (*backend_metrics.mutable_named_metrics()); + named_metrics["foo"] = 1.0; + named_metrics["bar"] = 2.0; + CheckRpcSendOk(DEBUG_LOCATION, kNumRpcsPerAddress * backends_.size(), + RpcOptions().set_backend_metrics(backend_metrics)); + backend_metrics.set_cpu_utilization(0.4); + backend_metrics.set_mem_utilization(0.3); + backend_metrics.set_application_utilization(0.2); + named_metrics["foo"] = 0.3; + named_metrics["bar"] = 0.4; + for (size_t i = 0; i < kNumFailuresPerAddress * backends_.size(); ++i) { + CheckRpcSendFailure(DEBUG_LOCATION, StatusCode::FAILED_PRECONDITION, "", + RpcOptions().set_server_fail(true).set_backend_metrics( + backend_metrics)); + } + const size_t total_successful_rpcs_sent = + (kNumRpcsPerAddress * backends_.size()) + num_warmup_rpcs; + const size_t total_failed_rpcs_sent = + kNumFailuresPerAddress * backends_.size(); + // Check that the backends got the right number of requests. + size_t total_rpcs_sent = 0; + for (const auto& backend : backends_) { + total_rpcs_sent += backend->backend_service()->request_count(); + } + EXPECT_EQ(total_rpcs_sent, + total_successful_rpcs_sent + total_failed_rpcs_sent); + // The load report received at the balancer should be correct. + std::vector load_report = + balancer_->lrs_service()->WaitForLoadReport(); + ASSERT_EQ(load_report.size(), 1UL); + ClientStats& client_stats = load_report.front(); + EXPECT_EQ(client_stats.cluster_name(), kDefaultClusterName); + EXPECT_EQ(client_stats.eds_service_name(), kDefaultEdsServiceName); + EXPECT_EQ(total_successful_rpcs_sent, + client_stats.total_successful_requests()); + EXPECT_EQ(0U, client_stats.total_requests_in_progress()); + EXPECT_EQ(total_rpcs_sent, client_stats.total_issued_requests()); + EXPECT_EQ(total_failed_rpcs_sent, client_stats.total_error_requests()); + EXPECT_EQ(0U, client_stats.total_dropped_requests()); + ASSERT_THAT( + client_stats.locality_stats(), + ::testing::ElementsAre(::testing::Pair("locality0", ::testing::_), + ::testing::Pair("locality1", ::testing::_))); + size_t num_successful_rpcs = 0; + size_t num_failed_rpcs = 0; + std::map + named_metrics_total; + for (const auto& p : client_stats.locality_stats()) { + EXPECT_EQ(p.second.total_requests_in_progress, 0U); + EXPECT_EQ( + p.second.total_issued_requests, + p.second.total_successful_requests + p.second.total_error_requests); + num_successful_rpcs += p.second.total_successful_requests; + num_failed_rpcs += p.second.total_error_requests; + for (const auto& s : p.second.load_metrics) { + named_metrics_total[s.first] += s.second; + } + } + EXPECT_EQ(num_successful_rpcs, total_successful_rpcs_sent); + EXPECT_EQ(num_failed_rpcs, total_failed_rpcs_sent); + EXPECT_EQ(num_successful_rpcs + num_failed_rpcs, total_rpcs_sent); + EXPECT_THAT(named_metrics_total, ::testing::UnorderedElementsAre()); + // The LRS service got a single request, and sent a single response. + EXPECT_EQ(1U, balancer_->lrs_service()->request_count()); + EXPECT_EQ(1U, balancer_->lrs_service()->response_count()); +} + // Tests send_all_clusters. TEST_P(ClientLoadReportingTest, SendAllClusters) { CreateAndStartBackends(2); diff --git a/test/cpp/end2end/xds/xds_end2end_test_lib.h b/test/cpp/end2end/xds/xds_end2end_test_lib.h index 5183e9cd562..02e3fcbe50d 100644 --- a/test/cpp/end2end/xds/xds_end2end_test_lib.h +++ b/test/cpp/end2end/xds/xds_end2end_test_lib.h @@ -304,6 +304,18 @@ class XdsEnd2endTest : public ::testing::TestWithParam, if (request->has_param() && request->param().has_backend_metrics()) { const auto& request_metrics = request->param().backend_metrics(); auto* recorder = context->ExperimentalGetCallMetricRecorder(); + if (request_metrics.cpu_utilization() != 0) { + recorder->RecordCpuUtilizationMetric( + request_metrics.cpu_utilization()); + } + if (request_metrics.mem_utilization() != 0) { + recorder->RecordMemoryUtilizationMetric( + request_metrics.mem_utilization()); + } + if (request_metrics.application_utilization() != 0) { + recorder->RecordApplicationUtilizationMetric( + request_metrics.application_utilization()); + } for (const auto& p : request_metrics.named_metrics()) { char* key = static_cast( grpc_call_arena_alloc(context->c_call(), p.first.size() + 1)); diff --git a/test/cpp/end2end/xds/xds_server.h b/test/cpp/end2end/xds/xds_server.h index 4131362f7b0..2b6c508faf7 100644 --- a/test/cpp/end2end/xds/xds_server.h +++ b/test/cpp/end2end/xds/xds_server.h @@ -617,8 +617,19 @@ class LrsServiceImpl // Stats for a given locality. struct LocalityStats { struct LoadMetric { - uint64_t num_requests_finished_with_metric; - double total_metric_value; + uint64_t num_requests_finished_with_metric = 0; + double total_metric_value = 0; + + LoadMetric() = default; + + // Works for both EndpointLoadMetricStats and + // UnnamedEndpointLoadMetricStats. + template + explicit LoadMetric(const T& stats) + : num_requests_finished_with_metric( + stats.num_requests_finished_with_metric()), + total_metric_value(stats.total_metric_value()) {} + LoadMetric& operator+=(const LoadMetric& other) { num_requests_finished_with_metric += other.num_requests_finished_with_metric; @@ -640,10 +651,13 @@ class LrsServiceImpl total_error_requests( upstream_locality_stats.total_error_requests()), total_issued_requests( - upstream_locality_stats.total_issued_requests()) { + upstream_locality_stats.total_issued_requests()), + cpu_utilization(upstream_locality_stats.cpu_utilization()), + mem_utilization(upstream_locality_stats.mem_utilization()), + application_utilization( + upstream_locality_stats.application_utilization()) { for (const auto& s : upstream_locality_stats.load_metric_stats()) { - load_metrics[s.metric_name()] += LoadMetric{ - s.num_requests_finished_with_metric(), s.total_metric_value()}; + load_metrics[s.metric_name()] += LoadMetric(s); } } @@ -652,6 +666,9 @@ class LrsServiceImpl total_requests_in_progress += other.total_requests_in_progress; total_error_requests += other.total_error_requests; total_issued_requests += other.total_issued_requests; + cpu_utilization += other.cpu_utilization; + mem_utilization += other.mem_utilization; + application_utilization += other.application_utilization; for (const auto& p : other.load_metrics) { load_metrics[p.first] += p.second; } @@ -662,6 +679,9 @@ class LrsServiceImpl uint64_t total_requests_in_progress = 0; uint64_t total_error_requests = 0; uint64_t total_issued_requests = 0; + LoadMetric cpu_utilization; + LoadMetric mem_utilization; + LoadMetric application_utilization; std::map load_metrics; }; diff --git a/tools/doxygen/Doxyfile.c++.internal b/tools/doxygen/Doxyfile.c++.internal index 994e038c983..4220bb664a0 100644 --- a/tools/doxygen/Doxyfile.c++.internal +++ b/tools/doxygen/Doxyfile.c++.internal @@ -3044,6 +3044,8 @@ src/core/xds/xds_client/lrs_client.cc \ src/core/xds/xds_client/lrs_client.h \ src/core/xds/xds_client/xds_api.cc \ src/core/xds/xds_client/xds_api.h \ +src/core/xds/xds_client/xds_backend_metric_propagation.cc \ +src/core/xds/xds_client/xds_backend_metric_propagation.h \ src/core/xds/xds_client/xds_bootstrap.cc \ src/core/xds/xds_client/xds_bootstrap.h \ src/core/xds/xds_client/xds_channel_args.h \ diff --git a/tools/doxygen/Doxyfile.core.internal b/tools/doxygen/Doxyfile.core.internal index 3725bd86978..eae9a2e2ea4 100644 --- a/tools/doxygen/Doxyfile.core.internal +++ b/tools/doxygen/Doxyfile.core.internal @@ -2821,6 +2821,8 @@ src/core/xds/xds_client/lrs_client.cc \ src/core/xds/xds_client/lrs_client.h \ src/core/xds/xds_client/xds_api.cc \ src/core/xds/xds_client/xds_api.h \ +src/core/xds/xds_client/xds_backend_metric_propagation.cc \ +src/core/xds/xds_client/xds_backend_metric_propagation.h \ src/core/xds/xds_client/xds_bootstrap.cc \ src/core/xds/xds_client/xds_bootstrap.h \ src/core/xds/xds_client/xds_channel_args.h \ From 40ff7aa6178d243ae9431a875fb4050c4b2534a9 Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Fri, 27 Sep 2024 11:31:31 -0700 Subject: [PATCH 37/75] [call-v3] Inline OperationExecutor methods (#37006) These methods are very short and very inlinable. Further more the specializations are very infrequently repeated. (I'm essentially hoisting code out of the .cc file and landing it in the .h file with the appropriate inlining annotations here) Before: ``` ---------------------------------------------------------------------------------------------------- Benchmark Time CPU Iterations ---------------------------------------------------------------------------------------------------- grpc_core::BM_UnaryWithSpawnPerEnd 1053 ns 1053 ns 2674404 grpc_core::BM_UnaryWithSpawnPerOp 1191 ns 1191 ns 2337068 grpc_core::BM_ClientToServerStreaming 243 ns 243 ns 11511112 grpc_core::BM_UnaryWithSpawnPerEnd 2723 ns 2724 ns 1033990 grpc_core::BM_UnaryWithSpawnPerOp 2930 ns 2931 ns 942815 grpc_core::BM_ClientToServerStreaming 455 ns 455 ns 6213422 ``` After: ``` ---------------------------------------------------------------------------------------------------- Benchmark Time CPU Iterations ---------------------------------------------------------------------------------------------------- grpc_core::BM_UnaryWithSpawnPerEnd 986 ns 986 ns 2867870 grpc_core::BM_UnaryWithSpawnPerOp 1101 ns 1101 ns 2472611 grpc_core::BM_ClientToServerStreaming 220 ns 220 ns 12774397 grpc_core::BM_UnaryWithSpawnPerEnd 2512 ns 2512 ns 1111667 grpc_core::BM_UnaryWithSpawnPerOp 2743 ns 2744 ns 1008676 grpc_core::BM_ClientToServerStreaming 420 ns 420 ns 6820805 ``` Closes #37006 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37006 from ctiller:inline-filters 24903bd524ae5f4c97fe75318a3fcf73436ff6ea PiperOrigin-RevId: 679666043 --- src/core/lib/transport/call_filters.cc | 115 +------------------------ src/core/lib/transport/call_filters.h | 108 +++++++++++++++++++++-- 2 files changed, 104 insertions(+), 119 deletions(-) diff --git a/src/core/lib/transport/call_filters.cc b/src/core/lib/transport/call_filters.cc index f15579db603..822c266b0b3 100644 --- a/src/core/lib/transport/call_filters.cc +++ b/src/core/lib/transport/call_filters.cc @@ -23,124 +23,13 @@ #include "src/core/util/crash.h" namespace grpc_core { - -namespace filters_detail { - -void RunHalfClose(absl::Span ops, void* call_data) { - for (const auto& op : ops) { - op.half_close(Offset(call_data, op.call_offset), op.channel_data); - } -} - -ServerMetadataHandle RunServerTrailingMetadata( - absl::Span ops, void* call_data, - ServerMetadataHandle md) { - for (auto& op : ops) { - md = op.server_trailing_metadata(Offset(call_data, op.call_offset), - op.channel_data, std::move(md)); - } - return md; -} - -template -OperationExecutor::~OperationExecutor() { - if (promise_data_ != nullptr) { - ops_->early_destroy(promise_data_); - gpr_free_aligned(promise_data_); - } -} - -template -Poll> OperationExecutor::Start(const Layout* layout, T input, - void* call_data) { - ops_ = layout->ops.data(); - end_ops_ = ops_ + layout->ops.size(); - if (layout->promise_size == 0) { - // No call state ==> instantaneously ready - auto r = InitStep(std::move(input), call_data); - CHECK(r.ready()); - return r; - } - promise_data_ = - gpr_malloc_aligned(layout->promise_size, layout->promise_alignment); - return InitStep(std::move(input), call_data); -} - -template -Poll> OperationExecutor::InitStep(T input, void* call_data) { - CHECK(input != nullptr); - while (true) { - if (ops_ == end_ops_) { - return ResultOr{std::move(input), nullptr}; - } - auto p = - ops_->promise_init(promise_data_, Offset(call_data, ops_->call_offset), - ops_->channel_data, std::move(input)); - if (auto* r = p.value_if_ready()) { - if (r->ok == nullptr) return std::move(*r); - input = std::move(r->ok); - ++ops_; - continue; - } - return Pending{}; - } -} - -template -Poll> OperationExecutor::Step(void* call_data) { - DCHECK_NE(promise_data_, nullptr); - auto p = ContinueStep(call_data); - if (p.ready()) { - gpr_free_aligned(promise_data_); - promise_data_ = nullptr; - } - return p; -} - -template -Poll> OperationExecutor::ContinueStep(void* call_data) { - auto p = ops_->poll(promise_data_); - if (auto* r = p.value_if_ready()) { - if (r->ok == nullptr) return std::move(*r); - ++ops_; - return InitStep(std::move(r->ok), call_data); - } - return Pending{}; -} - -// Explicit instantiations of some types used in filters.h -// We'll need to add ServerMetadataHandle to this when it becomes different -// to ClientMetadataHandle -template class OperationExecutor; -template class OperationExecutor; - -} // namespace filters_detail - -namespace { // Call data for those calls that don't have any call data // (we form pointers to this that aren't allowed to be nullptr) -char g_empty_call_data; -} // namespace +char CallFilters::g_empty_call_data_; /////////////////////////////////////////////////////////////////////////////// // CallFilters -CallFilters::CallFilters(ClientMetadataHandle client_initial_metadata) - : call_data_(nullptr), - push_client_initial_metadata_(std::move(client_initial_metadata)) {} - -CallFilters::~CallFilters() { - if (call_data_ != nullptr && call_data_ != &g_empty_call_data) { - for (const auto& stack : stacks_) { - for (const auto& destructor : stack.stack->data_.filter_destructor) { - destructor.call_destroy(filters_detail::Offset( - call_data_, stack.call_data_offset + destructor.call_offset)); - } - } - gpr_free_aligned(call_data_); - } -} - void CallFilters::Start() { CHECK_EQ(call_data_, nullptr); size_t call_data_alignment = 1; @@ -161,7 +50,7 @@ void CallFilters::Start() { if (call_data_size != 0) { call_data_ = gpr_malloc_aligned(call_data_size, call_data_alignment); } else { - call_data_ = &g_empty_call_data; + call_data_ = &g_empty_call_data_; } for (const auto& stack : stacks_) { for (const auto& constructor : stack.stack->data_.filter_constructor) { diff --git a/src/core/lib/transport/call_filters.h b/src/core/lib/transport/call_filters.h index fb64eb95eca..b1a54f5dfec 100644 --- a/src/core/lib/transport/call_filters.h +++ b/src/core/lib/transport/call_filters.h @@ -220,10 +220,22 @@ struct ServerTrailingMetadataOperator { void* call_data, void* channel_data, ServerMetadataHandle metadata); }; -void RunHalfClose(absl::Span ops, void* call_data); -ServerMetadataHandle RunServerTrailingMetadata( - absl::Span ops, void* call_data, - ServerMetadataHandle md); +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION inline void RunHalfClose( + absl::Span ops, void* call_data) { + for (const auto& op : ops) { + op.half_close(Offset(call_data, op.call_offset), op.channel_data); + } +} + +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION inline ServerMetadataHandle +RunServerTrailingMetadata(absl::Span ops, + void* call_data, ServerMetadataHandle md) { + for (auto& op : ops) { + md = op.server_trailing_metadata(Offset(call_data, op.call_offset), + op.channel_data, std::move(md)); + } + return md; +} // One call finalizer struct Finalizer { @@ -1116,6 +1128,76 @@ class OperationExecutor { const Operator* end_ops_; }; +template +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION inline OperationExecutor< + T>::~OperationExecutor() { + if (promise_data_ != nullptr) { + ops_->early_destroy(promise_data_); + gpr_free_aligned(promise_data_); + } +} + +template +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION inline Poll> +OperationExecutor::Start(const Layout* layout, T input, void* call_data) { + ops_ = layout->ops.data(); + end_ops_ = ops_ + layout->ops.size(); + if (layout->promise_size == 0) { + // No call state ==> instantaneously ready + auto r = InitStep(std::move(input), call_data); + CHECK(r.ready()); + return r; + } + promise_data_ = + gpr_malloc_aligned(layout->promise_size, layout->promise_alignment); + return InitStep(std::move(input), call_data); +} + +template +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION inline Poll> +OperationExecutor::InitStep(T input, void* call_data) { + CHECK(input != nullptr); + while (true) { + if (ops_ == end_ops_) { + return ResultOr{std::move(input), nullptr}; + } + auto p = + ops_->promise_init(promise_data_, Offset(call_data, ops_->call_offset), + ops_->channel_data, std::move(input)); + if (auto* r = p.value_if_ready()) { + if (r->ok == nullptr) return std::move(*r); + input = std::move(r->ok); + ++ops_; + continue; + } + return Pending{}; + } +} + +template +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION inline Poll> +OperationExecutor::Step(void* call_data) { + DCHECK_NE(promise_data_, nullptr); + auto p = ContinueStep(call_data); + if (p.ready()) { + gpr_free_aligned(promise_data_); + promise_data_ = nullptr; + } + return p; +} + +template +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION inline Poll> +OperationExecutor::ContinueStep(void* call_data) { + auto p = ops_->poll(promise_data_); + if (auto* r = p.value_if_ready()) { + if (r->ok == nullptr) return std::move(*r); + ++ops_; + return InitStep(std::move(r->ok), call_data); + } + return Pending{}; +} + template class ServerTrailingMetadataInterceptor { public: @@ -1276,8 +1358,20 @@ class CallFilters { filters_detail::StackData data_; }; - explicit CallFilters(ClientMetadataHandle client_initial_metadata); - ~CallFilters(); + explicit CallFilters(ClientMetadataHandle client_initial_metadata) + : call_data_(nullptr), + push_client_initial_metadata_(std::move(client_initial_metadata)) {} + ~CallFilters() { + if (call_data_ != nullptr && call_data_ != &g_empty_call_data_) { + for (const auto& stack : stacks_) { + for (const auto& destructor : stack.stack->data_.filter_destructor) { + destructor.call_destroy(filters_detail::Offset( + call_data_, stack.call_data_offset + destructor.call_offset)); + } + } + gpr_free_aligned(call_data_); + } + }; CallFilters(const CallFilters&) = delete; CallFilters& operator=(const CallFilters&) = delete; @@ -1528,6 +1622,8 @@ class CallFilters { MessageHandle push_client_to_server_message_; MessageHandle push_server_to_client_message_; ServerMetadataHandle push_server_trailing_metadata_; + + static char g_empty_call_data_; }; } // namespace grpc_core From 6dbc0bdb106b3b2c319198194ca7b6f18d88f8ff Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Fri, 27 Sep 2024 12:20:36 -0700 Subject: [PATCH 38/75] [chaotic-good] Use a party for internal activities (#37078) Allows use of the party <-> party wakeup batching stuff, which reduces threadhops drastically for this transport. Closes #37078 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37078 from ctiller:chaotic-party-3 75c32e6a6467f41e24d3786980a4aed3e8c93a4c PiperOrigin-RevId: 679685211 --- src/core/BUILD | 7 +-- .../chaotic_good/client_transport.cc | 45 ++++++------------- .../transport/chaotic_good/client_transport.h | 6 +-- .../chaotic_good/server_transport.cc | 33 +++++++------- .../transport/chaotic_good/server_transport.h | 3 +- src/core/lib/promise/party.cc | 21 ++++++--- src/core/lib/promise/party.h | 2 + .../chaotic_good/client_transport_test.cc | 12 ++--- .../chaotic_good/mock_promise_endpoint.h | 15 +++++++ .../chaotic_good/server_transport_test.cc | 4 +- 10 files changed, 76 insertions(+), 72 deletions(-) diff --git a/src/core/BUILD b/src/core/BUILD index 13091d6bd38..a7ae31fe639 100644 --- a/src/core/BUILD +++ b/src/core/BUILD @@ -7946,7 +7946,7 @@ grpc_cc_library( "absl/base:core_headers", "absl/container:flat_hash_map", "absl/log:check", - "absl/log:log", + "absl/log", "absl/random", "absl/random:bit_gen_ref", "absl/status", @@ -7957,20 +7957,18 @@ grpc_cc_library( language = "c++", deps = [ "activity", - "all_ok", "arena", "chaotic_good_frame", "chaotic_good_frame_header", "chaotic_good_transport", "context", - "event_engine_wakeup_scheduler", + "event_engine_context", "for_each", "grpc_promise_endpoint", "if", "inter_activity_pipe", "loop", "map", - "match", "memory_quota", "metadata_batch", "mpsc", @@ -7987,7 +7985,6 @@ grpc_cc_library( "//:grpc_base", "//:hpack_encoder", "//:hpack_parser", - "//:promise", "//:ref_counted_ptr", ], ) diff --git a/src/core/ext/transport/chaotic_good/client_transport.cc b/src/core/ext/transport/chaotic_good/client_transport.cc index 17aff601d45..28af0d5ba98 100644 --- a/src/core/ext/transport/chaotic_good/client_transport.cc +++ b/src/core/ext/transport/chaotic_good/client_transport.cc @@ -36,22 +36,15 @@ #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/iomgr/exec_ctx.h" -#include "src/core/lib/promise/activity.h" -#include "src/core/lib/promise/all_ok.h" -#include "src/core/lib/promise/event_engine_wakeup_scheduler.h" #include "src/core/lib/promise/loop.h" #include "src/core/lib/promise/map.h" -#include "src/core/lib/promise/promise.h" -#include "src/core/lib/promise/try_join.h" #include "src/core/lib/promise/try_seq.h" #include "src/core/lib/resource_quota/arena.h" #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/slice/slice_internal.h" #include "src/core/lib/transport/promise_endpoint.h" -#include "src/core/util/match.h" #include "src/core/util/ref_counted_ptr.h" namespace grpc_core { @@ -59,15 +52,12 @@ namespace chaotic_good { void ChaoticGoodClientTransport::Orphan() { AbortWithError(); - ActivityPtr writer; - ActivityPtr reader; + RefCountedPtr party; { MutexLock lock(&mu_); - writer = std::move(writer_); - reader = std::move(reader_); + party = std::move(party_); } - writer.reset(); - reader.reset(); + party.reset(); Unref(); } @@ -211,25 +201,18 @@ ChaoticGoodClientTransport::ChaoticGoodClientTransport( auto transport = MakeRefCounted( std::move(control_endpoint), std::move(data_endpoint), std::move(hpack_parser), std::move(hpack_encoder)); - writer_ = MakeActivity( - // Continuously write next outgoing frames to promise endpoints. - TransportWriteLoop(transport), EventEngineWakeupScheduler(event_engine), - OnTransportActivityDone("write_loop")); - reader_ = MakeActivity( - // Continuously read next incoming frames from promise endpoints. - TransportReadLoop(std::move(transport)), - EventEngineWakeupScheduler(event_engine), - OnTransportActivityDone("read_loop")); + auto party_arena = SimpleArenaAllocator(0)->MakeArena(); + party_arena->SetContext( + event_engine.get()); + party_ = Party::Make(std::move(party_arena)); + party_->Spawn("client-chaotic-writer", TransportWriteLoop(transport), + OnTransportActivityDone("write_loop")); + party_->Spawn("client-chaotic-reader", + TransportReadLoop(std::move(transport)), + OnTransportActivityDone("read_loop")); } -ChaoticGoodClientTransport::~ChaoticGoodClientTransport() { - if (writer_ != nullptr) { - writer_.reset(); - } - if (reader_ != nullptr) { - reader_.reset(); - } -} +ChaoticGoodClientTransport::~ChaoticGoodClientTransport() { party_.reset(); } void ChaoticGoodClientTransport::AbortWithError() { // Mark transport as unavailable when the endpoint write/read failed. diff --git a/src/core/ext/transport/chaotic_good/client_transport.h b/src/core/ext/transport/chaotic_good/client_transport.h index 8f2941947d3..f223c551002 100644 --- a/src/core/ext/transport/chaotic_good/client_transport.h +++ b/src/core/ext/transport/chaotic_good/client_transport.h @@ -88,9 +88,6 @@ class ChaoticGoodClientTransport final : public ClientTransport { void AbortWithError(); private: - // Queue size of each stream pipe is set to 2, so that for each stream read it - // will queue at most 2 frames. - static const size_t kServerFrameQueueSize = 2; using StreamMap = absl::flat_hash_map; uint32_t MakeStream(CallHandler call_handler); @@ -112,8 +109,7 @@ class ChaoticGoodClientTransport final : public ClientTransport { uint32_t next_stream_id_ ABSL_GUARDED_BY(mu_) = 1; // Map of stream incoming server frames, key is stream_id. StreamMap stream_map_ ABSL_GUARDED_BY(mu_); - ActivityPtr writer_; - ActivityPtr reader_; + RefCountedPtr party_; ConnectivityStateTracker state_tracker_ ABSL_GUARDED_BY(mu_){ "chaotic_good_client", GRPC_CHANNEL_READY}; }; diff --git a/src/core/ext/transport/chaotic_good/server_transport.cc b/src/core/ext/transport/chaotic_good/server_transport.cc index 4110af2fbcc..6588227a264 100644 --- a/src/core/ext/transport/chaotic_good/server_transport.cc +++ b/src/core/ext/transport/chaotic_good/server_transport.cc @@ -356,12 +356,14 @@ ChaoticGoodServerTransport::ChaoticGoodServerTransport( auto transport = MakeRefCounted( std::move(control_endpoint), std::move(data_endpoint), std::move(hpack_parser), std::move(hpack_encoder)); - writer_ = MakeActivity(TransportWriteLoop(transport), - EventEngineWakeupScheduler(event_engine), - OnTransportActivityDone("writer")); - reader_ = MakeActivity(TransportReadLoop(std::move(transport)), - EventEngineWakeupScheduler(event_engine), - OnTransportActivityDone("reader")); + auto party_arena = SimpleArenaAllocator(0)->MakeArena(); + party_arena->SetContext( + event_engine.get()); + party_ = Party::Make(std::move(party_arena)); + party_->Spawn("server-chaotic-writer", TransportWriteLoop(transport), + OnTransportActivityDone("writer")); + party_->Spawn("server-chaotic-reader", TransportReadLoop(transport), + OnTransportActivityDone("reader")); } void ChaoticGoodServerTransport::SetCallDestination( @@ -373,15 +375,13 @@ void ChaoticGoodServerTransport::SetCallDestination( } void ChaoticGoodServerTransport::Orphan() { - ActivityPtr writer; - ActivityPtr reader; + AbortWithError(); + RefCountedPtr party; { MutexLock lock(&mu_); - writer = std::move(writer_); - reader = std::move(reader_); + party = std::move(party_); } - writer.reset(); - reader.reset(); + party.reset(); Unref(); } @@ -461,7 +461,7 @@ absl::Status ChaoticGoodServerTransport::NewStream( } void ChaoticGoodServerTransport::PerformOp(grpc_transport_op* op) { - std::vector cancelled; + RefCountedPtr cancelled_party; MutexLock lock(&mu_); bool did_stuff = false; if (op->start_connectivity_watch != nullptr) { @@ -482,8 +482,11 @@ void ChaoticGoodServerTransport::PerformOp(grpc_transport_op* op) { did_stuff = true; } if (!op->goaway_error.ok() || !op->disconnect_with_error.ok()) { - cancelled.push_back(std::move(writer_)); - cancelled.push_back(std::move(reader_)); + cancelled_party = std::move(party_); + outgoing_frames_.MarkClosed(); + state_tracker_.SetState(GRPC_CHANNEL_SHUTDOWN, + absl::UnavailableError("transport closed"), + "transport closed"); did_stuff = true; } if (!did_stuff) { diff --git a/src/core/ext/transport/chaotic_good/server_transport.h b/src/core/ext/transport/chaotic_good/server_transport.h index 23909768b68..d8244ab32fe 100644 --- a/src/core/ext/transport/chaotic_good/server_transport.h +++ b/src/core/ext/transport/chaotic_good/server_transport.h @@ -146,8 +146,7 @@ class ChaoticGoodServerTransport final : public ServerTransport { // Map of stream incoming server frames, key is stream_id. StreamMap stream_map_ ABSL_GUARDED_BY(mu_); uint32_t last_seen_new_stream_id_ = 0; - ActivityPtr writer_ ABSL_GUARDED_BY(mu_); - ActivityPtr reader_ ABSL_GUARDED_BY(mu_); + RefCountedPtr party_; ConnectivityStateTracker state_tracker_ ABSL_GUARDED_BY(mu_){ "chaotic_good_server", GRPC_CHANNEL_READY}; }; diff --git a/src/core/lib/promise/party.cc b/src/core/lib/promise/party.cc index cfc34ebedee..79c310c9806 100644 --- a/src/core/lib/promise/party.cc +++ b/src/core/lib/promise/party.cc @@ -149,15 +149,24 @@ Party::Participant::~Participant() { Party::~Party() {} void Party::CancelRemainingParticipants() { - if ((state_.load(std::memory_order_relaxed) & kAllocatedMask) == 0) return; + uint64_t prev_state = state_.load(std::memory_order_relaxed); + if ((prev_state & 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)) { - p->Destroy(); + uint64_t clear_state = 0; + do { + for (size_t i = 0; i < party_detail::kMaxParticipants; i++) { + if (auto* p = + participants_[i].exchange(nullptr, std::memory_order_acquire)) { + clear_state |= 1ull << i << kAllocatedShift; + p->Destroy(); + } } - } + if (clear_state == 0) return; + } while (!state_.compare_exchange_weak(prev_state, prev_state & ~clear_state, + std::memory_order_acq_rel)); + LogStateChange("CancelRemainingParticipants", prev_state, + prev_state & ~clear_state); } std::string Party::ActivityDebugTag(WakeupMask wakeup_mask) const { diff --git a/src/core/lib/promise/party.h b/src/core/lib/promise/party.h index a38467a924b..d2051aa6083 100644 --- a/src/core/lib/promise/party.h +++ b/src/core/lib/promise/party.h @@ -430,12 +430,14 @@ 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) { + GRPC_TRACE_LOG(party_state, INFO) << "PARTY[" << this << "]: spawn " << name; AddParticipant(new ParticipantImpl( name, std::move(promise_factory), std::move(on_complete))); } template auto Party::SpawnWaitable(absl::string_view name, Factory promise_factory) { + GRPC_TRACE_LOG(party_state, INFO) << "PARTY[" << this << "]: spawn " << name; auto participant = MakeRefCounted>( name, std::move(promise_factory)); Participant* p = participant->Ref().release(); diff --git a/test/core/transport/chaotic_good/client_transport_test.cc b/test/core/transport/chaotic_good/client_transport_test.cc index d4f7037b733..aad18ee1601 100644 --- a/test/core/transport/chaotic_good/client_transport_test.cc +++ b/test/core/transport/chaotic_good/client_transport_test.cc @@ -102,8 +102,8 @@ ChannelArgs MakeChannelArgs() { } TEST_F(TransportTest, AddOneStream) { - MockPromiseEndpoint control_endpoint; - MockPromiseEndpoint data_endpoint; + MockPromiseEndpoint control_endpoint(1000); + MockPromiseEndpoint data_endpoint(1001); control_endpoint.ExpectRead( {SerializedFrameHeader(FrameType::kFragment, 7, 1, 26, 8, 56, 15), EventEngineSlice::FromCopiedBuffer(kPathDemoServiceStep, @@ -120,7 +120,6 @@ TEST_F(TransportTest, AddOneStream) { std::move(data_endpoint.promise_endpoint), MakeChannelArgs(), event_engine(), HPackParser(), HPackCompressor()); auto call = MakeCall(TestInitialMetadata()); - transport->StartCall(call.handler.StartCall()); StrictMock> on_done; EXPECT_CALL(on_done, Call()); control_endpoint.ExpectWrite( @@ -136,6 +135,7 @@ TEST_F(TransportTest, AddOneStream) { {EventEngineSlice::FromCopiedString("0"), Zeros(63)}, nullptr); control_endpoint.ExpectWrite( {SerializedFrameHeader(FrameType::kFragment, 4, 1, 0, 0, 0, 0)}, nullptr); + transport->StartCall(call.handler.StartCall()); call.initiator.SpawnGuarded("test-send", [initiator = call.initiator]() mutable { return SendClientToServerMessages(initiator, 1); @@ -183,8 +183,8 @@ TEST_F(TransportTest, AddOneStream) { } TEST_F(TransportTest, AddOneStreamMultipleMessages) { - MockPromiseEndpoint control_endpoint; - MockPromiseEndpoint data_endpoint; + MockPromiseEndpoint control_endpoint(1000); + MockPromiseEndpoint data_endpoint(1001); control_endpoint.ExpectRead( {SerializedFrameHeader(FrameType::kFragment, 3, 1, 26, 8, 56, 0), EventEngineSlice::FromCopiedBuffer(kPathDemoServiceStep, @@ -206,7 +206,6 @@ TEST_F(TransportTest, AddOneStreamMultipleMessages) { std::move(data_endpoint.promise_endpoint), MakeChannelArgs(), event_engine(), HPackParser(), HPackCompressor()); auto call = MakeCall(TestInitialMetadata()); - transport->StartCall(call.handler.StartCall()); StrictMock> on_done; EXPECT_CALL(on_done, Call()); control_endpoint.ExpectWrite( @@ -227,6 +226,7 @@ TEST_F(TransportTest, AddOneStreamMultipleMessages) { {EventEngineSlice::FromCopiedString("1"), Zeros(63)}, nullptr); control_endpoint.ExpectWrite( {SerializedFrameHeader(FrameType::kFragment, 4, 1, 0, 0, 0, 0)}, nullptr); + transport->StartCall(call.handler.StartCall()); call.initiator.SpawnGuarded("test-send", [initiator = call.initiator]() mutable { return SendClientToServerMessages(initiator, 2); diff --git a/test/core/transport/chaotic_good/mock_promise_endpoint.h b/test/core/transport/chaotic_good/mock_promise_endpoint.h index d90133feb9d..bf073e4644f 100644 --- a/test/core/transport/chaotic_good/mock_promise_endpoint.h +++ b/test/core/transport/chaotic_good/mock_promise_endpoint.h @@ -20,6 +20,7 @@ #include +#include "src/core/lib/event_engine/tcp_socket_utils.h" #include "src/core/lib/transport/promise_endpoint.h" namespace grpc_core { @@ -54,6 +55,20 @@ class MockEndpoint }; struct MockPromiseEndpoint { + explicit MockPromiseEndpoint(int port) { + if (GRPC_TRACE_FLAG_ENABLED(chaotic_good)) { + EXPECT_CALL(*endpoint, GetPeerAddress) + .WillRepeatedly( + [peer_address = + std::make_shared( + grpc_event_engine::experimental::URIToResolvedAddress( + absl::StrCat("ipv4:127.0.0.1:", port)) + .value())]() + -> const grpc_event_engine::experimental::EventEngine:: + ResolvedAddress& { return *peer_address; }); + } + } ::testing::StrictMock* endpoint = new ::testing::StrictMock(); PromiseEndpoint promise_endpoint = PromiseEndpoint( diff --git a/test/core/transport/chaotic_good/server_transport_test.cc b/test/core/transport/chaotic_good/server_transport_test.cc index af5b223c2fb..f3ab7f3a350 100644 --- a/test/core/transport/chaotic_good/server_transport_test.cc +++ b/test/core/transport/chaotic_good/server_transport_test.cc @@ -91,8 +91,8 @@ class MockCallDestination : public UnstartedCallDestination { }; TEST_F(TransportTest, ReadAndWriteOneMessage) { - MockPromiseEndpoint control_endpoint; - MockPromiseEndpoint data_endpoint; + MockPromiseEndpoint control_endpoint(1); + MockPromiseEndpoint data_endpoint(2); auto call_destination = MakeRefCounted>(); EXPECT_CALL(*call_destination, Orphaned()).Times(1); auto transport = MakeOrphanable( From e56d766a45a61e6b476958ad0bb68e2d022dcfbb Mon Sep 17 00:00:00 2001 From: "Mark D. Roth" Date: Fri, 27 Sep 2024 13:23:29 -0700 Subject: [PATCH 39/75] [GCP auth filter] add "blackboard" mechanism for retaining global state, and use it for cache in GCP auth filter (#37646) This is the last piece of gRFC A83 (https://github.com/grpc/proposal/pull/438). Note that although this is the first use-case for this "blackboard" mechanism, we will also use it in the future for the xDS rate-limiting filter on the gRPC server side. Closes #37646 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37646 from markdroth:gcp_auth_filter_state 72d0d96c79f1576a0085f1887829ffcab93fe5ff PiperOrigin-RevId: 679707134 --- BUILD | 2 + CMakeLists.txt | 62 ++++++++++++++++ Makefile | 1 + Package.swift | 2 + build_autogenerated.yaml | 57 +++++++++++++++ config.m4 | 2 + config.w32 | 2 + gRPC-C++.podspec | 2 + gRPC-Core.podspec | 3 + grpc.gemspec | 2 + package.xml | 2 + src/core/BUILD | 24 +++++++ src/core/client_channel/client_channel.cc | 7 +- src/core/client_channel/client_channel.h | 3 + .../client_channel/client_channel_filter.cc | 7 +- .../client_channel/client_channel_filter.h | 3 + src/core/client_channel/dynamic_filters.cc | 12 ++-- src/core/client_channel/dynamic_filters.h | 4 +- .../gcp_authentication_filter.cc | 62 ++++++++++++---- .../gcp_authentication_filter.h | 32 ++++++--- src/core/filter/blackboard.cc | 33 +++++++++ src/core/filter/blackboard.h | 71 +++++++++++++++++++ src/core/lib/channel/channel_stack.cc | 5 +- src/core/lib/channel/channel_stack.h | 17 ++--- .../lib/channel/channel_stack_builder_impl.cc | 2 +- .../lib/channel/channel_stack_builder_impl.h | 13 ++++ src/core/lib/channel/promise_based_filter.h | 39 ++++++++-- src/core/lib/transport/interception_chain.h | 17 +++-- src/core/util/lru_cache.h | 36 +++++++--- src/python/grpcio/grpc_core_dependencies.py | 1 + test/core/filters/BUILD | 13 ++++ test/core/filters/blackboard_test.cc | 66 +++++++++++++++++ test/core/util/lru_cache_test.cc | 33 +++++++++ .../end2end/xds/xds_gcp_authn_end2end_test.cc | 69 ++++++++++++++++++ tools/doxygen/Doxyfile.c++.internal | 2 + tools/doxygen/Doxyfile.core.internal | 2 + tools/run_tests/generated/tests.json | 24 +++++++ 37 files changed, 675 insertions(+), 59 deletions(-) create mode 100644 src/core/filter/blackboard.cc create mode 100644 src/core/filter/blackboard.h create mode 100644 test/core/filters/blackboard_test.cc diff --git a/BUILD b/BUILD index 17b278b61e6..c2d1c88a7d6 100644 --- a/BUILD +++ b/BUILD @@ -2043,6 +2043,7 @@ grpc_cc_library( "//src/core:arena_promise", "//src/core:atomic_utils", "//src/core:bitset", + "//src/core:blackboard", "//src/core:call_destination", "//src/core:call_filters", "//src/core:call_final_info", @@ -3780,6 +3781,7 @@ grpc_cc_library( "//src/core:arena", "//src/core:arena_promise", "//src/core:backend_metric_parser", + "//src/core:blackboard", "//src/core:call_destination", "//src/core:call_filters", "//src/core:call_spine", diff --git a/CMakeLists.txt b/CMakeLists.txt index 3836f7beac9..ec604861f22 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -960,6 +960,7 @@ if(gRPC_BUILD_TESTS) add_dependencies(buildtests_cxx binder_server_test) add_dependencies(buildtests_cxx binder_transport_test) add_dependencies(buildtests_cxx bitset_test) + add_dependencies(buildtests_cxx blackboard_test) add_dependencies(buildtests_cxx buffer_list_test) add_dependencies(buildtests_cxx byte_buffer_test) add_dependencies(buildtests_cxx c_slice_buffer_test) @@ -2246,6 +2247,7 @@ add_library(grpc src/core/ext/upbdefs-gen/xds/type/v3/cel.upbdefs.c src/core/ext/upbdefs-gen/xds/type/v3/range.upbdefs.c src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.c + src/core/filter/blackboard.cc src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc src/core/handshaker/handshaker.cc src/core/handshaker/handshaker_registry.cc @@ -3053,6 +3055,7 @@ add_library(grpc_unsecure src/core/ext/upb-gen/validate/validate.upb_minitable.c src/core/ext/upb-gen/xds/data/orca/v3/orca_load_report.upb_minitable.c src/core/ext/upb-gen/xds/service/orca/v3/orca.upb_minitable.c + src/core/filter/blackboard.cc src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc src/core/handshaker/handshaker.cc src/core/handshaker/handshaker_registry.cc @@ -5280,6 +5283,7 @@ add_library(grpc_authorization_provider src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb_minitable.c src/core/ext/upb-gen/src/proto/grpc/gcp/handshaker.upb_minitable.c src/core/ext/upb-gen/src/proto/grpc/gcp/transport_security_common.upb_minitable.c + src/core/filter/blackboard.cc src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc src/core/handshaker/handshaker.cc src/core/handshaker/handshaker_registry.cc @@ -8406,6 +8410,63 @@ target_link_libraries(bitset_test ) +endif() +if(gRPC_BUILD_TESTS) + +add_executable(blackboard_test + src/core/filter/blackboard.cc + src/core/lib/address_utils/sockaddr_utils.cc + src/core/lib/channel/channel_args.cc + src/core/lib/iomgr/sockaddr_utils_posix.cc + src/core/lib/iomgr/socket_utils_windows.cc + src/core/lib/surface/channel_stack_type.cc + src/core/resolver/endpoint_addresses.cc + src/core/util/ref_counted_string.cc + src/core/util/time.cc + src/core/util/uri.cc + test/core/filters/blackboard_test.cc +) +if(WIN32 AND MSVC) + if(BUILD_SHARED_LIBS) + target_compile_definitions(blackboard_test + PRIVATE + "GPR_DLL_IMPORTS" + ) + endif() +endif() +target_compile_features(blackboard_test PUBLIC cxx_std_14) +target_include_directories(blackboard_test + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_RE2_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_XXHASH_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} +) + +target_link_libraries(blackboard_test + ${_gRPC_ALLTARGETS_LIBRARIES} + gtest + absl::config + absl::flat_hash_map + absl::function_ref + absl::hash + absl::type_traits + absl::statusor + gpr +) + + endif() if(gRPC_BUILD_TESTS) @@ -9012,6 +9073,7 @@ add_executable(call_utils_test src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb_minitable.c src/core/ext/upb-gen/src/proto/grpc/gcp/handshaker.upb_minitable.c src/core/ext/upb-gen/src/proto/grpc/gcp/transport_security_common.upb_minitable.c + src/core/filter/blackboard.cc src/core/handshaker/handshaker_registry.cc src/core/handshaker/proxy_mapper_registry.cc src/core/lib/address_utils/parse_address.cc diff --git a/Makefile b/Makefile index 70828125ba2..078484c1fd6 100644 --- a/Makefile +++ b/Makefile @@ -1057,6 +1057,7 @@ LIBGRPC_SRC = \ src/core/ext/upbdefs-gen/xds/type/v3/cel.upbdefs.c \ src/core/ext/upbdefs-gen/xds/type/v3/range.upbdefs.c \ src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.c \ + src/core/filter/blackboard.cc \ src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc \ src/core/handshaker/handshaker.cc \ src/core/handshaker/handshaker_registry.cc \ diff --git a/Package.swift b/Package.swift index 8b1ae1392cc..c21dedc5f8b 100644 --- a/Package.swift +++ b/Package.swift @@ -1070,6 +1070,8 @@ let package = Package( "src/core/ext/upbdefs-gen/xds/type/v3/range.upbdefs.h", "src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.c", "src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.h", + "src/core/filter/blackboard.cc", + "src/core/filter/blackboard.h", "src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc", "src/core/handshaker/endpoint_info/endpoint_info_handshaker.h", "src/core/handshaker/handshaker.cc", diff --git a/build_autogenerated.yaml b/build_autogenerated.yaml index 33b9da00c33..b45eb26192f 100644 --- a/build_autogenerated.yaml +++ b/build_autogenerated.yaml @@ -781,6 +781,7 @@ libs: - src/core/ext/upbdefs-gen/xds/type/v3/cel.upbdefs.h - src/core/ext/upbdefs-gen/xds/type/v3/range.upbdefs.h - src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.h + - src/core/filter/blackboard.h - src/core/handshaker/endpoint_info/endpoint_info_handshaker.h - src/core/handshaker/handshaker.h - src/core/handshaker/handshaker_factory.h @@ -1662,6 +1663,7 @@ libs: - src/core/ext/upbdefs-gen/xds/type/v3/cel.upbdefs.c - src/core/ext/upbdefs-gen/xds/type/v3/range.upbdefs.c - src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.c + - src/core/filter/blackboard.cc - src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc - src/core/handshaker/handshaker.cc - src/core/handshaker/handshaker_registry.cc @@ -2359,6 +2361,7 @@ libs: - src/core/ext/upb-gen/xds/data/orca/v3/orca_load_report.upb_minitable.h - src/core/ext/upb-gen/xds/service/orca/v3/orca.upb.h - src/core/ext/upb-gen/xds/service/orca/v3/orca.upb_minitable.h + - src/core/filter/blackboard.h - src/core/handshaker/endpoint_info/endpoint_info_handshaker.h - src/core/handshaker/handshaker.h - src/core/handshaker/handshaker_factory.h @@ -2819,6 +2822,7 @@ libs: - src/core/ext/upb-gen/validate/validate.upb_minitable.c - src/core/ext/upb-gen/xds/data/orca/v3/orca_load_report.upb_minitable.c - src/core/ext/upb-gen/xds/service/orca/v3/orca.upb_minitable.c + - src/core/filter/blackboard.cc - src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc - src/core/handshaker/handshaker.cc - src/core/handshaker/handshaker_registry.cc @@ -4467,6 +4471,7 @@ libs: - src/core/ext/upb-gen/src/proto/grpc/gcp/handshaker.upb_minitable.h - src/core/ext/upb-gen/src/proto/grpc/gcp/transport_security_common.upb.h - src/core/ext/upb-gen/src/proto/grpc/gcp/transport_security_common.upb_minitable.h + - src/core/filter/blackboard.h - src/core/handshaker/endpoint_info/endpoint_info_handshaker.h - src/core/handshaker/handshaker.h - src/core/handshaker/handshaker_factory.h @@ -4803,6 +4808,7 @@ libs: - src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb_minitable.c - src/core/ext/upb-gen/src/proto/grpc/gcp/handshaker.upb_minitable.c - src/core/ext/upb-gen/src/proto/grpc/gcp/transport_security_common.upb_minitable.c + - src/core/filter/blackboard.cc - src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc - src/core/handshaker/handshaker.cc - src/core/handshaker/handshaker_registry.cc @@ -6278,6 +6284,55 @@ targets: - absl/log:check - absl/numeric:bits uses_polling: false +- name: blackboard_test + gtest: true + build: test + language: c++ + headers: + - src/core/filter/blackboard.h + - src/core/lib/address_utils/sockaddr_utils.h + - src/core/lib/channel/channel_args.h + - src/core/lib/iomgr/port.h + - src/core/lib/iomgr/resolved_address.h + - src/core/lib/iomgr/sockaddr.h + - src/core/lib/iomgr/sockaddr_posix.h + - src/core/lib/iomgr/sockaddr_windows.h + - src/core/lib/iomgr/socket_utils.h + - src/core/lib/surface/channel_stack_type.h + - src/core/resolver/endpoint_addresses.h + - src/core/util/atomic_utils.h + - src/core/util/avl.h + - src/core/util/down_cast.h + - src/core/util/dual_ref_counted.h + - src/core/util/orphanable.h + - src/core/util/ref_counted.h + - src/core/util/ref_counted_ptr.h + - src/core/util/ref_counted_string.h + - src/core/util/time.h + - src/core/util/unique_type_name.h + - src/core/util/uri.h + src: + - src/core/filter/blackboard.cc + - src/core/lib/address_utils/sockaddr_utils.cc + - src/core/lib/channel/channel_args.cc + - src/core/lib/iomgr/sockaddr_utils_posix.cc + - src/core/lib/iomgr/socket_utils_windows.cc + - src/core/lib/surface/channel_stack_type.cc + - src/core/resolver/endpoint_addresses.cc + - src/core/util/ref_counted_string.cc + - src/core/util/time.cc + - src/core/util/uri.cc + - test/core/filters/blackboard_test.cc + deps: + - gtest + - absl/base:config + - absl/container:flat_hash_map + - absl/functional:function_ref + - absl/hash:hash + - absl/meta:type_traits + - absl/status:statusor + - gpr + uses_polling: false - name: buffer_list_test gtest: true build: test @@ -6738,6 +6793,7 @@ targets: - src/core/ext/upb-gen/src/proto/grpc/gcp/handshaker.upb_minitable.h - src/core/ext/upb-gen/src/proto/grpc/gcp/transport_security_common.upb.h - src/core/ext/upb-gen/src/proto/grpc/gcp/transport_security_common.upb_minitable.h + - src/core/filter/blackboard.h - src/core/handshaker/handshaker_factory.h - src/core/handshaker/handshaker_registry.h - src/core/handshaker/proxy_mapper.h @@ -7043,6 +7099,7 @@ targets: - src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb_minitable.c - src/core/ext/upb-gen/src/proto/grpc/gcp/handshaker.upb_minitable.c - src/core/ext/upb-gen/src/proto/grpc/gcp/transport_security_common.upb_minitable.c + - src/core/filter/blackboard.cc - src/core/handshaker/handshaker_registry.cc - src/core/handshaker/proxy_mapper_registry.cc - src/core/lib/address_utils/parse_address.cc diff --git a/config.m4 b/config.m4 index a5d57181f70..ae67f344840 100644 --- a/config.m4 +++ b/config.m4 @@ -432,6 +432,7 @@ if test "$PHP_GRPC" != "no"; then src/core/ext/upbdefs-gen/xds/type/v3/cel.upbdefs.c \ src/core/ext/upbdefs-gen/xds/type/v3/range.upbdefs.c \ src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.c \ + src/core/filter/blackboard.cc \ src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc \ src/core/handshaker/handshaker.cc \ src/core/handshaker/handshaker_registry.cc \ @@ -1528,6 +1529,7 @@ if test "$PHP_GRPC" != "no"; then PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-gen/xds/core/v3) PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-gen/xds/type/matcher/v3) PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-gen/xds/type/v3) + PHP_ADD_BUILD_DIR($ext_builddir/src/core/filter) PHP_ADD_BUILD_DIR($ext_builddir/src/core/handshaker) PHP_ADD_BUILD_DIR($ext_builddir/src/core/handshaker/endpoint_info) PHP_ADD_BUILD_DIR($ext_builddir/src/core/handshaker/http_connect) diff --git a/config.w32 b/config.w32 index c0acf9bfb23..94e02c3e172 100644 --- a/config.w32 +++ b/config.w32 @@ -397,6 +397,7 @@ if (PHP_GRPC != "no") { "src\\core\\ext\\upbdefs-gen\\xds\\type\\v3\\cel.upbdefs.c " + "src\\core\\ext\\upbdefs-gen\\xds\\type\\v3\\range.upbdefs.c " + "src\\core\\ext\\upbdefs-gen\\xds\\type\\v3\\typed_struct.upbdefs.c " + + "src\\core\\filter\\blackboard.cc " + "src\\core\\handshaker\\endpoint_info\\endpoint_info_handshaker.cc " + "src\\core\\handshaker\\handshaker.cc " + "src\\core\\handshaker\\handshaker_registry.cc " + @@ -1666,6 +1667,7 @@ if (PHP_GRPC != "no") { FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\xds\\type\\matcher"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\xds\\type\\matcher\\v3"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\xds\\type\\v3"); + FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\filter"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\handshaker"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\handshaker\\endpoint_info"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\handshaker\\http_connect"); diff --git a/gRPC-C++.podspec b/gRPC-C++.podspec index 481f51c2ea4..a63753dd7d1 100644 --- a/gRPC-C++.podspec +++ b/gRPC-C++.podspec @@ -870,6 +870,7 @@ Pod::Spec.new do |s| 'src/core/ext/upbdefs-gen/xds/type/v3/cel.upbdefs.h', 'src/core/ext/upbdefs-gen/xds/type/v3/range.upbdefs.h', 'src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.h', + 'src/core/filter/blackboard.h', 'src/core/handshaker/endpoint_info/endpoint_info_handshaker.h', 'src/core/handshaker/handshaker.h', 'src/core/handshaker/handshaker_factory.h', @@ -2173,6 +2174,7 @@ Pod::Spec.new do |s| 'src/core/ext/upbdefs-gen/xds/type/v3/cel.upbdefs.h', 'src/core/ext/upbdefs-gen/xds/type/v3/range.upbdefs.h', 'src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.h', + 'src/core/filter/blackboard.h', 'src/core/handshaker/endpoint_info/endpoint_info_handshaker.h', 'src/core/handshaker/handshaker.h', 'src/core/handshaker/handshaker_factory.h', diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec index 2867cb57323..5eda92de512 100644 --- a/gRPC-Core.podspec +++ b/gRPC-Core.podspec @@ -1190,6 +1190,8 @@ Pod::Spec.new do |s| 'src/core/ext/upbdefs-gen/xds/type/v3/range.upbdefs.h', 'src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.c', 'src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.h', + 'src/core/filter/blackboard.cc', + 'src/core/filter/blackboard.h', 'src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc', 'src/core/handshaker/endpoint_info/endpoint_info_handshaker.h', 'src/core/handshaker/handshaker.cc', @@ -2960,6 +2962,7 @@ Pod::Spec.new do |s| 'src/core/ext/upbdefs-gen/xds/type/v3/cel.upbdefs.h', 'src/core/ext/upbdefs-gen/xds/type/v3/range.upbdefs.h', 'src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.h', + 'src/core/filter/blackboard.h', 'src/core/handshaker/endpoint_info/endpoint_info_handshaker.h', 'src/core/handshaker/handshaker.h', 'src/core/handshaker/handshaker_factory.h', diff --git a/grpc.gemspec b/grpc.gemspec index bd39eda2bda..3ba44548b25 100644 --- a/grpc.gemspec +++ b/grpc.gemspec @@ -1076,6 +1076,8 @@ Gem::Specification.new do |s| s.files += %w( src/core/ext/upbdefs-gen/xds/type/v3/range.upbdefs.h ) s.files += %w( src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.c ) s.files += %w( src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.h ) + s.files += %w( src/core/filter/blackboard.cc ) + s.files += %w( src/core/filter/blackboard.h ) s.files += %w( src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc ) s.files += %w( src/core/handshaker/endpoint_info/endpoint_info_handshaker.h ) s.files += %w( src/core/handshaker/handshaker.cc ) diff --git a/package.xml b/package.xml index befa4e97aa3..76be79fd6b5 100644 --- a/package.xml +++ b/package.xml @@ -1058,6 +1058,8 @@ + + diff --git a/src/core/BUILD b/src/core/BUILD index a7ae31fe639..0de80c1f68a 100644 --- a/src/core/BUILD +++ b/src/core/BUILD @@ -3309,6 +3309,29 @@ grpc_cc_library( ], ) +grpc_cc_library( + name = "blackboard", + srcs = [ + "filter/blackboard.cc", + ], + hdrs = [ + "filter/blackboard.h", + ], + external_deps = [ + "absl/container:flat_hash_map", + "absl/strings", + ], + language = "c++", + deps = [ + "ref_counted", + "unique_type_name", + "useful", + "//:debug_location", + "//:endpoint_addresses", + "//:ref_counted_ptr", + ], +) + grpc_cc_library( name = "subchannel_connector", hdrs = [ @@ -5034,6 +5057,7 @@ grpc_cc_library( language = "c++", deps = [ "arena", + "blackboard", "channel_args", "channel_fwd", "context", diff --git a/src/core/client_channel/client_channel.cc b/src/core/client_channel/client_channel.cc index bf87078b474..0d12c4b292a 100644 --- a/src/core/client_channel/client_channel.cc +++ b/src/core/client_channel/client_channel.cc @@ -1279,8 +1279,12 @@ void ClientChannel::UpdateServiceConfigInDataPlaneLocked( config_selector = MakeRefCounted(saved_service_config_); } + // Modify channel args. + ChannelArgs new_args = args.SetObject(this).SetObject(saved_service_config_); // Construct filter stack. - InterceptionChainBuilder builder(args.SetObject(this)); + auto new_blackboard = MakeRefCounted(); + InterceptionChainBuilder builder(new_args, blackboard_.get(), + new_blackboard.get()); if (idle_timeout_ != Duration::Zero()) { builder.AddOnServerTrailingMetadata([this](ServerMetadata&) { if (idle_state_.DecreaseCallCount()) StartIdleTimer(); @@ -1300,6 +1304,7 @@ void ClientChannel::UpdateServiceConfigInDataPlaneLocked( } // Create call destination. auto top_of_stack_call_destination = builder.Build(call_destination_); + blackboard_ = std::move(new_blackboard); // Send result to data plane. if (!top_of_stack_call_destination.ok()) { resolver_data_for_calls_.Set(MaybeRewriteIllegalStatusCode( diff --git a/src/core/client_channel/client_channel.h b/src/core/client_channel/client_channel.h index f268f6bfcb7..a7f7d75c705 100644 --- a/src/core/client_channel/client_channel.h +++ b/src/core/client_channel/client_channel.h @@ -27,6 +27,7 @@ #include "src/core/client_channel/config_selector.h" #include "src/core/client_channel/subchannel.h" #include "src/core/ext/filters/channel_idle/idle_filter_state.h" +#include "src/core/filter/blackboard.h" #include "src/core/lib/promise/observable.h" #include "src/core/lib/surface/channel.h" #include "src/core/lib/transport/metadata.h" @@ -215,6 +216,8 @@ class ClientChannel : public Channel { ABSL_GUARDED_BY(*work_serializer_); RefCountedPtr saved_config_selector_ ABSL_GUARDED_BY(*work_serializer_); + RefCountedPtr blackboard_ + ABSL_GUARDED_BY(*work_serializer_); OrphanablePtr lb_policy_ ABSL_GUARDED_BY(*work_serializer_); RefCountedPtr subchannel_pool_ diff --git a/src/core/client_channel/client_channel_filter.cc b/src/core/client_channel/client_channel_filter.cc index 8bedc588914..82caeb27ffc 100644 --- a/src/core/client_channel/client_channel_filter.cc +++ b/src/core/client_channel/client_channel_filter.cc @@ -1498,6 +1498,7 @@ void ClientChannelFilter::UpdateServiceConfigInDataPlaneLocked( config_selector = MakeRefCounted(saved_service_config_); } + // Modify channel args. ChannelArgs new_args = args.SetObject(this).SetObject(service_config); bool enable_retries = !new_args.WantMinimalStack() && @@ -1510,9 +1511,11 @@ void ClientChannelFilter::UpdateServiceConfigInDataPlaneLocked( } else { filters.push_back(&DynamicTerminationFilter::kFilterVtable); } - RefCountedPtr dynamic_filters = - DynamicFilters::Create(new_args, std::move(filters)); + auto new_blackboard = MakeRefCounted(); + RefCountedPtr dynamic_filters = DynamicFilters::Create( + new_args, std::move(filters), blackboard_.get(), new_blackboard.get()); CHECK(dynamic_filters != nullptr); + blackboard_ = std::move(new_blackboard); // Grab data plane lock to update service config. // // We defer unreffing the old values (and deallocating memory) until diff --git a/src/core/client_channel/client_channel_filter.h b/src/core/client_channel/client_channel_filter.h index 2741006a38a..0ca401df455 100644 --- a/src/core/client_channel/client_channel_filter.h +++ b/src/core/client_channel/client_channel_filter.h @@ -43,6 +43,7 @@ #include "src/core/client_channel/dynamic_filters.h" #include "src/core/client_channel/subchannel.h" #include "src/core/client_channel/subchannel_pool_interface.h" +#include "src/core/filter/blackboard.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_stack.h" @@ -316,6 +317,8 @@ class ClientChannelFilter final { ABSL_GUARDED_BY(*work_serializer_); RefCountedPtr saved_config_selector_ ABSL_GUARDED_BY(*work_serializer_); + RefCountedPtr blackboard_ + ABSL_GUARDED_BY(*work_serializer_); OrphanablePtr lb_policy_ ABSL_GUARDED_BY(*work_serializer_); RefCountedPtr subchannel_pool_ diff --git a/src/core/client_channel/dynamic_filters.cc b/src/core/client_channel/dynamic_filters.cc index 45e7d4ffcbc..c2825925fa4 100644 --- a/src/core/client_channel/dynamic_filters.cc +++ b/src/core/client_channel/dynamic_filters.cc @@ -139,8 +139,10 @@ void DynamicFilters::Call::IncrementRefCount(const DebugLocation& /*location*/, namespace { absl::StatusOr> CreateChannelStack( - const ChannelArgs& args, std::vector filters) { + const ChannelArgs& args, std::vector filters, + const Blackboard* old_blackboard, Blackboard* new_blackboard) { ChannelStackBuilderImpl builder("DynamicFilters", GRPC_CLIENT_DYNAMIC, args); + builder.SetBlackboards(old_blackboard, new_blackboard); for (auto filter : filters) { builder.AppendFilter(filter); } @@ -150,15 +152,17 @@ absl::StatusOr> CreateChannelStack( } // namespace RefCountedPtr DynamicFilters::Create( - const ChannelArgs& args, std::vector filters) { + const ChannelArgs& args, std::vector filters, + const Blackboard* old_blackboard, Blackboard* new_blackboard) { // Attempt to create channel stack from requested filters. - auto p = CreateChannelStack(args, std::move(filters)); + auto p = CreateChannelStack(args, std::move(filters), old_blackboard, + new_blackboard); if (!p.ok()) { // Channel stack creation failed with requested filters. // Create with lame filter instead. auto error = p.status(); p = CreateChannelStack(args.Set(MakeLameClientErrorArg(&error)), - {&LameClientFilter::kFilter}); + {&LameClientFilter::kFilter}, nullptr, nullptr); } return MakeRefCounted(std::move(p.value())); } diff --git a/src/core/client_channel/dynamic_filters.h b/src/core/client_channel/dynamic_filters.h index 142217d72d3..30a5354f935 100644 --- a/src/core/client_channel/dynamic_filters.h +++ b/src/core/client_channel/dynamic_filters.h @@ -24,6 +24,7 @@ #include +#include "src/core/filter/blackboard.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_stack.h" @@ -90,7 +91,8 @@ class DynamicFilters final : public RefCounted { }; static RefCountedPtr Create( - const ChannelArgs& args, std::vector filters); + const ChannelArgs& args, std::vector filters, + const Blackboard* old_blackboard, Blackboard* new_blackboard); explicit DynamicFilters(RefCountedPtr channel_stack) : channel_stack_(std::move(channel_stack)) {} diff --git a/src/core/ext/filters/gcp_authentication/gcp_authentication_filter.cc b/src/core/ext/filters/gcp_authentication/gcp_authentication_filter.cc index c3a6ab3e71b..7e51b20dca3 100644 --- a/src/core/ext/filters/gcp_authentication/gcp_authentication_filter.cc +++ b/src/core/ext/filters/gcp_authentication/gcp_authentication_filter.cc @@ -37,6 +37,10 @@ namespace grpc_core { +// +// GcpAuthenticationFilter::Call +// + const NoInterceptor GcpAuthenticationFilter::Call::OnClientToServerMessage; const NoInterceptor GcpAuthenticationFilter::Call::OnClientToServerHalfClose; const NoInterceptor GcpAuthenticationFilter::Call::OnServerInitialMetadata; @@ -98,7 +102,7 @@ absl::Status GcpAuthenticationFilter::Call::OnClientInitialMetadata( cluster_name)); } // Get the call creds instance. - auto creds = filter->GetCallCredentials( + auto creds = filter->cache_->Get( DownCast(metadata_value)->url()); // Add the call creds instance to the call. auto* arena = GetContext(); @@ -113,6 +117,34 @@ absl::Status GcpAuthenticationFilter::Call::OnClientInitialMetadata( return absl::OkStatus(); } +// +// GcpAuthenticationFilter::CallCredentialsCache +// + +UniqueTypeName GcpAuthenticationFilter::CallCredentialsCache::Type() { + static UniqueTypeName::Factory factory("gcp_auth_call_creds_cache"); + return factory.Create(); +} + +void GcpAuthenticationFilter::CallCredentialsCache::SetMaxSize( + size_t max_size) { + MutexLock lock(&mu_); + cache_.SetMaxSize(max_size); +} + +RefCountedPtr +GcpAuthenticationFilter::CallCredentialsCache::Get( + const std::string& audience) { + MutexLock lock(&mu_); + return cache_.GetOrInsert(audience, [](const std::string& audience) { + return MakeRefCounted(audience); + }); +} + +// +// GcpAuthenticationFilter +// + const grpc_channel_filter GcpAuthenticationFilter::kFilter = MakePromiseBasedFilter(); @@ -120,6 +152,7 @@ const grpc_channel_filter GcpAuthenticationFilter::kFilter = absl::StatusOr> GcpAuthenticationFilter::Create(const ChannelArgs& args, ChannelFilter::Args filter_args) { + // Get filter config. auto* service_config = args.GetObject(); if (service_config == nullptr) { return absl::InvalidArgumentError( @@ -136,29 +169,32 @@ GcpAuthenticationFilter::Create(const ChannelArgs& args, return absl::InvalidArgumentError( "gcp_auth: filter instance ID not found in filter config"); } + // Get XdsConfig so that we can look up CDS resources. 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)); + // Get existing cache or create new one. + auto cache = filter_args.GetOrCreateState( + filter_config->filter_instance_name, [&]() { + return MakeRefCounted(filter_config->cache_size); + }); + // Make sure size is updated, in case we're reusing a pre-existing + // cache but it has the wrong size. + cache->SetMaxSize(filter_config->cache_size); + // Instantiate filter. + return std::unique_ptr(new GcpAuthenticationFilter( + filter_config, std::move(xds_config), std::move(cache))); } GcpAuthenticationFilter::GcpAuthenticationFilter( const GcpAuthenticationParsedConfig::Config* filter_config, - RefCountedPtr xds_config) + RefCountedPtr xds_config, + RefCountedPtr cache) : 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); - }); -} + cache_(std::move(cache)) {} void GcpAuthenticationFilterRegister(CoreConfiguration::Builder* builder) { GcpAuthenticationServiceConfigParser::Register(builder); diff --git a/src/core/ext/filters/gcp_authentication/gcp_authentication_filter.h b/src/core/ext/filters/gcp_authentication/gcp_authentication_filter.h index 18109c70c1b..f8fc704c9e8 100644 --- a/src/core/ext/filters/gcp_authentication/gcp_authentication_filter.h +++ b/src/core/ext/filters/gcp_authentication/gcp_authentication_filter.h @@ -25,6 +25,7 @@ #include "absl/strings/string_view.h" #include "src/core/ext/filters/gcp_authentication/gcp_authentication_service_config_parser.h" +#include "src/core/filter/blackboard.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" @@ -49,10 +50,6 @@ class GcpAuthenticationFilter 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*/, @@ -66,15 +63,30 @@ class GcpAuthenticationFilter }; private: - RefCountedPtr GetCallCredentials( - const std::string& audience); + class CallCredentialsCache : public Blackboard::Entry { + public: + explicit CallCredentialsCache(size_t max_size) : cache_(max_size) {} + + static UniqueTypeName Type(); + + void SetMaxSize(size_t max_size); + + RefCountedPtr Get(const std::string& audience); + + private: + Mutex mu_; + LruCache> + cache_ ABSL_GUARDED_BY(&mu_); + }; + + GcpAuthenticationFilter( + const GcpAuthenticationParsedConfig::Config* filter_config, + RefCountedPtr xds_config, + RefCountedPtr cache); const GcpAuthenticationParsedConfig::Config* filter_config_; const RefCountedPtr xds_config_; - - Mutex mu_; - LruCache> - cache_ ABSL_GUARDED_BY(&mu_); + const RefCountedPtr cache_; }; } // namespace grpc_core diff --git a/src/core/filter/blackboard.cc b/src/core/filter/blackboard.cc new file mode 100644 index 00000000000..b916bf77d8f --- /dev/null +++ b/src/core/filter/blackboard.cc @@ -0,0 +1,33 @@ +// +// 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/filter/blackboard.h" + +namespace grpc_core { + +RefCountedPtr Blackboard::Get(UniqueTypeName type, + const std::string& key) const { + auto it = map_.find(std::make_pair(type, key)); + if (it == map_.end()) return nullptr; + return it->second; +} + +void Blackboard::Set(UniqueTypeName type, const std::string& key, + RefCountedPtr entry) { + map_[std::make_pair(type, key)] = std::move(entry); +} + +} // namespace grpc_core diff --git a/src/core/filter/blackboard.h b/src/core/filter/blackboard.h new file mode 100644 index 00000000000..972758162f0 --- /dev/null +++ b/src/core/filter/blackboard.h @@ -0,0 +1,71 @@ +// +// 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_FILTER_BLACKBOARD_H +#define GRPC_SRC_CORE_FILTER_BLACKBOARD_H + +#include +#include + +#include "absl/container/flat_hash_map.h" +#include "absl/strings/string_view.h" + +#include "src/core/resolver/endpoint_addresses.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/unique_type_name.h" +#include "src/core/util/useful.h" + +namespace grpc_core { + +// A blackboard is a place where dynamic filters can stash global state +// that they may want to retain across resolver updates. Entries are +// identified by by the unique type and a name that identifies the instance, +// which means that it's possible for two filter instances to use the same +// type (e.g., if there are two instantiations of the same filter). +class Blackboard : public RefCounted { + public: + // All entries must derive from this type. + // They must also have a static method with the following signature: + // static UniqueTypeName Type(); + class Entry : public RefCounted {}; + + // Returns an entry for a particular type and name, or null if not present. + template + RefCountedPtr Get(const std::string& key) const { + return Get(T::Type(), key).template TakeAsSubclass(); + } + + // Sets an entry for a particular type and name. + template + void Set(const std::string& key, RefCountedPtr entry) { + Set(T::Type(), key, std::move(entry)); + } + + private: + RefCountedPtr Get(UniqueTypeName type, const std::string& key) const; + void Set(UniqueTypeName type, const std::string& key, + RefCountedPtr entry); + + absl::flat_hash_map, + RefCountedPtr> + map_; +}; + +} // namespace grpc_core + +#endif // GRPC_SRC_CORE_FILTER_BLACKBOARD_H diff --git a/src/core/lib/channel/channel_stack.cc b/src/core/lib/channel/channel_stack.cc index 2590ab4590d..14e618a7fd8 100644 --- a/src/core/lib/channel/channel_stack.cc +++ b/src/core/lib/channel/channel_stack.cc @@ -116,7 +116,8 @@ grpc_error_handle grpc_channel_stack_init( int initial_refs, grpc_iomgr_cb_func destroy, void* destroy_arg, const grpc_channel_filter** filters, size_t filter_count, const grpc_core::ChannelArgs& channel_args, const char* name, - grpc_channel_stack* stack) { + grpc_channel_stack* stack, const grpc_core::Blackboard* old_blackboard, + grpc_core::Blackboard* new_blackboard) { if (GRPC_TRACE_FLAG_ENABLED(channel_stack)) { LOG(INFO) << "CHANNEL_STACK: init " << name; for (size_t i = 0; i < filter_count; i++) { @@ -145,6 +146,8 @@ grpc_error_handle grpc_channel_stack_init( sizeof(grpc_channel_element)); // init per-filter data + args.old_blackboard = old_blackboard; + args.new_blackboard = new_blackboard; grpc_error_handle first_error; for (i = 0; i < filter_count; i++) { args.channel_stack = stack; diff --git a/src/core/lib/channel/channel_stack.h b/src/core/lib/channel/channel_stack.h index 8ed7b4eafe1..56bcb62f900 100644 --- a/src/core/lib/channel/channel_stack.h +++ b/src/core/lib/channel/channel_stack.h @@ -19,13 +19,6 @@ #ifndef GRPC_SRC_CORE_LIB_CHANNEL_CHANNEL_STACK_H #define GRPC_SRC_CORE_LIB_CHANNEL_CHANNEL_STACK_H -////////////////////////////////////////////////////////////////////////////// -// IMPORTANT NOTE: -// -// When you update this API, please make the corresponding changes to -// the C++ API in src/cpp/common/channel_filter.{h,cc} -////////////////////////////////////////////////////////////////////////////// - // A channel filter defines how operations on a channel are implemented. // Channel filters are chained together to create full channels, and if those // chains are linear, then channel stacks provide a mechanism to minimize @@ -74,11 +67,17 @@ #include "src/core/util/time_precise.h" #include "src/core/util/unique_type_name.h" +namespace grpc_core { +class Blackboard; +} // namespace grpc_core + struct grpc_channel_element_args { grpc_channel_stack* channel_stack; grpc_core::ChannelArgs channel_args; int is_first; int is_last; + const grpc_core::Blackboard* old_blackboard; + grpc_core::Blackboard* new_blackboard; }; struct grpc_call_element_args { grpc_call_stack* call_stack; @@ -262,7 +261,9 @@ grpc_error_handle grpc_channel_stack_init( int initial_refs, grpc_iomgr_cb_func destroy, void* destroy_arg, const grpc_channel_filter** filters, size_t filter_count, const grpc_core::ChannelArgs& args, const char* name, - grpc_channel_stack* stack); + grpc_channel_stack* stack, + const grpc_core::Blackboard* old_blackboard = nullptr, + grpc_core::Blackboard* new_blackboard = nullptr); // Destroy a channel stack void grpc_channel_stack_destroy(grpc_channel_stack* stack); diff --git a/src/core/lib/channel/channel_stack_builder_impl.cc b/src/core/lib/channel/channel_stack_builder_impl.cc index 953a60a9232..360cd7aa7db 100644 --- a/src/core/lib/channel/channel_stack_builder_impl.cc +++ b/src/core/lib/channel/channel_stack_builder_impl.cc @@ -77,7 +77,7 @@ ChannelStackBuilderImpl::Build() { gpr_free(stk); }, channel_stack, stack.data(), stack.size(), channel_args(), name(), - channel_stack); + channel_stack, old_blackboard_, new_blackboard_); if (!error.ok()) { grpc_channel_stack_destroy(channel_stack); diff --git a/src/core/lib/channel/channel_stack_builder_impl.h b/src/core/lib/channel/channel_stack_builder_impl.h index 3bce0f5db3f..78df9809c90 100644 --- a/src/core/lib/channel/channel_stack_builder_impl.h +++ b/src/core/lib/channel/channel_stack_builder_impl.h @@ -25,6 +25,8 @@ namespace grpc_core { +class Blackboard; + // Build a channel stack. // Allows interested parties to add filters to the stack, and to query an // in-progress build. @@ -34,13 +36,24 @@ class ChannelStackBuilderImpl final : public ChannelStackBuilder { public: using ChannelStackBuilder::ChannelStackBuilder; + void SetBlackboards(const Blackboard* old_blackboard, + Blackboard* new_blackboard) { + old_blackboard_ = old_blackboard; + new_blackboard_ = new_blackboard; + } + // Build the channel stack. // After success, *result holds the new channel stack, // prefix_bytes are allocated before the channel stack, // initial_refs, destroy, destroy_arg are as per grpc_channel_stack_init // On failure, *result is nullptr. absl::StatusOr> Build() override; + + private: + const Blackboard* old_blackboard_ = nullptr; + Blackboard* new_blackboard_ = nullptr; }; + } // namespace grpc_core #endif // GRPC_SRC_CORE_LIB_CHANNEL_CHANNEL_STACK_BUILDER_IMPL_H diff --git a/src/core/lib/channel/promise_based_filter.h b/src/core/lib/channel/promise_based_filter.h index 0ac59932e0f..6b2ba31ce6b 100644 --- a/src/core/lib/channel/promise_based_filter.h +++ b/src/core/lib/channel/promise_based_filter.h @@ -42,6 +42,7 @@ #include #include +#include "src/core/filter/blackboard.h" #include "src/core/lib/channel/call_finalization.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_fwd.h" @@ -81,15 +82,23 @@ class ChannelFilter { public: Args() : Args(nullptr, nullptr) {} Args(grpc_channel_stack* channel_stack, - grpc_channel_element* channel_element) - : impl_(ChannelStackBased{channel_stack, channel_element}) {} + grpc_channel_element* channel_element, + const Blackboard* old_blackboard = nullptr, + Blackboard* new_blackboard = nullptr) + : impl_(ChannelStackBased{channel_stack, channel_element}), + old_blackboard_(old_blackboard), + new_blackboard_(new_blackboard) {} // While we're moving to call-v3 we need to have access to // grpc_channel_stack & friends here. That means that we can't rely on this // type signature from interception_chain.h, which means that we need a way // of constructing this object without naming it ===> implicit construction. // TODO(ctiller): remove this once we're fully on call-v3 // NOLINTNEXTLINE(google-explicit-constructor) - Args(size_t instance_id) : impl_(V3Based{instance_id}) {} + Args(size_t instance_id, const Blackboard* old_blackboard = nullptr, + Blackboard* new_blackboard = nullptr) + : impl_(V3Based{instance_id}), + old_blackboard_(old_blackboard), + new_blackboard_(new_blackboard) {} ABSL_DEPRECATED("Direct access to channel stack is deprecated") grpc_channel_stack* channel_stack() const { @@ -113,6 +122,21 @@ class ChannelFilter { [](const V3Based& v3) { return v3.instance_id; }); } + // If a filter state object of type T exists for key from a previous + // filter stack, retains it for the new filter stack we're constructing. + // Otherwise, invokes create_func() to create a new filter state + // object for the new filter stack. Returns the new filter state object. + template + RefCountedPtr GetOrCreateState( + const std::string& key, + absl::FunctionRef()> create_func) { + RefCountedPtr state; + if (old_blackboard_ != nullptr) state = old_blackboard_->Get(key); + if (state == nullptr) state = create_func(); + if (new_blackboard_ != nullptr) new_blackboard_->Set(key, state); + return state; + } + private: friend class ChannelFilter; @@ -127,6 +151,9 @@ class ChannelFilter { using Impl = absl::variant; Impl impl_; + + const Blackboard* old_blackboard_ = nullptr; + Blackboard* new_blackboard_ = nullptr; }; // Perform post-initialization step (if any). @@ -1620,8 +1647,10 @@ struct ChannelFilterWithFlagsMethods { static absl::Status InitChannelElem(grpc_channel_element* elem, grpc_channel_element_args* args) { CHECK(args->is_last == ((kFlags & kFilterIsLast) != 0)); - auto status = F::Create(args->channel_args, - ChannelFilter::Args(args->channel_stack, elem)); + auto status = F::Create( + args->channel_args, + ChannelFilter::Args(args->channel_stack, elem, args->old_blackboard, + args->new_blackboard)); if (!status.ok()) { new (elem->channel_data) F*(nullptr); return absl_status_to_grpc_error(status.status()); diff --git a/src/core/lib/transport/interception_chain.h b/src/core/lib/transport/interception_chain.h index 82608e3a005..a204985afc0 100644 --- a/src/core/lib/transport/interception_chain.h +++ b/src/core/lib/transport/interception_chain.h @@ -28,6 +28,7 @@ namespace grpc_core { +class Blackboard; class InterceptionChainBuilder; // One hijacked call. Using this we can get access to the CallHandler for the @@ -153,8 +154,12 @@ class InterceptionChainBuilder final { absl::variant, RefCountedPtr>; - explicit InterceptionChainBuilder(ChannelArgs args) - : args_(std::move(args)) {} + explicit InterceptionChainBuilder(ChannelArgs args, + const Blackboard* old_blackboard = nullptr, + Blackboard* new_blackboard = nullptr) + : args_(std::move(args)), + old_blackboard_(old_blackboard), + new_blackboard_(new_blackboard) {} // Add a filter with a `Call` class as an inner member. // Call class must be one compatible with the filters described in @@ -163,7 +168,8 @@ class InterceptionChainBuilder final { absl::enable_if_t Add() { if (!status_.ok()) return *this; - auto filter = T::Create(args_, {FilterInstanceId(FilterTypeId())}); + auto filter = T::Create(args_, {FilterInstanceId(FilterTypeId()), + old_blackboard_, new_blackboard_}); if (!filter.ok()) { status_ = filter.status(); return *this; @@ -179,7 +185,8 @@ class InterceptionChainBuilder final { absl::enable_if_t::value, InterceptionChainBuilder&> Add() { - AddInterceptor(T::Create(args_, {FilterInstanceId(FilterTypeId())})); + AddInterceptor(T::Create(args_, {FilterInstanceId(FilterTypeId()), + old_blackboard_, new_blackboard_})); return *this; }; @@ -237,6 +244,8 @@ class InterceptionChainBuilder final { absl::Status status_; std::map filter_type_counts_; static std::atomic next_filter_id_; + const Blackboard* old_blackboard_ = nullptr; + Blackboard* new_blackboard_ = nullptr; }; } // namespace grpc_core diff --git a/src/core/util/lru_cache.h b/src/core/util/lru_cache.h index d0bf5934f4b..6c9f045af7c 100644 --- a/src/core/util/lru_cache.h +++ b/src/core/util/lru_cache.h @@ -47,6 +47,11 @@ class LruCache { // to be too large, removes the least recently used entry. Value GetOrInsert(Key key, absl::AnyInvocable create); + // Changes the max size of the cache. If there are currently more than + // max_size entries, deletes least-recently-used entries to enforce + // the new max size. + void SetMaxSize(size_t max_size); + private: struct CacheEntry { Value value; @@ -55,7 +60,9 @@ class LruCache { explicit CacheEntry(Value v) : value(std::move(v)) {} }; - const size_t max_size_; + void RemoveOldestEntry(); + + size_t max_size_; absl::flat_hash_map cache_; std::list lru_list_; }; @@ -82,14 +89,7 @@ Value LruCache::GetOrInsert( if (value.has_value()) return std::move(*value); // Entry not found. We'll need to insert a new entry. // If the cache is at max size, remove the least recently used entry. - if (cache_.size() == max_size_) { - auto lru_it = lru_list_.begin(); - CHECK(lru_it != lru_list_.end()); - auto cache_it = cache_.find(*lru_it); - CHECK(cache_it != cache_.end()); - cache_.erase(cache_it); - lru_list_.pop_front(); - } + if (cache_.size() == max_size_) RemoveOldestEntry(); // Create a new entry, insert it, and return it. auto it = cache_ .emplace(std::piecewise_construct, std::forward_as_tuple(key), @@ -99,6 +99,24 @@ Value LruCache::GetOrInsert( return it->second.value; } +template +void LruCache::SetMaxSize(size_t max_size) { + max_size_ = max_size; + while (cache_.size() > max_size_) { + RemoveOldestEntry(); + } +} + +template +void LruCache::RemoveOldestEntry() { + auto lru_it = lru_list_.begin(); + CHECK(lru_it != lru_list_.end()); + auto cache_it = cache_.find(*lru_it); + CHECK(cache_it != cache_.end()); + cache_.erase(cache_it); + lru_list_.pop_front(); +} + } // namespace grpc_core #endif // GRPC_SRC_CORE_UTIL_LRU_CACHE_H diff --git a/src/python/grpcio/grpc_core_dependencies.py b/src/python/grpcio/grpc_core_dependencies.py index c7e8f2b4c9f..7c9601a6fe8 100644 --- a/src/python/grpcio/grpc_core_dependencies.py +++ b/src/python/grpcio/grpc_core_dependencies.py @@ -406,6 +406,7 @@ CORE_SOURCE_FILES = [ 'src/core/ext/upbdefs-gen/xds/type/v3/cel.upbdefs.c', 'src/core/ext/upbdefs-gen/xds/type/v3/range.upbdefs.c', 'src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.c', + 'src/core/filter/blackboard.cc', 'src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc', 'src/core/handshaker/handshaker.cc', 'src/core/handshaker/handshaker_registry.cc', diff --git a/test/core/filters/BUILD b/test/core/filters/BUILD index c14d98de853..1674eefb08a 100644 --- a/test/core/filters/BUILD +++ b/test/core/filters/BUILD @@ -150,3 +150,16 @@ grpc_cc_benchmark( "//test/core/transport:call_spine_benchmarks", ], ) + +grpc_cc_test( + name = "blackboard_test", + srcs = ["blackboard_test.cc"], + external_deps = [ + "gtest", + ], + uses_event_engine = False, + uses_polling = False, + deps = [ + "//src/core:blackboard", + ], +) diff --git a/test/core/filters/blackboard_test.cc b/test/core/filters/blackboard_test.cc new file mode 100644 index 00000000000..863aa3fbb36 --- /dev/null +++ b/test/core/filters/blackboard_test.cc @@ -0,0 +1,66 @@ +// 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/filter/blackboard.h" + +#include "gmock/gmock.h" +#include "gtest/gtest.h" + +namespace grpc_core { +namespace { + +class FooEntry : public Blackboard::Entry { + public: + static UniqueTypeName Type() { + static UniqueTypeName::Factory kFactory("FooEntry"); + return kFactory.Create(); + } +}; + +class BarEntry : public Blackboard::Entry { + public: + static UniqueTypeName Type() { + static UniqueTypeName::Factory kFactory("BarEntry"); + return kFactory.Create(); + } +}; + +TEST(Blackboard, Basic) { + Blackboard blackboard; + // No entry for type FooEntry key "foo". + EXPECT_EQ(blackboard.Get("a"), nullptr); + // Set entry for type FooEntry key "foo". + auto foo_entry = MakeRefCounted(); + blackboard.Set("a", foo_entry); + // Get the entry we just added. + EXPECT_EQ(blackboard.Get("a"), foo_entry); + // A different key for the same type is still unset. + EXPECT_EQ(blackboard.Get("b"), nullptr); + // The same key for a different type is still unset. + EXPECT_EQ(blackboard.Get("a"), nullptr); + // Set entry for type BarEntry key "foo". + auto bar_entry = MakeRefCounted(); + blackboard.Set("a", bar_entry); + EXPECT_EQ(blackboard.Get("a"), bar_entry); + // This should not have replaced the same key for FooEntry. + EXPECT_EQ(blackboard.Get("a"), foo_entry); +} + +} // namespace +} // namespace grpc_core + +int main(int argc, char** argv) { + ::testing::InitGoogleTest(&argc, argv); + return RUN_ALL_TESTS(); +} diff --git a/test/core/util/lru_cache_test.cc b/test/core/util/lru_cache_test.cc index fbb9ce1f37f..63745e073ce 100644 --- a/test/core/util/lru_cache_test.cc +++ b/test/core/util/lru_cache_test.cc @@ -66,6 +66,39 @@ TEST(LruCache, Basic) { EXPECT_THAT(created_list, ::testing::ElementsAreArray(kOrder2)); } +TEST(LruCache, SetMaxSize) { + auto create = [&](const std::string& key) { + int value; + CHECK(absl::SimpleAtoi(key, &value)); + return value; + }; + // Create a cache with max size 10. + LruCache cache(10); + // Insert 10 values. + for (int i = 1; i <= 10; ++i) { + std::string key = absl::StrCat(i); + EXPECT_EQ(absl::nullopt, cache.Get(key)); + EXPECT_EQ(i, cache.GetOrInsert(key, create)); + EXPECT_EQ(i, cache.Get(key)); + } + // Set max size to 15. All elements should still be present. + cache.SetMaxSize(15); + for (int i = 1; i <= 10; ++i) { + std::string key = absl::StrCat(i); + EXPECT_EQ(i, cache.Get(key)); + } + // Set max size to 6. This should remove the first 4 elements. + cache.SetMaxSize(6); + for (int i = 1; i <= 4; ++i) { + std::string key = absl::StrCat(i); + EXPECT_EQ(absl::nullopt, cache.Get(key)) << i; + } + for (int i = 5; i <= 10; ++i) { + std::string key = absl::StrCat(i); + EXPECT_EQ(i, cache.Get(key)); + } +} + } // namespace grpc_core int main(int argc, char** argv) { diff --git a/test/cpp/end2end/xds/xds_gcp_authn_end2end_test.cc b/test/cpp/end2end/xds/xds_gcp_authn_end2end_test.cc index d30c22e7605..775eb60e6fc 100644 --- a/test/cpp/end2end/xds/xds_gcp_authn_end2end_test.cc +++ b/test/cpp/end2end/xds/xds_gcp_authn_end2end_test.cc @@ -50,6 +50,7 @@ class XdsGcpAuthnEnd2endTest : public XdsEnd2endTest { void SetUp() override { g_audience = ""; g_token = nullptr; + g_num_token_fetches = 0; grpc_core::HttpRequest::SetOverride(HttpGetOverride, nullptr, nullptr); InitClient(MakeBootstrapBuilder(), /*lb_expected_authority=*/"", /*xds_resource_does_not_exist_timeout_ms=*/0, @@ -83,6 +84,7 @@ class XdsGcpAuthnEnd2endTest : public XdsEnd2endTest { "/computeMetadata/v1/instance/service-accounts/default/identity") { return 0; } + g_num_token_fetches.fetch_add(1); // Validate request. ValidateHttpRequest(request, uri); // Generate response. @@ -126,10 +128,12 @@ class XdsGcpAuthnEnd2endTest : public XdsEnd2endTest { static absl::string_view g_audience; static const char* g_token; + static std::atomic g_num_token_fetches; }; absl::string_view XdsGcpAuthnEnd2endTest::g_audience; const char* XdsGcpAuthnEnd2endTest::g_token; +std::atomic XdsGcpAuthnEnd2endTest::g_num_token_fetches; INSTANTIATE_TEST_SUITE_P(XdsTest, XdsGcpAuthnEnd2endTest, ::testing::Values(XdsTestType()), &XdsTestType::Name); @@ -159,6 +163,7 @@ TEST_P(XdsGcpAuthnEnd2endTest, Basic) { EXPECT_THAT(server_initial_metadata, ::testing::Contains(::testing::Pair( "authorization", absl::StrCat("Bearer ", g_token)))); + EXPECT_EQ(g_num_token_fetches.load(), 1); } TEST_P(XdsGcpAuthnEnd2endTest, NoOpWhenClusterHasNoAudience) { @@ -183,6 +188,70 @@ TEST_P(XdsGcpAuthnEnd2endTest, NoOpWhenClusterHasNoAudience) { ::testing::Not(::testing::Contains(::testing::Key("authorization")))); } +TEST_P(XdsGcpAuthnEnd2endTest, CacheRetainedAcrossXdsUpdates) { + grpc_core::testing::ScopedExperimentalEnvVar env( + "GRPC_EXPERIMENTAL_XDS_GCP_AUTHENTICATION_FILTER"); + // Construct auth token. + g_audience = kAudience; + std::string token = MakeToken(grpc_core::Timestamp::InfFuture()); + g_token = token.c_str(); + // Set xDS resources. + CreateAndStartBackends(1, /*xds_enabled=*/false, + CreateTlsServerCredentials()); + SetListenerAndRouteConfiguration(balancer_.get(), + BuildListenerWithGcpAuthnFilter(), + default_route_config_); + balancer_->ads_service()->SetCdsResource(BuildClusterWithAudience(kAudience)); + EdsResourceArgs args({{"locality0", {CreateEndpoint(0)}}}); + balancer_->ads_service()->SetEdsResource(BuildEdsResource(args)); + // Send an RPC and check that it arrives with the right auth token. + std::multimap server_initial_metadata; + Status status = SendRpc(RpcOptions().set_echo_metadata_initially(true), + /*response=*/nullptr, &server_initial_metadata); + EXPECT_TRUE(status.ok()) << "code=" << status.error_code() + << " message=" << status.error_message(); + EXPECT_THAT(server_initial_metadata, + ::testing::Contains(::testing::Pair( + "authorization", absl::StrCat("Bearer ", g_token)))); + EXPECT_EQ(g_num_token_fetches.load(), 1); + // Trigger update that changes the route config, thus causing the + // dynamic filters to be recreated. + // We insert a route that matches requests with the header "foo" and + // has a non-forwarding action, which will cause the client to fail RPCs + // that hit this route. + RouteConfiguration route_config = default_route_config_; + *route_config.mutable_virtual_hosts(0)->add_routes() = + route_config.virtual_hosts(0).routes(0); + auto* header_matcher = route_config.mutable_virtual_hosts(0) + ->mutable_routes(0) + ->mutable_match() + ->add_headers(); + header_matcher->set_name("foo"); + header_matcher->set_present_match(true); + route_config.mutable_virtual_hosts(0) + ->mutable_routes(0) + ->mutable_non_forwarding_action(); + SetListenerAndRouteConfiguration( + balancer_.get(), BuildListenerWithGcpAuthnFilter(), route_config); + // Send RPCs with the header "foo" and wait for them to start failing. + // When they do, we know that the client has seen the update. + SendRpcsUntil( + DEBUG_LOCATION, + [&](const RpcResult& result) { + if (result.status.ok()) return true; + EXPECT_EQ(StatusCode::UNAVAILABLE, result.status.error_code()); + EXPECT_EQ("Matching route has inappropriate action", + result.status.error_message()); + return false; + }, + /*timeout_ms=*/15000, RpcOptions().set_metadata({{"foo", "bar"}})); + // Now send an RPC without the header, which will go through the new + // instance of the GCP auth filter. + CheckRpcSendOk(DEBUG_LOCATION); + // Make sure we didn't re-fetch the token. + EXPECT_EQ(g_num_token_fetches.load(), 1); +} + TEST_P(XdsGcpAuthnEnd2endTest, FilterIgnoredWhenEnvVarNotSet) { // Construct auth token. g_audience = kAudience; diff --git a/tools/doxygen/Doxyfile.c++.internal b/tools/doxygen/Doxyfile.c++.internal index 4220bb664a0..efef382f359 100644 --- a/tools/doxygen/Doxyfile.c++.internal +++ b/tools/doxygen/Doxyfile.c++.internal @@ -2081,6 +2081,8 @@ src/core/ext/upbdefs-gen/xds/type/v3/range.upbdefs.c \ src/core/ext/upbdefs-gen/xds/type/v3/range.upbdefs.h \ src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.c \ src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.h \ +src/core/filter/blackboard.cc \ +src/core/filter/blackboard.h \ src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc \ src/core/handshaker/endpoint_info/endpoint_info_handshaker.h \ src/core/handshaker/handshaker.cc \ diff --git a/tools/doxygen/Doxyfile.core.internal b/tools/doxygen/Doxyfile.core.internal index eae9a2e2ea4..0471de0c886 100644 --- a/tools/doxygen/Doxyfile.core.internal +++ b/tools/doxygen/Doxyfile.core.internal @@ -1848,6 +1848,8 @@ src/core/ext/upbdefs-gen/xds/type/v3/range.upbdefs.c \ src/core/ext/upbdefs-gen/xds/type/v3/range.upbdefs.h \ src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.c \ src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.h \ +src/core/filter/blackboard.cc \ +src/core/filter/blackboard.h \ src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc \ src/core/handshaker/endpoint_info/endpoint_info_handshaker.h \ src/core/handshaker/handshaker.cc \ diff --git a/tools/run_tests/generated/tests.json b/tools/run_tests/generated/tests.json index 98ffb7f4c19..991313c58b5 100644 --- a/tools/run_tests/generated/tests.json +++ b/tools/run_tests/generated/tests.json @@ -1161,6 +1161,30 @@ ], "uses_polling": false }, + { + "args": [], + "benchmark": false, + "ci_platforms": [ + "linux", + "mac", + "posix", + "windows" + ], + "cpu_cost": 1.0, + "exclude_configs": [], + "exclude_iomgrs": [], + "flaky": false, + "gtest": true, + "language": "c++", + "name": "blackboard_test", + "platforms": [ + "linux", + "mac", + "posix", + "windows" + ], + "uses_polling": false + }, { "args": [], "benchmark": false, From f1df0f2b5f4d4b6073a81fe697fbeb986d4a3b6d Mon Sep 17 00:00:00 2001 From: Yousuk Seung Date: Fri, 27 Sep 2024 13:29:31 -0700 Subject: [PATCH 40/75] [doc] Clarify client callback API comments (#37805) Comments say users "should not" call Start* methods after notification callbacks are called with false, but users may still call so it's close to 'not recommended'. But it's less confusing to remove it altogether. Closes #37805 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37805 from yousukseung:client_callback_doc_clarify 38b9371f79d9763a84bbfb6972c21d23b4f36613 PiperOrigin-RevId: 679709417 --- include/grpcpp/support/client_callback.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/include/grpcpp/support/client_callback.h b/include/grpcpp/support/client_callback.h index 692dff6b8d1..82a404e2c87 100644 --- a/include/grpcpp/support/client_callback.h +++ b/include/grpcpp/support/client_callback.h @@ -325,21 +325,20 @@ class ClientBidiReactor : public internal::ClientReactor { /// call of OnReadDone or OnDone. /// /// \param[in] ok Was the initial metadata read successfully? If false, no - /// new read/write operation will succeed, and any further - /// Start* operations should not be called. + /// new read/write operation will succeed. virtual void OnReadInitialMetadataDone(bool /*ok*/) {} /// Notifies the application that a StartRead operation completed. /// /// \param[in] ok Was it successful? If false, no new read/write operation - /// will succeed, and any further Start* should not be called. + /// will succeed. virtual void OnReadDone(bool /*ok*/) {} /// Notifies the application that a StartWrite or StartWriteLast operation /// completed. /// /// \param[in] ok Was it successful? If false, no new read/write operation - /// will succeed, and any further Start* should not be called. + /// will succeed. virtual void OnWriteDone(bool /*ok*/) {} /// Notifies the application that a StartWritesDone operation completed. Note From 1b11b9218252e23f4e7fe8fdadae29c6abd86596 Mon Sep 17 00:00:00 2001 From: Esun Kim Date: Fri, 27 Sep 2024 14:54:52 -0700 Subject: [PATCH 41/75] [Deps] Updated Abseil to 1.20240722.0 (#37543) Closes #37543 PiperOrigin-RevId: 679738302 --- CMakeLists.txt | 6 + Makefile | 3 + bazel/grpc_deps.bzl | 8 +- config.m4 | 3 + config.w32 | 3 + gRPC-C++.podspec | 2 +- gRPC-Core.podspec | 2 +- grpc.gemspec | 10 +- package.xml | 10 +- src/abseil-cpp/preprocessed_builds.yaml | 107 ++++++++++++++++-- src/python/grpcio/grpc_core_dependencies.py | 3 + .../observability_lib_deps.py | 3 + templates/gRPC-C++.podspec.template | 2 +- templates/gRPC-Core.podspec.template | 2 +- third_party/abseil-cpp | 2 +- .../python/grpcio_tools/protoc_lib_deps.py | 3 + tools/run_tests/sanity/check_submodules.sh | 2 +- 17 files changed, 148 insertions(+), 23 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ec604861f22..da1e9c4ae87 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -110,6 +110,7 @@ set(gRPC_ABSL_USED_TARGETS absl_base_internal absl_bind_front absl_bits + absl_bounded_utf8_length_sequence absl_charset absl_check absl_city @@ -117,6 +118,7 @@ set(gRPC_ABSL_USED_TARGETS absl_cleanup absl_cleanup_internal absl_common_policy_traits + absl_compare absl_compressed_tuple absl_config absl_container_common @@ -135,7 +137,9 @@ set(gRPC_ABSL_USED_TARGETS absl_crc_cpu_detect absl_crc_internal absl_debugging_internal + absl_decode_rust_punycode absl_demangle_internal + absl_demangle_rust absl_dynamic_annotations absl_endian absl_errno_saver @@ -159,6 +163,7 @@ set(gRPC_ABSL_USED_TARGETS absl_graphcycles_internal absl_has_ostream_operator absl_hash + absl_hash_container_defaults absl_hash_function_defaults absl_hash_policy_traits absl_hashtable_debug_hooks @@ -245,6 +250,7 @@ set(gRPC_ABSL_USED_TARGETS absl_time absl_time_zone absl_type_traits + absl_utf8_for_code_point absl_utility absl_variant absl_vlog_config_internal diff --git a/Makefile b/Makefile index 078484c1fd6..028c9f90090 100644 --- a/Makefile +++ b/Makefile @@ -1544,9 +1544,12 @@ LIBGRPC_SRC = \ third_party/abseil-cpp/absl/crc/internal/crc_non_temporal_memcpy.cc \ third_party/abseil-cpp/absl/crc/internal/crc_x86_arm_combined.cc \ third_party/abseil-cpp/absl/debugging/internal/address_is_readable.cc \ + third_party/abseil-cpp/absl/debugging/internal/decode_rust_punycode.cc \ third_party/abseil-cpp/absl/debugging/internal/demangle.cc \ + third_party/abseil-cpp/absl/debugging/internal/demangle_rust.cc \ third_party/abseil-cpp/absl/debugging/internal/elf_mem_image.cc \ third_party/abseil-cpp/absl/debugging/internal/examine_stack.cc \ + third_party/abseil-cpp/absl/debugging/internal/utf8_for_code_point.cc \ third_party/abseil-cpp/absl/debugging/internal/vdso_support.cc \ third_party/abseil-cpp/absl/debugging/stacktrace.cc \ third_party/abseil-cpp/absl/debugging/symbolize.cc \ diff --git a/bazel/grpc_deps.bzl b/bazel/grpc_deps.bzl index 138ef9ed8af..b3d416aae9d 100644 --- a/bazel/grpc_deps.bzl +++ b/bazel/grpc_deps.bzl @@ -143,11 +143,11 @@ def grpc_deps(): if "com_google_absl" not in native.existing_rules(): http_archive( name = "com_google_absl", - sha256 = "338420448b140f0dfd1a1ea3c3ce71b3bc172071f24f4d9a57d59b45037da440", - strip_prefix = "abseil-cpp-20240116.0", + sha256 = "f50e5ac311a81382da7fa75b97310e4b9006474f9560ac46f54a9967f07d4ae3", + strip_prefix = "abseil-cpp-20240722.0", urls = [ - "https://storage.googleapis.com/grpc-bazel-mirror/github.com/abseil/abseil-cpp/archive/20240116.0.tar.gz", - "https://github.com/abseil/abseil-cpp/archive/20240116.0.tar.gz", + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/abseil/abseil-cpp/archive/20240722.0.tar.gz", + "https://github.com/abseil/abseil-cpp/archive/20240722.0.tar.gz", ], ) diff --git a/config.m4 b/config.m4 index ae67f344840..9bc1a068f3f 100644 --- a/config.m4 +++ b/config.m4 @@ -929,9 +929,12 @@ if test "$PHP_GRPC" != "no"; then third_party/abseil-cpp/absl/crc/internal/crc_non_temporal_memcpy.cc \ third_party/abseil-cpp/absl/crc/internal/crc_x86_arm_combined.cc \ third_party/abseil-cpp/absl/debugging/internal/address_is_readable.cc \ + third_party/abseil-cpp/absl/debugging/internal/decode_rust_punycode.cc \ third_party/abseil-cpp/absl/debugging/internal/demangle.cc \ + third_party/abseil-cpp/absl/debugging/internal/demangle_rust.cc \ third_party/abseil-cpp/absl/debugging/internal/elf_mem_image.cc \ third_party/abseil-cpp/absl/debugging/internal/examine_stack.cc \ + third_party/abseil-cpp/absl/debugging/internal/utf8_for_code_point.cc \ third_party/abseil-cpp/absl/debugging/internal/vdso_support.cc \ third_party/abseil-cpp/absl/debugging/stacktrace.cc \ third_party/abseil-cpp/absl/debugging/symbolize.cc \ diff --git a/config.w32 b/config.w32 index 94e02c3e172..f1f0df73b81 100644 --- a/config.w32 +++ b/config.w32 @@ -894,9 +894,12 @@ if (PHP_GRPC != "no") { "third_party\\abseil-cpp\\absl\\crc\\internal\\crc_non_temporal_memcpy.cc " + "third_party\\abseil-cpp\\absl\\crc\\internal\\crc_x86_arm_combined.cc " + "third_party\\abseil-cpp\\absl\\debugging\\internal\\address_is_readable.cc " + + "third_party\\abseil-cpp\\absl\\debugging\\internal\\decode_rust_punycode.cc " + "third_party\\abseil-cpp\\absl\\debugging\\internal\\demangle.cc " + + "third_party\\abseil-cpp\\absl\\debugging\\internal\\demangle_rust.cc " + "third_party\\abseil-cpp\\absl\\debugging\\internal\\elf_mem_image.cc " + "third_party\\abseil-cpp\\absl\\debugging\\internal\\examine_stack.cc " + + "third_party\\abseil-cpp\\absl\\debugging\\internal\\utf8_for_code_point.cc " + "third_party\\abseil-cpp\\absl\\debugging\\internal\\vdso_support.cc " + "third_party\\abseil-cpp\\absl\\debugging\\stacktrace.cc " + "third_party\\abseil-cpp\\absl\\debugging\\symbolize.cc " + diff --git a/gRPC-C++.podspec b/gRPC-C++.podspec index a63753dd7d1..abca293e113 100644 --- a/gRPC-C++.podspec +++ b/gRPC-C++.podspec @@ -231,7 +231,7 @@ Pod::Spec.new do |s| ss.dependency "#{s.name}/Privacy", version ss.dependency "#{s.name}/Interface", version ss.dependency 'gRPC-Core', version - abseil_version = '~> 1.20240116.2' + abseil_version = '~> 1.20240722.0' ss.dependency 'abseil/algorithm/container', abseil_version ss.dependency 'abseil/base/base', abseil_version ss.dependency 'abseil/base/config', abseil_version diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec index 5eda92de512..48543720dee 100644 --- a/gRPC-Core.podspec +++ b/gRPC-Core.podspec @@ -47,7 +47,7 @@ Pod::Spec.new do |s| s.requires_arc = false name = 'grpc' - abseil_version = '~> 1.20240116.2' + abseil_version = '~> 1.20240722.0' # When creating a dynamic framework, name it grpc.framework instead of gRPC-Core.framework. # This lets users write their includes like `#include ` as opposed to `#include diff --git a/grpc.gemspec b/grpc.gemspec index 3ba44548b25..7c4645fc5d2 100644 --- a/grpc.gemspec +++ b/grpc.gemspec @@ -2118,6 +2118,7 @@ Gem::Specification.new do |s| s.files += %w( third_party/abseil-cpp/absl/container/fixed_array.h ) s.files += %w( third_party/abseil-cpp/absl/container/flat_hash_map.h ) s.files += %w( third_party/abseil-cpp/absl/container/flat_hash_set.h ) + s.files += %w( third_party/abseil-cpp/absl/container/hash_container_defaults.h ) s.files += %w( third_party/abseil-cpp/absl/container/inlined_vector.h ) s.files += %w( third_party/abseil-cpp/absl/container/internal/common.h ) s.files += %w( third_party/abseil-cpp/absl/container/internal/common_policy_traits.h ) @@ -2155,8 +2156,13 @@ Gem::Specification.new do |s| s.files += %w( third_party/abseil-cpp/absl/crc/internal/non_temporal_memcpy.h ) s.files += %w( third_party/abseil-cpp/absl/debugging/internal/address_is_readable.cc ) s.files += %w( third_party/abseil-cpp/absl/debugging/internal/address_is_readable.h ) + s.files += %w( third_party/abseil-cpp/absl/debugging/internal/bounded_utf8_length_sequence.h ) + s.files += %w( third_party/abseil-cpp/absl/debugging/internal/decode_rust_punycode.cc ) + s.files += %w( third_party/abseil-cpp/absl/debugging/internal/decode_rust_punycode.h ) s.files += %w( third_party/abseil-cpp/absl/debugging/internal/demangle.cc ) s.files += %w( third_party/abseil-cpp/absl/debugging/internal/demangle.h ) + s.files += %w( third_party/abseil-cpp/absl/debugging/internal/demangle_rust.cc ) + s.files += %w( third_party/abseil-cpp/absl/debugging/internal/demangle_rust.h ) s.files += %w( third_party/abseil-cpp/absl/debugging/internal/elf_mem_image.cc ) s.files += %w( third_party/abseil-cpp/absl/debugging/internal/elf_mem_image.h ) s.files += %w( third_party/abseil-cpp/absl/debugging/internal/examine_stack.cc ) @@ -2172,6 +2178,8 @@ Gem::Specification.new do |s| s.files += %w( third_party/abseil-cpp/absl/debugging/internal/stacktrace_win32-inl.inc ) s.files += %w( third_party/abseil-cpp/absl/debugging/internal/stacktrace_x86-inl.inc ) s.files += %w( third_party/abseil-cpp/absl/debugging/internal/symbolize.h ) + s.files += %w( third_party/abseil-cpp/absl/debugging/internal/utf8_for_code_point.cc ) + s.files += %w( third_party/abseil-cpp/absl/debugging/internal/utf8_for_code_point.h ) s.files += %w( third_party/abseil-cpp/absl/debugging/internal/vdso_support.cc ) s.files += %w( third_party/abseil-cpp/absl/debugging/internal/vdso_support.h ) s.files += %w( third_party/abseil-cpp/absl/debugging/stacktrace.cc ) @@ -2369,7 +2377,6 @@ Gem::Specification.new do |s| s.files += %w( third_party/abseil-cpp/absl/strings/internal/damerau_levenshtein_distance.h ) s.files += %w( third_party/abseil-cpp/absl/strings/internal/escaping.cc ) s.files += %w( third_party/abseil-cpp/absl/strings/internal/escaping.h ) - s.files += %w( third_party/abseil-cpp/absl/strings/internal/has_absl_stringify.h ) s.files += %w( third_party/abseil-cpp/absl/strings/internal/memutil.cc ) s.files += %w( third_party/abseil-cpp/absl/strings/internal/memutil.h ) s.files += %w( third_party/abseil-cpp/absl/strings/internal/ostringstream.cc ) @@ -2479,6 +2486,7 @@ Gem::Specification.new do |s| s.files += %w( third_party/abseil-cpp/absl/types/bad_optional_access.h ) s.files += %w( third_party/abseil-cpp/absl/types/bad_variant_access.cc ) s.files += %w( third_party/abseil-cpp/absl/types/bad_variant_access.h ) + s.files += %w( third_party/abseil-cpp/absl/types/compare.h ) s.files += %w( third_party/abseil-cpp/absl/types/internal/optional.h ) s.files += %w( third_party/abseil-cpp/absl/types/internal/span.h ) s.files += %w( third_party/abseil-cpp/absl/types/internal/variant.h ) diff --git a/package.xml b/package.xml index 76be79fd6b5..69833761539 100644 --- a/package.xml +++ b/package.xml @@ -2122,6 +2122,7 @@ + @@ -2159,8 +2160,13 @@ + + + + + @@ -2176,6 +2182,8 @@ + + @@ -2373,7 +2381,6 @@ - @@ -2483,6 +2490,7 @@ + diff --git a/src/abseil-cpp/preprocessed_builds.yaml b/src/abseil-cpp/preprocessed_builds.yaml index 6250c0fa12d..5d82f5149bc 100644 --- a/src/abseil-cpp/preprocessed_builds.yaml +++ b/src/abseil-cpp/preprocessed_builds.yaml @@ -8,6 +8,7 @@ - cmake_target: absl::algorithm_container deps: - absl/algorithm:algorithm + - absl/base:config - absl/base:core_headers - absl/base:nullability - absl/meta:type_traits @@ -155,12 +156,14 @@ - cmake_target: absl::no_destructor deps: - absl/base:config + - absl/base:nullability headers: - third_party/abseil-cpp/absl/base/no_destructor.h name: absl/base:no_destructor src: [] - cmake_target: absl::nullability deps: + - absl/base:config - absl/base:core_headers - absl/meta:type_traits headers: @@ -168,6 +171,16 @@ - third_party/abseil-cpp/absl/base/nullability.h name: absl/base:nullability src: [] +- cmake_target: absl::poison + deps: + - absl/base:config + - absl/base:core_headers + - absl/base:malloc_internal + headers: + - third_party/abseil-cpp/absl/base/internal/poison.h + name: absl/base:poison + src: + - third_party/abseil-cpp/absl/base/internal/poison.cc - cmake_target: absl::prefetch deps: - absl/base:config @@ -247,6 +260,7 @@ src: [] - cmake_target: absl::btree deps: + - absl/base:config - absl/base:core_headers - absl/base:raw_logging_internal - absl/base:throw_delegate @@ -260,7 +274,6 @@ - absl/strings:cord - absl/strings:strings - absl/types:compare - - absl/utility:utility headers: - third_party/abseil-cpp/absl/container/btree_map.h - third_party/abseil-cpp/absl/container/btree_set.h @@ -318,9 +331,9 @@ - absl/algorithm:container - absl/base:core_headers - absl/container:container_memory - - absl/container:hash_function_defaults + - absl/container:hash_container_defaults - absl/container:raw_hash_map - - absl/memory:memory + - absl/meta:type_traits headers: - third_party/abseil-cpp/absl/container/flat_hash_map.h name: absl/container:flat_hash_map @@ -330,17 +343,28 @@ - absl/algorithm:container - absl/base:core_headers - absl/container:container_memory - - absl/container:hash_function_defaults + - absl/container:hash_container_defaults - absl/container:raw_hash_set - absl/memory:memory + - absl/meta:type_traits headers: - third_party/abseil-cpp/absl/container/flat_hash_set.h name: absl/container:flat_hash_set src: [] +- cmake_target: absl::hash_container_defaults + deps: + - absl/base:config + - absl/container:hash_function_defaults + headers: + - third_party/abseil-cpp/absl/container/hash_container_defaults.h + name: absl/container:hash_container_defaults + src: [] - cmake_target: absl::hash_function_defaults deps: - absl/base:config + - absl/container:common - absl/hash:hash + - absl/meta:type_traits - absl/strings:cord - absl/strings:strings headers: @@ -374,6 +398,7 @@ - absl/base:base - absl/base:config - absl/base:core_headers + - absl/base:no_destructor - absl/base:raw_logging_internal - absl/debugging:stacktrace - absl/memory:memory @@ -402,6 +427,7 @@ src: [] - cmake_target: absl::inlined_vector_internal deps: + - absl/base:base_internal - absl/base:config - absl/base:core_headers - absl/container:compressed_tuple @@ -430,10 +456,11 @@ - absl/algorithm:container - absl/base:core_headers - absl/container:container_memory - - absl/container:hash_function_defaults + - absl/container:hash_container_defaults - absl/container:node_slot_policy - absl/container:raw_hash_map - absl/memory:memory + - absl/meta:type_traits headers: - third_party/abseil-cpp/absl/container/node_hash_map.h name: absl/container:node_hash_map @@ -442,10 +469,12 @@ deps: - absl/algorithm:container - absl/base:core_headers - - absl/container:hash_function_defaults + - absl/container:container_memory + - absl/container:hash_container_defaults - absl/container:node_slot_policy - absl/container:raw_hash_set - absl/memory:memory + - absl/meta:type_traits headers: - third_party/abseil-cpp/absl/container/node_hash_set.h name: absl/container:node_hash_set @@ -526,9 +555,9 @@ - cmake_target: absl::crc_cord_state deps: - absl/base:config + - absl/base:no_destructor - absl/crc:crc32c - absl/numeric:bits - - absl/strings:strings headers: - third_party/abseil-cpp/absl/crc/internal/crc_cord_state.h name: absl/crc:crc_cord_state @@ -568,6 +597,14 @@ - third_party/abseil-cpp/absl/crc/internal/non_temporal_memcpy.h name: absl/crc:non_temporal_memcpy src: [] +- cmake_target: absl::bounded_utf8_length_sequence + deps: + - absl/base:config + - absl/numeric:bits + headers: + - third_party/abseil-cpp/absl/debugging/internal/bounded_utf8_length_sequence.h + name: absl/debugging:bounded_utf8_length_sequence + src: [] - cmake_target: absl::debugging_internal deps: - absl/base:config @@ -584,16 +621,40 @@ - third_party/abseil-cpp/absl/debugging/internal/address_is_readable.cc - third_party/abseil-cpp/absl/debugging/internal/elf_mem_image.cc - third_party/abseil-cpp/absl/debugging/internal/vdso_support.cc +- cmake_target: absl::decode_rust_punycode + deps: + - absl/base:config + - absl/base:nullability + - absl/debugging:bounded_utf8_length_sequence + - absl/debugging:utf8_for_code_point + headers: + - third_party/abseil-cpp/absl/debugging/internal/decode_rust_punycode.h + name: absl/debugging:decode_rust_punycode + src: + - third_party/abseil-cpp/absl/debugging/internal/decode_rust_punycode.cc - cmake_target: absl::demangle_internal deps: - absl/base:base - absl/base:config - absl/base:core_headers + - absl/base:nullability + - absl/debugging:demangle_rust + - absl/numeric:bits headers: - third_party/abseil-cpp/absl/debugging/internal/demangle.h name: absl/debugging:demangle_internal src: - third_party/abseil-cpp/absl/debugging/internal/demangle.cc +- cmake_target: absl::demangle_rust + deps: + - absl/base:config + - absl/base:core_headers + - absl/debugging:decode_rust_punycode + headers: + - third_party/abseil-cpp/absl/debugging/internal/demangle_rust.h + name: absl/debugging:demangle_rust + src: + - third_party/abseil-cpp/absl/debugging/internal/demangle_rust.cc - cmake_target: absl::examine_stack deps: - absl/base:config @@ -672,6 +733,14 @@ name: absl/debugging:symbolize src: - third_party/abseil-cpp/absl/debugging/symbolize.cc +- cmake_target: absl::utf8_for_code_point + deps: + - absl/base:config + headers: + - third_party/abseil-cpp/absl/debugging/internal/utf8_for_code_point.h + name: absl/debugging:utf8_for_code_point + src: + - third_party/abseil-cpp/absl/debugging/internal/utf8_for_code_point.cc - cmake_target: absl::flags_commandlineflag deps: - absl/base:config @@ -709,9 +778,9 @@ - third_party/abseil-cpp/absl/flags/usage_config.cc - cmake_target: absl::flags deps: - - absl/base:base - absl/base:config - absl/base:core_headers + - absl/flags:commandlineflag - absl/flags:config - absl/flags:flag_internal - absl/flags:reflection @@ -1139,6 +1208,7 @@ - third_party/abseil-cpp/absl/log/internal/proto.cc - cmake_target: absl::log_internal_strip deps: + - absl/base:core_headers - absl/base:log_severity - absl/log/internal:log_message - absl/log/internal:nullstream @@ -1366,6 +1436,7 @@ - absl/base:config - absl/base:core_headers - absl/numeric:bits + - absl/types:compare headers: - third_party/abseil-cpp/absl/numeric/int128.h - third_party/abseil-cpp/absl/numeric/int128_have_intrinsic.inc @@ -1453,12 +1524,25 @@ src: [] - cmake_target: absl::random_internal_mock_helpers deps: + - absl/base:config - absl/base:fast_type_id - absl/types:optional headers: - third_party/abseil-cpp/absl/random/internal/mock_helpers.h name: absl/random/internal:mock_helpers src: [] +- cmake_target: '' + deps: + - absl/base:config + - absl/base:raw_logging_internal + - absl/random/internal:iostream_state_saver + - absl/random/internal:uniform_helper + - absl/strings:string_view + - absl/strings:strings + headers: + - third_party/abseil-cpp/absl/random/internal/mock_validators.h + name: absl/random/internal:mock_validators + src: [] - cmake_target: '' deps: - absl/base:config @@ -1615,7 +1699,6 @@ deps: - absl/base:config - absl/meta:type_traits - - absl/numeric:int128 - absl/random/internal:traits headers: - third_party/abseil-cpp/absl/random/internal/uniform_helper.h @@ -1698,10 +1781,12 @@ - cmake_target: absl::random_seed_sequences deps: - absl/base:config + - absl/base:nullability - absl/random/internal:pool_urbg - absl/random/internal:salted_seed_seq - absl/random/internal:seed_material - absl/random:seed_gen_exception + - absl/strings:string_view - absl/types:span headers: - third_party/abseil-cpp/absl/random/seed_sequences.h @@ -1786,6 +1871,7 @@ - absl/strings:cordz_update_tracker - absl/strings:internal - absl/strings:strings + - absl/types:compare - absl/types:optional - absl/types:span headers: @@ -1844,8 +1930,8 @@ - third_party/abseil-cpp/absl/strings/internal/cordz_functions.cc - cmake_target: absl::cordz_handle deps: - - absl/base:base - absl/base:config + - absl/base:no_destructor - absl/base:raw_logging_internal - absl/synchronization:synchronization headers: @@ -2014,7 +2100,6 @@ - third_party/abseil-cpp/absl/strings/internal/charconv_bigint.h - third_party/abseil-cpp/absl/strings/internal/charconv_parse.h - third_party/abseil-cpp/absl/strings/internal/damerau_levenshtein_distance.h - - third_party/abseil-cpp/absl/strings/internal/has_absl_stringify.h - third_party/abseil-cpp/absl/strings/internal/memutil.h - third_party/abseil-cpp/absl/strings/internal/stl_type_traits.h - third_party/abseil-cpp/absl/strings/internal/str_join_internal.h diff --git a/src/python/grpcio/grpc_core_dependencies.py b/src/python/grpcio/grpc_core_dependencies.py index 7c9601a6fe8..fde998c3af6 100644 --- a/src/python/grpcio/grpc_core_dependencies.py +++ b/src/python/grpcio/grpc_core_dependencies.py @@ -893,9 +893,12 @@ CORE_SOURCE_FILES = [ 'third_party/abseil-cpp/absl/crc/internal/crc_non_temporal_memcpy.cc', 'third_party/abseil-cpp/absl/crc/internal/crc_x86_arm_combined.cc', 'third_party/abseil-cpp/absl/debugging/internal/address_is_readable.cc', + 'third_party/abseil-cpp/absl/debugging/internal/decode_rust_punycode.cc', 'third_party/abseil-cpp/absl/debugging/internal/demangle.cc', + 'third_party/abseil-cpp/absl/debugging/internal/demangle_rust.cc', 'third_party/abseil-cpp/absl/debugging/internal/elf_mem_image.cc', 'third_party/abseil-cpp/absl/debugging/internal/examine_stack.cc', + 'third_party/abseil-cpp/absl/debugging/internal/utf8_for_code_point.cc', 'third_party/abseil-cpp/absl/debugging/internal/vdso_support.cc', 'third_party/abseil-cpp/absl/debugging/stacktrace.cc', 'third_party/abseil-cpp/absl/debugging/symbolize.cc', diff --git a/src/python/grpcio_observability/observability_lib_deps.py b/src/python/grpcio_observability/observability_lib_deps.py index 471b6603806..9896cd7368b 100644 --- a/src/python/grpcio_observability/observability_lib_deps.py +++ b/src/python/grpcio_observability/observability_lib_deps.py @@ -87,9 +87,12 @@ CC_FILES=[ 'third_party/abseil-cpp/absl/crc/internal/crc_non_temporal_memcpy.cc', 'third_party/abseil-cpp/absl/crc/internal/crc_x86_arm_combined.cc', 'third_party/abseil-cpp/absl/debugging/internal/address_is_readable.cc', + 'third_party/abseil-cpp/absl/debugging/internal/decode_rust_punycode.cc', 'third_party/abseil-cpp/absl/debugging/internal/demangle.cc', + 'third_party/abseil-cpp/absl/debugging/internal/demangle_rust.cc', 'third_party/abseil-cpp/absl/debugging/internal/elf_mem_image.cc', 'third_party/abseil-cpp/absl/debugging/internal/examine_stack.cc', + 'third_party/abseil-cpp/absl/debugging/internal/utf8_for_code_point.cc', 'third_party/abseil-cpp/absl/debugging/internal/vdso_support.cc', 'third_party/abseil-cpp/absl/debugging/stacktrace.cc', 'third_party/abseil-cpp/absl/debugging/symbolize.cc', diff --git a/templates/gRPC-C++.podspec.template b/templates/gRPC-C++.podspec.template index ffc8b75d415..a78254b12b6 100644 --- a/templates/gRPC-C++.podspec.template +++ b/templates/gRPC-C++.podspec.template @@ -184,7 +184,7 @@ ss.dependency "#{s.name}/Privacy", version ss.dependency "#{s.name}/Interface", version ss.dependency 'gRPC-Core', version - abseil_version = '~> 1.20240116.2' + abseil_version = '~> 1.20240722.0' % for abseil_spec in grpcpp_abseil_specs: ss.dependency '${abseil_spec}', abseil_version % endfor diff --git a/templates/gRPC-Core.podspec.template b/templates/gRPC-Core.podspec.template index b6ffab39cdf..2de614df573 100644 --- a/templates/gRPC-Core.podspec.template +++ b/templates/gRPC-Core.podspec.template @@ -123,7 +123,7 @@ s.requires_arc = false name = 'grpc' - abseil_version = '~> 1.20240116.2' + abseil_version = '~> 1.20240722.0' # When creating a dynamic framework, name it grpc.framework instead of gRPC-Core.framework. # This lets users write their includes like `#include ` as opposed to `#include diff --git a/third_party/abseil-cpp b/third_party/abseil-cpp index 4a2c63365ef..4447c7562e3 160000 --- a/third_party/abseil-cpp +++ b/third_party/abseil-cpp @@ -1 +1 @@ -Subproject commit 4a2c63365eff8823a5221db86ef490e828306f9d +Subproject commit 4447c7562e3bc702ade25105912dce503f0c4010 diff --git a/tools/distrib/python/grpcio_tools/protoc_lib_deps.py b/tools/distrib/python/grpcio_tools/protoc_lib_deps.py index 2caad754ab6..00696e3486d 100644 --- a/tools/distrib/python/grpcio_tools/protoc_lib_deps.py +++ b/tools/distrib/python/grpcio_tools/protoc_lib_deps.py @@ -38,9 +38,12 @@ CC_FILES=[ 'third_party/abseil-cpp/absl/crc/internal/crc_non_temporal_memcpy.cc', 'third_party/abseil-cpp/absl/crc/internal/crc_x86_arm_combined.cc', 'third_party/abseil-cpp/absl/debugging/internal/address_is_readable.cc', + 'third_party/abseil-cpp/absl/debugging/internal/decode_rust_punycode.cc', 'third_party/abseil-cpp/absl/debugging/internal/demangle.cc', + 'third_party/abseil-cpp/absl/debugging/internal/demangle_rust.cc', 'third_party/abseil-cpp/absl/debugging/internal/elf_mem_image.cc', 'third_party/abseil-cpp/absl/debugging/internal/examine_stack.cc', + 'third_party/abseil-cpp/absl/debugging/internal/utf8_for_code_point.cc', 'third_party/abseil-cpp/absl/debugging/internal/vdso_support.cc', 'third_party/abseil-cpp/absl/debugging/stacktrace.cc', 'third_party/abseil-cpp/absl/debugging/symbolize.cc', diff --git a/tools/run_tests/sanity/check_submodules.sh b/tools/run_tests/sanity/check_submodules.sh index c2d0e3c4194..ab9c7c1cd6a 100755 --- a/tools/run_tests/sanity/check_submodules.sh +++ b/tools/run_tests/sanity/check_submodules.sh @@ -25,7 +25,7 @@ want_submodules=$(mktemp /tmp/submXXXXXX) git submodule | sed 's/+//g' | awk '{ print $2 " " $1 }' | sort >"$submodules" cat <"$want_submodules" -third_party/abseil-cpp 4a2c63365eff8823a5221db86ef490e828306f9d +third_party/abseil-cpp 4447c7562e3bc702ade25105912dce503f0c4010 third_party/benchmark 344117638c8ff7e239044fd0fa7085839fc03021 third_party/bloaty 60209eb1ccc34d5deefb002d1b7f37545204f7f2 third_party/boringssl-with-bazel b8b3e6e11166719a8ebfa43c0cde9ad7d57a84f6 From 05d214ee86c62741b719569509ba7d0a066d7755 Mon Sep 17 00:00:00 2001 From: Vignesh Babu Date: Fri, 27 Sep 2024 14:57:51 -0700 Subject: [PATCH 42/75] [tracing] Add latent see annotations to the filter stack. This would allow us to better attribute time spent in different filters. PiperOrigin-RevId: 679739129 --- BUILD | 1 + src/core/BUILD | 12 +++++++ .../backend_metrics/backend_metric_filter.cc | 3 ++ .../filters/http/client/http_client_filter.cc | 7 ++++ .../filters/http/client_authority_filter.cc | 3 ++ .../message_compress/compression_filter.cc | 17 +++++++++ .../filters/http/server/http_server_filter.cc | 7 ++++ .../server_load_reporting_filter.cc | 6 ++++ .../ext/filters/logging/logging_filter.cc | 25 +++++++++++++ .../message_size/message_size_filter.cc | 9 +++++ src/core/ext/filters/rbac/rbac_filter.cc | 2 ++ .../stateful_session_filter.cc | 7 ++++ src/core/lib/channel/promise_based_filter.cc | 35 ++++++++++--------- src/core/lib/channel/promise_based_filter.h | 3 +- .../authorization/grpc_server_authz_filter.cc | 3 ++ .../grpclb/client_load_reporting_filter.cc | 7 ++++ src/core/server/server_call_tracer_filter.cc | 8 +++++ .../server/server_config_selector_filter.cc | 3 ++ .../service_config_channel_arg_filter.cc | 3 ++ src/core/util/latent_see.cc | 22 ++++++++---- src/core/util/latent_see.h | 7 ++++ 21 files changed, 167 insertions(+), 23 deletions(-) diff --git a/BUILD b/BUILD index c2d1c88a7d6..0a0a13ee091 100644 --- a/BUILD +++ b/BUILD @@ -4362,6 +4362,7 @@ grpc_cc_library( "//src/core:experiments", "//src/core:grpc_message_size_filter", "//src/core:latch", + "//src/core:latent_see", "//src/core:map", "//src/core:metadata_batch", "//src/core:percent_encoding", diff --git a/src/core/BUILD b/src/core/BUILD index 0de80c1f68a..5f6adbeb898 100644 --- a/src/core/BUILD +++ b/src/core/BUILD @@ -199,6 +199,7 @@ grpc_cc_library( "channel_fwd", "channel_stack_type", "context", + "latent_see", "map", "pipe", "//:call_tracer", @@ -3539,6 +3540,7 @@ grpc_cc_library( "context", "grpc_message_size_filter", "grpc_service_config", + "latent_see", "metadata_batch", "service_config_parser", "//:channel_arg_names", @@ -3814,6 +3816,7 @@ grpc_cc_library( "event_engine_context", "grpc_server_config_selector", "grpc_service_config", + "latent_see", "metadata_batch", "status_helper", "//:gpr", @@ -3941,6 +3944,7 @@ grpc_cc_library( "channel_fwd", "dual_ref_counted", "endpoint_info_handshaker", + "latent_see", "load_file", "metadata_batch", "ref_counted", @@ -4853,6 +4857,7 @@ grpc_cc_library( "channel_args", "channel_fwd", "channel_stack_type", + "latent_see", "metadata_batch", "slice", "//:channel_arg_names", @@ -4892,6 +4897,7 @@ grpc_cc_library( "json_args", "json_object_loader", "latch", + "latent_see", "metadata_batch", "race", "service_config_parser", @@ -4982,6 +4988,7 @@ grpc_cc_library( "json", "json_args", "json_object_loader", + "latent_see", "metadata_batch", "service_config_parser", "validation_errors", @@ -5021,6 +5028,7 @@ grpc_cc_library( "json", "json_args", "json_object_loader", + "latent_see", "map", "metadata_batch", "pipe", @@ -5128,6 +5136,7 @@ grpc_cc_library( "json", "json_args", "json_object_loader", + "latent_see", "lb_policy", "lb_policy_factory", "lb_policy_registry", @@ -6893,6 +6902,7 @@ grpc_cc_library( "channel_stack_type", "context", "grpc_sockaddr", + "latent_see", "metadata_batch", "resolved_address", "seq", @@ -6937,6 +6947,7 @@ grpc_cc_library( "experiments", "grpc_backend_metric_data", "grpc_backend_metric_provider", + "latent_see", "map", "metadata_batch", "slice", @@ -7880,6 +7891,7 @@ grpc_cc_library( "channel_fwd", "channel_stack_type", "context", + "latent_see", "logging_sink", "map", "metadata_batch", diff --git a/src/core/ext/filters/backend_metrics/backend_metric_filter.cc b/src/core/ext/filters/backend_metrics/backend_metric_filter.cc index 647ff45c30e..da589a303b7 100644 --- a/src/core/ext/filters/backend_metrics/backend_metric_filter.cc +++ b/src/core/ext/filters/backend_metrics/backend_metric_filter.cc @@ -43,6 +43,7 @@ #include "src/core/lib/surface/channel_stack_type.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/load_balancing/backend_metric_data.h" +#include "src/core/util/latent_see.h" namespace grpc_core { @@ -125,6 +126,8 @@ BackendMetricFilter::Create(const ChannelArgs&, ChannelFilter::Args) { } void BackendMetricFilter::Call::OnServerTrailingMetadata(ServerMetadata& md) { + GRPC_LATENT_SEE_INNER_SCOPE( + "BackendMetricFilter::Call::OnServerTrailingMetadata"); if (md.get(GrpcCallWasCancelled()).value_or(false)) return; auto* ctx = MaybeGetContext(); if (ctx == nullptr) { diff --git a/src/core/ext/filters/http/client/http_client_filter.cc b/src/core/ext/filters/http/client/http_client_filter.cc index 7fd04a371e4..f46b3641b61 100644 --- a/src/core/ext/filters/http/client/http_client_filter.cc +++ b/src/core/ext/filters/http/client/http_client_filter.cc @@ -49,6 +49,7 @@ #include "src/core/lib/slice/percent_encoding.h" #include "src/core/lib/transport/status_conversion.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/latent_see.h" namespace grpc_core { @@ -113,6 +114,8 @@ Slice UserAgentFromArgs(const ChannelArgs& args, void HttpClientFilter::Call::OnClientInitialMetadata(ClientMetadata& md, HttpClientFilter* filter) { + GRPC_LATENT_SEE_INNER_SCOPE( + "HttpClientFilter::Call::OnClientInitialMetadata"); if (filter->test_only_use_put_requests_) { md.Set(HttpMethodMetadata(), HttpMethodMetadata::kPut); } else { @@ -126,11 +129,15 @@ void HttpClientFilter::Call::OnClientInitialMetadata(ClientMetadata& md, absl::Status HttpClientFilter::Call::OnServerInitialMetadata( ServerMetadata& md) { + GRPC_LATENT_SEE_INNER_SCOPE( + "HttpClientFilter::Call::OnServerInitialMetadata"); return CheckServerMetadata(&md); } absl::Status HttpClientFilter::Call::OnServerTrailingMetadata( ServerMetadata& md) { + GRPC_LATENT_SEE_INNER_SCOPE( + "HttpClientFilter::Call::OnServerTrailingMetadata"); return CheckServerMetadata(&md); } diff --git a/src/core/ext/filters/http/client_authority_filter.cc b/src/core/ext/filters/http/client_authority_filter.cc index 6dd44234151..b43e6a65b2b 100644 --- a/src/core/ext/filters/http/client_authority_filter.cc +++ b/src/core/ext/filters/http/client_authority_filter.cc @@ -34,6 +34,7 @@ #include "src/core/lib/security/transport/auth_filters.h" #include "src/core/lib/surface/channel_stack_type.h" #include "src/core/lib/transport/metadata_batch.h" +#include "src/core/util/latent_see.h" namespace grpc_core { @@ -59,6 +60,8 @@ ClientAuthorityFilter::Create(const ChannelArgs& args, ChannelFilter::Args) { void ClientAuthorityFilter::Call::OnClientInitialMetadata( ClientMetadata& md, ClientAuthorityFilter* filter) { + GRPC_LATENT_SEE_INNER_SCOPE( + "ClientAuthorityFilter::Call::OnClientInitialMetadata"); // If no authority is set, set the default authority. if (md.get_pointer(HttpAuthorityMetadata()) == nullptr) { md.Set(HttpAuthorityMetadata(), filter->default_authority_.Ref()); diff --git a/src/core/ext/filters/http/message_compress/compression_filter.cc b/src/core/ext/filters/http/message_compress/compression_filter.cc index dead10bbe15..85a67690206 100644 --- a/src/core/ext/filters/http/message_compress/compression_filter.cc +++ b/src/core/ext/filters/http/message_compress/compression_filter.cc @@ -51,6 +51,7 @@ #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" #include "src/core/telemetry/call_tracer.h" +#include "src/core/util/latent_see.h" namespace grpc_core { @@ -238,48 +239,64 @@ ChannelCompression::DecompressArgs ChannelCompression::HandleIncomingMetadata( void ClientCompressionFilter::Call::OnClientInitialMetadata( ClientMetadata& md, ClientCompressionFilter* filter) { + GRPC_LATENT_SEE_INNER_SCOPE( + "ClientCompressionFilter::Call::OnClientInitialMetadata"); compression_algorithm_ = filter->compression_engine_.HandleOutgoingMetadata(md); } MessageHandle ClientCompressionFilter::Call::OnClientToServerMessage( MessageHandle message, ClientCompressionFilter* filter) { + GRPC_LATENT_SEE_INNER_SCOPE( + "ClientCompressionFilter::Call::OnClientToServerMessage"); return filter->compression_engine_.CompressMessage(std::move(message), compression_algorithm_); } void ClientCompressionFilter::Call::OnServerInitialMetadata( ServerMetadata& md, ClientCompressionFilter* filter) { + GRPC_LATENT_SEE_INNER_SCOPE( + "ClientCompressionFilter::Call::OnServerInitialMetadata"); decompress_args_ = filter->compression_engine_.HandleIncomingMetadata(md); } absl::StatusOr ClientCompressionFilter::Call::OnServerToClientMessage( MessageHandle message, ClientCompressionFilter* filter) { + GRPC_LATENT_SEE_INNER_SCOPE( + "ClientCompressionFilter::Call::OnServerToClientMessage"); return filter->compression_engine_.DecompressMessage( /*is_client=*/true, std::move(message), decompress_args_); } void ServerCompressionFilter::Call::OnClientInitialMetadata( ClientMetadata& md, ServerCompressionFilter* filter) { + GRPC_LATENT_SEE_INNER_SCOPE( + "ServerCompressionFilter::Call::OnClientInitialMetadata"); decompress_args_ = filter->compression_engine_.HandleIncomingMetadata(md); } absl::StatusOr ServerCompressionFilter::Call::OnClientToServerMessage( MessageHandle message, ServerCompressionFilter* filter) { + GRPC_LATENT_SEE_INNER_SCOPE( + "ServerCompressionFilter::Call::OnClientToServerMessage"); return filter->compression_engine_.DecompressMessage( /*is_client=*/false, std::move(message), decompress_args_); } void ServerCompressionFilter::Call::OnServerInitialMetadata( ServerMetadata& md, ServerCompressionFilter* filter) { + GRPC_LATENT_SEE_INNER_SCOPE( + "ServerCompressionFilter::Call::OnServerInitialMetadata"); compression_algorithm_ = filter->compression_engine_.HandleOutgoingMetadata(md); } MessageHandle ServerCompressionFilter::Call::OnServerToClientMessage( MessageHandle message, ServerCompressionFilter* filter) { + GRPC_LATENT_SEE_INNER_SCOPE( + "ServerCompressionFilter::Call::OnServerToClientMessage"); return filter->compression_engine_.CompressMessage(std::move(message), compression_algorithm_); } diff --git a/src/core/ext/filters/http/server/http_server_filter.cc b/src/core/ext/filters/http/server/http_server_filter.cc index fa6a38ddcc0..92e541775e5 100644 --- a/src/core/ext/filters/http/server/http_server_filter.cc +++ b/src/core/ext/filters/http/server/http_server_filter.cc @@ -45,6 +45,7 @@ #include "src/core/lib/slice/percent_encoding.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/transport/metadata_batch.h" +#include "src/core/util/latent_see.h" namespace grpc_core { @@ -77,6 +78,8 @@ ServerMetadataHandle MalformedRequest(absl::string_view explanation) { ServerMetadataHandle HttpServerFilter::Call::OnClientInitialMetadata( ClientMetadata& md, HttpServerFilter* filter) { + GRPC_LATENT_SEE_INNER_SCOPE( + "HttpServerFilter::Call::OnClientInitialMetadata"); auto method = md.get(HttpMethodMetadata()); if (method.has_value()) { switch (*method) { @@ -139,6 +142,8 @@ ServerMetadataHandle HttpServerFilter::Call::OnClientInitialMetadata( } void HttpServerFilter::Call::OnServerInitialMetadata(ServerMetadata& md) { + GRPC_LATENT_SEE_INNER_SCOPE( + "HttpServerFilter::Call::OnServerInitialMetadata"); GRPC_TRACE_LOG(call, INFO) << GetContext()->DebugTag() << "[http-server] Write metadata"; FilterOutgoingMetadata(&md); @@ -147,6 +152,8 @@ void HttpServerFilter::Call::OnServerInitialMetadata(ServerMetadata& md) { } void HttpServerFilter::Call::OnServerTrailingMetadata(ServerMetadata& md) { + GRPC_LATENT_SEE_INNER_SCOPE( + "HttpServerFilter::Call::OnServerTrailingMetadata"); FilterOutgoingMetadata(&md); } diff --git a/src/core/ext/filters/load_reporting/server_load_reporting_filter.cc b/src/core/ext/filters/load_reporting/server_load_reporting_filter.cc index 928a50867e3..48cb742e505 100644 --- a/src/core/ext/filters/load_reporting/server_load_reporting_filter.cc +++ b/src/core/ext/filters/load_reporting/server_load_reporting_filter.cc @@ -61,6 +61,7 @@ #include "src/core/lib/slice/slice.h" #include "src/core/lib/surface/channel_stack_type.h" #include "src/core/lib/transport/metadata_batch.h" +#include "src/core/util/latent_see.h" #include "src/core/util/uri.h" #include "src/cpp/server/load_reporter/constants.h" @@ -181,6 +182,8 @@ const char* GetStatusTagForStatus(grpc_status_code status) { void ServerLoadReportingFilter::Call::OnClientInitialMetadata( ClientMetadata& md, ServerLoadReportingFilter* filter) { + GRPC_LATENT_SEE_INNER_SCOPE( + "ServerLoadReportingFilter::Call::OnClientInitialMetadata"); // Gather up basic facts about the request Slice service_method; if (const Slice* path = md.get_pointer(HttpPathMetadata())) { @@ -205,6 +208,8 @@ void ServerLoadReportingFilter::Call::OnClientInitialMetadata( void ServerLoadReportingFilter::Call::OnServerTrailingMetadata( ServerMetadata& md, ServerLoadReportingFilter* filter) { + GRPC_LATENT_SEE_INNER_SCOPE( + "ServerLoadReportingFilter::Call::OnServerTrailingMetadata"); const auto& costs = md.Take(LbCostBinMetadata()); for (const auto& cost : costs) { opencensus::stats::Record( @@ -222,6 +227,7 @@ void ServerLoadReportingFilter::Call::OnServerTrailingMetadata( void ServerLoadReportingFilter::Call::OnFinalize( const grpc_call_final_info* final_info, ServerLoadReportingFilter* filter) { + GRPC_LATENT_SEE_INNER_SCOPE("ServerLoadReportingFilter::Call::OnFinalize"); if (final_info == nullptr) return; // After the last bytes have been placed on the wire we record // final measurements diff --git a/src/core/ext/filters/logging/logging_filter.cc b/src/core/ext/filters/logging/logging_filter.cc index 1963f823665..cf12d8bb6ac 100644 --- a/src/core/ext/filters/logging/logging_filter.cc +++ b/src/core/ext/filters/logging/logging_filter.cc @@ -67,6 +67,7 @@ #include "src/core/resolver/resolver_registry.h" #include "src/core/telemetry/call_tracer.h" #include "src/core/util/host_port.h" +#include "src/core/util/latent_see.h" #include "src/core/util/time.h" #include "src/core/util/uri.h" @@ -359,6 +360,8 @@ ClientLoggingFilter::Create(const ChannelArgs& args, void ClientLoggingFilter::Call::OnClientInitialMetadata( ClientMetadata& md, ClientLoggingFilter* filter) { + GRPC_LATENT_SEE_INNER_SCOPE( + "ClientLoggingFilter::Call::OnClientInitialMetadata"); call_data_.emplace(true, md, filter->default_authority_); if (!call_data_->ShouldLog()) { call_data_.reset(); @@ -369,6 +372,8 @@ void ClientLoggingFilter::Call::OnClientInitialMetadata( } void ClientLoggingFilter::Call::OnServerInitialMetadata(ServerMetadata& md) { + GRPC_LATENT_SEE_INNER_SCOPE( + "ClientLoggingFilter::Call::OnServerInitialMetadata"); if (!call_data_.has_value()) return; call_data_->LogServerHeader( /*is_client=*/true, MaybeGetContext(), @@ -376,6 +381,8 @@ void ClientLoggingFilter::Call::OnServerInitialMetadata(ServerMetadata& md) { } void ClientLoggingFilter::Call::OnServerTrailingMetadata(ServerMetadata& md) { + GRPC_LATENT_SEE_INNER_SCOPE( + "ClientLoggingFilter::Call::OnServerTrailingMetadata"); if (!call_data_.has_value()) return; if (md.get(GrpcCallWasCancelled()).value_or(false) && md.get(GrpcStatusMetadata()) == GRPC_STATUS_CANCELLED) { @@ -390,6 +397,8 @@ void ClientLoggingFilter::Call::OnServerTrailingMetadata(ServerMetadata& md) { void ClientLoggingFilter::Call::OnClientToServerMessage( const Message& message) { + GRPC_LATENT_SEE_INNER_SCOPE( + "ClientLoggingFilter::Call::OnClientToServerMessage"); if (!call_data_.has_value()) return; call_data_->LogClientMessage( /*is_client=*/true, MaybeGetContext(), @@ -397,6 +406,8 @@ void ClientLoggingFilter::Call::OnClientToServerMessage( } void ClientLoggingFilter::Call::OnClientToServerHalfClose() { + GRPC_LATENT_SEE_INNER_SCOPE( + "ClientLoggingFilter::Call::OnClientToServerHalfClose"); if (!call_data_.has_value()) return; call_data_->LogClientHalfClose( /*is_client=*/true, MaybeGetContext()); @@ -404,6 +415,8 @@ void ClientLoggingFilter::Call::OnClientToServerHalfClose() { void ClientLoggingFilter::Call::OnServerToClientMessage( const Message& message) { + GRPC_LATENT_SEE_INNER_SCOPE( + "ClientLoggingFilter::Call::OnServerToClientMessage"); if (!call_data_.has_value()) return; call_data_->LogServerMessage( /*is_client=*/true, MaybeGetContext(), @@ -424,6 +437,8 @@ ServerLoggingFilter::Create(const ChannelArgs& /*args*/, // Construct a promise for one call. void ServerLoggingFilter::Call::OnClientInitialMetadata(ClientMetadata& md) { + GRPC_LATENT_SEE_INNER_SCOPE( + "ServerLoggingFilter::Call::OnClientInitialMetadata"); call_data_.emplace(false, md, ""); if (!call_data_->ShouldLog()) { call_data_.reset(); @@ -435,6 +450,8 @@ void ServerLoggingFilter::Call::OnClientInitialMetadata(ClientMetadata& md) { } void ServerLoggingFilter::Call::OnServerInitialMetadata(ServerMetadata& md) { + GRPC_LATENT_SEE_INNER_SCOPE( + "ServerLoggingFilter::Call::OnServerInitialMetadata"); if (!call_data_.has_value()) return; call_data_->LogServerHeader( /*is_client=*/false, MaybeGetContext(), @@ -442,6 +459,8 @@ void ServerLoggingFilter::Call::OnServerInitialMetadata(ServerMetadata& md) { } void ServerLoggingFilter::Call::OnServerTrailingMetadata(ServerMetadata& md) { + GRPC_LATENT_SEE_INNER_SCOPE( + "ServerLoggingFilter::Call::OnServerTrailingMetadata"); if (!call_data_.has_value()) return; if (md.get(GrpcCallWasCancelled()).value_or(false) && md.get(GrpcStatusMetadata()) == GRPC_STATUS_CANCELLED) { @@ -456,6 +475,8 @@ void ServerLoggingFilter::Call::OnServerTrailingMetadata(ServerMetadata& md) { void ServerLoggingFilter::Call::OnClientToServerMessage( const Message& message) { + GRPC_LATENT_SEE_INNER_SCOPE( + "ServerLoggingFilter::Call::OnClientToServerMessage"); if (!call_data_.has_value()) return; call_data_->LogClientMessage( /*is_client=*/false, MaybeGetContext(), @@ -463,6 +484,8 @@ void ServerLoggingFilter::Call::OnClientToServerMessage( } void ServerLoggingFilter::Call::OnClientToServerHalfClose() { + GRPC_LATENT_SEE_INNER_SCOPE( + "ServerLoggingFilter::Call::OnClientToServerHalfClose"); if (!call_data_.has_value()) return; call_data_->LogClientHalfClose( /*is_client=*/false, MaybeGetContext()); @@ -470,6 +493,8 @@ void ServerLoggingFilter::Call::OnClientToServerHalfClose() { void ServerLoggingFilter::Call::OnServerToClientMessage( const Message& message) { + GRPC_LATENT_SEE_INNER_SCOPE( + "ServerLoggingFilter::Call::OnServerToClientMessage"); if (!call_data_.has_value()) return; call_data_->LogServerMessage( /*is_client=*/false, MaybeGetContext(), diff --git a/src/core/ext/filters/message_size/message_size_filter.cc b/src/core/ext/filters/message_size/message_size_filter.cc index db0b4d514e7..01cc9a3a9d7 100644 --- a/src/core/ext/filters/message_size/message_size_filter.cc +++ b/src/core/ext/filters/message_size/message_size_filter.cc @@ -44,6 +44,7 @@ #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" #include "src/core/service_config/service_config_call_data.h" +#include "src/core/util/latent_see.h" namespace grpc_core { @@ -201,24 +202,32 @@ ClientMessageSizeFilter::Call::Call(ClientMessageSizeFilter* filter) ServerMetadataHandle ServerMessageSizeFilter::Call::OnClientToServerMessage( const Message& message, ServerMessageSizeFilter* filter) { + GRPC_LATENT_SEE_INNER_SCOPE( + "ServerMessageSizeFilter::Call::OnClientToServerMessage"); return CheckPayload(message, filter->parsed_config_.max_recv_size(), /*is_client=*/false, false); } ServerMetadataHandle ServerMessageSizeFilter::Call::OnServerToClientMessage( const Message& message, ServerMessageSizeFilter* filter) { + GRPC_LATENT_SEE_INNER_SCOPE( + "ServerMessageSizeFilter::Call::OnServerToClientMessage"); return CheckPayload(message, filter->parsed_config_.max_send_size(), /*is_client=*/false, true); } ServerMetadataHandle ClientMessageSizeFilter::Call::OnClientToServerMessage( const Message& message) { + GRPC_LATENT_SEE_INNER_SCOPE( + "ClientMessageSizeFilter::Call::OnClientToServerMessage"); return CheckPayload(message, limits_.max_send_size(), /*is_client=*/true, true); } ServerMetadataHandle ClientMessageSizeFilter::Call::OnServerToClientMessage( const Message& message) { + GRPC_LATENT_SEE_INNER_SCOPE( + "ClientMessageSizeFilter::Call::OnServerToClientMessage"); return CheckPayload(message, limits_.max_recv_size(), /*is_client=*/true, false); } diff --git a/src/core/ext/filters/rbac/rbac_filter.cc b/src/core/ext/filters/rbac/rbac_filter.cc index 583042786f0..c7a8d139b17 100644 --- a/src/core/ext/filters/rbac/rbac_filter.cc +++ b/src/core/ext/filters/rbac/rbac_filter.cc @@ -39,6 +39,7 @@ #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" #include "src/core/service_config/service_config_call_data.h" +#include "src/core/util/latent_see.h" namespace grpc_core { @@ -51,6 +52,7 @@ const NoInterceptor RbacFilter::Call::OnFinalize; absl::Status RbacFilter::Call::OnClientInitialMetadata(ClientMetadata& md, RbacFilter* filter) { + GRPC_LATENT_SEE_INNER_SCOPE("RbacFilter::Call::OnClientInitialMetadata"); // Fetch and apply the rbac policy from the service config. auto* service_config_call_data = GetContext(); auto* method_params = static_cast( diff --git a/src/core/ext/filters/stateful_session/stateful_session_filter.cc b/src/core/ext/filters/stateful_session/stateful_session_filter.cc index 953a32a511b..3852c7155bb 100644 --- a/src/core/ext/filters/stateful_session/stateful_session_filter.cc +++ b/src/core/ext/filters/stateful_session/stateful_session_filter.cc @@ -51,6 +51,7 @@ #include "src/core/resolver/xds/xds_resolver_attributes.h" #include "src/core/service_config/service_config_call_data.h" #include "src/core/util/crash.h" +#include "src/core/util/latent_see.h" #include "src/core/util/time.h" namespace grpc_core { @@ -219,6 +220,8 @@ bool IsConfiguredPath(absl::string_view configured_path, void StatefulSessionFilter::Call::OnClientInitialMetadata( ClientMetadata& md, StatefulSessionFilter* filter) { + GRPC_LATENT_SEE_INNER_SCOPE( + "StatefulSessionFilter::Call::OnClientInitialMetadata"); // Get config. auto* service_config_call_data = GetContext(); CHECK_NE(service_config_call_data, nullptr); @@ -258,6 +261,8 @@ void StatefulSessionFilter::Call::OnClientInitialMetadata( } void StatefulSessionFilter::Call::OnServerInitialMetadata(ServerMetadata& md) { + GRPC_LATENT_SEE_INNER_SCOPE( + "StatefulSessionFilter::Call::OnServerInitialMetadata"); if (!perform_filtering_) return; // Add cookie to server initial metadata if needed. MaybeUpdateServerInitialMetadata(cookie_config_, cluster_changed_, @@ -266,6 +271,8 @@ void StatefulSessionFilter::Call::OnServerInitialMetadata(ServerMetadata& md) { } void StatefulSessionFilter::Call::OnServerTrailingMetadata(ServerMetadata& md) { + GRPC_LATENT_SEE_INNER_SCOPE( + "StatefulSessionFilter::Call::OnServerTrailingMetadata"); if (!perform_filtering_) return; // If we got a Trailers-Only response, then add the // cookie to the trailing metadata instead of the diff --git a/src/core/lib/channel/promise_based_filter.cc b/src/core/lib/channel/promise_based_filter.cc index bf5dadfc804..d7409e63d1d 100644 --- a/src/core/lib/channel/promise_based_filter.cc +++ b/src/core/lib/channel/promise_based_filter.cc @@ -38,6 +38,7 @@ #include "src/core/lib/promise/seq.h" #include "src/core/lib/slice/slice.h" #include "src/core/util/crash.h" +#include "src/core/util/latent_see.h" #include "src/core/util/manual_constructor.h" #include "src/core/util/status_helper.h" @@ -242,10 +243,8 @@ void BaseCallData::CapturedBatch::CancelWith(grpc_error_handle error, /////////////////////////////////////////////////////////////////////////////// // BaseCallData::Flusher -BaseCallData::Flusher::Flusher(BaseCallData* call) - : latent_see::InnerScope( - GRPC_LATENT_SEE_METADATA("PromiseBasedFilter Flusher")), - call_(call) { +BaseCallData::Flusher::Flusher(BaseCallData* call, const char* desc) + : latent_see::InnerScope(GRPC_LATENT_SEE_METADATA_RAW(desc)), call_(call) { GRPC_CALL_STACK_REF(call_->call_stack(), "flusher"); } @@ -397,7 +396,7 @@ bool BaseCallData::SendMessage::IsIdle() const { } void BaseCallData::SendMessage::OnComplete(absl::Status status) { - Flusher flusher(base_); + Flusher flusher(base_, "SendMessage::OnComplete"); GRPC_TRACE_LOG(channel, INFO) << base_->LogTag() << " SendMessage.OnComplete st=" << StateString(state_) << " status=" << status; @@ -707,7 +706,7 @@ void BaseCallData::ReceiveMessage::OnComplete(absl::Status status) { break; } completed_status_ = status; - Flusher flusher(base_); + Flusher flusher(base_, "ReceiveMessage::OnComplete"); ScopedContext ctx(base_); base_->WakeInsideCombiner(&flusher); } @@ -1221,7 +1220,8 @@ class ClientCallData::PollContext { auto* next_poll = static_cast(p); { ScopedContext ctx(next_poll->call_data); - Flusher flusher(next_poll->call_data); + Flusher flusher(next_poll->call_data, + "ClientCallData::PollContext::~PollContext"); next_poll->call_data->WakeInsideCombiner(&flusher); } GRPC_CALL_STACK_UNREF(next_poll->call_stack, "re-poll"); @@ -1350,7 +1350,7 @@ void ClientCallData::StartBatch(grpc_transport_stream_op_batch* b) { // Fake out the activity based context. ScopedContext context(this); CapturedBatch batch(b); - Flusher flusher(this); + Flusher flusher(this, "ClientCallData::StartBatch"); GRPC_TRACE_LOG(channel, INFO) << LogTag() << " StartBatch " << DebugString(); @@ -1556,7 +1556,7 @@ void ClientCallData::RecvInitialMetadataReady(grpc_error_handle error) { << DebugString() << " error:" << error.ToString() << " md:" << recv_initial_metadata_->metadata->DebugString(); ScopedContext context(this); - Flusher flusher(this); + Flusher flusher(this, "ClientCallData::RecvInitialMetadataReady"); if (!error.ok()) { switch (recv_initial_metadata_->state) { case RecvInitialMetadata::kHookedWaitingForPipe: @@ -1742,7 +1742,7 @@ void ClientCallData::RecvTrailingMetadataReadyCallback( } void ClientCallData::RecvTrailingMetadataReady(grpc_error_handle error) { - Flusher flusher(this); + Flusher flusher(this, "ClientCallData::RecvTrailingMetadataReady"); GRPC_TRACE_LOG(channel, INFO) << LogTag() << " ClientCallData.RecvTrailingMetadataReady " << "recv_trailing_state=" << StateString(recv_trailing_state_) @@ -1793,11 +1793,12 @@ void ClientCallData::SetStatusFromError(grpc_metadata_batch* metadata, // Wakeup and poll the promise if appropriate. void ClientCallData::WakeInsideCombiner(Flusher* flusher) { + GRPC_LATENT_SEE_INNER_SCOPE("ClientCallData::WakeInsideCombiner"); PollContext(this, flusher).Run(); } void ClientCallData::OnWakeup() { - Flusher flusher(this); + Flusher flusher(this, "ClientCallData::OnWakeup"); ScopedContext context(this); WakeInsideCombiner(&flusher); } @@ -1873,7 +1874,8 @@ class ServerCallData::PollContext { auto run = [](void* p, grpc_error_handle) { auto* next_poll = static_cast(p); { - Flusher flusher(next_poll->call_data); + Flusher flusher(next_poll->call_data, + "ServerCallData::PollContext::~PollContext"); ScopedContext context(next_poll->call_data); next_poll->call_data->WakeInsideCombiner(&flusher); } @@ -1977,7 +1979,7 @@ void ServerCallData::StartBatch(grpc_transport_stream_op_batch* b) { // Fake out the activity based context. ScopedContext context(this); CapturedBatch batch(b); - Flusher flusher(this); + Flusher flusher(this, "ServerCallData::StartBatch"); bool wake = false; GRPC_TRACE_LOG(channel, INFO) << LogTag() << " StartBatch: " << DebugString(); @@ -2266,7 +2268,7 @@ void ServerCallData::RecvTrailingMetadataReady(grpc_error_handle error) { GRPC_TRACE_LOG(channel, INFO) << LogTag() << ": RecvTrailingMetadataReady error=" << error << " md=" << recv_trailing_metadata_->DebugString(); - Flusher flusher(this); + Flusher flusher(this, "ServerCallData::RecvTrailingMetadataReady"); PollContext poll_ctx(this, &flusher); Completed(error, recv_trailing_metadata_->get(GrpcTarPit()).has_value(), &flusher); @@ -2280,7 +2282,7 @@ void ServerCallData::RecvInitialMetadataReadyCallback(void* arg, } void ServerCallData::RecvInitialMetadataReady(grpc_error_handle error) { - Flusher flusher(this); + Flusher flusher(this, "ServerCallData::RecvInitialMetadataReady"); GRPC_TRACE_LOG(channel, INFO) << LogTag() << ": RecvInitialMetadataReady " << error; CHECK(recv_initial_state_ == RecvInitialState::kForwarded); @@ -2343,6 +2345,7 @@ std::string ServerCallData::DebugString() const { // Wakeup and poll the promise if appropriate. void ServerCallData::WakeInsideCombiner(Flusher* flusher) { + GRPC_LATENT_SEE_INNER_SCOPE("ServerCallData::WakeInsideCombiner"); PollContext poll_ctx(this, flusher); GRPC_TRACE_LOG(channel, INFO) << LogTag() << ": WakeInsideCombiner " << DebugString(); @@ -2494,7 +2497,7 @@ void ServerCallData::WakeInsideCombiner(Flusher* flusher) { } void ServerCallData::OnWakeup() { - Flusher flusher(this); + Flusher flusher(this, "ServerCallData::OnWakeup"); ScopedContext context(this); WakeInsideCombiner(&flusher); } diff --git a/src/core/lib/channel/promise_based_filter.h b/src/core/lib/channel/promise_based_filter.h index 6b2ba31ce6b..979c9e7db95 100644 --- a/src/core/lib/channel/promise_based_filter.h +++ b/src/core/lib/channel/promise_based_filter.h @@ -976,7 +976,8 @@ class BaseCallData : public Activity, private Wakeable { class Flusher : public latent_see::InnerScope { public: - explicit Flusher(BaseCallData* call); + explicit Flusher(BaseCallData* call, + const char* desc = "PromiseBasedFilter::Flusher"); // Calls closures, schedules batches, relinquishes call combiner. ~Flusher(); diff --git a/src/core/lib/security/authorization/grpc_server_authz_filter.cc b/src/core/lib/security/authorization/grpc_server_authz_filter.cc index 672b02a9d91..540b2af1f67 100644 --- a/src/core/lib/security/authorization/grpc_server_authz_filter.cc +++ b/src/core/lib/security/authorization/grpc_server_authz_filter.cc @@ -33,6 +33,7 @@ #include "src/core/lib/security/authorization/evaluate_args.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/latent_see.h" namespace grpc_core { @@ -99,6 +100,8 @@ bool GrpcServerAuthzFilter::IsAuthorized(ClientMetadata& initial_metadata) { absl::Status GrpcServerAuthzFilter::Call::OnClientInitialMetadata( ClientMetadata& md, GrpcServerAuthzFilter* filter) { + GRPC_LATENT_SEE_INNER_SCOPE( + "GrpcServerAuthzFilter::Call::OnClientInitialMetadata"); if (!filter->IsAuthorized(md)) { return absl::PermissionDeniedError("Unauthorized RPC request rejected."); } diff --git a/src/core/load_balancing/grpclb/client_load_reporting_filter.cc b/src/core/load_balancing/grpclb/client_load_reporting_filter.cc index 40de9f0c2bc..4aff5f14580 100644 --- a/src/core/load_balancing/grpclb/client_load_reporting_filter.cc +++ b/src/core/load_balancing/grpclb/client_load_reporting_filter.cc @@ -35,6 +35,7 @@ #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" #include "src/core/load_balancing/grpclb/grpclb_client_stats.h" +#include "src/core/util/latent_see.h" #include "src/core/util/ref_counted_ptr.h" namespace grpc_core { @@ -55,6 +56,8 @@ ClientLoadReportingFilter::Create(const ChannelArgs&, ChannelFilter::Args) { void ClientLoadReportingFilter::Call::OnClientInitialMetadata( ClientMetadata& client_initial_metadata) { + GRPC_LATENT_SEE_INNER_SCOPE( + "ClientLoadReportingFilter::Call::OnClientInitialMetadata"); // Handle client initial metadata. // Grab client stats object from metadata. auto client_stats_md = @@ -65,11 +68,15 @@ void ClientLoadReportingFilter::Call::OnClientInitialMetadata( } void ClientLoadReportingFilter::Call::OnServerInitialMetadata(ServerMetadata&) { + GRPC_LATENT_SEE_INNER_SCOPE( + "ClientLoadReportingFilter::Call::OnServerInitialMetadata"); saw_initial_metadata_ = true; } void ClientLoadReportingFilter::Call::OnServerTrailingMetadata( ServerMetadata& server_trailing_metadata) { + GRPC_LATENT_SEE_INNER_SCOPE( + "ClientLoadReportingFilter::Call::OnServerTrailingMetadata"); if (client_stats_ != nullptr) { client_stats_->AddCallFinished( server_trailing_metadata.get(GrpcStreamNetworkState()) == diff --git a/src/core/server/server_call_tracer_filter.cc b/src/core/server/server_call_tracer_filter.cc index 78f8589cea0..b4fbdafde9c 100644 --- a/src/core/server/server_call_tracer_filter.cc +++ b/src/core/server/server_call_tracer_filter.cc @@ -39,6 +39,7 @@ #include "src/core/lib/surface/channel_stack_type.h" #include "src/core/lib/transport/transport.h" #include "src/core/telemetry/call_tracer.h" +#include "src/core/util/latent_see.h" namespace grpc_core { @@ -57,24 +58,31 @@ class ServerCallTracerFilter class Call { public: void OnClientInitialMetadata(ClientMetadata& client_initial_metadata) { + GRPC_LATENT_SEE_INNER_SCOPE( + "ServerCallTracerFilter::Call::OnClientInitialMetadata"); auto* call_tracer = MaybeGetContext(); if (call_tracer == nullptr) return; call_tracer->RecordReceivedInitialMetadata(&client_initial_metadata); } void OnServerInitialMetadata(ServerMetadata& server_initial_metadata) { + GRPC_LATENT_SEE_INNER_SCOPE( + "ServerCallTracerFilter::Call::OnServerInitialMetadata"); auto* call_tracer = MaybeGetContext(); if (call_tracer == nullptr) return; call_tracer->RecordSendInitialMetadata(&server_initial_metadata); } void OnFinalize(const grpc_call_final_info* final_info) { + GRPC_LATENT_SEE_INNER_SCOPE("ServerCallTracerFilter::Call::OnFinalize"); auto* call_tracer = MaybeGetContext(); if (call_tracer == nullptr) return; call_tracer->RecordEnd(final_info); } void OnServerTrailingMetadata(ServerMetadata& server_trailing_metadata) { + GRPC_LATENT_SEE_INNER_SCOPE( + "ServerCallTracerFilter::Call::OnServerTrailingMetadata"); auto* call_tracer = MaybeGetContext(); if (call_tracer == nullptr) return; call_tracer->RecordSendTrailingMetadata(&server_trailing_metadata); diff --git a/src/core/server/server_config_selector_filter.cc b/src/core/server/server_config_selector_filter.cc index b17ea44930a..2f221e61426 100644 --- a/src/core/server/server_config_selector_filter.cc +++ b/src/core/server/server_config_selector_filter.cc @@ -38,6 +38,7 @@ #include "src/core/server/server_config_selector.h" #include "src/core/service_config/service_config.h" #include "src/core/service_config/service_config_call_data.h" +#include "src/core/util/latent_see.h" #include "src/core/util/ref_counted_ptr.h" #include "src/core/util/status_helper.h" #include "src/core/util/sync.h" @@ -144,6 +145,8 @@ void ServerConfigSelectorFilter::Orphan() { absl::Status ServerConfigSelectorFilter::Call::OnClientInitialMetadata( ClientMetadata& md, ServerConfigSelectorFilter* filter) { + GRPC_LATENT_SEE_INNER_SCOPE( + "ServerConfigSelectorFilter::Call::OnClientInitialMetadata"); auto sel = filter->config_selector(); if (!sel.ok()) return sel.status(); auto call_config = sel.value()->GetCallConfig(&md); diff --git a/src/core/service_config/service_config_channel_arg_filter.cc b/src/core/service_config/service_config_channel_arg_filter.cc index 54b1ae0d411..c17fa1a04d6 100644 --- a/src/core/service_config/service_config_channel_arg_filter.cc +++ b/src/core/service_config/service_config_channel_arg_filter.cc @@ -46,6 +46,7 @@ #include "src/core/service_config/service_config_call_data.h" #include "src/core/service_config/service_config_impl.h" #include "src/core/service_config/service_config_parser.h" +#include "src/core/util/latent_see.h" #include "src/core/util/ref_counted_ptr.h" namespace grpc_core { @@ -107,6 +108,8 @@ const NoInterceptor ServiceConfigChannelArgFilter::Call::OnFinalize; void ServiceConfigChannelArgFilter::Call::OnClientInitialMetadata( ClientMetadata& md, ServiceConfigChannelArgFilter* filter) { + GRPC_LATENT_SEE_INNER_SCOPE( + "ServiceConfigChannelArgFilter::Call::OnClientInitialMetadata"); const ServiceConfigParser::ParsedConfigVector* method_configs = nullptr; if (filter->service_config_ != nullptr) { method_configs = filter->service_config_->GetMethodParsedConfigVector( diff --git a/src/core/util/latent_see.cc b/src/core/util/latent_see.cc index 508e853055a..c8331144407 100644 --- a/src/core/util/latent_see.cc +++ b/src/core/util/latent_see.cc @@ -91,12 +91,22 @@ std::string Log::GenerateJson() { } if (!first) absl::StrAppend(&json, ",\n"); first = false; - absl::StrAppend(&json, "{\"name\": ", event.event.metadata->name, - ", \"ph\": \"", phase, "\", \"ts\": ", - std::chrono::duration( - event.event.timestamp - *start_time) - .count(), - ", \"pid\": 0, \"tid\": ", event.thread_id); + if (event.event.metadata->name[0] != '"') { + absl::StrAppend(&json, "{\"name\": \"", event.event.metadata->name, + "\", \"ph\": \"", phase, "\", \"ts\": ", + std::chrono::duration( + event.event.timestamp - *start_time) + .count(), + ", \"pid\": 0, \"tid\": ", event.thread_id); + } else { + absl::StrAppend(&json, "{\"name\": ", event.event.metadata->name, + ", \"ph\": \"", phase, "\", \"ts\": ", + std::chrono::duration( + event.event.timestamp - *start_time) + .count(), + ", \"pid\": 0, \"tid\": ", event.thread_id); + } + if (has_id) { absl::StrAppend(&json, ", \"id\": ", event.event.id); } diff --git a/src/core/util/latent_see.h b/src/core/util/latent_see.h index 34a247abd0a..19ca150b722 100644 --- a/src/core/util/latent_see.h +++ b/src/core/util/latent_see.h @@ -260,6 +260,12 @@ GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION inline void Mark(const Metadata* md) { #name}; \ return &metadata; \ }() +#define GRPC_LATENT_SEE_METADATA_RAW(name) \ + [ptr = name]() { \ + static grpc_core::latent_see::Metadata metadata = {__FILE__, __LINE__, \ + ptr}; \ + return &metadata; \ + }() // Parent scope: logs a begin and end event, and flushes the thread log on scope // exit. Because the flush takes some time it's better to place one parent scope // at the top of the stack, and use lighter weight scopes within it. @@ -295,6 +301,7 @@ struct InnerScope { } // namespace latent_see } // namespace grpc_core #define GRPC_LATENT_SEE_METADATA(name) nullptr +#define GRPC_LATENT_SEE_METADATA_RAW(name) nullptr #define GRPC_LATENT_SEE_PARENT_SCOPE(name) \ do { \ } while (0) From 3ea3e36e95400885a323c9d7447665559c090631 Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Fri, 27 Sep 2024 15:03:10 -0700 Subject: [PATCH 43/75] [tools] Add a `--fix` argument to check_submodules.sh (#37811) IDK how many times I've messed this up over the years accidentally and had to spend thoughts trying to fix it... when really we could do that trivially with code. Closes #37811 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37811 from ctiller:bamboozled 0cfbeae925be12fa0e5533c789e992d5d8a9aaff PiperOrigin-RevId: 679741188 --- tools/run_tests/sanity/check_submodules.sh | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/tools/run_tests/sanity/check_submodules.sh b/tools/run_tests/sanity/check_submodules.sh index ab9c7c1cd6a..9796fb593cc 100755 --- a/tools/run_tests/sanity/check_submodules.sh +++ b/tools/run_tests/sanity/check_submodules.sh @@ -43,6 +43,16 @@ third_party/xds 3a472e524827f72d1ad621c4983dd5af54c46776 third_party/zlib 09155eaa2f9270dc4ed1fa13e2b4b2613e6e4851 EOF -diff -u "$submodules" "$want_submodules" +if ! diff -u "$submodules" "$want_submodules"; then + if [ "$1" = "--fix" ]; then + while read -r path commit; do + git submodule update --init "$path" + (cd "$path" && git checkout "$commit") + done <"$want_submodules" + exit 0 + fi + echo "Submodules are out of sync. Please update this script or run with --fix." + exit 1 +fi rm "$submodules" "$want_submodules" From 6b88612d0398365c6696ab371925e2541478c933 Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Sat, 28 Sep 2024 22:24:16 -0700 Subject: [PATCH 44/75] [latent-see] Compilation fix for use_strict_warning=true (#37815) Since we don't actually use the `desc` parameter when building without latent_see we had an unused parameter error. More though, I think the `GRPC_LATENT_SEE_METADATA_RAW` macro was flawed, as the inner `metadata` argument would only be created once, and so all uses would get tagged by whatever passed through `Flusher` first. Correct this by passing in the `latent_see::Metadata*` directly to the function. Closes #37815 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37815 from ctiller:woah-bubba 606a6350fec07672921780903ac2b054ea583a7d PiperOrigin-RevId: 680136826 --- src/core/lib/channel/promise_based_filter.cc | 35 ++++++++++++-------- src/core/lib/channel/promise_based_filter.h | 3 +- src/core/util/latent_see.h | 6 ---- 3 files changed, 23 insertions(+), 21 deletions(-) diff --git a/src/core/lib/channel/promise_based_filter.cc b/src/core/lib/channel/promise_based_filter.cc index d7409e63d1d..a0fc813ad5c 100644 --- a/src/core/lib/channel/promise_based_filter.cc +++ b/src/core/lib/channel/promise_based_filter.cc @@ -243,8 +243,8 @@ void BaseCallData::CapturedBatch::CancelWith(grpc_error_handle error, /////////////////////////////////////////////////////////////////////////////// // BaseCallData::Flusher -BaseCallData::Flusher::Flusher(BaseCallData* call, const char* desc) - : latent_see::InnerScope(GRPC_LATENT_SEE_METADATA_RAW(desc)), call_(call) { +BaseCallData::Flusher::Flusher(BaseCallData* call, latent_see::Metadata* desc) + : latent_see::InnerScope(desc), call_(call) { GRPC_CALL_STACK_REF(call_->call_stack(), "flusher"); } @@ -396,7 +396,7 @@ bool BaseCallData::SendMessage::IsIdle() const { } void BaseCallData::SendMessage::OnComplete(absl::Status status) { - Flusher flusher(base_, "SendMessage::OnComplete"); + Flusher flusher(base_, GRPC_LATENT_SEE_METADATA("SendMessage::OnComplete")); GRPC_TRACE_LOG(channel, INFO) << base_->LogTag() << " SendMessage.OnComplete st=" << StateString(state_) << " status=" << status; @@ -706,7 +706,8 @@ void BaseCallData::ReceiveMessage::OnComplete(absl::Status status) { break; } completed_status_ = status; - Flusher flusher(base_, "ReceiveMessage::OnComplete"); + Flusher flusher(base_, + GRPC_LATENT_SEE_METADATA("ReceiveMessage::OnComplete")); ScopedContext ctx(base_); base_->WakeInsideCombiner(&flusher); } @@ -1221,7 +1222,8 @@ class ClientCallData::PollContext { { ScopedContext ctx(next_poll->call_data); Flusher flusher(next_poll->call_data, - "ClientCallData::PollContext::~PollContext"); + GRPC_LATENT_SEE_METADATA( + "ClientCallData::PollContext::~PollContext")); next_poll->call_data->WakeInsideCombiner(&flusher); } GRPC_CALL_STACK_UNREF(next_poll->call_stack, "re-poll"); @@ -1350,7 +1352,7 @@ void ClientCallData::StartBatch(grpc_transport_stream_op_batch* b) { // Fake out the activity based context. ScopedContext context(this); CapturedBatch batch(b); - Flusher flusher(this, "ClientCallData::StartBatch"); + Flusher flusher(this, GRPC_LATENT_SEE_METADATA("ClientCallData::StartBatch")); GRPC_TRACE_LOG(channel, INFO) << LogTag() << " StartBatch " << DebugString(); @@ -1556,7 +1558,8 @@ void ClientCallData::RecvInitialMetadataReady(grpc_error_handle error) { << DebugString() << " error:" << error.ToString() << " md:" << recv_initial_metadata_->metadata->DebugString(); ScopedContext context(this); - Flusher flusher(this, "ClientCallData::RecvInitialMetadataReady"); + Flusher flusher(this, GRPC_LATENT_SEE_METADATA( + "ClientCallData::RecvInitialMetadataReady")); if (!error.ok()) { switch (recv_initial_metadata_->state) { case RecvInitialMetadata::kHookedWaitingForPipe: @@ -1742,7 +1745,8 @@ void ClientCallData::RecvTrailingMetadataReadyCallback( } void ClientCallData::RecvTrailingMetadataReady(grpc_error_handle error) { - Flusher flusher(this, "ClientCallData::RecvTrailingMetadataReady"); + Flusher flusher(this, GRPC_LATENT_SEE_METADATA( + "ClientCallData::RecvTrailingMetadataReady")); GRPC_TRACE_LOG(channel, INFO) << LogTag() << " ClientCallData.RecvTrailingMetadataReady " << "recv_trailing_state=" << StateString(recv_trailing_state_) @@ -1798,7 +1802,7 @@ void ClientCallData::WakeInsideCombiner(Flusher* flusher) { } void ClientCallData::OnWakeup() { - Flusher flusher(this, "ClientCallData::OnWakeup"); + Flusher flusher(this, GRPC_LATENT_SEE_METADATA("ClientCallData::OnWakeup")); ScopedContext context(this); WakeInsideCombiner(&flusher); } @@ -1875,7 +1879,8 @@ class ServerCallData::PollContext { auto* next_poll = static_cast(p); { Flusher flusher(next_poll->call_data, - "ServerCallData::PollContext::~PollContext"); + GRPC_LATENT_SEE_METADATA( + "ServerCallData::PollContext::~PollContext")); ScopedContext context(next_poll->call_data); next_poll->call_data->WakeInsideCombiner(&flusher); } @@ -1979,7 +1984,7 @@ void ServerCallData::StartBatch(grpc_transport_stream_op_batch* b) { // Fake out the activity based context. ScopedContext context(this); CapturedBatch batch(b); - Flusher flusher(this, "ServerCallData::StartBatch"); + Flusher flusher(this, GRPC_LATENT_SEE_METADATA("ServerCallData::StartBatch")); bool wake = false; GRPC_TRACE_LOG(channel, INFO) << LogTag() << " StartBatch: " << DebugString(); @@ -2268,7 +2273,8 @@ void ServerCallData::RecvTrailingMetadataReady(grpc_error_handle error) { GRPC_TRACE_LOG(channel, INFO) << LogTag() << ": RecvTrailingMetadataReady error=" << error << " md=" << recv_trailing_metadata_->DebugString(); - Flusher flusher(this, "ServerCallData::RecvTrailingMetadataReady"); + Flusher flusher(this, GRPC_LATENT_SEE_METADATA( + "ServerCallData::RecvTrailingMetadataReady")); PollContext poll_ctx(this, &flusher); Completed(error, recv_trailing_metadata_->get(GrpcTarPit()).has_value(), &flusher); @@ -2282,7 +2288,8 @@ void ServerCallData::RecvInitialMetadataReadyCallback(void* arg, } void ServerCallData::RecvInitialMetadataReady(grpc_error_handle error) { - Flusher flusher(this, "ServerCallData::RecvInitialMetadataReady"); + Flusher flusher(this, GRPC_LATENT_SEE_METADATA( + "ServerCallData::RecvInitialMetadataReady")); GRPC_TRACE_LOG(channel, INFO) << LogTag() << ": RecvInitialMetadataReady " << error; CHECK(recv_initial_state_ == RecvInitialState::kForwarded); @@ -2497,7 +2504,7 @@ void ServerCallData::WakeInsideCombiner(Flusher* flusher) { } void ServerCallData::OnWakeup() { - Flusher flusher(this, "ServerCallData::OnWakeup"); + Flusher flusher(this, GRPC_LATENT_SEE_METADATA("ServerCallData::OnWakeup")); ScopedContext context(this); WakeInsideCombiner(&flusher); } diff --git a/src/core/lib/channel/promise_based_filter.h b/src/core/lib/channel/promise_based_filter.h index 979c9e7db95..1a31b901052 100644 --- a/src/core/lib/channel/promise_based_filter.h +++ b/src/core/lib/channel/promise_based_filter.h @@ -977,7 +977,8 @@ class BaseCallData : public Activity, private Wakeable { class Flusher : public latent_see::InnerScope { public: explicit Flusher(BaseCallData* call, - const char* desc = "PromiseBasedFilter::Flusher"); + latent_see::Metadata* desc = GRPC_LATENT_SEE_METADATA( + "PromiseBasedFilter::Flusher")); // Calls closures, schedules batches, relinquishes call combiner. ~Flusher(); diff --git a/src/core/util/latent_see.h b/src/core/util/latent_see.h index 19ca150b722..cf22a40ed8e 100644 --- a/src/core/util/latent_see.h +++ b/src/core/util/latent_see.h @@ -260,12 +260,6 @@ GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION inline void Mark(const Metadata* md) { #name}; \ return &metadata; \ }() -#define GRPC_LATENT_SEE_METADATA_RAW(name) \ - [ptr = name]() { \ - static grpc_core::latent_see::Metadata metadata = {__FILE__, __LINE__, \ - ptr}; \ - return &metadata; \ - }() // Parent scope: logs a begin and end event, and flushes the thread log on scope // exit. Because the flush takes some time it's better to place one parent scope // at the top of the stack, and use lighter weight scopes within it. From 331d42140e1bb405d1f2c65244b9f516df71b623 Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Sun, 29 Sep 2024 22:21:19 -0700 Subject: [PATCH 45/75] [chaotic-good] Fix use after free (#37814) Closes #37814 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37814 from ctiller:flake-fightas-15 cab1017eb771442aa96452a1de061f48b2fa3349 PiperOrigin-RevId: 680418287 --- src/core/server/server.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/core/server/server.cc b/src/core/server/server.cc index 573cd66b224..f88eb5925da 100644 --- a/src/core/server/server.cc +++ b/src/core/server/server.cc @@ -869,8 +869,10 @@ auto Server::MatchAndPublishCall(CallHandler call_handler) { absl::StatusOr> Server::MakeCallDestination(const ChannelArgs& args) { InterceptionChainBuilder builder(args); - builder.AddOnClientInitialMetadata( - [this](ClientMetadata& md) { SetRegisteredMethodOnMetadata(md); }); + // TODO(ctiller): find a way to avoid adding a server ref per call + builder.AddOnClientInitialMetadata([self = Ref()](ClientMetadata& md) { + self->SetRegisteredMethodOnMetadata(md); + }); CoreConfiguration::Get().channel_init().AddToInterceptionChainBuilder( GRPC_SERVER_CHANNEL, builder); return builder.Build( From ff0c2e326f4ff0a5236be29d6be1094e1b3290e5 Mon Sep 17 00:00:00 2001 From: Tanvi Jagtap Date: Mon, 30 Sep 2024 04:29:43 -0700 Subject: [PATCH 46/75] [PH2][Refactor] Minor changes. 1. Rename write_state_name to get_state_name 2. Adding const where appropriate PiperOrigin-RevId: 680516861 --- .../chttp2/transport/chttp2_transport.cc | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/core/ext/transport/chttp2/transport/chttp2_transport.cc b/src/core/ext/transport/chttp2/transport/chttp2_transport.cc index fef7fb92d0b..97cfe956ba9 100644 --- a/src/core/ext/transport/chttp2/transport/chttp2_transport.cc +++ b/src/core/ext/transport/chttp2/transport/chttp2_transport.cc @@ -441,7 +441,7 @@ grpc_chttp2_transport::~grpc_chttp2_transport() { static void read_channel_args(grpc_chttp2_transport* t, const grpc_core::ChannelArgs& channel_args, - bool is_client) { + const bool is_client) { const int initial_sequence_number = channel_args.GetInt(GRPC_ARG_HTTP2_INITIAL_SEQUENCE_NUMBER).value_or(-1); if (initial_sequence_number > 0) { @@ -611,7 +611,7 @@ using grpc_event_engine::experimental::TcpTraceExtension; grpc_chttp2_transport::grpc_chttp2_transport( const grpc_core::ChannelArgs& channel_args, - grpc_core::OrphanablePtr endpoint, bool is_client) + grpc_core::OrphanablePtr endpoint, const bool is_client) : ep(std::move(endpoint)), peer_string( grpc_core::Slice::FromCopiedString(grpc_endpoint_get_peer(ep.get()))), @@ -935,7 +935,7 @@ grpc_chttp2_stream* grpc_chttp2_parsing_accept_stream(grpc_chttp2_transport* t, // OUTPUT PROCESSING // -static const char* write_state_name(grpc_chttp2_write_state st) { +static const char* get_write_state_name(grpc_chttp2_write_state st) { switch (st) { case GRPC_CHTTP2_WRITE_STATE_IDLE: return "IDLE"; @@ -952,8 +952,8 @@ static void set_write_state(grpc_chttp2_transport* t, 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 << "]"; + << get_write_state_name(t->write_state) << " -> " + << get_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. @@ -1315,7 +1315,7 @@ void grpc_chttp2_complete_closure_step(grpc_chttp2_transport* t, << " 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) + << " write_state=" << get_write_state_name(t->write_state) << " whence=" << whence.file() << ":" << whence.line(); if (!error.ok()) { @@ -1324,7 +1324,7 @@ void grpc_chttp2_complete_closure_step(grpc_chttp2_transport* t, if (cl_err.ok()) { cl_err = GRPC_ERROR_CREATE(absl::StrCat( "Error in HTTP transport completing operation: ", desc, - " write_state=", write_state_name(t->write_state), + " write_state=", get_write_state_name(t->write_state), " refs=", closure->next_data.scratch / CLOSURE_BARRIER_FIRST_REF_BIT, " flags=", closure->next_data.scratch % CLOSURE_BARRIER_FIRST_REF_BIT, " peer_address=", t->peer_string.as_string_view())); @@ -1353,7 +1353,7 @@ static bool contains_non_ok_status(grpc_metadata_batch* batch) { } static void log_metadata(const grpc_metadata_batch* md_batch, uint32_t id, - bool is_client, bool is_initial) { + const bool is_client, const bool is_initial) { VLOG(2) << "--metadata--"; const std::string prefix = absl::StrCat( "HTTP:", id, is_initial ? ":HDR" : ":TRL", is_client ? ":CLI:" : ":SVR:"); @@ -1936,7 +1936,7 @@ class GracefulGoaway : public grpc_core::RefCounted { } // namespace static void send_goaway(grpc_chttp2_transport* t, grpc_error_handle error, - bool immediate_disconnect_hint) { + const bool immediate_disconnect_hint) { grpc_http2_error_code http_error; std::string message; grpc_error_get_status(error, grpc_core::Timestamp::InfFuture(), nullptr, @@ -3262,7 +3262,7 @@ grpc_chttp2_transport_get_socket_node(grpc_core::Transport* transport) { grpc_core::Transport* grpc_create_chttp2_transport( const grpc_core::ChannelArgs& channel_args, - grpc_core::OrphanablePtr ep, bool is_client) { + grpc_core::OrphanablePtr ep, const bool is_client) { return new grpc_chttp2_transport(channel_args, std::move(ep), is_client); } From a49d450a54c9116d107e921505f1d22efdaa6365 Mon Sep 17 00:00:00 2001 From: Esun Kim Date: Mon, 30 Sep 2024 10:52:26 -0700 Subject: [PATCH 47/75] [Build] Bumped the minimum version of cmake (#37702) Per https://github.com/google/oss-policies-info/blob/main/foundational-cxx-support-matrix.md, the minimum version of cmake to support is 3.16 so let's change our cmake builds' requirements accordingly. Closes #37702 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37702 from veblush:cmake316 bb4ed1a1be5e9374980c922aac3dc1ccd27d1266 PiperOrigin-RevId: 680639191 --- CMakeLists.txt | 2 +- examples/android/helloworld/app/CMakeLists.txt | 2 +- examples/cpp/auth/CMakeLists.txt | 2 +- examples/cpp/cancellation/CMakeLists.txt | 2 +- examples/cpp/cmake/common.cmake | 2 +- examples/cpp/compression/CMakeLists.txt | 2 +- examples/cpp/deadline/CMakeLists.txt | 2 +- examples/cpp/error_details/CMakeLists.txt | 2 +- examples/cpp/error_handling/CMakeLists.txt | 2 +- examples/cpp/flow_control/CMakeLists.txt | 2 +- examples/cpp/generic_api/CMakeLists.txt | 2 +- examples/cpp/health/CMakeLists.txt | 2 +- examples/cpp/helloworld/CMakeLists.txt | 2 +- examples/cpp/helloworld/cmake_externalproject/CMakeLists.txt | 2 +- examples/cpp/interceptors/CMakeLists.txt | 2 +- examples/cpp/keepalive/CMakeLists.txt | 2 +- examples/cpp/load_balancing/CMakeLists.txt | 2 +- examples/cpp/metadata/CMakeLists.txt | 2 +- examples/cpp/multiplex/CMakeLists.txt | 2 +- examples/cpp/otel/CMakeLists.txt | 2 +- examples/cpp/otel/codelab/CMakeLists.txt | 2 +- examples/cpp/otel/ostream/CMakeLists.txt | 2 +- examples/cpp/retry/CMakeLists.txt | 2 +- examples/cpp/route_guide/CMakeLists.txt | 2 +- examples/cpp/wait_for_ready/CMakeLists.txt | 2 +- src/android/test/interop/app/CMakeLists.txt | 2 +- src/cpp/README.md | 2 +- templates/CMakeLists.txt.template | 2 +- 28 files changed, 28 insertions(+), 28 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index da1e9c4ae87..85b51d334d2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,7 +22,7 @@ -cmake_minimum_required(VERSION 3.13) +cmake_minimum_required(VERSION 3.16) set(PACKAGE_NAME "grpc") set(PACKAGE_VERSION "1.68.0-dev") diff --git a/examples/android/helloworld/app/CMakeLists.txt b/examples/android/helloworld/app/CMakeLists.txt index 4524d3e0250..70c2d65668c 100644 --- a/examples/android/helloworld/app/CMakeLists.txt +++ b/examples/android/helloworld/app/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.8) +cmake_minimum_required(VERSION 3.16) set(helloworld_PROTOBUF_PROTOC_EXECUTABLE "/usr/local/bin/protoc" CACHE STRING "Protoc binary on host") set(helloworld_GRPC_CPP_PLUGIN_EXECUTABLE "/usr/local/bin/grpc_cpp_plugin" CACHE STRING "gRPC CPP plugin binary on host") diff --git a/examples/cpp/auth/CMakeLists.txt b/examples/cpp/auth/CMakeLists.txt index 1f28ba6bcc8..c1a97cd9f65 100644 --- a/examples/cpp/auth/CMakeLists.txt +++ b/examples/cpp/auth/CMakeLists.txt @@ -17,7 +17,7 @@ # See cmake_externalproject/CMakeLists.txt for all-in-one cmake build # that automatically builds all the dependencies before building keyvaluestore. -cmake_minimum_required(VERSION 3.8) +cmake_minimum_required(VERSION 3.16) project(Cancellation C CXX) diff --git a/examples/cpp/cancellation/CMakeLists.txt b/examples/cpp/cancellation/CMakeLists.txt index c82111b5239..e98472bba65 100644 --- a/examples/cpp/cancellation/CMakeLists.txt +++ b/examples/cpp/cancellation/CMakeLists.txt @@ -17,7 +17,7 @@ # See cmake_externalproject/CMakeLists.txt for all-in-one cmake build # that automatically builds all the dependencies before building keyvaluestore. -cmake_minimum_required(VERSION 3.8) +cmake_minimum_required(VERSION 3.16) project(Cancellation C CXX) diff --git a/examples/cpp/cmake/common.cmake b/examples/cpp/cmake/common.cmake index df9bc4db0f8..9637a2ad26c 100644 --- a/examples/cpp/cmake/common.cmake +++ b/examples/cpp/cmake/common.cmake @@ -17,7 +17,7 @@ # See cmake_externalproject/CMakeLists.txt for all-in-one cmake build # that automatically builds all the dependencies before building route_guide. -cmake_minimum_required(VERSION 3.8) +cmake_minimum_required(VERSION 3.16) if(MSVC) add_definitions(-D_WIN32_WINNT=0x600) diff --git a/examples/cpp/compression/CMakeLists.txt b/examples/cpp/compression/CMakeLists.txt index ca89acff47a..63cc4400ec4 100644 --- a/examples/cpp/compression/CMakeLists.txt +++ b/examples/cpp/compression/CMakeLists.txt @@ -17,7 +17,7 @@ # See cmake_externalproject/CMakeLists.txt for all-in-one cmake build # that automatically builds all the dependencies before building helloworld. -cmake_minimum_required(VERSION 3.8) +cmake_minimum_required(VERSION 3.16) project(Compression C CXX) diff --git a/examples/cpp/deadline/CMakeLists.txt b/examples/cpp/deadline/CMakeLists.txt index 1cf3462e31c..e0353f26df6 100644 --- a/examples/cpp/deadline/CMakeLists.txt +++ b/examples/cpp/deadline/CMakeLists.txt @@ -16,7 +16,7 @@ # See cmake_externalproject/CMakeLists.txt for all-in-one cmake build # that automatically builds all the dependencies before building this example. -cmake_minimum_required(VERSION 3.8) +cmake_minimum_required(VERSION 3.16) project(Deadline C CXX) diff --git a/examples/cpp/error_details/CMakeLists.txt b/examples/cpp/error_details/CMakeLists.txt index 3b32bc74900..36582ce67b8 100644 --- a/examples/cpp/error_details/CMakeLists.txt +++ b/examples/cpp/error_details/CMakeLists.txt @@ -17,7 +17,7 @@ # See cmake_externalproject/CMakeLists.txt for all-in-one cmake build # that automatically builds all the dependencies before building helloworld. -cmake_minimum_required(VERSION 3.8) +cmake_minimum_required(VERSION 3.16) project(ErrorDetails C CXX) diff --git a/examples/cpp/error_handling/CMakeLists.txt b/examples/cpp/error_handling/CMakeLists.txt index 1ae09cc8c5f..14b6414c502 100644 --- a/examples/cpp/error_handling/CMakeLists.txt +++ b/examples/cpp/error_handling/CMakeLists.txt @@ -17,7 +17,7 @@ # See cmake_externalproject/CMakeLists.txt for all-in-one cmake build # that automatically builds all the dependencies before building helloworld. -cmake_minimum_required(VERSION 3.8) +cmake_minimum_required(VERSION 3.16) project(ErrorHandling C CXX) diff --git a/examples/cpp/flow_control/CMakeLists.txt b/examples/cpp/flow_control/CMakeLists.txt index 0d6d4353177..48c7576220d 100644 --- a/examples/cpp/flow_control/CMakeLists.txt +++ b/examples/cpp/flow_control/CMakeLists.txt @@ -17,7 +17,7 @@ # See cmake_externalproject/CMakeLists.txt for all-in-one cmake build # that automatically builds all the dependencies before building example. -cmake_minimum_required(VERSION 3.8) +cmake_minimum_required(VERSION 3.16) project(HelloWorld C CXX) diff --git a/examples/cpp/generic_api/CMakeLists.txt b/examples/cpp/generic_api/CMakeLists.txt index 44e3820f0ab..988e44ca4f3 100644 --- a/examples/cpp/generic_api/CMakeLists.txt +++ b/examples/cpp/generic_api/CMakeLists.txt @@ -17,7 +17,7 @@ # See cmake_externalproject/CMakeLists.txt for all-in-one cmake build # that automatically builds all the dependencies before building helloworld. -cmake_minimum_required(VERSION 3.8) +cmake_minimum_required(VERSION 3.16) project(GenericAPI C CXX) diff --git a/examples/cpp/health/CMakeLists.txt b/examples/cpp/health/CMakeLists.txt index 963e82f0a3e..fc19ddb9785 100644 --- a/examples/cpp/health/CMakeLists.txt +++ b/examples/cpp/health/CMakeLists.txt @@ -17,7 +17,7 @@ # See cmake_externalproject/CMakeLists.txt for all-in-one cmake build # that automatically builds all the dependencies before building helloworld. -cmake_minimum_required(VERSION 3.8) +cmake_minimum_required(VERSION 3.16) project(HelloWorld C CXX) diff --git a/examples/cpp/helloworld/CMakeLists.txt b/examples/cpp/helloworld/CMakeLists.txt index defe3064b14..23c7ccd9211 100644 --- a/examples/cpp/helloworld/CMakeLists.txt +++ b/examples/cpp/helloworld/CMakeLists.txt @@ -17,7 +17,7 @@ # See cmake_externalproject/CMakeLists.txt for all-in-one cmake build # that automatically builds all the dependencies before building helloworld. -cmake_minimum_required(VERSION 3.8) +cmake_minimum_required(VERSION 3.16) project(HelloWorld C CXX) diff --git a/examples/cpp/helloworld/cmake_externalproject/CMakeLists.txt b/examples/cpp/helloworld/cmake_externalproject/CMakeLists.txt index 8c1218a053d..e370cc48084 100644 --- a/examples/cpp/helloworld/cmake_externalproject/CMakeLists.txt +++ b/examples/cpp/helloworld/cmake_externalproject/CMakeLists.txt @@ -20,7 +20,7 @@ # including the "helloworld" project itself. # See https://blog.kitware.com/cmake-superbuilds-git-submodules/ -cmake_minimum_required(VERSION 3.8) +cmake_minimum_required(VERSION 3.16) # Project project(HelloWorld-SuperBuild C CXX) diff --git a/examples/cpp/interceptors/CMakeLists.txt b/examples/cpp/interceptors/CMakeLists.txt index 38b7c83c570..69c64fbe2cf 100644 --- a/examples/cpp/interceptors/CMakeLists.txt +++ b/examples/cpp/interceptors/CMakeLists.txt @@ -17,7 +17,7 @@ # See cmake_externalproject/CMakeLists.txt for all-in-one cmake build # that automatically builds all the dependencies before building keyvaluestore. -cmake_minimum_required(VERSION 3.8) +cmake_minimum_required(VERSION 3.16) project(KeyValueStore C CXX) diff --git a/examples/cpp/keepalive/CMakeLists.txt b/examples/cpp/keepalive/CMakeLists.txt index 8053fba1df6..95bbaed5e6b 100644 --- a/examples/cpp/keepalive/CMakeLists.txt +++ b/examples/cpp/keepalive/CMakeLists.txt @@ -17,7 +17,7 @@ # See cmake_externalproject/CMakeLists.txt for all-in-one cmake build # that automatically builds all the dependencies before building helloworld. -cmake_minimum_required(VERSION 3.8) +cmake_minimum_required(VERSION 3.16) project(HelloWorld C CXX) diff --git a/examples/cpp/load_balancing/CMakeLists.txt b/examples/cpp/load_balancing/CMakeLists.txt index 786a508b272..73ea0c33968 100644 --- a/examples/cpp/load_balancing/CMakeLists.txt +++ b/examples/cpp/load_balancing/CMakeLists.txt @@ -17,7 +17,7 @@ # See cmake_externalproject/CMakeLists.txt for all-in-one cmake build # that automatically builds all the dependencies before building helloworld. -cmake_minimum_required(VERSION 3.8) +cmake_minimum_required(VERSION 3.16) project(LoadBalancing C CXX) diff --git a/examples/cpp/metadata/CMakeLists.txt b/examples/cpp/metadata/CMakeLists.txt index 7a95323b16a..36cacacd4f2 100644 --- a/examples/cpp/metadata/CMakeLists.txt +++ b/examples/cpp/metadata/CMakeLists.txt @@ -17,7 +17,7 @@ # See cmake_externalproject/CMakeLists.txt for all-in-one cmake build # that automatically builds all the dependencies before building helloworld. -cmake_minimum_required(VERSION 3.8) +cmake_minimum_required(VERSION 3.16) project(Metadata C CXX) diff --git a/examples/cpp/multiplex/CMakeLists.txt b/examples/cpp/multiplex/CMakeLists.txt index d0b97a37f26..185e79a3965 100644 --- a/examples/cpp/multiplex/CMakeLists.txt +++ b/examples/cpp/multiplex/CMakeLists.txt @@ -17,7 +17,7 @@ # See cmake_externalproject/CMakeLists.txt for all-in-one cmake build # that automatically builds all the dependencies before building helloworld. -cmake_minimum_required(VERSION 3.8) +cmake_minimum_required(VERSION 3.16) project(Multiplex C CXX) diff --git a/examples/cpp/otel/CMakeLists.txt b/examples/cpp/otel/CMakeLists.txt index b81a2538a89..3718b5c8ae3 100644 --- a/examples/cpp/otel/CMakeLists.txt +++ b/examples/cpp/otel/CMakeLists.txt @@ -17,7 +17,7 @@ # See cmake_externalproject/CMakeLists.txt for all-in-one cmake build # that automatically builds all the dependencies before building helloworld. -cmake_minimum_required(VERSION 3.13) +cmake_minimum_required(VERSION 3.16) project(grpc_opentelemetry_example C CXX) diff --git a/examples/cpp/otel/codelab/CMakeLists.txt b/examples/cpp/otel/codelab/CMakeLists.txt index 6ce38d77a2f..9403822c2b7 100644 --- a/examples/cpp/otel/codelab/CMakeLists.txt +++ b/examples/cpp/otel/codelab/CMakeLists.txt @@ -17,7 +17,7 @@ # See cmake_externalproject/CMakeLists.txt for all-in-one cmake build # that automatically builds all the dependencies before building helloworld. -cmake_minimum_required(VERSION 3.13) +cmake_minimum_required(VERSION 3.16) project(grpc_opentelemetry_example C CXX) diff --git a/examples/cpp/otel/ostream/CMakeLists.txt b/examples/cpp/otel/ostream/CMakeLists.txt index c0d9a58a988..9b37a5d19f8 100644 --- a/examples/cpp/otel/ostream/CMakeLists.txt +++ b/examples/cpp/otel/ostream/CMakeLists.txt @@ -17,7 +17,7 @@ # See cmake_externalproject/CMakeLists.txt for all-in-one cmake build # that automatically builds all the dependencies before building helloworld. -cmake_minimum_required(VERSION 3.13) +cmake_minimum_required(VERSION 3.16) project(grpc_opentelemetry_example C CXX) diff --git a/examples/cpp/retry/CMakeLists.txt b/examples/cpp/retry/CMakeLists.txt index f01e360bb7a..b07149a2cf6 100644 --- a/examples/cpp/retry/CMakeLists.txt +++ b/examples/cpp/retry/CMakeLists.txt @@ -17,7 +17,7 @@ # See cmake_externalproject/CMakeLists.txt for all-in-one cmake build # that automatically builds all the dependencies before building retry. -cmake_minimum_required(VERSION 3.8) +cmake_minimum_required(VERSION 3.16) project(Retry C CXX) diff --git a/examples/cpp/route_guide/CMakeLists.txt b/examples/cpp/route_guide/CMakeLists.txt index 90cebda39b1..bc321a00d57 100644 --- a/examples/cpp/route_guide/CMakeLists.txt +++ b/examples/cpp/route_guide/CMakeLists.txt @@ -17,7 +17,7 @@ # See cmake_externalproject/CMakeLists.txt for all-in-one cmake build # that automatically builds all the dependencies before building route_guide. -cmake_minimum_required(VERSION 3.8) +cmake_minimum_required(VERSION 3.16) project(RouteGuide C CXX) diff --git a/examples/cpp/wait_for_ready/CMakeLists.txt b/examples/cpp/wait_for_ready/CMakeLists.txt index 06024dfbc9b..472ece2d651 100644 --- a/examples/cpp/wait_for_ready/CMakeLists.txt +++ b/examples/cpp/wait_for_ready/CMakeLists.txt @@ -17,7 +17,7 @@ # See cmake_externalproject/CMakeLists.txt for all-in-one cmake build # that automatically builds all the dependencies before building helloworld. -cmake_minimum_required(VERSION 3.8) +cmake_minimum_required(VERSION 3.16) project(HelloWorld C CXX) diff --git a/src/android/test/interop/app/CMakeLists.txt b/src/android/test/interop/app/CMakeLists.txt index 403f1e518d8..83444593191 100644 --- a/src/android/test/interop/app/CMakeLists.txt +++ b/src/android/test/interop/app/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.8) +cmake_minimum_required(VERSION 3.16) set(PROTOBUF_PROTOC_EXECUTABLE "/usr/local/bin/protoc" CACHE STRING "Protoc binary on host") set(gRPC_CPP_PLUGIN_EXECUTABLE "/usr/local/bin/grpc_cpp_plugin" CACHE STRING "gRPC CPP plugin binary on host") diff --git a/src/cpp/README.md b/src/cpp/README.md index 780528b9c5e..84c19b79187 100755 --- a/src/cpp/README.md +++ b/src/cpp/README.md @@ -107,7 +107,7 @@ also sets up an `add_subdirectory()` rule for you. This causes gRPC to be built as part of your project. ```cmake -cmake_minimum_required(VERSION 3.15) +cmake_minimum_required(VERSION 3.16) project(my_project) include(FetchContent) diff --git a/templates/CMakeLists.txt.template b/templates/CMakeLists.txt.template index a3e7503f373..f5b7480d639 100644 --- a/templates/CMakeLists.txt.template +++ b/templates/CMakeLists.txt.template @@ -275,7 +275,7 @@ protobuf_gen_files.add(src) %> - cmake_minimum_required(VERSION 3.13) + cmake_minimum_required(VERSION 3.16) set(PACKAGE_NAME "grpc") set(PACKAGE_VERSION "${settings.cpp_version}") From daa793860c4a601533d538582c97da878b7d5824 Mon Sep 17 00:00:00 2001 From: Esun Kim Date: Mon, 30 Sep 2024 12:48:13 -0700 Subject: [PATCH 48/75] [Build] Minimum version of MSVC is now 2022 (#37687) Per https://github.com/google/oss-policies-info/blob/main/foundational-cxx-support-matrix.md, we can require msvc 2022 or later. Closes #37687 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37687 from veblush:msvc2022 32e35ec5b57697b2ab7341952df672eb37557038 PiperOrigin-RevId: 680682655 --- BUILDING.md | 6 +++--- src/cpp/README.md | 2 +- test/distrib/cpp/run_distrib_test_cmake.bat | 2 +- .../run_distrib_test_cmake_as_externalproject.bat | 2 +- test/distrib/cpp/run_distrib_test_cmake_for_dll.bat | 2 +- tools/run_tests/run_tests.py | 12 +----------- tools/run_tests/run_tests_matrix.py | 2 +- 7 files changed, 9 insertions(+), 19 deletions(-) diff --git a/BUILDING.md b/BUILDING.md index a293335b50e..8af2ba8478b 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -55,7 +55,7 @@ installed by `brew` is being used: ## Windows To prepare for cmake + Microsoft Visual C++ compiler build -- Install Visual Studio 2019 or later (Visual C++ compiler will be used). +- Install Visual Studio 2022 or later (Visual C++ compiler will be used). - Install [Git](https://git-scm.com/). - Install [CMake](https://cmake.org/download/). - Install [nasm](https://www.nasm.us/) and add it to `PATH` (`choco install nasm`) - *required by boringssl* @@ -132,7 +132,7 @@ $ make If you want to build shared libraries (`.so` files), run `cmake` with `-DBUILD_SHARED_LIBS=ON`. -### Windows, Using Visual Studio 2019 or later +### Windows, Using Visual Studio 2022 or later When using the "Visual Studio" generator, cmake will generate a solution (`grpc.sln`) that contains a VS project for @@ -143,7 +143,7 @@ you will be able to browse and build the code. > @rem Run from grpc directory after cloning the repo with --recursive or updating submodules. > md .build > cd .build -> cmake .. -G "Visual Studio 16 2019" +> cmake .. -G "Visual Studio 17 2022" > cmake --build . --config Release ``` diff --git a/src/cpp/README.md b/src/cpp/README.md index 84c19b79187..a999068fb75 100755 --- a/src/cpp/README.md +++ b/src/cpp/README.md @@ -31,7 +31,7 @@ Therefore, gRPC supports several major build systems, which should satisfy most | Operating System | Architectures | Versions | Support Level | |------------------|---------------|----------|---------------| | Linux - Debian, Ubuntu, CentOS | x86, x64 | clang 7+, GCC 7.3+ | Officially Supported | -| Windows 10+ | x86, x64 | Visual Studio 2019+ | Officially Supported | +| Windows 10+ | x86, x64 | Visual Studio 2022+ | Officially Supported | | MacOS | x64, ARM64 | XCode 12+ | Officially Supported | | Linux - Others | x86, x64 | clang 7+, GCC 7.3+ | Best Effort | | Linux | ARM64 | | Best Effort | diff --git a/test/distrib/cpp/run_distrib_test_cmake.bat b/test/distrib/cpp/run_distrib_test_cmake.bat index 7a485e4da51..ec8828e1fd7 100644 --- a/test/distrib/cpp/run_distrib_test_cmake.bat +++ b/test/distrib/cpp/run_distrib_test_cmake.bat @@ -31,7 +31,7 @@ set OPENSSL_DIR=%cd:\=/%/OpenSSL-Win32 @rem TODO(jtattermusch): add support for GRPC_CPP_DISTRIBTEST_BUILD_COMPILER_JOBS env variable -set VS_GENERATOR="Visual Studio 16 2019" +set VS_GENERATOR="Visual Studio 17 2022" @rem TODO(jtattermusch): switch to x64 build (will require pulling a x64 build of openssl) set VS_ARCHITECTURE="Win32" diff --git a/test/distrib/cpp/run_distrib_test_cmake_as_externalproject.bat b/test/distrib/cpp/run_distrib_test_cmake_as_externalproject.bat index a55fca355a3..cdc987da2c0 100644 --- a/test/distrib/cpp/run_distrib_test_cmake_as_externalproject.bat +++ b/test/distrib/cpp/run_distrib_test_cmake_as_externalproject.bat @@ -28,7 +28,7 @@ set OPENSSL_DIR=%cd:\=/%/OpenSSL-Win32 @rem TODO(jtattermusch): add support for GRPC_CPP_DISTRIBTEST_BUILD_COMPILER_JOBS env variable -set VS_GENERATOR="Visual Studio 16 2019" +set VS_GENERATOR="Visual Studio 17 2022" @rem TODO(jtattermusch): switch to x64 build (will require pulling a x64 build of openssl) set VS_ARCHITECTURE="Win32" diff --git a/test/distrib/cpp/run_distrib_test_cmake_for_dll.bat b/test/distrib/cpp/run_distrib_test_cmake_for_dll.bat index 887c20dcd74..e4676c018a8 100644 --- a/test/distrib/cpp/run_distrib_test_cmake_for_dll.bat +++ b/test/distrib/cpp/run_distrib_test_cmake_for_dll.bat @@ -31,7 +31,7 @@ set OPENSSL_DIR=%cd:\=/%/OpenSSL-Win32 @rem TODO(jtattermusch): add support for GRPC_CPP_DISTRIBTEST_BUILD_COMPILER_JOBS env variable -set VS_GENERATOR="Visual Studio 16 2019" +set VS_GENERATOR="Visual Studio 17 2022" @rem TODO(jtattermusch): switch to x64 build (will require pulling a x64 build of openssl) set VS_ARCHITECTURE="Win32" diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py index 90073bb8e2c..c4d7ddcb892 100755 --- a/tools/run_tests/run_tests.py +++ b/tools/run_tests/run_tests.py @@ -283,9 +283,7 @@ class CLanguage(object): [ "default", "cmake", - "cmake_ninja_vs2019", "cmake_ninja_vs2022", - "cmake_vs2019", "cmake_vs2022", ], ) @@ -293,19 +291,13 @@ class CLanguage(object): activate_vs_tools = "" if ( - self.args.compiler == "cmake_ninja_vs2019" + self.args.compiler == "cmake_ninja_vs2022" or self.args.compiler == "cmake" or self.args.compiler == "default" ): # cmake + ninja build is the default because it is faster and supports boringssl assembly optimizations - # the compiler used is exactly the same as for cmake_vs2017 - cmake_generator = "Ninja" - activate_vs_tools = "2019" - elif self.args.compiler == "cmake_ninja_vs2022": cmake_generator = "Ninja" activate_vs_tools = "2022" - elif self.args.compiler == "cmake_vs2019": - cmake_generator = "Visual Studio 16 2019" elif self.args.compiler == "cmake_vs2022": cmake_generator = "Visual Studio 17 2022" else: @@ -1698,9 +1690,7 @@ argp.add_argument( "all_the_cpythons", "coreclr", "cmake", - "cmake_ninja_vs2019", "cmake_ninja_vs2022", - "cmake_vs2019", "cmake_vs2022", "mono", ], diff --git a/tools/run_tests/run_tests_matrix.py b/tools/run_tests/run_tests_matrix.py index 4058cc5261d..3b9f2238248 100755 --- a/tools/run_tests/run_tests_matrix.py +++ b/tools/run_tests/run_tests_matrix.py @@ -383,7 +383,7 @@ def _create_portability_test_jobs( configs=["dbg"], platforms=["windows"], arch="default", - compiler="cmake_ninja_vs2019", + compiler="cmake_ninja_vs2022", labels=["portability", "corelang"], extra_args=extra_args, inner_jobs=inner_jobs, From 80b57c909b7bd4f7b459e62e441ebed027d68a6d Mon Sep 17 00:00:00 2001 From: Yijie Ma Date: Mon, 30 Sep 2024 15:09:05 -0700 Subject: [PATCH 49/75] [call_creds_util] Add debug checks for metadata accesses (#37822) Fix https://github.com/grpc/grpc/issues/37701 Closes #37822 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37822 from yijiem:debug-check-metadata 67df0da89c6a9be19a6ac3feb9dece436cfe9453 PiperOrigin-RevId: 680734161 --- src/core/lib/security/credentials/call_creds_util.cc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/core/lib/security/credentials/call_creds_util.cc b/src/core/lib/security/credentials/call_creds_util.cc index 71c3da6dfa3..3acc0708f62 100644 --- a/src/core/lib/security/credentials/call_creds_util.cc +++ b/src/core/lib/security/credentials/call_creds_util.cc @@ -18,6 +18,7 @@ #include +#include "absl/log/check.h" #include "absl/log/log.h" #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" @@ -42,6 +43,7 @@ struct ServiceUrlAndMethod { ServiceUrlAndMethod MakeServiceUrlAndMethod( const ClientMetadataHandle& initial_metadata, const grpc_call_credentials::GetRequestMetadataArgs* args) { + DCHECK(initial_metadata->get_pointer(HttpPathMetadata()) != nullptr); auto service = initial_metadata->get_pointer(HttpPathMetadata())->as_string_view(); auto last_slash = service.find_last_of('/'); @@ -56,6 +58,7 @@ ServiceUrlAndMethod MakeServiceUrlAndMethod( method_name = service.substr(last_slash + 1); service = service.substr(0, last_slash); } + DCHECK(initial_metadata->get_pointer(HttpAuthorityMetadata()) != nullptr); auto host_and_port = initial_metadata->get_pointer(HttpAuthorityMetadata())->as_string_view(); absl::string_view url_scheme = args->security_connector->url_scheme(); From 229de2530b9f0b5dee660942cef2333e20cd747d Mon Sep 17 00:00:00 2001 From: Tanvi Jagtap <139093547+tanvi-jagtap@users.noreply.github.com> Date: Mon, 30 Sep 2024 22:31:47 -0700 Subject: [PATCH 50/75] [PH2][Refactor] Creating call_tracer_wrapper.h . (#37786) [PH2][Refactor] Creating call_tracer_wrapper.h and cc and moving code as-is into it. The content of the functions or classes has not changed. In the next few iterations, more code will come into this file. Closes #37786 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37786 from tanvi-jagtap:ph2_internal_h_split_01 31af14a4e76eb67fadab37d5e5522b4637b5b511 PiperOrigin-RevId: 680861154 --- BUILD | 2 + CMakeLists.txt | 2 + Makefile | 1 + Package.swift | 2 + build_autogenerated.yaml | 4 ++ config.m4 | 1 + config.w32 | 1 + gRPC-C++.podspec | 2 + gRPC-Core.podspec | 3 + grpc.gemspec | 2 + package.xml | 2 + .../chttp2/transport/call_tracer_wrapper.cc | 53 ++++++++++++++ .../chttp2/transport/call_tracer_wrapper.h | 72 +++++++++++++++++++ .../chttp2/transport/chttp2_transport.cc | 29 +------- .../transport/chttp2/transport/frame_data.cc | 1 + .../chttp2/transport/frame_rst_stream.cc | 1 + .../chttp2/transport/frame_window_update.cc | 1 + .../ext/transport/chttp2/transport/internal.h | 46 +----------- .../ext/transport/chttp2/transport/parsing.cc | 1 + .../ext/transport/chttp2/transport/writing.cc | 1 + src/python/grpcio/grpc_core_dependencies.py | 1 + tools/doxygen/Doxyfile.c++.internal | 2 + tools/doxygen/Doxyfile.core.internal | 2 + 23 files changed, 159 insertions(+), 73 deletions(-) create mode 100644 src/core/ext/transport/chttp2/transport/call_tracer_wrapper.cc create mode 100644 src/core/ext/transport/chttp2/transport/call_tracer_wrapper.h diff --git a/BUILD b/BUILD index 0a0a13ee091..51633565bb3 100644 --- a/BUILD +++ b/BUILD @@ -4763,6 +4763,7 @@ grpc_cc_library( name = "grpc_transport_chttp2", srcs = [ "//src/core:ext/transport/chttp2/transport/bin_decoder.cc", + "//src/core:ext/transport/chttp2/transport/call_tracer_wrapper.cc", "//src/core:ext/transport/chttp2/transport/chttp2_transport.cc", "//src/core:ext/transport/chttp2/transport/frame_data.cc", "//src/core:ext/transport/chttp2/transport/frame_goaway.cc", @@ -4776,6 +4777,7 @@ grpc_cc_library( ], hdrs = [ "//src/core:ext/transport/chttp2/transport/bin_decoder.h", + "//src/core:ext/transport/chttp2/transport/call_tracer_wrapper.h", "//src/core:ext/transport/chttp2/transport/chttp2_transport.h", "//src/core:ext/transport/chttp2/transport/frame_data.h", "//src/core:ext/transport/chttp2/transport/frame_goaway.h", diff --git a/CMakeLists.txt b/CMakeLists.txt index 85b51d334d2..99147ab3f31 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1907,6 +1907,7 @@ add_library(grpc src/core/ext/transport/chttp2/server/chttp2_server.cc src/core/ext/transport/chttp2/transport/bin_decoder.cc src/core/ext/transport/chttp2/transport/bin_encoder.cc + src/core/ext/transport/chttp2/transport/call_tracer_wrapper.cc src/core/ext/transport/chttp2/transport/chttp2_transport.cc src/core/ext/transport/chttp2/transport/decode_huff.cc src/core/ext/transport/chttp2/transport/flow_control.cc @@ -3015,6 +3016,7 @@ add_library(grpc_unsecure src/core/ext/transport/chttp2/server/chttp2_server.cc src/core/ext/transport/chttp2/transport/bin_decoder.cc src/core/ext/transport/chttp2/transport/bin_encoder.cc + src/core/ext/transport/chttp2/transport/call_tracer_wrapper.cc src/core/ext/transport/chttp2/transport/chttp2_transport.cc src/core/ext/transport/chttp2/transport/decode_huff.cc src/core/ext/transport/chttp2/transport/flow_control.cc diff --git a/Makefile b/Makefile index 028c9f90090..b33a29370b9 100644 --- a/Makefile +++ b/Makefile @@ -711,6 +711,7 @@ LIBGRPC_SRC = \ src/core/ext/transport/chttp2/server/chttp2_server.cc \ src/core/ext/transport/chttp2/transport/bin_decoder.cc \ src/core/ext/transport/chttp2/transport/bin_encoder.cc \ + src/core/ext/transport/chttp2/transport/call_tracer_wrapper.cc \ src/core/ext/transport/chttp2/transport/chttp2_transport.cc \ src/core/ext/transport/chttp2/transport/decode_huff.cc \ src/core/ext/transport/chttp2/transport/flow_control.cc \ diff --git a/Package.swift b/Package.swift index c21dedc5f8b..f1e60c511ca 100644 --- a/Package.swift +++ b/Package.swift @@ -210,6 +210,8 @@ let package = Package( "src/core/ext/transport/chttp2/transport/bin_decoder.h", "src/core/ext/transport/chttp2/transport/bin_encoder.cc", "src/core/ext/transport/chttp2/transport/bin_encoder.h", + "src/core/ext/transport/chttp2/transport/call_tracer_wrapper.cc", + "src/core/ext/transport/chttp2/transport/call_tracer_wrapper.h", "src/core/ext/transport/chttp2/transport/chttp2_transport.cc", "src/core/ext/transport/chttp2/transport/chttp2_transport.h", "src/core/ext/transport/chttp2/transport/context_list_entry.h", diff --git a/build_autogenerated.yaml b/build_autogenerated.yaml index b45eb26192f..1dd0e4f335f 100644 --- a/build_autogenerated.yaml +++ b/build_autogenerated.yaml @@ -267,6 +267,7 @@ libs: - src/core/ext/transport/chttp2/server/chttp2_server.h - src/core/ext/transport/chttp2/transport/bin_decoder.h - src/core/ext/transport/chttp2/transport/bin_encoder.h + - src/core/ext/transport/chttp2/transport/call_tracer_wrapper.h - src/core/ext/transport/chttp2/transport/chttp2_transport.h - src/core/ext/transport/chttp2/transport/context_list_entry.h - src/core/ext/transport/chttp2/transport/decode_huff.h @@ -1317,6 +1318,7 @@ libs: - src/core/ext/transport/chttp2/server/chttp2_server.cc - src/core/ext/transport/chttp2/transport/bin_decoder.cc - src/core/ext/transport/chttp2/transport/bin_encoder.cc + - src/core/ext/transport/chttp2/transport/call_tracer_wrapper.cc - src/core/ext/transport/chttp2/transport/chttp2_transport.cc - src/core/ext/transport/chttp2/transport/decode_huff.cc - src/core/ext/transport/chttp2/transport/flow_control.cc @@ -2294,6 +2296,7 @@ libs: - src/core/ext/transport/chttp2/server/chttp2_server.h - src/core/ext/transport/chttp2/transport/bin_decoder.h - src/core/ext/transport/chttp2/transport/bin_encoder.h + - src/core/ext/transport/chttp2/transport/call_tracer_wrapper.h - src/core/ext/transport/chttp2/transport/chttp2_transport.h - src/core/ext/transport/chttp2/transport/context_list_entry.h - src/core/ext/transport/chttp2/transport/decode_huff.h @@ -2776,6 +2779,7 @@ libs: - src/core/ext/transport/chttp2/server/chttp2_server.cc - src/core/ext/transport/chttp2/transport/bin_decoder.cc - src/core/ext/transport/chttp2/transport/bin_encoder.cc + - src/core/ext/transport/chttp2/transport/call_tracer_wrapper.cc - src/core/ext/transport/chttp2/transport/chttp2_transport.cc - src/core/ext/transport/chttp2/transport/decode_huff.cc - src/core/ext/transport/chttp2/transport/flow_control.cc diff --git a/config.m4 b/config.m4 index 9bc1a068f3f..cd9212d3572 100644 --- a/config.m4 +++ b/config.m4 @@ -86,6 +86,7 @@ if test "$PHP_GRPC" != "no"; then src/core/ext/transport/chttp2/server/chttp2_server.cc \ src/core/ext/transport/chttp2/transport/bin_decoder.cc \ src/core/ext/transport/chttp2/transport/bin_encoder.cc \ + src/core/ext/transport/chttp2/transport/call_tracer_wrapper.cc \ src/core/ext/transport/chttp2/transport/chttp2_transport.cc \ src/core/ext/transport/chttp2/transport/decode_huff.cc \ src/core/ext/transport/chttp2/transport/flow_control.cc \ diff --git a/config.w32 b/config.w32 index f1f0df73b81..b590018a1bd 100644 --- a/config.w32 +++ b/config.w32 @@ -51,6 +51,7 @@ if (PHP_GRPC != "no") { "src\\core\\ext\\transport\\chttp2\\server\\chttp2_server.cc " + "src\\core\\ext\\transport\\chttp2\\transport\\bin_decoder.cc " + "src\\core\\ext\\transport\\chttp2\\transport\\bin_encoder.cc " + + "src\\core\\ext\\transport\\chttp2\\transport\\call_tracer_wrapper.cc " + "src\\core\\ext\\transport\\chttp2\\transport\\chttp2_transport.cc " + "src\\core\\ext\\transport\\chttp2\\transport\\decode_huff.cc " + "src\\core\\ext\\transport\\chttp2\\transport\\flow_control.cc " + diff --git a/gRPC-C++.podspec b/gRPC-C++.podspec index abca293e113..aeb929b9ad6 100644 --- a/gRPC-C++.podspec +++ b/gRPC-C++.podspec @@ -356,6 +356,7 @@ Pod::Spec.new do |s| 'src/core/ext/transport/chttp2/server/chttp2_server.h', 'src/core/ext/transport/chttp2/transport/bin_decoder.h', 'src/core/ext/transport/chttp2/transport/bin_encoder.h', + 'src/core/ext/transport/chttp2/transport/call_tracer_wrapper.h', 'src/core/ext/transport/chttp2/transport/chttp2_transport.h', 'src/core/ext/transport/chttp2/transport/context_list_entry.h', 'src/core/ext/transport/chttp2/transport/decode_huff.h', @@ -1660,6 +1661,7 @@ Pod::Spec.new do |s| 'src/core/ext/transport/chttp2/server/chttp2_server.h', 'src/core/ext/transport/chttp2/transport/bin_decoder.h', 'src/core/ext/transport/chttp2/transport/bin_encoder.h', + 'src/core/ext/transport/chttp2/transport/call_tracer_wrapper.h', 'src/core/ext/transport/chttp2/transport/chttp2_transport.h', 'src/core/ext/transport/chttp2/transport/context_list_entry.h', 'src/core/ext/transport/chttp2/transport/decode_huff.h', diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec index 48543720dee..26ed8c8dfab 100644 --- a/gRPC-Core.podspec +++ b/gRPC-Core.podspec @@ -330,6 +330,8 @@ Pod::Spec.new do |s| 'src/core/ext/transport/chttp2/transport/bin_decoder.h', 'src/core/ext/transport/chttp2/transport/bin_encoder.cc', 'src/core/ext/transport/chttp2/transport/bin_encoder.h', + 'src/core/ext/transport/chttp2/transport/call_tracer_wrapper.cc', + 'src/core/ext/transport/chttp2/transport/call_tracer_wrapper.h', 'src/core/ext/transport/chttp2/transport/chttp2_transport.cc', 'src/core/ext/transport/chttp2/transport/chttp2_transport.h', 'src/core/ext/transport/chttp2/transport/context_list_entry.h', @@ -2448,6 +2450,7 @@ Pod::Spec.new do |s| 'src/core/ext/transport/chttp2/server/chttp2_server.h', 'src/core/ext/transport/chttp2/transport/bin_decoder.h', 'src/core/ext/transport/chttp2/transport/bin_encoder.h', + 'src/core/ext/transport/chttp2/transport/call_tracer_wrapper.h', 'src/core/ext/transport/chttp2/transport/chttp2_transport.h', 'src/core/ext/transport/chttp2/transport/context_list_entry.h', 'src/core/ext/transport/chttp2/transport/decode_huff.h', diff --git a/grpc.gemspec b/grpc.gemspec index 7c4645fc5d2..349abdf9586 100644 --- a/grpc.gemspec +++ b/grpc.gemspec @@ -216,6 +216,8 @@ Gem::Specification.new do |s| s.files += %w( src/core/ext/transport/chttp2/transport/bin_decoder.h ) s.files += %w( src/core/ext/transport/chttp2/transport/bin_encoder.cc ) s.files += %w( src/core/ext/transport/chttp2/transport/bin_encoder.h ) + s.files += %w( src/core/ext/transport/chttp2/transport/call_tracer_wrapper.cc ) + s.files += %w( src/core/ext/transport/chttp2/transport/call_tracer_wrapper.h ) s.files += %w( src/core/ext/transport/chttp2/transport/chttp2_transport.cc ) s.files += %w( src/core/ext/transport/chttp2/transport/chttp2_transport.h ) s.files += %w( src/core/ext/transport/chttp2/transport/context_list_entry.h ) diff --git a/package.xml b/package.xml index 69833761539..3add46c2e40 100644 --- a/package.xml +++ b/package.xml @@ -198,6 +198,8 @@ + + diff --git a/src/core/ext/transport/chttp2/transport/call_tracer_wrapper.cc b/src/core/ext/transport/chttp2/transport/call_tracer_wrapper.cc new file mode 100644 index 00000000000..476f7844cd1 --- /dev/null +++ b/src/core/ext/transport/chttp2/transport/call_tracer_wrapper.cc @@ -0,0 +1,53 @@ +// +// +// 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/transport/chttp2/transport/call_tracer_wrapper.h" + +#include "src/core/ext/transport/chttp2/transport/internal.h" + +namespace grpc_core { + +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 \ No newline at end of file diff --git a/src/core/ext/transport/chttp2/transport/call_tracer_wrapper.h b/src/core/ext/transport/chttp2/transport/call_tracer_wrapper.h new file mode 100644 index 00000000000..cf535afc6cd --- /dev/null +++ b/src/core/ext/transport/chttp2/transport/call_tracer_wrapper.h @@ -0,0 +1,72 @@ +// +// +// 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_TRANSPORT_CHTTP2_TRANSPORT_CALL_TRACER_WRAPPER_H +#define GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_CALL_TRACER_WRAPPER_H + +#include "src/core/lib/transport/transport.h" +#include "src/core/telemetry/call_tracer.h" + +struct grpc_chttp2_stream; + +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 + +#endif // GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_CALL_TRACER_WRAPPER_H diff --git a/src/core/ext/transport/chttp2/transport/chttp2_transport.cc b/src/core/ext/transport/chttp2/transport/chttp2_transport.cc index 97cfe956ba9..e4b0b1fdf25 100644 --- a/src/core/ext/transport/chttp2/transport/chttp2_transport.cc +++ b/src/core/ext/transport/chttp2/transport/chttp2_transport.cc @@ -56,6 +56,7 @@ #include #include +#include "src/core/ext/transport/chttp2/transport/call_tracer_wrapper.h" #include "src/core/ext/transport/chttp2/transport/context_list_entry.h" #include "src/core/ext/transport/chttp2/transport/flow_control.h" #include "src/core/ext/transport/chttp2/transport/frame_data.h" @@ -361,34 +362,6 @@ 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 // diff --git a/src/core/ext/transport/chttp2/transport/frame_data.cc b/src/core/ext/transport/chttp2/transport/frame_data.cc index b20f1630add..b5bd13d2fc0 100644 --- a/src/core/ext/transport/chttp2/transport/frame_data.cc +++ b/src/core/ext/transport/chttp2/transport/frame_data.cc @@ -27,6 +27,7 @@ #include #include +#include "src/core/ext/transport/chttp2/transport/call_tracer_wrapper.h" #include "src/core/ext/transport/chttp2/transport/internal.h" #include "src/core/lib/experiments/experiments.h" #include "src/core/lib/slice/slice.h" diff --git a/src/core/ext/transport/chttp2/transport/frame_rst_stream.cc b/src/core/ext/transport/chttp2/transport/frame_rst_stream.cc index 14d91329eae..0e38b36c05c 100644 --- a/src/core/ext/transport/chttp2/transport/frame_rst_stream.cc +++ b/src/core/ext/transport/chttp2/transport/frame_rst_stream.cc @@ -30,6 +30,7 @@ #include #include +#include "src/core/ext/transport/chttp2/transport/call_tracer_wrapper.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/ping_callbacks.h" diff --git a/src/core/ext/transport/chttp2/transport/frame_window_update.cc b/src/core/ext/transport/chttp2/transport/frame_window_update.cc index 20cddebd5ca..5209ab2899a 100644 --- a/src/core/ext/transport/chttp2/transport/frame_window_update.cc +++ b/src/core/ext/transport/chttp2/transport/frame_window_update.cc @@ -27,6 +27,7 @@ #include +#include "src/core/ext/transport/chttp2/transport/call_tracer_wrapper.h" #include "src/core/ext/transport/chttp2/transport/flow_control.h" #include "src/core/ext/transport/chttp2/transport/internal.h" #include "src/core/ext/transport/chttp2/transport/stream_lists.h" diff --git a/src/core/ext/transport/chttp2/transport/internal.h b/src/core/ext/transport/chttp2/transport/internal.h index bdbbd6890c7..76deea4f043 100644 --- a/src/core/ext/transport/chttp2/transport/internal.h +++ b/src/core/ext/transport/chttp2/transport/internal.h @@ -41,6 +41,7 @@ #include #include "src/core/channelz/channelz.h" +#include "src/core/ext/transport/chttp2/transport/call_tracer_wrapper.h" #include "src/core/ext/transport/chttp2/transport/context_list_entry.h" #include "src/core/ext/transport/chttp2/transport/flow_control.h" #include "src/core/ext/transport/chttp2/transport/frame_goaway.h" @@ -553,51 +554,6 @@ 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); diff --git a/src/core/ext/transport/chttp2/transport/parsing.cc b/src/core/ext/transport/chttp2/transport/parsing.cc index cd102ff85df..e9d746d8e24 100644 --- a/src/core/ext/transport/chttp2/transport/parsing.cc +++ b/src/core/ext/transport/chttp2/transport/parsing.cc @@ -43,6 +43,7 @@ #include #include "src/core/channelz/channelz.h" +#include "src/core/ext/transport/chttp2/transport/call_tracer_wrapper.h" #include "src/core/ext/transport/chttp2/transport/flow_control.h" #include "src/core/ext/transport/chttp2/transport/frame_data.h" #include "src/core/ext/transport/chttp2/transport/frame_goaway.h" diff --git a/src/core/ext/transport/chttp2/transport/writing.cc b/src/core/ext/transport/chttp2/transport/writing.cc index d5678956f51..583d9eaa03d 100644 --- a/src/core/ext/transport/chttp2/transport/writing.cc +++ b/src/core/ext/transport/chttp2/transport/writing.cc @@ -37,6 +37,7 @@ #include #include "src/core/channelz/channelz.h" +#include "src/core/ext/transport/chttp2/transport/call_tracer_wrapper.h" #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" #include "src/core/ext/transport/chttp2/transport/context_list_entry.h" #include "src/core/ext/transport/chttp2/transport/flow_control.h" diff --git a/src/python/grpcio/grpc_core_dependencies.py b/src/python/grpcio/grpc_core_dependencies.py index fde998c3af6..e1bbd06531f 100644 --- a/src/python/grpcio/grpc_core_dependencies.py +++ b/src/python/grpcio/grpc_core_dependencies.py @@ -60,6 +60,7 @@ CORE_SOURCE_FILES = [ 'src/core/ext/transport/chttp2/server/chttp2_server.cc', 'src/core/ext/transport/chttp2/transport/bin_decoder.cc', 'src/core/ext/transport/chttp2/transport/bin_encoder.cc', + 'src/core/ext/transport/chttp2/transport/call_tracer_wrapper.cc', 'src/core/ext/transport/chttp2/transport/chttp2_transport.cc', 'src/core/ext/transport/chttp2/transport/decode_huff.cc', 'src/core/ext/transport/chttp2/transport/flow_control.cc', diff --git a/tools/doxygen/Doxyfile.c++.internal b/tools/doxygen/Doxyfile.c++.internal index efef382f359..4147fafc791 100644 --- a/tools/doxygen/Doxyfile.c++.internal +++ b/tools/doxygen/Doxyfile.c++.internal @@ -1221,6 +1221,8 @@ src/core/ext/transport/chttp2/transport/bin_decoder.cc \ src/core/ext/transport/chttp2/transport/bin_decoder.h \ src/core/ext/transport/chttp2/transport/bin_encoder.cc \ src/core/ext/transport/chttp2/transport/bin_encoder.h \ +src/core/ext/transport/chttp2/transport/call_tracer_wrapper.cc \ +src/core/ext/transport/chttp2/transport/call_tracer_wrapper.h \ src/core/ext/transport/chttp2/transport/chttp2_transport.cc \ src/core/ext/transport/chttp2/transport/chttp2_transport.h \ src/core/ext/transport/chttp2/transport/context_list_entry.h \ diff --git a/tools/doxygen/Doxyfile.core.internal b/tools/doxygen/Doxyfile.core.internal index 0471de0c886..cf962517d9e 100644 --- a/tools/doxygen/Doxyfile.core.internal +++ b/tools/doxygen/Doxyfile.core.internal @@ -988,6 +988,8 @@ src/core/ext/transport/chttp2/transport/bin_decoder.cc \ src/core/ext/transport/chttp2/transport/bin_decoder.h \ src/core/ext/transport/chttp2/transport/bin_encoder.cc \ src/core/ext/transport/chttp2/transport/bin_encoder.h \ +src/core/ext/transport/chttp2/transport/call_tracer_wrapper.cc \ +src/core/ext/transport/chttp2/transport/call_tracer_wrapper.h \ src/core/ext/transport/chttp2/transport/chttp2_transport.cc \ src/core/ext/transport/chttp2/transport/chttp2_transport.h \ src/core/ext/transport/chttp2/transport/context_list_entry.h \ From c938a7b564eebbd9f8eef8718e2d70e0bd35f093 Mon Sep 17 00:00:00 2001 From: Arjan Singh Bal <46515553+arjan-bal@users.noreply.github.com> Date: Tue, 1 Oct 2024 09:35:25 -0700 Subject: [PATCH 51/75] [interop] Remove python dependencies from Go dockerfile and add v1.67.0 release (#37792) ## Why Thanks to @ejona86 for finding this. The python dependencies were wrongly added in https://github.com/grpc/grpc/commit/0589e533cd65a2ca9e0e610cc1b284d016986572. And from then on people were just maintaining what was there. Java had it then too. Java removed the extra dockerfile steps at https://github.com/grpc/grpc/commit/977e4b1450d9910ccc51f2f8de51e2e00349c969 ## Testing Passing master branch test: https://source.cloud.google.com/results/invocations/79fc6c6f-c3d9-4692-870d-4d7002f4778a Passing ad-hoc interop matrix build: https://source.cloud.google.com/results/invocations/683d7487-2637-4a69-b65e-95dc82740679 Closes #37792 PiperOrigin-RevId: 681054405 --- .../dockerfile/gcp_api_libraries_venv.include | 7 ---- .../grpc_interop_go/Dockerfile.template | 1 - .../grpc_interop_go1.x/Dockerfile.template | 1 - .../run_tests_python_deps_venv.include | 31 ---------------- .../dockerimage_current_versions.bzl | 4 +-- .../grpc_interop_go.current_version | 2 +- .../interoptest/grpc_interop_go/Dockerfile | 36 ------------------- .../grpc_interop_go1.x.current_version | 2 +- .../interoptest/grpc_interop_go1.x/Dockerfile | 36 ------------------- tools/interop_matrix/client_matrix.py | 1 + 10 files changed, 5 insertions(+), 116 deletions(-) delete mode 100644 templates/tools/dockerfile/gcp_api_libraries_venv.include delete mode 100644 templates/tools/dockerfile/run_tests_python_deps_venv.include diff --git a/templates/tools/dockerfile/gcp_api_libraries_venv.include b/templates/tools/dockerfile/gcp_api_libraries_venv.include deleted file mode 100644 index 3cd4b48c44a..00000000000 --- a/templates/tools/dockerfile/gcp_api_libraries_venv.include +++ /dev/null @@ -1,7 +0,0 @@ -# Install Google Cloud Platform API libraries -# These are needed for uploading test results to BigQuery (e.g. by tools/run_tests scripts) -# This template is similar to gcp_api_libraries.include but installs the -# dependencies in a python virtual environment. This is required from pip 23.0 -# onwards as installation of system-wide packages is blocked by default. -RUN /bin/bash -c "source $PYTHON_ENV/bin/activate && \ - python3 -m pip install --upgrade google-auth==1.23.0 google-api-python-client==1.12.8 oauth2client==4.1.0" diff --git a/templates/tools/dockerfile/interoptest/grpc_interop_go/Dockerfile.template b/templates/tools/dockerfile/interoptest/grpc_interop_go/Dockerfile.template index bf6d317fe7c..fa1c1005f77 100644 --- a/templates/tools/dockerfile/interoptest/grpc_interop_go/Dockerfile.template +++ b/templates/tools/dockerfile/interoptest/grpc_interop_go/Dockerfile.template @@ -21,7 +21,6 @@ FROM golang:latest <%include file="../../go_path.include"/> - <%include file="../../run_tests_python_deps_venv.include"/> # Define the default command. CMD ["bash"] diff --git a/templates/tools/dockerfile/interoptest/grpc_interop_go1.x/Dockerfile.template b/templates/tools/dockerfile/interoptest/grpc_interop_go1.x/Dockerfile.template index 3137796840f..46a6de48e60 100644 --- a/templates/tools/dockerfile/interoptest/grpc_interop_go1.x/Dockerfile.template +++ b/templates/tools/dockerfile/interoptest/grpc_interop_go1.x/Dockerfile.template @@ -17,7 +17,6 @@ FROM golang:latest <%include file="../../go_path.include"/> - <%include file="../../run_tests_python_deps_venv.include"/> # Define the default command. CMD ["bash"] diff --git a/templates/tools/dockerfile/run_tests_python_deps_venv.include b/templates/tools/dockerfile/run_tests_python_deps_venv.include deleted file mode 100644 index 864c26bf526..00000000000 --- a/templates/tools/dockerfile/run_tests_python_deps_venv.include +++ /dev/null @@ -1,31 +0,0 @@ -#==================== -# run_tests.py python dependencies - -# Basic python dependencies to be able to run tools/run_tests python scripts -# These dependencies are not sufficient to build gRPC Python, gRPC Python -# deps are defined elsewhere (e.g. python_deps.include) -# This template is similar to run_tests_python_deps.include but installs the -# dependencies in a python virtual environment. This is required from pip 23.0 -# onwards as installation of system-wide packages is blocked by default. -RUN apt-get update && apt-get install -y ${'\\'} - python3 ${'\\'} - python3-pip ${'\\'} - python3-setuptools ${'\\'} - python3-yaml ${'\\'} - python3-venv ${'\\'} - && apt-get clean - -# Create a python virtual env for installing required dependencies. -ENV PYTHON_ENV="/opt/venv/grpc-interop" -RUN python3 -m venv "$PYTHON_ENV" -RUN echo "source $PYTHON_ENV/bin/activate" >> ~/.bashrc - -# Use bash explicitly as /bin/sh doesn't support the "source" command. -# use pinned version of pip to avoid sudden breakages -# TODO(#36814): currently six is needed for tools/run_tests scripts -# but since our python2 usage is deprecated, we should get rid of it. -RUN /bin/bash -c "source $PYTHON_ENV/bin/activate && \ - python3 -m pip install --upgrade pip==19.3.1 && \ - python3 -m pip install six==1.16.0" - -<%include file="./gcp_api_libraries_venv.include"/> diff --git a/tools/bazelify_tests/dockerimage_current_versions.bzl b/tools/bazelify_tests/dockerimage_current_versions.bzl index 973a649dfe5..541d9a7b9dc 100644 --- a/tools/bazelify_tests/dockerimage_current_versions.bzl +++ b/tools/bazelify_tests/dockerimage_current_versions.bzl @@ -72,12 +72,12 @@ DOCKERIMAGE_CURRENT_VERSIONS = { "tools/dockerfile/interoptest/grpc_interop_aspnetcore.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_interop_aspnetcore@sha256:8e2e732e78724a8382c340dca72e7653c5f82c251a3110fa2874cc00ba538878", "tools/dockerfile/interoptest/grpc_interop_cxx.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_interop_cxx@sha256:e5a474d33773d52ec6a8abbe2d61ee0c2a9c2b5f48793a5ea3b82c4445becf3f", "tools/dockerfile/interoptest/grpc_interop_dart.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_interop_dart@sha256:4915a280788126dad029858eb384dbbef2dc18cadccb434df6450dfd7a4929f2", - "tools/dockerfile/interoptest/grpc_interop_go.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_interop_go@sha256:c925667feb3e065abf586a9e8b028f64b4673cb94bfb4b5e389c652ce906f5dc", + "tools/dockerfile/interoptest/grpc_interop_go.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_interop_go@sha256:7affc40dd8c229a12aff76c44b173ce786fced97e563777640b5d696f1d8cd89", "tools/dockerfile/interoptest/grpc_interop_go1.11.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_interop_go1.11@sha256:f2fe3a0a581c687ee4217bf58fd42b18bb1f63d3d006f1b67379ff553b0e23c6", "tools/dockerfile/interoptest/grpc_interop_go1.16.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_interop_go1.16@sha256:3767f47c9d06584c6c07b7ab536e13f3e87550330e6c2652ad288d3a72b0de23", "tools/dockerfile/interoptest/grpc_interop_go1.19.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_interop_go1.19@sha256:889e7ff34399a5e16af87940d1eaa239e56da307f7faca3f8f1d28379c2e3df3", "tools/dockerfile/interoptest/grpc_interop_go1.8.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_interop_go1.8@sha256:7830a301b37539252c592b9cd7fa30a6142d0afc717a05fc8d2b82c74fb45efe", - "tools/dockerfile/interoptest/grpc_interop_go1.x.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_interop_go1.x@sha256:9d02b61552a93770ebb022f588daf9acd1088d29197fe120e0b082ede73f4584", + "tools/dockerfile/interoptest/grpc_interop_go1.x.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_interop_go1.x@sha256:7affc40dd8c229a12aff76c44b173ce786fced97e563777640b5d696f1d8cd89", "tools/dockerfile/interoptest/grpc_interop_http2.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_interop_http2@sha256:e3f247d8038374848fadf7215b841e3575c0b2a4217feb503a79b8004b164c5a", "tools/dockerfile/interoptest/grpc_interop_java.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_interop_java@sha256:6c0319bbbf77d6c198f61adf92d205efd33cbd2cccaf914a1af8f2dcb61b16a1", "tools/dockerfile/interoptest/grpc_interop_node.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_interop_node@sha256:549a7683cc024fb7ffee807eaa8acb6c2d5a5dd0184a2590f91852804eea39a4", diff --git a/tools/dockerfile/interoptest/grpc_interop_go.current_version b/tools/dockerfile/interoptest/grpc_interop_go.current_version index 2aca19d40be..c703fa40ee4 100644 --- a/tools/dockerfile/interoptest/grpc_interop_go.current_version +++ b/tools/dockerfile/interoptest/grpc_interop_go.current_version @@ -1 +1 @@ -us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_interop_go:969ce4614d1152a43f9083e7d08f1932c63a1616@sha256:c925667feb3e065abf586a9e8b028f64b4673cb94bfb4b5e389c652ce906f5dc \ No newline at end of file +us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_interop_go:e779403fffab573454461a7357acf9851c14b640@sha256:7affc40dd8c229a12aff76c44b173ce786fced97e563777640b5d696f1d8cd89 \ No newline at end of file diff --git a/tools/dockerfile/interoptest/grpc_interop_go/Dockerfile b/tools/dockerfile/interoptest/grpc_interop_go/Dockerfile index bf41ce181e0..2968da76eda 100644 --- a/tools/dockerfile/interoptest/grpc_interop_go/Dockerfile +++ b/tools/dockerfile/interoptest/grpc_interop_go/Dockerfile @@ -21,41 +21,5 @@ FROM golang:latest # Using login shell removes Go from path, so we add it. RUN ln -s /usr/local/go/bin/go /usr/local/bin -#==================== -# run_tests.py python dependencies - -# Basic python dependencies to be able to run tools/run_tests python scripts -# These dependencies are not sufficient to build gRPC Python, gRPC Python -# deps are defined elsewhere (e.g. python_deps.include) -# This template is similar to run_tests_python_deps.include but installs the -# dependencies in a python virtual environment. This is required from pip 23.0 -# onwards as installation of system-wide packages is blocked by default. -RUN apt-get update && apt-get install -y \ - python3 \ - python3-pip \ - python3-setuptools \ - python3-yaml \ - python3-venv \ - && apt-get clean - -# Create a python virtual env for installing required dependencies. -ENV PYTHON_ENV="/opt/venv/grpc-interop" -RUN python3 -m venv "$PYTHON_ENV" -RUN echo "source $PYTHON_ENV/bin/activate" >> ~/.bashrc - -# Use bash explicitly as /bin/sh doesn't support the "source" command. -# use pinned version of pip to avoid sudden breakages -# TODO(#36814): currently six is needed for tools/run_tests scripts -# but since our python2 usage is deprecated, we should get rid of it. -RUN /bin/bash -c "source $PYTHON_ENV/bin/activate && python3 -m pip install --upgrade pip==19.3.1 && python3 -m pip install six==1.16.0" - -# Install Google Cloud Platform API libraries -# These are needed for uploading test results to BigQuery (e.g. by tools/run_tests scripts) -# This template is similar to gcp_api_libraries.include but installs the -# dependencies in a python virtual environment. This is required from pip 23.0 -# onwards as installation of system-wide packages is blocked by default. -RUN /bin/bash -c "source $PYTHON_ENV/bin/activate && python3 -m pip install --upgrade google-auth==1.23.0 google-api-python-client==1.12.8 oauth2client==4.1.0" - - # Define the default command. CMD ["bash"] diff --git a/tools/dockerfile/interoptest/grpc_interop_go1.x.current_version b/tools/dockerfile/interoptest/grpc_interop_go1.x.current_version index 99a32701de6..d8b3e4cd6bc 100644 --- a/tools/dockerfile/interoptest/grpc_interop_go1.x.current_version +++ b/tools/dockerfile/interoptest/grpc_interop_go1.x.current_version @@ -1 +1 @@ -us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_interop_go1.x:9a524415365a73162b7f463bf0409ca04f64a73c@sha256:9d02b61552a93770ebb022f588daf9acd1088d29197fe120e0b082ede73f4584 \ No newline at end of file +us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_interop_go1.x:a50334d44bb6c5d23b08622328d97266b4bfacd8@sha256:7affc40dd8c229a12aff76c44b173ce786fced97e563777640b5d696f1d8cd89 \ No newline at end of file diff --git a/tools/dockerfile/interoptest/grpc_interop_go1.x/Dockerfile b/tools/dockerfile/interoptest/grpc_interop_go1.x/Dockerfile index 8aa291f0173..439757fc1a5 100644 --- a/tools/dockerfile/interoptest/grpc_interop_go1.x/Dockerfile +++ b/tools/dockerfile/interoptest/grpc_interop_go1.x/Dockerfile @@ -17,41 +17,5 @@ FROM golang:latest # Using login shell removes Go from path, so we add it. RUN ln -s /usr/local/go/bin/go /usr/local/bin -#==================== -# run_tests.py python dependencies - -# Basic python dependencies to be able to run tools/run_tests python scripts -# These dependencies are not sufficient to build gRPC Python, gRPC Python -# deps are defined elsewhere (e.g. python_deps.include) -# This template is similar to run_tests_python_deps.include but installs the -# dependencies in a python virtual environment. This is required from pip 23.0 -# onwards as installation of system-wide packages is blocked by default. -RUN apt-get update && apt-get install -y \ - python3 \ - python3-pip \ - python3-setuptools \ - python3-yaml \ - python3-venv \ - && apt-get clean - -# Create a python virtual env for installing required dependencies. -ENV PYTHON_ENV="/opt/venv/grpc-interop" -RUN python3 -m venv "$PYTHON_ENV" -RUN echo "source $PYTHON_ENV/bin/activate" >> ~/.bashrc - -# Use bash explicitly as /bin/sh doesn't support the "source" command. -# use pinned version of pip to avoid sudden breakages -# TODO(#36814): currently six is needed for tools/run_tests scripts -# but since our python2 usage is deprecated, we should get rid of it. -RUN /bin/bash -c "source $PYTHON_ENV/bin/activate && python3 -m pip install --upgrade pip==19.3.1 && python3 -m pip install six==1.16.0" - -# Install Google Cloud Platform API libraries -# These are needed for uploading test results to BigQuery (e.g. by tools/run_tests scripts) -# This template is similar to gcp_api_libraries.include but installs the -# dependencies in a python virtual environment. This is required from pip 23.0 -# onwards as installation of system-wide packages is blocked by default. -RUN /bin/bash -c "source $PYTHON_ENV/bin/activate && python3 -m pip install --upgrade google-auth==1.23.0 google-api-python-client==1.12.8 oauth2client==4.1.0" - - # Define the default command. CMD ["bash"] diff --git a/tools/interop_matrix/client_matrix.py b/tools/interop_matrix/client_matrix.py index bc4ea2d919e..1ec4c542fdc 100644 --- a/tools/interop_matrix/client_matrix.py +++ b/tools/interop_matrix/client_matrix.py @@ -306,6 +306,7 @@ LANG_RELEASE_MATRIX = { ("v1.64.1", ReleaseInfo()), ("v1.65.0", ReleaseInfo()), ("v1.66.2", ReleaseInfo()), + ("v1.67.0", ReleaseInfo()), ] ), "java": OrderedDict( From 74e640341d02e3e821232644fd26542e64c1e7cc Mon Sep 17 00:00:00 2001 From: Yash Tibrewal Date: Tue, 1 Oct 2024 13:42:53 -0700 Subject: [PATCH 52/75] [CSM O11y] Example logs (#37823) Closes #37823 PiperOrigin-RevId: 681149244 --- examples/cpp/csm/observability/BUILD | 2 ++ examples/cpp/csm/observability/Dockerfile.server | 2 ++ examples/cpp/csm/observability/csm_greeter_server.cc | 5 +++++ examples/cpp/otel/util.cc | 4 ++-- 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/examples/cpp/csm/observability/BUILD b/examples/cpp/csm/observability/BUILD index d6d8bb0eb33..e27bb9cfb5f 100644 --- a/examples/cpp/csm/observability/BUILD +++ b/examples/cpp/csm/observability/BUILD @@ -44,6 +44,8 @@ cc_binary( "@com_google_absl//absl/flags:flag", "@com_google_absl//absl/flags:parse", "@com_google_absl//absl/log", + "@com_google_absl//absl/log:globals", + "@com_google_absl//absl/log:initialize", "@io_opentelemetry_cpp//exporters/prometheus:prometheus_exporter", "@io_opentelemetry_cpp//sdk/src/metrics", ], diff --git a/examples/cpp/csm/observability/Dockerfile.server b/examples/cpp/csm/observability/Dockerfile.server index a6d82fdc793..1439072ec29 100644 --- a/examples/cpp/csm/observability/Dockerfile.server +++ b/examples/cpp/csm/observability/Dockerfile.server @@ -27,6 +27,8 @@ RUN cp -rL /workdir/bazel-bin/examples/cpp/csm/observability/csm_greeter_server FROM python:3.9-slim-bookworm +ENV GRPC_TRACE="xds_client,xds_resolver,xds_cluster_manager_lb,cds_lb,xds_cluster_resolver_lb,priority_lb,xds_cluster_impl_lb,weighted_target_lb,xds_server_config_fetcher,ring_hash_lb,outlier_detection_lb,xds_wrr_locality_lb,xds_override_host_lb" + RUN apt-get update \ && apt-get -y upgrade \ && apt-get -y autoremove \ diff --git a/examples/cpp/csm/observability/csm_greeter_server.cc b/examples/cpp/csm/observability/csm_greeter_server.cc index 12cdef49ca4..a3d7eccd978 100644 --- a/examples/cpp/csm/observability/csm_greeter_server.cc +++ b/examples/cpp/csm/observability/csm_greeter_server.cc @@ -22,6 +22,8 @@ #include "absl/flags/flag.h" #include "absl/flags/parse.h" +#include "absl/log/globals.h" +#include "absl/log/initialize.h" #include "absl/log/log.h" #include "absl/strings/str_cat.h" #include "examples/cpp/otel/util.h" @@ -42,6 +44,9 @@ ABSL_FLAG(std::string, prometheus_endpoint, "localhost:9464", int main(int argc, char** argv) { absl::ParseCommandLine(argc, argv); + absl::SetStderrThreshold(absl::LogSeverityAtLeast::kInfo); + absl::SetGlobalVLogLevel(2); + absl::InitializeLog(); opentelemetry::exporter::metrics::PrometheusExporterOptions opts; // default was "localhost:9464" which causes connection issue across GKE pods opts.url = "0.0.0.0:9464"; diff --git a/examples/cpp/otel/util.cc b/examples/cpp/otel/util.cc index cba83f736ad..f844a044a6e 100644 --- a/examples/cpp/otel/util.cc +++ b/examples/cpp/otel/util.cc @@ -169,10 +169,10 @@ void RunClient(const std::string& target_str) { // are created. This channel models a connection to an endpoint specified by // the argument "--target=" which is the only expected argument. grpc::ChannelArguments args; + GreeterClient greeter(grpc::CreateCustomChannel( + target_str, grpc::InsecureChannelCredentials(), args)); // Continuously send RPCs every second. while (true) { - GreeterClient greeter(grpc::CreateCustomChannel( - target_str, grpc::InsecureChannelCredentials(), args)); std::string user("world"); std::string reply = greeter.SayHello(user); std::cout << "Greeter received: " << reply << std::endl; From 9a12ec91e10c555cadc42893983a3e8ac30eb805 Mon Sep 17 00:00:00 2001 From: "Mark D. Roth" Date: Tue, 1 Oct 2024 13:44:59 -0700 Subject: [PATCH 53/75] [xds_client_test] change test to use FuzzingEventEngine (#37668) Closes #37668 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37668 from markdroth:xds_client_test_fuzzing_ee e1fe7f56c268ba8088a0ed931a533c22007248fc PiperOrigin-RevId: 681150007 --- CMakeLists.txt | 6 + build_autogenerated.yaml | 5 + .../fuzzing_event_engine.cc | 17 +- .../fuzzing_event_engine.h | 5 + test/core/xds/BUILD | 9 +- test/core/xds/xds_client_fuzzer.cc | 40 ++- test/core/xds/xds_client_fuzzer.proto | 2 + test/core/xds/xds_client_test.cc | 267 ++++++++++-------- test/core/xds/xds_transport_fake.cc | 79 +++--- test/core/xds/xds_transport_fake.h | 44 ++- 10 files changed, 269 insertions(+), 205 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 99147ab3f31..41e69b70ab7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -34193,8 +34193,14 @@ add_executable(xds_client_test ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/percent.grpc.pb.cc ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/percent.pb.h ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/percent.grpc.pb.h + ${_gRPC_PROTO_GENS_DIR}/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.pb.cc + ${_gRPC_PROTO_GENS_DIR}/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.grpc.pb.cc + ${_gRPC_PROTO_GENS_DIR}/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.pb.h + ${_gRPC_PROTO_GENS_DIR}/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.grpc.pb.h src/cpp/client/global_callback_hook.cc src/cpp/util/status.cc + test/core/event_engine/event_engine_test_utils.cc + test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.cc test/core/xds/xds_client_test.cc test/core/xds/xds_transport_fake.cc ) diff --git a/build_autogenerated.yaml b/build_autogenerated.yaml index 1dd0e4f335f..3ae9dd5577c 100644 --- a/build_autogenerated.yaml +++ b/build_autogenerated.yaml @@ -21562,6 +21562,8 @@ targets: build: test language: c++ headers: + - test/core/event_engine/event_engine_test_utils.h + - test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h - test/core/test_util/scoped_env_var.h - test/core/xds/xds_client_test_peer.h - test/core/xds/xds_transport_fake.h @@ -21569,8 +21571,11 @@ targets: - src/proto/grpc/testing/xds/v3/base.proto - src/proto/grpc/testing/xds/v3/discovery.proto - src/proto/grpc/testing/xds/v3/percent.proto + - test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.proto - src/cpp/client/global_callback_hook.cc - src/cpp/util/status.cc + - test/core/event_engine/event_engine_test_utils.cc + - test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.cc - test/core/xds/xds_client_test.cc - test/core/xds/xds_transport_fake.cc deps: diff --git a/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.cc b/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.cc index 0a85dafe2b4..1bc8a7a203e 100644 --- a/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.cc +++ b/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.cc @@ -194,16 +194,23 @@ void FuzzingEventEngine::TickUntilIdle() { << "TickUntilIdle: " << GRPC_DUMP_ARGS(tasks_by_id_.size(), outstanding_reads_.load(), outstanding_writes_.load()); - if (tasks_by_id_.empty() && - outstanding_writes_.load(std::memory_order_relaxed) == 0 && - outstanding_reads_.load(std::memory_order_relaxed) == 0) { - return; - } + if (IsIdleLocked()) return; } Tick(); } } +bool FuzzingEventEngine::IsIdle() { + grpc_core::MutexLock lock(&*mu_); + return IsIdleLocked(); +} + +bool FuzzingEventEngine::IsIdleLocked() { + return tasks_by_id_.empty() && + outstanding_writes_.load(std::memory_order_relaxed) == 0 && + outstanding_reads_.load(std::memory_order_relaxed) == 0; +} + void FuzzingEventEngine::TickUntil(Time t) { while (true) { auto now = Now(); diff --git a/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h b/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h index 23193ce99c6..6ff76e32a23 100644 --- a/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h +++ b/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h @@ -72,6 +72,8 @@ class FuzzingEventEngine : public EventEngine { ABSL_LOCKS_EXCLUDED(mu_); // Repeatedly call Tick() until there is no more work to do. void TickUntilIdle() ABSL_LOCKS_EXCLUDED(mu_); + // Returns true if idle. + bool IsIdle() ABSL_LOCKS_EXCLUDED(mu_); // Tick until some time void TickUntil(Time t) ABSL_LOCKS_EXCLUDED(mu_); // Tick for some duration @@ -296,6 +298,9 @@ class FuzzingEventEngine : public EventEngine { int AllocatePort() ABSL_EXCLUSIVE_LOCKS_REQUIRED(mu_); // Is the given port in use by any listener? bool IsPortUsed(int port) ABSL_EXCLUSIVE_LOCKS_REQUIRED(mu_); + + bool IsIdleLocked() ABSL_EXCLUSIVE_LOCKS_REQUIRED(mu_); + // For the next connection being built, query the list of fuzzer selected // write size limits. std::queue WriteSizesForConnection() diff --git a/test/core/xds/BUILD b/test/core/xds/BUILD index f152a44953f..03fe7802783 100644 --- a/test/core/xds/BUILD +++ b/test/core/xds/BUILD @@ -145,6 +145,7 @@ grpc_cc_library( "//:orphanable", "//:ref_counted_ptr", "//:xds_client", + "//test/core/event_engine/fuzzing_event_engine", "//test/core/test_util:grpc_test_util", ], ) @@ -166,7 +167,6 @@ grpc_cc_test( srcs = ["xds_client_test.cc"], external_deps = ["gtest"], language = "C++", - shard_count = 10, uses_event_engine = True, uses_polling = False, deps = [ @@ -174,6 +174,8 @@ grpc_cc_test( ":xds_transport_fake", "//:xds_client", "//src/proto/grpc/testing/xds/v3:discovery_proto", + "//test/core/event_engine:event_engine_test_utils", + "//test/core/event_engine/fuzzing_event_engine", "//test/core/test_util:grpc_test_util", "//test/core/test_util:scoped_env_var", ], @@ -188,9 +190,10 @@ grpc_proto_fuzzer( proto = "xds_client_fuzzer.proto", proto_deps = [ "//src/proto/grpc/testing/xds/v3:discovery_proto", + "//test/core/event_engine/fuzzing_event_engine:fuzzing_event_engine_proto", ], tags = ["no_windows"], - uses_event_engine = False, + uses_event_engine = True, uses_polling = False, deps = [ ":xds_client_test_peer", @@ -206,6 +209,8 @@ grpc_proto_fuzzer( "//src/proto/grpc/testing/xds/v3:endpoint_proto", "//src/proto/grpc/testing/xds/v3:http_connection_manager_proto", "//src/proto/grpc/testing/xds/v3:router_proto", + "//test/core/event_engine/fuzzing_event_engine", + "//test/core/event_engine:event_engine_test_utils", ], ) diff --git a/test/core/xds/xds_client_fuzzer.cc b/test/core/xds/xds_client_fuzzer.cc index ef660977c8d..158563429e8 100644 --- a/test/core/xds/xds_client_fuzzer.cc +++ b/test/core/xds/xds_client_fuzzer.cc @@ -30,7 +30,7 @@ #include -#include "src/core/lib/event_engine/default_event_engine.h" +#include "src/core/lib/iomgr/timer_manager.h" #include "src/core/util/orphanable.h" #include "src/core/util/ref_counted_ptr.h" #include "src/core/xds/grpc/xds_bootstrap_grpc.h" @@ -46,15 +46,24 @@ #include "src/core/xds/xds_client/xds_client.h" #include "src/libfuzzer/libfuzzer_macro.h" #include "src/proto/grpc/testing/xds/v3/discovery.pb.h" +#include "test/core/event_engine/event_engine_test_utils.h" +#include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h" #include "test/core/xds/xds_client_fuzzer.pb.h" #include "test/core/xds/xds_client_test_peer.h" #include "test/core/xds/xds_transport_fake.h" +using grpc_event_engine::experimental::FuzzingEventEngine; + namespace grpc_core { class Fuzzer { public: - explicit Fuzzer(absl::string_view bootstrap_json) { + Fuzzer(absl::string_view bootstrap_json, + const fuzzing_event_engine::Actions& fuzzing_ee_actions) { + event_engine_ = std::make_shared( + FuzzingEventEngine::Options(), fuzzing_ee_actions); + grpc_timer_manager_set_start_threaded(false); + grpc_init(); auto bootstrap = GrpcXdsBootstrap::Create(bootstrap_json); if (!bootstrap.ok()) { LOG(ERROR) << "error creating bootstrap: " << bootstrap.status(); @@ -62,15 +71,25 @@ class Fuzzer { return; } transport_factory_ = MakeRefCounted( - []() { Crash("Multiple concurrent reads"); }); + []() { Crash("Multiple concurrent reads"); }, event_engine_); transport_factory_->SetAutoCompleteMessagesFromClient(false); transport_factory_->SetAbortOnUndrainedMessages(false); xds_client_ = MakeRefCounted( - std::move(*bootstrap), transport_factory_, - grpc_event_engine::experimental::GetDefaultEventEngine(), + std::move(*bootstrap), transport_factory_, event_engine_, /*metrics_reporter=*/nullptr, "foo agent", "foo version"); } + ~Fuzzer() { + transport_factory_.reset(); + xds_client_.reset(); + event_engine_->FuzzingDone(); + event_engine_->TickUntilIdle(); + event_engine_->UnsetGlobalHooks(); + grpc_event_engine::experimental::WaitForSingleOwner( + std::move(event_engine_)); + grpc_shutdown_blocking(); + } + void Act(const xds_client_fuzzer::Action& action) { if (xds_client_ == nullptr) return; switch (action.action_type_case()) { @@ -276,8 +295,7 @@ class Fuzzer { if (xds_server == nullptr) return nullptr; const char* method = StreamIdMethod(stream_id); if (method == nullptr) return nullptr; - return transport_factory_->WaitForStream(*xds_server, method, - absl::ZeroDuration()); + return transport_factory_->WaitForStream(*xds_server, method); } static std::string StreamIdString( @@ -293,7 +311,7 @@ class Fuzzer { auto stream = GetStream(stream_id); if (stream == nullptr) return; LOG(INFO) << " stream=" << stream.get(); - auto message = stream->WaitForMessageFromClient(absl::ZeroDuration()); + auto message = stream->WaitForMessageFromClient(); if (message.has_value()) { LOG(INFO) << " completing send_message"; stream->CompleteSendMessageFromClient(ok); @@ -320,6 +338,7 @@ class Fuzzer { stream->MaybeSendStatusToClient(std::move(status)); } + std::shared_ptr event_engine_; RefCountedPtr xds_client_; RefCountedPtr transport_factory_; @@ -336,10 +355,9 @@ class Fuzzer { bool squelch = true; DEFINE_PROTO_FUZZER(const xds_client_fuzzer::Msg& message) { - grpc_init(); - grpc_core::Fuzzer fuzzer(message.bootstrap()); + grpc_core::Fuzzer fuzzer(message.bootstrap(), + message.fuzzing_event_engine_actions()); for (int i = 0; i < message.actions_size(); i++) { fuzzer.Act(message.actions(i)); } - grpc_shutdown(); } diff --git a/test/core/xds/xds_client_fuzzer.proto b/test/core/xds/xds_client_fuzzer.proto index e2ce7aa5d46..ae32016c644 100644 --- a/test/core/xds/xds_client_fuzzer.proto +++ b/test/core/xds/xds_client_fuzzer.proto @@ -19,6 +19,7 @@ syntax = "proto3"; package xds_client_fuzzer; import "src/proto/grpc/testing/xds/v3/discovery.proto"; +import "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.proto"; // We'd ideally like to use google.rpc.Status instead of creating our // own proto for this, but that winds up causing all sorts of dependency @@ -120,4 +121,5 @@ message Action { message Msg { string bootstrap = 1; repeated Action actions = 2; + fuzzing_event_engine.Actions fuzzing_event_engine_actions = 3; } diff --git a/test/core/xds/xds_client_test.cc b/test/core/xds/xds_client_test.cc index 87e3a8a2e11..c28966f2c23 100644 --- a/test/core/xds/xds_client_test.cc +++ b/test/core/xds/xds_client_test.cc @@ -46,7 +46,7 @@ #include #include -#include "src/core/lib/event_engine/default_event_engine.h" +#include "src/core/lib/iomgr/timer_manager.h" #include "src/core/util/debug_location.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_args.h" @@ -59,6 +59,8 @@ #include "src/core/xds/xds_client/xds_resource_type_impl.h" #include "src/proto/grpc/testing/xds/v3/base.pb.h" #include "src/proto/grpc/testing/xds/v3/discovery.pb.h" +#include "test/core/event_engine/event_engine_test_utils.h" +#include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h" #include "test/core/test_util/scoped_env_var.h" #include "test/core/test_util/test_config.h" #include "test/core/xds/xds_client_test_peer.h" @@ -73,6 +75,7 @@ using envoy::service::discovery::v3::DiscoveryRequest; using envoy::service::discovery::v3::DiscoveryResponse; +using grpc_event_engine::experimental::FuzzingEventEngine; namespace grpc_core { namespace testing { @@ -252,6 +255,9 @@ class XdsClientTest : public ::testing::Test { all_resources_required_in_sotw>, ResourceStruct>::WatcherInterface { public: + explicit Watcher(std::shared_ptr event_engine) + : event_engine_(std::move(event_engine)) {} + ~Watcher() override { MutexLock lock(&mu_); EXPECT_THAT(queue_, ::testing::IsEmpty()) @@ -270,42 +276,46 @@ class XdsClientTest : public ::testing::Test { }); } - // Returns true if no event is received during the timeout period. - bool ExpectNoEvent(absl::Duration timeout) { - MutexLock lock(&mu_); - return !WaitForEventLocked(timeout); - } - bool HasEvent() { MutexLock lock(&mu_); return !queue_.empty(); } + // Returns true if no event is received after draining the fuzzing + // EE queue. + bool ExpectNoEvent() { + event_engine_->TickUntilIdle(); + return !HasEvent(); + } + absl::optional WaitForNextResourceAndHandle( - absl::Duration timeout = absl::Seconds(1), SourceLocation location = SourceLocation()) { - MutexLock lock(&mu_); - if (!WaitForEventLocked(timeout)) return absl::nullopt; - Event& event = queue_.front(); - if (!absl::holds_alternative(event)) { - EXPECT_TRUE(false) - << "got unexpected event " - << (absl::holds_alternative(event) - ? "error" - : "does-not-exist") - << " at " << location.file() << ":" << location.line(); - return absl::nullopt; + while (true) { + event_engine_->Tick(); + MutexLock lock(&mu_); + if (queue_.empty()) { + if (event_engine_->IsIdle()) return absl::nullopt; + continue; + } + Event& event = queue_.front(); + if (!absl::holds_alternative(event)) { + EXPECT_TRUE(false) + << "got unexpected event " + << (absl::holds_alternative(event) + ? "error" + : "does-not-exist") + << " at " << location.file() << ":" << location.line(); + return absl::nullopt; + } + auto foo = std::move(absl::get(event)); + queue_.pop_front(); + return foo; } - auto foo = std::move(absl::get(event)); - queue_.pop_front(); - return foo; } std::shared_ptr WaitForNextResource( - absl::Duration timeout = absl::Seconds(1), SourceLocation location = SourceLocation()) { - auto resource_and_handle = - WaitForNextResourceAndHandle(timeout, location); + auto resource_and_handle = WaitForNextResourceAndHandle(location); if (!resource_and_handle.has_value()) { return nullptr; } @@ -313,40 +323,50 @@ class XdsClientTest : public ::testing::Test { } absl::optional WaitForNextError( - absl::Duration timeout = absl::Seconds(1), SourceLocation location = SourceLocation()) { - MutexLock lock(&mu_); - if (!WaitForEventLocked(timeout)) return absl::nullopt; - Event& event = queue_.front(); - if (!absl::holds_alternative(event)) { - EXPECT_TRUE(false) - << "got unexpected event " - << (absl::holds_alternative(event) - ? "resource" - : "does-not-exist") - << " at " << location.file() << ":" << location.line(); - return absl::nullopt; + while (true) { + event_engine_->Tick(); + MutexLock lock(&mu_); + if (queue_.empty()) { + if (event_engine_->IsIdle()) return absl::nullopt; + continue; + } + Event& event = queue_.front(); + if (!absl::holds_alternative(event)) { + EXPECT_TRUE(false) + << "got unexpected event " + << (absl::holds_alternative(event) + ? "resource" + : "does-not-exist") + << " at " << location.file() << ":" << location.line(); + return absl::nullopt; + } + absl::Status error = std::move(absl::get(event)); + queue_.pop_front(); + return std::move(error); } - absl::Status error = std::move(absl::get(event)); - queue_.pop_front(); - return std::move(error); } - bool WaitForDoesNotExist(absl::Duration timeout, - SourceLocation location = SourceLocation()) { - MutexLock lock(&mu_); - if (!WaitForEventLocked(timeout)) return false; - Event& event = queue_.front(); - if (!absl::holds_alternative(event)) { - EXPECT_TRUE(false) - << "got unexpected event " - << (absl::holds_alternative(event) ? "error" - : "resource") - << " at " << location.file() << ":" << location.line(); - return false; + bool WaitForDoesNotExist(SourceLocation location = SourceLocation()) { + while (true) { + event_engine_->Tick(); + MutexLock lock(&mu_); + if (queue_.empty()) { + if (event_engine_->IsIdle()) return false; + continue; + } + Event& event = queue_.front(); + if (!absl::holds_alternative(event)) { + EXPECT_TRUE(false) + << "got unexpected event " + << (absl::holds_alternative(event) ? "error" + : "resource") + << " at " << location.file() << ":" << location.line(); + return false; + } + queue_.pop_front(); + return true; } - queue_.pop_front(); - return true; } private: @@ -361,7 +381,6 @@ class XdsClientTest : public ::testing::Test { ResourceAndReadDelayHandle event_details = { std::move(foo), std::move(read_delay_handle)}; queue_.emplace_back(std::move(event_details)); - cv_.Signal(); } void OnError( @@ -370,7 +389,6 @@ class XdsClientTest : public ::testing::Test { override { MutexLock lock(&mu_); queue_.push_back(std::move(status)); - cv_.Signal(); } void OnResourceDoesNotExist( @@ -378,24 +396,11 @@ class XdsClientTest : public ::testing::Test { override { MutexLock lock(&mu_); queue_.push_back(DoesNotExist()); - cv_.Signal(); } - // Returns true if an event was received, or false if the timeout - // expires before any event is received. - bool WaitForEventLocked(absl::Duration timeout) - ABSL_EXCLUSIVE_LOCKS_REQUIRED(&mu_) { - while (queue_.empty()) { - if (cv_.WaitWithTimeout(&mu_, - timeout * grpc_test_slowdown_factor())) { - return false; - } - } - return true; - } + std::shared_ptr event_engine_; Mutex mu_; - CondVar cv_; std::deque queue_ ABSL_GUARDED_BY(&mu_); }; @@ -626,6 +631,9 @@ class XdsClientTest : public ::testing::Test { uint64_t>; using ServerFailureMap = std::map; + explicit MetricsReporter(std::shared_ptr event_engine) + : event_engine_(std::move(event_engine)) {} + ResourceUpdateMap resource_updates_valid() const { MutexLock lock(&mu_); return resource_updates_valid_; @@ -643,12 +651,10 @@ class XdsClientTest : public ::testing::Test { ::testing::Matcher resource_updates_valid_matcher, ::testing::Matcher resource_updates_invalid_matcher, ::testing::Matcher server_failures_matcher, - absl::Duration timeout = absl::Seconds(3), SourceLocation location = SourceLocation()) { - const absl::Time deadline = - absl::Now() + (timeout * grpc_test_slowdown_factor()); - MutexLock lock(&mu_); while (true) { + event_engine_->Tick(); + MutexLock lock(&mu_); if (::testing::Matches(resource_updates_valid_matcher)( resource_updates_valid_) && ::testing::Matches(resource_updates_invalid_matcher)( @@ -656,15 +662,15 @@ class XdsClientTest : public ::testing::Test { ::testing::Matches(server_failures_matcher)(server_failures_)) { return true; } - if (cond_.WaitWithDeadline(&mu_, deadline)) break; + if (!event_engine_->IsIdle()) continue; + EXPECT_THAT(resource_updates_valid_, resource_updates_valid_matcher) + << location.file() << ":" << location.line(); + EXPECT_THAT(resource_updates_invalid_, resource_updates_invalid_matcher) + << location.file() << ":" << location.line(); + EXPECT_THAT(server_failures_, server_failures_matcher) + << location.file() << ":" << location.line(); + return false; } - EXPECT_THAT(resource_updates_valid_, resource_updates_valid_matcher) - << location.file() << ":" << location.line(); - EXPECT_THAT(resource_updates_invalid_, resource_updates_invalid_matcher) - << location.file() << ":" << location.line(); - EXPECT_THAT(server_failures_, server_failures_matcher) - << location.file() << ":" << location.line(); - return false; } private: @@ -690,6 +696,8 @@ class XdsClientTest : public ::testing::Test { cond_.SignalAll(); } + std::shared_ptr event_engine_; + mutable Mutex mu_; ResourceUpdateMap resource_updates_valid_ ABSL_GUARDED_BY(mu_); ResourceUpdateMap resource_updates_invalid_ ABSL_GUARDED_BY(mu_); @@ -724,18 +732,35 @@ class XdsClientTest : public ::testing::Test { return server_connection_map; } + void SetUp() override { + event_engine_ = std::make_shared( + FuzzingEventEngine::Options(), fuzzing_event_engine::Actions()); + grpc_timer_manager_set_start_threaded(false); + grpc_init(); + } + + void TearDown() override { + transport_factory_.reset(); + xds_client_.reset(); + event_engine_->FuzzingDone(); + event_engine_->TickUntilIdle(); + event_engine_->UnsetGlobalHooks(); + grpc_event_engine::experimental::WaitForSingleOwner( + std::move(event_engine_)); + grpc_shutdown_blocking(); + } + // Sets transport_factory_ and initializes xds_client_ with the // specified bootstrap config. void InitXdsClient( FakeXdsBootstrap::Builder bootstrap_builder = FakeXdsBootstrap::Builder(), Duration resource_request_timeout = Duration::Seconds(15)) { transport_factory_ = MakeRefCounted( - []() { FAIL() << "Multiple concurrent reads"; }); - auto metrics_reporter = std::make_unique(); + []() { FAIL() << "Multiple concurrent reads"; }, event_engine_); + auto metrics_reporter = std::make_unique(event_engine_); metrics_reporter_ = metrics_reporter.get(); xds_client_ = MakeRefCounted( - bootstrap_builder.Build(), transport_factory_, - grpc_event_engine::experimental::GetDefaultEventEngine(), + bootstrap_builder.Build(), transport_factory_, event_engine_, std::move(metrics_reporter), "foo agent", "foo version", resource_request_timeout * grpc_test_slowdown_factor()); } @@ -743,7 +768,7 @@ class XdsClientTest : public ::testing::Test { // Starts and cancels a watch for a Foo resource. RefCountedPtr StartFooWatch( absl::string_view resource_name) { - auto watcher = MakeRefCounted(); + auto watcher = MakeRefCounted(event_engine_); XdsFooResourceType::StartWatch(xds_client_.get(), resource_name, watcher); return watcher; } @@ -757,7 +782,7 @@ class XdsClientTest : public ::testing::Test { // Starts and cancels a watch for a Bar resource. RefCountedPtr StartBarWatch( absl::string_view resource_name) { - auto watcher = MakeRefCounted(); + auto watcher = MakeRefCounted(event_engine_); XdsBarResourceType::StartWatch(xds_client_.get(), resource_name, watcher); return watcher; } @@ -771,7 +796,8 @@ class XdsClientTest : public ::testing::Test { // Starts and cancels a watch for a WildcardCapable resource. RefCountedPtr StartWildcardCapableWatch(absl::string_view resource_name) { - auto watcher = MakeRefCounted(); + auto watcher = + MakeRefCounted(event_engine_); XdsWildcardCapableResourceType::StartWatch(xds_client_.get(), resource_name, watcher); return watcher; @@ -784,11 +810,13 @@ class XdsClientTest : public ::testing::Test { } RefCountedPtr WaitForAdsStream( - const XdsBootstrap::XdsServer& xds_server, - absl::Duration timeout = absl::Seconds(5)) { + const XdsBootstrap::XdsServer& xds_server) { return transport_factory_->WaitForStream( - xds_server, FakeXdsTransportFactory::kAdsMethod, - timeout * grpc_test_slowdown_factor()); + xds_server, FakeXdsTransportFactory::kAdsMethod); + } + + RefCountedPtr WaitForAdsStream() { + return WaitForAdsStream(*xds_client_->bootstrap().servers().front()); } void TriggerConnectionFailure(const XdsBootstrap::XdsServer& xds_server, @@ -796,19 +824,11 @@ class XdsClientTest : public ::testing::Test { transport_factory_->TriggerConnectionFailure(xds_server, std::move(status)); } - RefCountedPtr WaitForAdsStream( - absl::Duration timeout = absl::Seconds(5)) { - return WaitForAdsStream(*xds_client_->bootstrap().servers().front(), - timeout); - } - // Gets the latest request sent to the fake xDS server. absl::optional WaitForRequest( FakeXdsTransportFactory::FakeStreamingCall* stream, - absl::Duration timeout = absl::Seconds(3), SourceLocation location = SourceLocation()) { - auto message = - stream->WaitForMessageFromClient(timeout * grpc_test_slowdown_factor()); + auto message = stream->WaitForMessageFromClient(); if (!message.has_value()) return absl::nullopt; DiscoveryRequest request; bool success = request.ParseFromString(*message); @@ -893,6 +913,7 @@ class XdsClientTest : public ::testing::Test { << location.file() << ":" << location.line(); } + std::shared_ptr event_engine_; RefCountedPtr transport_factory_; RefCountedPtr xds_client_; MetricsReporter* metrics_reporter_ = nullptr; @@ -2011,7 +2032,7 @@ TEST_F(XdsClientTest, ResourceDeletion) { .set_nonce("B") .Serialize()); // Watcher should see the does-not-exist event. - EXPECT_TRUE(watcher->WaitForDoesNotExist(absl::Seconds(1))); + EXPECT_TRUE(watcher->WaitForDoesNotExist()); // Check metric data. EXPECT_TRUE(metrics_reporter_->WaitForMetricsReporterData( ::testing::ElementsAre(::testing::Pair( @@ -2029,7 +2050,7 @@ TEST_F(XdsClientTest, ResourceDeletion) { // Start a new watcher for the same resource. It should immediately // receive the same does-not-exist notification. auto watcher2 = StartWildcardCapableWatch("wc1"); - EXPECT_TRUE(watcher2->WaitForDoesNotExist(absl::Seconds(1))); + EXPECT_TRUE(watcher2->WaitForDoesNotExist()); // XdsClient should have sent an ACK message to the xDS server. request = WaitForRequest(stream.get()); ASSERT_TRUE(request.has_value()); @@ -2142,7 +2163,7 @@ TEST_F(XdsClientTest, ResourceDeletionIgnoredWhenConfigured) { .Serialize()); // Watcher should not see any update, since we should have ignored the // deletion. - EXPECT_TRUE(watcher->ExpectNoEvent(absl::Seconds(1))); + EXPECT_TRUE(watcher->ExpectNoEvent()); // Check metric data. EXPECT_TRUE(metrics_reporter_->WaitForMetricsReporterData( ::testing::ElementsAre(::testing::Pair( @@ -2438,7 +2459,7 @@ TEST_F(XdsClientTest, ConnectionFails) { ::testing::ElementsAre(::testing::Pair(kDefaultXdsServerUrl, 1)))); // We should not see a resource-does-not-exist event, because the // timer should not be running while the channel is disconnected. - EXPECT_TRUE(watcher->ExpectNoEvent(absl::Seconds(4))); + EXPECT_TRUE(watcher->ExpectNoEvent()); // Start a new watch. This watcher should be given the same error, // since we have not yet recovered. auto watcher2 = StartFooWatch("foo1"); @@ -2517,7 +2538,7 @@ TEST_F(XdsClientTest, ResourceDoesNotExistUponTimeout) { CheckRequestNode(*request); // Should be present on the first request. // Do not send a response, but wait for the resource to be reported as // not existing. - EXPECT_TRUE(watcher->WaitForDoesNotExist(absl::Seconds(5))); + EXPECT_TRUE(watcher->WaitForDoesNotExist()); // Check metric data. EXPECT_TRUE(metrics_reporter_->WaitForMetricsReporterData( ::testing::ElementsAre(), ::testing::ElementsAre(), ::testing::_)); @@ -2530,7 +2551,7 @@ TEST_F(XdsClientTest, ResourceDoesNotExistUponTimeout) { // Start a new watcher for the same resource. It should immediately // receive the same does-not-exist notification. auto watcher2 = StartFooWatch("foo1"); - EXPECT_TRUE(watcher2->WaitForDoesNotExist(absl::Seconds(1))); + EXPECT_TRUE(watcher2->WaitForDoesNotExist()); // Now server sends a response. stream->SendMessageToClient( ResponseBuilder(XdsFooResourceType::Get()->type_url()) @@ -2641,7 +2662,7 @@ TEST_F(XdsClientTest, ResourceDoesNotExistAfterStreamRestart) { CheckRequestNode(*request); // Should be present on the first request. // Server does NOT send a response immediately. // Client should receive a resource does-not-exist. - ASSERT_TRUE(watcher->WaitForDoesNotExist(absl::Seconds(4))); + ASSERT_TRUE(watcher->WaitForDoesNotExist()); // Check metric data. EXPECT_TRUE(metrics_reporter_->WaitForMetricsReporterData( ::testing::ElementsAre(), ::testing::ElementsAre(), ::testing::_)); @@ -2713,7 +2734,7 @@ TEST_F(XdsClientTest, DoesNotExistTimerNotStartedUntilSendCompletes) { // Server does NOT send a response. // We should not see a resource-does-not-exist event, because the // timer should not be running while the channel is disconnected. - EXPECT_TRUE(watcher->ExpectNoEvent(absl::Seconds(4))); + EXPECT_TRUE(watcher->ExpectNoEvent()); // Check metric data. EXPECT_THAT(GetResourceCounts(), ::testing::ElementsAre(::testing::Pair( @@ -2726,7 +2747,7 @@ TEST_F(XdsClientTest, DoesNotExistTimerNotStartedUntilSendCompletes) { stream->CompleteSendMessageFromClient(); // Server does NOT send a response. // Watcher should see a does-not-exist event. - EXPECT_TRUE(watcher->WaitForDoesNotExist(absl::Seconds(4))); + EXPECT_TRUE(watcher->WaitForDoesNotExist()); // Check metric data. EXPECT_THAT(GetResourceCounts(), ::testing::ElementsAre(::testing::Pair( @@ -2915,7 +2936,7 @@ TEST_F(XdsClientTest, /*resource_names=*/{"foo1", "foo2"}); stream->CompleteSendMessageFromClient(); // Make sure the watcher for foo1 does not see a does-not-exist event. - EXPECT_TRUE(watcher->ExpectNoEvent(absl::Seconds(5))); + EXPECT_TRUE(watcher->ExpectNoEvent()); // Cancel watches. CancelFooWatch(watcher.get(), "foo1", /*delay_unsubscription=*/true); CancelFooWatch(watcher2.get(), "foo2"); @@ -2992,7 +3013,7 @@ TEST_F(XdsClientTest, DoNotSendDoesNotExistForCachedResource) { // We should not see a resource-does-not-exist event, because the // resource was already cached, so the server can optimize by not // resending it. - EXPECT_TRUE(watcher->ExpectNoEvent(absl::Seconds(4))); + EXPECT_TRUE(watcher->ExpectNoEvent()); // Check metric data. EXPECT_TRUE(metrics_reporter_->WaitForMetricsReporterData( ::testing::ElementsAre(::testing::Pair( @@ -3014,7 +3035,7 @@ TEST_F(XdsClientTest, DoNotSendDoesNotExistForCachedResource) { .AddFooResource(XdsFooResource("foo1", 6)) .Serialize()); // Watcher will not see any update, since the resource is unchanged. - EXPECT_TRUE(watcher->ExpectNoEvent(absl::Seconds(1))); + EXPECT_TRUE(watcher->ExpectNoEvent()); // Check metric data. EXPECT_TRUE(metrics_reporter_->WaitForMetricsReporterData( ::testing::ElementsAre(::testing::Pair( @@ -3504,7 +3525,7 @@ TEST_F(XdsClientTest, FederationWithUnknownAuthority) { << *error; } -TEST_F(XdsClientTest, FederationWithUnparsableXdstpResourceName) { +TEST_F(XdsClientTest, FederationWithUnparseableXdstpResourceName) { // Note: Not adding authority to bootstrap config. InitXdsClient(); // Start a watch for the xdstp resource name. @@ -3724,7 +3745,6 @@ TEST_F(XdsClientTest, FederationChannelFailureReportedToWatchers) { } TEST_F(XdsClientTest, AdsReadWaitsForHandleRelease) { - const absl::Duration timeout = absl::Seconds(5) * grpc_test_slowdown_factor(); InitXdsClient(); // Start watches for "foo1" and "foo2". auto watcher1 = StartFooWatch("foo1"); @@ -3777,11 +3797,11 @@ TEST_F(XdsClientTest, AdsReadWaitsForHandleRelease) { /*version_info=*/"1", /*response_nonce=*/"A", /*error_detail=*/absl::OkStatus(), /*resource_names=*/{"foo1", "foo2"}); - EXPECT_TRUE(stream->WaitForReadsStarted(1, timeout)); + EXPECT_TRUE(stream->WaitForReadsStarted(1)); resource1->read_delay_handle.reset(); - EXPECT_TRUE(stream->WaitForReadsStarted(1, timeout)); + EXPECT_TRUE(stream->WaitForReadsStarted(1)); resource2->read_delay_handle.reset(); - EXPECT_TRUE(stream->WaitForReadsStarted(2, timeout)); + EXPECT_TRUE(stream->WaitForReadsStarted(2)); resource1 = watcher1->WaitForNextResourceAndHandle(); ASSERT_NE(resource1, absl::nullopt); EXPECT_EQ(resource1->resource->name, "foo1"); @@ -3794,9 +3814,9 @@ TEST_F(XdsClientTest, AdsReadWaitsForHandleRelease) { /*version_info=*/"2", /*response_nonce=*/"B", /*error_detail=*/absl::OkStatus(), /*resource_names=*/{"foo1", "foo2"}); - EXPECT_TRUE(stream->WaitForReadsStarted(2, timeout)); + EXPECT_TRUE(stream->WaitForReadsStarted(2)); resource1->read_delay_handle.reset(); - EXPECT_TRUE(stream->WaitForReadsStarted(3, timeout)); + EXPECT_TRUE(stream->WaitForReadsStarted(3)); // Cancel watch. CancelFooWatch(watcher1.get(), "foo1"); request = WaitForRequest(stream.get()); @@ -4185,8 +4205,5 @@ TEST_F(XdsClientTest, FallbackOnStartup) { int main(int argc, char** argv) { ::testing::InitGoogleTest(&argc, argv); grpc::testing::TestEnvironment env(&argc, argv); - grpc_init(); - int ret = RUN_ALL_TESTS(); - grpc_shutdown(); - return ret; + return RUN_ALL_TESTS(); } diff --git a/test/core/xds/xds_transport_fake.cc b/test/core/xds/xds_transport_fake.cc index 8c0fc5f5ea3..6369fd60c97 100644 --- a/test/core/xds/xds_transport_fake.cc +++ b/test/core/xds/xds_transport_fake.cc @@ -29,15 +29,12 @@ #include #include -#include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/util/orphanable.h" #include "src/core/util/ref_counted_ptr.h" #include "src/core/xds/xds_client/xds_bootstrap.h" #include "test/core/test_util/test_config.h" -using grpc_event_engine::experimental::GetDefaultEventEngine; - namespace grpc_core { // @@ -60,8 +57,8 @@ FakeXdsTransportFactory::FakeStreamingCall::~FakeStreamingCall() { // synchronously, since those operations will trigger code in // XdsClient that acquires its mutex, but it was already holding its // mutex when it called us, so it would deadlock. - GetDefaultEventEngine()->Run([event_handler = std::move(event_handler_), - status_sent = status_sent_]() mutable { + event_engine_->Run([event_handler = std::move(event_handler_), + status_sent = status_sent_]() mutable { ExecCtx exec_ctx; if (!status_sent) event_handler->OnStatusReceived(absl::OkStatus()); event_handler.reset(); @@ -82,7 +79,6 @@ void FakeXdsTransportFactory::FakeStreamingCall::SendMessage( MutexLock lock(&mu_); CHECK(!orphaned_); from_client_messages_.push_back(std::move(payload)); - cv_client_msg_.Signal(); if (transport_->auto_complete_messages_from_client()) { CompleteSendMessageFromClientLocked(/*ok=*/true); } @@ -94,18 +90,18 @@ bool FakeXdsTransportFactory::FakeStreamingCall::HaveMessageFromClient() { } absl::optional -FakeXdsTransportFactory::FakeStreamingCall::WaitForMessageFromClient( - absl::Duration timeout) { - MutexLock lock(&mu_); - while (from_client_messages_.empty()) { - if (cv_client_msg_.WaitWithTimeout(&mu_, - timeout * grpc_test_slowdown_factor())) { - return absl::nullopt; +FakeXdsTransportFactory::FakeStreamingCall::WaitForMessageFromClient() { + while (true) { + event_engine_->Tick(); + MutexLock lock(&mu_); + if (from_client_messages_.empty()) { + if (event_engine_->IsIdle()) return absl::nullopt; + continue; } + std::string payload = std::move(from_client_messages_.front()); + from_client_messages_.pop_front(); + return payload; } - std::string payload = from_client_messages_.front(); - from_client_messages_.pop_front(); - return payload; } void FakeXdsTransportFactory::FakeStreamingCall:: @@ -113,12 +109,11 @@ void FakeXdsTransportFactory::FakeStreamingCall:: // Can't call event_handler_->OnRequestSent() synchronously, since that // operation will trigger code in XdsClient that acquires its mutex, but it // was already holding its mutex when it called us, so it would deadlock. - GetDefaultEventEngine()->Run( - [event_handler = event_handler_->Ref(), ok]() mutable { - ExecCtx exec_ctx; - event_handler->OnRequestSent(ok); - event_handler.reset(); - }); + event_engine_->Run([event_handler = event_handler_->Ref(), ok]() mutable { + ExecCtx exec_ctx; + event_handler->OnRequestSent(ok); + event_handler.reset(); + }); } void FakeXdsTransportFactory::FakeStreamingCall::CompleteSendMessageFromClient( @@ -135,11 +130,10 @@ void FakeXdsTransportFactory::FakeStreamingCall::StartRecvMessage() { } ++reads_started_; ++num_pending_reads_; - cv_reads_started_.SignalAll(); if (!to_client_messages_.empty()) { // Dispatch pending message (if there's one) on a separate thread to avoid // recursion - GetDefaultEventEngine()->Run([call = RefAsSubclass()]() { + event_engine_->Run([call = RefAsSubclass()]() { call->MaybeDeliverMessageToClient(); }); } @@ -187,6 +181,16 @@ void FakeXdsTransportFactory::FakeStreamingCall::MaybeSendStatusToClient( event_handler->OnStatusReceived(std::move(status)); } +bool FakeXdsTransportFactory::FakeStreamingCall::WaitForReadsStarted( + size_t expected) { + while (true) { + event_engine_->Tick(); + MutexLock lock(&mu_); + if (reads_started_ == expected) return true; + if (event_engine_->IsIdle()) return false; + } +} + bool FakeXdsTransportFactory::FakeStreamingCall::IsOrphaned() { MutexLock lock(&mu_); return orphaned_; @@ -223,7 +227,7 @@ void FakeXdsTransportFactory::FakeXdsTransport::Orphaned() { // Can't destroy watchers synchronously, since that operation will trigger // code in XdsClient that acquires its mutex, but it was already holding // its mutex when it called us, so it would deadlock. - GetDefaultEventEngine()->Run([watchers = std::move(watchers_)]() mutable { + event_engine_->Run([watchers = std::move(watchers_)]() mutable { ExecCtx exec_ctx; watchers.clear(); }); @@ -231,17 +235,14 @@ void FakeXdsTransportFactory::FakeXdsTransport::Orphaned() { } RefCountedPtr -FakeXdsTransportFactory::FakeXdsTransport::WaitForStream( - const char* method, absl::Duration timeout) { - MutexLock lock(&mu_); - auto it = active_calls_.find(method); - while (it == active_calls_.end() || it->second == nullptr) { - if (cv_.WaitWithTimeout(&mu_, timeout * grpc_test_slowdown_factor())) { - return nullptr; - } - it = active_calls_.find(method); +FakeXdsTransportFactory::FakeXdsTransport::WaitForStream(const char* method) { + while (true) { + event_engine_->Tick(); + MutexLock lock(&mu_); + auto it = active_calls_.find(method); + if (it != active_calls_.end() && it->second != nullptr) return it->second; + if (event_engine_->IsIdle()) return nullptr; } - return it->second; } void FakeXdsTransportFactory::FakeXdsTransport::RemoveStream( @@ -273,7 +274,6 @@ FakeXdsTransportFactory::FakeXdsTransport::CreateStreamingCall( WeakRefAsSubclass(), method, std::move(event_handler)); MutexLock lock(&mu_); active_calls_[method] = call->Ref().TakeAsSubclass(); - cv_.Signal(); return call; } @@ -318,13 +318,14 @@ void FakeXdsTransportFactory::SetAbortOnUndrainedMessages(bool value) { RefCountedPtr FakeXdsTransportFactory::WaitForStream(const XdsBootstrap::XdsServer& server, - const char* method, - absl::Duration timeout) { + const char* method) { auto transport = GetTransport(server); if (transport == nullptr) return nullptr; - return transport->WaitForStream(method, timeout); + return transport->WaitForStream(method); } +void FakeXdsTransportFactory::Orphaned() { event_engine_.reset(); } + RefCountedPtr FakeXdsTransportFactory::GetTransport(const XdsBootstrap::XdsServer& server) { std::string key = server.Key(); diff --git a/test/core/xds/xds_transport_fake.h b/test/core/xds/xds_transport_fake.h index 0eb37e8a489..ffa4c746551 100644 --- a/test/core/xds/xds_transport_fake.h +++ b/test/core/xds/xds_transport_fake.h @@ -40,6 +40,7 @@ #include "src/core/util/sync.h" #include "src/core/xds/xds_client/xds_bootstrap.h" #include "src/core/xds/xds_client/xds_transport.h" +#include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h" namespace grpc_core { @@ -61,6 +62,7 @@ class FakeXdsTransportFactory : public XdsTransportFactory { std::unique_ptr event_handler) : transport_(std::move(transport)), method_(method), + event_engine_(transport_->factory()->event_engine_), event_handler_(MakeRefCounted( std::move(event_handler))) {} @@ -75,8 +77,7 @@ class FakeXdsTransportFactory : public XdsTransportFactory { using StreamingCall::Ref; // Make it public. bool HaveMessageFromClient(); - absl::optional WaitForMessageFromClient( - absl::Duration timeout); + absl::optional WaitForMessageFromClient(); // If FakeXdsTransportFactory::SetAutoCompleteMessagesFromClient() // was called to set the value to false before the creation of the @@ -88,16 +89,7 @@ class FakeXdsTransportFactory : public XdsTransportFactory { void SendMessageToClient(absl::string_view payload); void MaybeSendStatusToClient(absl::Status status); - bool WaitForReadsStarted(size_t expected, absl::Duration timeout) { - MutexLock lock(&mu_); - const absl::Time deadline = absl::Now() + timeout; - do { - if (reads_started_ == expected) { - return true; - } - } while (!cv_reads_started_.WaitWithDeadline(&mu_, deadline)); - return false; - } + bool WaitForReadsStarted(size_t expected); private: class RefCountedEventHandler : public RefCounted { @@ -126,10 +118,10 @@ class FakeXdsTransportFactory : public XdsTransportFactory { WeakRefCountedPtr transport_; const char* method_; + std::shared_ptr + event_engine_; Mutex mu_; - CondVar cv_reads_started_; - CondVar cv_client_msg_; RefCountedPtr event_handler_ ABSL_GUARDED_BY(&mu_); std::deque from_client_messages_ ABSL_GUARDED_BY(&mu_); bool status_sent_ ABSL_GUARDED_BY(&mu_) = false; @@ -140,8 +132,11 @@ class FakeXdsTransportFactory : public XdsTransportFactory { }; explicit FakeXdsTransportFactory( - std::function too_many_pending_reads_callback) - : too_many_pending_reads_callback_( + std::function too_many_pending_reads_callback, + std::shared_ptr + event_engine) + : event_engine_(std::move(event_engine)), + too_many_pending_reads_callback_( std::move(too_many_pending_reads_callback)) {} void TriggerConnectionFailure(const XdsBootstrap::XdsServer& server, @@ -169,10 +164,9 @@ class FakeXdsTransportFactory : public XdsTransportFactory { void SetAbortOnUndrainedMessages(bool value); RefCountedPtr WaitForStream( - const XdsBootstrap::XdsServer& server, const char* method, - absl::Duration timeout); + const XdsBootstrap::XdsServer& server, const char* method); - void Orphaned() override {} + void Orphaned() override; private: class FakeXdsTransport : public XdsTransport { @@ -185,7 +179,8 @@ class FakeXdsTransportFactory : public XdsTransportFactory { server_(server), auto_complete_messages_from_client_( auto_complete_messages_from_client), - abort_on_undrained_messages_(abort_on_undrained_messages) {} + abort_on_undrained_messages_(abort_on_undrained_messages), + event_engine_(factory_->event_engine_) {} void Orphaned() override; @@ -199,8 +194,7 @@ class FakeXdsTransportFactory : public XdsTransportFactory { void TriggerConnectionFailure(absl::Status status); - RefCountedPtr WaitForStream(const char* method, - absl::Duration timeout); + RefCountedPtr WaitForStream(const char* method); void RemoveStream(const char* method, FakeStreamingCall* call); @@ -224,9 +218,10 @@ class FakeXdsTransportFactory : public XdsTransportFactory { const XdsBootstrap::XdsServer& server_; const bool auto_complete_messages_from_client_; const bool abort_on_undrained_messages_; + std::shared_ptr + event_engine_; Mutex mu_; - CondVar cv_; std::set> watchers_ ABSL_GUARDED_BY(&mu_); std::map> @@ -244,6 +239,9 @@ class FakeXdsTransportFactory : public XdsTransportFactory { RefCountedPtr GetTransportLocked(const std::string& key) ABSL_EXCLUSIVE_LOCKS_REQUIRED(&mu_); + std::shared_ptr + event_engine_; + Mutex mu_; std::map transport_map_ ABSL_GUARDED_BY(&mu_); From b44de399c1539d793504e03573d64228ee0f4733 Mon Sep 17 00:00:00 2001 From: Yash Tibrewal Date: Tue, 1 Oct 2024 15:21:44 -0700 Subject: [PATCH 54/75] [Chttp2Server] Remove unnecessary ExecCtx Flush (#37824) This seems to be a vestige from around 8 years ago. The code has changed a lot since then, and this makes no sense anymore. (Making this change separately to be safe.) Closes #37824 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37824 from yashykt:RemoveUnnecessaryExecCtxStuff 97a7625033df07ce5fcd24b915d76942ba24e912 PiperOrigin-RevId: 681184980 --- src/core/ext/transport/chttp2/server/chttp2_server.cc | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/core/ext/transport/chttp2/server/chttp2_server.cc b/src/core/ext/transport/chttp2/server/chttp2_server.cc index 212493f95f7..3ebc5758950 100644 --- a/src/core/ext/transport/chttp2/server/chttp2_server.cc +++ b/src/core/ext/transport/chttp2/server/chttp2_server.cc @@ -783,15 +783,11 @@ Chttp2ServerListener::Chttp2ServerListener( } Chttp2ServerListener::~Chttp2ServerListener() { - // Flush queued work before destroying handshaker factory, since that - // may do a synchronous unref. - ExecCtx::Get()->Flush(); if (passive_listener_ != nullptr) { passive_listener_->ListenerDestroyed(); } if (on_destroy_done_ != nullptr) { ExecCtx::Run(DEBUG_LOCATION, on_destroy_done_, absl::OkStatus()); - ExecCtx::Get()->Flush(); } } From cd129b49c20e6eb741e291e5c6f0db9b43125a64 Mon Sep 17 00:00:00 2001 From: "Mark D. Roth" Date: Tue, 1 Oct 2024 17:20:13 -0700 Subject: [PATCH 55/75] [GCP auth filter] hold ref to service config (#37831) This fixes the following crash: https://btx.cloud.google.com/invocations/3a7065d4-db7f-4f01-a239-5376b7f5ee8b/targets/%2F%2Ftest%2Fcpp%2Fend2end%2Fxds:xds_gcp_authn_end2end_test@experiment%3Dwork_serializer_dispatch;config=1a7dc092b28796b045d00aec96c95b85c1d4dc656912e0021a1fc84b3ecb2ac9/log The problem is caused by a race whereby the channel swaps out the service config due to a resolver update while the old dynamic filter stack is still processing calls in another thread. The GCP auth filter was dereferencing the old service config but not holding a ref to it. I've fixed this by having it hold a ref. In the long run, I suspect that we may run into other cases like this, in which case we may want the dynamic filter stack itself to hold a ref to the service config, so that individual filters don't have to. Closes #37831 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37831 from markdroth:gcp_auth_race_fix f2a0d1dd7921adfbb47332d50109ae612fc43240 PiperOrigin-RevId: 681221795 --- .../gcp_authentication/gcp_authentication_filter.cc | 11 +++++++---- .../gcp_authentication/gcp_authentication_filter.h | 4 ++++ 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/core/ext/filters/gcp_authentication/gcp_authentication_filter.cc b/src/core/ext/filters/gcp_authentication/gcp_authentication_filter.cc index 7e51b20dca3..e301ed62154 100644 --- a/src/core/ext/filters/gcp_authentication/gcp_authentication_filter.cc +++ b/src/core/ext/filters/gcp_authentication/gcp_authentication_filter.cc @@ -153,7 +153,7 @@ absl::StatusOr> GcpAuthenticationFilter::Create(const ChannelArgs& args, ChannelFilter::Args filter_args) { // Get filter config. - auto* service_config = args.GetObject(); + auto service_config = args.GetObjectRef(); if (service_config == nullptr) { return absl::InvalidArgumentError( "gcp_auth: no service config in channel args"); @@ -184,15 +184,18 @@ GcpAuthenticationFilter::Create(const ChannelArgs& args, // cache but it has the wrong size. cache->SetMaxSize(filter_config->cache_size); // Instantiate filter. - return std::unique_ptr(new GcpAuthenticationFilter( - filter_config, std::move(xds_config), std::move(cache))); + return std::unique_ptr( + new GcpAuthenticationFilter(std::move(service_config), filter_config, + std::move(xds_config), std::move(cache))); } GcpAuthenticationFilter::GcpAuthenticationFilter( + RefCountedPtr service_config, const GcpAuthenticationParsedConfig::Config* filter_config, RefCountedPtr xds_config, RefCountedPtr cache) - : filter_config_(filter_config), + : service_config_(std::move(service_config)), + filter_config_(filter_config), xds_config_(std::move(xds_config)), cache_(std::move(cache)) {} diff --git a/src/core/ext/filters/gcp_authentication/gcp_authentication_filter.h b/src/core/ext/filters/gcp_authentication/gcp_authentication_filter.h index f8fc704c9e8..a3136ebd460 100644 --- a/src/core/ext/filters/gcp_authentication/gcp_authentication_filter.h +++ b/src/core/ext/filters/gcp_authentication/gcp_authentication_filter.h @@ -80,10 +80,14 @@ class GcpAuthenticationFilter }; GcpAuthenticationFilter( + RefCountedPtr service_config, const GcpAuthenticationParsedConfig::Config* filter_config, RefCountedPtr xds_config, RefCountedPtr cache); + // TODO(roth): Consider having the channel stack hold this ref so that + // individual filters don't need to. + const RefCountedPtr service_config_; const GcpAuthenticationParsedConfig::Config* filter_config_; const RefCountedPtr xds_config_; const RefCountedPtr cache_; From d6fd0bd9919695b2047a66910628fb9b36145fa0 Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Tue, 1 Oct 2024 17:44:44 -0700 Subject: [PATCH 56/75] [chaotic-good] Annotate key promises for latent-see (#37830) Closes #37830 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37830 from ctiller:promising-latent-see 4f7dd1b7c60abe83f32c520d0d6106c04df9b27e PiperOrigin-RevId: 681228010 --- .../chaotic_good/client_transport.cc | 84 +++++----- .../chaotic_good/server_transport.cc | 152 +++++++++--------- .../posix_engine/posix_endpoint.cc | 2 +- src/core/lib/transport/promise_endpoint.h | 77 ++++----- src/core/util/latent_see.h | 20 ++- 5 files changed, 187 insertions(+), 148 deletions(-) diff --git a/src/core/ext/transport/chaotic_good/client_transport.cc b/src/core/ext/transport/chaotic_good/client_transport.cc index 28af0d5ba98..29a39c1fbac 100644 --- a/src/core/ext/transport/chaotic_good/client_transport.cc +++ b/src/core/ext/transport/chaotic_good/client_transport.cc @@ -117,7 +117,9 @@ auto ChaoticGoodClientTransport::PushFrameIntoCall(ServerFragmentFrame frame, }); // Wrap the actual sequence with something that owns the call handler so that // its lifetime extends until the push completes. - return [call_handler, push = std::move(push)]() mutable { return push(); }; + return GRPC_LATENT_SEE_PROMISE( + "PushFrameIntoCall", + ([call_handler, push = std::move(push)]() mutable { return push(); })); } auto ChaoticGoodClientTransport::TransportReadLoop( @@ -205,11 +207,15 @@ ChaoticGoodClientTransport::ChaoticGoodClientTransport( party_arena->SetContext( event_engine.get()); party_ = Party::Make(std::move(party_arena)); - party_->Spawn("client-chaotic-writer", TransportWriteLoop(transport), + party_->Spawn("client-chaotic-writer", + GRPC_LATENT_SEE_PROMISE("ClientTransportWriteLoop", + TransportWriteLoop(transport)), OnTransportActivityDone("write_loop")); - party_->Spawn("client-chaotic-reader", - TransportReadLoop(std::move(transport)), - OnTransportActivityDone("read_loop")); + party_->Spawn( + "client-chaotic-reader", + GRPC_LATENT_SEE_PROMISE("ClientTransportReadLoop", + TransportReadLoop(std::move(transport))), + OnTransportActivityDone("read_loop")); } ChaoticGoodClientTransport::~ChaoticGoodClientTransport() { party_.reset(); } @@ -265,38 +271,42 @@ auto ChaoticGoodClientTransport::CallOutboundLoop(uint32_t stream_id, return absl::OkStatus(); }); }; - return TrySeq( - // Wait for initial metadata then send it out. - call_handler.PullClientInitialMetadata(), - [send_fragment](ClientMetadataHandle md) mutable { - 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)); - }, - // Continuously send client frame with client to server messages. - ForEach(OutgoingMessages(call_handler), - [send_fragment, - aligned_bytes = aligned_bytes_](MessageHandle message) mutable { - ClientFragmentFrame frame; - // Construct frame header (flags, header_length and - // trailer_length will be added in serialization). - const uint32_t message_length = message->payload()->Length(); - const uint32_t padding = - message_length % aligned_bytes == 0 - ? 0 - : aligned_bytes - message_length % aligned_bytes; - CHECK_EQ((message_length + padding) % aligned_bytes, 0u); - frame.message = FragmentMessage(std::move(message), padding, - message_length); - return send_fragment(std::move(frame)); - }), - [send_fragment]() mutable { - ClientFragmentFrame frame; - frame.end_of_stream = true; - return send_fragment(std::move(frame)); - }); + return GRPC_LATENT_SEE_PROMISE( + "CallOutboundLoop", + TrySeq( + // Wait for initial metadata then send it out. + call_handler.PullClientInitialMetadata(), + [send_fragment](ClientMetadataHandle md) mutable { + 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)); + }, + // Continuously send client frame with client to server messages. + ForEach(OutgoingMessages(call_handler), + [send_fragment, aligned_bytes = aligned_bytes_]( + MessageHandle message) mutable { + ClientFragmentFrame frame; + // Construct frame header (flags, header_length and + // trailer_length will be added in serialization). + const uint32_t message_length = + message->payload()->Length(); + const uint32_t padding = + message_length % aligned_bytes == 0 + ? 0 + : aligned_bytes - message_length % aligned_bytes; + CHECK_EQ((message_length + padding) % aligned_bytes, 0u); + frame.message = FragmentMessage(std::move(message), padding, + message_length); + return send_fragment(std::move(frame)); + }), + [send_fragment]() mutable { + ClientFragmentFrame frame; + frame.end_of_stream = true; + return send_fragment(std::move(frame)); + })); } void ChaoticGoodClientTransport::StartCall(CallHandler call_handler) { diff --git a/src/core/ext/transport/chaotic_good/server_transport.cc b/src/core/ext/transport/chaotic_good/server_transport.cc index 6588227a264..492dee5c843 100644 --- a/src/core/ext/transport/chaotic_good/server_transport.cc +++ b/src/core/ext/transport/chaotic_good/server_transport.cc @@ -199,25 +199,27 @@ 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) { - 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); - }); + return GRPC_LATENT_SEE_PROMISE( + "CallOutboundLoop", + 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( @@ -269,57 +271,59 @@ auto ChaoticGoodServerTransport::DeserializeAndPushFragmentToExistingCall( } auto ChaoticGoodServerTransport::ReadOneFrame(ChaoticGoodTransport& transport) { - return TrySeq( - transport.ReadFrameBytes(), - [this, transport = - &transport](std::tuple frame_bytes) { - const auto& frame_header = std::get<0>(frame_bytes); - auto& buffers = std::get<1>(frame_bytes); - return Switch( - frame_header.type, - Case(FrameType::kSettings, - []() -> absl::Status { - return absl::InternalError("Unexpected settings frame"); - }), - Case(FrameType::kFragment, - [this, &frame_header, &buffers, transport]() { - return If( - frame_header.flags.is_set(0), - [this, &frame_header, &buffers, transport]() { - return DeserializeAndPushFragmentToNewCall( - frame_header, std::move(buffers), *transport); - }, - [this, &frame_header, &buffers, transport]() { - return DeserializeAndPushFragmentToExistingCall( - frame_header, std::move(buffers), *transport); - }); - }), - Case(FrameType::kCancel, - [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]() { - auto c = std::move(*call_initiator); - return c.SpawnWaitable("cancel", [c]() mutable { - c.Cancel(); - return absl::OkStatus(); - }); - }, - []() -> absl::Status { return absl::OkStatus(); }); - }), - Default([frame_header]() { - return absl::InternalError( - absl::StrCat("Unexpected frame type: ", - static_cast(frame_header.type))); - })); - }, - []() -> LoopCtl { return Continue{}; }); + return GRPC_LATENT_SEE_PROMISE( + "ReadOneFrame", + TrySeq( + transport.ReadFrameBytes(), + [this, transport = &transport]( + std::tuple frame_bytes) { + const auto& frame_header = std::get<0>(frame_bytes); + auto& buffers = std::get<1>(frame_bytes); + return Switch( + frame_header.type, + Case(FrameType::kSettings, + []() -> absl::Status { + return absl::InternalError("Unexpected settings frame"); + }), + Case(FrameType::kFragment, + [this, &frame_header, &buffers, transport]() { + return If( + frame_header.flags.is_set(0), + [this, &frame_header, &buffers, transport]() { + return DeserializeAndPushFragmentToNewCall( + frame_header, std::move(buffers), *transport); + }, + [this, &frame_header, &buffers, transport]() { + return DeserializeAndPushFragmentToExistingCall( + frame_header, std::move(buffers), *transport); + }); + }), + Case(FrameType::kCancel, + [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]() { + auto c = std::move(*call_initiator); + return c.SpawnWaitable("cancel", [c]() mutable { + c.Cancel(); + return absl::OkStatus(); + }); + }, + []() -> absl::Status { return absl::OkStatus(); }); + }), + Default([frame_header]() { + return absl::InternalError( + absl::StrCat("Unexpected frame type: ", + static_cast(frame_header.type))); + })); + }, + []() -> LoopCtl { return Continue{}; })); } auto ChaoticGoodServerTransport::TransportReadLoop( @@ -360,9 +364,13 @@ ChaoticGoodServerTransport::ChaoticGoodServerTransport( party_arena->SetContext( event_engine.get()); party_ = Party::Make(std::move(party_arena)); - party_->Spawn("server-chaotic-writer", TransportWriteLoop(transport), + party_->Spawn("server-chaotic-writer", + GRPC_LATENT_SEE_PROMISE("ServerTransportWriteLoop", + TransportWriteLoop(transport)), OnTransportActivityDone("writer")); - party_->Spawn("server-chaotic-reader", TransportReadLoop(transport), + party_->Spawn("server-chaotic-reader", + GRPC_LATENT_SEE_PROMISE("ServerTransportReadLoop", + TransportReadLoop(transport)), OnTransportActivityDone("reader")); } diff --git a/src/core/lib/event_engine/posix_engine/posix_endpoint.cc b/src/core/lib/event_engine/posix_engine/posix_endpoint.cc index c603f940359..bf6a78bb23c 100644 --- a/src/core/lib/event_engine/posix_engine/posix_endpoint.cc +++ b/src/core/lib/event_engine/posix_engine/posix_endpoint.cc @@ -102,7 +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"); + GRPC_LATENT_SEE_PARENT_SCOPE("TcpSend"); ssize_t sent_length; do { sent_length = sendmsg(fd, msg, SENDMSG_FLAGS | additional_flags); diff --git a/src/core/lib/transport/promise_endpoint.h b/src/core/lib/transport/promise_endpoint.h index 077a1a01f70..0e69b82f7a1 100644 --- a/src/core/lib/transport/promise_endpoint.h +++ b/src/core/lib/transport/promise_endpoint.h @@ -106,24 +106,25 @@ class PromiseEndpoint { return absl::OkStatus(); }; }, - [this]() { - return [write_state = write_state_]() -> Poll { - // If current write isn't finished return `Pending()`, else - // return write result. - WriteState::State expected = WriteState::kWritten; - if (write_state->state.compare_exchange_strong( - expected, WriteState::kIdle, std::memory_order_acquire, - std::memory_order_relaxed)) { - // State was Written, and we changed it to Idle. We can return - // the result. - return std::move(write_state->result); - } - // State was not Written; since we're polling it must be - // Writing. Assert that and return Pending. - CHECK(expected == WriteState::kWriting); - return Pending(); - }; - }); + GRPC_LATENT_SEE_PROMISE( + "DelayedWrite", ([this]() { + return [write_state = write_state_]() -> Poll { + // If current write isn't finished return `Pending()`, else + // return write result. + WriteState::State expected = WriteState::kWritten; + if (write_state->state.compare_exchange_strong( + expected, WriteState::kIdle, std::memory_order_acquire, + std::memory_order_relaxed)) { + // State was Written, and we changed it to Idle. We can return + // the result. + return std::move(write_state->result); + } + // State was not Written; since we're polling it must be + // Writing. Assert that and return Pending. + CHECK(expected == WriteState::kWriting); + return Pending(); + }; + }))); } // Returns a promise that resolves to `SliceBuffer` with @@ -174,25 +175,27 @@ class PromiseEndpoint { return std::move(ret); }; }, - [this, num_bytes]() { - return [read_state = read_state_, - num_bytes]() -> Poll> { - if (!read_state->complete.load(std::memory_order_acquire)) { - return Pending(); - } - // If read succeeds, return `SliceBuffer` with `num_bytes` bytes. - if (read_state->result.ok()) { - SliceBuffer ret; - grpc_slice_buffer_move_first_no_inline( - read_state->buffer.c_slice_buffer(), num_bytes, - ret.c_slice_buffer()); - read_state->complete.store(false, std::memory_order_relaxed); - return std::move(ret); - } - read_state->complete.store(false, std::memory_order_relaxed); - return std::move(read_state->result); - }; - }); + GRPC_LATENT_SEE_PROMISE( + "DelayedRead", ([this, num_bytes]() { + return [read_state = read_state_, + num_bytes]() -> Poll> { + if (!read_state->complete.load(std::memory_order_acquire)) { + return Pending(); + } + // If read succeeds, return `SliceBuffer` with `num_bytes` + // bytes. + if (read_state->result.ok()) { + SliceBuffer ret; + grpc_slice_buffer_move_first_no_inline( + read_state->buffer.c_slice_buffer(), num_bytes, + ret.c_slice_buffer()); + read_state->complete.store(false, std::memory_order_relaxed); + return std::move(ret); + } + read_state->complete.store(false, std::memory_order_relaxed); + return std::move(read_state->result); + }; + }))); } // Returns a promise that resolves to `Slice` with at least diff --git a/src/core/util/latent_see.h b/src/core/util/latent_see.h index cf22a40ed8e..1ace01110a6 100644 --- a/src/core/util/latent_see.h +++ b/src/core/util/latent_see.h @@ -252,12 +252,26 @@ GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION inline void Mark(const Metadata* md) { Log::CurrentThreadBin()->Append(md, EventType::kMark, 0); } +template +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION auto Promise(const Metadata* md_poll, + const Metadata* md_flow, + P promise) { + return [md_poll, md_flow, promise = std::move(promise), + flow = Flow(md_flow)]() mutable { + InnerScope scope(md_poll); + flow.End(); + auto r = promise(); + flow.Begin(md_flow); + return r; + }; +} + } // namespace latent_see } // namespace grpc_core #define GRPC_LATENT_SEE_METADATA(name) \ []() { \ static grpc_core::latent_see::Metadata metadata = {__FILE__, __LINE__, \ - #name}; \ + name}; \ return &metadata; \ }() // Parent scope: logs a begin and end event, and flushes the thread log on scope @@ -277,6 +291,9 @@ GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION inline void Mark(const Metadata* md) { // scope. #define GRPC_LATENT_SEE_MARK(name) \ grpc_core::latent_see::Mark(GRPC_LATENT_SEE_METADATA(name)) +#define GRPC_LATENT_SEE_PROMISE(name, promise) \ + grpc_core::latent_see::Promise(GRPC_LATENT_SEE_METADATA("Poll:" name), \ + GRPC_LATENT_SEE_METADATA(name), promise) #else // !def(GRPC_ENABLE_LATENT_SEE) namespace grpc_core { namespace latent_see { @@ -305,6 +322,7 @@ struct InnerScope { #define GRPC_LATENT_SEE_MARK(name) \ do { \ } while (0) +#define GRPC_LATENT_SEE_PROMISE(name, promise) promise #endif // GRPC_ENABLE_LATENT_SEE #endif // GRPC_SRC_CORE_UTIL_LATENT_SEE_H From 863aca8949c02c244c8fd7dea3a1f9c087c4f110 Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Tue, 1 Oct 2024 18:13:27 -0700 Subject: [PATCH 57/75] [call-v3] Implement failed_before_recv_message() on {Client,Server}Call (#37810) Closes #37810 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37810 from ctiller:CANCELLED 134f49a07b242dc2eaa924e784f9b6d48378c1d4 PiperOrigin-RevId: 681236011 --- src/core/lib/surface/client_call.h | 4 +++- src/core/lib/surface/server_call.h | 4 +++- src/core/lib/transport/call_filters.h | 7 +++++++ src/core/lib/transport/call_spine.h | 8 ++++++++ src/core/lib/transport/call_state.h | 23 +++++++++++++++++++++++ src/core/util/dump_args.h | 13 +++++++++---- test/core/transport/call_state_test.cc | 6 ++++++ 7 files changed, 59 insertions(+), 6 deletions(-) diff --git a/src/core/lib/surface/client_call.h b/src/core/lib/surface/client_call.h index 014eafed11d..8180c273ba2 100644 --- a/src/core/lib/surface/client_call.h +++ b/src/core/lib/surface/client_call.h @@ -98,7 +98,9 @@ class ClientCall final char* GetPeer() override; bool Completed() final { Crash("unimplemented"); } - bool failed_before_recv_message() const final { Crash("unimplemented"); } + bool failed_before_recv_message() const final { + return started_call_initiator_.WasCancelledPushed(); + } grpc_compression_algorithm incoming_compression_algorithm() override { return message_receiver_.incoming_compression_algorithm(); diff --git a/src/core/lib/surface/server_call.h b/src/core/lib/surface/server_call.h index b8e4299731b..dcc9d86606e 100644 --- a/src/core/lib/surface/server_call.h +++ b/src/core/lib/surface/server_call.h @@ -129,7 +129,9 @@ class ServerCall final : public Call, public DualRefCounted { } bool Completed() final { Crash("unimplemented"); } - bool failed_before_recv_message() const final { Crash("unimplemented"); } + bool failed_before_recv_message() const final { + return call_handler_.WasCancelledPushed(); + } uint32_t test_only_message_flags() override { return message_receiver_.last_message_flags(); diff --git a/src/core/lib/transport/call_filters.h b/src/core/lib/transport/call_filters.h index b1a54f5dfec..01d4c7614de 100644 --- a/src/core/lib/transport/call_filters.h +++ b/src/core/lib/transport/call_filters.h @@ -1590,10 +1590,17 @@ class CallFilters { GRPC_MUST_USE_RESULT auto WasCancelled() { return [this]() { return call_state_.PollWasCancelled(); }; } + // Client & server: returns true if server trailing metadata has been pushed + // *and* contained a cancellation, false otherwise. + GRPC_MUST_USE_RESULT bool WasCancelledPushed() const { + return call_state_.WasCancelledPushed(); + } + // Returns true if server trailing metadata has been pulled bool WasServerTrailingMetadataPulled() const { return call_state_.WasServerTrailingMetadataPulled(); } + // Client & server: fill in final_info with the final status of the call. void Finalize(const grpc_call_final_info* final_info); diff --git a/src/core/lib/transport/call_spine.h b/src/core/lib/transport/call_spine.h index 6e8e20146be..c3d5687b971 100644 --- a/src/core/lib/transport/call_spine.h +++ b/src/core/lib/transport/call_spine.h @@ -263,6 +263,10 @@ class CallInitiator { return spine_->SpawnWaitable(name, std::move(promise_factory)); } + bool WasCancelledPushed() const { + return spine_->call_filters().WasCancelledPushed(); + } + Arena* arena() { return spine_->arena(); } Party* party() { return spine_.get(); } @@ -304,6 +308,10 @@ class CallHandler { auto WasCancelled() { return spine_->WasCancelled(); } + bool WasCancelledPushed() const { + return spine_->call_filters().WasCancelledPushed(); + } + template void SpawnGuarded(absl::string_view name, PromiseFactory promise_factory, DebugLocation whence = {}) { diff --git a/src/core/lib/transport/call_state.h b/src/core/lib/transport/call_state.h index d741c541f2f..33eca5e66b4 100644 --- a/src/core/lib/transport/call_state.h +++ b/src/core/lib/transport/call_state.h @@ -52,8 +52,14 @@ class CallState { Poll> PollPullServerToClientMessageAvailable(); void FinishPullServerToClientMessage(); Poll PollServerTrailingMetadataAvailable(); + void FinishPullServerTrailingMetadata(); bool WasServerTrailingMetadataPulled() const; + // Resolves after server trailing metadata has been pulled, to true if the + // call was cancelled, and false otherwise. Poll PollWasCancelled(); + // Return true if server trailing metadata has been pushed *and* that push was + // a cancellation. + bool WasCancelledPushed() const; // Debug std::string DebugString() const; @@ -939,6 +945,23 @@ CallState::PollWasCancelled() { Crash("Unreachable"); } +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION inline bool CallState::WasCancelledPushed() + const { + GRPC_TRACE_LOG(call_state, INFO) + << "[call_state] PollWasCancelledPushed: " + << GRPC_DUMP_ARGS(this, server_trailing_metadata_state_); + switch (server_trailing_metadata_state_) { + case ServerTrailingMetadataState::kNotPushed: + case ServerTrailingMetadataState::kPulled: + case ServerTrailingMetadataState::kPushed: + return false; + case ServerTrailingMetadataState::kPushedCancel: + case ServerTrailingMetadataState::kPulledCancel: + return true; + } + Crash("Unreachable"); +} + } // namespace grpc_core #endif // GRPC_SRC_CORE_LIB_TRANSPORT_CALL_STATE_H diff --git a/src/core/util/dump_args.h b/src/core/util/dump_args.h index 02519075c36..da923e4f060 100644 --- a/src/core/util/dump_args.h +++ b/src/core/util/dump_args.h @@ -78,20 +78,25 @@ class DumpArgs { return 0; } - int AddDumper(void** p) { + int AddDumper(void const* const* 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)); + int AddDumper(T const* const* p) { + return AddDumper(reinterpret_cast(p)); } template int AddDumper(T* const* p) { - return AddDumper(const_cast(p)); + return AddDumper(const_cast(p)); + } + + template + int AddDumper(T const** p) { + return AddDumper(const_cast(p)); } void Stringify(CustomSink& sink) const; diff --git a/test/core/transport/call_state_test.cc b/test/core/transport/call_state_test.cc index c8dcca2825b..fcdf91b2818 100644 --- a/test/core/transport/call_state_test.cc +++ b/test/core/transport/call_state_test.cc @@ -262,11 +262,14 @@ TEST(CallStateTest, RecallNoCancellation) { activity.Activate(); CallState state; state.Start(); + EXPECT_EQ(state.WasCancelledPushed(), false); state.PushServerTrailingMetadata(false); + EXPECT_EQ(state.WasCancelledPushed(), false); EXPECT_THAT(state.PollPullServerInitialMetadataAvailable(), IsReady(false)); state.FinishPullServerInitialMetadata(); EXPECT_THAT(state.PollServerTrailingMetadataAvailable(), IsReady()); EXPECT_THAT(state.PollWasCancelled(), IsReady(false)); + EXPECT_EQ(state.WasCancelledPushed(), false); } TEST(CallStateTest, RecallCancellation) { @@ -274,11 +277,14 @@ TEST(CallStateTest, RecallCancellation) { activity.Activate(); CallState state; state.Start(); + EXPECT_EQ(state.WasCancelledPushed(), false); state.PushServerTrailingMetadata(true); + EXPECT_EQ(state.WasCancelledPushed(), true); EXPECT_THAT(state.PollPullServerInitialMetadataAvailable(), IsReady(false)); state.FinishPullServerInitialMetadata(); EXPECT_THAT(state.PollServerTrailingMetadataAvailable(), IsReady()); EXPECT_THAT(state.PollWasCancelled(), IsReady(true)); + EXPECT_EQ(state.WasCancelledPushed(), true); } TEST(CallStateTest, ReceiveTrailingMetadataAfterMessageRead) { From adc7affc2d84c5c932158e903596415d3e1a6742 Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Tue, 1 Oct 2024 18:14:17 -0700 Subject: [PATCH 58/75] [resource-quota] Add metrics for number of calls, connections dropped due to quota exceeded (#37833) Closes #37833 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37833 from ctiller:statty f0499160867d52d4d18b679497749ae7c2a6cd86 PiperOrigin-RevId: 681236201 --- .../transport/chttp2/transport/chttp2_transport.cc | 2 ++ src/core/telemetry/stats_data.cc | 13 +++++++++++++ src/core/telemetry/stats_data.h | 13 +++++++++++++ src/core/telemetry/stats_data.yaml | 5 +++++ 4 files changed, 33 insertions(+) diff --git a/src/core/ext/transport/chttp2/transport/chttp2_transport.cc b/src/core/ext/transport/chttp2/transport/chttp2_transport.cc index e4b0b1fdf25..4087efcf6dd 100644 --- a/src/core/ext/transport/chttp2/transport/chttp2_transport.cc +++ b/src/core/ext/transport/chttp2/transport/chttp2_transport.cc @@ -3110,6 +3110,7 @@ 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 + grpc_core::global_stats().IncrementRqConnectionsDropped(); GRPC_TRACE_LOG(resource_quota, INFO) << "HTTP2: " << t->peer_string.as_string_view() << " - send goaway to free memory"; @@ -3139,6 +3140,7 @@ static void destructive_reclaimer_locked( GRPC_TRACE_LOG(resource_quota, INFO) << "HTTP2: " << t->peer_string.as_string_view() << " - abandon stream id " << s->id; + grpc_core::global_stats().IncrementRqCallsDropped(); grpc_chttp2_cancel_stream( t.get(), s, grpc_error_set_int(GRPC_ERROR_CREATE("Buffers full"), diff --git a/src/core/telemetry/stats_data.cc b/src/core/telemetry/stats_data.cc index b39702f4762..a357b674844 100644 --- a/src/core/telemetry/stats_data.cc +++ b/src/core/telemetry/stats_data.cc @@ -128,6 +128,8 @@ const absl::string_view "client_subchannels_created", "server_channels_created", "insecure_connections_created", + "rq_connections_dropped", + "rq_calls_dropped", "syscall_write", "syscall_read", "tcp_read_alloc_8k", @@ -165,6 +167,8 @@ const absl::string_view GlobalStats::counter_doc[static_cast( "Number of client subchannels created", "Number of server channels created", "Number of insecure connections created", + "Number of connections dropped due to resource quota exceeded", + "Number of calls dropped due to resource quota exceeded", "Number of write syscalls (or equivalent - eg sendmsg) made by this " "process", "Number of read syscalls (or equivalent - eg recvmsg) made by this process", @@ -464,6 +468,8 @@ GlobalStats::GlobalStats() client_subchannels_created{0}, server_channels_created{0}, insecure_connections_created{0}, + rq_connections_dropped{0}, + rq_calls_dropped{0}, syscall_write{0}, syscall_read{0}, tcp_read_alloc_8k{0}, @@ -601,6 +607,10 @@ std::unique_ptr GlobalStatsCollector::Collect() const { data.server_channels_created.load(std::memory_order_relaxed); result->insecure_connections_created += data.insecure_connections_created.load(std::memory_order_relaxed); + result->rq_connections_dropped += + data.rq_connections_dropped.load(std::memory_order_relaxed); + result->rq_calls_dropped += + data.rq_calls_dropped.load(std::memory_order_relaxed); result->syscall_write += data.syscall_write.load(std::memory_order_relaxed); result->syscall_read += data.syscall_read.load(std::memory_order_relaxed); result->tcp_read_alloc_8k += @@ -716,6 +726,9 @@ std::unique_ptr GlobalStats::Diff(const GlobalStats& other) const { server_channels_created - other.server_channels_created; result->insecure_connections_created = insecure_connections_created - other.insecure_connections_created; + result->rq_connections_dropped = + rq_connections_dropped - other.rq_connections_dropped; + result->rq_calls_dropped = rq_calls_dropped - other.rq_calls_dropped; result->syscall_write = syscall_write - other.syscall_write; result->syscall_read = syscall_read - other.syscall_read; result->tcp_read_alloc_8k = tcp_read_alloc_8k - other.tcp_read_alloc_8k; diff --git a/src/core/telemetry/stats_data.h b/src/core/telemetry/stats_data.h index d0e7e5fd267..1ac7579a994 100644 --- a/src/core/telemetry/stats_data.h +++ b/src/core/telemetry/stats_data.h @@ -206,6 +206,8 @@ struct GlobalStats { kClientSubchannelsCreated, kServerChannelsCreated, kInsecureConnectionsCreated, + kRqConnectionsDropped, + kRqCallsDropped, kSyscallWrite, kSyscallRead, kTcpReadAlloc8k, @@ -283,6 +285,8 @@ struct GlobalStats { uint64_t client_subchannels_created; uint64_t server_channels_created; uint64_t insecure_connections_created; + uint64_t rq_connections_dropped; + uint64_t rq_calls_dropped; uint64_t syscall_write; uint64_t syscall_read; uint64_t tcp_read_alloc_8k; @@ -373,6 +377,13 @@ class GlobalStatsCollector { data_.this_cpu().insecure_connections_created.fetch_add( 1, std::memory_order_relaxed); } + void IncrementRqConnectionsDropped() { + data_.this_cpu().rq_connections_dropped.fetch_add( + 1, std::memory_order_relaxed); + } + void IncrementRqCallsDropped() { + data_.this_cpu().rq_calls_dropped.fetch_add(1, std::memory_order_relaxed); + } void IncrementSyscallWrite() { data_.this_cpu().syscall_write.fetch_add(1, std::memory_order_relaxed); } @@ -562,6 +573,8 @@ class GlobalStatsCollector { std::atomic client_subchannels_created{0}; std::atomic server_channels_created{0}; std::atomic insecure_connections_created{0}; + std::atomic rq_connections_dropped{0}; + std::atomic rq_calls_dropped{0}; std::atomic syscall_write{0}; std::atomic syscall_read{0}; std::atomic tcp_read_alloc_8k{0}; diff --git a/src/core/telemetry/stats_data.yaml b/src/core/telemetry/stats_data.yaml index 6b1f04878d0..c9580cded0b 100644 --- a/src/core/telemetry/stats_data.yaml +++ b/src/core/telemetry/stats_data.yaml @@ -32,6 +32,11 @@ doc: Number of server channels created - counter: insecure_connections_created doc: Number of insecure connections created +# resource quota +- counter: rq_connections_dropped + doc: Number of connections dropped due to resource quota exceeded +- counter: rq_calls_dropped + doc: Number of calls dropped due to resource quota exceeded # tcp - counter: syscall_write doc: Number of write syscalls (or equivalent - eg sendmsg) made by this process From d87165acf4c401ce1d71c8276ea4e975e685362c Mon Sep 17 00:00:00 2001 From: Yash Tibrewal Date: Wed, 2 Oct 2024 12:33:26 -0700 Subject: [PATCH 59/75] [chttp2_server] Fix race between connection starting and it being orphaned (#37683) Sample race - https://btx.cloud.google.com/invocations/0c4e65f2-3a38-4b4f-b67e-c53a4a4650ea/targets/%2F%2Ftest%2Fcore%2Fend2end:connectivity_test@poller%3Dpoll;config=2aed862ff4fd4384687d63aa95df415c7cb955355c2ab6dc6c6d7a9d123a76ec/log ``` WARNING: ThreadSanitizer: data race (pid=18) Write of size 8 at 0x72300000c318 by thread T29: #0 grpc_core::Chttp2ServerListener* std::__exchange(grpc_core::Chttp2ServerListener*&, grpc_core::Chttp2ServerListener*&) /usr/lib/gcc/x86_64-linux-gnu/9/../../../../include/c++/9/bits/move.h:152:13 (libsrc_Score_Slibgrpc_Utransport_Uchttp2_Userver.so+0x68c85) #1 grpc_core::Chttp2ServerListener* std::exchange(grpc_core::Chttp2ServerListener*&, grpc_core::Chttp2ServerListener*&) /usr/lib/gcc/x86_64-linux-gnu/9/../../../../include/c++/9/utility:287:14 (libsrc_Score_Slibgrpc_Utransport_Uchttp2_Userver.so+0x68c05) #2 grpc_core::RefCountedPtr::reset(grpc_core::Chttp2ServerListener*) /proc/self/cwd/./src/core/lib/gprpp/ref_counted_ptr.h:126:20 (libsrc_Score_Slibgrpc_Utransport_Uchttp2_Userver.so+0x68b32) #3 grpc_core::RefCountedPtr::operator=(grpc_core::RefCountedPtr&&) /proc/self/cwd/./src/core/lib/gprpp/ref_counted_ptr.h:66:5 (libsrc_Score_Slibgrpc_Utransport_Uchttp2_Userver.so+0x54380) #4 grpc_core::Chttp2ServerListener::ActiveConnection::Start(grpc_core::RefCountedPtr, std::unique_ptr, grpc_core::ChannelArgs const&) /proc/self/cwd/src/core/ext/transport/chttp2/server/chttp2_server.cc:615:13 (libsrc_Score_Slibgrpc_Utransport_Uchttp2_Userver.so+0x48914) #5 grpc_core::Chttp2ServerListener::OnAccept(void*, grpc_endpoint*, grpc_pollset*, grpc_tcp_server_acceptor*) /proc/self/cwd/src/core/ext/transport/chttp2/server/chttp2_server.cc:881:21 (libsrc_Score_Slibgrpc_Utransport_Uchttp2_Userver.so+0x49ce2) #6 CreateEventEngineListener(grpc_tcp_server*, grpc_closure*, grpc_event_engine::experimental::EndpointConfig const&, grpc_tcp_server**)::$_2::operator()(std::unique_ptr>, grpc_event_engine::experimental::MemoryAllocator) const /proc/self/cwd/src/core/lib/iomgr/tcp_server_posix.cc:228:11 (liblibiomgr.so+0xef627) #7 decltype(std::declval()(std::declval>>(), std::declval())) absl::lts_20240116::base_internal::Callable::Invoke>, grpc_event_engine::experimental::MemoryAllocator>(CreateEventEngineListener(grpc_tcp_server*, grpc_closure*, grpc_event_engine::experimental::EndpointConfig const&, grpc_tcp_server**)::$_2&, std::unique_ptr>&&, grpc_event_engine::experimental::MemoryAllocator&&) /proc/self/cwd/external/com_google_absl/absl/base/internal/invoke.h:185:12 (liblibiomgr.so+0xef3c2) #8 decltype(Invoker>, grpc_event_engine::experimental::MemoryAllocator>::type::Invoke(std::declval(), std::declval>>(), std::declval())) absl::lts_20240116::base_internal::invoke>, grpc_event_engine::experimental::MemoryAllocator>(CreateEventEngineListener(grpc_tcp_server*, grpc_closure*, grpc_event_engine::experimental::EndpointConfig const&, grpc_tcp_server**)::$_2&, std::unique_ptr>&&, grpc_event_engine::experimental::MemoryAllocator&&) /proc/self/cwd/external/com_google_absl/absl/base/internal/invoke.h:212:10 (liblibiomgr.so+0xef325) #9 void absl::lts_20240116::internal_any_invocable::InvokeR>, grpc_event_engine::experimental::MemoryAllocator, void>(CreateEventEngineListener(grpc_tcp_server*, grpc_closure*, grpc_event_engine::experimental::EndpointConfig const&, grpc_tcp_server**)::$_2&, std::unique_ptr>&&, grpc_event_engine::experimental::MemoryAllocator&&) /proc/self/cwd/external/com_google_absl/absl/functional/internal/any_invocable.h:132:3 (liblibiomgr.so+0xef2b5) #10 void absl::lts_20240116::internal_any_invocable::LocalInvoker>, grpc_event_engine::experimental::MemoryAllocator>(absl::lts_20240116::internal_any_invocable::TypeErasedState*, absl::lts_20240116::internal_any_invocable::ForwardedParameter>>::type, absl::lts_20240116::internal_any_invocable::ForwardedParameter::type) /proc/self/cwd/external/com_google_absl/absl/functional/internal/any_invocable.h:310:10 (liblibiomgr.so+0xef1e2) #11 absl::lts_20240116::internal_any_invocable::Impl>, grpc_event_engine::experimental::MemoryAllocator)>::operator()(std::unique_ptr>, grpc_event_engine::experimental::MemoryAllocator) /proc/self/cwd/external/com_google_absl/absl/functional/internal/any_invocable.h:868:1 (libsrc_Score_Slibposix_Uevent_Uengine.so+0xa754f) #12 grpc_event_engine::experimental::ThreadyEventEngine::CreateListener(absl::lts_20240116::AnyInvocable>, grpc_event_engine::experimental::MemoryAllocator)>, absl::lts_20240116::AnyInvocable, grpc_event_engine::experimental::EndpointConfig const&, std::unique_ptr>)::$_0::operator()(std::unique_ptr>, grpc_event_engine::experimental::MemoryAllocator) const::'lambda'()::operator()() /proc/self/cwd/src/core/lib/event_engine/thready_event_engine/thready_event_engine.cc:61:15 (libsrc_Score_Slibthready_Uevent_Uengine.so+0x27cdb) #13 decltype(std::declval>, grpc_event_engine::experimental::MemoryAllocator)>, absl::lts_20240116::AnyInvocable, grpc_event_engine::experimental::EndpointConfig const&, std::unique_ptr>)::$_0::operator()(std::unique_ptr>, grpc_event_engine::experimental::MemoryAllocator) const::'lambda'()&>()()) absl::lts_20240116::base_internal::Callable::Invoke>, grpc_event_engine::experimental::MemoryAllocator)>, absl::lts_20240116::AnyInvocable, grpc_event_engine::experimental::EndpointConfig const&, std::unique_ptr>)::$_0::operator()(std::unique_ptr>, grpc_event_engine::experimental::MemoryAllocator) const::'lambda'()&>(grpc_event_engine::experimental::ThreadyEventEngine::CreateListener(absl::lts_20240116::AnyInvocable>, grpc_event_engine::experimental::MemoryAllocator)>, absl::lts_20240116::AnyInvocable, grpc_event_engine::experimental::EndpointConfig const&, std::unique_ptr>)::$_0::operator()(std::unique_ptr>, grpc_event_engine::experimental::MemoryAllocator) const::'lambda'()&) /proc/self/cwd/external/com_google_absl/absl/base/internal/invoke.h:185:12 (libsrc_Score_Slibthready_Uevent_Uengine.so+0x27c45) #14 decltype(Invoker>, grpc_event_engine::experimental::MemoryAllocator)>, absl::lts_20240116::AnyInvocable, grpc_event_engine::experimental::EndpointConfig const&, std::unique_ptr>)::$_0::operator()(std::unique_ptr>, grpc_event_engine::experimental::MemoryAllocator) const::'lambda'()&>::type::Invoke(std::declval>, grpc_event_engine::experimental::MemoryAllocator)>, absl::lts_20240116::AnyInvocable, grpc_event_engine::experimental::EndpointConfig const&, std::unique_ptr>)::$_0::operator()(std::unique_ptr>, grpc_event_engine::experimental::MemoryAllocator) const::'lambda'()&>())) absl::lts_20240116::base_internal::invoke>, grpc_event_engine::experimental::MemoryAllocator)>, absl::lts_20240116::AnyInvocable, grpc_event_engine::experimental::EndpointConfig const&, std::unique_ptr>)::$_0::operator()(std::unique_ptr>, grpc_event_engine::experimental::MemoryAllocator) const::'lambda'()&>(grpc_event_engine::experimental::ThreadyEventEngine::CreateListener(absl::lts_20240116::AnyInvocable>, grpc_event_engine::experimental::MemoryAllocator)>, absl::lts_20240116::AnyInvocable, grpc_event_engine::experimental::EndpointConfig const&, std::unique_ptr>)::$_0::operator()(std::unique_ptr>, grpc_event_engine::experimental::MemoryAllocator) const::'lambda'()&) /proc/self/cwd/external/com_google_absl/absl/base/internal/invoke.h:212:10 (libsrc_Score_Slibthready_Uevent_Uengine.so+0x27bf5) #15 void absl::lts_20240116::internal_any_invocable::InvokeR>, grpc_event_engine::experimental::MemoryAllocator)>, absl::lts_20240116::AnyInvocable, grpc_event_engine::experimental::EndpointConfig const&, std::unique_ptr>)::$_0::operator()(std::unique_ptr>, grpc_event_engine::experimental::MemoryAllocator) const::'lambda'()&, void>(grpc_event_engine::experimental::ThreadyEventEngine::CreateListener(absl::lts_20240116::AnyInvocable>, grpc_event_engine::experimental::MemoryAllocator)>, absl::lts_20240116::AnyInvocable, grpc_event_engine::experimental::EndpointConfig const&, std::unique_ptr>)::$_0::operator()(std::unique_ptr>, grpc_event_engine::experimental::MemoryAllocator) const::'lambda'()&) /proc/self/cwd/external/com_google_absl/absl/functional/internal/any_invocable.h:132:3 (libsrc_Score_Slibthready_Uevent_Uengine.so+0x27ba5) #16 void absl::lts_20240116::internal_any_invocable::RemoteInvoker>, grpc_event_engine::experimental::MemoryAllocator)>, absl::lts_20240116::AnyInvocable, grpc_event_engine::experimental::EndpointConfig const&, std::unique_ptr>)::$_0::operator()(std::unique_ptr>, grpc_event_engine::experimental::MemoryAllocator) const::'lambda'()&>(absl::lts_20240116::internal_any_invocable::TypeErasedState*) /proc/self/cwd/external/com_google_absl/absl/functional/internal/any_invocable.h:368:10 (libsrc_Score_Slibthready_Uevent_Uengine.so+0x279cd) #17 absl::lts_20240116::internal_any_invocable::Impl::operator()() /proc/self/cwd/external/com_google_absl/absl/functional/internal/any_invocable.h:868:1 (libtest_Score_Send2end_Slibconnectivity_Ulibrary.so+0x337ff) #18 grpc_core::Thread::Thread(char const*, absl::lts_20240116::AnyInvocable, bool*, grpc_core::Thread::Options const&)::'lambda'(void*)::operator()(void*) const /proc/self/cwd/./src/core/lib/gprpp/thd.h:108:15 (libsrc_Score_Slibthready_Uevent_Uengine.so+0x2e264) #19 grpc_core::Thread::Thread(char const*, absl::lts_20240116::AnyInvocable, bool*, grpc_core::Thread::Options const&)::'lambda'(void*)::__invoke(void*) /proc/self/cwd/./src/core/lib/gprpp/thd.h:105:13 (libsrc_Score_Slibthready_Uevent_Uengine.so+0x2e1e9) #20 grpc_core::(anonymous namespace)::ThreadInternalsPosix::ThreadInternalsPosix(char const*, void (*)(void*), void*, bool*, grpc_core::Thread::Options const&)::'lambda'(void*)::operator()(void*) const /proc/self/cwd/src/core/lib/gprpp/posix/thd.cc:148:11 (liblibgpr.so+0x1d830) #21 grpc_core::(anonymous namespace)::ThreadInternalsPosix::ThreadInternalsPosix(char const*, void (*)(void*), void*, bool*, grpc_core::Thread::Options const&)::'lambda'(void*)::__invoke(void*) /proc/self/cwd/src/core/lib/gprpp/posix/thd.cc:118:9 (liblibgpr.so+0x1d659) Previous read of size 8 at 0x72300000c318 by main thread: #0 grpc_core::RefCountedPtr::operator!=(std::nullptr_t) const /proc/self/cwd/./src/core/lib/gprpp/ref_counted_ptr.h:192:50 (libsrc_Score_Slibgrpc_Utransport_Uchttp2_Userver.so+0x52345) #1 grpc_core::Chttp2ServerListener::ActiveConnection::HandshakingState::~HandshakingState() /proc/self/cwd/src/core/ext/transport/chttp2/server/chttp2_server.cc:394:30 (libsrc_Score_Slibgrpc_Utransport_Uchttp2_Userver.so+0x463ed) #2 std::enable_if::value, grpc_core::Chttp2ServerListener::ActiveConnection::HandshakingState*>::type grpc_event_engine::experimental::MemoryAllocator::New, grpc_pollset*&, std::unique_ptr, grpc_core::ChannelArgs const&>(grpc_core::RefCountedPtr&&, grpc_pollset*&, std::unique_ptr&&, grpc_core::ChannelArgs const&)::Wrapper::~Wrapper() /proc/self/cwd/include/grpc/event_engine/memory_allocator.h:117:65 (libsrc_Score_Slibgrpc_Utransport_Uchttp2_Userver.so+0x67a1c) #3 std::enable_if::value, grpc_core::Chttp2ServerListener::ActiveConnection::HandshakingState*>::type grpc_event_engine::experimental::MemoryAllocator::New, grpc_pollset*&, std::unique_ptr, grpc_core::ChannelArgs const&>(grpc_core::RefCountedPtr&&, grpc_pollset*&, std::unique_ptr&&, grpc_core::ChannelArgs const&)::Wrapper::~Wrapper() /proc/self/cwd/include/grpc/event_engine/memory_allocator.h:117:27 (libsrc_Score_Slibgrpc_Utransport_Uchttp2_Userver.so+0x67a59) #4 void grpc_core::UnrefDelete::operator()(grpc_core::Chttp2ServerListener::ActiveConnection::HandshakingState*) const /proc/self/cwd/./src/core/lib/gprpp/ref_counted.h:224:5 (libsrc_Score_Slibgrpc_Utransport_Uchttp2_Userver.so+0x6449d) #5 grpc_core::InternallyRefCounted::Unref() /proc/self/cwd/./src/core/lib/gprpp/orphanable.h:132:7 (libsrc_Score_Slibgrpc_Utransport_Uchttp2_Userver.so+0x52581) #6 grpc_core::Chttp2ServerListener::ActiveConnection::HandshakingState::Orphan() /proc/self/cwd/src/core/ext/transport/chttp2/server/chttp2_server.cc:407:3 (libsrc_Score_Slibgrpc_Utransport_Uchttp2_Userver.so+0x466ac) #7 void grpc_core::OrphanableDelete::operator()(grpc_core::Chttp2ServerListener::ActiveConnection::HandshakingState*) /proc/self/cwd/./src/core/lib/gprpp/orphanable.h:60:8 (libsrc_Score_Slibgrpc_Utransport_Uchttp2_Userver.so+0x653b1) #8 std::unique_ptr::~unique_ptr() /usr/lib/gcc/x86_64-linux-gnu/9/../../../../include/c++/9/bits/unique_ptr.h:292:4 (libsrc_Score_Slibgrpc_Utransport_Uchttp2_Userver.so+0x53ddf) #9 grpc_core::Chttp2ServerListener::ActiveConnection::Orphan() /proc/self/cwd/src/core/ext/transport/chttp2/server/chttp2_server.cc:581:1 (libsrc_Score_Slibgrpc_Utransport_Uchttp2_Userver.so+0x487db) #10 void grpc_core::OrphanableDelete::operator()(grpc_core::Chttp2ServerListener::ActiveConnection*) /proc/self/cwd/./src/core/lib/gprpp/orphanable.h:60:8 (libsrc_Score_Slibgrpc_Utransport_Uchttp2_Userver.so+0x66b01) #11 std::unique_ptr::~unique_ptr() /usr/lib/gcc/x86_64-linux-gnu/9/../../../../include/c++/9/bits/unique_ptr.h:292:4 (libsrc_Score_Slibgrpc_Utransport_Uchttp2_Userver.so+0x53d1f) #12 std::pair>::~pair() /usr/lib/gcc/x86_64-linux-gnu/9/../../../../include/c++/9/bits/stl_pair.h:208:12 (libsrc_Score_Slibgrpc_Utransport_Uchttp2_Userver.so+0x597f9) #13 void __gnu_cxx::new_allocator>>>::destroy>>(std::pair>*) /usr/lib/gcc/x86_64-linux-gnu/9/../../../../include/c++/9/ext/new_allocator.h:152:10 (libsrc_Score_Slibgrpc_Utransport_Uchttp2_Userver.so+0x597c1) #14 void std::allocator_traits>>>>::destroy>>(std::allocator>>>&, std::pair>*) /usr/lib/gcc/x86_64-linux-gnu/9/../../../../include/c++/9/bits/alloc_traits.h:496:8 (libsrc_Score_Slibgrpc_Utransport_Uchttp2_Userver.so+0x59725) #15 std::_Rb_tree>, std::_Select1st>>, std::less, std::allocator>>>::_M_destroy_node(std::_Rb_tree_node>>*) /usr/lib/gcc/x86_64-linux-gnu/9/../../../../include/c++/9/bits/stl_tree.h:642:2 (libsrc_Score_Slibgrpc_Utransport_Uchttp2_Userver.so+0x59674) #16 std::_Rb_tree>, std::_Select1st>>, std::less, std::allocator>>>::_M_drop_node(std::_Rb_tree_node>>*) /usr/lib/gcc/x86_64-linux-gnu/9/../../../../include/c++/9/bits/stl_tree.h:650:2 (libsrc_Score_Slibgrpc_Utransport_Uchttp2_Userver.so+0x595f9) #17 std::_Rb_tree>, std::_Select1st>>, std::less, std::allocator>>>::_M_erase(std::_Rb_tree_node>>*) /usr/lib/gcc/x86_64-linux-gnu/9/../../../../include/c++/9/bits/stl_tree.h:1920:4 (libsrc_Score_Slibgrpc_Utransport_Uchttp2_Userver.so+0x5945f) #18 std::_Rb_tree>, std::_Select1st>>, std::less, std::allocator>>>::~_Rb_tree() /usr/lib/gcc/x86_64-linux-gnu/9/../../../../include/c++/9/bits/stl_tree.h:1000:9 (libsrc_Score_Slibgrpc_Utransport_Uchttp2_Userver.so+0x593c5) #19 std::map, std::less, std::allocator>>>::~map() /usr/lib/gcc/x86_64-linux-gnu/9/../../../../include/c++/9/bits/stl_map.h:300:22 (libsrc_Score_Slibgrpc_Utransport_Uchttp2_Userver.so+0x51525) #20 grpc_core::Chttp2ServerListener::Orphan() /proc/self/cwd/src/core/ext/transport/chttp2/server/chttp2_server.cc:923:1 (libsrc_Score_Slibgrpc_Utransport_Uchttp2_Userver.so+0x4b5dd) #21 void grpc_core::OrphanableDelete::operator()(grpc_core::Server::ListenerInterface*) /proc/self/cwd/./src/core/lib/gprpp/orphanable.h:60:8 (libsrc_Score_Slibchaotic_Ugood_Userver.so+0x1d0981) #22 std::unique_ptr::reset(grpc_core::Server::ListenerInterface*) /usr/lib/gcc/x86_64-linux-gnu/9/../../../../include/c++/9/bits/unique_ptr.h:402:4 (liblibserver.so+0x1d5c21) #23 grpc_core::Server::StopListening() /proc/self/cwd/src/core/server/server.cc:1211:23 (liblibserver.so+0x1b9c62) #24 grpc_core::Server::ShutdownAndNotify(grpc_completion_queue*, void*) /proc/self/cwd/src/core/server/server.cc:1195:3 (liblibserver.so+0x1b97da) #25 grpc_server_shutdown_and_notify /proc/self/cwd/src/core/server/server.cc:1829:37 (liblibserver.so+0x1bf212) #26 grpc_core::CoreEnd2endTest::ShutdownServerAndNotify(int) /proc/self/cwd/./test/core/end2end/end2end_tests.h:459:5 (libtest_Score_Send2end_Slibconnectivity_Ulibrary.so+0x33370) #27 grpc_core::(anonymous namespace)::CoreEnd2endTest_RetryHttp2Test_ConnectivityWatch::RunTest() /proc/self/cwd/test/core/end2end/tests/connectivity.cc:74:3 (libtest_Score_Send2end_Slibconnectivity_Ulibrary.so+0x2ee8d) #28 grpc_core::(anonymous namespace)::CoreEnd2endTest_RetryHttp2Test_ConnectivityWatch::TestBody() /proc/self/cwd/test/core/end2end/tests/connectivity.cc:32:1 (libtest_Score_Send2end_Slibconnectivity_Ulibrary.so+0x2dc96) #29 void testing::internal::HandleSehExceptionsInMethodIfSupported(testing::Test*, void (testing::Test::*)(), char const*) /proc/self/cwd/external/com_google_googletest/googletest/src/gtest.cc:2612:10 (libexternal_Scom_Ugoogle_Ugoogletest_Slibgtest.so+0x16d2dc) #30 void testing::internal::HandleExceptionsInMethodIfSupported(testing::Test*, void (testing::Test::*)(), char const*) /proc/self/cwd/external/com_google_googletest/googletest/src/gtest.cc:2648:14 (libexternal_Scom_Ugoogle_Ugoogletest_Slibgtest.so+0x14a51d) #31 testing::Test::Run() /proc/self/cwd/external/com_google_googletest/googletest/src/gtest.cc:2687:5 (libexternal_Scom_Ugoogle_Ugoogletest_Slibgtest.so+0x120458) #32 testing::TestInfo::Run() /proc/self/cwd/external/com_google_googletest/googletest/src/gtest.cc:2836:11 (libexternal_Scom_Ugoogle_Ugoogletest_Slibgtest.so+0x1215f3) #33 testing::TestSuite::Run() /proc/self/cwd/external/com_google_googletest/googletest/src/gtest.cc:3015:30 (libexternal_Scom_Ugoogle_Ugoogletest_Slibgtest.so+0x12230c) #34 testing::internal::UnitTestImpl::RunAllTests() /proc/self/cwd/external/com_google_googletest/googletest/src/gtest.cc:5921:44 (libexternal_Scom_Ugoogle_Ugoogletest_Slibgtest.so+0x138142) #35 bool testing::internal::HandleSehExceptionsInMethodIfSupported(testing::internal::UnitTestImpl*, bool (testing::internal::UnitTestImpl::*)(), char const*) /proc/self/cwd/external/com_google_googletest/googletest/src/gtest.cc:2612:10 (libexternal_Scom_Ugoogle_Ugoogletest_Slibgtest.so+0x17508f) #36 bool testing::internal::HandleExceptionsInMethodIfSupported(testing::internal::UnitTestImpl*, bool (testing::internal::UnitTestImpl::*)(), char const*) /proc/self/cwd/external/com_google_googletest/googletest/src/gtest.cc:2648:14 (libexternal_Scom_Ugoogle_Ugoogletest_Slibgtest.so+0x14e5b3) #37 testing::UnitTest::Run() /proc/self/cwd/external/com_google_googletest/googletest/src/gtest.cc:5485:10 (libexternal_Scom_Ugoogle_Ugoogletest_Slibgtest.so+0x13795b) #38 RUN_ALL_TESTS() /proc/self/cwd/external/com_google_googletest/googletest/include/gtest/gtest.h:2316:73 (libtest_Score_Send2end_Slibend2end_Utest_Umain.so+0x8457) #39 main /proc/self/cwd/test/core/end2end/end2end_test_main.cc:50:10 (libtest_Score_Send2end_Slibend2end_Utest_Umain.so+0x77b6) ``` We start the connection outside the critical region and that's where we supply the listener ref to the connection. There is a freak case where the connection can be orphaned due to the listener stopping to serve and the `Orphan()` would also be trying to access the listener ref resulting in a race. Closes #37683 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37683 from yashykt:FixChttp2ServerRace e3c452984f9c2fa0b9ea425fbd8b58d285d1fc5f PiperOrigin-RevId: 681552145 --- .../transport/chttp2/server/chttp2_server.cc | 47 +++++++++++-------- 1 file changed, 27 insertions(+), 20 deletions(-) diff --git a/src/core/ext/transport/chttp2/server/chttp2_server.cc b/src/core/ext/transport/chttp2/server/chttp2_server.cc index 3ebc5758950..ac0562c4117 100644 --- a/src/core/ext/transport/chttp2/server/chttp2_server.cc +++ b/src/core/ext/transport/chttp2/server/chttp2_server.cc @@ -207,7 +207,8 @@ class Chttp2ServerListener : public Server::ListenerInterface { grpc_pollset_set* const interested_parties_; }; - ActiveConnection(grpc_pollset* accepting_pollset, AcceptorPtr acceptor, + ActiveConnection(RefCountedPtr listener, + grpc_pollset* accepting_pollset, AcceptorPtr acceptor, EventEngine* event_engine, const ChannelArgs& args, MemoryOwner memory_owner); @@ -215,8 +216,7 @@ class Chttp2ServerListener : public Server::ListenerInterface { void SendGoAway(); - void Start(RefCountedPtr listener, - OrphanablePtr endpoint, const ChannelArgs& args); + void Start(OrphanablePtr endpoint, const ChannelArgs& args); // Needed to be able to grab an external ref in // Chttp2ServerListener::OnAccept() @@ -228,6 +228,9 @@ class Chttp2ServerListener : public Server::ListenerInterface { RefCountedPtr listener_; Mutex mu_ ABSL_ACQUIRED_AFTER(&listener_->mu_); + // Was ActiveConnection::Start() invoked? Used to determine whether + // tcp_server needs to be unreffed. + bool connection_started_ ABSL_GUARDED_BY(&mu_) = false; // Set by HandshakingState before the handshaking begins and reset when // handshaking is done. OrphanablePtr handshaking_state_ ABSL_GUARDED_BY(&mu_); @@ -390,11 +393,16 @@ Chttp2ServerListener::ActiveConnection::HandshakingState::HandshakingState( } Chttp2ServerListener::ActiveConnection::HandshakingState::~HandshakingState() { + bool connection_started = false; + { + MutexLock lock(&connection_->mu_); + connection_started = connection_->connection_started_; + } if (accepting_pollset_ != nullptr) { grpc_pollset_set_del_pollset(interested_parties_, accepting_pollset_); } grpc_pollset_set_destroy(interested_parties_); - if (connection_->listener_ != nullptr && + if (connection_started && connection_->listener_ != nullptr && connection_->listener_->tcp_server_ != nullptr) { grpc_tcp_server_unref(connection_->listener_->tcp_server_); } @@ -566,10 +574,12 @@ void Chttp2ServerListener::ActiveConnection::HandshakingState::OnHandshakeDone( // Chttp2ServerListener::ActiveConnection::ActiveConnection( + RefCountedPtr listener, grpc_pollset* accepting_pollset, AcceptorPtr acceptor, EventEngine* event_engine, const ChannelArgs& args, MemoryOwner memory_owner) - : handshaking_state_(memory_owner.MakeOrphanable( + : listener_(std::move(listener)), + handshaking_state_(memory_owner.MakeOrphanable( Ref(), accepting_pollset, std::move(acceptor), args)), event_engine_(event_engine) { GRPC_CLOSURE_INIT(&on_close_, ActiveConnection::OnClose, this, @@ -626,12 +636,11 @@ void Chttp2ServerListener::ActiveConnection::SendGoAway() { } void Chttp2ServerListener::ActiveConnection::Start( - RefCountedPtr listener, OrphanablePtr endpoint, const ChannelArgs& args) { - listener_ = std::move(listener); RefCountedPtr handshaking_state_ref; { MutexLock lock(&mu_); + connection_started_ = true; // If the Connection is already shutdown at this point, it implies the // owning Chttp2ServerListener and all associated ActiveConnections have // been orphaned. @@ -863,34 +872,32 @@ void Chttp2ServerListener::OnAccept(void* arg, grpc_endpoint* tcp, auto memory_owner = self->memory_quota_->CreateMemoryOwner(); EventEngine* const event_engine = self->args_.GetObject(); auto connection = memory_owner.MakeOrphanable( - accepting_pollset, std::move(acceptor), event_engine, args, - std::move(memory_owner)); + self->RefAsSubclass(), 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(); - RefCountedPtr listener_ref; { MutexLock lock(&self->mu_); // Shutdown the the connection if listener's stopped serving or if the // connection manager has changed. if (!self->shutdown_ && self->is_serving_ && connection_manager == self->connection_manager_) { - // 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. + // The ref for the tcp_server 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 + // 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 && listener_ref != nullptr) { - connection_ref->Start(std::move(listener_ref), std::move(endpoint), args); + if (connection == nullptr) { + connection_ref->Start(std::move(endpoint), args); } } From 7c7a979ab278303fc65df747de4519a1282f440f Mon Sep 17 00:00:00 2001 From: Kukki <16548543+AlienCookie@users.noreply.github.com> Date: Wed, 2 Oct 2024 12:41:23 -0700 Subject: [PATCH 60/75] Added static Type method to some credential types (#37795) * grpc_google_default_channel_credentials * TlsServerCredentials * grpc_alts(_server)_credentials * UrlExternalAccountCredentials * FileExternalAccountCredentials * AwsExternalAccountCredentials Closes #37795 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37795 from AlienCookie:patch-1 34ffa5eca5d3520c7127c10c0f1e66144e0595a1 PiperOrigin-RevId: 681554756 --- .../lib/security/credentials/alts/alts_credentials.cc | 4 ++-- src/core/lib/security/credentials/alts/alts_credentials.h | 8 ++++++-- .../external/aws_external_account_credentials.cc | 2 +- .../external/aws_external_account_credentials.h | 4 +++- .../external/file_external_account_credentials.cc | 2 +- .../external/file_external_account_credentials.h | 4 +++- .../external/url_external_account_credentials.cc | 2 +- .../external/url_external_account_credentials.h | 4 +++- .../google_default/google_default_credentials.cc | 3 +-- .../google_default/google_default_credentials.h | 4 +++- src/core/lib/security/credentials/tls/tls_credentials.cc | 2 +- src/core/lib/security/credentials/tls/tls_credentials.h | 4 +++- 12 files changed, 28 insertions(+), 15 deletions(-) diff --git a/src/core/lib/security/credentials/alts/alts_credentials.cc b/src/core/lib/security/credentials/alts/alts_credentials.cc index fd8c364c26a..45888d0e808 100644 --- a/src/core/lib/security/credentials/alts/alts_credentials.cc +++ b/src/core/lib/security/credentials/alts/alts_credentials.cc @@ -54,7 +54,7 @@ grpc_alts_credentials::create_security_connector( this->Ref(), std::move(call_creds), target_name); } -grpc_core::UniqueTypeName grpc_alts_credentials::type() const { +grpc_core::UniqueTypeName grpc_alts_credentials::Type() { static grpc_core::UniqueTypeName::Factory kFactory("Alts"); return kFactory.Create(); } @@ -80,7 +80,7 @@ grpc_alts_server_credentials::~grpc_alts_server_credentials() { gpr_free(handshaker_service_url_); } -grpc_core::UniqueTypeName grpc_alts_server_credentials::type() const { +grpc_core::UniqueTypeName grpc_alts_server_credentials::Type() { static grpc_core::UniqueTypeName::Factory kFactory("Alts"); return kFactory.Create(); } diff --git a/src/core/lib/security/credentials/alts/alts_credentials.h b/src/core/lib/security/credentials/alts/alts_credentials.h index 3aa072789ff..c998c05210f 100644 --- a/src/core/lib/security/credentials/alts/alts_credentials.h +++ b/src/core/lib/security/credentials/alts/alts_credentials.h @@ -43,7 +43,9 @@ class grpc_alts_credentials final : public grpc_channel_credentials { grpc_core::RefCountedPtr call_creds, const char* target_name, grpc_core::ChannelArgs* args) override; - grpc_core::UniqueTypeName type() const override; + static grpc_core::UniqueTypeName Type(); + + grpc_core::UniqueTypeName type() const override { return Type(); } const grpc_alts_credentials_options* options() const { return options_; } grpc_alts_credentials_options* mutable_options() { return options_; } @@ -70,7 +72,9 @@ class grpc_alts_server_credentials final : public grpc_server_credentials { grpc_core::RefCountedPtr create_security_connector(const grpc_core::ChannelArgs& /* args */) override; - grpc_core::UniqueTypeName type() const override; + static grpc_core::UniqueTypeName Type(); + + grpc_core::UniqueTypeName type() const override { return Type(); } const grpc_alts_credentials_options* options() const { return options_; } grpc_alts_credentials_options* mutable_options() { return options_; } diff --git a/src/core/lib/security/credentials/external/aws_external_account_credentials.cc b/src/core/lib/security/credentials/external/aws_external_account_credentials.cc index 23061f1679a..3348e3c5aba 100644 --- a/src/core/lib/security/credentials/external/aws_external_account_credentials.cc +++ b/src/core/lib/security/credentials/external/aws_external_account_credentials.cc @@ -512,7 +512,7 @@ std::string AwsExternalAccountCredentials::debug_string() { ")"); } -UniqueTypeName AwsExternalAccountCredentials::type() const { +UniqueTypeName AwsExternalAccountCredentials::Type() { static UniqueTypeName::Factory kFactory("AwsExternalAccountCredentials"); return kFactory.Create(); } diff --git a/src/core/lib/security/credentials/external/aws_external_account_credentials.h b/src/core/lib/security/credentials/external/aws_external_account_credentials.h index 466094cbe23..3ccac92ad7a 100644 --- a/src/core/lib/security/credentials/external/aws_external_account_credentials.h +++ b/src/core/lib/security/credentials/external/aws_external_account_credentials.h @@ -51,7 +51,9 @@ class AwsExternalAccountCredentials final : public ExternalAccountCredentials { std::string debug_string() override; - UniqueTypeName type() const override; + static UniqueTypeName Type(); + + UniqueTypeName type() const override { return Type(); } private: // A FetchBody impl that itself performs a sequence of FetchBody operations. diff --git a/src/core/lib/security/credentials/external/file_external_account_credentials.cc b/src/core/lib/security/credentials/external/file_external_account_credentials.cc index c38adc83dc6..6c8e1f06062 100644 --- a/src/core/lib/security/credentials/external/file_external_account_credentials.cc +++ b/src/core/lib/security/credentials/external/file_external_account_credentials.cc @@ -157,7 +157,7 @@ std::string FileExternalAccountCredentials::debug_string() { ")"); } -UniqueTypeName FileExternalAccountCredentials::type() const { +UniqueTypeName FileExternalAccountCredentials::Type() { static UniqueTypeName::Factory kFactory("FileExternalAccountCredentials"); return kFactory.Create(); } diff --git a/src/core/lib/security/credentials/external/file_external_account_credentials.h b/src/core/lib/security/credentials/external/file_external_account_credentials.h index 7d4721a0bf4..093f0a02809 100644 --- a/src/core/lib/security/credentials/external/file_external_account_credentials.h +++ b/src/core/lib/security/credentials/external/file_external_account_credentials.h @@ -46,7 +46,9 @@ class FileExternalAccountCredentials final : public ExternalAccountCredentials { std::string debug_string() override; - UniqueTypeName type() const override; + static UniqueTypeName Type(); + + UniqueTypeName type() const override { return Type(); } private: class FileFetchBody final : public FetchBody { diff --git a/src/core/lib/security/credentials/external/url_external_account_credentials.cc b/src/core/lib/security/credentials/external/url_external_account_credentials.cc index bcea5eadc09..39efb91d8f3 100644 --- a/src/core/lib/security/credentials/external/url_external_account_credentials.cc +++ b/src/core/lib/security/credentials/external/url_external_account_credentials.cc @@ -137,7 +137,7 @@ std::string UrlExternalAccountCredentials::debug_string() { ")"); } -UniqueTypeName UrlExternalAccountCredentials::type() const { +UniqueTypeName UrlExternalAccountCredentials::Type() { static UniqueTypeName::Factory kFactory("UrlExternalAccountCredentials"); return kFactory.Create(); } diff --git a/src/core/lib/security/credentials/external/url_external_account_credentials.h b/src/core/lib/security/credentials/external/url_external_account_credentials.h index bf44736edf6..d7a28777d2d 100644 --- a/src/core/lib/security/credentials/external/url_external_account_credentials.h +++ b/src/core/lib/security/credentials/external/url_external_account_credentials.h @@ -50,7 +50,9 @@ class UrlExternalAccountCredentials final : public ExternalAccountCredentials { std::string debug_string() override; - UniqueTypeName type() const override; + static UniqueTypeName Type(); + + UniqueTypeName type() const override { return Type(); } private: OrphanablePtr RetrieveSubjectToken( diff --git a/src/core/lib/security/credentials/google_default/google_default_credentials.cc b/src/core/lib/security/credentials/google_default/google_default_credentials.cc index ba9aeca2942..6581194e911 100644 --- a/src/core/lib/security/credentials/google_default/google_default_credentials.cc +++ b/src/core/lib/security/credentials/google_default/google_default_credentials.cc @@ -162,8 +162,7 @@ grpc_google_default_channel_credentials::update_arguments( return args.SetIfUnset(GRPC_ARG_DNS_ENABLE_SRV_QUERIES, true); } -grpc_core::UniqueTypeName grpc_google_default_channel_credentials::type() - const { +grpc_core::UniqueTypeName grpc_google_default_channel_credentials::Type() { static grpc_core::UniqueTypeName::Factory kFactory("GoogleDefault"); return kFactory.Create(); } diff --git a/src/core/lib/security/credentials/google_default/google_default_credentials.h b/src/core/lib/security/credentials/google_default/google_default_credentials.h index 58f9ae40cdc..889aebde57b 100644 --- a/src/core/lib/security/credentials/google_default/google_default_credentials.h +++ b/src/core/lib/security/credentials/google_default/google_default_credentials.h @@ -65,7 +65,9 @@ class grpc_google_default_channel_credentials grpc_core::ChannelArgs update_arguments(grpc_core::ChannelArgs args) override; - grpc_core::UniqueTypeName type() const override; + static grpc_core::UniqueTypeName Type(); + + grpc_core::UniqueTypeName type() const override { return Type(); } const grpc_channel_credentials* alts_creds() const { return alts_creds_.get(); diff --git a/src/core/lib/security/credentials/tls/tls_credentials.cc b/src/core/lib/security/credentials/tls/tls_credentials.cc index 765f669e5ce..5fd5abf419e 100644 --- a/src/core/lib/security/credentials/tls/tls_credentials.cc +++ b/src/core/lib/security/credentials/tls/tls_credentials.cc @@ -145,7 +145,7 @@ TlsServerCredentials::create_security_connector( CreateTlsServerSecurityConnector(this->Ref(), options_); } -grpc_core::UniqueTypeName TlsServerCredentials::type() const { +grpc_core::UniqueTypeName TlsServerCredentials::Type() { static grpc_core::UniqueTypeName::Factory kFactory("Tls"); return kFactory.Create(); } diff --git a/src/core/lib/security/credentials/tls/tls_credentials.h b/src/core/lib/security/credentials/tls/tls_credentials.h index fd78967d8f5..a22cd428657 100644 --- a/src/core/lib/security/credentials/tls/tls_credentials.h +++ b/src/core/lib/security/credentials/tls/tls_credentials.h @@ -62,7 +62,9 @@ class TlsServerCredentials final : public grpc_server_credentials { grpc_core::RefCountedPtr create_security_connector(const grpc_core::ChannelArgs& /* args */) override; - grpc_core::UniqueTypeName type() const override; + static grpc_core::UniqueTypeName Type(); + + grpc_core::UniqueTypeName type() const override { return Type(); } grpc_tls_credentials_options* options() const { return options_.get(); } From a422c8ffe3e57040fa47bb6c5579e50967d41775 Mon Sep 17 00:00:00 2001 From: Yousuk Seung Date: Wed, 2 Oct 2024 15:16:10 -0700 Subject: [PATCH 61/75] [experiments] retry work_serializer_dispatch with posix (#37839) All known flakes/bugs have been fixed. Closes #37839 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37839 from yousukseung:work_serializer_dispatch a82a068ebfd5d5f19c014e68321829f7c9216332 PiperOrigin-RevId: 681609545 --- bazel/experiments.bzl | 16 ++++++---------- src/core/lib/experiments/experiments.cc | 2 +- src/core/lib/experiments/experiments.h | 3 ++- src/core/lib/experiments/rollouts.yaml | 2 +- 4 files changed, 10 insertions(+), 13 deletions(-) diff --git a/bazel/experiments.bzl b/bazel/experiments.bzl index 0709155657e..830d4a076d2 100644 --- a/bazel/experiments.bzl +++ b/bazel/experiments.bzl @@ -138,10 +138,6 @@ EXPERIMENTS = { "core_end2end_test": [ "event_engine_client", "local_connector_secure", - "work_serializer_dispatch", - ], - "cpp_end2end_test": [ - "work_serializer_dispatch", ], "endpoint_test": [ "tcp_frame_size_tuning", @@ -155,16 +151,10 @@ EXPERIMENTS = { "tcp_frame_size_tuning", "tcp_rcv_lowat", ], - "lb_unit_test": [ - "work_serializer_dispatch", - ], "resource_quota_test": [ "free_large_allocator", "unconstrained_max_quota_buffer_size", ], - "xds_end2end_test": [ - "work_serializer_dispatch", - ], }, "on": { "cancel_ares_query_test": [ @@ -172,6 +162,10 @@ EXPERIMENTS = { ], "core_end2end_test": [ "event_engine_listener", + "work_serializer_dispatch", + ], + "cpp_end2end_test": [ + "work_serializer_dispatch", ], "cpp_lb_end2end_test": [ "pick_first_new", @@ -181,12 +175,14 @@ EXPERIMENTS = { ], "lb_unit_test": [ "pick_first_new", + "work_serializer_dispatch", ], "resolver_component_tests_runner_invoker": [ "event_engine_dns", ], "xds_end2end_test": [ "pick_first_new", + "work_serializer_dispatch", ], }, }, diff --git a/src/core/lib/experiments/experiments.cc b/src/core/lib/experiments/experiments.cc index 7a6522410d7..8464f0756a0 100644 --- a/src/core/lib/experiments/experiments.cc +++ b/src/core/lib/experiments/experiments.cc @@ -462,7 +462,7 @@ const ExperimentMetadata g_experiment_metadata[] = { additional_constraints_work_serializer_clears_time_cache, nullptr, 0, true, true}, {"work_serializer_dispatch", description_work_serializer_dispatch, - additional_constraints_work_serializer_dispatch, nullptr, 0, false, true}, + additional_constraints_work_serializer_dispatch, nullptr, 0, true, true}, }; } // namespace grpc_core diff --git a/src/core/lib/experiments/experiments.h b/src/core/lib/experiments/experiments.h index ca6c0734a81..8aa59e12f9b 100644 --- a/src/core/lib/experiments/experiments.h +++ b/src/core/lib/experiments/experiments.h @@ -155,7 +155,8 @@ inline bool IsTraceRecordCallopsEnabled() { return true; } inline bool IsUnconstrainedMaxQuotaBufferSizeEnabled() { return false; } #define GRPC_EXPERIMENT_IS_INCLUDED_WORK_SERIALIZER_CLEARS_TIME_CACHE inline bool IsWorkSerializerClearsTimeCacheEnabled() { return true; } -inline bool IsWorkSerializerDispatchEnabled() { return false; } +#define GRPC_EXPERIMENT_IS_INCLUDED_WORK_SERIALIZER_DISPATCH +inline bool IsWorkSerializerDispatchEnabled() { return true; } #endif #else diff --git a/src/core/lib/experiments/rollouts.yaml b/src/core/lib/experiments/rollouts.yaml index 36ef43d8b40..eb86f1d851e 100644 --- a/src/core/lib/experiments/rollouts.yaml +++ b/src/core/lib/experiments/rollouts.yaml @@ -112,6 +112,6 @@ default: # TODO(ysseung): Not fully tested. ios: broken - posix: false + posix: true # TODO(ysseung): Test flakes not fully resolved. windows: broken From 14d15834b96fef8158a08be1145bac5481ed7408 Mon Sep 17 00:00:00 2001 From: Sourabh Singh Date: Thu, 3 Oct 2024 08:26:30 -0700 Subject: [PATCH 62/75] [grpc][Python][doc] Added CONTRIBUTING.md to guide new contributors through the process of contributing to gRPC Python (#36749) This PR introduces a new CONTRIBUTING.md file to the gRPC Python repository. The goal of this document is to provide clear and comprehensive guidelines for new contributors who are interested in contributing to the project. - **Code of Conduct**: Establishes expectations for respectful and inclusive interactions within the community. - **Guidelines**: Offers advice and best practices for contributing effectively, including how to find issues, get started with the codebase, and follow the project's standards. - **Ways to Contribute**: Highlights the diverse ways in which people can contribute beyond just code, including documentation, community support, and testing. - **Steps to Contributing**: Provides a step-by-step guide on how to set up a development environment, make changes, run tests, and submit a pull request. - **Code Style**: Outlines the coding conventions and tools used in the project to ensure consistency. Closes #36749 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/36749 from sourabhsinghs:documentation/python-contributing-guide bcd11237420ab1a54455624f9a251aeea757f997 PiperOrigin-RevId: 681889662 --- src/python/CONTRIBUTING.md | 92 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) create mode 100644 src/python/CONTRIBUTING.md diff --git a/src/python/CONTRIBUTING.md b/src/python/CONTRIBUTING.md new file mode 100644 index 00000000000..9e92b6679c5 --- /dev/null +++ b/src/python/CONTRIBUTING.md @@ -0,0 +1,92 @@ +# Contributing to gRPC Python +We're thrilled you're interested in contributing to gRPC Python! Our vibrant community is the heart of this project. Your expertise and ideas are invaluable, so join us in shaping the future of gRPC Python. + +## Legal Requirements +**Sign the CLA:** Before your PR can be reviewed, you'll need to sign the [CNCF Contributor License Agreement (CLA)](https://identity.linuxfoundation.org/projects/cncf). + +## Community Code of Conduct +gRPC Python follows the [CNCF Code of Conduct](https://github.com/cncf/foundation/blob/master/code-of-conduct.md). + + +## Guidelines +gRPC Python Follows [gRPC Guidelines for Pull Requests](https://github.com/grpc/grpc/blob/master/CONTRIBUTING.md#guidelines-for-pull-requests) + +## There are many ways to contribute! + +* **Code:** Fix bugs, add new features, or improve existing code. +* **Documentation:** Improve tutorials, guides, or API reference documentation. +* **Community:** Answer questions on forums, help triage issues, or write blog posts. +* **Testing:** Help ensure the quality of gRPC Python by writing tests or reporting bugs. + + +## Writing Your First Patch for gRPC Python + +Ready to dive in? We'll walk you through the entire process of making your first contribution, from identifying an issue to submitting your changes for review. Don't worry if you're new to open source – our documentation and helpful community will ensure a smooth experience. + +### Prerequisites + +* **Git:** You should have Git installed on your system. If not, download and install it from the [official Git website](https://git-scm.com/). +* **GitHub Account:** You'll need a GitHub account to fork the repository and submit pull requests. +* **Python:** You should have a good understanding of Python programming. If you're new to Python, there are many resources available online to get you started. You can find the official documentation on the [Python website](https://www.python.org/doc/). +* **gRPC Concepts:** Familiarize yourself with the basics of gRPC, including concepts like protocol buffers, services, clients, and servers. Refer to the [gRPC documentation](https://grpc.io/docs/) for an overview. +* **Bazel:** Bazel is one of the build systems used for gRPC. To install it, follow the instructions for your operating system on the [Bazel website](https://bazel.build/install). + +### Steps to Contributing to gRPC Python + +1. **Find an Issue:** + * **Browse Open Issues:** Look for issues labeled "[help wanted](https://github.com/grpc/grpc/issues?q=is%3Aopen+label%3A%22disposition%2Fhelp+wanted%22)" on the [gRPC Python issue tracker](https://github.com/grpc/grpc/issues?q=is%3Aissue+is%3Aopen+label%3Alang%2Fpython+sort%3Aupdated-desc). + * **Ask for Help:** If you're unsure where to start or need clarification on an issue, feel free to ask questions on the [gRPC forum](https://groups.google.com/g/grpc-io). +2. **Get a Copy of the gRPC Python Development Version:** + * **Fork:** Click the "Fork" button on the top right of the [gRPC repository page](https://github.com/grpc/grpc) to create a copy of the repository under your GitHub account. + * **Clone your fork:** + ```git clone https://github.com//grpc.git``` + * **Initialize and Update Submodules:** + ```bash + cd grpc + git submodule update --init --recursive + ``` + * **Create a Branch:** Make your changes on a new branch: + ```git checkout -b my-feature-branch``` +3. **Setting up Your Local System for Development and Testing:** + * Create a new virtual environment by running:```python -m venv ~/.virtualenvs/grpc-python``` + * Activate the environment: ```source ~/.virtualenvs/grpc-python/bin/activate``` + * Install Dependencies: ```pip install -r requirements.txt``` +4. **Run Tests:** + * Before making any changes, run the existing test suite to ensure your environment is set up correctly: + * **Using Bazel (Recommended):** + * To run a single unit test: + ```bash + bazel test --cache_test_results=no "//src/python/grpcio_tests/tests/unit:_abort_test" + ``` + * To execute all unit tests for Python: + ```bash + bazel test --cache_test_results=no "//src/python/..." + ``` + * **Using Provided Scripts (Alternative):** + * Install Python Modules: + ```bash + ./tools/distrib/install_all_python_modules.sh + ``` + * Run Tooling Tests: + ```bash + ./tools/distrib/run_python_tooling_tests.sh + ``` + * **Verify No Failures:** Make sure all tests pass before submitting your patch. +5. **Commit & Push Changes:** + * **Commit:** `git commit -m "Add new feature: brief description"` (Make sure your commit message is clear and concise.) + * **Push:** `git push origin my-feature-branch` +6. **Open a Pull Request (PR):** + * **Go to GitHub:** Visit the original gRPC Python repository on GitHub. + * **Click "New Pull Request":** Compare your branch with the main branch and submit your pull request. + * **Provide a Description:** Write a clear explanation of your changes, referencing the relevant issue(s). +7. **Code Review:** + * **Wait for Feedback:** Maintainers will review your PR and provide feedback. + * **Respond to Comments:** Address any questions or concerns raised during the review. + * **Make Revisions:** Update your code as needed based on the feedback. + +## Code Style + +* **Pythonic Code:** Follow the [PEP 8 style guide](https://www.python.org/dev/peps/pep-0008/) for Python code. +* **Type Hints:** Use type hints to improve code readability and maintainability. +* **Formatting:** Use [Black](https://black.readthedocs.io/en/stable/) for automatic code formatting. + From 0979765fd32a5f913b7492cb1999f99ac49f9a3b Mon Sep 17 00:00:00 2001 From: erm-g <110920239+erm-g@users.noreply.github.com> Date: Thu, 3 Oct 2024 08:30:48 -0700 Subject: [PATCH 63/75] [flake] Increase timeout to ssl_credentials_test flakiness (#37844) In some rare occasions on Win machines (0,3-0,4%), the tests are stuck when we execute the loop of 10 DoRpc calls. We receive Deadline Exceeded for such cases. The PR bumps the deadline from 10 to 60s (no flakes for --runs_per_test=10000). Closes #37844 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37844 from erm-g:seqFix 8644db81949735d7793d70c6510e1e6e830c7dd6 PiperOrigin-RevId: 681891281 --- test/cpp/end2end/ssl_credentials_test.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/cpp/end2end/ssl_credentials_test.cc b/test/cpp/end2end/ssl_credentials_test.cc index 325dc79068d..b111e5bfbc2 100644 --- a/test/cpp/end2end/ssl_credentials_test.cc +++ b/test/cpp/end2end/ssl_credentials_test.cc @@ -100,7 +100,7 @@ void DoRpc(const std::string& server_addr, grpc::testing::EchoResponse response; request.set_message(kMessage); ClientContext context; - context.set_deadline(grpc_timeout_seconds_to_deadline(/*time_s=*/10)); + context.set_deadline(grpc_timeout_seconds_to_deadline(/*time_s=*/60)); grpc::Status result = stub->Echo(&context, request, &response); EXPECT_TRUE(result.ok()); if (!result.ok()) { From 00545fa0fab227ed4a93bf6a67f12648d8a42cad Mon Sep 17 00:00:00 2001 From: Yousuk Seung Date: Thu, 3 Oct 2024 10:21:21 -0700 Subject: [PATCH 64/75] [generic API] add separate targets for cq generic stub/service (#36447) (#37838) This allows to restrict CQ based generic stub/service use. See https://github.com/grpc/proposal/pull/426 Closes #37838 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37838 from yousukseung:generic-stub 3e7c558372e733bfd6c73279619eb10040c6e061 PiperOrigin-RevId: 681932616 --- BUILD | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/BUILD b/BUILD index 51633565bb3..4d57a053c1f 100644 --- a/BUILD +++ b/BUILD @@ -2961,6 +2961,18 @@ grpc_cc_library( ], ) +grpc_cc_library( + name = "generic_stub", + hdrs = [ + "include/grpcpp/generic/generic_stub.h", + ], + language = "c++", + visibility = ["@grpc:public"], + deps = [ + "generic_stub_internal", + ], +) + grpc_cc_library( name = "generic_stub_callback", hdrs = [ @@ -2973,6 +2985,18 @@ grpc_cc_library( ], ) +grpc_cc_library( + name = "async_generic_service", + hdrs = [ + "include/grpcpp/generic/async_generic_service.h", + ], + language = "c++", + visibility = ["@grpc:public"], + deps = [ + "grpc++_public_hdrs", + ], +) + grpc_cc_library( name = "callback_generic_service", hdrs = [ From 41dc97e1d66f32d95fdf016641164d9f7dc6fb94 Mon Sep 17 00:00:00 2001 From: Alexander Polcyn Date: Thu, 3 Oct 2024 11:30:33 -0700 Subject: [PATCH 65/75] Handle backport PRs without piper info in release notes automation Example commits on v1.67.x that are failing the current regex match: ``` commit 1eb5673cdd2471cfa8f68dbe1123c35e9ee03574 Author: apolcyn Date: Mon Sep 16 12:35:34 2024 -0700 [objc] backport https://github.com/grpc/grpc/pull/37690 to v1.67.x (#37712) Backport https://github.com/grpc/grpc/pull/37690 cc @HannahShiSFB @sampajano Co-authored-by: Hannah Shi commit ace22e307d1bb2f81420cd55a81b2725f50c894b Author: apolcyn Date: Thu Sep 12 10:16:46 2024 -0700 [ruby] reduce an INFO log to DEBUG (backport https://github.com/grpc/grpc/pull/37633) (#37686) Backport https://github.com/grpc/grpc/pull/37633 to 1.67 Note https://github.com/grpc/grpc/pull/37633 is not yet merged b/c of the master branch freeze. Merging on 1.67 with the idea that https://github.com/grpc/grpc/pull/37633 will merge as soon as the master branch is unfrozen. ``` PiperOrigin-RevId: 681960402 --- tools/release/release_notes.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/tools/release/release_notes.py b/tools/release/release_notes.py index 5576b9f7161..a8423bf69b3 100644 --- a/tools/release/release_notes.py +++ b/tools/release/release_notes.py @@ -104,15 +104,16 @@ def get_commit_detail(commit): detail += "- " + title if not title.endswith("."): detail += "." - matches = re.search("PiperOrigin-RevId: ([0-9]+)$", output) - cl_num = matches.group(1) - detail += ( - " ([commit](https://github.com/grpc/grpc/commit/" - + commit - + ")) ([CL](https://critique.corp.google.com/cl/" - + cl_num - + "))" + detail += " ([commit](https://github.com/grpc/grpc/commit/{}))".format( + commit ) + matches = re.search("PiperOrigin-RevId: ([0-9]+)$", output) + # backport commits might not have PiperOrigin-RevId + if matches is not None: + cl_num = matches.group(1) + detail += " ([CL](https://critique.corp.google.com/cl/{}))".format( + cl_num + ) return detail From dbb5164ac7322d2a396675aab9cee7979203126d Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Fri, 4 Oct 2024 09:41:56 -0700 Subject: [PATCH 66/75] [clang-format] Remove custom clang-format rules for include ordering (#37820) Closes #37820 PiperOrigin-RevId: 682352913 --- .clang-format | 30 ----------- .../grpc/binder/cpp/exampleclient/native.cc | 5 +- .../grpc/binder/cpp/exampleserver/native.cc | 9 ++-- examples/cpp/auth/ssl_client.cc | 4 +- examples/cpp/auth/ssl_server.cc | 4 +- examples/cpp/cancellation/client.cc | 4 +- examples/cpp/cancellation/server.cc | 4 +- examples/cpp/compression/greeter_client.cc | 4 +- examples/cpp/compression/greeter_server.cc | 4 +- examples/cpp/csm/csm_greeter_client.cc | 7 ++- examples/cpp/csm/csm_greeter_server.cc | 15 +++--- .../csm/observability/csm_greeter_client.cc | 7 ++- .../csm/observability/csm_greeter_server.cc | 14 ++--- examples/cpp/deadline/client.cc | 4 +- examples/cpp/deadline/server.cc | 4 +- .../cpp/debugging/crashing_greeter_client.cc | 4 +- .../greeter_callback_server_admin.cc | 10 ++-- examples/cpp/error_details/greeter_client.cc | 5 +- examples/cpp/error_details/greeter_server.cc | 9 ++-- examples/cpp/error_handling/greeter_client.cc | 4 +- examples/cpp/error_handling/greeter_server.cc | 8 +-- .../client_flow_control_client.cc | 8 +-- .../client_flow_control_server.cc | 8 +-- .../server_flow_control_client.cc | 8 +-- .../server_flow_control_server.cc | 10 ++-- .../helloworld/greeter_client.cc | 6 +-- .../helloworld/greeter_server.cc | 10 ++-- examples/cpp/generic_api/greeter_client.cc | 6 +-- examples/cpp/generic_api/greeter_server.cc | 6 +-- examples/cpp/health/health_client.cc | 5 +- examples/cpp/health/health_server.cc | 8 +-- .../cpp/helloworld/greeter_async_client.cc | 4 +- .../cpp/helloworld/greeter_async_client2.cc | 4 +- .../cpp/helloworld/greeter_async_server.cc | 4 +- .../cpp/helloworld/greeter_callback_client.cc | 4 +- .../cpp/helloworld/greeter_callback_server.cc | 8 +-- examples/cpp/helloworld/greeter_client.cc | 4 +- examples/cpp/helloworld/greeter_server.cc | 8 +-- examples/cpp/helloworld/xds_greeter_client.cc | 4 +- examples/cpp/helloworld/xds_greeter_server.cc | 12 ++--- .../cpp/interceptors/caching_interceptor.h | 4 +- examples/cpp/interceptors/client.cc | 4 +- examples/cpp/interceptors/server.cc | 6 +-- .../cpp/keepalive/greeter_callback_client.cc | 4 +- .../cpp/keepalive/greeter_callback_server.cc | 8 +-- examples/cpp/load_balancing/greeter_client.cc | 4 +- examples/cpp/load_balancing/greeter_server.cc | 4 +- examples/cpp/metadata/greeter_client.cc | 4 +- examples/cpp/metadata/greeter_server.cc | 4 +- examples/cpp/multiplex/multiplex_client.cc | 4 +- examples/cpp/multiplex/multiplex_server.cc | 8 +-- examples/cpp/orca/orca_server.cc | 12 ++--- .../otel/codelab/greeter_callback_client.cc | 6 +-- .../greeter_callback_client_solution.cc | 6 +-- .../otel/codelab/greeter_callback_server.cc | 10 ++-- .../greeter_callback_server_solution.cc | 10 ++-- examples/cpp/otel/codelab/util.cc | 4 +- examples/cpp/otel/greeter_callback_client.cc | 4 +- examples/cpp/otel/greeter_callback_server.cc | 4 +- .../otel/ostream/greeter_callback_client.cc | 4 +- .../otel/ostream/greeter_callback_server.cc | 4 +- examples/cpp/otel/util.cc | 8 +-- examples/cpp/reflection/reflection_server.cc | 6 +-- examples/cpp/retry/client.cc | 6 +-- examples/cpp/retry/server.cc | 8 +-- .../route_guide_callback_client.cc | 14 ++--- .../route_guide_callback_server.cc | 12 ++--- .../cpp/route_guide/route_guide_client.cc | 12 ++--- .../cpp/route_guide/route_guide_server.cc | 12 ++--- .../cpp/systemd_socket_activation/client.cc | 4 +- .../cpp/systemd_socket_activation/server.cc | 8 +-- examples/cpp/unix_abstract_sockets/client.cc | 4 +- examples/cpp/unix_abstract_sockets/server.cc | 8 +-- .../wait_for_ready/greeter_callback_client.cc | 4 +- examples/cpp/xds/xds_greeter_client.cc | 4 +- examples/cpp/xds/xds_greeter_server.cc | 12 ++--- include/grpc++/impl/.clang-format | 50 ----------------- include/grpc/.clang-format | 50 ----------------- include/grpc/compression.h | 3 +- include/grpc/credentials.h | 3 +- include/grpc/event_engine/endpoint_config.h | 4 +- include/grpc/event_engine/event_engine.h | 12 ++--- include/grpc/event_engine/extensible.h | 4 +- .../internal/memory_allocator_impl.h | 8 +-- include/grpc/event_engine/memory_allocator.h | 7 ++- include/grpc/event_engine/memory_request.h | 3 +- include/grpc/event_engine/slice.h | 7 ++- include/grpc/event_engine/slice_buffer.h | 13 +++-- include/grpc/grpc.h | 3 +- include/grpc/grpc_audit_logging.h | 6 +-- include/grpc/grpc_crl_provider.h | 8 +-- include/grpc/grpc_posix.h | 3 +- include/grpc/grpc_security.h | 3 +- include/grpc/impl/call.h | 4 +- include/grpc/impl/grpc_types.h | 3 +- include/grpc/impl/slice_type.h | 3 +- include/grpc/passive_listener.h | 4 +- include/grpc/support/alloc.h | 3 +- include/grpc/support/json.h | 3 +- include/grpc/support/log.h | 3 +- include/grpc/support/metrics.h | 4 +- include/grpc/support/sync_posix.h | 3 +- include/grpc/support/time.h | 3 +- include/grpcpp/.clang-format | 50 ----------------- include/grpcpp/alarm.h | 4 +- include/grpcpp/channel.h | 4 +- include/grpcpp/client_context.h | 12 ++--- include/grpcpp/completion_queue.h | 8 +-- include/grpcpp/create_channel.h | 4 +- include/grpcpp/create_channel_binder.h | 7 ++- include/grpcpp/create_channel_posix.h | 4 +- include/grpcpp/ext/call_metric_recorder.h | 6 +-- include/grpcpp/ext/csm_observability.h | 6 +-- include/grpcpp/ext/gcp_observability.h | 6 +-- ...alth_check_service_server_builder_option.h | 4 +- include/grpcpp/ext/orca_service.h | 12 ++--- include/grpcpp/ext/otel_plugin.h | 9 ++-- .../ext/proto_server_reflection_plugin.h | 4 +- include/grpcpp/ext/server_metric_recorder.h | 6 +-- include/grpcpp/impl/.clang-format | 50 ----------------- include/grpcpp/impl/call_op_set.h | 14 ++--- include/grpcpp/impl/channel_argument_option.h | 6 +-- include/grpcpp/impl/codegen/.clang-format | 50 ----------------- include/grpcpp/impl/create_auth_context.h | 4 +- include/grpcpp/impl/delegating_channel.h | 4 +- include/grpcpp/impl/generic_stub_internal.h | 4 +- include/grpcpp/impl/grpc_library.h | 4 +- include/grpcpp/impl/interceptor_common.h | 10 ++-- include/grpcpp/impl/metadata_map.h | 4 +- include/grpcpp/impl/proto_utils.h | 8 +-- include/grpcpp/impl/rpc_method.h | 4 +- include/grpcpp/impl/rpc_service_method.h | 10 ++-- include/grpcpp/impl/server_builder_option.h | 6 +-- include/grpcpp/impl/server_builder_plugin.h | 4 +- .../grpcpp/impl/server_callback_handlers.h | 4 +- include/grpcpp/impl/server_initializer.h | 4 +- include/grpcpp/impl/service_type.h | 4 +- include/grpcpp/impl/sync.h | 6 +-- include/grpcpp/security/.clang-format | 50 ----------------- include/grpcpp/security/alts_context.h | 6 +-- include/grpcpp/security/alts_util.h | 4 +- include/grpcpp/security/audit_logging.h | 6 +-- include/grpcpp/security/auth_context.h | 6 +-- .../grpcpp/security/auth_metadata_processor.h | 4 +- .../security/authorization_policy_provider.h | 4 +- include/grpcpp/security/binder_credentials.h | 4 +- include/grpcpp/security/credentials.h | 8 +-- include/grpcpp/security/server_credentials.h | 6 +-- .../security/tls_certificate_provider.h | 12 ++--- .../security/tls_certificate_verifier.h | 12 ++--- .../grpcpp/security/tls_credentials_options.h | 6 +-- include/grpcpp/server.h | 8 +-- include/grpcpp/server_builder.h | 10 ++-- include/grpcpp/server_context.h | 14 ++--- include/grpcpp/server_interface.h | 4 +- include/grpcpp/server_posix.h | 4 +- include/grpcpp/support/.clang-format | 50 ----------------- include/grpcpp/support/async_stream.h | 4 +- include/grpcpp/support/async_unary_call.h | 4 +- include/grpcpp/support/byte_buffer.h | 4 +- include/grpcpp/support/callback_common.h | 8 +-- include/grpcpp/support/channel_arguments.h | 6 +-- include/grpcpp/support/client_callback.h | 10 ++-- include/grpcpp/support/client_interceptor.h | 8 +-- include/grpcpp/support/interceptor.h | 8 +-- include/grpcpp/support/method_handler.h | 4 +- include/grpcpp/support/proto_buffer_reader.h | 10 ++-- include/grpcpp/support/proto_buffer_writer.h | 10 ++-- include/grpcpp/support/server_callback.h | 12 ++--- include/grpcpp/support/server_interceptor.h | 8 +-- include/grpcpp/support/string_ref.h | 3 +- include/grpcpp/support/sync_stream.h | 4 +- include/grpcpp/support/time.h | 4 +- .../grpcpp/test/client_context_test_peer.h | 4 +- include/grpcpp/test/mock_stream.h | 4 +- .../grpcpp/test/server_context_test_spouse.h | 4 +- src/.clang-format | 50 ----------------- src/compiler/.clang-format | 50 ----------------- src/compiler/objective_c_generator.cc | 4 +- src/compiler/objective_c_generator_helpers.h | 4 +- src/compiler/objective_c_plugin.cc | 4 +- src/compiler/php_generator.cc | 4 +- src/core/.clang-format | 50 ----------------- src/core/channelz/channel_trace.cc | 9 ++-- src/core/channelz/channel_trace.h | 8 ++- src/core/channelz/channelz.cc | 9 ++-- src/core/channelz/channelz.h | 10 ++-- src/core/channelz/channelz_registry.cc | 11 ++-- src/core/channelz/channelz_registry.h | 5 +- src/core/client_channel/.clang-format | 53 ------------------- src/core/client_channel/backup_poller.cc | 9 ++-- src/core/client_channel/client_channel.cc | 21 ++++---- src/core/client_channel/client_channel.h | 1 - .../client_channel/client_channel_factory.cc | 4 +- .../client_channel/client_channel_factory.h | 1 - .../client_channel/client_channel_filter.cc | 19 +++---- .../client_channel/client_channel_filter.h | 7 +-- .../client_channel/client_channel_internal.h | 1 - .../client_channel/client_channel_plugin.cc | 4 +- .../client_channel_service_config.cc | 5 +- .../client_channel_service_config.h | 2 - src/core/client_channel/config_selector.h | 5 +- src/core/client_channel/dynamic_filters.cc | 4 +- src/core/client_channel/dynamic_filters.h | 3 +- .../client_channel/global_subchannel_pool.cc | 4 +- .../client_channel/global_subchannel_pool.h | 1 - src/core/client_channel/lb_metadata.h | 5 +- .../load_balanced_call_destination.cc | 1 - .../load_balanced_call_destination.h | 1 - .../client_channel/local_subchannel_pool.cc | 5 +- src/core/client_channel/retry_filter.cc | 8 ++- src/core/client_channel/retry_filter.h | 9 ++-- .../retry_filter_legacy_call_data.cc | 4 +- .../retry_filter_legacy_call_data.h | 9 ++-- .../client_channel/retry_service_config.cc | 12 ++--- .../client_channel/retry_service_config.h | 2 - src/core/client_channel/retry_throttle.cc | 7 ++- src/core/client_channel/retry_throttle.h | 5 +- src/core/client_channel/subchannel.cc | 11 ++-- src/core/client_channel/subchannel.h | 7 +-- .../subchannel_pool_interface.cc | 4 +- .../subchannel_pool_interface.h | 1 - .../subchannel_stream_client.cc | 7 +-- .../client_channel/subchannel_stream_client.h | 10 ++-- src/core/ext/.clang-format | 50 ----------------- src/core/ext/filters/.clang-format | 53 ------------------- .../backend_metrics/backend_metric_filter.cc | 13 ++--- .../backend_metrics/backend_metric_filter.h | 1 - src/core/ext/filters/census/grpc_context.cc | 3 +- .../filters/channel_idle/idle_filter_state.cc | 3 +- .../filters/channel_idle/idle_filter_state.h | 1 - .../legacy_channel_idle_filter.cc | 8 ++- .../channel_idle/legacy_channel_idle_filter.h | 4 +- .../fault_injection/fault_injection_filter.cc | 7 +-- .../fault_injection/fault_injection_filter.h | 2 - .../fault_injection_service_config_parser.cc | 5 +- .../fault_injection_service_config_parser.h | 5 +- .../gcp_authentication_filter.cc | 1 - .../gcp_authentication_filter.h | 1 - ...cp_authentication_service_config_parser.cc | 5 +- ...gcp_authentication_service_config_parser.h | 1 - .../filters/http/client/http_client_filter.cc | 12 ++--- .../filters/http/client/http_client_filter.h | 1 - .../filters/http/client_authority_filter.cc | 8 ++- .../filters/http/client_authority_filter.h | 1 - .../ext/filters/http/http_filters_plugin.cc | 1 - .../message_compress/compression_filter.cc | 13 ++--- .../message_compress/compression_filter.h | 5 +- .../filters/http/server/http_server_filter.cc | 10 ++-- .../filters/http/server/http_server_filter.h | 1 - .../registered_opencensus_objects.h | 1 - .../server_load_reporting_filter.cc | 13 ++--- .../server_load_reporting_filter.h | 2 - .../ext/filters/logging/logging_filter.cc | 11 ++-- src/core/ext/filters/logging/logging_filter.h | 1 - src/core/ext/filters/logging/logging_sink.h | 2 - .../message_size/message_size_filter.cc | 9 ++-- .../message_size/message_size_filter.h | 2 - src/core/ext/filters/rbac/rbac_filter.cc | 8 ++- src/core/ext/filters/rbac/rbac_filter.h | 2 - .../rbac/rbac_service_config_parser.cc | 8 ++- .../filters/rbac/rbac_service_config_parser.h | 2 - .../stateful_session_filter.cc | 4 +- .../stateful_session_filter.h | 2 - .../stateful_session_service_config_parser.cc | 5 +- .../stateful_session_service_config_parser.h | 2 - src/core/ext/transport/.clang-format | 50 ----------------- src/core/ext/transport/binder/.clang-format | 50 ----------------- .../binder/client/binder_connector.cc | 5 +- .../binder/client/binder_connector.h | 11 ++-- .../transport/binder/client/channel_create.cc | 7 ++- .../binder/client/channel_create_impl.cc | 1 - .../binder/client/connection_id_generator.h | 5 +- .../binder/client/endpoint_binder_pool.cc | 4 +- .../binder/client/endpoint_binder_pool.h | 5 +- .../ext/transport/binder/client/jni_utils.cc | 4 +- .../ext/transport/binder/client/jni_utils.h | 3 +- .../binder/client/security_policy_setting.cc | 4 +- .../binder/client/security_policy_setting.h | 5 +- .../security_policy/binder_security_policy.cc | 1 - .../transport/binder/server/binder_server.cc | 5 +- .../transport/binder/server/binder_server.h | 7 ++- .../server/binder_server_credentials.cc | 4 +- .../binder/transport/binder_transport.cc | 1 - .../binder/transport/binder_transport.h | 7 ++- .../ext/transport/binder/utils/ndk_binder.cc | 1 - .../binder/utils/transport_stream_receiver.h | 5 +- .../utils/transport_stream_receiver_impl.cc | 1 - .../utils/transport_stream_receiver_impl.h | 4 +- .../ext/transport/binder/wire_format/binder.h | 5 +- .../binder/wire_format/binder_android.cc | 1 - .../binder/wire_format/binder_android.h | 1 - .../binder/wire_format/binder_constants.h | 4 +- .../binder/wire_format/transaction.h | 5 +- .../binder/wire_format/wire_reader.h | 4 +- .../binder/wire_format/wire_reader_impl.cc | 1 - .../binder/wire_format/wire_reader_impl.h | 7 ++- .../binder/wire_format/wire_writer.cc | 1 - .../binder/wire_format/wire_writer.h | 5 +- .../chaotic_good/chaotic_good_transport.h | 5 +- .../client/chaotic_good_connector.cc | 7 ++- .../client/chaotic_good_connector.h | 7 ++- .../chaotic_good/client_transport.cc | 9 ++-- .../transport/chaotic_good/client_transport.h | 10 ++-- src/core/ext/transport/chaotic_good/frame.cc | 6 +-- src/core/ext/transport/chaotic_good/frame.h | 5 +- .../transport/chaotic_good/frame_header.cc | 4 +- .../ext/transport/chaotic_good/frame_header.h | 4 +- .../server/chaotic_good_server.cc | 11 ++-- .../chaotic_good/server/chaotic_good_server.h | 7 ++- .../chaotic_good/server_transport.cc | 11 ++-- .../transport/chaotic_good/server_transport.h | 12 ++--- .../chaotic_good/settings_metadata.cc | 3 +- .../chaotic_good/settings_metadata.h | 3 +- src/core/ext/transport/chttp2/alpn/alpn.cc | 3 +- src/core/ext/transport/chttp2/alpn/alpn.h | 3 +- .../chttp2/client/chttp2_connector.cc | 18 +++---- .../chttp2/client/chttp2_connector.h | 5 +- .../transport/chttp2/server/chttp2_server.cc | 18 +++---- .../transport/chttp2/server/chttp2_server.h | 4 +- .../transport/chttp2/transport/.clang-format | 50 ----------------- .../transport/chttp2/transport/bin_decoder.cc | 7 ++- .../transport/chttp2/transport/bin_decoder.h | 5 +- .../transport/chttp2/transport/bin_encoder.cc | 4 +- .../transport/chttp2/transport/bin_encoder.h | 3 +- .../chttp2/transport/chttp2_transport.cc | 20 ++++--- .../chttp2/transport/chttp2_transport.h | 7 ++- .../chttp2/transport/context_list_entry.h | 3 +- .../transport/chttp2/transport/decode_huff.h | 4 +- .../chttp2/transport/flow_control.cc | 4 +- .../transport/chttp2/transport/flow_control.h | 4 +- .../ext/transport/chttp2/transport/frame.cc | 4 +- .../ext/transport/chttp2/transport/frame.h | 5 +- .../transport/chttp2/transport/frame_data.cc | 6 +-- .../transport/chttp2/transport/frame_data.h | 6 +-- .../chttp2/transport/frame_goaway.cc | 8 ++- .../transport/chttp2/transport/frame_goaway.h | 3 +- .../transport/chttp2/transport/frame_ping.cc | 6 +-- .../transport/chttp2/transport/frame_ping.h | 3 +- .../chttp2/transport/frame_rst_stream.cc | 6 +-- .../chttp2/transport/frame_rst_stream.h | 3 +- .../chttp2/transport/frame_settings.cc | 6 +-- .../chttp2/transport/frame_settings.h | 5 +- .../chttp2/transport/frame_window_update.cc | 4 +- .../chttp2/transport/frame_window_update.h | 3 +- .../chttp2/transport/hpack_constants.h | 4 +- .../chttp2/transport/hpack_encoder.cc | 9 ++-- .../chttp2/transport/hpack_encoder.h | 6 +-- .../chttp2/transport/hpack_encoder_table.cc | 4 +- .../chttp2/transport/hpack_encoder_table.h | 3 +- .../chttp2/transport/hpack_parse_result.cc | 4 +- .../chttp2/transport/hpack_parse_result.h | 4 +- .../chttp2/transport/hpack_parser.cc | 6 +-- .../transport/chttp2/transport/hpack_parser.h | 6 +-- .../chttp2/transport/hpack_parser_table.cc | 4 +- .../chttp2/transport/hpack_parser_table.h | 4 +- .../chttp2/transport/http2_settings.cc | 3 +- .../chttp2/transport/http2_settings.h | 4 +- .../ext/transport/chttp2/transport/internal.h | 14 +++-- .../ext/transport/chttp2/transport/parsing.cc | 10 ++-- .../chttp2/transport/ping_abuse_policy.cc | 6 +-- .../chttp2/transport/ping_abuse_policy.h | 4 +- .../chttp2/transport/ping_callbacks.cc | 4 +- .../chttp2/transport/ping_callbacks.h | 6 +-- .../chttp2/transport/ping_rate_policy.cc | 7 ++- .../chttp2/transport/ping_rate_policy.h | 4 +- .../chttp2/transport/stream_lists.cc | 5 +- .../ext/transport/chttp2/transport/varint.cc | 4 +- .../ext/transport/chttp2/transport/varint.h | 3 +- .../chttp2/transport/write_size_policy.cc | 4 +- .../chttp2/transport/write_size_policy.h | 3 +- .../ext/transport/chttp2/transport/writing.cc | 10 ++-- .../client/secure/cronet_channel_create.cc | 5 +- .../cronet/transport/cronet_api_phony.cc | 4 +- .../cronet/transport/cronet_transport.cc | 16 +++--- .../ext/transport/inproc/inproc_transport.cc | 7 ++- .../inproc/legacy_inproc_transport.cc | 16 +++--- src/core/filter/blackboard.h | 1 - .../endpoint_info/endpoint_info_handshaker.cc | 5 +- src/core/handshaker/handshaker.cc | 12 ++--- src/core/handshaker/handshaker.h | 8 ++- src/core/handshaker/handshaker_registry.cc | 3 +- src/core/handshaker/handshaker_registry.h | 4 +- .../http_connect/http_connect_handshaker.cc | 10 ++-- .../http_connect/http_proxy_mapper.cc | 8 ++- .../http_connect/http_proxy_mapper.h | 5 +- src/core/handshaker/proxy_mapper.h | 5 +- src/core/handshaker/proxy_mapper_registry.cc | 4 +- src/core/handshaker/proxy_mapper_registry.h | 5 +- .../handshaker/security/secure_endpoint.cc | 18 +++---- .../handshaker/security/secure_endpoint.h | 3 +- .../security/security_handshaker.cc | 16 +++--- .../handshaker/security/security_handshaker.h | 3 +- .../tcp_connect/tcp_connect_handshaker.cc | 11 ++-- src/core/lib/address_utils/parse_address.cc | 1 - src/core/lib/address_utils/parse_address.h | 4 +- src/core/lib/address_utils/sockaddr_utils.cc | 4 +- src/core/lib/address_utils/sockaddr_utils.h | 4 +- src/core/lib/channel/call_finalization.h | 4 +- src/core/lib/channel/channel_args.cc | 10 ++-- src/core/lib/channel/channel_args.h | 8 ++- .../channel/channel_args_preconditioning.cc | 4 +- .../channel/channel_args_preconditioning.h | 6 +-- src/core/lib/channel/channel_stack.cc | 4 +- src/core/lib/channel/channel_stack.h | 9 ++-- src/core/lib/channel/channel_stack_builder.cc | 4 +- src/core/lib/channel/channel_stack_builder.h | 5 +- .../lib/channel/channel_stack_builder_impl.cc | 6 +-- .../lib/channel/channel_stack_builder_impl.h | 3 +- src/core/lib/channel/connected_channel.cc | 10 ++-- src/core/lib/channel/promise_based_filter.cc | 7 ++- src/core/lib/channel/promise_based_filter.h | 8 ++- src/core/lib/channel/status_util.cc | 4 +- src/core/lib/channel/status_util.h | 6 +-- src/core/lib/compression/compression.cc | 8 ++- .../lib/compression/compression_internal.cc | 6 +-- .../lib/compression/compression_internal.h | 6 +-- src/core/lib/compression/message_compress.cc | 9 ++-- src/core/lib/config/config_vars.cc | 5 +- src/core/lib/config/config_vars.h | 3 +- .../lib/config/config_vars_non_generated.cc | 4 +- src/core/lib/config/core_configuration.cc | 4 +- src/core/lib/config/core_configuration.h | 5 +- src/core/lib/config/load_config.cc | 4 +- src/core/lib/config/load_config.h | 3 +- src/core/lib/debug/trace.cc | 7 ++- src/core/lib/debug/trace_flags.cc | 1 - src/core/lib/debug/trace_impl.h | 4 +- src/core/lib/event_engine/ares_resolver.cc | 8 ++- src/core/lib/event_engine/ares_resolver.h | 13 ++--- .../lib/event_engine/cf_engine/cf_engine.cc | 4 +- .../cf_engine/cfstream_endpoint.cc | 1 - .../cf_engine/cfstream_endpoint.h | 4 +- .../cf_engine/dns_service_resolver.cc | 1 - .../cf_engine/dns_service_resolver.h | 4 +- .../channel_args_endpoint_config.cc | 7 ++- .../channel_args_endpoint_config.h | 5 +- src/core/lib/event_engine/common_closures.h | 6 +-- .../lib/event_engine/default_event_engine.cc | 7 ++- .../lib/event_engine/default_event_engine.h | 4 +- .../default_event_engine_factory.cc | 4 +- .../default_event_engine_factory.h | 4 +- src/core/lib/event_engine/event_engine.cc | 4 +- .../extensions/can_track_errors.h | 4 +- .../extensions/chaotic_good_extension.h | 3 +- .../lib/event_engine/extensions/supports_fd.h | 6 +-- .../lib/event_engine/extensions/tcp_trace.h | 1 - src/core/lib/event_engine/forkable.cc | 4 +- src/core/lib/event_engine/forkable.h | 4 +- src/core/lib/event_engine/grpc_polled_fd.h | 5 +- src/core/lib/event_engine/handle_containers.h | 5 +- .../event_engine/memory_allocator_factory.h | 7 ++- src/core/lib/event_engine/poller.h | 4 +- .../event_engine/posix_engine/.clang-format | 50 ----------------- .../posix_engine/ev_epoll1_linux.cc | 10 ++-- .../posix_engine/ev_epoll1_linux.h | 7 ++- .../posix_engine/ev_poll_posix.cc | 15 +++--- .../event_engine/posix_engine/ev_poll_posix.h | 7 ++- .../event_engine/posix_engine/event_poller.h | 7 ++- .../event_poller_posix_default.cc | 5 +- .../posix_engine/event_poller_posix_default.h | 4 +- .../posix_engine/grpc_polled_fd_posix.h | 8 ++- .../posix_engine/internal_errqueue.cc | 3 +- .../posix_engine/internal_errqueue.h | 3 +- .../posix_engine/lockfree_event.cc | 7 ++- .../posix_engine/lockfree_event.h | 5 +- .../posix_engine/native_posix_dns_resolver.cc | 1 - .../posix_engine/native_posix_dns_resolver.h | 5 +- .../posix_engine/posix_endpoint.cc | 12 ++--- .../posix_engine/posix_endpoint.h | 11 ++-- .../event_engine/posix_engine/posix_engine.cc | 13 +++-- .../event_engine/posix_engine/posix_engine.h | 11 ++-- .../posix_engine/posix_engine_closure.h | 6 +-- .../posix_engine/posix_engine_listener.cc | 8 ++- .../posix_engine/posix_engine_listener.h | 12 ++--- .../posix_engine_listener_utils.cc | 6 +-- .../posix_engine_listener_utils.h | 3 +- .../posix_engine/tcp_socket_utils.cc | 11 ++-- .../posix_engine/tcp_socket_utils.h | 13 +++-- .../lib/event_engine/posix_engine/timer.cc | 6 +-- .../lib/event_engine/posix_engine/timer.h | 6 +-- .../event_engine/posix_engine/timer_heap.cc | 3 +- .../event_engine/posix_engine/timer_heap.h | 4 +- .../posix_engine/timer_manager.cc | 7 ++- .../event_engine/posix_engine/timer_manager.h | 6 +-- .../posix_engine/traced_buffer_list.cc | 6 +-- .../posix_engine/traced_buffer_list.h | 6 +-- .../posix_engine/wakeup_fd_eventfd.cc | 5 +- .../posix_engine/wakeup_fd_eventfd.h | 5 +- .../posix_engine/wakeup_fd_pipe.cc | 5 +- .../posix_engine/wakeup_fd_pipe.h | 5 +- .../posix_engine/wakeup_fd_posix.h | 4 +- .../posix_engine/wakeup_fd_posix_default.cc | 5 +- .../posix_engine/wakeup_fd_posix_default.h | 4 +- src/core/lib/event_engine/query_extensions.h | 4 +- .../ref_counted_dns_resolver_interface.h | 6 +-- src/core/lib/event_engine/resolved_address.cc | 6 +-- src/core/lib/event_engine/slice.cc | 8 ++- src/core/lib/event_engine/slice_buffer.cc | 3 +- src/core/lib/event_engine/tcp_socket_utils.cc | 1 - src/core/lib/event_engine/tcp_socket_utils.h | 6 +-- .../event_engine/thread_pool/thread_count.cc | 4 +- .../event_engine/thread_pool/thread_count.h | 7 ++- .../event_engine/thread_pool/thread_pool.h | 6 +-- .../thread_pool/thread_pool_factory.cc | 3 +- .../thread_pool/work_stealing_thread_pool.cc | 6 +-- .../thread_pool/work_stealing_thread_pool.h | 8 ++- .../thready_event_engine.cc | 4 +- .../thready_event_engine.h | 10 ++-- src/core/lib/event_engine/time_util.cc | 4 +- src/core/lib/event_engine/time_util.h | 3 +- src/core/lib/event_engine/utils.cc | 6 +-- src/core/lib/event_engine/utils.h | 5 +- .../lib/event_engine/windows/.clang-format | 50 ----------------- .../windows/grpc_polled_fd_windows.cc | 7 +-- .../windows/grpc_polled_fd_windows.h | 8 ++- src/core/lib/event_engine/windows/iocp.cc | 7 ++- src/core/lib/event_engine/windows/iocp.h | 3 +- .../windows/native_windows_dns_resolver.cc | 4 +- .../lib/event_engine/windows/win_socket.cc | 5 +- .../lib/event_engine/windows/win_socket.h | 5 +- .../event_engine/windows/windows_endpoint.cc | 7 ++- .../event_engine/windows/windows_engine.cc | 13 +++-- .../lib/event_engine/windows/windows_engine.h | 11 ++-- .../event_engine/windows/windows_listener.cc | 1 - .../event_engine/windows/windows_listener.h | 7 ++- .../work_queue/basic_work_queue.cc | 4 +- .../work_queue/basic_work_queue.h | 6 +-- .../lib/event_engine/work_queue/work_queue.h | 5 +- src/core/lib/experiments/config.cc | 4 +- src/core/lib/experiments/config.h | 3 +- src/core/lib/iomgr/buffer_list.cc | 3 +- src/core/lib/iomgr/buffer_list.h | 3 +- src/core/lib/iomgr/call_combiner.cc | 4 +- src/core/lib/iomgr/call_combiner.h | 6 +-- src/core/lib/iomgr/cfstream_handle.cc | 4 +- src/core/lib/iomgr/closure.cc | 4 +- src/core/lib/iomgr/closure.h | 6 +-- src/core/lib/iomgr/combiner.cc | 6 +-- src/core/lib/iomgr/combiner.h | 3 +- src/core/lib/iomgr/endpoint.h | 3 +- src/core/lib/iomgr/endpoint_cfstream.cc | 6 +-- src/core/lib/iomgr/endpoint_pair_posix.cc | 4 +- src/core/lib/iomgr/endpoint_pair_windows.cc | 1 - src/core/lib/iomgr/error.cc | 10 ++-- src/core/lib/iomgr/error.h | 10 ++-- src/core/lib/iomgr/error_cfstream.cc | 4 +- src/core/lib/iomgr/ev_apple.cc | 1 - src/core/lib/iomgr/ev_epoll1_linux.cc | 6 +-- src/core/lib/iomgr/ev_poll_posix.cc | 4 +- src/core/lib/iomgr/ev_posix.cc | 6 +-- src/core/lib/iomgr/ev_posix.h | 3 +- .../lib/iomgr/event_engine_shims/closure.cc | 7 ++- .../lib/iomgr/event_engine_shims/closure.h | 3 +- .../lib/iomgr/event_engine_shims/endpoint.cc | 15 +++--- .../lib/iomgr/event_engine_shims/endpoint.h | 4 +- .../iomgr/event_engine_shims/tcp_client.cc | 5 +- src/core/lib/iomgr/exec_ctx.cc | 7 ++- src/core/lib/iomgr/exec_ctx.h | 7 ++- src/core/lib/iomgr/executor.cc | 10 ++-- src/core/lib/iomgr/fork_posix.cc | 6 +-- src/core/lib/iomgr/fork_windows.cc | 4 +- src/core/lib/iomgr/internal_errqueue.cc | 3 +- src/core/lib/iomgr/iocp_windows.cc | 6 +-- src/core/lib/iomgr/iomgr.cc | 10 ++-- src/core/lib/iomgr/iomgr.h | 3 +- src/core/lib/iomgr/iomgr_internal.cc | 3 +- src/core/lib/iomgr/iomgr_internal.h | 3 +- src/core/lib/iomgr/iomgr_windows.cc | 1 - src/core/lib/iomgr/lockfree_event.cc | 5 +- src/core/lib/iomgr/polling_entity.cc | 5 +- src/core/lib/iomgr/pollset_set_windows.cc | 3 +- src/core/lib/iomgr/resolve_address.cc | 3 +- src/core/lib/iomgr/resolve_address.h | 6 +-- src/core/lib/iomgr/resolve_address_impl.h | 3 +- src/core/lib/iomgr/resolve_address_posix.cc | 5 +- src/core/lib/iomgr/resolve_address_posix.h | 4 +- src/core/lib/iomgr/resolve_address_windows.cc | 10 ++-- src/core/lib/iomgr/resolve_address_windows.h | 4 +- src/core/lib/iomgr/resolved_address.h | 3 +- src/core/lib/iomgr/sockaddr_utils_posix.cc | 6 +-- src/core/lib/iomgr/socket_mutator.h | 3 +- src/core/lib/iomgr/socket_utils.h | 3 +- .../lib/iomgr/socket_utils_common_posix.cc | 8 ++- src/core/lib/iomgr/socket_utils_posix.cc | 6 +-- src/core/lib/iomgr/socket_windows.cc | 6 +-- src/core/lib/iomgr/socket_windows.h | 3 +- src/core/lib/iomgr/tcp_client_cfstream.cc | 8 ++- src/core/lib/iomgr/tcp_client_posix.cc | 6 +-- src/core/lib/iomgr/tcp_client_windows.cc | 6 +-- src/core/lib/iomgr/tcp_posix.cc | 19 +++---- src/core/lib/iomgr/tcp_server.h | 4 +- src/core/lib/iomgr/tcp_server_posix.cc | 18 +++---- src/core/lib/iomgr/tcp_server_utils_posix.h | 5 +- .../iomgr/tcp_server_utils_posix_common.cc | 6 +-- .../iomgr/tcp_server_utils_posix_ifaddrs.cc | 4 +- src/core/lib/iomgr/tcp_server_windows.cc | 16 +++--- src/core/lib/iomgr/tcp_windows.cc | 8 ++- src/core/lib/iomgr/timer.h | 4 +- src/core/lib/iomgr/timer_generic.cc | 10 ++-- src/core/lib/iomgr/timer_heap.cc | 3 +- src/core/lib/iomgr/timer_manager.cc | 6 +-- src/core/lib/iomgr/timer_manager.h | 3 +- src/core/lib/iomgr/unix_sockets_posix.cc | 5 +- src/core/lib/iomgr/unix_sockets_posix.h | 7 ++- src/core/lib/iomgr/vsock.cc | 4 +- src/core/lib/iomgr/vsock.h | 7 ++- src/core/lib/iomgr/wakeup_fd_pipe.cc | 1 - src/core/lib/promise/activity.cc | 4 +- src/core/lib/promise/activity.h | 4 +- src/core/lib/promise/all_ok.h | 5 +- src/core/lib/promise/arena_promise.h | 4 +- src/core/lib/promise/context.h | 5 +- src/core/lib/promise/detail/join_state.h | 5 +- src/core/lib/promise/detail/promise_factory.h | 5 +- src/core/lib/promise/detail/promise_like.h | 5 +- src/core/lib/promise/detail/seq_state.h | 4 +- src/core/lib/promise/detail/status.h | 4 +- .../promise/event_engine_wakeup_scheduler.h | 7 ++- .../lib/promise/exec_ctx_wakeup_scheduler.h | 3 +- src/core/lib/promise/for_each.h | 4 +- src/core/lib/promise/if.h | 5 +- src/core/lib/promise/inter_activity_latch.h | 4 +- src/core/lib/promise/inter_activity_pipe.h | 4 +- src/core/lib/promise/interceptor_list.h | 4 +- src/core/lib/promise/join.h | 4 +- src/core/lib/promise/latch.h | 4 +- src/core/lib/promise/loop.h | 5 +- src/core/lib/promise/map.h | 3 +- src/core/lib/promise/map_pipe.h | 5 +- src/core/lib/promise/mpsc.h | 4 +- src/core/lib/promise/observable.h | 5 +- src/core/lib/promise/party.cc | 5 +- src/core/lib/promise/party.h | 6 +-- src/core/lib/promise/pipe.h | 4 +- src/core/lib/promise/poll.h | 5 +- src/core/lib/promise/prioritized_race.h | 4 +- src/core/lib/promise/promise.h | 5 +- src/core/lib/promise/promise_mutex.h | 5 +- src/core/lib/promise/race.h | 4 +- src/core/lib/promise/seq.h | 3 +- src/core/lib/promise/sleep.cc | 4 +- src/core/lib/promise/sleep.h | 7 ++- src/core/lib/promise/status_flag.h | 5 +- src/core/lib/promise/switch.h | 4 +- src/core/lib/promise/try_join.h | 5 +- src/core/lib/promise/try_seq.h | 4 +- src/core/lib/promise/wait_for_callback.h | 5 +- src/core/lib/promise/wait_set.h | 5 +- src/core/lib/resource_quota/api.cc | 8 ++- src/core/lib/resource_quota/api.h | 3 +- src/core/lib/resource_quota/arena.cc | 7 ++- src/core/lib/resource_quota/arena.h | 5 +- .../lib/resource_quota/connection_quota.cc | 4 +- .../lib/resource_quota/connection_quota.h | 5 +- src/core/lib/resource_quota/memory_quota.cc | 8 ++- src/core/lib/resource_quota/memory_quota.h | 8 ++- .../lib/resource_quota/periodic_update.cc | 4 +- src/core/lib/resource_quota/periodic_update.h | 4 +- src/core/lib/resource_quota/resource_quota.h | 9 ++-- src/core/lib/resource_quota/thread_quota.cc | 4 +- src/core/lib/resource_quota/thread_quota.h | 5 +- .../security/authorization/audit_logging.cc | 9 ++-- .../security/authorization/audit_logging.h | 9 ++-- .../authorization/authorization_engine.h | 4 +- .../authorization_policy_provider.h | 3 +- .../authorization/cel_authorization_engine.cc | 3 +- .../authorization/cel_authorization_engine.h | 7 ++- .../security/authorization/evaluate_args.cc | 6 +-- .../security/authorization/evaluate_args.h | 7 ++- .../grpc_authorization_engine.cc | 5 +- .../authorization/grpc_authorization_engine.h | 5 +- .../grpc_authorization_policy_provider.cc | 14 +++-- .../grpc_authorization_policy_provider.h | 9 ++-- .../authorization/grpc_server_authz_filter.cc | 5 +- .../authorization/grpc_server_authz_filter.h | 3 +- .../lib/security/authorization/matchers.cc | 6 +-- .../lib/security/authorization/matchers.h | 4 +- .../authorization/mock_cel/activation.h | 3 +- .../mock_cel/cel_expr_builder_factory.h | 4 +- .../authorization/mock_cel/cel_expression.h | 5 +- .../authorization/mock_cel/cel_value.h | 3 +- .../authorization/mock_cel/evaluator_core.h | 5 +- .../mock_cel/flat_expr_builder.h | 5 +- .../lib/security/authorization/rbac_policy.cc | 4 +- .../lib/security/authorization/rbac_policy.h | 6 +-- .../security/authorization/rbac_translator.cc | 8 ++- .../security/authorization/rbac_translator.h | 5 +- .../security/authorization/stdout_logger.cc | 8 +-- .../security/authorization/stdout_logger.h | 8 +-- .../certificate_provider_factory.h | 7 ++- .../certificate_provider_registry.cc | 4 +- .../certificate_provider_registry.h | 5 +- .../lib/security/context/security_context.cc | 12 ++--- .../lib/security/context/security_context.h | 12 ++--- .../credentials/alts/alts_credentials.cc | 4 +- .../credentials/alts/check_gcp_environment.cc | 5 +- .../alts/check_gcp_environment_linux.cc | 3 +- .../alts/check_gcp_environment_no_op.cc | 1 - .../alts/check_gcp_environment_windows.cc | 5 +- .../grpc_alts_credentials_client_options.cc | 3 +- .../alts/grpc_alts_credentials_options.cc | 4 +- .../security/credentials/call_creds_util.cc | 6 +-- .../security/credentials/call_creds_util.h | 4 +- .../credentials/channel_creds_registry.h | 5 +- .../channel_creds_registry_init.cc | 13 +++-- .../composite/composite_credentials.cc | 5 +- .../composite/composite_credentials.h | 13 +++-- .../lib/security/credentials/credentials.cc | 4 +- .../lib/security/credentials/credentials.h | 15 +++--- .../aws_external_account_credentials.cc | 16 +++--- .../aws_external_account_credentials.h | 5 +- .../external/aws_request_signer.cc | 9 ++-- .../credentials/external/aws_request_signer.h | 4 +- .../external/external_account_credentials.cc | 16 +++--- .../external/external_account_credentials.h | 6 +-- .../file_external_account_credentials.cc | 9 ++-- .../file_external_account_credentials.h | 5 +- .../url_external_account_credentials.cc | 16 +++--- .../url_external_account_credentials.h | 5 +- .../credentials/fake/fake_credentials.cc | 4 +- .../credentials/fake/fake_credentials.h | 7 ++- ...cp_service_account_identity_credentials.cc | 5 +- ...gcp_service_account_identity_credentials.h | 6 +-- .../google_default/credentials_generic.cc | 5 +- .../google_default_credentials.cc | 18 +++---- .../google_default_credentials.h | 4 +- .../credentials/iam/iam_credentials.cc | 4 +- .../credentials/iam/iam_credentials.h | 9 ++-- .../insecure/insecure_credentials.cc | 4 +- .../security/credentials/jwt/json_token.cc | 25 ++++----- .../lib/security/credentials/jwt/json_token.h | 3 +- .../credentials/jwt/jwt_credentials.cc | 14 +++-- .../credentials/jwt/jwt_credentials.h | 12 ++--- .../security/credentials/jwt/jwt_verifier.cc | 31 +++++------ .../security/credentials/jwt/jwt_verifier.h | 3 +- .../credentials/local/local_credentials.cc | 4 +- .../credentials/oauth2/oauth2_credentials.cc | 20 ++++--- .../credentials/oauth2/oauth2_credentials.h | 13 +++-- .../credentials/plugin/plugin_credentials.cc | 7 ++- .../credentials/plugin/plugin_credentials.h | 14 +++-- .../credentials/ssl/ssl_credentials.cc | 10 ++-- .../credentials/ssl/ssl_credentials.h | 6 +-- .../tls/grpc_tls_certificate_distributor.cc | 6 +-- .../tls/grpc_tls_certificate_distributor.h | 5 +- .../tls/grpc_tls_certificate_match.cc | 4 +- .../tls/grpc_tls_certificate_provider.cc | 10 ++-- .../tls/grpc_tls_certificate_provider.h | 8 ++- .../tls/grpc_tls_certificate_verifier.cc | 8 ++- .../tls/grpc_tls_certificate_verifier.h | 11 ++-- .../tls/grpc_tls_credentials_options.cc | 7 ++- .../credentials/tls/grpc_tls_crl_provider.cc | 4 +- .../credentials/tls/grpc_tls_crl_provider.h | 12 ++--- .../credentials/tls/tls_credentials.cc | 11 ++-- .../lib/security/credentials/tls/tls_utils.cc | 3 +- .../lib/security/credentials/tls/tls_utils.h | 6 +-- .../token_fetcher/token_fetcher_credentials.h | 5 +- .../credentials/xds/xds_credentials.cc | 5 +- .../credentials/xds/xds_credentials.h | 10 ++-- .../alts/alts_security_connector.cc | 16 +++--- .../fake/fake_security_connector.cc | 12 ++--- .../insecure/insecure_security_connector.cc | 6 +-- .../insecure/insecure_security_connector.h | 9 ++-- .../load_system_roots_supported.cc | 8 ++- .../load_system_roots_windows.cc | 7 ++- .../local/local_security_connector.cc | 12 ++--- .../security_connector/security_connector.cc | 4 +- .../security_connector/security_connector.h | 9 ++-- .../ssl/ssl_security_connector.cc | 6 +-- .../ssl/ssl_security_connector.h | 3 +- .../security/security_connector/ssl_utils.cc | 18 +++---- .../security/security_connector/ssl_utils.h | 12 ++--- .../tls/tls_security_connector.cc | 12 ++--- .../tls/tls_security_connector.h | 11 ++-- .../lib/security/transport/auth_filters.h | 3 +- .../security/transport/client_auth_filter.cc | 14 +++-- .../security/transport/server_auth_filter.cc | 15 +++--- src/core/lib/security/util/json_util.cc | 9 ++-- src/core/lib/slice/percent_encoding.cc | 4 +- src/core/lib/slice/slice.cc | 8 ++- src/core/lib/slice/slice.h | 10 ++-- src/core/lib/slice/slice_buffer.cc | 10 ++-- src/core/lib/slice/slice_buffer.h | 7 ++- src/core/lib/slice/slice_internal.h | 6 +-- src/core/lib/slice/slice_refcount.h | 3 +- src/core/lib/slice/slice_string_helpers.h | 3 +- src/core/lib/surface/byte_buffer.cc | 3 +- src/core/lib/surface/byte_buffer_reader.cc | 8 ++- src/core/lib/surface/call.cc | 28 +++++----- src/core/lib/surface/call.h | 10 ++-- src/core/lib/surface/call_log_batch.cc | 8 ++- src/core/lib/surface/call_test_only.h | 3 +- src/core/lib/surface/call_utils.cc | 28 +++++----- src/core/lib/surface/call_utils.h | 28 +++++----- src/core/lib/surface/channel.cc | 3 +- src/core/lib/surface/channel.h | 13 +++-- src/core/lib/surface/channel_create.cc | 3 +- src/core/lib/surface/channel_create.h | 5 +- src/core/lib/surface/channel_init.cc | 4 +- src/core/lib/surface/channel_init.h | 4 +- src/core/lib/surface/client_call.cc | 28 +++++----- src/core/lib/surface/client_call.h | 24 ++++----- src/core/lib/surface/completion_queue.cc | 14 +++-- src/core/lib/surface/completion_queue.h | 3 +- .../lib/surface/completion_queue_factory.cc | 3 +- src/core/lib/surface/event_string.cc | 4 +- src/core/lib/surface/event_string.h | 4 +- src/core/lib/surface/filter_stack_call.cc | 28 +++++----- src/core/lib/surface/filter_stack_call.h | 28 +++++----- src/core/lib/surface/init.cc | 9 ++-- src/core/lib/surface/init.h | 4 +- src/core/lib/surface/lame_client.cc | 11 ++-- src/core/lib/surface/lame_client.h | 7 ++- src/core/lib/surface/legacy_channel.cc | 11 ++-- src/core/lib/surface/legacy_channel.h | 9 ++-- src/core/lib/surface/metadata_array.cc | 3 +- src/core/lib/surface/server_call.cc | 22 ++++---- src/core/lib/surface/server_call.h | 28 +++++----- src/core/lib/surface/validate_metadata.cc | 5 +- src/core/lib/surface/validate_metadata.h | 6 +-- src/core/lib/transport/bdp_estimator.cc | 3 +- src/core/lib/transport/bdp_estimator.h | 6 +-- .../lib/transport/call_arena_allocator.cc | 4 +- src/core/lib/transport/call_arena_allocator.h | 3 +- src/core/lib/transport/call_filters.cc | 5 +- src/core/lib/transport/call_filters.h | 5 +- src/core/lib/transport/call_final_info.cc | 4 +- src/core/lib/transport/call_final_info.h | 4 +- src/core/lib/transport/call_spine.cc | 3 +- src/core/lib/transport/call_spine.h | 3 +- src/core/lib/transport/call_state.h | 3 +- src/core/lib/transport/connectivity_state.cc | 3 +- src/core/lib/transport/connectivity_state.h | 7 ++- src/core/lib/transport/error_utils.cc | 5 +- src/core/lib/transport/error_utils.h | 7 ++- src/core/lib/transport/interception_chain.cc | 4 +- src/core/lib/transport/interception_chain.h | 4 +- src/core/lib/transport/message.cc | 4 +- src/core/lib/transport/metadata_batch.cc | 4 +- src/core/lib/transport/metadata_batch.h | 8 ++- .../transport/metadata_compression_traits.h | 3 +- src/core/lib/transport/parsed_metadata.h | 6 +-- src/core/lib/transport/promise_endpoint.cc | 11 ++-- src/core/lib/transport/promise_endpoint.h | 12 ++--- .../transport/simple_slice_based_metadata.h | 3 +- src/core/lib/transport/timeout_encoding.cc | 6 +-- src/core/lib/transport/timeout_encoding.h | 4 +- src/core/lib/transport/transport.cc | 8 ++- src/core/lib/transport/transport.h | 12 ++--- src/core/lib/transport/transport_op_string.cc | 5 +- src/core/load_balancing/.clang-format | 50 ----------------- src/core/load_balancing/address_filtering.cc | 4 +- src/core/load_balancing/address_filtering.h | 5 +- src/core/load_balancing/backend_metric_data.h | 4 +- .../load_balancing/backend_metric_parser.cc | 3 +- .../load_balancing/backend_metric_parser.h | 4 +- .../load_balancing/child_policy_handler.cc | 7 ++- .../load_balancing/child_policy_handler.h | 5 +- src/core/load_balancing/delegating_helper.h | 9 ++-- src/core/load_balancing/endpoint_list.cc | 8 ++- src/core/load_balancing/endpoint_list.h | 6 +-- .../grpclb/client_load_reporting_filter.cc | 5 +- .../grpclb/client_load_reporting_filter.h | 3 +- src/core/load_balancing/grpclb/grpclb.cc | 20 ++++--- .../grpclb/grpclb_balancer_addresses.cc | 3 +- .../grpclb/grpclb_client_stats.cc | 3 +- .../grpclb/grpclb_client_stats.h | 6 +-- .../grpclb/load_balancer_api.cc | 8 ++- .../load_balancing/grpclb/load_balancer_api.h | 8 ++- .../load_balancing/health_check_client.cc | 16 +++--- src/core/load_balancing/health_check_client.h | 4 +- .../health_check_client_internal.h | 7 ++- src/core/load_balancing/lb_policy.h | 12 ++--- src/core/load_balancing/lb_policy_factory.h | 5 +- src/core/load_balancing/lb_policy_registry.cc | 7 ++- src/core/load_balancing/lb_policy_registry.h | 5 +- src/core/load_balancing/oob_backend_metric.cc | 18 +++---- src/core/load_balancing/oob_backend_metric.h | 4 +- .../oob_backend_metric_internal.h | 7 ++- .../outlier_detection/outlier_detection.cc | 8 ++- .../outlier_detection/outlier_detection.h | 4 +- .../load_balancing/pick_first/pick_first.cc | 10 ++-- src/core/load_balancing/priority/priority.cc | 10 ++-- .../load_balancing/ring_hash/ring_hash.cc | 10 ++-- src/core/load_balancing/ring_hash/ring_hash.h | 3 +- src/core/load_balancing/rls/rls.cc | 28 +++++----- .../load_balancing/round_robin/round_robin.cc | 6 +-- .../load_balancing/subchannel_interface.h | 7 ++- .../static_stride_scheduler.cc | 4 +- .../static_stride_scheduler.h | 3 +- .../weighted_round_robin.cc | 8 ++- .../weighted_target/weighted_target.cc | 8 ++- src/core/load_balancing/xds/cds.cc | 11 ++-- .../load_balancing/xds/xds_cluster_impl.cc | 6 +-- .../load_balancing/xds/xds_cluster_manager.cc | 8 ++- .../load_balancing/xds/xds_override_host.cc | 8 ++- .../load_balancing/xds/xds_override_host.h | 3 +- .../load_balancing/xds/xds_wrr_locality.cc | 9 ++-- src/core/resolver/.clang-format | 50 ----------------- src/core/resolver/binder/binder_resolver.cc | 6 +-- .../resolver/dns/c_ares/dns_resolver_ares.cc | 9 ++-- .../resolver/dns/c_ares/dns_resolver_ares.h | 3 +- .../resolver/dns/c_ares/grpc_ares_ev_driver.h | 8 ++- .../dns/c_ares/grpc_ares_ev_driver_posix.cc | 4 +- .../dns/c_ares/grpc_ares_ev_driver_windows.cc | 13 ++--- .../resolver/dns/c_ares/grpc_ares_wrapper.cc | 20 +++---- .../resolver/dns/c_ares/grpc_ares_wrapper.h | 7 +-- src/core/resolver/dns/dns_resolver_plugin.cc | 5 +- .../event_engine_client_channel_resolver.cc | 8 ++- .../event_engine_client_channel_resolver.h | 3 +- .../dns/event_engine/service_config_helper.cc | 4 +- .../dns/event_engine/service_config_helper.h | 4 +- src/core/resolver/dns/native/dns_resolver.cc | 7 ++- src/core/resolver/endpoint_addresses.cc | 4 +- src/core/resolver/endpoint_addresses.h | 5 +- src/core/resolver/fake/fake_resolver.cc | 5 +- src/core/resolver/fake/fake_resolver.h | 7 ++- .../google_c2p/google_c2p_resolver.cc | 7 ++- src/core/resolver/polling_resolver.cc | 4 +- src/core/resolver/polling_resolver.h | 7 ++- src/core/resolver/resolver.h | 5 +- src/core/resolver/resolver_factory.h | 5 +- src/core/resolver/resolver_registry.cc | 4 +- src/core/resolver/resolver_registry.h | 5 +- .../resolver/sockaddr/sockaddr_resolver.cc | 5 +- src/core/resolver/xds/xds_config.cc | 1 - src/core/resolver/xds/xds_config.h | 1 - .../resolver/xds/xds_dependency_manager.cc | 1 - .../resolver/xds/xds_dependency_manager.h | 1 - src/core/resolver/xds/xds_resolver.cc | 10 ++-- .../resolver/xds/xds_resolver_attributes.h | 3 +- src/core/server/server.cc | 18 +++---- src/core/server/server.h | 14 +++-- src/core/server/server_call_tracer_filter.cc | 5 +- src/core/server/server_config_selector.h | 5 +- .../server/server_config_selector_filter.cc | 5 +- src/core/server/xds_channel_stack_modifier.cc | 4 +- src/core/server/xds_channel_stack_modifier.h | 7 ++- src/core/server/xds_server_config_fetcher.cc | 14 +++-- src/core/service_config/service_config.h | 6 +-- .../service_config/service_config_call_data.h | 3 +- .../service_config_channel_arg_filter.cc | 7 ++- .../service_config/service_config_impl.cc | 4 +- src/core/service_config/service_config_impl.h | 6 +-- .../service_config/service_config_parser.cc | 3 +- .../service_config/service_config_parser.h | 4 +- src/core/telemetry/call_tracer.cc | 5 +- src/core/telemetry/call_tracer.h | 7 ++- src/core/telemetry/histogram_view.h | 3 +- src/core/telemetry/metrics.cc | 5 +- src/core/telemetry/metrics.h | 7 ++- src/core/telemetry/stats.cc | 3 +- src/core/telemetry/stats.h | 4 +- src/core/telemetry/stats_data.cc | 3 +- src/core/telemetry/stats_data.h | 4 +- src/core/telemetry/tcp_tracer.h | 3 +- src/core/tsi/alts/crypt/aes_gcm.cc | 13 ++--- src/core/tsi/alts/crypt/gsec.cc | 5 +- src/core/tsi/alts/crypt/gsec.h | 7 ++- .../tsi/alts/frame_protector/alts_counter.cc | 3 +- .../tsi/alts/frame_protector/alts_counter.h | 5 +- .../tsi/alts/frame_protector/alts_crypter.cc | 3 +- .../tsi/alts/frame_protector/alts_crypter.h | 5 +- .../frame_protector/alts_frame_protector.cc | 6 +-- .../frame_protector/alts_frame_protector.h | 3 +- .../tsi/alts/frame_protector/frame_handler.cc | 6 +-- .../tsi/alts/frame_protector/frame_handler.h | 3 +- .../alts/handshaker/alts_handshaker_client.cc | 11 ++-- .../alts/handshaker/alts_shared_resource.cc | 3 +- .../alts/handshaker/alts_tsi_handshaker.cc | 14 +++-- .../tsi/alts/handshaker/alts_tsi_utils.cc | 5 +- .../transport_security_common_api.cc | 4 +- ...lts_grpc_integrity_only_record_protocol.cc | 6 +-- ...alts_grpc_integrity_only_record_protocol.h | 3 +- ..._grpc_privacy_integrity_record_protocol.cc | 3 +- ...s_grpc_privacy_integrity_record_protocol.h | 3 +- .../alts_grpc_record_protocol_common.cc | 6 +-- .../alts_iovec_record_protocol.cc | 5 +- .../alts_iovec_record_protocol.h | 3 +- .../alts_zero_copy_grpc_protector.cc | 6 +-- .../alts_zero_copy_grpc_protector.h | 3 +- src/core/tsi/fake_transport_security.cc | 6 +-- src/core/tsi/local_transport_security.cc | 8 ++- .../tsi/ssl/key_logging/ssl_key_logging.cc | 5 +- .../tsi/ssl/key_logging/ssl_key_logging.h | 12 ++--- src/core/tsi/ssl/session_cache/ssl_session.h | 7 ++- .../ssl/session_cache/ssl_session_cache.cc | 5 +- .../tsi/ssl/session_cache/ssl_session_cache.h | 7 ++- .../ssl/session_cache/ssl_session_openssl.cc | 4 +- src/core/tsi/ssl_transport_security.cc | 23 ++++---- src/core/tsi/ssl_transport_security.h | 10 ++-- src/core/tsi/ssl_transport_security_utils.cc | 4 +- src/core/tsi/ssl_transport_security_utils.h | 6 +-- src/core/tsi/ssl_types.h | 3 +- src/core/tsi/transport_security.cc | 5 +- src/core/tsi/transport_security.h | 3 +- src/core/tsi/transport_security_interface.h | 3 +- src/core/util/.clang-format | 53 ------------------- src/core/util/alloc.cc | 5 +- src/core/util/atm.cc | 3 +- src/core/util/avl.h | 1 - src/core/util/backoff.cc | 4 +- src/core/util/backoff.h | 1 - src/core/util/bitset.h | 1 - src/core/util/chunked_vector.h | 1 - src/core/util/crash.cc | 3 +- src/core/util/crash.h | 1 - src/core/util/dual_ref_counted.h | 1 - src/core/util/event_log.cc | 4 +- src/core/util/event_log.h | 2 - src/core/util/examine_stack.cc | 4 +- src/core/util/fork.cc | 7 ++- src/core/util/gcp_metadata_query.cc | 11 ++-- src/core/util/gcp_metadata_query.h | 1 - src/core/util/gethostname_host_name_max.cc | 3 +- src/core/util/gethostname_sysconf.cc | 3 +- src/core/util/gpr_time.cc | 7 +-- src/core/util/grpc_if_nametoindex.h | 1 - src/core/util/grpc_if_nametoindex_posix.cc | 1 - .../util/grpc_if_nametoindex_unsupported.cc | 1 - src/core/util/host_port.cc | 3 +- src/core/util/http_client/format_request.cc | 7 +-- src/core/util/http_client/format_request.h | 3 +- src/core/util/http_client/httpcli.cc | 11 ++-- src/core/util/http_client/httpcli.h | 7 +-- .../http_client/httpcli_security_connector.cc | 15 +++--- .../http_client/httpcli_ssl_credentials.h | 3 +- src/core/util/http_client/parser.cc | 6 +-- src/core/util/http_client/parser.h | 4 +- src/core/util/iphone/cpu.cc | 3 +- src/core/util/json/json.h | 3 +- src/core/util/json/json_channel_args.h | 1 - src/core/util/json/json_object_loader.cc | 7 ++- src/core/util/json/json_object_loader.h | 1 - src/core/util/json/json_reader.cc | 5 +- src/core/util/json/json_reader.h | 1 - src/core/util/json/json_util.cc | 4 +- src/core/util/json/json_util.h | 1 - src/core/util/json/json_writer.cc | 2 - src/core/util/latent_see.cc | 1 - src/core/util/latent_see.h | 1 - src/core/util/linux/cpu.cc | 6 +-- src/core/util/load_file.cc | 8 ++- src/core/util/load_file.h | 1 - src/core/util/log.cc | 11 ++-- src/core/util/manual_constructor.h | 1 - src/core/util/match.h | 1 - src/core/util/matchers.cc | 4 +- src/core/util/matchers.h | 1 - src/core/util/memory.h | 3 +- src/core/util/mpscq.cc | 4 +- src/core/util/mpscq.h | 1 - src/core/util/msys/tmpfile.cc | 5 +- src/core/util/notification.h | 1 - src/core/util/per_cpu.cc | 3 +- src/core/util/per_cpu.h | 4 +- src/core/util/posix/cpu.cc | 6 +-- src/core/util/posix/stat.cc | 1 - src/core/util/posix/string.cc | 5 +- src/core/util/posix/sync.cc | 6 +-- src/core/util/posix/thd.cc | 9 ++-- src/core/util/posix/time.cc | 3 +- src/core/util/posix/tmpfile.cc | 6 +-- src/core/util/random_early_detection.cc | 4 +- src/core/util/random_early_detection.h | 1 - src/core/util/ref_counted.h | 1 - src/core/util/ref_counted_ptr.h | 2 - src/core/util/ref_counted_string.cc | 6 +-- src/core/util/ref_counted_string.h | 2 - src/core/util/spinlock.h | 3 +- src/core/util/stat.h | 1 - src/core/util/status_helper.cc | 8 ++- src/core/util/status_helper.h | 2 - src/core/util/strerror.cc | 3 +- src/core/util/string.cc | 9 ++-- src/core/util/string.h | 4 +- src/core/util/subprocess_posix.cc | 4 +- src/core/util/subprocess_windows.cc | 4 +- src/core/util/sync.cc | 8 ++- src/core/util/sync.h | 3 +- src/core/util/sync_abseil.cc | 8 ++- src/core/util/table.h | 2 - src/core/util/tchar.cc | 4 +- src/core/util/thd.h | 4 +- src/core/util/time.cc | 8 ++- src/core/util/time.h | 7 +-- src/core/util/time_averaged_stats.cc | 4 +- src/core/util/time_precise.cc | 5 +- src/core/util/time_precise.h | 1 - src/core/util/time_util.cc | 6 +-- src/core/util/time_util.h | 3 +- src/core/util/tmpfile.h | 1 - src/core/util/unique_type_name.h | 1 - src/core/util/uri.cc | 3 +- src/core/util/uuid_v4.cc | 4 +- src/core/util/uuid_v4.h | 1 - src/core/util/validation_errors.cc | 3 +- src/core/util/validation_errors.h | 1 - src/core/util/windows/directory_reader.cc | 1 - src/core/util/windows/stat.cc | 1 - src/core/util/windows/string.cc | 5 +- src/core/util/windows/string_util.cc | 10 ++-- src/core/util/windows/sync.cc | 3 +- src/core/util/windows/thd.cc | 8 ++- src/core/util/windows/time.cc | 4 +- src/core/util/windows/tmpfile.cc | 5 +- src/core/util/work_serializer.cc | 7 +-- src/core/util/work_serializer.h | 4 +- .../xds/grpc/certificate_provider_store.cc | 5 +- .../xds/grpc/certificate_provider_store.h | 7 ++- ...le_watcher_certificate_provider_factory.cc | 7 ++- ...ile_watcher_certificate_provider_factory.h | 7 ++- .../xds/grpc/xds_audit_logger_registry.cc | 5 +- src/core/xds/grpc/xds_audit_logger_registry.h | 5 +- src/core/xds/grpc/xds_bootstrap_grpc.cc | 6 +-- src/core/xds/grpc/xds_bootstrap_grpc.h | 5 +- src/core/xds/grpc/xds_certificate_provider.cc | 5 +- src/core/xds/grpc/xds_certificate_provider.h | 9 ++-- src/core/xds/grpc/xds_client_grpc.cc | 17 +++--- src/core/xds/grpc/xds_client_grpc.h | 7 ++- src/core/xds/grpc/xds_cluster.cc | 1 - src/core/xds/grpc/xds_cluster.h | 1 - src/core/xds/grpc/xds_cluster_parser.cc | 5 +- src/core/xds/grpc/xds_cluster_parser.h | 3 +- .../xds/grpc/xds_cluster_specifier_plugin.cc | 12 ++--- .../xds/grpc/xds_cluster_specifier_plugin.h | 9 ++-- src/core/xds/grpc/xds_common_types.cc | 1 - src/core/xds/grpc/xds_common_types.h | 1 - src/core/xds/grpc/xds_common_types_parser.cc | 14 +++-- src/core/xds/grpc/xds_common_types_parser.h | 1 - src/core/xds/grpc/xds_endpoint.h | 1 - src/core/xds/grpc/xds_endpoint_parser.cc | 6 +-- src/core/xds/grpc/xds_endpoint_parser.h | 3 +- src/core/xds/grpc/xds_health_status.h | 1 - src/core/xds/grpc/xds_http_fault_filter.cc | 8 ++- src/core/xds/grpc/xds_http_fault_filter.h | 7 ++- src/core/xds/grpc/xds_http_filter.h | 3 +- src/core/xds/grpc/xds_http_filter_registry.cc | 5 +- src/core/xds/grpc/xds_http_filter_registry.h | 3 +- .../xds/grpc/xds_http_gcp_authn_filter.cc | 5 +- src/core/xds/grpc/xds_http_gcp_authn_filter.h | 3 +- src/core/xds/grpc/xds_http_rbac_filter.cc | 8 ++- src/core/xds/grpc/xds_http_rbac_filter.h | 7 ++- .../grpc/xds_http_stateful_session_filter.cc | 7 ++- .../grpc/xds_http_stateful_session_filter.h | 7 ++- src/core/xds/grpc/xds_lb_policy_registry.cc | 6 +-- src/core/xds/grpc/xds_lb_policy_registry.h | 5 +- src/core/xds/grpc/xds_listener.cc | 1 - src/core/xds/grpc/xds_listener.h | 1 - src/core/xds/grpc/xds_listener_parser.cc | 6 +-- src/core/xds/grpc/xds_listener_parser.h | 3 +- src/core/xds/grpc/xds_metadata.h | 1 - src/core/xds/grpc/xds_metadata_parser.cc | 5 +- src/core/xds/grpc/xds_metadata_parser.h | 1 - src/core/xds/grpc/xds_route_config.cc | 1 - src/core/xds/grpc/xds_route_config.h | 1 - src/core/xds/grpc/xds_route_config_parser.cc | 12 ++--- src/core/xds/grpc/xds_route_config_parser.h | 6 +-- src/core/xds/grpc/xds_routing.cc | 4 +- src/core/xds/grpc/xds_routing.h | 4 +- src/core/xds/grpc/xds_server_grpc.cc | 1 - src/core/xds/grpc/xds_transport_grpc.cc | 18 +++---- src/core/xds/grpc/xds_transport_grpc.h | 11 ++-- src/core/xds/xds_client/lrs_client.cc | 13 +++-- src/core/xds/xds_client/lrs_client.h | 7 ++- src/core/xds/xds_client/xds_api.cc | 14 +++-- src/core/xds/xds_client/xds_api.h | 8 ++- .../xds_backend_metric_propagation.cc | 1 - .../xds_backend_metric_propagation.h | 1 - src/core/xds/xds_client/xds_bootstrap.cc | 3 +- src/core/xds/xds_client/xds_bootstrap.h | 4 +- src/core/xds/xds_client/xds_client.cc | 10 ++-- src/core/xds/xds_client/xds_client.h | 9 ++-- src/core/xds/xds_client/xds_locality.h | 1 - src/core/xds/xds_client/xds_metrics.h | 4 +- src/core/xds/xds_client/xds_resource_type.h | 9 ++-- .../xds/xds_client/xds_resource_type_impl.h | 5 +- src/core/xds/xds_client/xds_transport.h | 1 - src/cpp/client/call_credentials.cc | 5 +- src/cpp/client/channel_cc.cc | 17 +++--- src/cpp/client/channel_credentials.cc | 8 +-- src/cpp/client/client_context.cc | 20 ++++--- src/cpp/client/create_channel.cc | 10 ++-- src/cpp/client/create_channel_internal.cc | 4 +- src/cpp/client/create_channel_internal.h | 8 +-- src/cpp/client/create_channel_posix.cc | 10 ++-- src/cpp/client/cronet_credentials.cc | 10 ++-- src/cpp/client/global_callback_hook.cc | 4 +- src/cpp/client/insecure_credentials.cc | 4 +- src/cpp/client/secure_credentials.cc | 24 ++++----- src/cpp/client/xds_credentials.cc | 8 +-- src/cpp/common/alarm.cc | 15 +++--- src/cpp/common/alts_context.cc | 10 ++-- src/cpp/common/alts_util.cc | 15 +++--- src/cpp/common/auth_property_iterator.cc | 4 +- src/cpp/common/channel_arguments.cc | 13 +++-- src/cpp/common/completion_queue_cc.cc | 11 ++-- .../common/insecure_create_auth_context.cc | 4 +- src/cpp/common/resource_quota_cc.cc | 5 +- src/cpp/common/secure_auth_context.cc | 4 +- src/cpp/common/secure_auth_context.h | 6 +-- src/cpp/common/secure_create_auth_context.cc | 4 +- src/cpp/common/tls_certificate_provider.cc | 9 ++-- src/cpp/common/tls_certificate_verifier.cc | 19 ++++--- src/cpp/common/tls_credentials_options.cc | 10 ++-- src/cpp/common/validate_service_config.cc | 7 ++- src/cpp/common/version_cc.cc | 4 +- src/cpp/ext/chaotic_good.cc | 4 +- src/cpp/ext/chaotic_good.h | 4 +- src/cpp/ext/csm/csm_observability.cc | 7 ++- src/cpp/ext/csm/csm_observability.h | 3 +- src/cpp/ext/csm/metadata_exchange.cc | 8 ++- src/cpp/ext/csm/metadata_exchange.h | 7 ++- src/cpp/ext/filters/census/client_filter.cc | 14 +++-- src/cpp/ext/filters/census/client_filter.h | 3 +- src/cpp/ext/filters/census/context.cc | 5 +- src/cpp/ext/filters/census/context.h | 12 ++--- src/cpp/ext/filters/census/grpc_plugin.cc | 9 ++-- src/cpp/ext/filters/census/grpc_plugin.h | 6 +-- src/cpp/ext/filters/census/measures.cc | 3 +- src/cpp/ext/filters/census/measures.h | 4 +- .../filters/census/open_census_call_tracer.h | 8 ++- src/cpp/ext/filters/census/rpc_encoding.h | 3 +- .../ext/filters/census/server_call_tracer.cc | 8 ++- src/cpp/ext/filters/census/views.cc | 7 ++- src/cpp/ext/gcp/environment_autodetect.cc | 11 ++-- src/cpp/ext/gcp/environment_autodetect.h | 7 ++- src/cpp/ext/gcp/observability.cc | 16 +++--- src/cpp/ext/gcp/observability_config.cc | 8 ++- src/cpp/ext/gcp/observability_config.h | 4 +- src/cpp/ext/gcp/observability_logging_sink.cc | 17 +++--- src/cpp/ext/gcp/observability_logging_sink.h | 6 +-- src/cpp/ext/otel/key_value_iterable.h | 4 +- src/cpp/ext/otel/otel_client_call_tracer.cc | 8 ++- src/cpp/ext/otel/otel_client_call_tracer.h | 6 +-- src/cpp/ext/otel/otel_plugin.cc | 9 ++-- src/cpp/ext/otel/otel_plugin.h | 8 ++- src/cpp/ext/otel/otel_server_call_tracer.cc | 5 +- src/cpp/ext/otel/otel_server_call_tracer.h | 3 +- src/cpp/ext/proto_server_reflection.cc | 6 +-- src/cpp/ext/proto_server_reflection.h | 12 ++--- src/cpp/ext/proto_server_reflection_plugin.cc | 6 +-- .../server/authorization_policy_provider.cc | 6 +-- src/cpp/server/backend_metric_recorder.cc | 6 +-- src/cpp/server/backend_metric_recorder.h | 10 ++-- src/cpp/server/channel_argument_option.cc | 8 +-- src/cpp/server/channelz/channelz_service.cc | 4 +- .../channelz/channelz_service_plugin.cc | 6 +-- src/cpp/server/csds/csds.cc | 10 ++-- src/cpp/server/dynamic_thread_pool.h | 4 +- .../external_connection_acceptor_impl.cc | 8 +-- .../external_connection_acceptor_impl.h | 6 +-- .../health/default_health_check_service.cc | 14 +++-- .../health/default_health_check_service.h | 14 +++-- ...lth_check_service_server_builder_option.cc | 8 +-- src/cpp/server/insecure_server_credentials.cc | 4 +- src/cpp/server/load_reporter/constants.h | 3 +- src/cpp/server/load_reporter/get_cpu_stats.h | 3 +- .../load_reporter/get_cpu_stats_linux.cc | 4 +- .../get_cpu_stats_unsupported.cc | 1 - .../server/load_reporter/load_data_store.cc | 4 +- .../server/load_reporter/load_data_store.h | 5 +- src/cpp/server/load_reporter/load_reporter.cc | 4 +- src/cpp/server/load_reporter/load_reporter.h | 7 +-- .../load_reporter_async_service_impl.cc | 9 ++-- .../load_reporter_async_service_impl.h | 12 ++--- ...reporting_service_server_builder_option.cc | 8 +-- ...reporting_service_server_builder_plugin.cc | 4 +- ..._reporting_service_server_builder_plugin.h | 6 +-- src/cpp/server/load_reporter/util.cc | 9 ++-- src/cpp/server/orca/orca_service.cc | 32 ++++++----- src/cpp/server/secure_server_credentials.cc | 8 +-- src/cpp/server/secure_server_credentials.h | 4 +- src/cpp/server/server_builder.cc | 22 ++++---- src/cpp/server/server_cc.cc | 34 ++++++------ src/cpp/server/server_context.cc | 30 +++++------ src/cpp/server/xds_server_credentials.cc | 8 +-- src/cpp/thread_manager/thread_manager.cc | 1 - src/cpp/util/byte_buffer_cc.cc | 6 +-- src/cpp/util/status.cc | 4 +- src/cpp/util/string_ref.cc | 3 +- src/cpp/util/time_cc.cc | 6 +-- .../tests/CppCronetTests/TestHelper.h | 7 ++- .../grpc_observability/client_call_tracer.cc | 4 +- .../grpc_observability/client_call_tracer.h | 4 +- .../grpc_observability/metadata_exchange.cc | 4 +- .../grpc_observability/metadata_exchange.h | 1 - .../grpc_observability/observability_util.h | 3 +- .../python_observability_context.cc | 1 - .../python_observability_context.h | 4 +- .../grpc_observability/rpc_encoding.h | 3 +- .../grpc_observability/server_call_tracer.cc | 4 +- .../grpc_observability/server_call_tracer.h | 5 +- src/ruby/ext/grpc/rb_byte_buffer.c | 6 +-- src/ruby/ext/grpc/rb_call.c | 10 ++-- src/ruby/ext/grpc/rb_call_credentials.c | 11 ++-- src/ruby/ext/grpc/rb_channel.c | 13 +++-- src/ruby/ext/grpc/rb_channel_args.c | 6 +-- src/ruby/ext/grpc/rb_channel_credentials.c | 11 ++-- src/ruby/ext/grpc/rb_channel_credentials.h | 3 +- src/ruby/ext/grpc/rb_completion_queue.c | 7 ++- src/ruby/ext/grpc/rb_compression_options.c | 11 ++-- src/ruby/ext/grpc/rb_event_thread.c | 9 ++-- src/ruby/ext/grpc/rb_grpc.c | 7 ++- src/ruby/ext/grpc/rb_grpc.h | 3 +- src/ruby/ext/grpc/rb_server.c | 12 ++--- src/ruby/ext/grpc/rb_server_credentials.c | 6 +-- src/ruby/ext/grpc/rb_server_credentials.h | 3 +- .../ext/grpc/rb_xds_channel_credentials.c | 11 ++-- .../ext/grpc/rb_xds_channel_credentials.h | 3 +- src/ruby/ext/grpc/rb_xds_server_credentials.c | 8 +-- src/ruby/ext/grpc/rb_xds_server_credentials.h | 3 +- test/core/address_utils/parse_address_test.cc | 5 +- .../parse_address_with_named_scope_id_test.cc | 8 ++- .../sockaddr_utils_fuzzer_test.cc | 1 - .../core/address_utils/sockaddr_utils_test.cc | 5 +- test/core/bad_client/bad_client.cc | 10 ++-- test/core/bad_client/bad_client.h | 5 +- .../core/bad_client/tests/bad_streaming_id.cc | 8 ++- test/core/bad_client/tests/badreq.cc | 3 +- .../bad_client/tests/connection_prefix.cc | 3 +- .../core/bad_client/tests/duplicate_header.cc | 6 +-- .../bad_client/tests/head_of_line_blocking.cc | 10 ++-- test/core/bad_client/tests/headers.cc | 3 +- .../tests/initial_settings_frame.cc | 5 +- test/core/bad_client/tests/out_of_bounds.cc | 8 ++- .../tests/server_registered_method.cc | 3 +- test/core/bad_client/tests/simple_request.cc | 3 +- test/core/bad_client/tests/unknown_frame.cc | 8 ++- test/core/bad_client/tests/window_overflow.cc | 6 +-- test/core/bad_connection/close_fd_test.cc | 17 +++--- test/core/bad_ssl/bad_ssl_test.cc | 12 ++--- test/core/bad_ssl/server_common.cc | 4 +- test/core/bad_ssl/servers/alpn.cc | 6 +-- test/core/bad_ssl/servers/cert.cc | 3 +- test/core/call/batch_builder.h | 1 - test/core/call/bm_client_call.cc | 1 - test/core/call/call_utils_test.cc | 4 +- test/core/call/client_call_test.cc | 3 +- test/core/call/request_buffer_test.cc | 1 - test/core/call/server_call_test.cc | 7 ++- test/core/call/yodel/fuzzer_main.cc | 7 +-- test/core/call/yodel/test_main.cc | 1 - test/core/call/yodel/yodel_test.cc | 1 - test/core/call/yodel/yodel_test.h | 5 +- test/core/channel/call_finalization_test.cc | 5 +- test/core/channel/channel_args_test.cc | 10 ++-- .../channel/channel_stack_builder_test.cc | 5 +- test/core/channel/channel_stack_test.cc | 5 +- .../channel/minimal_stack_is_minimal_test.cc | 7 ++- .../server_call_tracer_factory_test.cc | 1 - test/core/channelz/channel_trace_test.cc | 10 ++-- test/core/channelz/channelz_registry_test.cc | 1 - test/core/channelz/channelz_test.cc | 18 +++---- test/core/client_channel/bm_client_channel.cc | 4 +- .../bm_load_balanced_call_destination.cc | 4 +- .../client_channel_service_config_test.cc | 7 ++- .../client_channel/client_channel_test.cc | 5 +- .../connected_subchannel_test.cc | 5 +- test/core/client_channel/lb_metadata_test.cc | 1 - .../load_balanced_call_destination_test.cc | 5 +- .../retry_service_config_test.cc | 7 ++- .../client_channel/retry_throttle_test.cc | 1 - .../client_channel/subchannel_args_test.cc | 7 ++- .../miscompile_with_no_unique_address_test.cc | 4 +- test/core/compression/compression_test.cc | 6 +-- .../compression/message_compress_fuzzer.cc | 5 +- .../core/compression/message_compress_test.cc | 6 +-- .../compression/message_decompress_fuzzer.cc | 5 +- test/core/config/core_configuration_test.cc | 4 +- test/core/config/load_config_test.cc | 1 - test/core/end2end/bad_server_response_test.cc | 20 ++++--- test/core/end2end/connection_refused_test.cc | 12 ++--- test/core/end2end/cq_verifier.cc | 14 +++-- test/core/end2end/cq_verifier.h | 10 ++-- test/core/end2end/dualstack_socket_test.cc | 21 ++++---- test/core/end2end/end2end_test_fuzzer.cc | 7 +-- test/core/end2end/end2end_test_main.cc | 1 - test/core/end2end/end2end_test_suites.cc | 22 ++++---- test/core/end2end/end2end_tests.h | 22 ++++---- test/core/end2end/fixtures/h2_oauth2_common.h | 6 +-- .../fixtures/h2_ssl_cred_reload_fixture.h | 6 +-- .../core/end2end/fixtures/h2_ssl_tls_common.h | 6 +-- test/core/end2end/fixtures/h2_tls_common.h | 14 +++-- .../end2end/fixtures/http_proxy_fixture.cc | 12 ++--- test/core/end2end/fixtures/inproc_fixture.h | 3 +- test/core/end2end/fixtures/local_util.cc | 7 ++- test/core/end2end/fixtures/local_util.h | 7 ++- test/core/end2end/fixtures/proxy.cc | 16 +++--- test/core/end2end/fixtures/secure_fixture.h | 9 ++-- test/core/end2end/fixtures/sockpair_fixture.h | 9 ++-- test/core/end2end/fuzzers/api_fuzzer.cc | 14 +++-- test/core/end2end/fuzzers/client_fuzzer.cc | 9 ++-- test/core/end2end/fuzzers/connector_fuzzer.h | 1 - test/core/end2end/fuzzers/fuzzing_common.cc | 16 +++--- test/core/end2end/fuzzers/fuzzing_common.h | 4 +- test/core/end2end/fuzzers/network_input.cc | 4 +- test/core/end2end/fuzzers/server_fuzzer.cc | 9 ++-- test/core/end2end/fuzzers/server_fuzzer.h | 3 +- .../fuzzers/server_fuzzer_chaotic_good.cc | 3 +- test/core/end2end/goaway_server_test.cc | 22 ++++---- test/core/end2end/h2_ssl_cert_test.cc | 22 ++++---- .../core/end2end/h2_ssl_session_reuse_test.cc | 15 +++--- ...ls_peer_property_external_verifier_test.cc | 17 +++--- .../end2end/invalid_call_argument_test.cc | 18 +++---- test/core/end2end/no_server_test.cc | 16 +++--- test/core/end2end/tests/bad_ping.cc | 7 ++- test/core/end2end/tests/binary_metadata.cc | 7 ++- test/core/end2end/tests/call_creds.cc | 11 ++-- test/core/end2end/tests/call_host_override.cc | 7 ++- .../core/end2end/tests/cancel_after_accept.cc | 7 ++- .../end2end/tests/cancel_after_client_done.cc | 5 +- .../core/end2end/tests/cancel_after_invoke.cc | 5 +- .../end2end/tests/cancel_after_round_trip.cc | 7 ++- .../end2end/tests/cancel_before_invoke.cc | 5 +- test/core/end2end/tests/cancel_with_status.cc | 7 ++- test/core/end2end/tests/channelz.cc | 7 ++- test/core/end2end/tests/client_streaming.cc | 5 +- test/core/end2end/tests/compressed_payload.cc | 10 ++-- test/core/end2end/tests/connectivity.cc | 5 +- test/core/end2end/tests/default_host.cc | 5 +- .../core/end2end/tests/disappearing_server.cc | 5 +- .../core/end2end/tests/filter_causes_close.cc | 4 +- test/core/end2end/tests/filter_init_fails.cc | 5 +- test/core/end2end/tests/filtered_metadata.cc | 5 +- .../end2end/tests/graceful_server_shutdown.cc | 5 +- test/core/end2end/tests/grpc_authz.cc | 11 ++-- test/core/end2end/tests/high_initial_seqno.cc | 7 ++- test/core/end2end/tests/hpack_size.cc | 6 +-- test/core/end2end/tests/http2_stats.cc | 7 ++- .../end2end/tests/invoke_large_request.cc | 6 +-- test/core/end2end/tests/keepalive_timeout.cc | 7 ++- test/core/end2end/tests/large_metadata.cc | 6 +-- .../end2end/tests/max_concurrent_streams.cc | 7 ++- test/core/end2end/tests/max_connection_age.cc | 6 +-- .../core/end2end/tests/max_connection_idle.cc | 9 ++-- test/core/end2end/tests/max_message_length.cc | 7 ++- test/core/end2end/tests/negative_deadline.cc | 5 +- test/core/end2end/tests/no_logging.cc | 7 ++- test/core/end2end/tests/payload.cc | 5 +- test/core/end2end/tests/ping.cc | 5 +- .../core/end2end/tests/ping_pong_streaming.cc | 4 +- test/core/end2end/tests/proxy_auth.cc | 5 +- test/core/end2end/tests/registered_call.cc | 3 +- test/core/end2end/tests/request_with_flags.cc | 10 ++-- .../end2end/tests/request_with_payload.cc | 5 +- .../end2end/tests/resource_quota_server.cc | 8 ++- test/core/end2end/tests/retry.cc | 7 ++- ...retry_cancel_after_first_attempt_starts.cc | 5 +- .../tests/retry_cancel_during_delay.cc | 7 ++- ...retry_cancel_with_multiple_send_batches.cc | 7 ++- test/core/end2end/tests/retry_cancellation.cc | 7 ++- test/core/end2end/tests/retry_disabled.cc | 7 ++- .../retry_exceeds_buffer_size_in_delay.cc | 7 ++- ...ry_exceeds_buffer_size_in_initial_batch.cc | 7 ++- ...exceeds_buffer_size_in_subsequent_batch.cc | 7 ++- test/core/end2end/tests/retry_lb_drop.cc | 9 ++-- test/core/end2end/tests/retry_lb_fail.cc | 7 ++- .../tests/retry_non_retriable_status.cc | 7 ++- ...ry_non_retriable_status_before_trailers.cc | 7 ++- .../tests/retry_per_attempt_recv_timeout.cc | 7 ++- ...er_attempt_recv_timeout_on_last_attempt.cc | 7 ++- .../tests/retry_recv_initial_metadata.cc | 7 ++- test/core/end2end/tests/retry_recv_message.cc | 7 ++- .../tests/retry_recv_message_replay.cc | 7 ++- .../retry_recv_trailing_metadata_error.cc | 7 ++- .../tests/retry_send_initial_metadata_refs.cc | 9 ++-- .../core/end2end/tests/retry_send_op_fails.cc | 7 ++- .../end2end/tests/retry_send_recv_batch.cc | 7 ++- .../tests/retry_server_pushback_delay.cc | 7 ++- .../tests/retry_server_pushback_disabled.cc | 7 ++- test/core/end2end/tests/retry_streaming.cc | 7 ++- .../tests/retry_streaming_after_commit.cc | 7 ++- ...reaming_succeeds_before_replay_finished.cc | 7 ++- test/core/end2end/tests/retry_throttled.cc | 7 ++- .../end2end/tests/retry_too_many_attempts.cc | 7 ++- .../end2end/tests/retry_transparent_goaway.cc | 7 ++- ...etry_transparent_max_concurrent_streams.cc | 9 ++-- .../retry_transparent_not_sent_on_wire.cc | 6 +-- .../tests/retry_unref_before_finish.cc | 7 ++- .../end2end/tests/retry_unref_before_recv.cc | 7 ++- .../end2end/tests/server_finishes_request.cc | 5 +- test/core/end2end/tests/server_streaming.cc | 5 +- .../end2end/tests/shutdown_finishes_calls.cc | 7 ++- .../end2end/tests/simple_delayed_request.cc | 9 ++-- test/core/end2end/tests/simple_metadata.cc | 5 +- test/core/end2end/tests/simple_request.cc | 4 +- .../end2end/tests/streaming_error_response.cc | 5 +- .../tests/timeout_before_request_call.cc | 8 ++- test/core/end2end/tests/trailing_metadata.cc | 5 +- test/core/end2end/tests/write_buffering.cc | 7 ++- .../end2end/tests/write_buffering_at_end.cc | 7 ++- test/core/event_engine/cf/cf_engine_test.cc | 7 ++- .../core/event_engine/common_closures_test.cc | 5 +- .../default_engine_methods_test.cc | 13 +++-- .../core/event_engine/endpoint_config_test.cc | 5 +- .../event_engine/event_engine_test_utils.cc | 12 ++--- .../event_engine/event_engine_test_utils.h | 7 ++- test/core/event_engine/factory_test.cc | 7 ++- test/core/event_engine/forkable_test.cc | 1 - .../fuzzing_event_engine.cc | 6 +-- .../fuzzing_event_engine.h | 12 ++--- .../fuzzing_event_engine_unittest.cc | 5 +- test/core/event_engine/handle_tests.cc | 6 +-- test/core/event_engine/mock_event_engine.h | 8 +-- .../posix/event_poller_posix_test.cc | 10 ++-- .../posix/lock_free_event_test.cc | 10 ++-- .../posix/log_too_many_open_files_test.cc | 1 - .../event_engine/posix/posix_endpoint_test.cc | 9 ++-- .../posix/posix_engine_listener_utils_test.cc | 5 +- .../posix/posix_engine_test_utils.cc | 1 - .../posix/posix_engine_test_utils.h | 5 +- .../posix/posix_event_engine_connect_test.cc | 8 ++- .../posix/tcp_posix_socket_utils_test.cc | 7 +-- .../event_engine/posix/timer_heap_test.cc | 1 - .../event_engine/posix/timer_list_test.cc | 7 ++- .../event_engine/posix/timer_manager_test.cc | 5 +- .../posix/traced_buffer_list_test.cc | 6 +-- .../posix/wakeup_fd_posix_test.cc | 1 - .../event_engine/query_extensions_test.cc | 9 ++-- test/core/event_engine/slice_buffer_test.cc | 11 ++-- test/core/event_engine/smoke_test.cc | 9 ++-- .../event_engine/tcp_socket_utils_test.cc | 6 +-- test/core/event_engine/test_init.cc | 4 +- test/core/event_engine/test_init.h | 4 +- .../test_suite/event_engine_test_framework.cc | 3 +- .../test_suite/event_engine_test_framework.h | 7 ++- .../test_suite/fuzzing_event_engine_test.cc | 4 +- .../posix/oracle_event_engine_posix.cc | 6 +-- .../posix/oracle_event_engine_posix.h | 11 ++-- .../posix_event_engine_native_dns_test.cc | 7 ++- .../test_suite/posix_event_engine_test.cc | 5 +- .../test_suite/tests/client_test.cc | 9 ++-- .../event_engine/test_suite/tests/dns_test.cc | 7 ++- .../test_suite/tests/server_test.cc | 9 ++-- .../test_suite/tests/timer_test.cc | 5 +- .../thready_posix_event_engine_test.cc | 5 +- .../test_suite/tools/echo_client.cc | 14 +++-- .../tools/posix_event_engine_factory.cc | 7 ++- .../tools/windows_event_engine_factory.cc | 6 +-- test/core/event_engine/thread_pool_test.cc | 7 ++- .../event_engine/util/aborting_event_engine.h | 9 ++-- .../event_engine/windows/create_sockpair.cc | 1 - test/core/event_engine/windows/iocp_test.cc | 10 ++-- .../event_engine/windows/win_socket_test.cc | 6 +-- .../windows/windows_endpoint_test.cc | 6 +-- .../work_queue/basic_work_queue_fuzzer.cc | 6 +-- .../work_queue/basic_work_queue_test.cc | 7 ++- test/core/experiments/experiments_tag_test.cc | 5 +- test/core/experiments/experiments_test.cc | 5 +- .../resolver_fuzzer.cc | 7 ++- .../rbac/rbac_service_config_parser_test.cc | 9 ++-- test/core/filters/bm_http_client_filter.cc | 4 +- test/core/filters/client_auth_filter_test.cc | 11 ++-- .../filters/client_authority_filter_test.cc | 5 +- test/core/filters/filter_test.cc | 5 +- test/core/filters/filter_test.h | 9 ++-- test/core/filters/filter_test_test.cc | 5 +- .../filters/gcp_authentication_filter_test.cc | 1 - test/core/handshake/client_ssl.cc | 26 ++++----- test/core/handshake/http_proxy_mapper_test.cc | 5 +- .../readahead_handshaker_server_ssl.cc | 5 +- test/core/handshake/server_ssl.cc | 1 - test/core/handshake/server_ssl_common.cc | 25 ++++----- test/core/handshake/verify_peer_options.cc | 15 +++--- test/core/http/format_request_test.cc | 1 - test/core/http/httpcli_test.cc | 19 +++---- test/core/http/httpcli_test_util.cc | 10 ++-- test/core/http/httpscli_test.cc | 15 +++--- test/core/http/parser_test.cc | 4 +- test/core/http/request_fuzzer.cc | 5 +- test/core/http/response_fuzzer.cc | 5 +- test/core/iomgr/buffer_list_test.cc | 6 +-- test/core/iomgr/combiner_test.cc | 7 ++- test/core/iomgr/endpoint_pair_test.cc | 12 ++--- test/core/iomgr/endpoint_tests.cc | 8 ++- test/core/iomgr/error_test.cc | 9 ++-- test/core/iomgr/fd_conservation_posix_test.cc | 4 +- test/core/iomgr/fd_posix_test.cc | 10 ++-- .../grpc_ipv6_loopback_available_test.cc | 3 +- .../iomgr/pollset_windows_starvation_test.cc | 4 +- test/core/iomgr/resolve_address_posix_test.cc | 13 ++--- test/core/iomgr/resolve_address_test.cc | 13 ++--- test/core/iomgr/socket_utils_test.cc | 9 ++-- test/core/iomgr/tcp_client_posix_test.cc | 8 ++- test/core/iomgr/tcp_posix_test.cc | 12 ++--- test/core/iomgr/tcp_server_posix_test.cc | 9 ++-- test/core/iomgr/timer_heap_test.cc | 7 +-- test/core/iomgr/timer_list_test.cc | 4 +- test/core/json/fuzzer.cc | 4 +- test/core/json/json_object_loader_test.cc | 5 +- test/core/json/json_test.cc | 1 - test/core/load_balancing/bm_picker.cc | 8 ++- test/core/load_balancing/lb_policy_test_lib.h | 10 ++-- ...outlier_detection_lb_config_parser_test.cc | 5 +- .../load_balancing/outlier_detection_test.cc | 6 +-- test/core/load_balancing/pick_first_test.cc | 6 +-- test/core/load_balancing/ring_hash_test.cc | 6 +-- .../rls_lb_config_parser_test.cc | 5 +- test/core/load_balancing/round_robin_test.cc | 5 +- .../static_stride_scheduler_benchmark.cc | 5 +- .../weighted_round_robin_config_test.cc | 5 +- .../weighted_round_robin_test.cc | 6 +-- ...xds_override_host_lb_config_parser_test.cc | 5 +- .../load_balancing/xds_override_host_test.cc | 6 +-- test/core/memory_usage/callback_client.cc | 12 ++--- test/core/memory_usage/callback_server.cc | 12 ++--- test/core/memory_usage/client.cc | 22 ++++---- test/core/memory_usage/memory_usage_test.cc | 12 ++--- test/core/memory_usage/server.cc | 21 ++++---- .../message_size_service_config_test.cc | 6 +-- test/core/nanopb/fuzzer_response.cc | 3 +- test/core/nanopb/fuzzer_serverlist.cc | 3 +- .../network_benchmarks/low_level_ping_pong.cc | 6 +-- test/core/promise/activity_test.cc | 1 - test/core/promise/arena_promise_test.cc | 5 +- test/core/promise/bm_party.cc | 1 - test/core/promise/cancel_callback_test.cc | 1 - .../event_engine_wakeup_scheduler_test.cc | 6 +-- .../promise/exec_ctx_wakeup_scheduler_test.cc | 1 - test/core/promise/for_each_test.cc | 5 +- .../core/promise/inter_activity_latch_test.cc | 5 +- test/core/promise/inter_activity_pipe_test.cc | 1 - test/core/promise/interceptor_list_test.cc | 5 +- test/core/promise/join_test.cc | 1 - test/core/promise/latch_test.cc | 1 - test/core/promise/loop_test.cc | 1 - test/core/promise/map_pipe_test.cc | 5 +- test/core/promise/map_test.cc | 1 - test/core/promise/mpsc_test.cc | 5 +- test/core/promise/observable_test.cc | 5 +- test/core/promise/party_test.cc | 8 ++- test/core/promise/pipe_test.cc | 7 ++- test/core/promise/prioritized_race_test.cc | 1 - test/core/promise/promise_factory_test.cc | 1 - test/core/promise/promise_fuzzer.cc | 1 - test/core/promise/promise_mutex_test.cc | 1 - test/core/promise/race_test.cc | 1 - test/core/promise/sleep_test.cc | 5 +- test/core/promise/try_seq_metadata_test.cc | 7 ++- test/core/promise/wait_for_callback_test.cc | 1 - test/core/resolver/binder_resolver_test.cc | 4 +- .../resolver/dns_resolver_cooldown_test.cc | 16 +++--- test/core/resolver/dns_resolver_test.cc | 1 - test/core/resolver/endpoint_addresses_test.cc | 5 +- test/core/resolver/fake_resolver_test.cc | 4 +- .../core/resolver/google_c2p_resolver_test.cc | 12 ++--- test/core/resolver/sockaddr_resolver_test.cc | 1 - test/core/resource_quota/arena_test.cc | 6 +-- .../resource_quota/memory_quota_fuzzer.cc | 8 ++- .../memory_quota_stress_test.cc | 6 +-- test/core/resource_quota/memory_quota_test.cc | 7 ++- .../resource_quota/periodic_update_test.cc | 6 +-- .../resource_quota/resource_quota_test.cc | 1 - test/core/security/alts_credentials_fuzzer.cc | 6 +-- .../security/alts_security_connector_test.cc | 9 ++-- test/core/security/auth_context_test.cc | 4 +- .../security/authorization_matchers_test.cc | 7 ++- test/core/security/aws_request_signer_test.cc | 4 +- .../certificate_provider_registry_test.cc | 1 - .../security/channel_creds_registry_test.cc | 4 +- .../check_gcp_environment_linux_test.cc | 8 ++- .../check_gcp_environment_windows_test.cc | 8 ++- test/core/security/create_jwt.cc | 5 +- test/core/security/credentials_test.cc | 21 ++++---- test/core/security/evaluate_args_test.cc | 3 +- test/core/security/fetch_oauth2.cc | 10 ++-- .../grpc_alts_credentials_options_test.cc | 6 +-- test/core/security/grpc_audit_logging_test.cc | 10 ++-- .../grpc_authorization_engine_test.cc | 7 ++- ...grpc_authorization_policy_provider_test.cc | 3 +- .../grpc_tls_certificate_distributor_test.cc | 12 ++--- .../grpc_tls_certificate_provider_test.cc | 12 ++--- .../grpc_tls_certificate_verifier_test.cc | 12 ++--- .../grpc_tls_credentials_options_test.cc | 3 +- .../security/grpc_tls_crl_provider_test.cc | 12 ++--- .../insecure_security_connector_test.cc | 3 +- test/core/security/json_token_test.cc | 13 ++--- test/core/security/jwt_verifier_test.cc | 9 ++-- .../security/local_security_connector_test.cc | 3 +- test/core/security/oauth2_utils.cc | 6 +-- .../print_google_default_creds_token.cc | 8 ++- test/core/security/rbac_translator_test.cc | 8 ++- test/core/security/secure_endpoint_test.cc | 9 ++-- test/core/security/security_connector_test.cc | 11 ++-- test/core/security/ssl_credentials_test.cc | 8 ++- test/core/security/ssl_server_fuzzer.cc | 5 +- test/core/security/system_roots_test.cc | 6 +-- .../security/tls_security_connector_test.cc | 11 ++-- test/core/security/verify_jwt.cc | 8 ++- test/core/security/xds_credentials_test.cc | 3 +- .../server/server_config_selector_test.cc | 5 +- .../server/xds_channel_stack_modifier_test.cc | 5 +- .../service_config/service_config_test.cc | 4 +- test/core/slice/c_slice_buffer_test.cc | 6 +-- test/core/slice/percent_decode_fuzzer.cc | 3 +- test/core/slice/percent_encode_fuzzer.cc | 4 +- test/core/slice/percent_encoding_test.cc | 4 +- test/core/slice/slice_buffer_test.cc | 8 ++- test/core/slice/slice_string_helpers_test.cc | 5 +- test/core/slice/slice_test.cc | 6 +-- test/core/surface/byte_buffer_reader_test.cc | 12 ++--- test/core/surface/channel_init_test.cc | 1 - test/core/surface/completion_queue_test.cc | 8 ++- .../completion_queue_threading_test.cc | 10 ++-- .../surface/concurrent_connectivity_test.cc | 14 +++-- test/core/surface/init_test.cc | 7 ++- test/core/surface/lame_client_test.cc | 12 ++--- ...num_external_connectivity_watchers_test.cc | 12 ++--- .../surface/secure_channel_create_test.cc | 5 +- .../surface/sequential_connectivity_test.cc | 14 +++-- test/core/surface/server_chttp2_test.cc | 7 ++- test/core/surface/server_test.cc | 12 ++--- test/core/telemetry/call_tracer_test.cc | 7 ++- test/core/telemetry/metrics_test.cc | 1 - test/core/telemetry/stats_test.cc | 5 +- test/core/telemetry/trace_flags_test.cc | 5 +- test/core/test_util/audit_logging_utils.cc | 9 ++-- test/core/test_util/audit_logging_utils.h | 8 +-- test/core/test_util/cmdline.cc | 4 +- test/core/test_util/cmdline.h | 4 +- test/core/test_util/cmdline_test.cc | 1 - test/core/test_util/evaluate_args_test_util.h | 8 ++- test/core/test_util/fake_stats_plugin.cc | 1 - test/core/test_util/fake_stats_plugin.h | 1 - .../core/test_util/fake_udp_and_tcp_server.cc | 6 +-- test/core/test_util/fake_udp_and_tcp_server.h | 6 +-- .../test_util/fuzz_config_vars_helpers.cc | 1 - .../core/test_util/fuzz_config_vars_helpers.h | 3 +- test/core/test_util/fuzzer_corpus_test.cc | 6 +-- test/core/test_util/fuzzer_util.cc | 3 +- test/core/test_util/fuzzing_channel_args.h | 4 +- test/core/test_util/histogram.cc | 6 +-- test/core/test_util/histogram.h | 3 +- test/core/test_util/mock_endpoint.cc | 9 ++-- test/core/test_util/mock_endpoint.h | 4 +- .../core/test_util/one_corpus_entry_fuzzer.cc | 4 +- test/core/test_util/parse_hexstring.cc | 3 +- test/core/test_util/parse_hexstring.h | 1 - test/core/test_util/passthrough_endpoint.h | 4 +- test/core/test_util/port.cc | 8 ++- .../port_isolated_runtime_environment.cc | 6 +-- test/core/test_util/port_server_client.cc | 16 +++--- test/core/test_util/proto_bit_gen.h | 3 +- test/core/test_util/reconnect_server.cc | 6 +-- test/core/test_util/reconnect_server.h | 4 +- test/core/test_util/resolve_localhost_ip46.cc | 5 +- test/core/test_util/slice_splitter.cc | 5 +- test/core/test_util/slice_splitter.h | 3 +- .../socket_use_after_close_detector.cc | 8 ++- .../socket_use_after_close_detector.h | 6 +-- test/core/test_util/stack_tracer.cc | 5 +- test/core/test_util/stack_tracer.h | 4 +- test/core/test_util/stack_tracer_test.cc | 1 - test/core/test_util/test_config.cc | 8 ++- test/core/test_util/test_config.h | 3 +- test/core/test_util/test_lb_policies.cc | 6 +-- test/core/test_util/test_lb_policies.h | 5 +- test/core/test_util/test_tcp_server.cc | 10 ++-- test/core/test_util/test_tcp_server.h | 4 +- test/core/test_util/tls_utils.cc | 8 ++- test/core/test_util/tls_utils.h | 9 ++-- test/core/transport/bdp_estimator_test.cc | 4 +- .../transport/benchmarks/bm_chaotic_good.cc | 4 +- test/core/transport/benchmarks/bm_inproc.cc | 8 ++- .../transport/binder/binder_transport_test.cc | 10 ++-- .../binder/end2end/binder_server_test.cc | 12 ++--- .../end2end/end2end_binder_transport_test.cc | 10 ++-- .../transport/binder/end2end/fake_binder.cc | 1 - .../transport/binder/end2end/fake_binder.h | 1 - .../binder/end2end/fake_binder_test.cc | 7 ++- .../binder/end2end/fuzzers/client_fuzzer.cc | 7 ++- .../binder/end2end/fuzzers/fuzzer_utils.h | 1 - .../binder/end2end/fuzzers/server_fuzzer.cc | 3 +- .../binder/end2end/testing_channel_create.cc | 5 +- .../binder/end2end/testing_channel_create.h | 4 +- .../binder/endpoint_binder_pool_test.cc | 7 ++- .../binder/transport_stream_receiver_test.cc | 7 ++- .../core/transport/binder/wire_reader_test.cc | 10 ++-- .../core/transport/binder/wire_writer_test.cc | 8 ++- test/core/transport/bm_call_spine.cc | 1 - .../transport/call_arena_allocator_test.cc | 6 +-- test/core/transport/call_filters_test.cc | 1 - test/core/transport/call_spine_benchmarks.h | 1 - test/core/transport/call_spine_test.cc | 5 +- test/core/transport/call_state_test.cc | 1 - .../chaotic_good/chaotic_good_server_test.cc | 11 ++-- .../client_transport_error_test.cc | 14 +++-- .../chaotic_good/client_transport_test.cc | 15 +++--- .../transport/chaotic_good/frame_fuzzer.cc | 4 +- .../chaotic_good/frame_header_fuzzer.cc | 1 - .../core/transport/chaotic_good/frame_test.cc | 1 - .../chaotic_good/mock_promise_endpoint.cc | 4 +- .../chaotic_good/mock_promise_endpoint.h | 5 +- .../chaotic_good/server_transport_test.cc | 15 +++--- .../transport/chaotic_good/transport_test.h | 1 - test/core/transport/chttp2/alpn_test.cc | 1 - .../core/transport/chttp2/bin_decoder_test.cc | 4 +- .../core/transport/chttp2/bin_encoder_test.cc | 9 ++-- .../transport/chttp2/decode_huff_fuzzer.cc | 1 - .../chttp2/encode_decode_huff_fuzzer.cc | 4 +- .../transport/chttp2/flow_control_fuzzer.cc | 6 +-- .../transport/chttp2/flow_control_test.cc | 5 +- test/core/transport/chttp2/frame_test.cc | 1 - .../chttp2/graceful_shutdown_test.cc | 14 +++-- .../transport/chttp2/hpack_encoder_test.cc | 6 +-- .../chttp2/hpack_parser_fuzzer_test.cc | 6 +-- .../chttp2/hpack_parser_input_size_fuzzer.cc | 10 ++-- .../chttp2/hpack_parser_table_test.cc | 5 +- .../transport/chttp2/hpack_parser_test.cc | 13 +++-- .../transport/chttp2/hpack_sync_fuzzer.cc | 1 - .../core/transport/chttp2/hpack_utils_test.cc | 8 ++- .../chttp2/ping_abuse_policy_test.cc | 4 +- .../transport/chttp2/ping_callbacks_test.cc | 1 - .../chttp2/ping_configuration_test.cc | 7 ++- .../transport/chttp2/ping_rate_policy_test.cc | 1 - .../remove_stream_from_stalled_lists_test.cc | 25 ++++----- .../transport/chttp2/settings_timeout_test.cc | 22 ++++---- ...ak_with_queued_flow_control_update_test.cc | 20 ++++--- .../transport/chttp2/streams_not_seen_test.cc | 22 ++++---- .../transport/chttp2/too_many_pings_test.cc | 22 ++++---- test/core/transport/chttp2/varint_test.cc | 5 +- .../core/transport/connectivity_state_test.cc | 3 +- test/core/transport/error_utils_test.cc | 1 - .../core/transport/interception_chain_test.cc | 7 ++- test/core/transport/metadata_map_test.cc | 4 +- test/core/transport/parsed_metadata_test.cc | 1 - test/core/transport/promise_endpoint_test.cc | 9 ++-- test/core/transport/status_conversion_test.cc | 5 +- .../core/transport/test_suite/call_content.cc | 1 - .../test_suite/chaotic_good_fixture.cc | 1 - test/core/transport/test_suite/stress.cc | 1 - .../transport/test_suite/transport_test.h | 1 - test/core/transport/timeout_encoding_test.cc | 1 - test/core/tsi/alts/crypt/aes_gcm_test.cc | 8 ++- test/core/tsi/alts/crypt/gsec_test_util.cc | 3 +- test/core/tsi/alts/crypt/gsec_test_util.h | 3 +- .../fake_handshaker/fake_handshaker_server.cc | 15 +++--- .../fake_handshaker/fake_handshaker_server.h | 4 +- .../fake_handshaker_server_main.cc | 7 ++- .../alts/frame_protector/alts_counter_test.cc | 3 +- .../alts/frame_protector/alts_crypter_test.cc | 7 +-- .../alts_frame_protector_test.cc | 6 +-- .../frame_protector/frame_handler_test.cc | 6 +-- .../alts_concurrent_connectivity_test.cc | 25 ++++----- .../handshaker/alts_handshaker_client_test.cc | 6 +-- .../handshaker/alts_tsi_handshaker_test.cc | 11 ++-- .../alts/handshaker/alts_tsi_utils_test.cc | 3 +- .../transport_security_common_api_test.cc | 3 +- .../alts_grpc_record_protocol_test.cc | 8 ++- .../alts_iovec_record_protocol_test.cc | 8 ++- .../alts_zero_copy_grpc_protector_test.cc | 6 +-- .../tsi/crl_ssl_transport_security_test.cc | 13 ++--- test/core/tsi/fake_transport_security_test.cc | 8 ++- test/core/tsi/ssl_session_cache_test.cc | 8 ++- test/core/tsi/ssl_transport_security_test.cc | 15 +++--- .../tsi/ssl_transport_security_utils_test.cc | 9 ++-- test/core/tsi/transport_security_test.cc | 11 ++-- test/core/tsi/transport_security_test_lib.cc | 13 ++--- test/core/tsi/transport_security_test_lib.h | 3 +- test/core/util/alloc_test.cc | 4 +- test/core/util/backoff_test.cc | 5 +- test/core/util/chunked_vector_fuzzer.cc | 4 +- test/core/util/chunked_vector_test.cc | 5 +- test/core/util/cpp_impl_of_test.cc | 4 +- test/core/util/cpu_test.cc | 10 ++-- test/core/util/directory_reader_test.cc | 1 - test/core/util/dual_ref_counted_test.cc | 1 - test/core/util/env_test.cc | 1 - test/core/util/fork_test.cc | 4 +- test/core/util/glob_test.cc | 5 +- test/core/util/gpr_time_test.cc | 4 +- test/core/util/host_port_test.cc | 1 - test/core/util/load_file_test.cc | 4 +- test/core/util/mpscq_test.cc | 6 +-- test/core/util/orphanable_test.cc | 1 - test/core/util/ref_counted_ptr_test.cc | 1 - test/core/util/ref_counted_test.cc | 1 - test/core/util/ring_buffer_test.cc | 4 +- test/core/util/spinlock_test.cc | 6 +-- test/core/util/stat_test.cc | 4 +- test/core/util/string_test.cc | 6 +-- test/core/util/sync_test.cc | 8 ++- test/core/util/thd_test.cc | 7 ++- test/core/util/time_averaged_stats_test.cc | 3 +- test/core/util/time_util_test.cc | 4 +- test/core/util/unique_ptr_with_bitset_test.cc | 3 +- test/core/util/uri_fuzzer_test.cc | 5 +- test/core/util/uri_test.cc | 5 +- test/core/util/useful_test.cc | 3 +- test/core/util/validation_errors_test.cc | 1 - test/core/util/work_serializer_test.cc | 8 ++- .../xds/certificate_provider_store_test.cc | 5 +- ...tcher_certificate_provider_factory_test.cc | 5 +- .../xds/xds_audit_logger_registry_test.cc | 14 +++-- test/core/xds/xds_bootstrap_test.cc | 10 ++-- .../core/xds/xds_certificate_provider_test.cc | 5 +- test/core/xds/xds_client_fuzzer.cc | 5 +- test/core/xds/xds_client_test.cc | 15 +++--- test/core/xds/xds_client_test_peer.h | 5 +- .../xds/xds_cluster_resource_type_test.cc | 16 +++--- test/core/xds/xds_common_types_test.cc | 14 +++-- .../xds/xds_endpoint_resource_type_test.cc | 11 ++-- test/core/xds/xds_http_filters_test.cc | 22 ++++---- test/core/xds/xds_lb_policy_registry_test.cc | 12 ++--- .../xds/xds_listener_resource_type_test.cc | 16 +++--- test/core/xds/xds_metadata_test.cc | 7 ++- .../xds_route_config_resource_type_test.cc | 17 +++--- test/core/xds/xds_transport_fake.cc | 7 ++- test/core/xds/xds_transport_fake.h | 4 +- test/cpp/client/credentials_test.cc | 10 ++-- ...channel_with_active_connect_stress_test.cc | 15 +++--- test/cpp/codegen/codegen_test_full.cc | 3 +- test/cpp/codegen/golden_file_test.cc | 5 +- test/cpp/codegen/proto_utils_test.cc | 3 +- test/cpp/common/alarm_test.cc | 9 ++-- test/cpp/common/alts_util_test.cc | 6 +-- .../cpp/common/auth_property_iterator_test.cc | 3 +- test/cpp/common/channel_arguments_test.cc | 3 +- test/cpp/common/secure_auth_context_test.cc | 3 +- test/cpp/common/time_jump_test.cc | 7 +-- test/cpp/common/timer_test.cc | 4 +- .../end2end/admin_services_end2end_test.cc | 6 +-- test/cpp/end2end/async_end2end_test.cc | 19 ++++--- test/cpp/end2end/cfstream_test.cc | 20 ++++--- test/cpp/end2end/channelz_service_test.cc | 8 ++- .../end2end/client_callback_end2end_test.cc | 24 ++++----- test/cpp/end2end/client_crash_test.cc | 8 ++- test/cpp/end2end/client_crash_test_server.cc | 9 ++-- test/cpp/end2end/client_fork_test.cc | 11 ++-- .../client_interceptors_end2end_test.cc | 14 +++-- test/cpp/end2end/client_lb_end2end_test.cc | 38 +++++++------ .../end2end/connection_attempt_injector.cc | 1 - .../end2end/context_allocator_end2end_test.cc | 22 ++++---- test/cpp/end2end/crl_provider_test.cc | 24 ++++----- test/cpp/end2end/delegating_channel_test.cc | 9 ++-- test/cpp/end2end/end2end_test.cc | 19 ++++--- test/cpp/end2end/exception_test.cc | 9 ++-- test/cpp/end2end/flaky_network_test.cc | 22 ++++---- test/cpp/end2end/generic_end2end_test.cc | 12 ++--- test/cpp/end2end/grpc_authz_end2end_test.cc | 7 ++- test/cpp/end2end/grpclb_end2end_test.cc | 26 +++++---- .../end2end/health_service_end2end_test.cc | 13 +++-- test/cpp/end2end/hybrid_end2end_test.cc | 14 +++-- test/cpp/end2end/interceptors_util.cc | 1 - test/cpp/end2end/interceptors_util.h | 8 ++- .../end2end/message_allocator_end2end_test.cc | 24 ++++----- test/cpp/end2end/mock_test.cc | 14 +++-- test/cpp/end2end/nonblocking_test.cc | 9 ++-- test/cpp/end2end/orca_service_end2end_test.cc | 10 ++-- test/cpp/end2end/port_sharing_end2end_test.cc | 14 +++-- .../end2end/proto_server_reflection_test.cc | 9 ++-- test/cpp/end2end/raw_end2end_test.cc | 14 +++-- .../resource_quota_end2end_stress_test.cc | 16 +++--- test/cpp/end2end/rls_end2end_test.cc | 22 ++++---- test/cpp/end2end/rls_server.cc | 1 - test/cpp/end2end/rls_server.h | 1 - .../cpp/end2end/server_builder_plugin_test.cc | 10 ++-- test/cpp/end2end/server_crash_test.cc | 10 ++-- test/cpp/end2end/server_crash_test_client.cc | 9 ++-- test/cpp/end2end/server_early_return_test.cc | 3 +- .../server_interceptors_end2end_test.cc | 14 +++-- .../server_load_reporting_end2end_test.cc | 10 ++-- .../end2end/service_config_end2end_test.cc | 28 +++++----- test/cpp/end2end/shutdown_test.cc | 12 ++--- test/cpp/end2end/ssl_credentials_test.cc | 12 ++--- test/cpp/end2end/streaming_throughput_test.cc | 15 +++--- .../end2end/test_health_check_service_impl.h | 6 +-- test/cpp/end2end/test_service_impl.cc | 12 ++--- test/cpp/end2end/test_service_impl.h | 14 +++-- test/cpp/end2end/thread_stress_test.cc | 14 +++-- test/cpp/end2end/time_change_test.cc | 15 +++--- test/cpp/end2end/tls_credentials_test.cc | 12 ++--- test/cpp/end2end/tls_key_export_test.cc | 15 +++--- .../end2end/xds/xds_cluster_end2end_test.cc | 7 ++- .../xds/xds_cluster_type_end2end_test.cc | 8 ++- test/cpp/end2end/xds/xds_core_end2end_test.cc | 7 ++- .../xds/xds_credentials_end2end_test.cc | 3 +- test/cpp/end2end/xds/xds_csds_end2end_test.cc | 12 ++--- test/cpp/end2end/xds/xds_end2end_test.cc | 32 ++++++----- test/cpp/end2end/xds/xds_end2end_test_lib.cc | 10 ++-- test/cpp/end2end/xds/xds_end2end_test_lib.h | 22 ++++---- .../end2end/xds/xds_fallback_end2end_test.cc | 14 +++-- .../xds/xds_fault_injection_end2end_test.cc | 6 +-- .../end2end/xds/xds_gcp_authn_end2end_test.cc | 5 +- .../xds/xds_outlier_detection_end2end_test.cc | 7 ++- .../xds/xds_override_host_end2end_test.cc | 7 ++- .../xds/xds_pick_first_end2end_test.cc | 11 ++-- .../end2end/xds/xds_ring_hash_end2end_test.cc | 10 ++-- test/cpp/end2end/xds/xds_rls_end2end_test.cc | 5 +- .../end2end/xds/xds_routing_end2end_test.cc | 7 ++- test/cpp/end2end/xds/xds_server.cc | 1 - test/cpp/end2end/xds/xds_server.h | 5 +- test/cpp/end2end/xds/xds_utils.cc | 5 +- test/cpp/end2end/xds/xds_utils.h | 1 - test/cpp/end2end/xds/xds_wrr_end2end_test.cc | 12 ++--- test/cpp/ext/chaotic_good_test.cc | 3 +- test/cpp/ext/csm/csm_observability_test.cc | 7 ++- test/cpp/ext/csm/mesh_id_test.cc | 3 +- test/cpp/ext/csm/metadata_exchange_test.cc | 7 ++- .../filters/census/constant_labels_test.cc | 7 ++- test/cpp/ext/filters/census/library.h | 7 ++- .../census/stats_plugin_end2end_test.cc | 7 ++- test/cpp/ext/filters/logging/library.h | 9 ++-- .../logging_census_integration_test.cc | 9 ++-- test/cpp/ext/filters/logging/logging_test.cc | 7 ++- .../ext/gcp/environment_autodetect_test.cc | 5 +- test/cpp/ext/gcp/observability_config_test.cc | 5 +- .../gcp/observability_logging_sink_test.cc | 1 - test/cpp/ext/gcp/observability_test.cc | 5 +- test/cpp/ext/otel/otel_plugin_test.cc | 7 ++- test/cpp/ext/otel/otel_test_library.cc | 5 +- test/cpp/ext/otel/otel_test_library.h | 9 ++-- test/cpp/grpclb/grpclb_api_test.cc | 8 ++- test/cpp/interop/backend_metrics_lb_policy.cc | 5 +- .../interop/backend_metrics_lb_policy_test.cc | 9 ++-- test/cpp/interop/client.cc | 11 ++-- test/cpp/interop/client_helper.cc | 15 +++--- test/cpp/interop/client_helper.h | 8 +-- test/cpp/interop/grpclb_fallback_test.cc | 14 +++-- test/cpp/interop/http2_client.cc | 9 ++-- test/cpp/interop/http2_client.h | 4 +- test/cpp/interop/interop_client.cc | 17 +++--- test/cpp/interop/interop_client.h | 6 +-- test/cpp/interop/interop_server.cc | 17 +++--- test/cpp/interop/interop_test.cc | 4 +- test/cpp/interop/istio_echo_server.cc | 19 ++++--- test/cpp/interop/istio_echo_server_lib.cc | 7 ++- test/cpp/interop/istio_echo_server_test.cc | 12 ++--- test/cpp/interop/metrics_client.cc | 5 +- test/cpp/interop/observability_client.cc | 15 +++--- .../observability_interop_server_bootstrap.cc | 4 +- test/cpp/interop/pre_stop_hook_server.cc | 5 +- test/cpp/interop/pre_stop_hook_server_test.cc | 10 ++-- test/cpp/interop/reconnect_interop_client.cc | 11 ++-- test/cpp/interop/reconnect_interop_server.cc | 10 ++-- test/cpp/interop/rpc_behavior_lb_policy.cc | 5 +- test/cpp/interop/server_helper.cc | 5 +- test/cpp/interop/server_helper.h | 6 +-- test/cpp/interop/stress_interop_client.cc | 5 +- test/cpp/interop/stress_interop_client.h | 4 +- test/cpp/interop/stress_test.cc | 8 ++- test/cpp/interop/xds_federation_client.cc | 7 ++- test/cpp/interop/xds_interop_client.cc | 17 +++--- test/cpp/interop/xds_interop_server.cc | 9 ++-- test/cpp/interop/xds_interop_server_lib.cc | 11 ++-- test/cpp/interop/xds_interop_server_lib.h | 4 +- test/cpp/interop/xds_interop_server_test.cc | 10 ++-- test/cpp/interop/xds_stats_watcher.h | 5 +- test/cpp/interop/xds_stats_watcher_test.cc | 7 ++- test/cpp/microbenchmarks/bm_alarm.cc | 1 - .../microbenchmarks/bm_basic_work_queue.cc | 8 ++- test/cpp/microbenchmarks/bm_byte_buffer.cc | 8 ++- test/cpp/microbenchmarks/bm_channel.cc | 1 - test/cpp/microbenchmarks/bm_channel_args.cc | 8 ++- test/cpp/microbenchmarks/bm_chttp2_hpack.cc | 9 ++-- test/cpp/microbenchmarks/bm_closure.cc | 5 +- test/cpp/microbenchmarks/bm_cq.cc | 4 +- .../microbenchmarks/bm_cq_multiple_threads.cc | 9 ++-- .../microbenchmarks/bm_event_engine_run.cc | 10 ++-- test/cpp/microbenchmarks/bm_exec_ctx.cc | 7 ++- test/cpp/microbenchmarks/bm_huffman_decode.cc | 5 +- .../microbenchmarks/bm_opencensus_plugin.cc | 12 ++--- test/cpp/microbenchmarks/bm_rng.cc | 1 - test/cpp/microbenchmarks/bm_stats_plugin.cc | 8 ++- test/cpp/microbenchmarks/bm_thread_pool.cc | 10 ++-- .../callback_streaming_ping_pong.h | 5 +- .../microbenchmarks/callback_test_service.h | 4 +- .../callback_unary_ping_pong.h | 5 +- test/cpp/microbenchmarks/fullstack_fixtures.h | 3 +- .../fullstack_streaming_ping_pong.h | 5 +- .../fullstack_streaming_pump.h | 5 +- .../fullstack_unary_ping_pong.h | 5 +- test/cpp/microbenchmarks/helpers.h | 7 ++- test/cpp/naming/address_sorting_test.cc | 15 +++--- test/cpp/naming/cancel_ares_query_test.cc | 17 +++--- test/cpp/naming/resolver_component_test.cc | 17 +++--- ...resolver_component_tests_runner_invoker.cc | 12 ++--- test/cpp/performance/writes_per_rpc_test.cc | 14 +++-- test/cpp/qps/benchmark_config.cc | 5 +- test/cpp/qps/client.h | 12 ++--- test/cpp/qps/client_async.cc | 15 +++--- test/cpp/qps/client_callback.cc | 13 +++-- test/cpp/qps/client_sync.cc | 17 +++--- test/cpp/qps/driver.cc | 13 +++-- .../qps/inproc_sync_unary_ping_pong_test.cc | 1 - test/cpp/qps/interarrival.h | 4 +- test/cpp/qps/json_run_localhost.cc | 1 - test/cpp/qps/parse_json.cc | 1 - test/cpp/qps/qps_json_driver.cc | 5 +- test/cpp/qps/qps_openloop_test.cc | 1 - test/cpp/qps/qps_server_builder.h | 4 +- test/cpp/qps/qps_worker.cc | 17 +++--- test/cpp/qps/qps_worker.h | 4 +- test/cpp/qps/report.cc | 5 +- test/cpp/qps/report.h | 6 +-- test/cpp/qps/scenario_runner.cc | 1 - .../qps/secure_sync_unary_ping_pong_test.cc | 1 - test/cpp/qps/server.h | 7 ++- test/cpp/qps/server_async.cc | 17 +++--- test/cpp/qps/server_callback.cc | 3 +- test/cpp/qps/server_sync.cc | 9 ++-- test/cpp/qps/usage_timer.cc | 5 +- test/cpp/qps/worker.cc | 6 +-- .../security/tls_certificate_verifier_test.cc | 7 ++- .../authorization_policy_provider_test.cc | 3 +- test/cpp/server/credentials_test.cc | 10 ++-- .../load_reporter/get_cpu_stats_test.cc | 3 +- .../load_reporter/load_data_store_test.cc | 9 ++-- .../load_reporter/load_reporter_test.cc | 12 ++--- test/cpp/server/server_builder_test.cc | 6 +-- ...server_builder_with_socket_mutator_test.cc | 7 ++- test/cpp/server/server_request_call_test.cc | 12 ++--- .../cpp/test/client_context_test_peer_test.cc | 9 ++-- test/cpp/test/mock_stream_test.cc | 4 +- .../test/server_context_test_spouse_test.cc | 9 ++-- .../cpp/thread_manager/thread_manager_test.cc | 10 ++-- test/cpp/util/byte_buffer_proto_helper.h | 4 +- test/cpp/util/byte_buffer_test.cc | 9 ++-- test/cpp/util/channel_trace_proto_helper.cc | 3 +- test/cpp/util/channelz_sampler.cc | 26 +++++---- test/cpp/util/channelz_sampler_test.cc | 26 +++++---- test/cpp/util/cli_call.cc | 11 ++-- test/cpp/util/cli_call.h | 4 +- test/cpp/util/cli_call_test.cc | 3 +- test/cpp/util/cli_credentials.cc | 5 +- test/cpp/util/create_test_channel.cc | 5 +- test/cpp/util/create_test_channel.h | 4 +- test/cpp/util/error_details_test.cc | 3 +- test/cpp/util/grpc_cli.cc | 5 +- test/cpp/util/grpc_tool.cc | 17 +++--- test/cpp/util/grpc_tool.h | 4 +- test/cpp/util/grpc_tool_test.cc | 16 +++--- test/cpp/util/metrics_server.cc | 3 +- test/cpp/util/metrics_server.h | 4 +- test/cpp/util/proto_buffer_reader_test.cc | 3 +- test/cpp/util/proto_buffer_writer_test.cc | 3 +- test/cpp/util/proto_file_parser.cc | 4 +- test/cpp/util/proto_file_parser.h | 4 +- .../proto_reflection_descriptor_database.cc | 1 - .../proto_reflection_descriptor_database.h | 6 +-- test/cpp/util/slice_test.cc | 3 +- test/cpp/util/string_ref_test.cc | 6 +-- test/cpp/util/test_config_cc.cc | 1 - test/cpp/util/test_credentials_provider.cc | 7 ++- test/cpp/util/test_credentials_provider.h | 4 +- test/cpp/util/time_test.cc | 3 +- test/cpp/util/tls_test_utils.h | 4 +- test/cpp/util/windows/manifest_file.cc | 1 - .../python/grpcio_tools/grpc_tools/main.cc | 15 +++--- 2150 files changed, 5746 insertions(+), 9439 deletions(-) delete mode 100644 include/grpc++/impl/.clang-format delete mode 100644 include/grpc/.clang-format delete mode 100644 include/grpcpp/.clang-format delete mode 100644 include/grpcpp/impl/.clang-format delete mode 100644 include/grpcpp/impl/codegen/.clang-format delete mode 100644 include/grpcpp/security/.clang-format delete mode 100644 include/grpcpp/support/.clang-format delete mode 100644 src/.clang-format delete mode 100644 src/compiler/.clang-format delete mode 100644 src/core/.clang-format delete mode 100644 src/core/client_channel/.clang-format delete mode 100644 src/core/ext/.clang-format delete mode 100644 src/core/ext/filters/.clang-format delete mode 100644 src/core/ext/transport/.clang-format delete mode 100644 src/core/ext/transport/binder/.clang-format delete mode 100644 src/core/ext/transport/chttp2/transport/.clang-format delete mode 100644 src/core/lib/event_engine/posix_engine/.clang-format delete mode 100644 src/core/lib/event_engine/windows/.clang-format delete mode 100644 src/core/load_balancing/.clang-format delete mode 100644 src/core/resolver/.clang-format delete mode 100644 src/core/util/.clang-format diff --git a/.clang-format b/.clang-format index 5f150ef6edb..6c6c4548e80 100644 --- a/.clang-format +++ b/.clang-format @@ -8,36 +8,6 @@ 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 diff --git a/examples/android/binder/java/io/grpc/binder/cpp/exampleclient/native.cc b/examples/android/binder/java/io/grpc/binder/cpp/exampleclient/native.cc index fe7d910f1b4..3cb8637eb69 100644 --- a/examples/android/binder/java/io/grpc/binder/cpp/exampleclient/native.cc +++ b/examples/android/binder/java/io/grpc/binder/cpp/exampleclient/native.cc @@ -13,14 +13,13 @@ // limitations under the License. #include +#include +#include #include #include "examples/protos/helloworld.grpc.pb.h" #include "examples/protos/helloworld.pb.h" -#include -#include - extern "C" JNIEXPORT jstring JNICALL Java_io_grpc_binder_cpp_exampleclient_ButtonPressHandler_native_1entry( JNIEnv* env, jobject /*this*/, jobject application) { diff --git a/examples/android/binder/java/io/grpc/binder/cpp/exampleserver/native.cc b/examples/android/binder/java/io/grpc/binder/cpp/exampleserver/native.cc index 8b2e546ab2c..0f220c1066c 100644 --- a/examples/android/binder/java/io/grpc/binder/cpp/exampleserver/native.cc +++ b/examples/android/binder/java/io/grpc/binder/cpp/exampleserver/native.cc @@ -13,15 +13,14 @@ // limitations under the License. #include -#include - -#include "examples/protos/helloworld.grpc.pb.h" -#include "examples/protos/helloworld.pb.h" - #include #include #include #include +#include + +#include "examples/protos/helloworld.grpc.pb.h" +#include "examples/protos/helloworld.pb.h" namespace { class GreeterService : public helloworld::Greeter::Service { diff --git a/examples/cpp/auth/ssl_client.cc b/examples/cpp/auth/ssl_client.cc index 95e94eb1dbe..9a0efcadaac 100644 --- a/examples/cpp/auth/ssl_client.cc +++ b/examples/cpp/auth/ssl_client.cc @@ -16,6 +16,8 @@ * */ +#include + #include #include #include @@ -26,8 +28,6 @@ #include "absl/flags/parse.h" #include "helper.h" -#include - #ifdef BAZEL_BUILD #include "examples/protos/helloworld.grpc.pb.h" #else diff --git a/examples/cpp/auth/ssl_server.cc b/examples/cpp/auth/ssl_server.cc index dc76ecdc093..e9bf94cf890 100644 --- a/examples/cpp/auth/ssl_server.cc +++ b/examples/cpp/auth/ssl_server.cc @@ -12,6 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include + #include #include #include @@ -21,8 +23,6 @@ #include "absl/strings/str_format.h" #include "helper.h" -#include - #ifdef BAZEL_BUILD #include "examples/protos/helloworld.grpc.pb.h" #else diff --git a/examples/cpp/cancellation/client.cc b/examples/cpp/cancellation/client.cc index 97c9f1fac48..d78c9da25ac 100644 --- a/examples/cpp/cancellation/client.cc +++ b/examples/cpp/cancellation/client.cc @@ -12,6 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include + #include #include #include @@ -23,8 +25,6 @@ #include "absl/flags/parse.h" #include "absl/strings/str_cat.h" -#include - #ifdef BAZEL_BUILD #include "examples/protos/helloworld.grpc.pb.h" #else diff --git a/examples/cpp/cancellation/server.cc b/examples/cpp/cancellation/server.cc index 7c537976508..f2a468d6ad2 100644 --- a/examples/cpp/cancellation/server.cc +++ b/examples/cpp/cancellation/server.cc @@ -12,6 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include + #include #include #include @@ -21,8 +23,6 @@ #include "absl/flags/parse.h" #include "absl/strings/str_format.h" -#include - #ifdef BAZEL_BUILD #include "examples/protos/helloworld.grpc.pb.h" #else diff --git a/examples/cpp/compression/greeter_client.cc b/examples/cpp/compression/greeter_client.cc index b1ef4546d8a..95aa5a9c152 100644 --- a/examples/cpp/compression/greeter_client.cc +++ b/examples/cpp/compression/greeter_client.cc @@ -16,12 +16,12 @@ * */ +#include + #include #include #include -#include - #ifdef BAZEL_BUILD #include "examples/protos/helloworld.grpc.pb.h" #else diff --git a/examples/cpp/compression/greeter_server.cc b/examples/cpp/compression/greeter_server.cc index dc1b1f6530f..f27447b13d9 100644 --- a/examples/cpp/compression/greeter_server.cc +++ b/examples/cpp/compression/greeter_server.cc @@ -16,12 +16,12 @@ * */ +#include + #include #include #include -#include - #ifdef BAZEL_BUILD #include "examples/protos/helloworld.grpc.pb.h" #else diff --git a/examples/cpp/csm/csm_greeter_client.cc b/examples/cpp/csm/csm_greeter_client.cc index a689fdfa0d2..90d550a9928 100644 --- a/examples/cpp/csm/csm_greeter_client.cc +++ b/examples/cpp/csm/csm_greeter_client.cc @@ -16,6 +16,9 @@ * */ +#include +#include +#include #include #include @@ -34,10 +37,6 @@ #include "opentelemetry/exporters/prometheus/exporter_options.h" #include "opentelemetry/sdk/metrics/meter_provider.h" -#include -#include -#include - #ifdef BAZEL_BUILD #include "examples/protos/helloworld.grpc.pb.h" #else diff --git a/examples/cpp/csm/csm_greeter_server.cc b/examples/cpp/csm/csm_greeter_server.cc index 7f66a5cc9a9..0c6a47446b5 100644 --- a/examples/cpp/csm/csm_greeter_server.cc +++ b/examples/cpp/csm/csm_greeter_server.cc @@ -16,6 +16,13 @@ * */ +#include +#include +#include +#include +#include +#include + #include #include #include @@ -27,14 +34,6 @@ #include "opentelemetry/exporters/prometheus/exporter_factory.h" #include "opentelemetry/exporters/prometheus/exporter_options.h" #include "opentelemetry/sdk/metrics/meter_provider.h" - -#include -#include -#include -#include -#include -#include - #include "src/core/util/gethostname.h" #ifdef BAZEL_BUILD diff --git a/examples/cpp/csm/observability/csm_greeter_client.cc b/examples/cpp/csm/observability/csm_greeter_client.cc index 7040bc13f90..6d08d901e5a 100644 --- a/examples/cpp/csm/observability/csm_greeter_client.cc +++ b/examples/cpp/csm/observability/csm_greeter_client.cc @@ -16,6 +16,9 @@ * */ +#include +#include +#include #include #include @@ -32,10 +35,6 @@ #include "opentelemetry/exporters/prometheus/exporter_options.h" #include "opentelemetry/sdk/metrics/meter_provider.h" -#include -#include -#include - ABSL_FLAG(std::string, target, "xds:///helloworld:50051", "Target string"); ABSL_FLAG(std::string, prometheus_endpoint, "localhost:9464", "Prometheus exporter endpoint"); diff --git a/examples/cpp/csm/observability/csm_greeter_server.cc b/examples/cpp/csm/observability/csm_greeter_server.cc index a3d7eccd978..cfae25d4c3d 100644 --- a/examples/cpp/csm/observability/csm_greeter_server.cc +++ b/examples/cpp/csm/observability/csm_greeter_server.cc @@ -16,6 +16,13 @@ * */ +#include +#include +#include +#include +#include +#include + #include #include #include @@ -31,13 +38,6 @@ #include "opentelemetry/exporters/prometheus/exporter_options.h" #include "opentelemetry/sdk/metrics/meter_provider.h" -#include -#include -#include -#include -#include -#include - ABSL_FLAG(int32_t, port, 50051, "Server port for service."); ABSL_FLAG(std::string, prometheus_endpoint, "localhost:9464", "Prometheus exporter endpoint"); diff --git a/examples/cpp/deadline/client.cc b/examples/cpp/deadline/client.cc index 398be745733..7971ab77f45 100644 --- a/examples/cpp/deadline/client.cc +++ b/examples/cpp/deadline/client.cc @@ -12,6 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include + #include #include #include @@ -23,8 +25,6 @@ #include "absl/flags/parse.h" #include "absl/strings/str_cat.h" -#include - #ifdef BAZEL_BUILD #include "examples/protos/helloworld.grpc.pb.h" #else diff --git a/examples/cpp/deadline/server.cc b/examples/cpp/deadline/server.cc index eae5c0e1d08..14f2bfafe8b 100644 --- a/examples/cpp/deadline/server.cc +++ b/examples/cpp/deadline/server.cc @@ -12,6 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include + #include #include #include @@ -25,8 +27,6 @@ #include "absl/strings/match.h" #include "absl/strings/str_format.h" -#include - #ifdef BAZEL_BUILD #include "examples/protos/helloworld.grpc.pb.h" #else diff --git a/examples/cpp/debugging/crashing_greeter_client.cc b/examples/cpp/debugging/crashing_greeter_client.cc index 732535539f1..490ebcec98e 100644 --- a/examples/cpp/debugging/crashing_greeter_client.cc +++ b/examples/cpp/debugging/crashing_greeter_client.cc @@ -12,6 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include + #include #include #include @@ -19,8 +21,6 @@ #include "absl/flags/flag.h" #include "absl/flags/parse.h" -#include - #ifdef BAZEL_BUILD #include "examples/protos/helloworld.grpc.pb.h" #else diff --git a/examples/cpp/debugging/greeter_callback_server_admin.cc b/examples/cpp/debugging/greeter_callback_server_admin.cc index 397503f4e6d..c2c776fa707 100644 --- a/examples/cpp/debugging/greeter_callback_server_admin.cc +++ b/examples/cpp/debugging/greeter_callback_server_admin.cc @@ -12,6 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include +#include +#include +#include + #include #include #include @@ -20,11 +25,6 @@ #include "absl/flags/parse.h" #include "absl/strings/str_format.h" -#include -#include -#include -#include - #ifdef BAZEL_BUILD #include "examples/protos/helloworld.grpc.pb.h" #else diff --git a/examples/cpp/error_details/greeter_client.cc b/examples/cpp/error_details/greeter_client.cc index a86756d01ec..08e960c6fb5 100644 --- a/examples/cpp/error_details/greeter_client.cc +++ b/examples/cpp/error_details/greeter_client.cc @@ -12,6 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include + #include #include #include @@ -22,12 +24,9 @@ #include "absl/flags/parse.h" #include "absl/strings/str_format.h" -#include - #ifdef BAZEL_BUILD #include "examples/protos/helloworld.grpc.pb.h" #include "google/rpc/error_details.pb.h" - #include "src/proto/grpc/status/status.pb.h" #else #include "error_details.pb.h" diff --git a/examples/cpp/error_details/greeter_server.cc b/examples/cpp/error_details/greeter_server.cc index 41f844ab5c1..30a2c2bdebe 100644 --- a/examples/cpp/error_details/greeter_server.cc +++ b/examples/cpp/error_details/greeter_server.cc @@ -12,6 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include +#include +#include + #include #include #include @@ -22,14 +26,9 @@ #include "absl/strings/str_format.h" #include "absl/synchronization/mutex.h" -#include -#include -#include - #ifdef BAZEL_BUILD #include "examples/protos/helloworld.grpc.pb.h" #include "google/rpc/error_details.pb.h" - #include "src/proto/grpc/status/status.pb.h" #else #include "error_details.pb.h" diff --git a/examples/cpp/error_handling/greeter_client.cc b/examples/cpp/error_handling/greeter_client.cc index 551d8f66607..10824339bf3 100644 --- a/examples/cpp/error_handling/greeter_client.cc +++ b/examples/cpp/error_handling/greeter_client.cc @@ -12,6 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include + #include #include #include @@ -22,8 +24,6 @@ #include "absl/flags/parse.h" #include "absl/strings/str_format.h" -#include - #ifdef BAZEL_BUILD #include "examples/protos/helloworld.grpc.pb.h" #else diff --git a/examples/cpp/error_handling/greeter_server.cc b/examples/cpp/error_handling/greeter_server.cc index 79a527a516b..701530b1fa4 100644 --- a/examples/cpp/error_handling/greeter_server.cc +++ b/examples/cpp/error_handling/greeter_server.cc @@ -12,6 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include +#include +#include + #include #include #include @@ -22,10 +26,6 @@ #include "absl/strings/str_format.h" #include "absl/synchronization/mutex.h" -#include -#include -#include - #ifdef BAZEL_BUILD #include "examples/protos/helloworld.grpc.pb.h" #else diff --git a/examples/cpp/flow_control/client_flow_control_client.cc b/examples/cpp/flow_control/client_flow_control_client.cc index 933489d7d04..053a0c120f4 100644 --- a/examples/cpp/flow_control/client_flow_control_client.cc +++ b/examples/cpp/flow_control/client_flow_control_client.cc @@ -16,6 +16,10 @@ * */ +#include +#include +#include + #include #include #include @@ -23,10 +27,6 @@ #include "absl/flags/flag.h" #include "absl/flags/parse.h" -#include -#include -#include - #ifdef BAZEL_BUILD #include "examples/protos/helloworld.grpc.pb.h" #else diff --git a/examples/cpp/flow_control/client_flow_control_server.cc b/examples/cpp/flow_control/client_flow_control_server.cc index 31de9275d7c..c19e40693fb 100644 --- a/examples/cpp/flow_control/client_flow_control_server.cc +++ b/examples/cpp/flow_control/client_flow_control_server.cc @@ -16,6 +16,10 @@ * */ +#include +#include +#include + #include #include #include @@ -25,10 +29,6 @@ #include "absl/flags/parse.h" #include "absl/strings/str_format.h" -#include -#include -#include - #ifdef BAZEL_BUILD #include "examples/protos/helloworld.grpc.pb.h" #else diff --git a/examples/cpp/flow_control/server_flow_control_client.cc b/examples/cpp/flow_control/server_flow_control_client.cc index 2c9b5938a48..82df2dc463b 100644 --- a/examples/cpp/flow_control/server_flow_control_client.cc +++ b/examples/cpp/flow_control/server_flow_control_client.cc @@ -16,16 +16,16 @@ * */ +#include +#include +#include + #include #include #include "absl/flags/flag.h" #include "absl/flags/parse.h" -#include -#include -#include - #ifdef BAZEL_BUILD #include "examples/protos/helloworld.grpc.pb.h" #else diff --git a/examples/cpp/flow_control/server_flow_control_server.cc b/examples/cpp/flow_control/server_flow_control_server.cc index 75b71eb1e1a..f04a84e1969 100644 --- a/examples/cpp/flow_control/server_flow_control_server.cc +++ b/examples/cpp/flow_control/server_flow_control_server.cc @@ -15,6 +15,11 @@ * limitations under the License. * */ +#include +#include +#include +#include + #include #include #include @@ -24,11 +29,6 @@ #include "absl/flags/parse.h" #include "absl/strings/str_cat.h" -#include -#include -#include -#include - #ifdef BAZEL_BUILD #include "examples/protos/helloworld.grpc.pb.h" #else diff --git a/examples/cpp/gcp_observability/helloworld/greeter_client.cc b/examples/cpp/gcp_observability/helloworld/greeter_client.cc index 7b4d79fab1f..1412cf07cf3 100644 --- a/examples/cpp/gcp_observability/helloworld/greeter_client.cc +++ b/examples/cpp/gcp_observability/helloworld/greeter_client.cc @@ -16,6 +16,9 @@ // // +#include +#include + #include #include #include @@ -25,9 +28,6 @@ #include "absl/flags/flag.h" #include "absl/flags/parse.h" -#include -#include - #ifdef BAZEL_BUILD #include "examples/protos/helloworld.grpc.pb.h" #else diff --git a/examples/cpp/gcp_observability/helloworld/greeter_server.cc b/examples/cpp/gcp_observability/helloworld/greeter_server.cc index 5312d68708a..02570a1bfbd 100644 --- a/examples/cpp/gcp_observability/helloworld/greeter_server.cc +++ b/examples/cpp/gcp_observability/helloworld/greeter_server.cc @@ -16,6 +16,11 @@ // // +#include +#include +#include +#include + #include #include #include @@ -27,11 +32,6 @@ #include "absl/flags/parse.h" #include "absl/strings/str_format.h" -#include -#include -#include -#include - #ifdef BAZEL_BUILD #include "examples/protos/helloworld.grpc.pb.h" #else diff --git a/examples/cpp/generic_api/greeter_client.cc b/examples/cpp/generic_api/greeter_client.cc index 8435ad6c2e3..7afd5377e45 100644 --- a/examples/cpp/generic_api/greeter_client.cc +++ b/examples/cpp/generic_api/greeter_client.cc @@ -12,6 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include +#include + #include #include #include @@ -22,9 +25,6 @@ #include "absl/flags/parse.h" #include "absl/strings/str_format.h" -#include -#include - #ifdef BAZEL_BUILD #include "examples/protos/helloworld.grpc.pb.h" #else diff --git a/examples/cpp/generic_api/greeter_server.cc b/examples/cpp/generic_api/greeter_server.cc index e2a9b3f8976..d4e9a837829 100644 --- a/examples/cpp/generic_api/greeter_server.cc +++ b/examples/cpp/generic_api/greeter_server.cc @@ -12,6 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include +#include + #include #include #include @@ -22,9 +25,6 @@ #include "absl/strings/str_format.h" #include "absl/synchronization/mutex.h" -#include -#include - #ifdef BAZEL_BUILD #include "examples/protos/helloworld.grpc.pb.h" #else diff --git a/examples/cpp/health/health_client.cc b/examples/cpp/health/health_client.cc index 488dbdf4d31..15e04b84216 100644 --- a/examples/cpp/health/health_client.cc +++ b/examples/cpp/health/health_client.cc @@ -16,6 +16,8 @@ * */ +#include + #include #include #include @@ -25,11 +27,8 @@ #include "absl/flags/flag.h" #include "absl/flags/parse.h" -#include - #ifdef BAZEL_BUILD #include "examples/protos/helloworld.grpc.pb.h" - #include "src/proto/grpc/health/v1/health.grpc.pb.h" #else #include "health.grpc.pb.h" diff --git a/examples/cpp/health/health_server.cc b/examples/cpp/health/health_server.cc index ac78435ea1e..aae879c027b 100644 --- a/examples/cpp/health/health_server.cc +++ b/examples/cpp/health/health_server.cc @@ -16,6 +16,10 @@ * */ +#include +#include +#include + #include #include #include @@ -24,10 +28,6 @@ #include "absl/flags/parse.h" #include "absl/strings/str_format.h" -#include -#include -#include - #ifdef BAZEL_BUILD #include "examples/protos/helloworld.grpc.pb.h" #else diff --git a/examples/cpp/helloworld/greeter_async_client.cc b/examples/cpp/helloworld/greeter_async_client.cc index 25417269085..e798c92bc0a 100644 --- a/examples/cpp/helloworld/greeter_async_client.cc +++ b/examples/cpp/helloworld/greeter_async_client.cc @@ -16,6 +16,8 @@ * */ +#include + #include #include #include @@ -24,8 +26,6 @@ #include "absl/flags/parse.h" #include "absl/log/check.h" -#include - #ifdef BAZEL_BUILD #include "examples/protos/helloworld.grpc.pb.h" #else diff --git a/examples/cpp/helloworld/greeter_async_client2.cc b/examples/cpp/helloworld/greeter_async_client2.cc index 83662761837..fd43fa2bb64 100644 --- a/examples/cpp/helloworld/greeter_async_client2.cc +++ b/examples/cpp/helloworld/greeter_async_client2.cc @@ -16,6 +16,8 @@ * */ +#include + #include #include #include @@ -25,8 +27,6 @@ #include "absl/flags/parse.h" #include "absl/log/check.h" -#include - #ifdef BAZEL_BUILD #include "examples/protos/helloworld.grpc.pb.h" #else diff --git a/examples/cpp/helloworld/greeter_async_server.cc b/examples/cpp/helloworld/greeter_async_server.cc index 9adefedf7d9..72267b3e822 100644 --- a/examples/cpp/helloworld/greeter_async_server.cc +++ b/examples/cpp/helloworld/greeter_async_server.cc @@ -16,6 +16,8 @@ * */ +#include + #include #include #include @@ -26,8 +28,6 @@ #include "absl/log/check.h" #include "absl/strings/str_format.h" -#include - #ifdef BAZEL_BUILD #include "examples/protos/helloworld.grpc.pb.h" #else diff --git a/examples/cpp/helloworld/greeter_callback_client.cc b/examples/cpp/helloworld/greeter_callback_client.cc index ae09066c0f6..547120918c2 100644 --- a/examples/cpp/helloworld/greeter_callback_client.cc +++ b/examples/cpp/helloworld/greeter_callback_client.cc @@ -16,6 +16,8 @@ * */ +#include + #include #include #include @@ -25,8 +27,6 @@ #include "absl/flags/flag.h" #include "absl/flags/parse.h" -#include - #ifdef BAZEL_BUILD #include "examples/protos/helloworld.grpc.pb.h" #else diff --git a/examples/cpp/helloworld/greeter_callback_server.cc b/examples/cpp/helloworld/greeter_callback_server.cc index 0a1b4ea9318..d8363c8d493 100644 --- a/examples/cpp/helloworld/greeter_callback_server.cc +++ b/examples/cpp/helloworld/greeter_callback_server.cc @@ -16,6 +16,10 @@ * */ +#include +#include +#include + #include #include #include @@ -24,10 +28,6 @@ #include "absl/flags/parse.h" #include "absl/strings/str_format.h" -#include -#include -#include - #ifdef BAZEL_BUILD #include "examples/protos/helloworld.grpc.pb.h" #else diff --git a/examples/cpp/helloworld/greeter_client.cc b/examples/cpp/helloworld/greeter_client.cc index b97f0bd1da3..a022fa628a4 100644 --- a/examples/cpp/helloworld/greeter_client.cc +++ b/examples/cpp/helloworld/greeter_client.cc @@ -16,6 +16,8 @@ * */ +#include + #include #include #include @@ -23,8 +25,6 @@ #include "absl/flags/flag.h" #include "absl/flags/parse.h" -#include - #ifdef BAZEL_BUILD #include "examples/protos/helloworld.grpc.pb.h" #else diff --git a/examples/cpp/helloworld/greeter_server.cc b/examples/cpp/helloworld/greeter_server.cc index e35c4ac9eb9..1bdc84acdb3 100644 --- a/examples/cpp/helloworld/greeter_server.cc +++ b/examples/cpp/helloworld/greeter_server.cc @@ -16,6 +16,10 @@ * */ +#include +#include +#include + #include #include #include @@ -24,10 +28,6 @@ #include "absl/flags/parse.h" #include "absl/strings/str_format.h" -#include -#include -#include - #ifdef BAZEL_BUILD #include "examples/protos/helloworld.grpc.pb.h" #else diff --git a/examples/cpp/helloworld/xds_greeter_client.cc b/examples/cpp/helloworld/xds_greeter_client.cc index 093204ec3e0..455ba5c2de8 100644 --- a/examples/cpp/helloworld/xds_greeter_client.cc +++ b/examples/cpp/helloworld/xds_greeter_client.cc @@ -16,6 +16,8 @@ * */ +#include + #include #include #include @@ -23,8 +25,6 @@ #include "absl/flags/flag.h" #include "absl/flags/parse.h" -#include - #ifdef BAZEL_BUILD #include "examples/protos/helloworld.grpc.pb.h" #else diff --git a/examples/cpp/helloworld/xds_greeter_server.cc b/examples/cpp/helloworld/xds_greeter_server.cc index c0bed68ff7a..f7266b81581 100644 --- a/examples/cpp/helloworld/xds_greeter_server.cc +++ b/examples/cpp/helloworld/xds_greeter_server.cc @@ -16,6 +16,12 @@ * */ +#include +#include +#include +#include +#include + #include #include #include @@ -25,12 +31,6 @@ #include "absl/log/log.h" #include "absl/strings/str_cat.h" -#include -#include -#include -#include -#include - #ifdef BAZEL_BUILD #include "examples/protos/helloworld.grpc.pb.h" #else diff --git a/examples/cpp/interceptors/caching_interceptor.h b/examples/cpp/interceptors/caching_interceptor.h index b461524f6f4..cd979752e8f 100644 --- a/examples/cpp/interceptors/caching_interceptor.h +++ b/examples/cpp/interceptors/caching_interceptor.h @@ -16,12 +16,12 @@ * */ +#include + #include #include "absl/log/check.h" -#include - #ifdef BAZEL_BUILD #include "examples/protos/keyvaluestore.grpc.pb.h" #else diff --git a/examples/cpp/interceptors/client.cc b/examples/cpp/interceptors/client.cc index 9c63c86c172..cc815db9698 100644 --- a/examples/cpp/interceptors/client.cc +++ b/examples/cpp/interceptors/client.cc @@ -16,6 +16,8 @@ * */ +#include + #include #include #include @@ -25,8 +27,6 @@ #include "caching_interceptor.h" -#include - #ifdef BAZEL_BUILD #include "examples/protos/keyvaluestore.grpc.pb.h" #else diff --git a/examples/cpp/interceptors/server.cc b/examples/cpp/interceptors/server.cc index e865bbe02fe..f1d3941c10f 100644 --- a/examples/cpp/interceptors/server.cc +++ b/examples/cpp/interceptors/server.cc @@ -16,14 +16,14 @@ * */ +#include +#include + #include #include #include #include -#include -#include - #ifdef BAZEL_BUILD #include "examples/protos/keyvaluestore.grpc.pb.h" #else diff --git a/examples/cpp/keepalive/greeter_callback_client.cc b/examples/cpp/keepalive/greeter_callback_client.cc index 3df307b44b0..0e123155815 100644 --- a/examples/cpp/keepalive/greeter_callback_client.cc +++ b/examples/cpp/keepalive/greeter_callback_client.cc @@ -16,6 +16,8 @@ * */ +#include + #include #include #include @@ -26,8 +28,6 @@ #include "absl/flags/flag.h" #include "absl/flags/parse.h" -#include - #ifdef BAZEL_BUILD #include "examples/protos/helloworld.grpc.pb.h" #else diff --git a/examples/cpp/keepalive/greeter_callback_server.cc b/examples/cpp/keepalive/greeter_callback_server.cc index 17c3c402d75..9a34a5a65ae 100644 --- a/examples/cpp/keepalive/greeter_callback_server.cc +++ b/examples/cpp/keepalive/greeter_callback_server.cc @@ -16,6 +16,10 @@ * */ +#include +#include +#include + #include #include #include @@ -24,10 +28,6 @@ #include "absl/flags/parse.h" #include "absl/strings/str_format.h" -#include -#include -#include - #ifdef BAZEL_BUILD #include "examples/protos/helloworld.grpc.pb.h" #else diff --git a/examples/cpp/load_balancing/greeter_client.cc b/examples/cpp/load_balancing/greeter_client.cc index 25322dbfc95..f09598f350e 100644 --- a/examples/cpp/load_balancing/greeter_client.cc +++ b/examples/cpp/load_balancing/greeter_client.cc @@ -16,12 +16,12 @@ * */ +#include + #include #include #include -#include - #ifdef BAZEL_BUILD #include "examples/protos/helloworld.grpc.pb.h" #else diff --git a/examples/cpp/load_balancing/greeter_server.cc b/examples/cpp/load_balancing/greeter_server.cc index d021b54c4d1..93b8c91e0a0 100644 --- a/examples/cpp/load_balancing/greeter_server.cc +++ b/examples/cpp/load_balancing/greeter_server.cc @@ -16,12 +16,12 @@ * */ +#include + #include #include #include -#include - #ifdef BAZEL_BUILD #include "examples/protos/helloworld.grpc.pb.h" #else diff --git a/examples/cpp/metadata/greeter_client.cc b/examples/cpp/metadata/greeter_client.cc index 3784d2fa26a..f7592501f19 100644 --- a/examples/cpp/metadata/greeter_client.cc +++ b/examples/cpp/metadata/greeter_client.cc @@ -16,12 +16,12 @@ * */ +#include + #include #include #include -#include - #ifdef BAZEL_BUILD #include "examples/protos/helloworld.grpc.pb.h" #else diff --git a/examples/cpp/metadata/greeter_server.cc b/examples/cpp/metadata/greeter_server.cc index 19d8bb0d01d..d2a742f400f 100644 --- a/examples/cpp/metadata/greeter_server.cc +++ b/examples/cpp/metadata/greeter_server.cc @@ -16,12 +16,12 @@ * */ +#include + #include #include #include -#include - #ifdef BAZEL_BUILD #include "examples/protos/helloworld.grpc.pb.h" #else diff --git a/examples/cpp/multiplex/multiplex_client.cc b/examples/cpp/multiplex/multiplex_client.cc index 085d1334a8c..31b125047de 100644 --- a/examples/cpp/multiplex/multiplex_client.cc +++ b/examples/cpp/multiplex/multiplex_client.cc @@ -15,6 +15,8 @@ * limitations under the License. * */ +#include + #include #include #include @@ -25,8 +27,6 @@ #include "absl/flags/flag.h" #include "absl/flags/parse.h" -#include - #ifdef BAZEL_BUILD #include "examples/protos/helloworld.grpc.pb.h" #include "examples/protos/route_guide.grpc.pb.h" diff --git a/examples/cpp/multiplex/multiplex_server.cc b/examples/cpp/multiplex/multiplex_server.cc index e4cdc54ec1f..7c08e9e8b59 100644 --- a/examples/cpp/multiplex/multiplex_server.cc +++ b/examples/cpp/multiplex/multiplex_server.cc @@ -16,6 +16,10 @@ * */ +#include +#include +#include + #include #include #include @@ -25,10 +29,6 @@ #include "absl/flags/parse.h" #include "absl/strings/str_format.h" -#include -#include -#include - #ifdef BAZEL_BUILD #include "examples/protos/helloworld.grpc.pb.h" #include "examples/protos/route_guide.grpc.pb.h" diff --git a/examples/cpp/orca/orca_server.cc b/examples/cpp/orca/orca_server.cc index d05d763a6a5..9feac2636d1 100644 --- a/examples/cpp/orca/orca_server.cc +++ b/examples/cpp/orca/orca_server.cc @@ -15,6 +15,12 @@ * limitations under the License. * */ +#include +#include +#include +#include +#include + #include #include #include @@ -25,12 +31,6 @@ #include "absl/strings/str_format.h" #include "examples/protos/helloworld.grpc.pb.h" -#include -#include -#include -#include -#include - using grpc::CallbackServerContext; using grpc::Server; using grpc::ServerBuilder; diff --git a/examples/cpp/otel/codelab/greeter_callback_client.cc b/examples/cpp/otel/codelab/greeter_callback_client.cc index d9eab4e9edd..2f2f0fa3d27 100644 --- a/examples/cpp/otel/codelab/greeter_callback_client.cc +++ b/examples/cpp/otel/codelab/greeter_callback_client.cc @@ -23,6 +23,9 @@ #define HAVE_ABSEIL #endif +#include +#include + #include #include #include @@ -33,9 +36,6 @@ #include "opentelemetry/exporters/prometheus/exporter_options.h" #include "opentelemetry/sdk/metrics/meter_provider.h" -#include -#include - #ifdef BAZEL_BUILD #include "examples/cpp/otel/codelab/util.h" #include "examples/protos/helloworld.grpc.pb.h" diff --git a/examples/cpp/otel/codelab/greeter_callback_client_solution.cc b/examples/cpp/otel/codelab/greeter_callback_client_solution.cc index b7b507c509d..83015949e19 100644 --- a/examples/cpp/otel/codelab/greeter_callback_client_solution.cc +++ b/examples/cpp/otel/codelab/greeter_callback_client_solution.cc @@ -23,6 +23,9 @@ #define HAVE_ABSEIL #endif +#include +#include + #include #include #include @@ -33,9 +36,6 @@ #include "opentelemetry/exporters/prometheus/exporter_options.h" #include "opentelemetry/sdk/metrics/meter_provider.h" -#include -#include - #ifdef BAZEL_BUILD #include "examples/cpp/otel/codelab/util.h" #include "examples/protos/helloworld.grpc.pb.h" diff --git a/examples/cpp/otel/codelab/greeter_callback_server.cc b/examples/cpp/otel/codelab/greeter_callback_server.cc index bba7c9ce072..7abd5ff716d 100644 --- a/examples/cpp/otel/codelab/greeter_callback_server.cc +++ b/examples/cpp/otel/codelab/greeter_callback_server.cc @@ -23,6 +23,11 @@ #define HAVE_ABSEIL #endif +#include +#include +#include +#include + #include #include #include @@ -34,11 +39,6 @@ #include "opentelemetry/exporters/prometheus/exporter_options.h" #include "opentelemetry/sdk/metrics/meter_provider.h" -#include -#include -#include -#include - #ifdef BAZEL_BUILD #include "examples/cpp/otel/codelab/util.h" #include "examples/protos/helloworld.grpc.pb.h" diff --git a/examples/cpp/otel/codelab/greeter_callback_server_solution.cc b/examples/cpp/otel/codelab/greeter_callback_server_solution.cc index a53ab288af4..8a8373e35db 100644 --- a/examples/cpp/otel/codelab/greeter_callback_server_solution.cc +++ b/examples/cpp/otel/codelab/greeter_callback_server_solution.cc @@ -23,6 +23,11 @@ #define HAVE_ABSEIL #endif +#include +#include +#include +#include + #include #include #include @@ -34,11 +39,6 @@ #include "opentelemetry/exporters/prometheus/exporter_options.h" #include "opentelemetry/sdk/metrics/meter_provider.h" -#include -#include -#include -#include - #ifdef BAZEL_BUILD #include "examples/cpp/otel/codelab/util.h" #include "examples/protos/helloworld.grpc.pb.h" diff --git a/examples/cpp/otel/codelab/util.cc b/examples/cpp/otel/codelab/util.cc index a8fcce95663..35a1fe35c8e 100644 --- a/examples/cpp/otel/codelab/util.cc +++ b/examples/cpp/otel/codelab/util.cc @@ -23,12 +23,12 @@ #define HAVE_ABSEIL #endif +#include + #include "opentelemetry/sdk/metrics/view/instrument_selector_factory.h" #include "opentelemetry/sdk/metrics/view/meter_selector_factory.h" #include "opentelemetry/sdk/metrics/view/view_factory.h" -#include - #ifdef BAZEL_BUILD #include "examples/cpp/otel/codelab/util.h" #include "examples/protos/helloworld.grpc.pb.h" diff --git a/examples/cpp/otel/greeter_callback_client.cc b/examples/cpp/otel/greeter_callback_client.cc index f166bd9f5e6..0e4cf644779 100644 --- a/examples/cpp/otel/greeter_callback_client.cc +++ b/examples/cpp/otel/greeter_callback_client.cc @@ -23,6 +23,8 @@ #define HAVE_ABSEIL #endif +#include + #include #include "absl/flags/flag.h" @@ -31,8 +33,6 @@ #include "opentelemetry/exporters/prometheus/exporter_options.h" #include "opentelemetry/sdk/metrics/meter_provider.h" -#include - #ifdef BAZEL_BUILD #include "examples/cpp/otel/util.h" #else diff --git a/examples/cpp/otel/greeter_callback_server.cc b/examples/cpp/otel/greeter_callback_server.cc index 408b52d685d..60fec863a4e 100644 --- a/examples/cpp/otel/greeter_callback_server.cc +++ b/examples/cpp/otel/greeter_callback_server.cc @@ -23,6 +23,8 @@ #define HAVE_ABSEIL #endif +#include + #include #include #include @@ -34,8 +36,6 @@ #include "opentelemetry/exporters/prometheus/exporter_options.h" #include "opentelemetry/sdk/metrics/meter_provider.h" -#include - #ifdef BAZEL_BUILD #include "examples/cpp/otel/util.h" #else diff --git a/examples/cpp/otel/ostream/greeter_callback_client.cc b/examples/cpp/otel/ostream/greeter_callback_client.cc index 24e141fd7b5..1437d57e522 100644 --- a/examples/cpp/otel/ostream/greeter_callback_client.cc +++ b/examples/cpp/otel/ostream/greeter_callback_client.cc @@ -23,6 +23,8 @@ #define HAVE_ABSEIL #endif +#include + #include #include "absl/flags/flag.h" @@ -33,8 +35,6 @@ #include "opentelemetry/sdk/metrics/export/periodic_exporting_metric_reader_factory.h" #include "opentelemetry/sdk/metrics/meter_provider.h" -#include - #ifdef BAZEL_BUILD #include "examples/cpp/otel/util.h" #else diff --git a/examples/cpp/otel/ostream/greeter_callback_server.cc b/examples/cpp/otel/ostream/greeter_callback_server.cc index ab539efd305..13ae436cbb4 100644 --- a/examples/cpp/otel/ostream/greeter_callback_server.cc +++ b/examples/cpp/otel/ostream/greeter_callback_server.cc @@ -23,6 +23,8 @@ #define HAVE_ABSEIL #endif +#include + #include #include #include @@ -35,8 +37,6 @@ #include "opentelemetry/sdk/metrics/export/periodic_exporting_metric_reader_factory.h" #include "opentelemetry/sdk/metrics/meter_provider.h" -#include - #ifdef BAZEL_BUILD #include "examples/cpp/otel/util.h" #else diff --git a/examples/cpp/otel/util.cc b/examples/cpp/otel/util.cc index f844a044a6e..e75b4ec4e05 100644 --- a/examples/cpp/otel/util.cc +++ b/examples/cpp/otel/util.cc @@ -23,6 +23,10 @@ #define HAVE_ABSEIL #endif +#include +#include +#include + #include #include @@ -30,10 +34,6 @@ #include "opentelemetry/sdk/metrics/view/meter_selector_factory.h" #include "opentelemetry/sdk/metrics/view/view_factory.h" -#include -#include -#include - #ifdef BAZEL_BUILD #include "examples/cpp/otel/util.h" #include "examples/protos/helloworld.grpc.pb.h" diff --git a/examples/cpp/reflection/reflection_server.cc b/examples/cpp/reflection/reflection_server.cc index 8ef327bbee8..1b3a4f2fbe5 100644 --- a/examples/cpp/reflection/reflection_server.cc +++ b/examples/cpp/reflection/reflection_server.cc @@ -12,6 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include +#include + #include #include "absl/flags/flag.h" @@ -19,9 +22,6 @@ #include "absl/strings/str_format.h" #include "examples/protos/helloworld.grpc.pb.h" -#include -#include - using grpc::CallbackServerContext; using grpc::Server; using grpc::ServerBuilder; diff --git a/examples/cpp/retry/client.cc b/examples/cpp/retry/client.cc index 3d490f25d5c..94417f61a70 100644 --- a/examples/cpp/retry/client.cc +++ b/examples/cpp/retry/client.cc @@ -14,15 +14,15 @@ * limitations under the License. */ +#include +#include + #include #include #include #include "absl/strings/string_view.h" -#include -#include - #ifdef BAZEL_BUILD #include "examples/protos/helloworld.grpc.pb.h" #else diff --git a/examples/cpp/retry/server.cc b/examples/cpp/retry/server.cc index f6a8c602473..66d809d7972 100644 --- a/examples/cpp/retry/server.cc +++ b/examples/cpp/retry/server.cc @@ -14,14 +14,14 @@ * limitations under the License. */ -#include -#include -#include - #include #include #include +#include +#include +#include + #ifdef BAZEL_BUILD #include "examples/protos/helloworld.grpc.pb.h" #else diff --git a/examples/cpp/route_guide/route_guide_callback_client.cc b/examples/cpp/route_guide/route_guide_callback_client.cc index d44e9fae2d3..8e0624fddae 100644 --- a/examples/cpp/route_guide/route_guide_callback_client.cc +++ b/examples/cpp/route_guide/route_guide_callback_client.cc @@ -16,6 +16,13 @@ * */ +#include +#include +#include +#include +#include +#include + #include #include #include @@ -26,13 +33,6 @@ #include #include "helper.h" - -#include -#include -#include -#include -#include -#include #ifdef BAZEL_BUILD #include "examples/protos/route_guide.grpc.pb.h" #else diff --git a/examples/cpp/route_guide/route_guide_callback_server.cc b/examples/cpp/route_guide/route_guide_callback_server.cc index c9ff97c8174..f97884e7b96 100644 --- a/examples/cpp/route_guide/route_guide_callback_server.cc +++ b/examples/cpp/route_guide/route_guide_callback_server.cc @@ -16,6 +16,12 @@ * */ +#include +#include +#include +#include +#include + #include #include #include @@ -29,12 +35,6 @@ #include "absl/log/initialize.h" #include "absl/log/log.h" #include "helper.h" - -#include -#include -#include -#include -#include #ifdef BAZEL_BUILD #include "examples/protos/route_guide.grpc.pb.h" #else diff --git a/examples/cpp/route_guide/route_guide_client.cc b/examples/cpp/route_guide/route_guide_client.cc index fd29a31e373..73983f458d9 100644 --- a/examples/cpp/route_guide/route_guide_client.cc +++ b/examples/cpp/route_guide/route_guide_client.cc @@ -16,6 +16,12 @@ * */ +#include +#include +#include +#include +#include + #include #include #include @@ -24,12 +30,6 @@ #include #include "helper.h" - -#include -#include -#include -#include -#include #ifdef BAZEL_BUILD #include "examples/protos/route_guide.grpc.pb.h" #else diff --git a/examples/cpp/route_guide/route_guide_server.cc b/examples/cpp/route_guide/route_guide_server.cc index 0e29125881f..7a6a1c8ecaa 100644 --- a/examples/cpp/route_guide/route_guide_server.cc +++ b/examples/cpp/route_guide/route_guide_server.cc @@ -16,6 +16,12 @@ * */ +#include +#include +#include +#include +#include + #include #include #include @@ -24,12 +30,6 @@ #include #include "helper.h" - -#include -#include -#include -#include -#include #ifdef BAZEL_BUILD #include "examples/protos/route_guide.grpc.pb.h" #else diff --git a/examples/cpp/systemd_socket_activation/client.cc b/examples/cpp/systemd_socket_activation/client.cc index 46cdb53defe..6d25f4abffe 100644 --- a/examples/cpp/systemd_socket_activation/client.cc +++ b/examples/cpp/systemd_socket_activation/client.cc @@ -12,14 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include + #include #include #include #include "examples/protos/helloworld.grpc.pb.h" -#include - using grpc::Channel; using grpc::ClientContext; using grpc::Status; diff --git a/examples/cpp/systemd_socket_activation/server.cc b/examples/cpp/systemd_socket_activation/server.cc index 28ec68114a4..bdd19a873f3 100644 --- a/examples/cpp/systemd_socket_activation/server.cc +++ b/examples/cpp/systemd_socket_activation/server.cc @@ -12,16 +12,16 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include +#include +#include + #include #include #include #include "examples/protos/helloworld.grpc.pb.h" -#include -#include -#include - using grpc::Server; using grpc::ServerBuilder; using grpc::ServerContext; diff --git a/examples/cpp/unix_abstract_sockets/client.cc b/examples/cpp/unix_abstract_sockets/client.cc index 36f561e7cdb..d86202ec433 100644 --- a/examples/cpp/unix_abstract_sockets/client.cc +++ b/examples/cpp/unix_abstract_sockets/client.cc @@ -12,14 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include + #include #include #include #include "examples/protos/helloworld.grpc.pb.h" -#include - using grpc::Channel; using grpc::ClientContext; using grpc::Status; diff --git a/examples/cpp/unix_abstract_sockets/server.cc b/examples/cpp/unix_abstract_sockets/server.cc index 6d941a6fcc6..53fe378f9c2 100644 --- a/examples/cpp/unix_abstract_sockets/server.cc +++ b/examples/cpp/unix_abstract_sockets/server.cc @@ -12,16 +12,16 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include +#include +#include + #include #include #include #include "examples/protos/helloworld.grpc.pb.h" -#include -#include -#include - using grpc::Server; using grpc::ServerBuilder; using grpc::ServerContext; diff --git a/examples/cpp/wait_for_ready/greeter_callback_client.cc b/examples/cpp/wait_for_ready/greeter_callback_client.cc index 1c7865ed2bf..546a5d7f503 100644 --- a/examples/cpp/wait_for_ready/greeter_callback_client.cc +++ b/examples/cpp/wait_for_ready/greeter_callback_client.cc @@ -16,6 +16,8 @@ // // +#include + #include #include #include @@ -26,8 +28,6 @@ #include "absl/flags/flag.h" #include "absl/flags/parse.h" -#include - #ifdef BAZEL_BUILD #include "examples/protos/helloworld.grpc.pb.h" #else diff --git a/examples/cpp/xds/xds_greeter_client.cc b/examples/cpp/xds/xds_greeter_client.cc index 4bf47e1057c..d60e3f17d81 100644 --- a/examples/cpp/xds/xds_greeter_client.cc +++ b/examples/cpp/xds/xds_greeter_client.cc @@ -16,6 +16,8 @@ * */ +#include + #include #include #include @@ -25,8 +27,6 @@ #include "absl/flags/flag.h" #include "absl/flags/parse.h" -#include - #ifdef BAZEL_BUILD #include "examples/protos/helloworld.grpc.pb.h" #else diff --git a/examples/cpp/xds/xds_greeter_server.cc b/examples/cpp/xds/xds_greeter_server.cc index c35166c819e..1eb65162ac6 100644 --- a/examples/cpp/xds/xds_greeter_server.cc +++ b/examples/cpp/xds/xds_greeter_server.cc @@ -16,6 +16,12 @@ * */ +#include +#include +#include +#include +#include + #include #include #include @@ -25,12 +31,6 @@ #include "absl/log/log.h" #include "absl/strings/str_cat.h" -#include -#include -#include -#include -#include - #ifdef BAZEL_BUILD #include "examples/protos/helloworld.grpc.pb.h" #else diff --git a/include/grpc++/impl/.clang-format b/include/grpc++/impl/.clang-format deleted file mode 100644 index 5f150ef6edb..00000000000 --- a/include/grpc++/impl/.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/include/grpc/.clang-format b/include/grpc/.clang-format deleted file mode 100644 index 5f150ef6edb..00000000000 --- a/include/grpc/.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/include/grpc/compression.h b/include/grpc/compression.h index 0f07a514b2b..0db81a2593a 100644 --- a/include/grpc/compression.h +++ b/include/grpc/compression.h @@ -19,11 +19,10 @@ #ifndef GRPC_COMPRESSION_H #define GRPC_COMPRESSION_H -#include - #include // IWYU pragma: export #include #include +#include #ifdef __cplusplus extern "C" { diff --git a/include/grpc/credentials.h b/include/grpc/credentials.h index b5814b913c4..8875dd115b6 100644 --- a/include/grpc/credentials.h +++ b/include/grpc/credentials.h @@ -19,11 +19,10 @@ #ifndef GRPC_CREDENTIALS_H #define GRPC_CREDENTIALS_H -#include - #include #include #include +#include #ifdef __cplusplus extern "C" { diff --git a/include/grpc/event_engine/endpoint_config.h b/include/grpc/event_engine/endpoint_config.h index ea1699afc52..68dae44caee 100644 --- a/include/grpc/event_engine/endpoint_config.h +++ b/include/grpc/event_engine/endpoint_config.h @@ -14,13 +14,13 @@ #ifndef GRPC_EVENT_ENGINE_ENDPOINT_CONFIG_H #define GRPC_EVENT_ENGINE_ENDPOINT_CONFIG_H +#include + #include #include "absl/strings/string_view.h" #include "absl/types/optional.h" -#include - namespace grpc_event_engine { namespace experimental { diff --git a/include/grpc/event_engine/event_engine.h b/include/grpc/event_engine/event_engine.h index 21a0c1c4826..410c109dfc2 100644 --- a/include/grpc/event_engine/event_engine.h +++ b/include/grpc/event_engine/event_engine.h @@ -14,12 +14,6 @@ #ifndef GRPC_EVENT_ENGINE_EVENT_ENGINE_H #define GRPC_EVENT_ENGINE_EVENT_ENGINE_H -#include - -#include "absl/functional/any_invocable.h" -#include "absl/status/status.h" -#include "absl/status/statusor.h" - #include #include #include @@ -27,6 +21,12 @@ #include #include +#include + +#include "absl/functional/any_invocable.h" +#include "absl/status/status.h" +#include "absl/status/statusor.h" + // TODO(vigneshbabu): Define the Endpoint::Write metrics collection system namespace grpc_event_engine { namespace experimental { diff --git a/include/grpc/event_engine/extensible.h b/include/grpc/event_engine/extensible.h index 9af4f37682b..2923bb6a077 100644 --- a/include/grpc/event_engine/extensible.h +++ b/include/grpc/event_engine/extensible.h @@ -15,10 +15,10 @@ #ifndef GRPC_EVENT_ENGINE_EXTENSIBLE_H #define GRPC_EVENT_ENGINE_EXTENSIBLE_H -#include "absl/strings/string_view.h" - #include +#include "absl/strings/string_view.h" + namespace grpc_event_engine { namespace experimental { diff --git a/include/grpc/event_engine/internal/memory_allocator_impl.h b/include/grpc/event_engine/internal/memory_allocator_impl.h index 91cba5a9491..721da86d0ac 100644 --- a/include/grpc/event_engine/internal/memory_allocator_impl.h +++ b/include/grpc/event_engine/internal/memory_allocator_impl.h @@ -14,15 +14,15 @@ #ifndef GRPC_EVENT_ENGINE_INTERNAL_MEMORY_ALLOCATOR_IMPL_H #define GRPC_EVENT_ENGINE_INTERNAL_MEMORY_ALLOCATOR_IMPL_H +#include +#include +#include + #include #include #include #include -#include -#include -#include - namespace grpc_event_engine { namespace experimental { diff --git a/include/grpc/event_engine/memory_allocator.h b/include/grpc/event_engine/memory_allocator.h index 3a347c3b5cf..d50404c71ab 100644 --- a/include/grpc/event_engine/memory_allocator.h +++ b/include/grpc/event_engine/memory_allocator.h @@ -14,6 +14,9 @@ #ifndef GRPC_EVENT_ENGINE_MEMORY_ALLOCATOR_H #define GRPC_EVENT_ENGINE_MEMORY_ALLOCATOR_H +#include +#include +#include #include // for abort() #include @@ -21,10 +24,6 @@ #include #include -#include -#include -#include - namespace grpc_event_engine { namespace experimental { diff --git a/include/grpc/event_engine/memory_request.h b/include/grpc/event_engine/memory_request.h index 2ea7bc5c1ab..b705f030c50 100644 --- a/include/grpc/event_engine/memory_request.h +++ b/include/grpc/event_engine/memory_request.h @@ -14,12 +14,11 @@ #ifndef GRPC_EVENT_ENGINE_MEMORY_REQUEST_H #define GRPC_EVENT_ENGINE_MEMORY_REQUEST_H +#include #include #include "absl/strings/string_view.h" -#include - namespace grpc_event_engine { namespace experimental { diff --git a/include/grpc/event_engine/slice.h b/include/grpc/event_engine/slice.h index f4009648dc1..7e4b2f08f7a 100644 --- a/include/grpc/event_engine/slice.h +++ b/include/grpc/event_engine/slice.h @@ -15,6 +15,9 @@ #ifndef GRPC_EVENT_ENGINE_SLICE_H #define GRPC_EVENT_ENGINE_SLICE_H +#include +#include +#include #include #include @@ -23,10 +26,6 @@ #include "absl/strings/string_view.h" -#include -#include -#include - // This public slice definition largely based of the internal grpc_core::Slice // implementation. Changes to this implementation might warrant changes to the // internal grpc_core::Slice type as well. diff --git a/include/grpc/event_engine/slice_buffer.h b/include/grpc/event_engine/slice_buffer.h index 724c3d07292..f6d23d72e09 100644 --- a/include/grpc/event_engine/slice_buffer.h +++ b/include/grpc/event_engine/slice_buffer.h @@ -15,6 +15,12 @@ #ifndef GRPC_EVENT_ENGINE_SLICE_BUFFER_H #define GRPC_EVENT_ENGINE_SLICE_BUFFER_H +#include +#include +#include +#include +#include +#include #include #include @@ -23,13 +29,6 @@ #include "absl/strings/string_view.h" #include "absl/utility/utility.h" -#include -#include -#include -#include -#include -#include - namespace grpc_event_engine { namespace experimental { diff --git a/include/grpc/grpc.h b/include/grpc/grpc.h index d293907eac0..2b681889d10 100644 --- a/include/grpc/grpc.h +++ b/include/grpc/grpc.h @@ -19,8 +19,6 @@ #ifndef GRPC_GRPC_H #define GRPC_GRPC_H -#include - #include #include // IWYU pragma: export #include // IWYU pragma: export @@ -29,6 +27,7 @@ #include #include #include +#include #ifdef __cplusplus extern "C" { diff --git a/include/grpc/grpc_audit_logging.h b/include/grpc/grpc_audit_logging.h index 4c30593f2fd..229df79165d 100644 --- a/include/grpc/grpc_audit_logging.h +++ b/include/grpc/grpc_audit_logging.h @@ -19,15 +19,15 @@ #ifndef GRPC_GRPC_AUDIT_LOGGING_H #define GRPC_GRPC_AUDIT_LOGGING_H +#include +#include + #include #include #include "absl/status/statusor.h" #include "absl/strings/string_view.h" -#include -#include - namespace grpc_core { namespace experimental { diff --git a/include/grpc/grpc_crl_provider.h b/include/grpc/grpc_crl_provider.h index 968d10b0600..e9a6db95cd9 100644 --- a/include/grpc/grpc_crl_provider.h +++ b/include/grpc/grpc_crl_provider.h @@ -19,16 +19,16 @@ #ifndef GRPC_GRPC_CRL_PROVIDER_H #define GRPC_GRPC_CRL_PROVIDER_H +#include +#include +#include + #include #include #include "absl/status/statusor.h" #include "absl/strings/string_view.h" -#include -#include -#include - namespace grpc_core { namespace experimental { diff --git a/include/grpc/grpc_posix.h b/include/grpc/grpc_posix.h index 3f59a4423d3..864ba979a9e 100644 --- a/include/grpc/grpc_posix.h +++ b/include/grpc/grpc_posix.h @@ -19,11 +19,10 @@ #ifndef GRPC_GRPC_POSIX_H #define GRPC_GRPC_POSIX_H -#include - #include #include #include +#include #ifdef __cplusplus extern "C" { diff --git a/include/grpc/grpc_security.h b/include/grpc/grpc_security.h index 11e08a6f4a1..f9a2d9d555d 100644 --- a/include/grpc/grpc_security.h +++ b/include/grpc/grpc_security.h @@ -19,12 +19,11 @@ #ifndef GRPC_GRPC_SECURITY_H #define GRPC_GRPC_SECURITY_H -#include - #include #include #include #include +#include #ifdef __cplusplus extern "C" { diff --git a/include/grpc/impl/call.h b/include/grpc/impl/call.h index ea298f2ef5c..43b44b195f5 100644 --- a/include/grpc/impl/call.h +++ b/include/grpc/impl/call.h @@ -15,11 +15,11 @@ #ifndef GRPC_IMPL_CALL_H #define GRPC_IMPL_CALL_H -#include "absl/functional/any_invocable.h" - #include #include +#include "absl/functional/any_invocable.h" + // Run a callback in the call's EventEngine. // Internal-only void grpc_call_run_in_event_engine(const grpc_call* call, diff --git a/include/grpc/impl/grpc_types.h b/include/grpc/impl/grpc_types.h index b1305114eb1..02c79532939 100644 --- a/include/grpc/impl/grpc_types.h +++ b/include/grpc/impl/grpc_types.h @@ -21,14 +21,13 @@ // IWYU pragma: private, include -#include - #include #include #include #include #include #include +#include #ifdef __cplusplus extern "C" { diff --git a/include/grpc/impl/slice_type.h b/include/grpc/impl/slice_type.h index 5e35446ef93..6d23f8abf4c 100644 --- a/include/grpc/impl/slice_type.h +++ b/include/grpc/impl/slice_type.h @@ -21,9 +21,8 @@ // IWYU pragma: private, include -#include - #include +#include typedef struct grpc_slice grpc_slice; diff --git a/include/grpc/passive_listener.h b/include/grpc/passive_listener.h index fffc789dba0..234ac5d8364 100644 --- a/include/grpc/passive_listener.h +++ b/include/grpc/passive_listener.h @@ -14,10 +14,10 @@ #ifndef GRPC_PASSIVE_LISTENER_H #define GRPC_PASSIVE_LISTENER_H -#include - #include #include + +#include // #include namespace grpc_core { diff --git a/include/grpc/support/alloc.h b/include/grpc/support/alloc.h index fdfa63c8e88..1ffd1966e7c 100644 --- a/include/grpc/support/alloc.h +++ b/include/grpc/support/alloc.h @@ -19,9 +19,8 @@ #ifndef GRPC_SUPPORT_ALLOC_H #define GRPC_SUPPORT_ALLOC_H -#include - #include +#include #ifdef __cplusplus extern "C" { diff --git a/include/grpc/support/json.h b/include/grpc/support/json.h index 7b850e1cc28..2c96a7fb5ab 100644 --- a/include/grpc/support/json.h +++ b/include/grpc/support/json.h @@ -17,6 +17,7 @@ #ifndef GRPC_SUPPORT_JSON_H #define GRPC_SUPPORT_JSON_H +#include #include #include @@ -27,8 +28,6 @@ #include "absl/strings/str_cat.h" #include "absl/types/variant.h" -#include - namespace grpc_core { namespace experimental { diff --git a/include/grpc/support/log.h b/include/grpc/support/log.h index 92a41f0066e..10b3e6ff67a 100644 --- a/include/grpc/support/log.h +++ b/include/grpc/support/log.h @@ -19,11 +19,10 @@ #ifndef GRPC_SUPPORT_LOG_H #define GRPC_SUPPORT_LOG_H +#include #include #include /* for abort() */ -#include - #ifdef __cplusplus extern "C" { #endif diff --git a/include/grpc/support/metrics.h b/include/grpc/support/metrics.h index 829db0a404f..62525756620 100644 --- a/include/grpc/support/metrics.h +++ b/include/grpc/support/metrics.h @@ -15,11 +15,11 @@ #ifndef GRPC_SUPPORT_METRICS_H #define GRPC_SUPPORT_METRICS_H -#include "absl/strings/string_view.h" - #include #include +#include "absl/strings/string_view.h" + namespace grpc_core { namespace experimental { diff --git a/include/grpc/support/sync_posix.h b/include/grpc/support/sync_posix.h index 5348bac951f..18b049d418d 100644 --- a/include/grpc/support/sync_posix.h +++ b/include/grpc/support/sync_posix.h @@ -19,10 +19,9 @@ #ifndef GRPC_SUPPORT_SYNC_POSIX_H #define GRPC_SUPPORT_SYNC_POSIX_H -#include - #include #include +#include #ifdef GRPC_ASAN_ENABLED /* The member |leak_checker| is used to check whether there is a memory leak diff --git a/include/grpc/support/time.h b/include/grpc/support/time.h index 7adbfcedd1f..9fc786d8f41 100644 --- a/include/grpc/support/time.h +++ b/include/grpc/support/time.h @@ -19,11 +19,10 @@ #ifndef GRPC_SUPPORT_TIME_H #define GRPC_SUPPORT_TIME_H +#include #include #include -#include - #ifdef __cplusplus extern "C" { #endif diff --git a/include/grpcpp/.clang-format b/include/grpcpp/.clang-format deleted file mode 100644 index 5f150ef6edb..00000000000 --- a/include/grpcpp/.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/include/grpcpp/alarm.h b/include/grpcpp/alarm.h index bace15ec89c..86356909afd 100644 --- a/include/grpcpp/alarm.h +++ b/include/grpcpp/alarm.h @@ -21,8 +21,6 @@ #ifndef GRPCPP_ALARM_H #define GRPCPP_ALARM_H -#include - #include #include #include @@ -30,6 +28,8 @@ #include #include +#include + namespace grpc { /// Trigger a \a CompletionQueue event, or asynchronous callback execution, diff --git a/include/grpcpp/channel.h b/include/grpcpp/channel.h index aef567390d9..dacd27c38a4 100644 --- a/include/grpcpp/channel.h +++ b/include/grpcpp/channel.h @@ -19,8 +19,6 @@ #ifndef GRPCPP_CHANNEL_H #define GRPCPP_CHANNEL_H -#include - #include #include #include @@ -30,6 +28,8 @@ #include #include +#include + struct grpc_channel; namespace grpc { diff --git a/include/grpcpp/client_context.h b/include/grpcpp/client_context.h index af3b533ed1b..7226fce06de 100644 --- a/include/grpcpp/client_context.h +++ b/include/grpcpp/client_context.h @@ -34,12 +34,6 @@ #ifndef GRPCPP_CLIENT_CONTEXT_H #define GRPCPP_CLIENT_CONTEXT_H -#include -#include -#include - -#include "absl/log/absl_check.h" - #include #include #include @@ -54,6 +48,12 @@ #include #include +#include +#include +#include + +#include "absl/log/absl_check.h" + struct census_context; struct grpc_call; diff --git a/include/grpcpp/completion_queue.h b/include/grpcpp/completion_queue.h index 2bb391fccfc..2216dabb096 100644 --- a/include/grpcpp/completion_queue.h +++ b/include/grpcpp/completion_queue.h @@ -32,10 +32,6 @@ #ifndef GRPCPP_COMPLETION_QUEUE_H #define GRPCPP_COMPLETION_QUEUE_H -#include - -#include "absl/log/absl_check.h" - #include #include #include @@ -47,6 +43,10 @@ #include #include +#include + +#include "absl/log/absl_check.h" + struct grpc_completion_queue; namespace grpc { diff --git a/include/grpcpp/create_channel.h b/include/grpcpp/create_channel.h index 83f905e776f..7b765b8966a 100644 --- a/include/grpcpp/create_channel.h +++ b/include/grpcpp/create_channel.h @@ -19,14 +19,14 @@ #ifndef GRPCPP_CREATE_CHANNEL_H #define GRPCPP_CREATE_CHANNEL_H -#include - #include #include #include #include #include +#include + namespace grpc { /// Create a new \a Channel pointing to \a target. /// diff --git a/include/grpcpp/create_channel_binder.h b/include/grpcpp/create_channel_binder.h index 16616f31ca9..f19792a184a 100644 --- a/include/grpcpp/create_channel_binder.h +++ b/include/grpcpp/create_channel_binder.h @@ -19,16 +19,15 @@ #ifdef GPR_ANDROID +#include +#include +#include #include #include #include "absl/strings/string_view.h" -#include -#include -#include - namespace grpc { namespace experimental { diff --git a/include/grpcpp/create_channel_posix.h b/include/grpcpp/create_channel_posix.h index c4eb30c8d87..b6b06e8412a 100644 --- a/include/grpcpp/create_channel_posix.h +++ b/include/grpcpp/create_channel_posix.h @@ -19,12 +19,12 @@ #ifndef GRPCPP_CREATE_CHANNEL_POSIX_H #define GRPCPP_CREATE_CHANNEL_POSIX_H -#include - #include #include #include +#include + namespace grpc { #ifdef GPR_SUPPORT_CHANNELS_FROM_FD diff --git a/include/grpcpp/ext/call_metric_recorder.h b/include/grpcpp/ext/call_metric_recorder.h index 303a35db14d..443f5e4e67e 100644 --- a/include/grpcpp/ext/call_metric_recorder.h +++ b/include/grpcpp/ext/call_metric_recorder.h @@ -19,15 +19,15 @@ #ifndef GRPCPP_EXT_CALL_METRIC_RECORDER_H #define GRPCPP_EXT_CALL_METRIC_RECORDER_H +#include +#include + #include #include #include "absl/strings/string_view.h" #include "absl/types/optional.h" -#include -#include - namespace grpc { namespace experimental { diff --git a/include/grpcpp/ext/csm_observability.h b/include/grpcpp/ext/csm_observability.h index af7b42f4d1b..265d91949cd 100644 --- a/include/grpcpp/ext/csm_observability.h +++ b/include/grpcpp/ext/csm_observability.h @@ -19,6 +19,9 @@ #ifndef GRPCPP_EXT_CSM_OBSERVABILITY_H #define GRPCPP_EXT_CSM_OBSERVABILITY_H +#include +#include + #include #include "absl/functional/any_invocable.h" @@ -26,9 +29,6 @@ #include "absl/strings/string_view.h" #include "opentelemetry/metrics/meter_provider.h" -#include -#include - namespace grpc { namespace internal { diff --git a/include/grpcpp/ext/gcp_observability.h b/include/grpcpp/ext/gcp_observability.h index df270bec887..96d1aee2680 100644 --- a/include/grpcpp/ext/gcp_observability.h +++ b/include/grpcpp/ext/gcp_observability.h @@ -17,12 +17,12 @@ #ifndef GRPCPP_EXT_GCP_OBSERVABILITY_H #define GRPCPP_EXT_GCP_OBSERVABILITY_H -#include "absl/status/status.h" -#include "absl/status/statusor.h" - #include #include +#include "absl/status/status.h" +#include "absl/status/statusor.h" + namespace grpc { // GcpObservability objects follow the RAII idiom and help manage the lifetime diff --git a/include/grpcpp/ext/health_check_service_server_builder_option.h b/include/grpcpp/ext/health_check_service_server_builder_option.h index 85b661ee515..e328f434d1f 100644 --- a/include/grpcpp/ext/health_check_service_server_builder_option.h +++ b/include/grpcpp/ext/health_check_service_server_builder_option.h @@ -19,12 +19,12 @@ #ifndef GRPCPP_EXT_HEALTH_CHECK_SERVICE_SERVER_BUILDER_OPTION_H #define GRPCPP_EXT_HEALTH_CHECK_SERVICE_SERVER_BUILDER_OPTION_H -#include - #include #include #include +#include + namespace grpc { class HealthCheckServiceServerBuilderOption : public ServerBuilderOption { diff --git a/include/grpcpp/ext/orca_service.h b/include/grpcpp/ext/orca_service.h index 83a676095dc..3a2dd1a84ae 100644 --- a/include/grpcpp/ext/orca_service.h +++ b/include/grpcpp/ext/orca_service.h @@ -17,12 +17,6 @@ #ifndef GRPCPP_EXT_ORCA_SERVICE_H #define GRPCPP_EXT_ORCA_SERVICE_H -#include -#include - -#include "absl/time/time.h" -#include "absl/types/optional.h" - #include #include #include @@ -30,6 +24,12 @@ #include #include +#include +#include + +#include "absl/time/time.h" +#include "absl/types/optional.h" + namespace grpc { namespace experimental { diff --git a/include/grpcpp/ext/otel_plugin.h b/include/grpcpp/ext/otel_plugin.h index 9de57fbb496..ffd6f6647c4 100644 --- a/include/grpcpp/ext/otel_plugin.h +++ b/include/grpcpp/ext/otel_plugin.h @@ -19,6 +19,10 @@ #ifndef GRPCPP_EXT_OTEL_PLUGIN_H #define GRPCPP_EXT_OTEL_PLUGIN_H +#include +#include +#include +#include #include #include @@ -30,11 +34,6 @@ #include "absl/strings/string_view.h" #include "opentelemetry/metrics/meter_provider.h" -#include -#include -#include -#include - namespace grpc { namespace internal { class OpenTelemetryPluginBuilderImpl; diff --git a/include/grpcpp/ext/proto_server_reflection_plugin.h b/include/grpcpp/ext/proto_server_reflection_plugin.h index b1cbb5a67c2..fd10c3acfbd 100644 --- a/include/grpcpp/ext/proto_server_reflection_plugin.h +++ b/include/grpcpp/ext/proto_server_reflection_plugin.h @@ -19,11 +19,11 @@ #ifndef GRPCPP_EXT_PROTO_SERVER_REFLECTION_PLUGIN_H #define GRPCPP_EXT_PROTO_SERVER_REFLECTION_PLUGIN_H -#include - #include #include +#include + namespace grpc { class ProtoServerReflection; class ProtoServerReflectionBackend; diff --git a/include/grpcpp/ext/server_metric_recorder.h b/include/grpcpp/ext/server_metric_recorder.h index d2ddaae9367..4741572c44c 100644 --- a/include/grpcpp/ext/server_metric_recorder.h +++ b/include/grpcpp/ext/server_metric_recorder.h @@ -19,13 +19,13 @@ #ifndef GRPCPP_EXT_SERVER_METRIC_RECORDER_H #define GRPCPP_EXT_SERVER_METRIC_RECORDER_H +#include +#include + #include #include #include -#include -#include - namespace grpc_core { struct BackendMetricData; } // namespace grpc_core diff --git a/include/grpcpp/impl/.clang-format b/include/grpcpp/impl/.clang-format deleted file mode 100644 index 5f150ef6edb..00000000000 --- a/include/grpcpp/impl/.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/include/grpcpp/impl/call_op_set.h b/include/grpcpp/impl/call_op_set.h index 5afa8272aa2..3ed80330e4b 100644 --- a/include/grpcpp/impl/call_op_set.h +++ b/include/grpcpp/impl/call_op_set.h @@ -19,13 +19,6 @@ #ifndef GRPCPP_IMPL_CALL_OP_SET_H #define GRPCPP_IMPL_CALL_OP_SET_H -#include -#include -#include - -#include "absl/log/absl_check.h" -#include "absl/log/absl_log.h" - #include #include #include @@ -45,6 +38,13 @@ #include #include +#include +#include +#include + +#include "absl/log/absl_check.h" +#include "absl/log/absl_log.h" + namespace grpc { namespace internal { diff --git a/include/grpcpp/impl/channel_argument_option.h b/include/grpcpp/impl/channel_argument_option.h index d1bf931c578..b4f411e3c51 100644 --- a/include/grpcpp/impl/channel_argument_option.h +++ b/include/grpcpp/impl/channel_argument_option.h @@ -19,12 +19,12 @@ #ifndef GRPCPP_IMPL_CHANNEL_ARGUMENT_OPTION_H #define GRPCPP_IMPL_CHANNEL_ARGUMENT_OPTION_H -#include -#include - #include #include +#include +#include + namespace grpc { std::unique_ptr MakeChannelArgumentOption( diff --git a/include/grpcpp/impl/codegen/.clang-format b/include/grpcpp/impl/codegen/.clang-format deleted file mode 100644 index 5f150ef6edb..00000000000 --- a/include/grpcpp/impl/codegen/.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/include/grpcpp/impl/create_auth_context.h b/include/grpcpp/impl/create_auth_context.h index 10844bec92c..892da261a23 100644 --- a/include/grpcpp/impl/create_auth_context.h +++ b/include/grpcpp/impl/create_auth_context.h @@ -19,11 +19,11 @@ #ifndef GRPCPP_IMPL_CREATE_AUTH_CONTEXT_H #define GRPCPP_IMPL_CREATE_AUTH_CONTEXT_H -#include - #include #include +#include + namespace grpc { /// TODO(ctiller): not sure we want to make this a permanent thing diff --git a/include/grpcpp/impl/delegating_channel.h b/include/grpcpp/impl/delegating_channel.h index 802237f2efd..add88a23bb0 100644 --- a/include/grpcpp/impl/delegating_channel.h +++ b/include/grpcpp/impl/delegating_channel.h @@ -19,10 +19,10 @@ #ifndef GRPCPP_IMPL_DELEGATING_CHANNEL_H #define GRPCPP_IMPL_DELEGATING_CHANNEL_H -#include - #include +#include + namespace grpc { namespace experimental { diff --git a/include/grpcpp/impl/generic_stub_internal.h b/include/grpcpp/impl/generic_stub_internal.h index ba8c929d8fe..efc57417713 100644 --- a/include/grpcpp/impl/generic_stub_internal.h +++ b/include/grpcpp/impl/generic_stub_internal.h @@ -19,8 +19,6 @@ #ifndef GRPCPP_IMPL_GENERIC_STUB_INTERNAL_H #define GRPCPP_IMPL_GENERIC_STUB_INTERNAL_H -#include - #include #include #include @@ -28,6 +26,8 @@ #include #include +#include + namespace grpc { template diff --git a/include/grpcpp/impl/grpc_library.h b/include/grpcpp/impl/grpc_library.h index 6f20d2bf413..728dda84624 100644 --- a/include/grpcpp/impl/grpc_library.h +++ b/include/grpcpp/impl/grpc_library.h @@ -19,11 +19,11 @@ #ifndef GRPCPP_IMPL_GRPC_LIBRARY_H #define GRPCPP_IMPL_GRPC_LIBRARY_H -#include - #include #include +#include + namespace grpc { namespace internal { diff --git a/include/grpcpp/impl/interceptor_common.h b/include/grpcpp/impl/interceptor_common.h index 2d4c56701d2..5686c792b77 100644 --- a/include/grpcpp/impl/interceptor_common.h +++ b/include/grpcpp/impl/interceptor_common.h @@ -19,11 +19,6 @@ #ifndef GRPCPP_IMPL_INTERCEPTOR_COMMON_H #define GRPCPP_IMPL_INTERCEPTOR_COMMON_H -#include -#include - -#include "absl/log/absl_check.h" - #include #include #include @@ -31,6 +26,11 @@ #include #include +#include +#include + +#include "absl/log/absl_check.h" + namespace grpc { namespace internal { diff --git a/include/grpcpp/impl/metadata_map.h b/include/grpcpp/impl/metadata_map.h index 6241df0c259..c6407eaa208 100644 --- a/include/grpcpp/impl/metadata_map.h +++ b/include/grpcpp/impl/metadata_map.h @@ -19,11 +19,11 @@ #ifndef GRPCPP_IMPL_METADATA_MAP_H #define GRPCPP_IMPL_METADATA_MAP_H -#include - #include #include +#include + namespace grpc { namespace internal { diff --git a/include/grpcpp/impl/proto_utils.h b/include/grpcpp/impl/proto_utils.h index d738ff3ab67..4a101ebe113 100644 --- a/include/grpcpp/impl/proto_utils.h +++ b/include/grpcpp/impl/proto_utils.h @@ -19,10 +19,6 @@ #ifndef GRPCPP_IMPL_PROTO_UTILS_H #define GRPCPP_IMPL_PROTO_UTILS_H -#include - -#include "absl/log/absl_check.h" - #include #include #include @@ -34,6 +30,10 @@ #include #include +#include + +#include "absl/log/absl_check.h" + /// This header provides serialization and deserialization between gRPC /// messages serialized using protobuf and the C++ objects they represent. diff --git a/include/grpcpp/impl/rpc_method.h b/include/grpcpp/impl/rpc_method.h index e1dcd003367..bb47f45ec10 100644 --- a/include/grpcpp/impl/rpc_method.h +++ b/include/grpcpp/impl/rpc_method.h @@ -19,10 +19,10 @@ #ifndef GRPCPP_IMPL_RPC_METHOD_H #define GRPCPP_IMPL_RPC_METHOD_H -#include - #include +#include + namespace grpc { namespace internal { /// Descriptor of an RPC method diff --git a/include/grpcpp/impl/rpc_service_method.h b/include/grpcpp/impl/rpc_service_method.h index 6ab92c978e3..1b9911eca41 100644 --- a/include/grpcpp/impl/rpc_service_method.h +++ b/include/grpcpp/impl/rpc_service_method.h @@ -19,6 +19,11 @@ #ifndef GRPCPP_IMPL_RPC_SERVICE_METHOD_H #define GRPCPP_IMPL_RPC_SERVICE_METHOD_H +#include +#include +#include +#include + #include #include #include @@ -28,11 +33,6 @@ #include "absl/log/absl_check.h" #include "absl/log/absl_log.h" -#include -#include -#include -#include - namespace grpc { class ServerContextBase; namespace internal { diff --git a/include/grpcpp/impl/server_builder_option.h b/include/grpcpp/impl/server_builder_option.h index d5745c6fb0c..22a94fd6833 100644 --- a/include/grpcpp/impl/server_builder_option.h +++ b/include/grpcpp/impl/server_builder_option.h @@ -19,12 +19,12 @@ #ifndef GRPCPP_IMPL_SERVER_BUILDER_OPTION_H #define GRPCPP_IMPL_SERVER_BUILDER_OPTION_H -#include -#include - #include #include +#include +#include + namespace grpc { /// Interface to pass an option to a \a ServerBuilder. diff --git a/include/grpcpp/impl/server_builder_plugin.h b/include/grpcpp/impl/server_builder_plugin.h index d7ef0be5c29..bf4397b37ba 100644 --- a/include/grpcpp/impl/server_builder_plugin.h +++ b/include/grpcpp/impl/server_builder_plugin.h @@ -19,11 +19,11 @@ #ifndef GRPCPP_IMPL_SERVER_BUILDER_PLUGIN_H #define GRPCPP_IMPL_SERVER_BUILDER_PLUGIN_H -#include - #include #include +#include + namespace grpc { class ServerBuilder; diff --git a/include/grpcpp/impl/server_callback_handlers.h b/include/grpcpp/impl/server_callback_handlers.h index 7a4b6cf9aef..1c6104a51a8 100644 --- a/include/grpcpp/impl/server_callback_handlers.h +++ b/include/grpcpp/impl/server_callback_handlers.h @@ -18,8 +18,6 @@ #ifndef GRPCPP_IMPL_SERVER_CALLBACK_HANDLERS_H #define GRPCPP_IMPL_SERVER_CALLBACK_HANDLERS_H -#include "absl/log/absl_check.h" - #include #include #include @@ -28,6 +26,8 @@ #include #include +#include "absl/log/absl_check.h" + namespace grpc { namespace internal { diff --git a/include/grpcpp/impl/server_initializer.h b/include/grpcpp/impl/server_initializer.h index c2ad90bd269..2624681d165 100644 --- a/include/grpcpp/impl/server_initializer.h +++ b/include/grpcpp/impl/server_initializer.h @@ -19,11 +19,11 @@ #ifndef GRPCPP_IMPL_SERVER_INITIALIZER_H #define GRPCPP_IMPL_SERVER_INITIALIZER_H +#include + #include #include -#include - namespace grpc { class Server; class Service; diff --git a/include/grpcpp/impl/service_type.h b/include/grpcpp/impl/service_type.h index b6af6e1fc98..f29f499f4e1 100644 --- a/include/grpcpp/impl/service_type.h +++ b/include/grpcpp/impl/service_type.h @@ -19,14 +19,14 @@ #ifndef GRPCPP_IMPL_SERVICE_TYPE_H #define GRPCPP_IMPL_SERVICE_TYPE_H -#include "absl/log/absl_check.h" - #include #include #include #include #include +#include "absl/log/absl_check.h" + namespace grpc { class CompletionQueue; diff --git a/include/grpcpp/impl/sync.h b/include/grpcpp/impl/sync.h index c4aa00bc07d..dcd4dcd1e86 100644 --- a/include/grpcpp/impl/sync.h +++ b/include/grpcpp/impl/sync.h @@ -25,14 +25,14 @@ #include #endif +#include +#include + #include #include "absl/log/absl_check.h" #include "absl/synchronization/mutex.h" -#include -#include - // The core library is not accessible in C++ codegen headers, and vice versa. // Thus, we need to have duplicate headers with similar functionality. // Make sure any change to this file is also reflected in diff --git a/include/grpcpp/security/.clang-format b/include/grpcpp/security/.clang-format deleted file mode 100644 index 5f150ef6edb..00000000000 --- a/include/grpcpp/security/.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/include/grpcpp/security/alts_context.h b/include/grpcpp/security/alts_context.h index 2f2de4e8824..04f1a0501c1 100644 --- a/include/grpcpp/security/alts_context.h +++ b/include/grpcpp/security/alts_context.h @@ -19,12 +19,12 @@ #ifndef GRPCPP_SECURITY_ALTS_CONTEXT_H #define GRPCPP_SECURITY_ALTS_CONTEXT_H -#include -#include - #include #include +#include +#include + struct grpc_gcp_AltsContext; namespace grpc { diff --git a/include/grpcpp/security/alts_util.h b/include/grpcpp/security/alts_util.h index c196823d1a8..a3df6474589 100644 --- a/include/grpcpp/security/alts_util.h +++ b/include/grpcpp/security/alts_util.h @@ -19,13 +19,13 @@ #ifndef GRPCPP_SECURITY_ALTS_UTIL_H #define GRPCPP_SECURITY_ALTS_UTIL_H -#include - #include #include #include #include +#include + struct grpc_gcp_AltsContext; namespace grpc { diff --git a/include/grpcpp/security/audit_logging.h b/include/grpcpp/security/audit_logging.h index b29464a6907..cec7aa23c90 100644 --- a/include/grpcpp/security/audit_logging.h +++ b/include/grpcpp/security/audit_logging.h @@ -19,15 +19,15 @@ #ifndef GRPCPP_SECURITY_AUDIT_LOGGING_H #define GRPCPP_SECURITY_AUDIT_LOGGING_H +#include +#include + #include #include #include #include "absl/status/statusor.h" -#include -#include - namespace grpc { namespace experimental { diff --git a/include/grpcpp/security/auth_context.h b/include/grpcpp/security/auth_context.h index f6e3fae481b..90dbb5535fa 100644 --- a/include/grpcpp/security/auth_context.h +++ b/include/grpcpp/security/auth_context.h @@ -19,12 +19,12 @@ #ifndef GRPCPP_SECURITY_AUTH_CONTEXT_H #define GRPCPP_SECURITY_AUTH_CONTEXT_H -#include -#include - #include #include +#include +#include + struct grpc_auth_context; struct grpc_auth_property; struct grpc_auth_property_iterator; diff --git a/include/grpcpp/security/auth_metadata_processor.h b/include/grpcpp/security/auth_metadata_processor.h index c491a13b198..aab59056bab 100644 --- a/include/grpcpp/security/auth_metadata_processor.h +++ b/include/grpcpp/security/auth_metadata_processor.h @@ -19,12 +19,12 @@ #ifndef GRPCPP_SECURITY_AUTH_METADATA_PROCESSOR_H #define GRPCPP_SECURITY_AUTH_METADATA_PROCESSOR_H -#include - #include #include #include +#include + namespace grpc { /// Interface allowing custom server-side authorization based on credentials diff --git a/include/grpcpp/security/authorization_policy_provider.h b/include/grpcpp/security/authorization_policy_provider.h index fe4f2c19f23..9bd916ff4b6 100644 --- a/include/grpcpp/security/authorization_policy_provider.h +++ b/include/grpcpp/security/authorization_policy_provider.h @@ -15,12 +15,12 @@ #ifndef GRPCPP_SECURITY_AUTHORIZATION_POLICY_PROVIDER_H #define GRPCPP_SECURITY_AUTHORIZATION_POLICY_PROVIDER_H -#include - #include #include #include +#include + namespace grpc { namespace experimental { diff --git a/include/grpcpp/security/binder_credentials.h b/include/grpcpp/security/binder_credentials.h index f511837ef2e..3c38b5129d5 100644 --- a/include/grpcpp/security/binder_credentials.h +++ b/include/grpcpp/security/binder_credentials.h @@ -15,11 +15,11 @@ #ifndef GRPCPP_SECURITY_BINDER_CREDENTIALS_H #define GRPCPP_SECURITY_BINDER_CREDENTIALS_H -#include - #include #include +#include + namespace grpc { class ChannelCredentials; diff --git a/include/grpcpp/security/credentials.h b/include/grpcpp/security/credentials.h index d1f8c22846a..d3ff3c830d0 100644 --- a/include/grpcpp/security/credentials.h +++ b/include/grpcpp/security/credentials.h @@ -19,10 +19,6 @@ #ifndef GRPCPP_SECURITY_CREDENTIALS_H #define GRPCPP_SECURITY_CREDENTIALS_H -#include -#include -#include - #include #include #include @@ -33,6 +29,10 @@ #include #include +#include +#include +#include + struct grpc_call; namespace grpc { diff --git a/include/grpcpp/security/server_credentials.h b/include/grpcpp/security/server_credentials.h index aa602cf4e64..d75c62bd648 100644 --- a/include/grpcpp/security/server_credentials.h +++ b/include/grpcpp/security/server_credentials.h @@ -19,15 +19,15 @@ #ifndef GRPCPP_SECURITY_SERVER_CREDENTIALS_H #define GRPCPP_SECURITY_SERVER_CREDENTIALS_H -#include -#include - #include #include #include #include #include +#include +#include + struct grpc_server; namespace grpc { diff --git a/include/grpcpp/security/tls_certificate_provider.h b/include/grpcpp/security/tls_certificate_provider.h index fc34d67a6d5..7912e4ccd26 100644 --- a/include/grpcpp/security/tls_certificate_provider.h +++ b/include/grpcpp/security/tls_certificate_provider.h @@ -17,12 +17,6 @@ #ifndef GRPCPP_SECURITY_TLS_CERTIFICATE_PROVIDER_H #define GRPCPP_SECURITY_TLS_CERTIFICATE_PROVIDER_H -#include -#include -#include - -#include "absl/status/statusor.h" - #include #include #include @@ -30,6 +24,12 @@ #include #include +#include +#include +#include + +#include "absl/status/statusor.h" + namespace grpc { namespace experimental { diff --git a/include/grpcpp/security/tls_certificate_verifier.h b/include/grpcpp/security/tls_certificate_verifier.h index 5b87b1a42c6..34fbd998794 100644 --- a/include/grpcpp/security/tls_certificate_verifier.h +++ b/include/grpcpp/security/tls_certificate_verifier.h @@ -17,12 +17,6 @@ #ifndef GRPCPP_SECURITY_TLS_CERTIFICATE_VERIFIER_H #define GRPCPP_SECURITY_TLS_CERTIFICATE_VERIFIER_H -#include -#include -#include -#include -#include - #include #include #include @@ -31,6 +25,12 @@ #include #include +#include +#include +#include +#include +#include + // TODO(yihuazhang): remove the forward declaration here and include // directly once the insecure builds are cleaned up. typedef struct grpc_tls_custom_verification_check_request diff --git a/include/grpcpp/security/tls_credentials_options.h b/include/grpcpp/security/tls_credentials_options.h index c47f348ccaa..b509af05c69 100644 --- a/include/grpcpp/security/tls_credentials_options.h +++ b/include/grpcpp/security/tls_credentials_options.h @@ -19,9 +19,6 @@ #ifndef GRPCPP_SECURITY_TLS_CREDENTIALS_OPTIONS_H #define GRPCPP_SECURITY_TLS_CREDENTIALS_OPTIONS_H -#include -#include - #include #include #include @@ -30,6 +27,9 @@ #include #include +#include +#include + namespace grpc { namespace experimental { diff --git a/include/grpcpp/server.h b/include/grpcpp/server.h index 3c56b6a06a2..37f71ff7d62 100644 --- a/include/grpcpp/server.h +++ b/include/grpcpp/server.h @@ -19,10 +19,6 @@ #ifndef GRPCPP_SERVER_H #define GRPCPP_SERVER_H -#include -#include -#include - #include #include #include @@ -39,6 +35,10 @@ #include #include +#include +#include +#include + struct grpc_server; namespace grpc { diff --git a/include/grpcpp/server_builder.h b/include/grpcpp/server_builder.h index 787cb20af7d..118861fa063 100644 --- a/include/grpcpp/server_builder.h +++ b/include/grpcpp/server_builder.h @@ -19,11 +19,6 @@ #ifndef GRPCPP_SERVER_BUILDER_H #define GRPCPP_SERVER_BUILDER_H -#include -#include -#include -#include - #include #include #include @@ -40,6 +35,11 @@ #include #include +#include +#include +#include +#include + struct grpc_resource_quota; namespace grpc { diff --git a/include/grpcpp/server_context.h b/include/grpcpp/server_context.h index eb72e36b4af..00a3709f1dc 100644 --- a/include/grpcpp/server_context.h +++ b/include/grpcpp/server_context.h @@ -19,13 +19,6 @@ #ifndef GRPCPP_SERVER_CONTEXT_H #define GRPCPP_SERVER_CONTEXT_H -#include -#include -#include -#include -#include -#include - #include #include #include @@ -47,6 +40,13 @@ #include #include +#include +#include +#include +#include +#include +#include + struct grpc_metadata; struct grpc_call; struct census_context; diff --git a/include/grpcpp/server_interface.h b/include/grpcpp/server_interface.h index 9791ee3589c..3e6680f1767 100644 --- a/include/grpcpp/server_interface.h +++ b/include/grpcpp/server_interface.h @@ -19,8 +19,6 @@ #ifndef GRPCPP_SERVER_INTERFACE_H #define GRPCPP_SERVER_INTERFACE_H -#include "absl/log/absl_check.h" - #include #include #include @@ -33,6 +31,8 @@ #include #include +#include "absl/log/absl_check.h" + namespace grpc { class AsyncGenericService; diff --git a/include/grpcpp/server_posix.h b/include/grpcpp/server_posix.h index 8132c01cf94..0ccf560e063 100644 --- a/include/grpcpp/server_posix.h +++ b/include/grpcpp/server_posix.h @@ -19,11 +19,11 @@ #ifndef GRPCPP_SERVER_POSIX_H #define GRPCPP_SERVER_POSIX_H -#include - #include #include +#include + namespace grpc { #ifdef GPR_SUPPORT_CHANNELS_FROM_FD diff --git a/include/grpcpp/support/.clang-format b/include/grpcpp/support/.clang-format deleted file mode 100644 index 5f150ef6edb..00000000000 --- a/include/grpcpp/support/.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/include/grpcpp/support/async_stream.h b/include/grpcpp/support/async_stream.h index c4cbb9dbb43..931d321a982 100644 --- a/include/grpcpp/support/async_stream.h +++ b/include/grpcpp/support/async_stream.h @@ -19,8 +19,6 @@ #ifndef GRPCPP_SUPPORT_ASYNC_STREAM_H #define GRPCPP_SUPPORT_ASYNC_STREAM_H -#include "absl/log/absl_check.h" - #include #include #include @@ -28,6 +26,8 @@ #include #include +#include "absl/log/absl_check.h" + namespace grpc { namespace internal { diff --git a/include/grpcpp/support/async_unary_call.h b/include/grpcpp/support/async_unary_call.h index a03a9b28382..b50798ae7cf 100644 --- a/include/grpcpp/support/async_unary_call.h +++ b/include/grpcpp/support/async_unary_call.h @@ -19,8 +19,6 @@ #ifndef GRPCPP_SUPPORT_ASYNC_UNARY_CALL_H #define GRPCPP_SUPPORT_ASYNC_UNARY_CALL_H -#include "absl/log/absl_check.h" - #include #include #include @@ -31,6 +29,8 @@ #include #include +#include "absl/log/absl_check.h" + namespace grpc { // Forward declaration for use in Helper class diff --git a/include/grpcpp/support/byte_buffer.h b/include/grpcpp/support/byte_buffer.h index 676d3cfad7e..c60326f036a 100644 --- a/include/grpcpp/support/byte_buffer.h +++ b/include/grpcpp/support/byte_buffer.h @@ -19,8 +19,6 @@ #ifndef GRPCPP_SUPPORT_BYTE_BUFFER_H #define GRPCPP_SUPPORT_BYTE_BUFFER_H -#include - #include #include #include @@ -28,6 +26,8 @@ #include #include +#include + namespace grpc { class ServerInterface; diff --git a/include/grpcpp/support/callback_common.h b/include/grpcpp/support/callback_common.h index 49eaa56172a..b4ba1e7baa5 100644 --- a/include/grpcpp/support/callback_common.h +++ b/include/grpcpp/support/callback_common.h @@ -19,10 +19,6 @@ #ifndef GRPCPP_SUPPORT_CALLBACK_COMMON_H #define GRPCPP_SUPPORT_CALLBACK_COMMON_H -#include - -#include "absl/log/absl_check.h" - #include #include #include @@ -32,6 +28,10 @@ #include #include +#include + +#include "absl/log/absl_check.h" + namespace grpc { namespace internal { diff --git a/include/grpcpp/support/channel_arguments.h b/include/grpcpp/support/channel_arguments.h index a149a6d72ba..c0858dbc623 100644 --- a/include/grpcpp/support/channel_arguments.h +++ b/include/grpcpp/support/channel_arguments.h @@ -19,14 +19,14 @@ #ifndef GRPCPP_SUPPORT_CHANNEL_ARGUMENTS_H #define GRPCPP_SUPPORT_CHANNEL_ARGUMENTS_H -#include -#include - #include #include #include #include +#include +#include + namespace grpc { class ChannelCredentials; namespace testing { diff --git a/include/grpcpp/support/client_callback.h b/include/grpcpp/support/client_callback.h index 82a404e2c87..88de62b6d9a 100644 --- a/include/grpcpp/support/client_callback.h +++ b/include/grpcpp/support/client_callback.h @@ -19,11 +19,6 @@ #ifndef GRPCPP_SUPPORT_CLIENT_CALLBACK_H #define GRPCPP_SUPPORT_CLIENT_CALLBACK_H -#include -#include - -#include "absl/log/absl_check.h" - #include #include #include @@ -33,6 +28,11 @@ #include #include +#include +#include + +#include "absl/log/absl_check.h" + namespace grpc { class Channel; class ClientContext; diff --git a/include/grpcpp/support/client_interceptor.h b/include/grpcpp/support/client_interceptor.h index fbf554437bf..b00101f9b5c 100644 --- a/include/grpcpp/support/client_interceptor.h +++ b/include/grpcpp/support/client_interceptor.h @@ -19,15 +19,15 @@ #ifndef GRPCPP_SUPPORT_CLIENT_INTERCEPTOR_H #define GRPCPP_SUPPORT_CLIENT_INTERCEPTOR_H +#include +#include +#include + #include #include #include "absl/log/absl_check.h" -#include -#include -#include - namespace grpc { class Channel; diff --git a/include/grpcpp/support/interceptor.h b/include/grpcpp/support/interceptor.h index 1e4d66610f6..04a4b34c4e2 100644 --- a/include/grpcpp/support/interceptor.h +++ b/include/grpcpp/support/interceptor.h @@ -19,16 +19,16 @@ #ifndef GRPCPP_SUPPORT_INTERCEPTOR_H #define GRPCPP_SUPPORT_INTERCEPTOR_H -#include -#include -#include - #include #include #include #include #include +#include +#include +#include + namespace grpc { class ChannelInterface; diff --git a/include/grpcpp/support/method_handler.h b/include/grpcpp/support/method_handler.h index 081401b187b..a61843bdb86 100644 --- a/include/grpcpp/support/method_handler.h +++ b/include/grpcpp/support/method_handler.h @@ -19,13 +19,13 @@ #ifndef GRPCPP_SUPPORT_METHOD_HANDLER_H #define GRPCPP_SUPPORT_METHOD_HANDLER_H -#include "absl/log/absl_check.h" - #include #include #include #include +#include "absl/log/absl_check.h" + namespace grpc { namespace internal { diff --git a/include/grpcpp/support/proto_buffer_reader.h b/include/grpcpp/support/proto_buffer_reader.h index 7bdf8d13d72..5f5be2cd0d9 100644 --- a/include/grpcpp/support/proto_buffer_reader.h +++ b/include/grpcpp/support/proto_buffer_reader.h @@ -19,11 +19,6 @@ #ifndef GRPCPP_SUPPORT_PROTO_BUFFER_READER_H #define GRPCPP_SUPPORT_PROTO_BUFFER_READER_H -#include - -#include "absl/log/absl_check.h" -#include "absl/strings/cord.h" - #include #include #include @@ -33,6 +28,11 @@ #include #include +#include + +#include "absl/log/absl_check.h" +#include "absl/strings/cord.h" + /// This header provides an object that reads bytes directly from a /// grpc::ByteBuffer, via the ZeroCopyInputStream interface diff --git a/include/grpcpp/support/proto_buffer_writer.h b/include/grpcpp/support/proto_buffer_writer.h index 1417a619911..225c8555fb9 100644 --- a/include/grpcpp/support/proto_buffer_writer.h +++ b/include/grpcpp/support/proto_buffer_writer.h @@ -19,11 +19,6 @@ #ifndef GRPCPP_SUPPORT_PROTO_BUFFER_WRITER_H #define GRPCPP_SUPPORT_PROTO_BUFFER_WRITER_H -#include - -#include "absl/log/absl_check.h" -#include "absl/strings/cord.h" - #include #include #include @@ -33,6 +28,11 @@ #include #include +#include + +#include "absl/log/absl_check.h" +#include "absl/strings/cord.h" + /// This header provides an object that writes bytes directly into a /// grpc::ByteBuffer, via the ZeroCopyOutputStream interface diff --git a/include/grpcpp/support/server_callback.h b/include/grpcpp/support/server_callback.h index e5fd910701a..378e88006bf 100644 --- a/include/grpcpp/support/server_callback.h +++ b/include/grpcpp/support/server_callback.h @@ -19,12 +19,6 @@ #ifndef GRPCPP_SUPPORT_SERVER_CALLBACK_H #define GRPCPP_SUPPORT_SERVER_CALLBACK_H -#include -#include -#include - -#include "absl/functional/any_invocable.h" - #include #include #include @@ -34,6 +28,12 @@ #include #include +#include +#include +#include + +#include "absl/functional/any_invocable.h" + namespace grpc { // Declare base class of all reactors as internal diff --git a/include/grpcpp/support/server_interceptor.h b/include/grpcpp/support/server_interceptor.h index de875a347f1..d705e740334 100644 --- a/include/grpcpp/support/server_interceptor.h +++ b/include/grpcpp/support/server_interceptor.h @@ -19,15 +19,15 @@ #ifndef GRPCPP_SUPPORT_SERVER_INTERCEPTOR_H #define GRPCPP_SUPPORT_SERVER_INTERCEPTOR_H +#include +#include +#include + #include #include #include "absl/log/absl_check.h" -#include -#include -#include - namespace grpc { class ServerContextBase; namespace internal { diff --git a/include/grpcpp/support/string_ref.h b/include/grpcpp/support/string_ref.h index 380ceee2ffb..deb96b90d9f 100644 --- a/include/grpcpp/support/string_ref.h +++ b/include/grpcpp/support/string_ref.h @@ -19,6 +19,7 @@ #ifndef GRPCPP_SUPPORT_STRING_REF_H #define GRPCPP_SUPPORT_STRING_REF_H +#include #include #include @@ -26,8 +27,6 @@ #include #include -#include - namespace grpc { /// This class is a non owning reference to a string. diff --git a/include/grpcpp/support/sync_stream.h b/include/grpcpp/support/sync_stream.h index 7479adb25c1..cacf605a979 100644 --- a/include/grpcpp/support/sync_stream.h +++ b/include/grpcpp/support/sync_stream.h @@ -19,8 +19,6 @@ #ifndef GRPCPP_SUPPORT_SYNC_STREAM_H #define GRPCPP_SUPPORT_SYNC_STREAM_H -#include "absl/log/absl_check.h" - #include #include #include @@ -29,6 +27,8 @@ #include #include +#include "absl/log/absl_check.h" + namespace grpc { namespace internal { diff --git a/include/grpcpp/support/time.h b/include/grpcpp/support/time.h index 5397eb6ba24..41edfb5fd90 100644 --- a/include/grpcpp/support/time.h +++ b/include/grpcpp/support/time.h @@ -19,11 +19,11 @@ #ifndef GRPCPP_SUPPORT_TIME_H #define GRPCPP_SUPPORT_TIME_H -#include - #include #include +#include + namespace grpc { /// If you are trying to use CompletionQueue::AsyncNext with a time class that diff --git a/include/grpcpp/test/client_context_test_peer.h b/include/grpcpp/test/client_context_test_peer.h index 9cb1f683787..632575b6314 100644 --- a/include/grpcpp/test/client_context_test_peer.h +++ b/include/grpcpp/test/client_context_test_peer.h @@ -19,10 +19,10 @@ #ifndef GRPCPP_TEST_CLIENT_CONTEXT_TEST_PEER_H #define GRPCPP_TEST_CLIENT_CONTEXT_TEST_PEER_H -#include - #include +#include + namespace grpc { namespace testing { diff --git a/include/grpcpp/test/mock_stream.h b/include/grpcpp/test/mock_stream.h index 7c39358d949..6ab61ff0dba 100644 --- a/include/grpcpp/test/mock_stream.h +++ b/include/grpcpp/test/mock_stream.h @@ -19,14 +19,12 @@ #ifndef GRPCPP_TEST_MOCK_STREAM_H #define GRPCPP_TEST_MOCK_STREAM_H -#include - #include - #include #include #include #include +#include namespace grpc { namespace testing { diff --git a/include/grpcpp/test/server_context_test_spouse.h b/include/grpcpp/test/server_context_test_spouse.h index 88dc7205588..c68f1a94cc7 100644 --- a/include/grpcpp/test/server_context_test_spouse.h +++ b/include/grpcpp/test/server_context_test_spouse.h @@ -19,10 +19,10 @@ #ifndef GRPCPP_TEST_SERVER_CONTEXT_TEST_SPOUSE_H #define GRPCPP_TEST_SERVER_CONTEXT_TEST_SPOUSE_H -#include - #include +#include + namespace grpc { namespace testing { diff --git a/src/.clang-format b/src/.clang-format deleted file mode 100644 index 5f150ef6edb..00000000000 --- a/src/.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/src/compiler/.clang-format b/src/compiler/.clang-format deleted file mode 100644 index 5f150ef6edb..00000000000 --- a/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/src/compiler/objective_c_generator.cc b/src/compiler/objective_c_generator.cc index 2a2a9ebc0d2..530dfddedf5 100644 --- a/src/compiler/objective_c_generator.cc +++ b/src/compiler/objective_c_generator.cc @@ -18,12 +18,12 @@ #include "src/compiler/objective_c_generator.h" +#include + #include #include #include -#include - #include "src/compiler/config.h" #include "src/compiler/objective_c_generator_helpers.h" diff --git a/src/compiler/objective_c_generator_helpers.h b/src/compiler/objective_c_generator_helpers.h index 8490ecf6a0c..1337863f9dd 100644 --- a/src/compiler/objective_c_generator_helpers.h +++ b/src/compiler/objective_c_generator_helpers.h @@ -19,10 +19,10 @@ #ifndef GRPC_INTERNAL_COMPILER_OBJECTIVE_C_GENERATOR_HELPERS_H #define GRPC_INTERNAL_COMPILER_OBJECTIVE_C_GENERATOR_HELPERS_H -#include - #include +#include + #include "src/compiler/config.h" #include "src/compiler/generator_helpers.h" diff --git a/src/compiler/objective_c_plugin.cc b/src/compiler/objective_c_plugin.cc index 4b0f2964212..1d886fcf1d5 100644 --- a/src/compiler/objective_c_plugin.cc +++ b/src/compiler/objective_c_plugin.cc @@ -18,10 +18,10 @@ // Generates Objective C gRPC service interface out of Protobuf IDL. -#include - #include +#include + #include "src/compiler/config.h" #include "src/compiler/objective_c_generator.h" #include "src/compiler/objective_c_generator_helpers.h" diff --git a/src/compiler/php_generator.cc b/src/compiler/php_generator.cc index 7ef2891c488..338b5b602cf 100644 --- a/src/compiler/php_generator.cc +++ b/src/compiler/php_generator.cc @@ -16,10 +16,10 @@ * */ -#include - #include +#include + #include "src/compiler/config.h" #include "src/compiler/generator_helpers.h" #include "src/compiler/php_generator_helpers.h" diff --git a/src/core/.clang-format b/src/core/.clang-format deleted file mode 100644 index 5f150ef6edb..00000000000 --- a/src/core/.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/src/core/channelz/channel_trace.cc b/src/core/channelz/channel_trace.cc index ee1de5e87c5..78d7e049009 100644 --- a/src/core/channelz/channel_trace.cc +++ b/src/core/channelz/channel_trace.cc @@ -18,15 +18,14 @@ #include "src/core/channelz/channel_trace.h" -#include -#include - -#include "absl/strings/str_cat.h" - #include #include #include +#include +#include + +#include "absl/strings/str_cat.h" #include "src/core/channelz/channelz.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/slice/slice_internal.h" diff --git a/src/core/channelz/channel_trace.h b/src/core/channelz/channel_trace.h index 82ac733e4c7..c9e42094379 100644 --- a/src/core/channelz/channel_trace.h +++ b/src/core/channelz/channel_trace.h @@ -19,15 +19,13 @@ #ifndef GRPC_SRC_CORE_CHANNELZ_CHANNEL_TRACE_H #define GRPC_SRC_CORE_CHANNELZ_CHANNEL_TRACE_H -#include -#include - -#include "absl/base/thread_annotations.h" - #include #include #include +#include +#include +#include "absl/base/thread_annotations.h" #include "src/core/util/json/json.h" #include "src/core/util/ref_counted_ptr.h" #include "src/core/util/sync.h" diff --git a/src/core/channelz/channelz.cc b/src/core/channelz/channelz.cc index ef27e51ffbf..1a8aa222a72 100644 --- a/src/core/channelz/channelz.cc +++ b/src/core/channelz/channelz.cc @@ -18,6 +18,10 @@ #include "src/core/channelz/channelz.h" +#include +#include +#include + #include #include #include @@ -27,11 +31,6 @@ #include "absl/strings/escaping.h" #include "absl/strings/str_cat.h" #include "absl/strings/strip.h" - -#include -#include -#include - #include "src/core/channelz/channelz_registry.h" #include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/address_utils/sockaddr_utils.h" diff --git a/src/core/channelz/channelz.h b/src/core/channelz/channelz.h index 6938ec99437..316e96fba74 100644 --- a/src/core/channelz/channelz.h +++ b/src/core/channelz/channelz.h @@ -19,6 +19,10 @@ #ifndef GRPC_SRC_CORE_CHANNELZ_CHANNELZ_H #define GRPC_SRC_CORE_CHANNELZ_CHANNELZ_H +#include +#include +#include +#include #include #include @@ -31,12 +35,6 @@ #include "absl/base/thread_annotations.h" #include "absl/strings/string_view.h" #include "absl/types/optional.h" - -#include -#include -#include -#include - #include "src/core/channelz/channel_trace.h" #include "src/core/util/json/json.h" #include "src/core/util/per_cpu.h" diff --git a/src/core/channelz/channelz_registry.cc b/src/core/channelz/channelz_registry.cc index 4393675c831..6db28fa7514 100644 --- a/src/core/channelz/channelz_registry.cc +++ b/src/core/channelz/channelz_registry.cc @@ -18,6 +18,11 @@ #include "src/core/channelz/channelz_registry.h" +#include +#include +#include +#include + #include #include #include @@ -26,12 +31,6 @@ #include "absl/log/check.h" #include "absl/log/log.h" - -#include -#include -#include -#include - #include "src/core/channelz/channelz.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/util/json/json.h" diff --git a/src/core/channelz/channelz_registry.h b/src/core/channelz/channelz_registry.h index f849ac1ac84..eeb6a47d788 100644 --- a/src/core/channelz/channelz_registry.h +++ b/src/core/channelz/channelz_registry.h @@ -19,14 +19,13 @@ #ifndef GRPC_SRC_CORE_CHANNELZ_CHANNELZ_REGISTRY_H #define GRPC_SRC_CORE_CHANNELZ_CHANNELZ_REGISTRY_H +#include + #include #include #include #include "absl/base/thread_annotations.h" - -#include - #include "src/core/channelz/channelz.h" #include "src/core/util/ref_counted_ptr.h" #include "src/core/util/sync.h" diff --git a/src/core/client_channel/.clang-format b/src/core/client_channel/.clang-format deleted file mode 100644 index 64387e9e515..00000000000 --- a/src/core/client_channel/.clang-format +++ /dev/null @@ -1,53 +0,0 @@ ---- -Language: Cpp -BasedOnStyle: Google -DerivePointerAlignment: false -PointerAlignment: Left -IncludeBlocks: Regroup -IncludeCategories: - # port_platform.h is before almost everything - - Regex: '^' - Priority: -100 - # 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/src/core/client_channel/backup_poller.cc b/src/core/client_channel/backup_poller.cc index 37914688a7e..43b485dc7ef 100644 --- a/src/core/client_channel/backup_poller.cc +++ b/src/core/client_channel/backup_poller.cc @@ -16,18 +16,15 @@ // // -#include - #include "src/core/client_channel/backup_poller.h" +#include +#include +#include #include #include "absl/log/log.h" #include "absl/status/status.h" - -#include -#include - #include "src/core/lib/config/config_vars.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" diff --git a/src/core/client_channel/client_channel.cc b/src/core/client_channel/client_channel.cc index 0d12c4b292a..315befd72ef 100644 --- a/src/core/client_channel/client_channel.cc +++ b/src/core/client_channel/client_channel.cc @@ -12,10 +12,17 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - #include "src/core/client_channel/client_channel.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -38,16 +45,6 @@ #include "absl/strings/string_view.h" #include "absl/types/optional.h" #include "absl/types/variant.h" - -#include -#include -#include -#include -#include -#include -#include -#include - #include "src/core/client_channel/client_channel_internal.h" #include "src/core/client_channel/client_channel_service_config.h" #include "src/core/client_channel/config_selector.h" diff --git a/src/core/client_channel/client_channel.h b/src/core/client_channel/client_channel.h index a7f7d75c705..662274446ad 100644 --- a/src/core/client_channel/client_channel.h +++ b/src/core/client_channel/client_channel.h @@ -22,7 +22,6 @@ #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/string_view.h" - #include "src/core/client_channel/client_channel_factory.h" #include "src/core/client_channel/config_selector.h" #include "src/core/client_channel/subchannel.h" diff --git a/src/core/client_channel/client_channel_factory.cc b/src/core/client_channel/client_channel_factory.cc index 39b5c20e97e..615950a599e 100644 --- a/src/core/client_channel/client_channel_factory.cc +++ b/src/core/client_channel/client_channel_factory.cc @@ -16,10 +16,10 @@ // // -#include - #include "src/core/client_channel/client_channel_factory.h" +#include + // Channel arg key for client channel factory. #define GRPC_ARG_CLIENT_CHANNEL_FACTORY "grpc.client_channel_factory" diff --git a/src/core/client_channel/client_channel_factory.h b/src/core/client_channel/client_channel_factory.h index fee6cd9f628..9e8ca146e0e 100644 --- a/src/core/client_channel/client_channel_factory.h +++ b/src/core/client_channel/client_channel_factory.h @@ -20,7 +20,6 @@ #include #include "absl/strings/string_view.h" - #include "src/core/client_channel/subchannel.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/iomgr/resolved_address.h" diff --git a/src/core/client_channel/client_channel_filter.cc b/src/core/client_channel/client_channel_filter.cc index 82caeb27ffc..6b87eb436c7 100644 --- a/src/core/client_channel/client_channel_filter.cc +++ b/src/core/client_channel/client_channel_filter.cc @@ -14,10 +14,16 @@ // limitations under the License. // -#include - #include "src/core/client_channel/client_channel_filter.h" +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -41,15 +47,6 @@ #include "absl/strings/string_view.h" #include "absl/types/optional.h" #include "absl/types/variant.h" - -#include -#include -#include -#include -#include -#include -#include - #include "src/core/channelz/channel_trace.h" #include "src/core/client_channel/backup_poller.h" #include "src/core/client_channel/client_channel_internal.h" diff --git a/src/core/client_channel/client_channel_filter.h b/src/core/client_channel/client_channel_filter.h index 0ca401df455..c2318360fba 100644 --- a/src/core/client_channel/client_channel_filter.h +++ b/src/core/client_channel/client_channel_filter.h @@ -17,8 +17,9 @@ #ifndef GRPC_SRC_CORE_CLIENT_CHANNEL_CLIENT_CHANNEL_FILTER_H #define GRPC_SRC_CORE_CLIENT_CHANNEL_CLIENT_CHANNEL_FILTER_H +#include +#include #include - #include #include @@ -33,10 +34,6 @@ #include "absl/status/status.h" #include "absl/strings/string_view.h" #include "absl/types/optional.h" - -#include -#include - #include "src/core/channelz/channelz.h" #include "src/core/client_channel/client_channel_factory.h" #include "src/core/client_channel/config_selector.h" diff --git a/src/core/client_channel/client_channel_internal.h b/src/core/client_channel/client_channel_internal.h index 1806bf057c9..99e045c0047 100644 --- a/src/core/client_channel/client_channel_internal.h +++ b/src/core/client_channel/client_channel_internal.h @@ -23,7 +23,6 @@ #include "absl/functional/any_invocable.h" #include "absl/log/check.h" - #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/transport/call_destination.h" #include "src/core/load_balancing/lb_policy.h" diff --git a/src/core/client_channel/client_channel_plugin.cc b/src/core/client_channel/client_channel_plugin.cc index ccec049b6eb..afb99741950 100644 --- a/src/core/client_channel/client_channel_plugin.cc +++ b/src/core/client_channel/client_channel_plugin.cc @@ -16,12 +16,10 @@ // // +#include #include #include "absl/types/optional.h" - -#include - #include "src/core/client_channel/client_channel_filter.h" #include "src/core/client_channel/client_channel_service_config.h" #include "src/core/client_channel/retry_service_config.h" diff --git a/src/core/client_channel/client_channel_service_config.cc b/src/core/client_channel/client_channel_service_config.cc index af08f54a956..07d34b12d44 100644 --- a/src/core/client_channel/client_channel_service_config.cc +++ b/src/core/client_channel/client_channel_service_config.cc @@ -14,10 +14,10 @@ // limitations under the License. // -#include - #include "src/core/client_channel/client_channel_service_config.h" +#include + #include #include @@ -26,7 +26,6 @@ #include "absl/strings/ascii.h" #include "absl/strings/str_cat.h" #include "absl/types/optional.h" - #include "src/core/load_balancing/lb_policy_registry.h" // As per the retry design, we do not allow more than 5 retry attempts. diff --git a/src/core/client_channel/client_channel_service_config.h b/src/core/client_channel/client_channel_service_config.h index e985b8e92e0..6d33d11b170 100644 --- a/src/core/client_channel/client_channel_service_config.h +++ b/src/core/client_channel/client_channel_service_config.h @@ -18,7 +18,6 @@ #define GRPC_SRC_CORE_CLIENT_CHANNEL_CLIENT_CHANNEL_SERVICE_CONFIG_H #include - #include #include @@ -26,7 +25,6 @@ #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/load_balancing/lb_policy.h" diff --git a/src/core/client_channel/config_selector.h b/src/core/client_channel/config_selector.h index 76572369fe4..2901ee471bd 100644 --- a/src/core/client_channel/config_selector.h +++ b/src/core/client_channel/config_selector.h @@ -17,8 +17,8 @@ #ifndef GRPC_SRC_CORE_CLIENT_CHANNEL_CONFIG_SELECTOR_H #define GRPC_SRC_CORE_CLIENT_CHANNEL_CONFIG_SELECTOR_H +#include #include - #include #include @@ -27,9 +27,6 @@ #include "absl/log/check.h" #include "absl/status/status.h" #include "absl/strings/string_view.h" - -#include - #include "src/core/client_channel/client_channel_internal.h" #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/resource_quota/arena.h" diff --git a/src/core/client_channel/dynamic_filters.cc b/src/core/client_channel/dynamic_filters.cc index c2825925fa4..93a3c49d957 100644 --- a/src/core/client_channel/dynamic_filters.cc +++ b/src/core/client_channel/dynamic_filters.cc @@ -14,10 +14,9 @@ // limitations under the License. // -#include - #include "src/core/client_channel/dynamic_filters.h" +#include #include #include @@ -26,7 +25,6 @@ #include "absl/log/check.h" #include "absl/log/log.h" #include "absl/status/statusor.h" - #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" diff --git a/src/core/client_channel/dynamic_filters.h b/src/core/client_channel/dynamic_filters.h index 30a5354f935..505ca293ead 100644 --- a/src/core/client_channel/dynamic_filters.h +++ b/src/core/client_channel/dynamic_filters.h @@ -17,13 +17,12 @@ #ifndef GRPC_SRC_CORE_CLIENT_CHANNEL_DYNAMIC_FILTERS_H #define GRPC_SRC_CORE_CLIENT_CHANNEL_DYNAMIC_FILTERS_H +#include #include #include #include -#include - #include "src/core/filter/blackboard.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_fwd.h" diff --git a/src/core/client_channel/global_subchannel_pool.cc b/src/core/client_channel/global_subchannel_pool.cc index 2f3ecf9faeb..5b6ffe85a22 100644 --- a/src/core/client_channel/global_subchannel_pool.cc +++ b/src/core/client_channel/global_subchannel_pool.cc @@ -16,10 +16,10 @@ // // -#include - #include "src/core/client_channel/global_subchannel_pool.h" +#include + #include #include "src/core/client_channel/subchannel.h" diff --git a/src/core/client_channel/global_subchannel_pool.h b/src/core/client_channel/global_subchannel_pool.h index 76ef31af385..79ea6672796 100644 --- a/src/core/client_channel/global_subchannel_pool.h +++ b/src/core/client_channel/global_subchannel_pool.h @@ -24,7 +24,6 @@ #include #include "absl/base/thread_annotations.h" - #include "src/core/client_channel/subchannel_pool_interface.h" #include "src/core/util/ref_counted_ptr.h" #include "src/core/util/sync.h" diff --git a/src/core/client_channel/lb_metadata.h b/src/core/client_channel/lb_metadata.h index f1c5e7e429f..f41510120a5 100644 --- a/src/core/client_channel/lb_metadata.h +++ b/src/core/client_channel/lb_metadata.h @@ -15,14 +15,13 @@ #ifndef GRPC_SRC_CORE_CLIENT_CHANNEL_LB_METADATA_H #define GRPC_SRC_CORE_CLIENT_CHANNEL_LB_METADATA_H +#include + #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" diff --git a/src/core/client_channel/load_balanced_call_destination.cc b/src/core/client_channel/load_balanced_call_destination.cc index 5d7c0b3c66c..2415e367ccc 100644 --- a/src/core/client_channel/load_balanced_call_destination.cc +++ b/src/core/client_channel/load_balanced_call_destination.cc @@ -15,7 +15,6 @@ #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" diff --git a/src/core/client_channel/load_balanced_call_destination.h b/src/core/client_channel/load_balanced_call_destination.h index 2adbdbe3dc3..904ff47e1ec 100644 --- a/src/core/client_channel/load_balanced_call_destination.h +++ b/src/core/client_channel/load_balanced_call_destination.h @@ -16,7 +16,6 @@ #define GRPC_SRC_CORE_CLIENT_CHANNEL_LOAD_BALANCED_CALL_DESTINATION_H #include "absl/functional/any_invocable.h" - #include "src/core/client_channel/client_channel.h" #include "src/core/lib/promise/context.h" #include "src/core/lib/transport/call_destination.h" diff --git a/src/core/client_channel/local_subchannel_pool.cc b/src/core/client_channel/local_subchannel_pool.cc index 878d3547b96..428db14bdf9 100644 --- a/src/core/client_channel/local_subchannel_pool.cc +++ b/src/core/client_channel/local_subchannel_pool.cc @@ -16,14 +16,13 @@ // // -#include - #include "src/core/client_channel/local_subchannel_pool.h" +#include + #include #include "absl/log/check.h" - #include "src/core/client_channel/subchannel.h" namespace grpc_core { diff --git a/src/core/client_channel/retry_filter.cc b/src/core/client_channel/retry_filter.cc index 73de1a4ebe1..f4bf99d5c5c 100644 --- a/src/core/client_channel/retry_filter.cc +++ b/src/core/client_channel/retry_filter.cc @@ -14,18 +14,16 @@ // limitations under the License. // -#include - #include "src/core/client_channel/retry_filter.h" +#include +#include + #include #include "absl/status/statusor.h" #include "absl/strings/strip.h" #include "absl/types/optional.h" - -#include - #include "src/core/client_channel/client_channel_filter.h" #include "src/core/client_channel/retry_filter_legacy_call_data.h" #include "src/core/client_channel/retry_service_config.h" diff --git a/src/core/client_channel/retry_filter.h b/src/core/client_channel/retry_filter.h index 402fa047691..1ed87fbc989 100644 --- a/src/core/client_channel/retry_filter.h +++ b/src/core/client_channel/retry_filter.h @@ -17,8 +17,10 @@ #ifndef GRPC_SRC_CORE_CLIENT_CHANNEL_RETRY_FILTER_H #define GRPC_SRC_CORE_CLIENT_CHANNEL_RETRY_FILTER_H +#include +#include +#include #include - #include #include @@ -26,11 +28,6 @@ #include "absl/log/check.h" #include "absl/types/optional.h" - -#include -#include -#include - #include "src/core/client_channel/client_channel_filter.h" #include "src/core/client_channel/retry_service_config.h" #include "src/core/client_channel/retry_throttle.h" diff --git a/src/core/client_channel/retry_filter_legacy_call_data.cc b/src/core/client_channel/retry_filter_legacy_call_data.cc index dda37fd4c62..7e3abc4a5a8 100644 --- a/src/core/client_channel/retry_filter_legacy_call_data.cc +++ b/src/core/client_channel/retry_filter_legacy_call_data.cc @@ -12,10 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - #include "src/core/client_channel/retry_filter_legacy_call_data.h" +#include #include #include @@ -25,7 +24,6 @@ #include "absl/log/log.h" #include "absl/status/status.h" #include "absl/strings/str_cat.h" - #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" diff --git a/src/core/client_channel/retry_filter_legacy_call_data.h b/src/core/client_channel/retry_filter_legacy_call_data.h index a4336072f1b..b121a8735bc 100644 --- a/src/core/client_channel/retry_filter_legacy_call_data.h +++ b/src/core/client_channel/retry_filter_legacy_call_data.h @@ -15,8 +15,10 @@ #ifndef GRPC_SRC_CORE_CLIENT_CHANNEL_RETRY_FILTER_LEGACY_CALL_DATA_H #define GRPC_SRC_CORE_CLIENT_CHANNEL_RETRY_FILTER_LEGACY_CALL_DATA_H +#include +#include +#include #include - #include #include @@ -25,11 +27,6 @@ #include "absl/container/inlined_vector.h" #include "absl/functional/any_invocable.h" #include "absl/types/optional.h" - -#include -#include -#include - #include "src/core/client_channel/client_channel_filter.h" #include "src/core/client_channel/retry_filter.h" #include "src/core/client_channel/retry_service_config.h" diff --git a/src/core/client_channel/retry_service_config.cc b/src/core/client_channel/retry_service_config.cc index e0ee89ce140..01e4c867ea9 100644 --- a/src/core/client_channel/retry_service_config.cc +++ b/src/core/client_channel/retry_service_config.cc @@ -14,10 +14,13 @@ // limitations under the License. // -#include - #include "src/core/client_channel/retry_service_config.h" +#include +#include +#include +#include + #include #include #include @@ -27,11 +30,6 @@ #include "absl/strings/numbers.h" #include "absl/strings/str_cat.h" #include "absl/types/optional.h" - -#include -#include -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/status_util.h" #include "src/core/lib/config/core_configuration.h" diff --git a/src/core/client_channel/retry_service_config.h b/src/core/client_channel/retry_service_config.h index 237e3b93bcc..91c6fe52dc9 100644 --- a/src/core/client_channel/retry_service_config.h +++ b/src/core/client_channel/retry_service_config.h @@ -18,7 +18,6 @@ #define GRPC_SRC_CORE_CLIENT_CHANNEL_RETRY_SERVICE_CONFIG_H #include - #include #include @@ -26,7 +25,6 @@ #include "absl/strings/string_view.h" #include "absl/types/optional.h" - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/status_util.h" #include "src/core/lib/config/core_configuration.h" diff --git a/src/core/client_channel/retry_throttle.cc b/src/core/client_channel/retry_throttle.cc index c9671832309..a631a8c47dd 100644 --- a/src/core/client_channel/retry_throttle.cc +++ b/src/core/client_channel/retry_throttle.cc @@ -16,16 +16,15 @@ // // -#include - #include "src/core/client_channel/retry_throttle.h" +#include +#include + #include #include #include -#include - namespace grpc_core { namespace internal { diff --git a/src/core/client_channel/retry_throttle.h b/src/core/client_channel/retry_throttle.h index 3cb32604277..fd01471d673 100644 --- a/src/core/client_channel/retry_throttle.h +++ b/src/core/client_channel/retry_throttle.h @@ -19,17 +19,14 @@ #ifndef GRPC_SRC_CORE_CLIENT_CHANNEL_RETRY_THROTTLE_H #define GRPC_SRC_CORE_CLIENT_CHANNEL_RETRY_THROTTLE_H +#include #include - #include #include #include #include "absl/base/thread_annotations.h" - -#include - #include "src/core/util/ref_counted.h" #include "src/core/util/ref_counted_ptr.h" #include "src/core/util/sync.h" diff --git a/src/core/client_channel/subchannel.cc b/src/core/client_channel/subchannel.cc index 26f76b77709..56918f0f294 100644 --- a/src/core/client_channel/subchannel.cc +++ b/src/core/client_channel/subchannel.cc @@ -14,10 +14,12 @@ // limitations under the License. // -#include - #include "src/core/client_channel/subchannel.h" +#include +#include +#include +#include #include #include @@ -33,11 +35,6 @@ #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" #include "absl/types/optional.h" - -#include -#include -#include - #include "src/core/channelz/channel_trace.h" #include "src/core/channelz/channelz.h" #include "src/core/client_channel/client_channel_internal.h" diff --git a/src/core/client_channel/subchannel.h b/src/core/client_channel/subchannel.h index 06a414363b1..41928e95300 100644 --- a/src/core/client_channel/subchannel.h +++ b/src/core/client_channel/subchannel.h @@ -17,8 +17,9 @@ #ifndef GRPC_SRC_CORE_CLIENT_CHANNEL_SUBCHANNEL_H #define GRPC_SRC_CORE_CLIENT_CHANNEL_SUBCHANNEL_H +#include +#include #include - #include #include @@ -27,10 +28,6 @@ #include "absl/base/thread_annotations.h" #include "absl/status/status.h" - -#include -#include - #include "src/core/client_channel/connector.h" #include "src/core/client_channel/subchannel_pool_interface.h" #include "src/core/lib/address_utils/sockaddr_utils.h" diff --git a/src/core/client_channel/subchannel_pool_interface.cc b/src/core/client_channel/subchannel_pool_interface.cc index 7b083a8b47a..bc55e478008 100644 --- a/src/core/client_channel/subchannel_pool_interface.cc +++ b/src/core/client_channel/subchannel_pool_interface.cc @@ -16,16 +16,14 @@ // // -#include - #include "src/core/client_channel/subchannel_pool_interface.h" +#include #include #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/str_cat.h" - #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/channel/channel_args.h" diff --git a/src/core/client_channel/subchannel_pool_interface.h b/src/core/client_channel/subchannel_pool_interface.h index d7cab8f1e99..ca385d1e591 100644 --- a/src/core/client_channel/subchannel_pool_interface.h +++ b/src/core/client_channel/subchannel_pool_interface.h @@ -24,7 +24,6 @@ #include #include "absl/strings/string_view.h" - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/iomgr/resolved_address.h" diff --git a/src/core/client_channel/subchannel_stream_client.cc b/src/core/client_channel/subchannel_stream_client.cc index a01165e3d11..205daac3d96 100644 --- a/src/core/client_channel/subchannel_stream_client.cc +++ b/src/core/client_channel/subchannel_stream_client.cc @@ -14,10 +14,10 @@ // limitations under the License. // -#include - #include "src/core/client_channel/subchannel_stream_client.h" +#include +#include #include #include @@ -25,9 +25,6 @@ #include "absl/log/check.h" #include "absl/log/log.h" - -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/resource_quota/resource_quota.h" diff --git a/src/core/client_channel/subchannel_stream_client.h b/src/core/client_channel/subchannel_stream_client.h index f50314e0ace..0f530c17f36 100644 --- a/src/core/client_channel/subchannel_stream_client.h +++ b/src/core/client_channel/subchannel_stream_client.h @@ -17,6 +17,10 @@ #ifndef GRPC_SRC_CORE_CLIENT_CHANNEL_SUBCHANNEL_STREAM_CLIENT_H #define GRPC_SRC_CORE_CLIENT_CHANNEL_SUBCHANNEL_STREAM_CLIENT_H +#include +#include +#include +#include #include #include @@ -26,12 +30,6 @@ #include "absl/status/status.h" #include "absl/strings/string_view.h" #include "absl/types/optional.h" - -#include -#include -#include -#include - #include "src/core/client_channel/subchannel.h" #include "src/core/lib/iomgr/call_combiner.h" #include "src/core/lib/iomgr/closure.h" diff --git a/src/core/ext/.clang-format b/src/core/ext/.clang-format deleted file mode 100644 index 5f150ef6edb..00000000000 --- a/src/core/ext/.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/src/core/ext/filters/.clang-format b/src/core/ext/filters/.clang-format deleted file mode 100644 index 64387e9e515..00000000000 --- a/src/core/ext/filters/.clang-format +++ /dev/null @@ -1,53 +0,0 @@ ---- -Language: Cpp -BasedOnStyle: Google -DerivePointerAlignment: false -PointerAlignment: Left -IncludeBlocks: Regroup -IncludeCategories: - # port_platform.h is before almost everything - - Regex: '^' - Priority: -100 - # 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/src/core/ext/filters/backend_metrics/backend_metric_filter.cc b/src/core/ext/filters/backend_metrics/backend_metric_filter.cc index da589a303b7..8d5e559e7a5 100644 --- a/src/core/ext/filters/backend_metrics/backend_metric_filter.cc +++ b/src/core/ext/filters/backend_metrics/backend_metric_filter.cc @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - #include "src/core/ext/filters/backend_metrics/backend_metric_filter.h" +#include +#include #include #include @@ -26,12 +26,6 @@ #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 "src/core/lib/channel/channel_stack.h" #include "src/core/lib/channel/promise_based_filter.h" #include "src/core/lib/config/core_configuration.h" @@ -44,6 +38,9 @@ #include "src/core/lib/transport/metadata_batch.h" #include "src/core/load_balancing/backend_metric_data.h" #include "src/core/util/latent_see.h" +#include "upb/base/string_view.h" +#include "upb/mem/arena.hpp" +#include "xds/data/orca/v3/orca_load_report.upb.h" namespace grpc_core { diff --git a/src/core/ext/filters/backend_metrics/backend_metric_filter.h b/src/core/ext/filters/backend_metrics/backend_metric_filter.h index 02ee8611dce..c2d630a155a 100644 --- a/src/core/ext/filters/backend_metrics/backend_metric_filter.h +++ b/src/core/ext/filters/backend_metrics/backend_metric_filter.h @@ -21,7 +21,6 @@ #include "absl/status/statusor.h" #include "absl/types/optional.h" - #include "src/core/ext/filters/backend_metrics/backend_metric_provider.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_fwd.h" diff --git a/src/core/ext/filters/census/grpc_context.cc b/src/core/ext/filters/census/grpc_context.cc index 77965df7ecd..42d72df6523 100644 --- a/src/core/ext/filters/census/grpc_context.cc +++ b/src/core/ext/filters/census/grpc_context.cc @@ -16,10 +16,9 @@ // // -#include - #include #include +#include #include "src/core/lib/debug/trace.h" #include "src/core/lib/surface/call.h" diff --git a/src/core/ext/filters/channel_idle/idle_filter_state.cc b/src/core/ext/filters/channel_idle/idle_filter_state.cc index 72b5448a1e5..2fbc8365067 100644 --- a/src/core/ext/filters/channel_idle/idle_filter_state.cc +++ b/src/core/ext/filters/channel_idle/idle_filter_state.cc @@ -12,11 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - #include "src/core/ext/filters/channel_idle/idle_filter_state.h" #include +#include namespace grpc_core { diff --git a/src/core/ext/filters/channel_idle/idle_filter_state.h b/src/core/ext/filters/channel_idle/idle_filter_state.h index f921e082fcd..772d4a0b6c3 100644 --- a/src/core/ext/filters/channel_idle/idle_filter_state.h +++ b/src/core/ext/filters/channel_idle/idle_filter_state.h @@ -16,7 +16,6 @@ #define GRPC_SRC_CORE_EXT_FILTERS_CHANNEL_IDLE_IDLE_FILTER_STATE_H #include - #include #include diff --git a/src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc b/src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc index bc4e834a10d..968386bec8a 100644 --- a/src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc +++ b/src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc @@ -15,10 +15,11 @@ // TODO(ctiller): Add a unit test suite for these filters once it's practical to // mock transport operations. -#include - #include "src/core/ext/filters/channel_idle/legacy_channel_idle_filter.h" +#include +#include + #include #include @@ -27,9 +28,6 @@ #include "absl/random/random.h" #include "absl/status/statusor.h" #include "absl/types/optional.h" - -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/promise_based_filter.h" #include "src/core/lib/config/core_configuration.h" diff --git a/src/core/ext/filters/channel_idle/legacy_channel_idle_filter.h b/src/core/ext/filters/channel_idle/legacy_channel_idle_filter.h index b4b61f10bb3..b903b41f766 100644 --- a/src/core/ext/filters/channel_idle/legacy_channel_idle_filter.h +++ b/src/core/ext/filters/channel_idle/legacy_channel_idle_filter.h @@ -15,15 +15,13 @@ #ifndef GRPC_SRC_CORE_EXT_FILTERS_CHANNEL_IDLE_LEGACY_CHANNEL_IDLE_FILTER_H #define GRPC_SRC_CORE_EXT_FILTERS_CHANNEL_IDLE_LEGACY_CHANNEL_IDLE_FILTER_H +#include #include #include #include "absl/status/status.h" #include "absl/status/statusor.h" - -#include - #include "src/core/ext/filters/channel_idle/idle_filter_state.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_fwd.h" diff --git a/src/core/ext/filters/fault_injection/fault_injection_filter.cc b/src/core/ext/filters/fault_injection/fault_injection_filter.cc index e0e4d3e031b..72429fea9d6 100644 --- a/src/core/ext/filters/fault_injection/fault_injection_filter.cc +++ b/src/core/ext/filters/fault_injection/fault_injection_filter.cc @@ -14,10 +14,10 @@ // limitations under the License. // -#include - #include "src/core/ext/filters/fault_injection/fault_injection_filter.h" +#include +#include #include #include @@ -35,9 +35,6 @@ #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" #include "absl/types/optional.h" - -#include - #include "src/core/ext/filters/fault_injection/fault_injection_service_config_parser.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/channel/status_util.h" diff --git a/src/core/ext/filters/fault_injection/fault_injection_filter.h b/src/core/ext/filters/fault_injection/fault_injection_filter.h index 40b839c1033..c7e04a470fd 100644 --- a/src/core/ext/filters/fault_injection/fault_injection_filter.h +++ b/src/core/ext/filters/fault_injection/fault_injection_filter.h @@ -18,7 +18,6 @@ #define GRPC_SRC_CORE_EXT_FILTERS_FAULT_INJECTION_FAULT_INJECTION_FILTER_H #include - #include #include @@ -26,7 +25,6 @@ #include "absl/base/thread_annotations.h" #include "absl/random/random.h" #include "absl/status/statusor.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" diff --git a/src/core/ext/filters/fault_injection/fault_injection_service_config_parser.cc b/src/core/ext/filters/fault_injection/fault_injection_service_config_parser.cc index 9e12ce0b093..6ecb24f856b 100644 --- a/src/core/ext/filters/fault_injection/fault_injection_service_config_parser.cc +++ b/src/core/ext/filters/fault_injection/fault_injection_service_config_parser.cc @@ -14,14 +14,13 @@ // limitations under the License. // -#include - #include "src/core/ext/filters/fault_injection/fault_injection_service_config_parser.h" +#include + #include #include "absl/types/optional.h" - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/status_util.h" diff --git a/src/core/ext/filters/fault_injection/fault_injection_service_config_parser.h b/src/core/ext/filters/fault_injection/fault_injection_service_config_parser.h index 0016c552c8e..f2c4769ccc6 100644 --- a/src/core/ext/filters/fault_injection/fault_injection_service_config_parser.h +++ b/src/core/ext/filters/fault_injection/fault_injection_service_config_parser.h @@ -17,8 +17,8 @@ #ifndef GRPC_SRC_CORE_EXT_FILTERS_FAULT_INJECTION_FAULT_INJECTION_SERVICE_CONFIG_PARSER_H #define GRPC_SRC_CORE_EXT_FILTERS_FAULT_INJECTION_FAULT_INJECTION_SERVICE_CONFIG_PARSER_H +#include #include - #include #include @@ -28,9 +28,6 @@ #include #include "absl/strings/string_view.h" - -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/service_config/service_config_parser.h" diff --git a/src/core/ext/filters/gcp_authentication/gcp_authentication_filter.cc b/src/core/ext/filters/gcp_authentication/gcp_authentication_filter.cc index e301ed62154..61a6a84a64e 100644 --- a/src/core/ext/filters/gcp_authentication/gcp_authentication_filter.cc +++ b/src/core/ext/filters/gcp_authentication/gcp_authentication_filter.cc @@ -22,7 +22,6 @@ #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" diff --git a/src/core/ext/filters/gcp_authentication/gcp_authentication_filter.h b/src/core/ext/filters/gcp_authentication/gcp_authentication_filter.h index a3136ebd460..66f8d13d4da 100644 --- a/src/core/ext/filters/gcp_authentication/gcp_authentication_filter.h +++ b/src/core/ext/filters/gcp_authentication/gcp_authentication_filter.h @@ -23,7 +23,6 @@ #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/filter/blackboard.h" #include "src/core/lib/channel/channel_args.h" diff --git a/src/core/ext/filters/gcp_authentication/gcp_authentication_service_config_parser.cc b/src/core/ext/filters/gcp_authentication/gcp_authentication_service_config_parser.cc index 4af33e528f7..2fb9fd2f55c 100644 --- a/src/core/ext/filters/gcp_authentication/gcp_authentication_service_config_parser.cc +++ b/src/core/ext/filters/gcp_authentication/gcp_authentication_service_config_parser.cc @@ -14,14 +14,13 @@ // limitations under the License. // -#include - #include "src/core/ext/filters/gcp_authentication/gcp_authentication_service_config_parser.h" +#include + #include #include "absl/types/optional.h" - #include "src/core/lib/channel/channel_args.h" namespace grpc_core { diff --git a/src/core/ext/filters/gcp_authentication/gcp_authentication_service_config_parser.h b/src/core/ext/filters/gcp_authentication/gcp_authentication_service_config_parser.h index 2c64a694485..36637d580b3 100644 --- a/src/core/ext/filters/gcp_authentication/gcp_authentication_service_config_parser.h +++ b/src/core/ext/filters/gcp_authentication/gcp_authentication_service_config_parser.h @@ -25,7 +25,6 @@ #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/service_config/service_config_parser.h" diff --git a/src/core/ext/filters/http/client/http_client_filter.cc b/src/core/ext/filters/http/client/http_client_filter.cc index f46b3641b61..cd91e931e56 100644 --- a/src/core/ext/filters/http/client/http_client_filter.cc +++ b/src/core/ext/filters/http/client/http_client_filter.cc @@ -15,10 +15,13 @@ // // -#include - #include "src/core/ext/filters/http/client/http_client_filter.h" +#include +#include +#include +#include + #include #include #include @@ -33,11 +36,6 @@ #include "absl/strings/str_join.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" #include "src/core/lib/promise/context.h" diff --git a/src/core/ext/filters/http/client/http_client_filter.h b/src/core/ext/filters/http/client/http_client_filter.h index 0b319cec303..05f6c14fe90 100644 --- a/src/core/ext/filters/http/client/http_client_filter.h +++ b/src/core/ext/filters/http/client/http_client_filter.h @@ -21,7 +21,6 @@ #include #include "absl/status/statusor.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" diff --git a/src/core/ext/filters/http/client_authority_filter.cc b/src/core/ext/filters/http/client_authority_filter.cc index b43e6a65b2b..924a54d469f 100644 --- a/src/core/ext/filters/http/client_authority_filter.cc +++ b/src/core/ext/filters/http/client_authority_filter.cc @@ -16,19 +16,17 @@ // // -#include - #include "src/core/ext/filters/http/client_authority_filter.h" +#include +#include + #include #include #include "absl/status/status.h" #include "absl/strings/string_view.h" #include "absl/types/optional.h" - -#include - #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/security/transport/auth_filters.h" diff --git a/src/core/ext/filters/http/client_authority_filter.h b/src/core/ext/filters/http/client_authority_filter.h index c3b817527c1..0137c21bc62 100644 --- a/src/core/ext/filters/http/client_authority_filter.h +++ b/src/core/ext/filters/http/client_authority_filter.h @@ -24,7 +24,6 @@ #include #include "absl/status/statusor.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" diff --git a/src/core/ext/filters/http/http_filters_plugin.cc b/src/core/ext/filters/http/http_filters_plugin.cc index b662737ebae..b791e454b33 100644 --- a/src/core/ext/filters/http/http_filters_plugin.cc +++ b/src/core/ext/filters/http/http_filters_plugin.cc @@ -19,7 +19,6 @@ #include #include "absl/strings/match.h" - #include "src/core/ext/filters/http/client/http_client_filter.h" #include "src/core/ext/filters/http/message_compress/compression_filter.h" #include "src/core/ext/filters/http/server/http_server_filter.h" diff --git a/src/core/ext/filters/http/message_compress/compression_filter.cc b/src/core/ext/filters/http/message_compress/compression_filter.cc index 85a67690206..fe7123db78f 100644 --- a/src/core/ext/filters/http/message_compress/compression_filter.cc +++ b/src/core/ext/filters/http/message_compress/compression_filter.cc @@ -12,10 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - #include "src/core/ext/filters/http/message_compress/compression_filter.h" +#include +#include +#include +#include +#include #include #include @@ -27,12 +30,6 @@ #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" #include "absl/types/optional.h" - -#include -#include -#include -#include - #include "src/core/ext/filters/message_size/message_size_filter.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_stack.h" diff --git a/src/core/ext/filters/http/message_compress/compression_filter.h b/src/core/ext/filters/http/message_compress/compression_filter.h index ae3a9ee317e..fbd28d309f7 100644 --- a/src/core/ext/filters/http/message_compress/compression_filter.h +++ b/src/core/ext/filters/http/message_compress/compression_filter.h @@ -19,17 +19,14 @@ #ifndef GRPC_SRC_CORE_EXT_FILTERS_HTTP_MESSAGE_COMPRESS_COMPRESSION_FILTER_H #define GRPC_SRC_CORE_EXT_FILTERS_HTTP_MESSAGE_COMPRESS_COMPRESSION_FILTER_H +#include #include - #include #include #include "absl/status/statusor.h" #include "absl/strings/string_view.h" #include "absl/types/optional.h" - -#include - #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" diff --git a/src/core/ext/filters/http/server/http_server_filter.cc b/src/core/ext/filters/http/server/http_server_filter.cc index 92e541775e5..35c73ba7be7 100644 --- a/src/core/ext/filters/http/server/http_server_filter.cc +++ b/src/core/ext/filters/http/server/http_server_filter.cc @@ -16,10 +16,12 @@ // // -#include - #include "src/core/ext/filters/http/server/http_server_filter.h" +#include +#include +#include + #include #include #include @@ -28,10 +30,6 @@ #include "absl/log/log.h" #include "absl/strings/string_view.h" #include "absl/types/optional.h" - -#include -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/debug/trace.h" diff --git a/src/core/ext/filters/http/server/http_server_filter.h b/src/core/ext/filters/http/server/http_server_filter.h index 8f933865d7d..c84e619bfb4 100644 --- a/src/core/ext/filters/http/server/http_server_filter.h +++ b/src/core/ext/filters/http/server/http_server_filter.h @@ -22,7 +22,6 @@ #include #include "absl/status/statusor.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" diff --git a/src/core/ext/filters/load_reporting/registered_opencensus_objects.h b/src/core/ext/filters/load_reporting/registered_opencensus_objects.h index cb17a04109d..0df3ce181fc 100644 --- a/src/core/ext/filters/load_reporting/registered_opencensus_objects.h +++ b/src/core/ext/filters/load_reporting/registered_opencensus_objects.h @@ -23,7 +23,6 @@ #include "opencensus/stats/stats.h" #include "opencensus/tags/tag_key.h" - #include "src/cpp/server/load_reporter/constants.h" namespace grpc { diff --git a/src/core/ext/filters/load_reporting/server_load_reporting_filter.cc b/src/core/ext/filters/load_reporting/server_load_reporting_filter.cc index 48cb742e505..a7d9eeccdd9 100644 --- a/src/core/ext/filters/load_reporting/server_load_reporting_filter.cc +++ b/src/core/ext/filters/load_reporting/server_load_reporting_filter.cc @@ -16,10 +16,13 @@ // // -#include - #include "src/core/ext/filters/load_reporting/server_load_reporting_filter.h" +#include +#include +#include +#include +#include #include #include @@ -38,12 +41,6 @@ #include "absl/types/optional.h" #include "opencensus/stats/stats.h" #include "opencensus/tags/tag_key.h" - -#include -#include -#include -#include - #include "src/core/ext/filters/load_reporting/registered_opencensus_objects.h" #include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/channel/call_finalization.h" diff --git a/src/core/ext/filters/load_reporting/server_load_reporting_filter.h b/src/core/ext/filters/load_reporting/server_load_reporting_filter.h index 41f66ec948d..d5a5eb96bf5 100644 --- a/src/core/ext/filters/load_reporting/server_load_reporting_filter.h +++ b/src/core/ext/filters/load_reporting/server_load_reporting_filter.h @@ -20,13 +20,11 @@ #define GRPC_SRC_CORE_EXT_FILTERS_LOAD_REPORTING_SERVER_LOAD_REPORTING_FILTER_H #include - #include #include #include "absl/status/statusor.h" - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/promise_based_filter.h" #include "src/core/lib/promise/arena_promise.h" diff --git a/src/core/ext/filters/logging/logging_filter.cc b/src/core/ext/filters/logging/logging_filter.cc index cf12d8bb6ac..b8563872eb4 100644 --- a/src/core/ext/filters/logging/logging_filter.cc +++ b/src/core/ext/filters/logging/logging_filter.cc @@ -16,10 +16,12 @@ // // -#include - #include "src/core/ext/filters/logging/logging_filter.h" +#include +#include +#include +#include #include #include @@ -42,11 +44,6 @@ #include "absl/strings/string_view.h" #include "absl/strings/strip.h" #include "absl/types/optional.h" - -#include -#include -#include - #include "src/core/client_channel/client_channel_filter.h" #include "src/core/ext/filters/logging/logging_sink.h" #include "src/core/lib/channel/channel_args.h" diff --git a/src/core/ext/filters/logging/logging_filter.h b/src/core/ext/filters/logging/logging_filter.h index 5d8b77752cd..9acc80e99c2 100644 --- a/src/core/ext/filters/logging/logging_filter.h +++ b/src/core/ext/filters/logging/logging_filter.h @@ -25,7 +25,6 @@ #include #include "absl/status/statusor.h" - #include "src/core/ext/filters/logging/logging_sink.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_fwd.h" diff --git a/src/core/ext/filters/logging/logging_sink.h b/src/core/ext/filters/logging/logging_sink.h index 71720799e4d..8b7914e0110 100644 --- a/src/core/ext/filters/logging/logging_sink.h +++ b/src/core/ext/filters/logging/logging_sink.h @@ -20,7 +20,6 @@ #define GRPC_SRC_CORE_EXT_FILTERS_LOGGING_LOGGING_SINK_H #include - #include #include @@ -29,7 +28,6 @@ #include "absl/numeric/int128.h" #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" - #include "src/core/util/time.h" namespace grpc_core { diff --git a/src/core/ext/filters/message_size/message_size_filter.cc b/src/core/ext/filters/message_size/message_size_filter.cc index 01cc9a3a9d7..813cd04dbf3 100644 --- a/src/core/ext/filters/message_size/message_size_filter.cc +++ b/src/core/ext/filters/message_size/message_size_filter.cc @@ -14,10 +14,11 @@ // limitations under the License. // -#include - #include "src/core/ext/filters/message_size/message_size_filter.h" +#include +#include +#include #include #include @@ -25,10 +26,6 @@ #include "absl/log/log.h" #include "absl/strings/str_format.h" - -#include -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/config/core_configuration.h" diff --git a/src/core/ext/filters/message_size/message_size_filter.h b/src/core/ext/filters/message_size/message_size_filter.h index 2bc36cfde31..ff6dc5837df 100644 --- a/src/core/ext/filters/message_size/message_size_filter.h +++ b/src/core/ext/filters/message_size/message_size_filter.h @@ -18,7 +18,6 @@ #define GRPC_SRC_CORE_EXT_FILTERS_MESSAGE_SIZE_MESSAGE_SIZE_FILTER_H #include - #include #include @@ -27,7 +26,6 @@ #include "absl/status/statusor.h" #include "absl/strings/string_view.h" #include "absl/types/optional.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" diff --git a/src/core/ext/filters/rbac/rbac_filter.cc b/src/core/ext/filters/rbac/rbac_filter.cc index c7a8d139b17..0385b865c7c 100644 --- a/src/core/ext/filters/rbac/rbac_filter.cc +++ b/src/core/ext/filters/rbac/rbac_filter.cc @@ -14,18 +14,16 @@ // limitations under the License. // -#include - #include "src/core/ext/filters/rbac/rbac_filter.h" +#include +#include + #include #include #include #include "absl/status/status.h" - -#include - #include "src/core/ext/filters/rbac/rbac_service_config_parser.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_stack.h" diff --git a/src/core/ext/filters/rbac/rbac_filter.h b/src/core/ext/filters/rbac/rbac_filter.h index f41e8490ccf..16489f47f02 100644 --- a/src/core/ext/filters/rbac/rbac_filter.h +++ b/src/core/ext/filters/rbac/rbac_filter.h @@ -18,11 +18,9 @@ #define GRPC_SRC_CORE_EXT_FILTERS_RBAC_RBAC_FILTER_H #include - #include #include "absl/status/statusor.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" diff --git a/src/core/ext/filters/rbac/rbac_service_config_parser.cc b/src/core/ext/filters/rbac/rbac_service_config_parser.cc index 56195fe4625..5c1fce9748c 100644 --- a/src/core/ext/filters/rbac/rbac_service_config_parser.cc +++ b/src/core/ext/filters/rbac/rbac_service_config_parser.cc @@ -14,10 +14,11 @@ // limitations under the License. // -#include - #include "src/core/ext/filters/rbac/rbac_service_config_parser.h" +#include +#include + #include #include #include @@ -27,9 +28,6 @@ #include "absl/status/statusor.h" #include "absl/strings/str_cat.h" #include "absl/types/optional.h" - -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/security/authorization/audit_logging.h" #include "src/core/util/json/json_args.h" diff --git a/src/core/ext/filters/rbac/rbac_service_config_parser.h b/src/core/ext/filters/rbac/rbac_service_config_parser.h index f9a4c29c34e..0bd3bc465e6 100644 --- a/src/core/ext/filters/rbac/rbac_service_config_parser.h +++ b/src/core/ext/filters/rbac/rbac_service_config_parser.h @@ -18,7 +18,6 @@ #define GRPC_SRC_CORE_EXT_FILTERS_RBAC_RBAC_SERVICE_CONFIG_PARSER_H #include - #include #include @@ -27,7 +26,6 @@ #include #include "absl/strings/string_view.h" - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/security/authorization/grpc_authorization_engine.h" diff --git a/src/core/ext/filters/stateful_session/stateful_session_filter.cc b/src/core/ext/filters/stateful_session/stateful_session_filter.cc index 3852c7155bb..22b3177c08f 100644 --- a/src/core/ext/filters/stateful_session/stateful_session_filter.cc +++ b/src/core/ext/filters/stateful_session/stateful_session_filter.cc @@ -14,10 +14,9 @@ // limitations under the License. // -#include - #include "src/core/ext/filters/stateful_session/stateful_session_filter.h" +#include #include #include @@ -36,7 +35,6 @@ #include "absl/strings/string_view.h" #include "absl/strings/strip.h" #include "absl/types/optional.h" - #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" diff --git a/src/core/ext/filters/stateful_session/stateful_session_filter.h b/src/core/ext/filters/stateful_session/stateful_session_filter.h index b7bde679c17..ce4e1dc801e 100644 --- a/src/core/ext/filters/stateful_session/stateful_session_filter.h +++ b/src/core/ext/filters/stateful_session/stateful_session_filter.h @@ -18,14 +18,12 @@ #define GRPC_SRC_CORE_EXT_FILTERS_STATEFUL_SESSION_STATEFUL_SESSION_FILTER_H #include - #include #include #include "absl/status/statusor.h" #include "absl/strings/string_view.h" - #include "src/core/ext/filters/stateful_session/stateful_session_service_config_parser.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_fwd.h" diff --git a/src/core/ext/filters/stateful_session/stateful_session_service_config_parser.cc b/src/core/ext/filters/stateful_session/stateful_session_service_config_parser.cc index 3be9785ac7c..1dc24ac99ce 100644 --- a/src/core/ext/filters/stateful_session/stateful_session_service_config_parser.cc +++ b/src/core/ext/filters/stateful_session/stateful_session_service_config_parser.cc @@ -14,14 +14,13 @@ // limitations under the License. // -#include - #include "src/core/ext/filters/stateful_session/stateful_session_service_config_parser.h" +#include + #include #include "absl/types/optional.h" - #include "src/core/lib/channel/channel_args.h" namespace grpc_core { diff --git a/src/core/ext/filters/stateful_session/stateful_session_service_config_parser.h b/src/core/ext/filters/stateful_session/stateful_session_service_config_parser.h index edf6f55a79d..59ee3bd7069 100644 --- a/src/core/ext/filters/stateful_session/stateful_session_service_config_parser.h +++ b/src/core/ext/filters/stateful_session/stateful_session_service_config_parser.h @@ -18,7 +18,6 @@ #define GRPC_SRC_CORE_EXT_FILTERS_STATEFUL_SESSION_STATEFUL_SESSION_SERVICE_CONFIG_PARSER_H #include - #include #include @@ -27,7 +26,6 @@ #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/service_config/service_config_parser.h" diff --git a/src/core/ext/transport/.clang-format b/src/core/ext/transport/.clang-format deleted file mode 100644 index 5f150ef6edb..00000000000 --- a/src/core/ext/transport/.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/src/core/ext/transport/binder/.clang-format b/src/core/ext/transport/binder/.clang-format deleted file mode 100644 index 5f150ef6edb..00000000000 --- a/src/core/ext/transport/binder/.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/src/core/ext/transport/binder/client/binder_connector.cc b/src/core/ext/transport/binder/client/binder_connector.cc index 725c5ad8a39..1317219a173 100644 --- a/src/core/ext/transport/binder/client/binder_connector.cc +++ b/src/core/ext/transport/binder/client/binder_connector.cc @@ -30,14 +30,13 @@ #endif // GPR_WINDOWS #endif +#include + #include #include #include "absl/log/check.h" #include "absl/log/log.h" - -#include - #include "src/core/client_channel/connector.h" #include "src/core/client_channel/subchannel.h" #include "src/core/ext/transport/binder/client/endpoint_binder_pool.h" diff --git a/src/core/ext/transport/binder/client/binder_connector.h b/src/core/ext/transport/binder/client/binder_connector.h index e054e3555c5..5ce6d86e583 100644 --- a/src/core/ext/transport/binder/client/binder_connector.h +++ b/src/core/ext/transport/binder/client/binder_connector.h @@ -15,17 +15,16 @@ #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_CLIENT_BINDER_CONNECTOR_H #define GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_CLIENT_BINDER_CONNECTOR_H -#include -#include - -#include "absl/strings/string_view.h" -#include "absl/strings/strip.h" - #include #include #include #include +#include +#include + +#include "absl/strings/string_view.h" +#include "absl/strings/strip.h" #include "src/core/client_channel/client_channel_factory.h" #include "src/core/client_channel/client_channel_filter.h" diff --git a/src/core/ext/transport/binder/client/channel_create.cc b/src/core/ext/transport/binder/client/channel_create.cc index 6ccf25f5b9b..483d488afaa 100644 --- a/src/core/ext/transport/binder/client/channel_create.cc +++ b/src/core/ext/transport/binder/client/channel_create.cc @@ -33,16 +33,15 @@ #ifdef GPR_SUPPORT_BINDER_TRANSPORT +#include +#include + #include "absl/log/check.h" #include "absl/log/log.h" #include "absl/memory/memory.h" #include "absl/strings/substitute.h" #include "absl/time/clock.h" #include "absl/time/time.h" - -#include -#include - #include "src/core/client_channel/client_channel_filter.h" #include "src/core/ext/transport/binder/client/channel_create_impl.h" #include "src/core/ext/transport/binder/client/connection_id_generator.h" diff --git a/src/core/ext/transport/binder/client/channel_create_impl.cc b/src/core/ext/transport/binder/client/channel_create_impl.cc index cf3a0caab69..1234c7c80fc 100644 --- a/src/core/ext/transport/binder/client/channel_create_impl.cc +++ b/src/core/ext/transport/binder/client/channel_create_impl.cc @@ -22,7 +22,6 @@ #include #include "absl/log/check.h" - #include "src/core/ext/transport/binder/client/binder_connector.h" #include "src/core/ext/transport/binder/transport/binder_transport.h" #include "src/core/ext/transport/binder/wire_format/binder.h" diff --git a/src/core/ext/transport/binder/client/connection_id_generator.h b/src/core/ext/transport/binder/client/connection_id_generator.h index fbe945cfb74..6e2b98d4ea1 100644 --- a/src/core/ext/transport/binder/client/connection_id_generator.h +++ b/src/core/ext/transport/binder/client/connection_id_generator.h @@ -15,12 +15,11 @@ #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_CLIENT_CONNECTION_ID_GENERATOR_H #define GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_CLIENT_CONNECTION_ID_GENERATOR_H +#include + #include #include "absl/strings/string_view.h" - -#include - #include "src/core/util/sync.h" namespace grpc_binder { diff --git a/src/core/ext/transport/binder/client/endpoint_binder_pool.cc b/src/core/ext/transport/binder/client/endpoint_binder_pool.cc index 012d7f03063..b64436acb5a 100644 --- a/src/core/ext/transport/binder/client/endpoint_binder_pool.cc +++ b/src/core/ext/transport/binder/client/endpoint_binder_pool.cc @@ -14,11 +14,11 @@ #include "src/core/ext/transport/binder/client/endpoint_binder_pool.h" +#include + #include "absl/log/check.h" #include "absl/log/log.h" -#include - #ifndef GRPC_NO_BINDER #include "src/core/ext/transport/binder/client/jni_utils.h" diff --git a/src/core/ext/transport/binder/client/endpoint_binder_pool.h b/src/core/ext/transport/binder/client/endpoint_binder_pool.h index 4f9ac233219..997c36e76a6 100644 --- a/src/core/ext/transport/binder/client/endpoint_binder_pool.h +++ b/src/core/ext/transport/binder/client/endpoint_binder_pool.h @@ -15,13 +15,12 @@ #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_CLIENT_ENDPOINT_BINDER_POOL_H #define GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_CLIENT_ENDPOINT_BINDER_POOL_H +#include + #include #include #include "absl/container/flat_hash_map.h" - -#include - #include "src/core/ext/transport/binder/wire_format/binder.h" #include "src/core/util/sync.h" diff --git a/src/core/ext/transport/binder/client/jni_utils.cc b/src/core/ext/transport/binder/client/jni_utils.cc index 8fc4f629c3c..3f13e269b0c 100644 --- a/src/core/ext/transport/binder/client/jni_utils.cc +++ b/src/core/ext/transport/binder/client/jni_utils.cc @@ -14,11 +14,11 @@ #include "src/core/ext/transport/binder/client/jni_utils.h" +#include + #include "absl/log/check.h" #include "absl/log/log.h" -#include - #ifndef GRPC_NO_BINDER #include "src/core/util/crash.h" diff --git a/src/core/ext/transport/binder/client/jni_utils.h b/src/core/ext/transport/binder/client/jni_utils.h index 1c809b127c8..c83949d3bf0 100644 --- a/src/core/ext/transport/binder/client/jni_utils.h +++ b/src/core/ext/transport/binder/client/jni_utils.h @@ -17,6 +17,7 @@ #if defined(ANDROID) || defined(__ANDROID__) +#include #include #include @@ -24,8 +25,6 @@ #include "absl/strings/string_view.h" -#include - namespace grpc_binder { // Finds NativeConnectionHelper Java class and caches it. This is useful because diff --git a/src/core/ext/transport/binder/client/security_policy_setting.cc b/src/core/ext/transport/binder/client/security_policy_setting.cc index 318b434e6fa..c08a83324c3 100644 --- a/src/core/ext/transport/binder/client/security_policy_setting.cc +++ b/src/core/ext/transport/binder/client/security_policy_setting.cc @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "absl/log/check.h" - #include +#include "absl/log/check.h" + #ifndef GRPC_NO_BINDER #include "src/core/ext/transport/binder/client/security_policy_setting.h" diff --git a/src/core/ext/transport/binder/client/security_policy_setting.h b/src/core/ext/transport/binder/client/security_policy_setting.h index 46fb000246a..cd386693408 100644 --- a/src/core/ext/transport/binder/client/security_policy_setting.h +++ b/src/core/ext/transport/binder/client/security_policy_setting.h @@ -15,12 +15,11 @@ #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_CLIENT_SECURITY_POLICY_SETTING_H #define GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_CLIENT_SECURITY_POLICY_SETTING_H -#include "absl/container/flat_hash_map.h" -#include "absl/strings/string_view.h" - #include #include +#include "absl/container/flat_hash_map.h" +#include "absl/strings/string_view.h" #include "src/core/util/sync.h" namespace grpc_binder { diff --git a/src/core/ext/transport/binder/security_policy/binder_security_policy.cc b/src/core/ext/transport/binder/security_policy/binder_security_policy.cc index 4fe4ee4d159..8126d4c6db7 100644 --- a/src/core/ext/transport/binder/security_policy/binder_security_policy.cc +++ b/src/core/ext/transport/binder/security_policy/binder_security_policy.cc @@ -25,7 +25,6 @@ #include "absl/log/check.h" #include "absl/log/log.h" - #include "src/core/ext/transport/binder/client/jni_utils.h" #include "src/core/util/crash.h" diff --git a/src/core/ext/transport/binder/server/binder_server.cc b/src/core/ext/transport/binder/server/binder_server.cc index 3d84b95a8d5..65d70c2fdb7 100644 --- a/src/core/ext/transport/binder/server/binder_server.cc +++ b/src/core/ext/transport/binder/server/binder_server.cc @@ -18,6 +18,8 @@ #ifndef GRPC_NO_BINDER +#include + #include #include #include @@ -25,9 +27,6 @@ #include "absl/log/check.h" #include "absl/log/log.h" #include "absl/memory/memory.h" - -#include - #include "src/core/ext/transport/binder/transport/binder_transport.h" #include "src/core/ext/transport/binder/utils/ndk_binder.h" #include "src/core/ext/transport/binder/wire_format/binder_android.h" diff --git a/src/core/ext/transport/binder/server/binder_server.h b/src/core/ext/transport/binder/server/binder_server.h index 34f25090c59..889a2555438 100644 --- a/src/core/ext/transport/binder/server/binder_server.h +++ b/src/core/ext/transport/binder/server/binder_server.h @@ -15,14 +15,13 @@ #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_SERVER_BINDER_SERVER_H #define GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_SERVER_BINDER_SERVER_H +#include +#include + #include #include "absl/container/flat_hash_map.h" #include "absl/status/status.h" - -#include -#include - #include "src/core/ext/transport/binder/transport/binder_transport.h" #include "src/core/ext/transport/binder/wire_format/binder.h" #include "src/core/lib/iomgr/exec_ctx.h" diff --git a/src/core/ext/transport/binder/server/binder_server_credentials.cc b/src/core/ext/transport/binder/server/binder_server_credentials.cc index 0d8f3dd63af..aea85fd82a6 100644 --- a/src/core/ext/transport/binder/server/binder_server_credentials.cc +++ b/src/core/ext/transport/binder/server/binder_server_credentials.cc @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "absl/log/check.h" - #include +#include "absl/log/check.h" + #ifndef GRPC_NO_BINDER #include diff --git a/src/core/ext/transport/binder/transport/binder_transport.cc b/src/core/ext/transport/binder/transport/binder_transport.cc index 06ed2da8798..aa0990f9ba2 100644 --- a/src/core/ext/transport/binder/transport/binder_transport.cc +++ b/src/core/ext/transport/binder/transport/binder_transport.cc @@ -28,7 +28,6 @@ #include "absl/memory/memory.h" #include "absl/strings/str_cat.h" #include "absl/strings/substitute.h" - #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" diff --git a/src/core/ext/transport/binder/transport/binder_transport.h b/src/core/ext/transport/binder/transport/binder_transport.h index 108926f25df..1e5446c3fc1 100644 --- a/src/core/ext/transport/binder/transport/binder_transport.h +++ b/src/core/ext/transport/binder/transport/binder_transport.h @@ -15,6 +15,9 @@ #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_TRANSPORT_BINDER_TRANSPORT_H #define GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_TRANSPORT_BINDER_TRANSPORT_H +#include +#include + #include #include #include @@ -24,10 +27,6 @@ #include "absl/container/flat_hash_map.h" #include "absl/log/check.h" #include "absl/log/log.h" - -#include -#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_reader.h" diff --git a/src/core/ext/transport/binder/utils/ndk_binder.cc b/src/core/ext/transport/binder/utils/ndk_binder.cc index 95b52789803..8997255d7d7 100644 --- a/src/core/ext/transport/binder/utils/ndk_binder.cc +++ b/src/core/ext/transport/binder/utils/ndk_binder.cc @@ -24,7 +24,6 @@ #include "absl/log/check.h" #include "absl/log/log.h" - #include "src/core/util/crash.h" #include "src/core/util/sync.h" diff --git a/src/core/ext/transport/binder/utils/transport_stream_receiver.h b/src/core/ext/transport/binder/utils/transport_stream_receiver.h index fa7dd21472d..a7f22d40c59 100644 --- a/src/core/ext/transport/binder/utils/transport_stream_receiver.h +++ b/src/core/ext/transport/binder/utils/transport_stream_receiver.h @@ -15,14 +15,13 @@ #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_UTILS_TRANSPORT_STREAM_RECEIVER_H #define GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_UTILS_TRANSPORT_STREAM_RECEIVER_H +#include + #include #include #include #include "absl/status/statusor.h" - -#include - #include "src/core/ext/transport/binder/wire_format/transaction.h" namespace grpc_binder { diff --git a/src/core/ext/transport/binder/utils/transport_stream_receiver_impl.cc b/src/core/ext/transport/binder/utils/transport_stream_receiver_impl.cc index 5a3cc10cb27..af1f4071104 100644 --- a/src/core/ext/transport/binder/utils/transport_stream_receiver_impl.cc +++ b/src/core/ext/transport/binder/utils/transport_stream_receiver_impl.cc @@ -24,7 +24,6 @@ #include "absl/log/check.h" #include "absl/log/log.h" - #include "src/core/util/crash.h" namespace grpc_binder { diff --git a/src/core/ext/transport/binder/utils/transport_stream_receiver_impl.h b/src/core/ext/transport/binder/utils/transport_stream_receiver_impl.h index a671a5e8233..a5548aba89c 100644 --- a/src/core/ext/transport/binder/utils/transport_stream_receiver_impl.h +++ b/src/core/ext/transport/binder/utils/transport_stream_receiver_impl.h @@ -15,6 +15,8 @@ #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_UTILS_TRANSPORT_STREAM_RECEIVER_IMPL_H #define GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_UTILS_TRANSPORT_STREAM_RECEIVER_IMPL_H +#include + #include #include #include @@ -22,8 +24,6 @@ #include #include -#include - #include "src/core/ext/transport/binder/utils/transport_stream_receiver.h" #include "src/core/util/sync.h" diff --git a/src/core/ext/transport/binder/wire_format/binder.h b/src/core/ext/transport/binder/wire_format/binder.h index 7936fbb65ce..77ab16597e8 100644 --- a/src/core/ext/transport/binder/wire_format/binder.h +++ b/src/core/ext/transport/binder/wire_format/binder.h @@ -15,6 +15,8 @@ #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_WIRE_FORMAT_BINDER_H #define GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_WIRE_FORMAT_BINDER_H +#include + #include #include #include @@ -22,9 +24,6 @@ #include "absl/status/status.h" #include "absl/strings/string_view.h" - -#include - #include "src/core/ext/transport/binder/wire_format/binder_constants.h" #include "src/core/util/orphanable.h" diff --git a/src/core/ext/transport/binder/wire_format/binder_android.cc b/src/core/ext/transport/binder/wire_format/binder_android.cc index e2a55df6b01..bc808e09bca 100644 --- a/src/core/ext/transport/binder/wire_format/binder_android.cc +++ b/src/core/ext/transport/binder/wire_format/binder_android.cc @@ -24,7 +24,6 @@ #include "absl/log/log.h" #include "absl/memory/memory.h" #include "absl/strings/str_cat.h" - #include "src/core/ext/transport/binder/wire_format/binder_android.h" #include "src/core/util/crash.h" #include "src/core/util/sync.h" diff --git a/src/core/ext/transport/binder/wire_format/binder_android.h b/src/core/ext/transport/binder/wire_format/binder_android.h index a11b9bb8957..7d59a5fa00d 100644 --- a/src/core/ext/transport/binder/wire_format/binder_android.h +++ b/src/core/ext/transport/binder/wire_format/binder_android.h @@ -24,7 +24,6 @@ #include #include "absl/memory/memory.h" - #include "src/core/ext/transport/binder/utils/binder_auto_utils.h" #include "src/core/ext/transport/binder/utils/ndk_binder.h" #include "src/core/ext/transport/binder/wire_format/binder.h" diff --git a/src/core/ext/transport/binder/wire_format/binder_constants.h b/src/core/ext/transport/binder/wire_format/binder_constants.h index 562f248ec0d..0dacaa742c0 100644 --- a/src/core/ext/transport/binder/wire_format/binder_constants.h +++ b/src/core/ext/transport/binder/wire_format/binder_constants.h @@ -15,12 +15,12 @@ #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_WIRE_FORMAT_BINDER_CONSTANTS_H #define GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_WIRE_FORMAT_BINDER_CONSTANTS_H +#include + #include #include "absl/base/attributes.h" -#include - using transaction_code_t = uint32_t; ABSL_CONST_INIT extern const int FIRST_CALL_TRANSACTION; diff --git a/src/core/ext/transport/binder/wire_format/transaction.h b/src/core/ext/transport/binder/wire_format/transaction.h index eda30d093a5..0b22f8a60e9 100644 --- a/src/core/ext/transport/binder/wire_format/transaction.h +++ b/src/core/ext/transport/binder/wire_format/transaction.h @@ -15,15 +15,14 @@ #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_WIRE_FORMAT_TRANSACTION_H #define GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_WIRE_FORMAT_TRANSACTION_H +#include + #include #include #include "absl/log/check.h" #include "absl/log/log.h" #include "absl/strings/string_view.h" - -#include - #include "src/core/util/crash.h" namespace grpc_binder { diff --git a/src/core/ext/transport/binder/wire_format/wire_reader.h b/src/core/ext/transport/binder/wire_format/wire_reader.h index 570f99ac683..e446342af62 100644 --- a/src/core/ext/transport/binder/wire_format/wire_reader.h +++ b/src/core/ext/transport/binder/wire_format/wire_reader.h @@ -15,11 +15,11 @@ #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_WIRE_FORMAT_WIRE_READER_H #define GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_WIRE_FORMAT_WIRE_READER_H +#include + #include #include -#include - #include "src/core/ext/transport/binder/wire_format/binder.h" #include "src/core/ext/transport/binder/wire_format/wire_writer.h" #include "src/core/util/orphanable.h" diff --git a/src/core/ext/transport/binder/wire_format/wire_reader_impl.cc b/src/core/ext/transport/binder/wire_format/wire_reader_impl.cc index d877b9cd9c1..5d8144650ac 100644 --- a/src/core/ext/transport/binder/wire_format/wire_reader_impl.cc +++ b/src/core/ext/transport/binder/wire_format/wire_reader_impl.cc @@ -29,7 +29,6 @@ #include "absl/log/log.h" #include "absl/memory/memory.h" #include "absl/status/statusor.h" - #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" diff --git a/src/core/ext/transport/binder/wire_format/wire_reader_impl.h b/src/core/ext/transport/binder/wire_format/wire_reader_impl.h index a08cb6f4985..8c8c4e939f7 100644 --- a/src/core/ext/transport/binder/wire_format/wire_reader_impl.h +++ b/src/core/ext/transport/binder/wire_format/wire_reader_impl.h @@ -15,16 +15,15 @@ #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_WIRE_FORMAT_WIRE_READER_IMPL_H #define GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_WIRE_FORMAT_WIRE_READER_IMPL_H +#include +#include + #include #include #include #include "absl/container/flat_hash_map.h" #include "absl/functional/any_invocable.h" - -#include -#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_reader.h" diff --git a/src/core/ext/transport/binder/wire_format/wire_writer.cc b/src/core/ext/transport/binder/wire_format/wire_writer.cc index 1cefd1bd5f2..948f16d2ee9 100644 --- a/src/core/ext/transport/binder/wire_format/wire_writer.cc +++ b/src/core/ext/transport/binder/wire_format/wire_writer.cc @@ -24,7 +24,6 @@ #include "absl/log/check.h" #include "absl/log/log.h" #include "absl/types/variant.h" - #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/util/crash.h" diff --git a/src/core/ext/transport/binder/wire_format/wire_writer.h b/src/core/ext/transport/binder/wire_format/wire_writer.h index 81041c68c02..81848296323 100644 --- a/src/core/ext/transport/binder/wire_format/wire_writer.h +++ b/src/core/ext/transport/binder/wire_format/wire_writer.h @@ -15,14 +15,13 @@ #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_WIRE_FORMAT_WIRE_WRITER_H #define GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_WIRE_FORMAT_WIRE_WRITER_H +#include + #include #include #include #include "absl/container/flat_hash_map.h" - -#include - #include "src/core/ext/transport/binder/wire_format/binder.h" #include "src/core/ext/transport/binder/wire_format/transaction.h" #include "src/core/lib/iomgr/combiner.h" diff --git a/src/core/ext/transport/chaotic_good/chaotic_good_transport.h b/src/core/ext/transport/chaotic_good/chaotic_good_transport.h index b3df1ceb1e6..3616797a3bb 100644 --- a/src/core/ext/transport/chaotic_good/chaotic_good_transport.h +++ b/src/core/ext/transport/chaotic_good/chaotic_good_transport.h @@ -15,14 +15,13 @@ #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHAOTIC_GOOD_CHAOTIC_GOOD_TRANSPORT_H #define GRPC_SRC_CORE_EXT_TRANSPORT_CHAOTIC_GOOD_CHAOTIC_GOOD_TRANSPORT_H +#include + #include #include #include "absl/log/log.h" #include "absl/random/random.h" - -#include - #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" diff --git a/src/core/ext/transport/chaotic_good/client/chaotic_good_connector.cc b/src/core/ext/transport/chaotic_good/client/chaotic_good_connector.cc index d8743703a04..ae9317e3b89 100644 --- a/src/core/ext/transport/chaotic_good/client/chaotic_good_connector.cc +++ b/src/core/ext/transport/chaotic_good/client/chaotic_good_connector.cc @@ -14,6 +14,9 @@ #include "src/core/ext/transport/chaotic_good/client/chaotic_good_connector.h" +#include +#include + #include #include #include @@ -23,10 +26,6 @@ #include "absl/random/bit_gen_ref.h" #include "absl/status/status.h" #include "absl/status/statusor.h" - -#include -#include - #include "src/core/client_channel/client_channel_factory.h" #include "src/core/client_channel/client_channel_filter.h" #include "src/core/ext/transport/chaotic_good/client_transport.h" diff --git a/src/core/ext/transport/chaotic_good/client/chaotic_good_connector.h b/src/core/ext/transport/chaotic_good/client/chaotic_good_connector.h index 59ef8fd4376..963c8da55be 100644 --- a/src/core/ext/transport/chaotic_good/client/chaotic_good_connector.h +++ b/src/core/ext/transport/chaotic_good/client/chaotic_good_connector.h @@ -15,16 +15,15 @@ #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHAOTIC_GOOD_CLIENT_CHAOTIC_GOOD_CONNECTOR_H #define GRPC_SRC_CORE_EXT_TRANSPORT_CHAOTIC_GOOD_CLIENT_CHAOTIC_GOOD_CONNECTOR_H +#include +#include + #include #include #include #include "absl/random/random.h" #include "absl/status/statusor.h" - -#include -#include - #include "src/core/client_channel/connector.h" #include "src/core/ext/transport/chttp2/transport/hpack_encoder.h" #include "src/core/ext/transport/chttp2/transport/hpack_parser.h" diff --git a/src/core/ext/transport/chaotic_good/client_transport.cc b/src/core/ext/transport/chaotic_good/client_transport.cc index 29a39c1fbac..3d585191bca 100644 --- a/src/core/ext/transport/chaotic_good/client_transport.cc +++ b/src/core/ext/transport/chaotic_good/client_transport.cc @@ -14,6 +14,10 @@ #include "src/core/ext/transport/chaotic_good/client_transport.h" +#include +#include +#include + #include #include #include @@ -27,11 +31,6 @@ #include "absl/random/random.h" #include "absl/status/status.h" #include "absl/status/statusor.h" - -#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" diff --git a/src/core/ext/transport/chaotic_good/client_transport.h b/src/core/ext/transport/chaotic_good/client_transport.h index f223c551002..997f03d6120 100644 --- a/src/core/ext/transport/chaotic_good/client_transport.h +++ b/src/core/ext/transport/chaotic_good/client_transport.h @@ -15,6 +15,10 @@ #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHAOTIC_GOOD_CLIENT_TRANSPORT_H #define GRPC_SRC_CORE_EXT_TRANSPORT_CHAOTIC_GOOD_CLIENT_TRANSPORT_H +#include +#include +#include +#include #include #include @@ -32,12 +36,6 @@ #include "absl/status/status.h" #include "absl/types/optional.h" #include "absl/types/variant.h" - -#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" diff --git a/src/core/ext/transport/chaotic_good/frame.cc b/src/core/ext/transport/chaotic_good/frame.cc index dccdf7f0dc5..5fbb51d070b 100644 --- a/src/core/ext/transport/chaotic_good/frame.cc +++ b/src/core/ext/transport/chaotic_good/frame.cc @@ -14,6 +14,8 @@ #include "src/core/ext/transport/chaotic_good/frame.h" +#include +#include #include #include @@ -23,10 +25,6 @@ #include "absl/log/check.h" #include "absl/status/status.h" #include "absl/status/statusor.h" - -#include -#include - #include "src/core/ext/transport/chaotic_good/frame_header.h" #include "src/core/lib/promise/context.h" #include "src/core/lib/resource_quota/arena.h" diff --git a/src/core/ext/transport/chaotic_good/frame.h b/src/core/ext/transport/chaotic_good/frame.h index a328c3c80ce..d29545e87c8 100644 --- a/src/core/ext/transport/chaotic_good/frame.h +++ b/src/core/ext/transport/chaotic_good/frame.h @@ -15,6 +15,8 @@ #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHAOTIC_GOOD_FRAME_H #define GRPC_SRC_CORE_EXT_TRANSPORT_CHAOTIC_GOOD_FRAME_H +#include + #include #include #include @@ -22,9 +24,6 @@ #include "absl/random/bit_gen_ref.h" #include "absl/status/status.h" #include "absl/types/variant.h" - -#include - #include "src/core/ext/transport/chaotic_good/frame_header.h" #include "src/core/ext/transport/chttp2/transport/hpack_encoder.h" #include "src/core/ext/transport/chttp2/transport/hpack_parser.h" diff --git a/src/core/ext/transport/chaotic_good/frame_header.cc b/src/core/ext/transport/chaotic_good/frame_header.cc index 903e4646419..7cc9a0d7b91 100644 --- a/src/core/ext/transport/chaotic_good/frame_header.cc +++ b/src/core/ext/transport/chaotic_good/frame_header.cc @@ -14,13 +14,13 @@ #include "src/core/ext/transport/chaotic_good/frame_header.h" +#include + #include #include "absl/status/status.h" #include "absl/strings/str_cat.h" -#include - namespace grpc_core { namespace chaotic_good { diff --git a/src/core/ext/transport/chaotic_good/frame_header.h b/src/core/ext/transport/chaotic_good/frame_header.h index 91a83eed4a8..202e8387441 100644 --- a/src/core/ext/transport/chaotic_good/frame_header.h +++ b/src/core/ext/transport/chaotic_good/frame_header.h @@ -15,14 +15,12 @@ #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHAOTIC_GOOD_FRAME_HEADER_H #define GRPC_SRC_CORE_EXT_TRANSPORT_CHAOTIC_GOOD_FRAME_HEADER_H +#include #include #include #include "absl/status/statusor.h" - -#include - #include "src/core/util/bitset.h" namespace grpc_core { diff --git a/src/core/ext/transport/chaotic_good/server/chaotic_good_server.cc b/src/core/ext/transport/chaotic_good/server/chaotic_good_server.cc index f5c8dc2d685..749a27155bd 100644 --- a/src/core/ext/transport/chaotic_good/server/chaotic_good_server.cc +++ b/src/core/ext/transport/chaotic_good/server/chaotic_good_server.cc @@ -14,6 +14,11 @@ #include "src/core/ext/transport/chaotic_good/server/chaotic_good_server.h" +#include +#include +#include +#include + #include #include #include @@ -26,12 +31,6 @@ #include "absl/random/bit_gen_ref.h" #include "absl/status/status.h" #include "absl/status/statusor.h" - -#include -#include -#include -#include - #include "src/core/ext/transport/chaotic_good/frame.h" #include "src/core/ext/transport/chaotic_good/frame_header.h" #include "src/core/ext/transport/chaotic_good/server_transport.h" diff --git a/src/core/ext/transport/chaotic_good/server/chaotic_good_server.h b/src/core/ext/transport/chaotic_good/server/chaotic_good_server.h index 167da14458d..8b555264aab 100644 --- a/src/core/ext/transport/chaotic_good/server/chaotic_good_server.h +++ b/src/core/ext/transport/chaotic_good/server/chaotic_good_server.h @@ -15,6 +15,9 @@ #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHAOTIC_GOOD_SERVER_CHAOTIC_GOOD_SERVER_H #define GRPC_SRC_CORE_EXT_TRANSPORT_CHAOTIC_GOOD_SERVER_CHAOTIC_GOOD_SERVER_H +#include +#include + #include #include #include @@ -25,10 +28,6 @@ #include "absl/random/random.h" #include "absl/status/status.h" #include "absl/status/statusor.h" - -#include -#include - #include "src/core/channelz/channelz.h" #include "src/core/ext/transport/chttp2/transport/hpack_encoder.h" #include "src/core/ext/transport/chttp2/transport/hpack_parser.h" diff --git a/src/core/ext/transport/chaotic_good/server_transport.cc b/src/core/ext/transport/chaotic_good/server_transport.cc index 492dee5c843..b166d79380f 100644 --- a/src/core/ext/transport/chaotic_good/server_transport.cc +++ b/src/core/ext/transport/chaotic_good/server_transport.cc @@ -14,6 +14,11 @@ #include "src/core/ext/transport/chaotic_good/server_transport.h" +#include +#include +#include +#include + #include #include #include @@ -24,12 +29,6 @@ #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" #include "src/core/ext/transport/chaotic_good/frame.h" #include "src/core/ext/transport/chaotic_good/frame_header.h" diff --git a/src/core/ext/transport/chaotic_good/server_transport.h b/src/core/ext/transport/chaotic_good/server_transport.h index d8244ab32fe..49fd5ae015f 100644 --- a/src/core/ext/transport/chaotic_good/server_transport.h +++ b/src/core/ext/transport/chaotic_good/server_transport.h @@ -15,6 +15,11 @@ #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHAOTIC_GOOD_SERVER_TRANSPORT_H #define GRPC_SRC_CORE_EXT_TRANSPORT_CHAOTIC_GOOD_SERVER_TRANSPORT_H +#include +#include +#include +#include +#include #include #include @@ -37,13 +42,6 @@ #include "absl/status/statusor.h" #include "absl/types/optional.h" #include "absl/types/variant.h" - -#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" diff --git a/src/core/ext/transport/chaotic_good/settings_metadata.cc b/src/core/ext/transport/chaotic_good/settings_metadata.cc index 3d952be719a..a3b8c5642d3 100644 --- a/src/core/ext/transport/chaotic_good/settings_metadata.cc +++ b/src/core/ext/transport/chaotic_good/settings_metadata.cc @@ -14,10 +14,9 @@ #include "src/core/ext/transport/chaotic_good/settings_metadata.h" -#include "absl/status/status.h" - #include +#include "absl/status/status.h" #include "src/core/util/crash.h" namespace grpc_core { diff --git a/src/core/ext/transport/chaotic_good/settings_metadata.h b/src/core/ext/transport/chaotic_good/settings_metadata.h index fab73696446..81b5fca4f21 100644 --- a/src/core/ext/transport/chaotic_good/settings_metadata.h +++ b/src/core/ext/transport/chaotic_good/settings_metadata.h @@ -15,10 +15,9 @@ #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHAOTIC_GOOD_SETTINGS_METADATA_H #define GRPC_SRC_CORE_EXT_TRANSPORT_CHAOTIC_GOOD_SETTINGS_METADATA_H -#include "absl/types/optional.h" - #include +#include "absl/types/optional.h" #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/transport/metadata_batch.h" diff --git a/src/core/ext/transport/chttp2/alpn/alpn.cc b/src/core/ext/transport/chttp2/alpn/alpn.cc index 75f17402335..cd6119f4782 100644 --- a/src/core/ext/transport/chttp2/alpn/alpn.cc +++ b/src/core/ext/transport/chttp2/alpn/alpn.cc @@ -18,10 +18,9 @@ #include "src/core/ext/transport/chttp2/alpn/alpn.h" -#include "absl/log/check.h" - #include +#include "absl/log/check.h" #include "src/core/util/useful.h" // in order of preference diff --git a/src/core/ext/transport/chttp2/alpn/alpn.h b/src/core/ext/transport/chttp2/alpn/alpn.h index 9c381f8b3b2..09135e90ae2 100644 --- a/src/core/ext/transport/chttp2/alpn/alpn.h +++ b/src/core/ext/transport/chttp2/alpn/alpn.h @@ -19,9 +19,8 @@ #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_ALPN_ALPN_H #define GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_ALPN_ALPN_H -#include - #include +#include // Returns 1 if the version is supported, 0 otherwise. int grpc_chttp2_is_alpn_version_supported(const char* version, size_t size); diff --git a/src/core/ext/transport/chttp2/client/chttp2_connector.cc b/src/core/ext/transport/chttp2/client/chttp2_connector.cc index 2f6e070ae6a..0223539a450 100644 --- a/src/core/ext/transport/chttp2/client/chttp2_connector.cc +++ b/src/core/ext/transport/chttp2/client/chttp2_connector.cc @@ -18,6 +18,14 @@ #include "src/core/ext/transport/chttp2/client/chttp2_connector.h" +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -29,16 +37,6 @@ #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/str_format.h" - -#include -#include -#include -#include -#include -#include -#include -#include - #include "src/core/channelz/channelz.h" #include "src/core/client_channel/client_channel_factory.h" #include "src/core/client_channel/client_channel_filter.h" diff --git a/src/core/ext/transport/chttp2/client/chttp2_connector.h b/src/core/ext/transport/chttp2/client/chttp2_connector.h index 4c7eaa614da..800e08a8ec1 100644 --- a/src/core/ext/transport/chttp2/client/chttp2_connector.h +++ b/src/core/ext/transport/chttp2/client/chttp2_connector.h @@ -19,12 +19,11 @@ #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_CLIENT_CHTTP2_CONNECTOR_H #define GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_CLIENT_CHTTP2_CONNECTOR_H -#include "absl/base/thread_annotations.h" -#include "absl/types/optional.h" - #include #include +#include "absl/base/thread_annotations.h" +#include "absl/types/optional.h" #include "src/core/client_channel/connector.h" #include "src/core/handshaker/handshaker.h" #include "src/core/lib/iomgr/closure.h" diff --git a/src/core/ext/transport/chttp2/server/chttp2_server.cc b/src/core/ext/transport/chttp2/server/chttp2_server.cc index ac0562c4117..0486f7e3bf5 100644 --- a/src/core/ext/transport/chttp2/server/chttp2_server.cc +++ b/src/core/ext/transport/chttp2/server/chttp2_server.cc @@ -18,6 +18,14 @@ #include "src/core/ext/transport/chttp2/server/chttp2_server.h" +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -38,16 +46,6 @@ #include "absl/strings/string_view.h" #include "absl/strings/strip.h" #include "absl/types/optional.h" - -#include -#include -#include -#include -#include -#include -#include -#include - #include "src/core/channelz/channelz.h" #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" #include "src/core/ext/transport/chttp2/transport/internal.h" diff --git a/src/core/ext/transport/chttp2/server/chttp2_server.h b/src/core/ext/transport/chttp2/server/chttp2_server.h index 25d38236aed..0ecbf39e745 100644 --- a/src/core/ext/transport/chttp2/server/chttp2_server.h +++ b/src/core/ext/transport/chttp2/server/chttp2_server.h @@ -19,11 +19,11 @@ #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_SERVER_CHTTP2_SERVER_H #define GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_SERVER_CHTTP2_SERVER_H -#include - #include #include +#include + #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/iomgr/error.h" #include "src/core/server/server.h" diff --git a/src/core/ext/transport/chttp2/transport/.clang-format b/src/core/ext/transport/chttp2/transport/.clang-format deleted file mode 100644 index 5f150ef6edb..00000000000 --- a/src/core/ext/transport/chttp2/transport/.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/src/core/ext/transport/chttp2/transport/bin_decoder.cc b/src/core/ext/transport/chttp2/transport/bin_decoder.cc index 8d00da86e59..d996de7315e 100644 --- a/src/core/ext/transport/chttp2/transport/bin_decoder.cc +++ b/src/core/ext/transport/chttp2/transport/bin_decoder.cc @@ -18,13 +18,12 @@ #include "src/core/ext/transport/chttp2/transport/bin_decoder.h" -#include "absl/base/attributes.h" -#include "absl/log/check.h" -#include "absl/log/log.h" - #include #include +#include "absl/base/attributes.h" +#include "absl/log/check.h" +#include "absl/log/log.h" #include "src/core/lib/slice/slice.h" static uint8_t decode_table[] = { diff --git a/src/core/ext/transport/chttp2/transport/bin_decoder.h b/src/core/ext/transport/chttp2/transport/bin_decoder.h index fc87450d365..4af97f54907 100644 --- a/src/core/ext/transport/chttp2/transport/bin_decoder.h +++ b/src/core/ext/transport/chttp2/transport/bin_decoder.h @@ -19,11 +19,10 @@ #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_BIN_DECODER_H #define GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_BIN_DECODER_H -#include -#include - #include #include +#include +#include struct grpc_base64_decode_context { // input/output: diff --git a/src/core/ext/transport/chttp2/transport/bin_encoder.cc b/src/core/ext/transport/chttp2/transport/bin_encoder.cc index 4063d1d5491..8a6b3670ce1 100644 --- a/src/core/ext/transport/chttp2/transport/bin_encoder.cc +++ b/src/core/ext/transport/chttp2/transport/bin_encoder.cc @@ -18,13 +18,11 @@ #include "src/core/ext/transport/chttp2/transport/bin_encoder.h" +#include #include #include #include "absl/log/check.h" - -#include - #include "src/core/ext/transport/chttp2/transport/huffsyms.h" static const char alphabet[] = diff --git a/src/core/ext/transport/chttp2/transport/bin_encoder.h b/src/core/ext/transport/chttp2/transport/bin_encoder.h index fbada017abc..5e561036f8f 100644 --- a/src/core/ext/transport/chttp2/transport/bin_encoder.h +++ b/src/core/ext/transport/chttp2/transport/bin_encoder.h @@ -19,10 +19,9 @@ #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_BIN_ENCODER_H #define GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_BIN_ENCODER_H -#include - #include #include +#include // base64 encode a slice. Returns a new slice, does not take ownership of the // input diff --git a/src/core/ext/transport/chttp2/transport/chttp2_transport.cc b/src/core/ext/transport/chttp2/transport/chttp2_transport.cc index 4087efcf6dd..61c560e0d21 100644 --- a/src/core/ext/transport/chttp2/transport/chttp2_transport.cc +++ b/src/core/ext/transport/chttp2/transport/chttp2_transport.cc @@ -16,6 +16,15 @@ #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include @@ -45,17 +54,6 @@ #include "absl/strings/string_view.h" #include "absl/types/optional.h" #include "absl/types/variant.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include - #include "src/core/ext/transport/chttp2/transport/call_tracer_wrapper.h" #include "src/core/ext/transport/chttp2/transport/context_list_entry.h" #include "src/core/ext/transport/chttp2/transport/flow_control.h" diff --git a/src/core/ext/transport/chttp2/transport/chttp2_transport.h b/src/core/ext/transport/chttp2/transport/chttp2_transport.h index c832da4ed9e..011eeae1a0c 100644 --- a/src/core/ext/transport/chttp2/transport/chttp2_transport.h +++ b/src/core/ext/transport/chttp2/transport/chttp2_transport.h @@ -19,14 +19,13 @@ #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_CHTTP2_TRANSPORT_H #define GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_CHTTP2_TRANSPORT_H +#include +#include + #include #include #include "absl/types/optional.h" - -#include -#include - #include "src/core/channelz/channelz.h" #include "src/core/ext/transport/chttp2/transport/flow_control.h" #include "src/core/lib/channel/channel_args.h" diff --git a/src/core/ext/transport/chttp2/transport/context_list_entry.h b/src/core/ext/transport/chttp2/transport/context_list_entry.h index 8d64b321aef..583e8ed522f 100644 --- a/src/core/ext/transport/chttp2/transport/context_list_entry.h +++ b/src/core/ext/transport/chttp2/transport/context_list_entry.h @@ -19,6 +19,7 @@ #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_CONTEXT_LIST_ENTRY_H #define GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_CONTEXT_LIST_ENTRY_H +#include #include #include @@ -26,8 +27,6 @@ #include #include -#include - #include "src/core/telemetry/tcp_tracer.h" namespace grpc_core { diff --git a/src/core/ext/transport/chttp2/transport/decode_huff.h b/src/core/ext/transport/chttp2/transport/decode_huff.h index 2562f9d0d97..21f087585c0 100644 --- a/src/core/ext/transport/chttp2/transport/decode_huff.h +++ b/src/core/ext/transport/chttp2/transport/decode_huff.h @@ -17,10 +17,10 @@ #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_DECODE_HUFF_H #define GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_DECODE_HUFF_H +#include + #include #include - -#include namespace grpc_core { class HuffDecoderCommon { protected: diff --git a/src/core/ext/transport/chttp2/transport/flow_control.cc b/src/core/ext/transport/chttp2/transport/flow_control.cc index c80fdd83073..b65ab0e12a5 100644 --- a/src/core/ext/transport/chttp2/transport/flow_control.cc +++ b/src/core/ext/transport/chttp2/transport/flow_control.cc @@ -18,6 +18,7 @@ #include "src/core/ext/transport/chttp2/transport/flow_control.h" +#include #include #include @@ -32,9 +33,6 @@ #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" #include "absl/strings/str_join.h" - -#include - #include "src/core/ext/transport/chttp2/transport/http2_settings.h" #include "src/core/lib/experiments/experiments.h" #include "src/core/lib/resource_quota/memory_quota.h" diff --git a/src/core/ext/transport/chttp2/transport/flow_control.h b/src/core/ext/transport/chttp2/transport/flow_control.h index d3f1202a217..c7050b99daf 100644 --- a/src/core/ext/transport/chttp2/transport/flow_control.h +++ b/src/core/ext/transport/chttp2/transport/flow_control.h @@ -19,6 +19,7 @@ #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_FLOW_CONTROL_H #define GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_FLOW_CONTROL_H +#include #include #include @@ -31,9 +32,6 @@ #include "absl/status/status.h" #include "absl/strings/string_view.h" #include "absl/types/optional.h" - -#include - #include "src/core/ext/transport/chttp2/transport/http2_settings.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/resource_quota/memory_quota.h" diff --git a/src/core/ext/transport/chttp2/transport/frame.cc b/src/core/ext/transport/chttp2/transport/frame.cc index 65bb1660248..cd9093f94a9 100644 --- a/src/core/ext/transport/chttp2/transport/frame.cc +++ b/src/core/ext/transport/chttp2/transport/frame.cc @@ -14,6 +14,7 @@ #include "src/core/ext/transport/chttp2/transport/frame.h" +#include #include #include @@ -22,9 +23,6 @@ #include "absl/log/check.h" #include "absl/status/status.h" #include "absl/strings/str_cat.h" - -#include - #include "src/core/util/crash.h" namespace grpc_core { diff --git a/src/core/ext/transport/chttp2/transport/frame.h b/src/core/ext/transport/chttp2/transport/frame.h index ac6b9e771dd..ccefc083f92 100644 --- a/src/core/ext/transport/chttp2/transport/frame.h +++ b/src/core/ext/transport/chttp2/transport/frame.h @@ -15,6 +15,8 @@ #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_FRAME_H #define GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_FRAME_H +#include + #include #include #include @@ -23,9 +25,6 @@ #include "absl/strings/string_view.h" #include "absl/types/span.h" #include "absl/types/variant.h" - -#include - #include "src/core/lib/slice/slice.h" #include "src/core/lib/slice/slice_buffer.h" diff --git a/src/core/ext/transport/chttp2/transport/frame_data.cc b/src/core/ext/transport/chttp2/transport/frame_data.cc index b5bd13d2fc0..d03e47fa71d 100644 --- a/src/core/ext/transport/chttp2/transport/frame_data.cc +++ b/src/core/ext/transport/chttp2/transport/frame_data.cc @@ -18,15 +18,13 @@ #include "src/core/ext/transport/chttp2/transport/frame_data.h" +#include +#include #include #include "absl/log/check.h" #include "absl/status/status.h" #include "absl/strings/str_format.h" - -#include -#include - #include "src/core/ext/transport/chttp2/transport/call_tracer_wrapper.h" #include "src/core/ext/transport/chttp2/transport/internal.h" #include "src/core/lib/experiments/experiments.h" diff --git a/src/core/ext/transport/chttp2/transport/frame_data.h b/src/core/ext/transport/chttp2/transport/frame_data.h index eae1f439c3d..e107b740f89 100644 --- a/src/core/ext/transport/chttp2/transport/frame_data.h +++ b/src/core/ext/transport/chttp2/transport/frame_data.h @@ -21,13 +21,11 @@ // Parser for GRPC streams embedded in DATA frames -#include - -#include "absl/status/status.h" - #include #include +#include +#include "absl/status/status.h" #include "src/core/ext/transport/chttp2/transport/legacy_frame.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/promise/poll.h" diff --git a/src/core/ext/transport/chttp2/transport/frame_goaway.cc b/src/core/ext/transport/chttp2/transport/frame_goaway.cc index 31e7c76ba39..36873e862e3 100644 --- a/src/core/ext/transport/chttp2/transport/frame_goaway.cc +++ b/src/core/ext/transport/chttp2/transport/frame_goaway.cc @@ -18,6 +18,9 @@ #include "src/core/ext/transport/chttp2/transport/frame_goaway.h" +#include +#include +#include #include #include "absl/base/attributes.h" @@ -25,11 +28,6 @@ #include "absl/status/status.h" #include "absl/strings/str_format.h" #include "absl/strings/string_view.h" - -#include -#include -#include - #include "src/core/ext/transport/chttp2/transport/internal.h" void grpc_chttp2_goaway_parser_init(grpc_chttp2_goaway_parser* p) { diff --git a/src/core/ext/transport/chttp2/transport/frame_goaway.h b/src/core/ext/transport/chttp2/transport/frame_goaway.h index 40f132721e7..a455f06c24f 100644 --- a/src/core/ext/transport/chttp2/transport/frame_goaway.h +++ b/src/core/ext/transport/chttp2/transport/frame_goaway.h @@ -19,10 +19,9 @@ #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_FRAME_GOAWAY_H #define GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_FRAME_GOAWAY_H -#include - #include #include +#include #include "src/core/ext/transport/chttp2/transport/legacy_frame.h" #include "src/core/lib/iomgr/error.h" diff --git a/src/core/ext/transport/chttp2/transport/frame_ping.cc b/src/core/ext/transport/chttp2/transport/frame_ping.cc index 7b7b080e320..2db29ee7ef6 100644 --- a/src/core/ext/transport/chttp2/transport/frame_ping.cc +++ b/src/core/ext/transport/chttp2/transport/frame_ping.cc @@ -18,6 +18,8 @@ #include "src/core/ext/transport/chttp2/transport/frame_ping.h" +#include +#include #include #include @@ -28,10 +30,6 @@ #include "absl/log/log.h" #include "absl/status/status.h" #include "absl/strings/str_format.h" - -#include -#include - #include "src/core/ext/transport/chttp2/transport/internal.h" #include "src/core/ext/transport/chttp2/transport/ping_abuse_policy.h" #include "src/core/ext/transport/chttp2/transport/ping_callbacks.h" diff --git a/src/core/ext/transport/chttp2/transport/frame_ping.h b/src/core/ext/transport/chttp2/transport/frame_ping.h index 6f4cd55ff41..a785a9dfa35 100644 --- a/src/core/ext/transport/chttp2/transport/frame_ping.h +++ b/src/core/ext/transport/chttp2/transport/frame_ping.h @@ -19,10 +19,9 @@ #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_FRAME_PING_H #define GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_FRAME_PING_H -#include - #include #include +#include #include "src/core/ext/transport/chttp2/transport/legacy_frame.h" #include "src/core/lib/iomgr/error.h" diff --git a/src/core/ext/transport/chttp2/transport/frame_rst_stream.cc b/src/core/ext/transport/chttp2/transport/frame_rst_stream.cc index 0e38b36c05c..0378d6773c0 100644 --- a/src/core/ext/transport/chttp2/transport/frame_rst_stream.cc +++ b/src/core/ext/transport/chttp2/transport/frame_rst_stream.cc @@ -18,6 +18,8 @@ #include "src/core/ext/transport/chttp2/transport/frame_rst_stream.h" +#include +#include #include #include "absl/log/check.h" @@ -26,10 +28,6 @@ #include "absl/status/status.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" - -#include -#include - #include "src/core/ext/transport/chttp2/transport/call_tracer_wrapper.h" #include "src/core/ext/transport/chttp2/transport/internal.h" #include "src/core/ext/transport/chttp2/transport/legacy_frame.h" diff --git a/src/core/ext/transport/chttp2/transport/frame_rst_stream.h b/src/core/ext/transport/chttp2/transport/frame_rst_stream.h index 0e8e74b62a2..d55ab2831d0 100644 --- a/src/core/ext/transport/chttp2/transport/frame_rst_stream.h +++ b/src/core/ext/transport/chttp2/transport/frame_rst_stream.h @@ -19,10 +19,9 @@ #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_FRAME_RST_STREAM_H #define GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_FRAME_RST_STREAM_H -#include - #include #include +#include #include "src/core/ext/transport/chttp2/transport/legacy_frame.h" #include "src/core/lib/iomgr/error.h" diff --git a/src/core/ext/transport/chttp2/transport/frame_settings.cc b/src/core/ext/transport/chttp2/transport/frame_settings.cc index 817097a57b2..84dafd73827 100644 --- a/src/core/ext/transport/chttp2/transport/frame_settings.cc +++ b/src/core/ext/transport/chttp2/transport/frame_settings.cc @@ -18,6 +18,8 @@ #include "src/core/ext/transport/chttp2/transport/frame_settings.h" +#include +#include #include #include @@ -26,10 +28,6 @@ #include "absl/log/log.h" #include "absl/status/status.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/frame_goaway.h" #include "src/core/ext/transport/chttp2/transport/http2_settings.h" diff --git a/src/core/ext/transport/chttp2/transport/frame_settings.h b/src/core/ext/transport/chttp2/transport/frame_settings.h index 011862f5888..b5480b64029 100644 --- a/src/core/ext/transport/chttp2/transport/frame_settings.h +++ b/src/core/ext/transport/chttp2/transport/frame_settings.h @@ -19,11 +19,10 @@ #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_FRAME_SETTINGS_H #define GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_FRAME_SETTINGS_H -#include -#include - #include #include +#include +#include #include "src/core/ext/transport/chttp2/transport/http2_settings.h" #include "src/core/ext/transport/chttp2/transport/legacy_frame.h" diff --git a/src/core/ext/transport/chttp2/transport/frame_window_update.cc b/src/core/ext/transport/chttp2/transport/frame_window_update.cc index 5209ab2899a..47db0a03941 100644 --- a/src/core/ext/transport/chttp2/transport/frame_window_update.cc +++ b/src/core/ext/transport/chttp2/transport/frame_window_update.cc @@ -18,15 +18,13 @@ #include "src/core/ext/transport/chttp2/transport/frame_window_update.h" +#include #include #include "absl/log/check.h" #include "absl/status/status.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" - -#include - #include "src/core/ext/transport/chttp2/transport/call_tracer_wrapper.h" #include "src/core/ext/transport/chttp2/transport/flow_control.h" #include "src/core/ext/transport/chttp2/transport/internal.h" diff --git a/src/core/ext/transport/chttp2/transport/frame_window_update.h b/src/core/ext/transport/chttp2/transport/frame_window_update.h index 53c5f41d3db..c1c8f6e8251 100644 --- a/src/core/ext/transport/chttp2/transport/frame_window_update.h +++ b/src/core/ext/transport/chttp2/transport/frame_window_update.h @@ -19,10 +19,9 @@ #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_FRAME_WINDOW_UPDATE_H #define GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_FRAME_WINDOW_UPDATE_H -#include - #include #include +#include #include "src/core/ext/transport/chttp2/transport/legacy_frame.h" #include "src/core/lib/iomgr/error.h" diff --git a/src/core/ext/transport/chttp2/transport/hpack_constants.h b/src/core/ext/transport/chttp2/transport/hpack_constants.h index 739c57ba3e3..d709e0ba278 100644 --- a/src/core/ext/transport/chttp2/transport/hpack_constants.h +++ b/src/core/ext/transport/chttp2/transport/hpack_constants.h @@ -15,11 +15,11 @@ #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_HPACK_CONSTANTS_H #define GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_HPACK_CONSTANTS_H +#include + #include #include -#include - namespace grpc_core { namespace hpack_constants { // Per entry overhead bytes as per the spec diff --git a/src/core/ext/transport/chttp2/transport/hpack_encoder.cc b/src/core/ext/transport/chttp2/transport/hpack_encoder.cc index 5c573a0beb6..1ae3db3d609 100644 --- a/src/core/ext/transport/chttp2/transport/hpack_encoder.cc +++ b/src/core/ext/transport/chttp2/transport/hpack_encoder.cc @@ -18,16 +18,15 @@ #include "src/core/ext/transport/chttp2/transport/hpack_encoder.h" +#include +#include +#include + #include #include #include "absl/log/check.h" #include "absl/log/log.h" - -#include -#include -#include - #include "src/core/ext/transport/chttp2/transport/bin_encoder.h" #include "src/core/ext/transport/chttp2/transport/hpack_constants.h" #include "src/core/ext/transport/chttp2/transport/hpack_encoder_table.h" diff --git a/src/core/ext/transport/chttp2/transport/hpack_encoder.h b/src/core/ext/transport/chttp2/transport/hpack_encoder.h index 1dab0871ff2..4695089b01a 100644 --- a/src/core/ext/transport/chttp2/transport/hpack_encoder.h +++ b/src/core/ext/transport/chttp2/transport/hpack_encoder.h @@ -19,6 +19,8 @@ #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_HPACK_ENCODER_H #define GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_HPACK_ENCODER_H +#include +#include #include #include @@ -29,10 +31,6 @@ #include "absl/strings/match.h" #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" - -#include -#include - #include "src/core/ext/transport/chttp2/transport/hpack_constants.h" #include "src/core/ext/transport/chttp2/transport/hpack_encoder_table.h" #include "src/core/lib/slice/slice.h" diff --git a/src/core/ext/transport/chttp2/transport/hpack_encoder_table.cc b/src/core/ext/transport/chttp2/transport/hpack_encoder_table.cc index 143781dca32..2947587c7a6 100644 --- a/src/core/ext/transport/chttp2/transport/hpack_encoder_table.cc +++ b/src/core/ext/transport/chttp2/transport/hpack_encoder_table.cc @@ -14,12 +14,12 @@ #include "src/core/ext/transport/chttp2/transport/hpack_encoder_table.h" +#include + #include #include "absl/log/check.h" -#include - namespace grpc_core { uint32_t HPackEncoderTable::AllocateIndex(size_t element_size) { diff --git a/src/core/ext/transport/chttp2/transport/hpack_encoder_table.h b/src/core/ext/transport/chttp2/transport/hpack_encoder_table.h index 1bde664d0fd..f68e2995b2b 100644 --- a/src/core/ext/transport/chttp2/transport/hpack_encoder_table.h +++ b/src/core/ext/transport/chttp2/transport/hpack_encoder_table.h @@ -15,14 +15,13 @@ #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_HPACK_ENCODER_TABLE_H #define GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_HPACK_ENCODER_TABLE_H +#include #include #include #include #include -#include - #include "src/core/ext/transport/chttp2/transport/hpack_constants.h" namespace grpc_core { diff --git a/src/core/ext/transport/chttp2/transport/hpack_parse_result.cc b/src/core/ext/transport/chttp2/transport/hpack_parse_result.cc index aa4b69623ad..ffead9117a9 100644 --- a/src/core/ext/transport/chttp2/transport/hpack_parse_result.cc +++ b/src/core/ext/transport/chttp2/transport/hpack_parse_result.cc @@ -14,13 +14,11 @@ #include "src/core/ext/transport/chttp2/transport/hpack_parse_result.h" +#include #include #include "absl/log/check.h" #include "absl/strings/str_format.h" - -#include - #include "src/core/ext/transport/chttp2/transport/hpack_constants.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/slice/slice.h" diff --git a/src/core/ext/transport/chttp2/transport/hpack_parse_result.h b/src/core/ext/transport/chttp2/transport/hpack_parse_result.h index 628b3327f5b..6aea73bc5b7 100644 --- a/src/core/ext/transport/chttp2/transport/hpack_parse_result.h +++ b/src/core/ext/transport/chttp2/transport/hpack_parse_result.h @@ -15,6 +15,7 @@ #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_HPACK_PARSE_RESULT_H #define GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_HPACK_PARSE_RESULT_H +#include #include #include @@ -26,9 +27,6 @@ #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" #include "absl/types/optional.h" - -#include - #include "src/core/lib/surface/validate_metadata.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/util/crash.h" diff --git a/src/core/ext/transport/chttp2/transport/hpack_parser.cc b/src/core/ext/transport/chttp2/transport/hpack_parser.cc index fb2e9b301a9..82d249f2ce0 100644 --- a/src/core/ext/transport/chttp2/transport/hpack_parser.cc +++ b/src/core/ext/transport/chttp2/transport/hpack_parser.cc @@ -18,6 +18,8 @@ #include "src/core/ext/transport/chttp2/transport/hpack_parser.h" +#include +#include #include #include @@ -36,10 +38,6 @@ #include "absl/types/optional.h" #include "absl/types/span.h" #include "absl/types/variant.h" - -#include -#include - #include "src/core/ext/transport/chttp2/transport/decode_huff.h" #include "src/core/ext/transport/chttp2/transport/hpack_constants.h" #include "src/core/ext/transport/chttp2/transport/hpack_parse_result.h" diff --git a/src/core/ext/transport/chttp2/transport/hpack_parser.h b/src/core/ext/transport/chttp2/transport/hpack_parser.h index af2c1a9c7f0..5417c9e0213 100644 --- a/src/core/ext/transport/chttp2/transport/hpack_parser.h +++ b/src/core/ext/transport/chttp2/transport/hpack_parser.h @@ -19,6 +19,8 @@ #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_HPACK_PARSER_H #define GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_HPACK_PARSER_H +#include +#include #include #include @@ -32,10 +34,6 @@ #include "absl/types/optional.h" #include "absl/types/span.h" #include "absl/types/variant.h" - -#include -#include - #include "src/core/ext/transport/chttp2/transport/hpack_parse_result.h" #include "src/core/ext/transport/chttp2/transport/hpack_parser_table.h" #include "src/core/ext/transport/chttp2/transport/legacy_frame.h" diff --git a/src/core/ext/transport/chttp2/transport/hpack_parser_table.cc b/src/core/ext/transport/chttp2/transport/hpack_parser_table.cc index 7a0b7bd8498..b258e6ead09 100644 --- a/src/core/ext/transport/chttp2/transport/hpack_parser_table.cc +++ b/src/core/ext/transport/chttp2/transport/hpack_parser_table.cc @@ -18,6 +18,7 @@ #include "src/core/ext/transport/chttp2/transport/hpack_parser_table.h" +#include #include #include @@ -30,9 +31,6 @@ #include "absl/status/status.h" #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" - -#include - #include "src/core/ext/transport/chttp2/transport/hpack_constants.h" #include "src/core/ext/transport/chttp2/transport/hpack_parse_result.h" #include "src/core/lib/debug/trace.h" diff --git a/src/core/ext/transport/chttp2/transport/hpack_parser_table.h b/src/core/ext/transport/chttp2/transport/hpack_parser_table.h index 2d790bb2e21..1ccb0808c43 100644 --- a/src/core/ext/transport/chttp2/transport/hpack_parser_table.h +++ b/src/core/ext/transport/chttp2/transport/hpack_parser_table.h @@ -19,6 +19,7 @@ #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_HPACK_PARSER_TABLE_H #define GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_HPACK_PARSER_TABLE_H +#include #include #include @@ -28,9 +29,6 @@ #include #include "absl/functional/function_ref.h" - -#include - #include "src/core/ext/transport/chttp2/transport/hpack_constants.h" #include "src/core/ext/transport/chttp2/transport/hpack_parse_result.h" #include "src/core/lib/transport/metadata_batch.h" diff --git a/src/core/ext/transport/chttp2/transport/http2_settings.cc b/src/core/ext/transport/chttp2/transport/http2_settings.cc index ac9c1553301..83bf6e5c5d8 100644 --- a/src/core/ext/transport/chttp2/transport/http2_settings.cc +++ b/src/core/ext/transport/chttp2/transport/http2_settings.cc @@ -20,10 +20,9 @@ #include "src/core/ext/transport/chttp2/transport/http2_settings.h" -#include "absl/strings/str_cat.h" - #include +#include "absl/strings/str_cat.h" #include "src/core/ext/transport/chttp2/transport/frame.h" #include "src/core/lib/transport/http2_errors.h" #include "src/core/util/useful.h" diff --git a/src/core/ext/transport/chttp2/transport/http2_settings.h b/src/core/ext/transport/chttp2/transport/http2_settings.h index b5debf96c7e..44ed672d123 100644 --- a/src/core/ext/transport/chttp2/transport/http2_settings.h +++ b/src/core/ext/transport/chttp2/transport/http2_settings.h @@ -17,6 +17,7 @@ #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_HTTP2_SETTINGS_H #define GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_HTTP2_SETTINGS_H +#include #include #include @@ -24,9 +25,6 @@ #include "absl/functional/function_ref.h" #include "absl/strings/string_view.h" #include "absl/types/optional.h" - -#include - #include "src/core/ext/transport/chttp2/transport/frame.h" #include "src/core/lib/transport/http2_errors.h" #include "src/core/util/useful.h" diff --git a/src/core/ext/transport/chttp2/transport/internal.h b/src/core/ext/transport/chttp2/transport/internal.h index 76deea4f043..afe319b81a2 100644 --- a/src/core/ext/transport/chttp2/transport/internal.h +++ b/src/core/ext/transport/chttp2/transport/internal.h @@ -19,6 +19,12 @@ #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_INTERNAL_H #define GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_INTERNAL_H +#include +#include +#include +#include +#include +#include #include #include @@ -32,14 +38,6 @@ #include "absl/strings/string_view.h" #include "absl/types/optional.h" #include "absl/types/variant.h" - -#include -#include -#include -#include -#include -#include - #include "src/core/channelz/channelz.h" #include "src/core/ext/transport/chttp2/transport/call_tracer_wrapper.h" #include "src/core/ext/transport/chttp2/transport/context_list_entry.h" diff --git a/src/core/ext/transport/chttp2/transport/parsing.cc b/src/core/ext/transport/chttp2/transport/parsing.cc index e9d746d8e24..7fa290db466 100644 --- a/src/core/ext/transport/chttp2/transport/parsing.cc +++ b/src/core/ext/transport/chttp2/transport/parsing.cc @@ -16,6 +16,10 @@ // // +#include +#include +#include +#include #include #include @@ -36,12 +40,6 @@ #include "absl/strings/str_format.h" #include "absl/strings/string_view.h" #include "absl/types/variant.h" - -#include -#include -#include -#include - #include "src/core/channelz/channelz.h" #include "src/core/ext/transport/chttp2/transport/call_tracer_wrapper.h" #include "src/core/ext/transport/chttp2/transport/flow_control.h" diff --git a/src/core/ext/transport/chttp2/transport/ping_abuse_policy.cc b/src/core/ext/transport/chttp2/transport/ping_abuse_policy.cc index d1f371537f7..e2652964058 100644 --- a/src/core/ext/transport/chttp2/transport/ping_abuse_policy.cc +++ b/src/core/ext/transport/chttp2/transport/ping_abuse_policy.cc @@ -14,14 +14,14 @@ #include "src/core/ext/transport/chttp2/transport/ping_abuse_policy.h" +#include +#include + #include #include "absl/strings/str_cat.h" #include "absl/types/optional.h" -#include -#include - namespace grpc_core { namespace { diff --git a/src/core/ext/transport/chttp2/transport/ping_abuse_policy.h b/src/core/ext/transport/chttp2/transport/ping_abuse_policy.h index bff04089822..22e6b03b778 100644 --- a/src/core/ext/transport/chttp2/transport/ping_abuse_policy.h +++ b/src/core/ext/transport/chttp2/transport/ping_abuse_policy.h @@ -15,10 +15,10 @@ #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_PING_ABUSE_POLICY_H #define GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_PING_ABUSE_POLICY_H -#include - #include +#include + #include "src/core/lib/channel/channel_args.h" #include "src/core/util/time.h" diff --git a/src/core/ext/transport/chttp2/transport/ping_callbacks.cc b/src/core/ext/transport/chttp2/transport/ping_callbacks.cc index 4bd16e1fbb4..ff473e59630 100644 --- a/src/core/ext/transport/chttp2/transport/ping_callbacks.cc +++ b/src/core/ext/transport/chttp2/transport/ping_callbacks.cc @@ -14,14 +14,14 @@ #include "src/core/ext/transport/chttp2/transport/ping_callbacks.h" +#include + #include #include "absl/log/check.h" #include "absl/meta/type_traits.h" #include "absl/random/distributions.h" -#include - namespace grpc_core { void Chttp2PingCallbacks::OnPing(Callback on_start, Callback on_ack) { diff --git a/src/core/ext/transport/chttp2/transport/ping_callbacks.h b/src/core/ext/transport/chttp2/transport/ping_callbacks.h index 1e558eda836..deae3da479f 100644 --- a/src/core/ext/transport/chttp2/transport/ping_callbacks.h +++ b/src/core/ext/transport/chttp2/transport/ping_callbacks.h @@ -15,6 +15,8 @@ #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_PING_CALLBACKS_H #define GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_PING_CALLBACKS_H +#include +#include #include #include @@ -26,10 +28,6 @@ #include "absl/hash/hash.h" #include "absl/random/bit_gen_ref.h" #include "absl/types/optional.h" - -#include -#include - #include "src/core/lib/debug/trace.h" #include "src/core/util/time.h" diff --git a/src/core/ext/transport/chttp2/transport/ping_rate_policy.cc b/src/core/ext/transport/chttp2/transport/ping_rate_policy.cc index 6f329735306..b895e518202 100644 --- a/src/core/ext/transport/chttp2/transport/ping_rate_policy.cc +++ b/src/core/ext/transport/chttp2/transport/ping_rate_policy.cc @@ -14,15 +14,14 @@ #include "src/core/ext/transport/chttp2/transport/ping_rate_policy.h" +#include +#include + #include #include #include "absl/strings/str_cat.h" #include "absl/types/optional.h" - -#include -#include - #include "src/core/lib/experiments/experiments.h" #include "src/core/util/match.h" diff --git a/src/core/ext/transport/chttp2/transport/ping_rate_policy.h b/src/core/ext/transport/chttp2/transport/ping_rate_policy.h index df16b3813bc..b49d5323a43 100644 --- a/src/core/ext/transport/chttp2/transport/ping_rate_policy.h +++ b/src/core/ext/transport/chttp2/transport/ping_rate_policy.h @@ -15,15 +15,13 @@ #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_PING_RATE_POLICY_H #define GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_PING_RATE_POLICY_H +#include #include #include #include #include "absl/types/variant.h" - -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/util/time.h" diff --git a/src/core/ext/transport/chttp2/transport/stream_lists.cc b/src/core/ext/transport/chttp2/transport/stream_lists.cc index 14039a614b7..2bf7daa04f7 100644 --- a/src/core/ext/transport/chttp2/transport/stream_lists.cc +++ b/src/core/ext/transport/chttp2/transport/stream_lists.cc @@ -18,11 +18,10 @@ #include "src/core/ext/transport/chttp2/transport/stream_lists.h" -#include "absl/log/check.h" -#include "absl/log/log.h" - #include +#include "absl/log/check.h" +#include "absl/log/log.h" #include "src/core/ext/transport/chttp2/transport/internal.h" #include "src/core/ext/transport/chttp2/transport/legacy_frame.h" #include "src/core/lib/debug/trace.h" diff --git a/src/core/ext/transport/chttp2/transport/varint.cc b/src/core/ext/transport/chttp2/transport/varint.cc index 7af77e772be..1db7d67c06f 100644 --- a/src/core/ext/transport/chttp2/transport/varint.cc +++ b/src/core/ext/transport/chttp2/transport/varint.cc @@ -18,10 +18,10 @@ #include "src/core/ext/transport/chttp2/transport/varint.h" -#include "absl/base/attributes.h" - #include +#include "absl/base/attributes.h" + namespace grpc_core { size_t VarintLength(size_t tail_value) { diff --git a/src/core/ext/transport/chttp2/transport/varint.h b/src/core/ext/transport/chttp2/transport/varint.h index 3dcf32aa609..e84f1b6ee21 100644 --- a/src/core/ext/transport/chttp2/transport/varint.h +++ b/src/core/ext/transport/chttp2/transport/varint.h @@ -19,13 +19,12 @@ #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_VARINT_H #define GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_VARINT_H +#include #include #include #include "absl/log/check.h" -#include - // Helpers for hpack varint encoding namespace grpc_core { diff --git a/src/core/ext/transport/chttp2/transport/write_size_policy.cc b/src/core/ext/transport/chttp2/transport/write_size_policy.cc index 63e8d2b7e25..b843205de70 100644 --- a/src/core/ext/transport/chttp2/transport/write_size_policy.cc +++ b/src/core/ext/transport/chttp2/transport/write_size_policy.cc @@ -14,12 +14,12 @@ #include "src/core/ext/transport/chttp2/transport/write_size_policy.h" +#include + #include #include "absl/log/check.h" -#include - namespace grpc_core { size_t Chttp2WriteSizePolicy::WriteTargetSize() { return current_target_; } diff --git a/src/core/ext/transport/chttp2/transport/write_size_policy.h b/src/core/ext/transport/chttp2/transport/write_size_policy.h index fdeeda0763a..6f0098e69b1 100644 --- a/src/core/ext/transport/chttp2/transport/write_size_policy.h +++ b/src/core/ext/transport/chttp2/transport/write_size_policy.h @@ -15,11 +15,10 @@ #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_WRITE_SIZE_POLICY_H #define GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_WRITE_SIZE_POLICY_H +#include #include #include -#include - #include "src/core/util/time.h" namespace grpc_core { diff --git a/src/core/ext/transport/chttp2/transport/writing.cc b/src/core/ext/transport/chttp2/transport/writing.cc index 583d9eaa03d..8aa306ab680 100644 --- a/src/core/ext/transport/chttp2/transport/writing.cc +++ b/src/core/ext/transport/chttp2/transport/writing.cc @@ -16,6 +16,10 @@ // // +#include +#include +#include +#include #include #include @@ -30,12 +34,6 @@ #include "absl/log/log.h" #include "absl/status/status.h" #include "absl/types/optional.h" - -#include -#include -#include -#include - #include "src/core/channelz/channelz.h" #include "src/core/ext/transport/chttp2/transport/call_tracer_wrapper.h" #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" diff --git a/src/core/ext/transport/cronet/client/secure/cronet_channel_create.cc b/src/core/ext/transport/cronet/client/secure/cronet_channel_create.cc index a7c59b26d94..538c6aa2ee0 100644 --- a/src/core/ext/transport/cronet/client/secure/cronet_channel_create.cc +++ b/src/core/ext/transport/cronet/client/secure/cronet_channel_create.cc @@ -18,12 +18,11 @@ #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 "absl/log/log.h" +#include "absl/status/statusor.h" #include "src/core/ext/transport/cronet/transport/cronet_transport.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_args_preconditioning.h" diff --git a/src/core/ext/transport/cronet/transport/cronet_api_phony.cc b/src/core/ext/transport/cronet/transport/cronet_api_phony.cc index f0befc2faa1..25b80945e5b 100644 --- a/src/core/ext/transport/cronet/transport/cronet_api_phony.cc +++ b/src/core/ext/transport/cronet/transport/cronet_api_phony.cc @@ -19,11 +19,11 @@ // This file has empty implementation of all the functions exposed by the cronet // library, so we can build it in all environments +#include + #include "absl/log/check.h" #include "third_party/objective_c/Cronet/bidirectional_stream_c.h" -#include - #ifdef GRPC_COMPILE_WITH_CRONET // link with the real CRONET library in the build system #else diff --git a/src/core/ext/transport/cronet/transport/cronet_transport.cc b/src/core/ext/transport/cronet/transport/cronet_transport.cc index 4d47895f9bb..1e1ad321bb8 100644 --- a/src/core/ext/transport/cronet/transport/cronet_transport.cc +++ b/src/core/ext/transport/cronet/transport/cronet_transport.cc @@ -18,6 +18,12 @@ #include "src/core/ext/transport/cronet/transport/cronet_transport.h" +#include +#include +#include +#include +#include +#include #include #include #include @@ -34,15 +40,6 @@ #include "absl/strings/str_format.h" #include "absl/strings/string_view.h" #include "absl/types/optional.h" -#include "third_party/objective_c/Cronet/bidirectional_stream_c.h" - -#include -#include -#include -#include -#include -#include - #include "src/core/ext/transport/chttp2/transport/bin_decoder.h" #include "src/core/ext/transport/chttp2/transport/bin_encoder.h" #include "src/core/ext/transport/cronet/transport/cronet_status.h" @@ -61,6 +58,7 @@ #include "src/core/util/crash.h" #include "src/core/util/debug_location.h" #include "src/core/util/status_helper.h" +#include "third_party/objective_c/Cronet/bidirectional_stream_c.h" // IWYU pragma: no_include diff --git a/src/core/ext/transport/inproc/inproc_transport.cc b/src/core/ext/transport/inproc/inproc_transport.cc index a656d8b7fde..16846ac1960 100644 --- a/src/core/ext/transport/inproc/inproc_transport.cc +++ b/src/core/ext/transport/inproc/inproc_transport.cc @@ -14,16 +14,15 @@ #include "src/core/ext/transport/inproc/inproc_transport.h" +#include +#include + #include #include #include "absl/log/check.h" #include "absl/log/log.h" #include "absl/status/status.h" - -#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" diff --git a/src/core/ext/transport/inproc/legacy_inproc_transport.cc b/src/core/ext/transport/inproc/legacy_inproc_transport.cc index b93fc97a160..fd7fc3f99b6 100644 --- a/src/core/ext/transport/inproc/legacy_inproc_transport.cc +++ b/src/core/ext/transport/inproc/legacy_inproc_transport.cc @@ -18,6 +18,13 @@ #include "src/core/ext/transport/inproc/legacy_inproc_transport.h" +#include +#include +#include +#include +#include +#include +#include #include #include @@ -34,15 +41,6 @@ #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" #include "absl/types/optional.h" - -#include -#include -#include -#include -#include -#include -#include - #include "src/core/channelz/channelz.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_args_preconditioning.h" diff --git a/src/core/filter/blackboard.h b/src/core/filter/blackboard.h index 972758162f0..19f08be382b 100644 --- a/src/core/filter/blackboard.h +++ b/src/core/filter/blackboard.h @@ -22,7 +22,6 @@ #include "absl/container/flat_hash_map.h" #include "absl/strings/string_view.h" - #include "src/core/resolver/endpoint_addresses.h" #include "src/core/util/debug_location.h" #include "src/core/util/ref_counted.h" diff --git a/src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc b/src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc index 151f4e8c9d4..b6037bfe7cb 100644 --- a/src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc +++ b/src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc @@ -16,14 +16,13 @@ #include "src/core/handshaker/endpoint_info/endpoint_info_handshaker.h" +#include + #include #include #include "absl/functional/any_invocable.h" #include "absl/status/status.h" - -#include - #include "src/core/handshaker/handshaker.h" #include "src/core/handshaker/handshaker_factory.h" #include "src/core/handshaker/handshaker_registry.h" diff --git a/src/core/handshaker/handshaker.cc b/src/core/handshaker/handshaker.cc index b476e550f75..241d656da80 100644 --- a/src/core/handshaker/handshaker.cc +++ b/src/core/handshaker/handshaker.cc @@ -18,6 +18,11 @@ #include "src/core/handshaker/handshaker.h" +#include +#include +#include +#include +#include #include #include @@ -29,13 +34,6 @@ #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/str_format.h" - -#include -#include -#include -#include -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/iomgr/endpoint.h" diff --git a/src/core/handshaker/handshaker.h b/src/core/handshaker/handshaker.h index 12ea2b4b8bf..251ec6bf7cc 100644 --- a/src/core/handshaker/handshaker.h +++ b/src/core/handshaker/handshaker.h @@ -19,17 +19,15 @@ #ifndef GRPC_SRC_CORE_HANDSHAKER_HANDSHAKER_H #define GRPC_SRC_CORE_HANDSHAKER_HANDSHAKER_H +#include +#include +#include #include #include #include "absl/base/thread_annotations.h" #include "absl/container/inlined_vector.h" - -#include -#include -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint.h" diff --git a/src/core/handshaker/handshaker_registry.cc b/src/core/handshaker/handshaker_registry.cc index 750fdabfdc0..e4e2380b46f 100644 --- a/src/core/handshaker/handshaker_registry.cc +++ b/src/core/handshaker/handshaker_registry.cc @@ -18,13 +18,12 @@ #include "src/core/handshaker/handshaker_registry.h" +#include #include #include #include -#include - namespace grpc_core { void HandshakerRegistry::Builder::RegisterHandshakerFactory( diff --git a/src/core/handshaker/handshaker_registry.h b/src/core/handshaker/handshaker_registry.h index 1357686c6fb..b9ccba03fd8 100644 --- a/src/core/handshaker/handshaker_registry.h +++ b/src/core/handshaker/handshaker_registry.h @@ -19,11 +19,11 @@ #ifndef GRPC_SRC_CORE_HANDSHAKER_HANDSHAKER_REGISTRY_H #define GRPC_SRC_CORE_HANDSHAKER_HANDSHAKER_REGISTRY_H +#include + #include #include -#include - #include "src/core/handshaker/handshaker_factory.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/iomgr/iomgr_fwd.h" diff --git a/src/core/handshaker/http_connect/http_connect_handshaker.cc b/src/core/handshaker/http_connect/http_connect_handshaker.cc index 3ec778ed4b1..68ca9ab73c7 100644 --- a/src/core/handshaker/http_connect/http_connect_handshaker.cc +++ b/src/core/handshaker/http_connect/http_connect_handshaker.cc @@ -18,6 +18,10 @@ #include "src/core/handshaker/http_connect/http_connect_handshaker.h" +#include +#include +#include +#include #include #include @@ -31,12 +35,6 @@ #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" #include "absl/types/optional.h" - -#include -#include -#include -#include - #include "src/core/handshaker/handshaker.h" #include "src/core/handshaker/handshaker_factory.h" #include "src/core/handshaker/handshaker_registry.h" diff --git a/src/core/handshaker/http_connect/http_proxy_mapper.cc b/src/core/handshaker/http_connect/http_proxy_mapper.cc index f22e6d67423..4bd1e16ee50 100644 --- a/src/core/handshaker/http_connect/http_proxy_mapper.cc +++ b/src/core/handshaker/http_connect/http_proxy_mapper.cc @@ -18,6 +18,9 @@ #include "src/core/handshaker/http_connect/http_proxy_mapper.h" +#include +#include +#include #include #include @@ -38,11 +41,6 @@ #include "absl/strings/string_view.h" #include "absl/strings/strip.h" #include "absl/types/optional.h" - -#include -#include -#include - #include "src/core/handshaker/http_connect/http_connect_handshaker.h" #include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/address_utils/sockaddr_utils.h" diff --git a/src/core/handshaker/http_connect/http_proxy_mapper.h b/src/core/handshaker/http_connect/http_proxy_mapper.h index 2a283833bd4..50fb2919c96 100644 --- a/src/core/handshaker/http_connect/http_proxy_mapper.h +++ b/src/core/handshaker/http_connect/http_proxy_mapper.h @@ -19,13 +19,12 @@ #ifndef GRPC_SRC_CORE_HANDSHAKER_HTTP_CONNECT_HTTP_PROXY_MAPPER_H #define GRPC_SRC_CORE_HANDSHAKER_HTTP_CONNECT_HTTP_PROXY_MAPPER_H +#include + #include #include "absl/strings/string_view.h" #include "absl/types/optional.h" - -#include - #include "src/core/handshaker/proxy_mapper.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" diff --git a/src/core/handshaker/proxy_mapper.h b/src/core/handshaker/proxy_mapper.h index 8ba3f740394..6ffe9467670 100644 --- a/src/core/handshaker/proxy_mapper.h +++ b/src/core/handshaker/proxy_mapper.h @@ -19,13 +19,12 @@ #ifndef GRPC_SRC_CORE_HANDSHAKER_PROXY_MAPPER_H #define GRPC_SRC_CORE_HANDSHAKER_PROXY_MAPPER_H +#include + #include #include "absl/strings/string_view.h" #include "absl/types/optional.h" - -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/iomgr/resolved_address.h" diff --git a/src/core/handshaker/proxy_mapper_registry.cc b/src/core/handshaker/proxy_mapper_registry.cc index f13e07cc334..c02cac376c6 100644 --- a/src/core/handshaker/proxy_mapper_registry.cc +++ b/src/core/handshaker/proxy_mapper_registry.cc @@ -18,6 +18,8 @@ #include "src/core/handshaker/proxy_mapper_registry.h" +#include + #include #include #include @@ -25,8 +27,6 @@ #include "absl/types/optional.h" -#include - namespace grpc_core { void ProxyMapperRegistry::Builder::Register( diff --git a/src/core/handshaker/proxy_mapper_registry.h b/src/core/handshaker/proxy_mapper_registry.h index fbc09f6152d..3c604ef9e0c 100644 --- a/src/core/handshaker/proxy_mapper_registry.h +++ b/src/core/handshaker/proxy_mapper_registry.h @@ -19,6 +19,8 @@ #ifndef GRPC_SRC_CORE_HANDSHAKER_PROXY_MAPPER_REGISTRY_H #define GRPC_SRC_CORE_HANDSHAKER_PROXY_MAPPER_REGISTRY_H +#include + #include #include #include @@ -26,9 +28,6 @@ #include "absl/strings/string_view.h" #include "absl/types/optional.h" - -#include - #include "src/core/handshaker/proxy_mapper.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/iomgr/resolved_address.h" diff --git a/src/core/handshaker/security/secure_endpoint.cc b/src/core/handshaker/security/secure_endpoint.cc index c57b56b4d26..02c39865a3f 100644 --- a/src/core/handshaker/security/secure_endpoint.cc +++ b/src/core/handshaker/security/secure_endpoint.cc @@ -18,6 +18,14 @@ #include "src/core/handshaker/security/secure_endpoint.h" +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -31,16 +39,6 @@ #include "absl/status/status.h" #include "absl/strings/string_view.h" #include "absl/types/optional.h" - -#include -#include -#include -#include -#include -#include -#include -#include - #include "src/core/lib/debug/trace.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint.h" diff --git a/src/core/handshaker/security/secure_endpoint.h b/src/core/handshaker/security/secure_endpoint.h index 0d81fec090b..cb036d25766 100644 --- a/src/core/handshaker/security/secure_endpoint.h +++ b/src/core/handshaker/security/secure_endpoint.h @@ -19,11 +19,10 @@ #ifndef GRPC_SRC_CORE_HANDSHAKER_SECURITY_SECURE_ENDPOINT_H #define GRPC_SRC_CORE_HANDSHAKER_SECURITY_SECURE_ENDPOINT_H -#include - #include #include #include +#include #include "src/core/lib/debug/trace.h" #include "src/core/lib/iomgr/endpoint.h" diff --git a/src/core/handshaker/security/security_handshaker.cc b/src/core/handshaker/security/security_handshaker.cc index 82756fc8723..1e1102846df 100644 --- a/src/core/handshaker/security/security_handshaker.cc +++ b/src/core/handshaker/security/security_handshaker.cc @@ -18,6 +18,13 @@ #include "src/core/handshaker/security/security_handshaker.h" +#include +#include +#include +#include +#include +#include +#include #include #include #include @@ -34,15 +41,6 @@ #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" #include "absl/types/optional.h" - -#include -#include -#include -#include -#include -#include -#include - #include "src/core/channelz/channelz.h" #include "src/core/handshaker/handshaker.h" #include "src/core/handshaker/handshaker_factory.h" diff --git a/src/core/handshaker/security/security_handshaker.h b/src/core/handshaker/security/security_handshaker.h index 3e6096d6c47..23c10b94fac 100644 --- a/src/core/handshaker/security/security_handshaker.h +++ b/src/core/handshaker/security/security_handshaker.h @@ -19,11 +19,10 @@ #ifndef GRPC_SRC_CORE_HANDSHAKER_SECURITY_SECURITY_HANDSHAKER_H #define GRPC_SRC_CORE_HANDSHAKER_SECURITY_SECURITY_HANDSHAKER_H -#include "absl/status/statusor.h" - #include #include +#include "absl/status/statusor.h" #include "src/core/handshaker/handshaker.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" diff --git a/src/core/handshaker/tcp_connect/tcp_connect_handshaker.cc b/src/core/handshaker/tcp_connect/tcp_connect_handshaker.cc index a02ccfa8cc3..8dd1ff89d44 100644 --- a/src/core/handshaker/tcp_connect/tcp_connect_handshaker.cc +++ b/src/core/handshaker/tcp_connect/tcp_connect_handshaker.cc @@ -18,6 +18,11 @@ #include "src/core/handshaker/tcp_connect/tcp_connect_handshaker.h" +#include +#include +#include +#include + #include #include @@ -27,12 +32,6 @@ #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/types/optional.h" - -#include -#include -#include -#include - #include "src/core/handshaker/handshaker.h" #include "src/core/handshaker/handshaker_factory.h" #include "src/core/handshaker/handshaker_registry.h" diff --git a/src/core/lib/address_utils/parse_address.cc b/src/core/lib/address_utils/parse_address.cc index ce75321ce31..8a3c270a3d1 100644 --- a/src/core/lib/address_utils/parse_address.cc +++ b/src/core/lib/address_utils/parse_address.cc @@ -46,7 +46,6 @@ #include "absl/status/status.h" #include "absl/strings/str_cat.h" #include "absl/strings/strip.h" - #include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/iomgr/socket_utils.h" #include "src/core/util/grpc_if_nametoindex.h" diff --git a/src/core/lib/address_utils/parse_address.h b/src/core/lib/address_utils/parse_address.h index c11789885ab..840d0c260bc 100644 --- a/src/core/lib/address_utils/parse_address.h +++ b/src/core/lib/address_utils/parse_address.h @@ -19,13 +19,11 @@ #ifndef GRPC_SRC_CORE_LIB_ADDRESS_UTILS_PARSE_ADDRESS_H #define GRPC_SRC_CORE_LIB_ADDRESS_UTILS_PARSE_ADDRESS_H +#include #include #include "absl/status/statusor.h" #include "absl/strings/string_view.h" - -#include - #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/resolved_address.h" #include "src/core/util/uri.h" diff --git a/src/core/lib/address_utils/sockaddr_utils.cc b/src/core/lib/address_utils/sockaddr_utils.cc index 41564ba5242..b52491637c0 100644 --- a/src/core/lib/address_utils/sockaddr_utils.cc +++ b/src/core/lib/address_utils/sockaddr_utils.cc @@ -19,11 +19,10 @@ #include "src/core/lib/address_utils/sockaddr_utils.h" #include +#include #include #include "absl/log/check.h" - -#include #ifdef GRPC_HAVE_VSOCK #include #endif @@ -36,7 +35,6 @@ #include "absl/status/status.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" - #include "src/core/lib/iomgr/port.h" #include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/iomgr/socket_utils.h" diff --git a/src/core/lib/address_utils/sockaddr_utils.h b/src/core/lib/address_utils/sockaddr_utils.h index 9837afd930b..c76aa64908a 100644 --- a/src/core/lib/address_utils/sockaddr_utils.h +++ b/src/core/lib/address_utils/sockaddr_utils.h @@ -19,14 +19,12 @@ #ifndef GRPC_SRC_CORE_LIB_ADDRESS_UTILS_SOCKADDR_UTILS_H #define GRPC_SRC_CORE_LIB_ADDRESS_UTILS_SOCKADDR_UTILS_H +#include #include #include #include "absl/status/statusor.h" - -#include - #include "src/core/lib/iomgr/resolved_address.h" // Returns true if addr is an IPv4-mapped IPv6 address within the diff --git a/src/core/lib/channel/call_finalization.h b/src/core/lib/channel/call_finalization.h index 9e083e350a0..a3076677826 100644 --- a/src/core/lib/channel/call_finalization.h +++ b/src/core/lib/channel/call_finalization.h @@ -15,10 +15,10 @@ #ifndef GRPC_SRC_CORE_LIB_CHANNEL_CALL_FINALIZATION_H #define GRPC_SRC_CORE_LIB_CHANNEL_CALL_FINALIZATION_H -#include - #include +#include + #include "src/core/lib/promise/context.h" #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/transport/call_final_info.h" diff --git a/src/core/lib/channel/channel_args.cc b/src/core/lib/channel/channel_args.cc index 1c66f414350..72802910ea0 100644 --- a/src/core/lib/channel/channel_args.cc +++ b/src/core/lib/channel/channel_args.cc @@ -18,6 +18,10 @@ #include "src/core/lib/channel/channel_args.h" +#include +#include +#include +#include #include #include #include @@ -34,12 +38,6 @@ #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" #include "absl/strings/str_join.h" - -#include -#include -#include -#include - #include "src/core/util/useful.h" namespace grpc_core { diff --git a/src/core/lib/channel/channel_args.h b/src/core/lib/channel/channel_args.h index 9274c453988..9a49c3dd3fd 100644 --- a/src/core/lib/channel/channel_args.h +++ b/src/core/lib/channel/channel_args.h @@ -19,6 +19,9 @@ #ifndef GRPC_SRC_CORE_LIB_CHANNEL_CHANNEL_ARGS_H #define GRPC_SRC_CORE_LIB_CHANNEL_CHANNEL_ARGS_H +#include +#include +#include #include #include @@ -32,11 +35,6 @@ #include "absl/meta/type_traits.h" #include "absl/strings/string_view.h" #include "absl/types/optional.h" - -#include -#include -#include - #include "src/core/lib/surface/channel_stack_type.h" #include "src/core/util/avl.h" #include "src/core/util/debug_location.h" diff --git a/src/core/lib/channel/channel_args_preconditioning.cc b/src/core/lib/channel/channel_args_preconditioning.cc index 92a94535d30..bb83515839d 100644 --- a/src/core/lib/channel/channel_args_preconditioning.cc +++ b/src/core/lib/channel/channel_args_preconditioning.cc @@ -14,10 +14,10 @@ #include "src/core/lib/channel/channel_args_preconditioning.h" -#include - #include +#include + namespace grpc_core { void ChannelArgsPreconditioning::Builder::RegisterStage(Stage stage) { diff --git a/src/core/lib/channel/channel_args_preconditioning.h b/src/core/lib/channel/channel_args_preconditioning.h index 69f64accd34..ff4b43fc54b 100644 --- a/src/core/lib/channel/channel_args_preconditioning.h +++ b/src/core/lib/channel/channel_args_preconditioning.h @@ -15,12 +15,12 @@ #ifndef GRPC_SRC_CORE_LIB_CHANNEL_CHANNEL_ARGS_PRECONDITIONING_H #define GRPC_SRC_CORE_LIB_CHANNEL_CHANNEL_ARGS_PRECONDITIONING_H -#include -#include - #include #include +#include +#include + #include "src/core/lib/channel/channel_args.h" namespace grpc_core { diff --git a/src/core/lib/channel/channel_stack.cc b/src/core/lib/channel/channel_stack.cc index 14e618a7fd8..0b0b0345538 100644 --- a/src/core/lib/channel/channel_stack.cc +++ b/src/core/lib/channel/channel_stack.cc @@ -18,6 +18,7 @@ #include "src/core/lib/channel/channel_stack.h" +#include #include #include @@ -25,9 +26,6 @@ #include "absl/log/check.h" #include "absl/log/log.h" - -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/surface/channel_init.h" diff --git a/src/core/lib/channel/channel_stack.h b/src/core/lib/channel/channel_stack.h index 56bcb62f900..855354970b6 100644 --- a/src/core/lib/channel/channel_stack.h +++ b/src/core/lib/channel/channel_stack.h @@ -37,17 +37,16 @@ // it can have an effect on the call status. // -#include - -#include -#include - #include #include #include #include #include #include +#include + +#include +#include #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_fwd.h" diff --git a/src/core/lib/channel/channel_stack_builder.cc b/src/core/lib/channel/channel_stack_builder.cc index 69c4fff4fe9..307176e08e1 100644 --- a/src/core/lib/channel/channel_stack_builder.cc +++ b/src/core/lib/channel/channel_stack_builder.cc @@ -18,10 +18,10 @@ #include "src/core/lib/channel/channel_stack_builder.h" -#include - #include +#include + #include "src/core/lib/channel/channel_args.h" namespace grpc_core { diff --git a/src/core/lib/channel/channel_stack_builder.h b/src/core/lib/channel/channel_stack_builder.h index 6b3155fcbdb..b1e72116765 100644 --- a/src/core/lib/channel/channel_stack_builder.h +++ b/src/core/lib/channel/channel_stack_builder.h @@ -15,14 +15,13 @@ #ifndef GRPC_SRC_CORE_LIB_CHANNEL_CHANNEL_STACK_BUILDER_H #define GRPC_SRC_CORE_LIB_CHANNEL_CHANNEL_STACK_BUILDER_H +#include + #include #include #include "absl/status/statusor.h" #include "absl/strings/string_view.h" - -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/surface/channel_stack_type.h" diff --git a/src/core/lib/channel/channel_stack_builder_impl.cc b/src/core/lib/channel/channel_stack_builder_impl.cc index 360cd7aa7db..2d7bfc2fc47 100644 --- a/src/core/lib/channel/channel_stack_builder_impl.cc +++ b/src/core/lib/channel/channel_stack_builder_impl.cc @@ -18,6 +18,8 @@ #include "src/core/lib/channel/channel_stack_builder_impl.h" +#include +#include #include #include @@ -31,10 +33,6 @@ #include "absl/container/flat_hash_map.h" #include "absl/status/status.h" #include "absl/strings/str_cat.h" - -#include -#include - #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/debug/trace.h" diff --git a/src/core/lib/channel/channel_stack_builder_impl.h b/src/core/lib/channel/channel_stack_builder_impl.h index 78df9809c90..6de06ebba73 100644 --- a/src/core/lib/channel/channel_stack_builder_impl.h +++ b/src/core/lib/channel/channel_stack_builder_impl.h @@ -15,10 +15,9 @@ #ifndef GRPC_SRC_CORE_LIB_CHANNEL_CHANNEL_STACK_BUILDER_IMPL_H #define GRPC_SRC_CORE_LIB_CHANNEL_CHANNEL_STACK_BUILDER_IMPL_H -#include "absl/status/statusor.h" - #include +#include "absl/status/statusor.h" #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_stack_builder.h" #include "src/core/util/ref_counted_ptr.h" diff --git a/src/core/lib/channel/connected_channel.cc b/src/core/lib/channel/connected_channel.cc index f65f5f74f29..6f8b1bb2913 100644 --- a/src/core/lib/channel/connected_channel.cc +++ b/src/core/lib/channel/connected_channel.cc @@ -18,6 +18,10 @@ #include "src/core/lib/channel/connected_channel.h" +#include +#include +#include +#include #include #include @@ -30,12 +34,6 @@ #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/types/optional.h" - -#include -#include -#include -#include - #include "src/core/lib/channel/call_finalization.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_fwd.h" diff --git a/src/core/lib/channel/promise_based_filter.cc b/src/core/lib/channel/promise_based_filter.cc index a0fc813ad5c..4488a56b680 100644 --- a/src/core/lib/channel/promise_based_filter.cc +++ b/src/core/lib/channel/promise_based_filter.cc @@ -14,6 +14,9 @@ #include "src/core/lib/channel/promise_based_filter.h" +#include +#include + #include #include #include @@ -28,10 +31,6 @@ #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" #include "absl/strings/str_join.h" - -#include -#include - #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/iomgr/error.h" diff --git a/src/core/lib/channel/promise_based_filter.h b/src/core/lib/channel/promise_based_filter.h index 1a31b901052..d18809dca6b 100644 --- a/src/core/lib/channel/promise_based_filter.h +++ b/src/core/lib/channel/promise_based_filter.h @@ -19,6 +19,9 @@ // promise-style. Most of this will be removed once the promises conversion is // completed. +#include +#include +#include #include #include @@ -37,11 +40,6 @@ #include "absl/status/status.h" #include "absl/strings/string_view.h" #include "absl/types/optional.h" - -#include -#include -#include - #include "src/core/filter/blackboard.h" #include "src/core/lib/channel/call_finalization.h" #include "src/core/lib/channel/channel_args.h" diff --git a/src/core/lib/channel/status_util.cc b/src/core/lib/channel/status_util.cc index 7c78ac5504a..2caa7da563a 100644 --- a/src/core/lib/channel/status_util.cc +++ b/src/core/lib/channel/status_util.cc @@ -18,15 +18,13 @@ #include "src/core/lib/channel/status_util.h" +#include #include #include #include "absl/strings/str_cat.h" #include "absl/strings/str_join.h" - -#include - #include "src/core/util/useful.h" struct status_string_entry { diff --git a/src/core/lib/channel/status_util.h b/src/core/lib/channel/status_util.h index cc46bd4feb0..fe6d47e4a70 100644 --- a/src/core/lib/channel/status_util.h +++ b/src/core/lib/channel/status_util.h @@ -19,14 +19,14 @@ #ifndef GRPC_SRC_CORE_LIB_CHANNEL_STATUS_UTIL_H #define GRPC_SRC_CORE_LIB_CHANNEL_STATUS_UTIL_H +#include +#include + #include #include "absl/status/status.h" #include "absl/strings/string_view.h" -#include -#include - /// If \a status_str is a valid status string, sets \a status to the /// corresponding status value and returns true. bool grpc_status_code_from_string(const char* status_str, diff --git a/src/core/lib/compression/compression.cc b/src/core/lib/compression/compression.cc index 018e92a379a..1a6e1e81dc4 100644 --- a/src/core/lib/compression/compression.cc +++ b/src/core/lib/compression/compression.cc @@ -16,16 +16,14 @@ // // -#include -#include - -#include "absl/types/optional.h" - #include #include #include #include +#include +#include +#include "absl/types/optional.h" #include "src/core/lib/compression/compression_internal.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/slice/slice_internal.h" diff --git a/src/core/lib/compression/compression_internal.cc b/src/core/lib/compression/compression_internal.cc index 3bb8a7f2882..d81670a3d1d 100644 --- a/src/core/lib/compression/compression_internal.cc +++ b/src/core/lib/compression/compression_internal.cc @@ -18,6 +18,8 @@ #include "src/core/lib/compression/compression_internal.h" +#include +#include #include #include @@ -27,10 +29,6 @@ #include "absl/strings/ascii.h" #include "absl/strings/str_format.h" #include "absl/strings/str_split.h" - -#include -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/debug/trace.h" #include "src/core/util/crash.h" diff --git a/src/core/lib/compression/compression_internal.h b/src/core/lib/compression/compression_internal.h index 45a24faa998..6f417feaf95 100644 --- a/src/core/lib/compression/compression_internal.h +++ b/src/core/lib/compression/compression_internal.h @@ -19,16 +19,14 @@ #ifndef GRPC_SRC_CORE_LIB_COMPRESSION_COMPRESSION_INTERNAL_H #define GRPC_SRC_CORE_LIB_COMPRESSION_COMPRESSION_INTERNAL_H +#include +#include #include #include #include "absl/strings/string_view.h" #include "absl/types/optional.h" - -#include -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/slice/slice.h" #include "src/core/util/bitset.h" diff --git a/src/core/lib/compression/message_compress.cc b/src/core/lib/compression/message_compress.cc index 9fb7a7956ac..7a731495e4a 100644 --- a/src/core/lib/compression/message_compress.cc +++ b/src/core/lib/compression/message_compress.cc @@ -18,18 +18,15 @@ #include "src/core/lib/compression/message_compress.h" +#include +#include +#include #include - #include #include #include "absl/log/check.h" #include "absl/log/log.h" - -#include -#include -#include - #include "src/core/lib/slice/slice.h" #define OUTPUT_BLOCK_SIZE 1024 diff --git a/src/core/lib/config/config_vars.cc b/src/core/lib/config/config_vars.cc index e0db62f5d09..6aa9f551d71 100644 --- a/src/core/lib/config/config_vars.cc +++ b/src/core/lib/config/config_vars.cc @@ -18,11 +18,10 @@ #include "src/core/lib/config/config_vars.h" -#include "absl/flags/flag.h" -#include "absl/strings/escaping.h" - #include +#include "absl/flags/flag.h" +#include "absl/strings/escaping.h" #include "src/core/lib/config/load_config.h" #ifndef GPR_DEFAULT_LOG_VERBOSITY_STRING diff --git a/src/core/lib/config/config_vars.h b/src/core/lib/config/config_vars.h index 32220cd1f17..b7ea541ad92 100644 --- a/src/core/lib/config/config_vars.h +++ b/src/core/lib/config/config_vars.h @@ -19,6 +19,7 @@ #ifndef GRPC_SRC_CORE_LIB_CONFIG_CONFIG_VARS_H #define GRPC_SRC_CORE_LIB_CONFIG_CONFIG_VARS_H +#include #include #include @@ -27,8 +28,6 @@ #include "absl/strings/string_view.h" #include "absl/types/optional.h" -#include - namespace grpc_core { class GPR_DLL ConfigVars { diff --git a/src/core/lib/config/config_vars_non_generated.cc b/src/core/lib/config/config_vars_non_generated.cc index 2f86246f2b7..78af08c1d8d 100644 --- a/src/core/lib/config/config_vars_non_generated.cc +++ b/src/core/lib/config/config_vars_non_generated.cc @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include + #include #include -#include - #include "src/core/lib/config/config_vars.h" namespace grpc_core { diff --git a/src/core/lib/config/core_configuration.cc b/src/core/lib/config/core_configuration.cc index 474ec3b56c4..3623ac53d8f 100644 --- a/src/core/lib/config/core_configuration.cc +++ b/src/core/lib/config/core_configuration.cc @@ -14,14 +14,14 @@ #include "src/core/lib/config/core_configuration.h" +#include + #include #include #include #include "absl/log/check.h" -#include - namespace grpc_core { std::atomic CoreConfiguration::config_{nullptr}; diff --git a/src/core/lib/config/core_configuration.h b/src/core/lib/config/core_configuration.h index 400278bd5ea..aa2f79c64fe 100644 --- a/src/core/lib/config/core_configuration.h +++ b/src/core/lib/config/core_configuration.h @@ -15,13 +15,12 @@ #ifndef GRPC_SRC_CORE_LIB_CONFIG_CORE_CONFIGURATION_H #define GRPC_SRC_CORE_LIB_CONFIG_CORE_CONFIGURATION_H +#include + #include #include "absl/functional/any_invocable.h" #include "absl/log/check.h" - -#include - #include "src/core/handshaker/handshaker_registry.h" #include "src/core/handshaker/proxy_mapper_registry.h" #include "src/core/lib/channel/channel_args_preconditioning.h" diff --git a/src/core/lib/config/load_config.cc b/src/core/lib/config/load_config.cc index 3d52fc4db03..afceacc7e4f 100644 --- a/src/core/lib/config/load_config.cc +++ b/src/core/lib/config/load_config.cc @@ -14,6 +14,7 @@ #include "src/core/lib/config/load_config.h" +#include #include #include "absl/flags/marshalling.h" @@ -21,9 +22,6 @@ #include "absl/strings/numbers.h" #include "absl/strings/str_join.h" #include "absl/types/optional.h" - -#include - #include "src/core/util/env.h" namespace grpc_core { diff --git a/src/core/lib/config/load_config.h b/src/core/lib/config/load_config.h index a668174193f..c0a1fe486cd 100644 --- a/src/core/lib/config/load_config.h +++ b/src/core/lib/config/load_config.h @@ -15,6 +15,7 @@ #ifndef GRPC_SRC_CORE_LIB_CONFIG_LOAD_CONFIG_H #define GRPC_SRC_CORE_LIB_CONFIG_LOAD_CONFIG_H +#include #include #include @@ -24,8 +25,6 @@ #include "absl/strings/string_view.h" #include "absl/types/optional.h" -#include - namespace grpc_core { std::string LoadConfigFromEnv(absl::string_view environment_variable, diff --git a/src/core/lib/debug/trace.cc b/src/core/lib/debug/trace.cc index 920c5d491c9..3eb004ec232 100644 --- a/src/core/lib/debug/trace.cc +++ b/src/core/lib/debug/trace.cc @@ -18,6 +18,9 @@ #include "src/core/lib/debug/trace.h" +#include +#include + #include #include #include @@ -28,10 +31,6 @@ #include "absl/strings/str_split.h" #include "absl/strings/string_view.h" #include "absl/strings/strip.h" - -#include -#include - #include "src/core/lib/config/config_vars.h" #include "src/core/util/glob.h" diff --git a/src/core/lib/debug/trace_flags.cc b/src/core/lib/debug/trace_flags.cc index 03bfe06312c..29963b4c1f6 100644 --- a/src/core/lib/debug/trace_flags.cc +++ b/src/core/lib/debug/trace_flags.cc @@ -17,7 +17,6 @@ // #include "absl/container/flat_hash_map.h" - #include "src/core/lib/debug/trace.h" #include "src/core/util/no_destruct.h" diff --git a/src/core/lib/debug/trace_impl.h b/src/core/lib/debug/trace_impl.h index 4d91c374d02..5d43e103433 100644 --- a/src/core/lib/debug/trace_impl.h +++ b/src/core/lib/debug/trace_impl.h @@ -15,6 +15,8 @@ #ifndef GRPC_SRC_CORE_LIB_DEBUG_TRACE_IMPL_H #define GRPC_SRC_CORE_LIB_DEBUG_TRACE_IMPL_H +#include + #include #include #include @@ -23,8 +25,6 @@ #include "absl/log/log.h" #include "absl/strings/string_view.h" -#include - #ifdef _WIN32 #undef ERROR #endif diff --git a/src/core/lib/event_engine/ares_resolver.cc b/src/core/lib/event_engine/ares_resolver.cc index f1faf409241..1d38e9b827b 100644 --- a/src/core/lib/event_engine/ares_resolver.cc +++ b/src/core/lib/event_engine/ares_resolver.cc @@ -13,11 +13,11 @@ // limitations under the License. #include "src/core/lib/event_engine/ares_resolver.h" +#include + #include #include -#include - #include "src/core/lib/iomgr/port.h" // IWYU pragma: no_include @@ -42,6 +42,7 @@ #include "src/core/lib/event_engine/nameser.h" // IWYU pragma: keep #endif +#include #include #include @@ -59,9 +60,6 @@ #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" #include "absl/types/optional.h" - -#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" diff --git a/src/core/lib/event_engine/ares_resolver.h b/src/core/lib/event_engine/ares_resolver.h index 331e533b35f..e9ca598d82e 100644 --- a/src/core/lib/event_engine/ares_resolver.h +++ b/src/core/lib/event_engine/ares_resolver.h @@ -14,30 +14,27 @@ #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_ARES_RESOLVER_H #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_ARES_RESOLVER_H +#include + #include #include "absl/status/status.h" - -#include - #include "src/core/lib/debug/trace.h" #if GRPC_ARES == 1 +#include +#include + #include #include -#include - #include "absl/base/thread_annotations.h" #include "absl/container/flat_hash_map.h" #include "absl/status/statusor.h" #include "absl/strings/string_view.h" #include "absl/types/optional.h" #include "absl/types/variant.h" - -#include - #include "src/core/lib/event_engine/grpc_polled_fd.h" #include "src/core/lib/event_engine/ref_counted_dns_resolver_interface.h" #include "src/core/util/orphanable.h" diff --git a/src/core/lib/event_engine/cf_engine/cf_engine.cc b/src/core/lib/event_engine/cf_engine/cf_engine.cc index cc80e9977b6..a4c61521a29 100644 --- a/src/core/lib/event_engine/cf_engine/cf_engine.cc +++ b/src/core/lib/event_engine/cf_engine/cf_engine.cc @@ -19,12 +19,10 @@ #ifdef AVAILABLE_MAC_OS_X_VERSION_10_12_AND_LATER #include +#include #include "absl/log/check.h" #include "absl/log/log.h" - -#include - #include "src/core/lib/event_engine/cf_engine/cf_engine.h" #include "src/core/lib/event_engine/cf_engine/cfstream_endpoint.h" #include "src/core/lib/event_engine/cf_engine/dns_service_resolver.h" diff --git a/src/core/lib/event_engine/cf_engine/cfstream_endpoint.cc b/src/core/lib/event_engine/cf_engine/cfstream_endpoint.cc index 7a5f15b4208..9f7235aaa00 100644 --- a/src/core/lib/event_engine/cf_engine/cfstream_endpoint.cc +++ b/src/core/lib/event_engine/cf_engine/cfstream_endpoint.cc @@ -21,7 +21,6 @@ #include "absl/status/status.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" - #include "src/core/lib/event_engine/cf_engine/cfstream_endpoint.h" #include "src/core/util/strerror.h" diff --git a/src/core/lib/event_engine/cf_engine/cfstream_endpoint.h b/src/core/lib/event_engine/cf_engine/cfstream_endpoint.h index 8623dc888f0..04d8f8bf640 100644 --- a/src/core/lib/event_engine/cf_engine/cfstream_endpoint.h +++ b/src/core/lib/event_engine/cf_engine/cfstream_endpoint.h @@ -20,11 +20,9 @@ #ifdef AVAILABLE_MAC_OS_X_VERSION_10_12_AND_LATER #include - -#include "absl/strings/str_format.h" - #include +#include "absl/strings/str_format.h" #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/event_engine/cf_engine/cf_engine.h" #include "src/core/lib/event_engine/cf_engine/cftype_unique_ref.h" diff --git a/src/core/lib/event_engine/cf_engine/dns_service_resolver.cc b/src/core/lib/event_engine/cf_engine/dns_service_resolver.cc index a4fd9758ae5..c75b62b8f98 100644 --- a/src/core/lib/event_engine/cf_engine/dns_service_resolver.cc +++ b/src/core/lib/event_engine/cf_engine/dns_service_resolver.cc @@ -21,7 +21,6 @@ #include "absl/log/check.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" - #include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/event_engine/cf_engine/dns_service_resolver.h" #include "src/core/lib/event_engine/posix_engine/lockfree_event.h" diff --git a/src/core/lib/event_engine/cf_engine/dns_service_resolver.h b/src/core/lib/event_engine/cf_engine/dns_service_resolver.h index e9c464029b3..01d69b95cc8 100644 --- a/src/core/lib/event_engine/cf_engine/dns_service_resolver.h +++ b/src/core/lib/event_engine/cf_engine/dns_service_resolver.h @@ -21,12 +21,10 @@ #include #include +#include #include "absl/container/flat_hash_map.h" #include "absl/log/check.h" - -#include - #include "src/core/lib/event_engine/cf_engine/cf_engine.h" #include "src/core/util/ref_counted.h" #include "src/core/util/ref_counted_ptr.h" diff --git a/src/core/lib/event_engine/channel_args_endpoint_config.cc b/src/core/lib/event_engine/channel_args_endpoint_config.cc index 6cc79a7028a..41dd385080e 100644 --- a/src/core/lib/event_engine/channel_args_endpoint_config.cc +++ b/src/core/lib/event_engine/channel_args_endpoint_config.cc @@ -13,13 +13,12 @@ // limitations under the License. #include "src/core/lib/event_engine/channel_args_endpoint_config.h" -#include - -#include "absl/types/optional.h" - #include #include +#include + +#include "absl/types/optional.h" #include "src/core/lib/channel/channel_args.h" namespace grpc_event_engine { diff --git a/src/core/lib/event_engine/channel_args_endpoint_config.h b/src/core/lib/event_engine/channel_args_endpoint_config.h index c14735e3376..91000223bf2 100644 --- a/src/core/lib/event_engine/channel_args_endpoint_config.h +++ b/src/core/lib/event_engine/channel_args_endpoint_config.h @@ -14,12 +14,11 @@ #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_CHANNEL_ARGS_ENDPOINT_CONFIG_H #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_CHANNEL_ARGS_ENDPOINT_CONFIG_H -#include "absl/strings/string_view.h" -#include "absl/types/optional.h" - #include #include +#include "absl/strings/string_view.h" +#include "absl/types/optional.h" #include "src/core/lib/channel/channel_args.h" namespace grpc_event_engine { diff --git a/src/core/lib/event_engine/common_closures.h b/src/core/lib/event_engine/common_closures.h index 007f352cbb8..52a8477be17 100644 --- a/src/core/lib/event_engine/common_closures.h +++ b/src/core/lib/event_engine/common_closures.h @@ -15,13 +15,13 @@ #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_COMMON_CLOSURES_H #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_COMMON_CLOSURES_H +#include +#include + #include #include "absl/functional/any_invocable.h" -#include -#include - namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/event_engine/default_event_engine.cc b/src/core/lib/event_engine/default_event_engine.cc index 24282e7921b..7b005d02d8e 100644 --- a/src/core/lib/event_engine/default_event_engine.cc +++ b/src/core/lib/event_engine/default_event_engine.cc @@ -13,15 +13,14 @@ // limitations under the License. #include "src/core/lib/event_engine/default_event_engine.h" +#include +#include + #include #include #include #include "absl/functional/any_invocable.h" - -#include -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.h" diff --git a/src/core/lib/event_engine/default_event_engine.h b/src/core/lib/event_engine/default_event_engine.h index 2f7c982ab4c..2a254d49586 100644 --- a/src/core/lib/event_engine/default_event_engine.h +++ b/src/core/lib/event_engine/default_event_engine.h @@ -15,11 +15,11 @@ #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_DEFAULT_EVENT_ENGINE_H #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_DEFAULT_EVENT_ENGINE_H -#include - #include #include +#include + #include "src/core/lib/config/core_configuration.h" #include "src/core/util/debug_location.h" diff --git a/src/core/lib/event_engine/default_event_engine_factory.cc b/src/core/lib/event_engine/default_event_engine_factory.cc index d48aa2fba03..8f91ad64431 100644 --- a/src/core/lib/event_engine/default_event_engine_factory.cc +++ b/src/core/lib/event_engine/default_event_engine_factory.cc @@ -14,11 +14,11 @@ #include "src/core/lib/event_engine/default_event_engine_factory.h" -#include - #include #include +#include + #if defined(GPR_WINDOWS) #include "src/core/lib/event_engine/windows/windows_engine.h" diff --git a/src/core/lib/event_engine/default_event_engine_factory.h b/src/core/lib/event_engine/default_event_engine_factory.h index a32f04ff6be..3e97c4e480b 100644 --- a/src/core/lib/event_engine/default_event_engine_factory.h +++ b/src/core/lib/event_engine/default_event_engine_factory.h @@ -15,11 +15,11 @@ #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_DEFAULT_EVENT_ENGINE_FACTORY_H #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_DEFAULT_EVENT_ENGINE_FACTORY_H -#include - #include #include +#include + namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/event_engine/event_engine.cc b/src/core/lib/event_engine/event_engine.cc index 5a162f871a1..0a16cba4dbc 100644 --- a/src/core/lib/event_engine/event_engine.cc +++ b/src/core/lib/event_engine/event_engine.cc @@ -11,11 +11,11 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -#include "absl/strings/str_cat.h" - #include #include +#include "absl/strings/str_cat.h" + namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/event_engine/extensions/can_track_errors.h b/src/core/lib/event_engine/extensions/can_track_errors.h index 8a6f9df046c..d3042acbb2a 100644 --- a/src/core/lib/event_engine/extensions/can_track_errors.h +++ b/src/core/lib/event_engine/extensions/can_track_errors.h @@ -15,10 +15,10 @@ #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_EXTENSIONS_CAN_TRACK_ERRORS_H #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_EXTENSIONS_CAN_TRACK_ERRORS_H -#include "absl/strings/string_view.h" - #include +#include "absl/strings/string_view.h" + namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/event_engine/extensions/chaotic_good_extension.h b/src/core/lib/event_engine/extensions/chaotic_good_extension.h index 9610f4ed720..e787712e266 100644 --- a/src/core/lib/event_engine/extensions/chaotic_good_extension.h +++ b/src/core/lib/event_engine/extensions/chaotic_good_extension.h @@ -15,10 +15,9 @@ #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_EXTENSIONS_CHAOTIC_GOOD_EXTENSION_H #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_EXTENSIONS_CHAOTIC_GOOD_EXTENSION_H -#include "absl/strings/string_view.h" - #include +#include "absl/strings/string_view.h" #include "src/core/lib/resource_quota/memory_quota.h" namespace grpc_event_engine { diff --git a/src/core/lib/event_engine/extensions/supports_fd.h b/src/core/lib/event_engine/extensions/supports_fd.h index 30f0d2ad0e6..c7a1bfdcd4f 100644 --- a/src/core/lib/event_engine/extensions/supports_fd.h +++ b/src/core/lib/event_engine/extensions/supports_fd.h @@ -15,13 +15,13 @@ #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_EXTENSIONS_SUPPORTS_FD_H #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_EXTENSIONS_SUPPORTS_FD_H +#include +#include + #include "absl/functional/any_invocable.h" #include "absl/status/statusor.h" #include "absl/strings/string_view.h" -#include -#include - namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/event_engine/extensions/tcp_trace.h b/src/core/lib/event_engine/extensions/tcp_trace.h index e5d66a45860..4e5efa712f7 100644 --- a/src/core/lib/event_engine/extensions/tcp_trace.h +++ b/src/core/lib/event_engine/extensions/tcp_trace.h @@ -18,7 +18,6 @@ #include #include "absl/strings/string_view.h" - #include "src/core/telemetry/tcp_tracer.h" namespace grpc_event_engine { diff --git a/src/core/lib/event_engine/forkable.cc b/src/core/lib/event_engine/forkable.cc index 0034cbbd92e..e83c8105dee 100644 --- a/src/core/lib/event_engine/forkable.cc +++ b/src/core/lib/event_engine/forkable.cc @@ -14,10 +14,10 @@ #include "src/core/lib/event_engine/forkable.h" -#include "absl/log/check.h" - #include +#include "absl/log/check.h" + #ifdef GRPC_POSIX_FORK_ALLOW_PTHREAD_ATFORK #include #endif diff --git a/src/core/lib/event_engine/forkable.h b/src/core/lib/event_engine/forkable.h index 414947b7515..38a3637ecae 100644 --- a/src/core/lib/event_engine/forkable.h +++ b/src/core/lib/event_engine/forkable.h @@ -14,11 +14,11 @@ #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_FORKABLE_H #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_FORKABLE_H +#include + #include #include -#include - #include "src/core/lib/debug/trace.h" namespace grpc_event_engine { diff --git a/src/core/lib/event_engine/grpc_polled_fd.h b/src/core/lib/event_engine/grpc_polled_fd.h index d1e6dc3b20c..65ce8cbb176 100644 --- a/src/core/lib/event_engine/grpc_polled_fd.h +++ b/src/core/lib/event_engine/grpc_polled_fd.h @@ -15,18 +15,17 @@ #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_GRPC_POLLED_FD_H #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_GRPC_POLLED_FD_H -#include - #include #include +#include + #if GRPC_ARES == 1 #include #include "absl/functional/any_invocable.h" #include "absl/status/status.h" - #include "src/core/util/sync.h" namespace grpc_event_engine { diff --git a/src/core/lib/event_engine/handle_containers.h b/src/core/lib/event_engine/handle_containers.h index 2a4cd766f18..5772de7476d 100644 --- a/src/core/lib/event_engine/handle_containers.h +++ b/src/core/lib/event_engine/handle_containers.h @@ -14,6 +14,8 @@ #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_HANDLE_CONTAINERS_H #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_HANDLE_CONTAINERS_H +#include +#include #include #include @@ -22,9 +24,6 @@ #include "absl/container/flat_hash_set.h" #include "absl/hash/hash.h" -#include -#include - namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/event_engine/memory_allocator_factory.h b/src/core/lib/event_engine/memory_allocator_factory.h index 88e61908ef3..8283c415970 100644 --- a/src/core/lib/event_engine/memory_allocator_factory.h +++ b/src/core/lib/event_engine/memory_allocator_factory.h @@ -13,14 +13,13 @@ // limitations under the License. #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_MEMORY_ALLOCATOR_FACTORY_H #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_MEMORY_ALLOCATOR_FACTORY_H +#include +#include + #include #include #include "absl/strings/string_view.h" - -#include -#include - #include "src/core/lib/resource_quota/memory_quota.h" namespace grpc_event_engine { diff --git a/src/core/lib/event_engine/poller.h b/src/core/lib/event_engine/poller.h index 26333e798fa..550ce2b24f2 100644 --- a/src/core/lib/event_engine/poller.h +++ b/src/core/lib/event_engine/poller.h @@ -14,11 +14,11 @@ #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_POLLER_H #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_POLLER_H -#include "absl/functional/function_ref.h" - #include #include +#include "absl/functional/function_ref.h" + namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/event_engine/posix_engine/.clang-format b/src/core/lib/event_engine/posix_engine/.clang-format deleted file mode 100644 index 5f150ef6edb..00000000000 --- a/src/core/lib/event_engine/posix_engine/.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/src/core/lib/event_engine/posix_engine/ev_epoll1_linux.cc b/src/core/lib/event_engine/posix_engine/ev_epoll1_linux.cc index f59c6616bd9..e8abcaf471d 100644 --- a/src/core/lib/event_engine/posix_engine/ev_epoll1_linux.cc +++ b/src/core/lib/event_engine/posix_engine/ev_epoll1_linux.cc @@ -13,6 +13,10 @@ // limitations under the License. #include "src/core/lib/event_engine/posix_engine/ev_epoll1_linux.h" +#include +#include +#include +#include #include #include @@ -23,12 +27,6 @@ #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/str_format.h" - -#include -#include -#include -#include - #include "src/core/lib/event_engine/poller.h" #include "src/core/lib/event_engine/time_util.h" #include "src/core/lib/iomgr/port.h" diff --git a/src/core/lib/event_engine/posix_engine/ev_epoll1_linux.h b/src/core/lib/event_engine/posix_engine/ev_epoll1_linux.h index 42c61446659..de850dc671f 100644 --- a/src/core/lib/event_engine/posix_engine/ev_epoll1_linux.h +++ b/src/core/lib/event_engine/posix_engine/ev_epoll1_linux.h @@ -14,6 +14,9 @@ #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_EV_EPOLL1_LINUX_H #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_EV_EPOLL1_LINUX_H +#include +#include + #include #include #include @@ -22,10 +25,6 @@ #include "absl/container/inlined_vector.h" #include "absl/functional/function_ref.h" #include "absl/strings/string_view.h" - -#include -#include - #include "src/core/lib/event_engine/poller.h" #include "src/core/lib/event_engine/posix_engine/event_poller.h" #include "src/core/lib/event_engine/posix_engine/internal_errqueue.h" diff --git a/src/core/lib/event_engine/posix_engine/ev_poll_posix.cc b/src/core/lib/event_engine/posix_engine/ev_poll_posix.cc index c62c9e1a8e2..9bc6ba27553 100644 --- a/src/core/lib/event_engine/posix_engine/ev_poll_posix.cc +++ b/src/core/lib/event_engine/posix_engine/ev_poll_posix.cc @@ -14,6 +14,11 @@ #include "src/core/lib/event_engine/posix_engine/ev_poll_posix.h" +#include +#include +#include +#include +#include #include #include @@ -27,13 +32,6 @@ #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/str_format.h" - -#include -#include -#include -#include -#include - #include "src/core/lib/event_engine/poller.h" #include "src/core/lib/event_engine/posix_engine/event_poller.h" #include "src/core/lib/event_engine/posix_engine/posix_engine_closure.h" @@ -43,13 +41,12 @@ #ifdef GRPC_POSIX_SOCKET_EV_POLL #include +#include #include #include #include #include -#include - #include "src/core/lib/event_engine/common_closures.h" #include "src/core/lib/event_engine/posix_engine/wakeup_fd_posix.h" #include "src/core/lib/event_engine/posix_engine/wakeup_fd_posix_default.h" diff --git a/src/core/lib/event_engine/posix_engine/ev_poll_posix.h b/src/core/lib/event_engine/posix_engine/ev_poll_posix.h index d3e139eb0c8..d296eb58e50 100644 --- a/src/core/lib/event_engine/posix_engine/ev_poll_posix.h +++ b/src/core/lib/event_engine/posix_engine/ev_poll_posix.h @@ -15,16 +15,15 @@ #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_EV_POLL_POSIX_H #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_EV_POLL_POSIX_H +#include +#include + #include #include #include "absl/base/thread_annotations.h" #include "absl/functional/function_ref.h" #include "absl/strings/string_view.h" - -#include -#include - #include "src/core/lib/event_engine/poller.h" #include "src/core/lib/event_engine/posix_engine/event_poller.h" #include "src/core/lib/event_engine/posix_engine/wakeup_fd_posix.h" diff --git a/src/core/lib/event_engine/posix_engine/event_poller.h b/src/core/lib/event_engine/posix_engine/event_poller.h index 49cf7769364..3553ae6ca3f 100644 --- a/src/core/lib/event_engine/posix_engine/event_poller.h +++ b/src/core/lib/event_engine/posix_engine/event_poller.h @@ -14,15 +14,14 @@ #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_EVENT_POLLER_H #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_EVENT_POLLER_H +#include +#include + #include #include "absl/functional/any_invocable.h" #include "absl/status/status.h" #include "absl/strings/string_view.h" - -#include -#include - #include "src/core/lib/event_engine/forkable.h" #include "src/core/lib/event_engine/poller.h" #include "src/core/lib/event_engine/posix_engine/posix_engine_closure.h" diff --git a/src/core/lib/event_engine/posix_engine/event_poller_posix_default.cc b/src/core/lib/event_engine/posix_engine/event_poller_posix_default.cc index 7f11bbb05a0..7d22bcaf503 100644 --- a/src/core/lib/event_engine/posix_engine/event_poller_posix_default.cc +++ b/src/core/lib/event_engine/posix_engine/event_poller_posix_default.cc @@ -12,14 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include + #include #include #include "absl/strings/str_split.h" #include "absl/strings/string_view.h" - -#include - #include "src/core/lib/config/config_vars.h" #include "src/core/lib/event_engine/forkable.h" #include "src/core/lib/event_engine/posix_engine/ev_epoll1_linux.h" diff --git a/src/core/lib/event_engine/posix_engine/event_poller_posix_default.h b/src/core/lib/event_engine/posix_engine/event_poller_posix_default.h index f1ec8c39d9e..bfde1904d9c 100644 --- a/src/core/lib/event_engine/posix_engine/event_poller_posix_default.h +++ b/src/core/lib/event_engine/posix_engine/event_poller_posix_default.h @@ -15,10 +15,10 @@ #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_EVENT_POLLER_POSIX_DEFAULT_H #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_EVENT_POLLER_POSIX_DEFAULT_H -#include - #include +#include + namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/event_engine/posix_engine/grpc_polled_fd_posix.h b/src/core/lib/event_engine/posix_engine/grpc_polled_fd_posix.h index 7c9f8a5f742..0dba5c5d11b 100644 --- a/src/core/lib/event_engine/posix_engine/grpc_polled_fd_posix.h +++ b/src/core/lib/event_engine/posix_engine/grpc_polled_fd_posix.h @@ -15,11 +15,11 @@ #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_GRPC_POLLED_FD_POSIX_H #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_GRPC_POLLED_FD_POSIX_H -#include - #include #include +#include + #include "src/core/lib/iomgr/port.h" #include "src/core/util/sync.h" @@ -27,6 +27,7 @@ // IWYU pragma: no_include +#include #include #include #include @@ -36,12 +37,9 @@ #include #include -#include - #include "absl/functional/any_invocable.h" #include "absl/status/status.h" #include "absl/strings/str_cat.h" - #include "src/core/lib/event_engine/grpc_polled_fd.h" #include "src/core/lib/event_engine/posix_engine/event_poller.h" #include "src/core/lib/event_engine/posix_engine/posix_engine_closure.h" diff --git a/src/core/lib/event_engine/posix_engine/internal_errqueue.cc b/src/core/lib/event_engine/posix_engine/internal_errqueue.cc index dd4d3711f9d..878b5ba4022 100644 --- a/src/core/lib/event_engine/posix_engine/internal_errqueue.cc +++ b/src/core/lib/event_engine/posix_engine/internal_errqueue.cc @@ -14,10 +14,9 @@ #include "src/core/lib/event_engine/posix_engine/internal_errqueue.h" -#include "absl/log/log.h" - #include +#include "absl/log/log.h" #include "src/core/lib/iomgr/port.h" #ifdef GRPC_POSIX_SOCKET_TCP diff --git a/src/core/lib/event_engine/posix_engine/internal_errqueue.h b/src/core/lib/event_engine/posix_engine/internal_errqueue.h index c779af8106d..e2c1460d050 100644 --- a/src/core/lib/event_engine/posix_engine/internal_errqueue.h +++ b/src/core/lib/event_engine/posix_engine/internal_errqueue.h @@ -15,9 +15,8 @@ #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_INTERNAL_ERRQUEUE_H #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_INTERNAL_ERRQUEUE_H -#include - #include +#include #include "src/core/lib/iomgr/port.h" diff --git a/src/core/lib/event_engine/posix_engine/lockfree_event.cc b/src/core/lib/event_engine/posix_engine/lockfree_event.cc index e0cb157b922..6a904cd36db 100644 --- a/src/core/lib/event_engine/posix_engine/lockfree_event.cc +++ b/src/core/lib/event_engine/posix_engine/lockfree_event.cc @@ -13,15 +13,14 @@ // limitations under the License. #include "src/core/lib/event_engine/posix_engine/lockfree_event.h" +#include +#include + #include #include #include "absl/log/check.h" #include "absl/status/status.h" - -#include -#include - #include "src/core/lib/event_engine/posix_engine/event_poller.h" #include "src/core/lib/event_engine/posix_engine/posix_engine_closure.h" #include "src/core/util/crash.h" diff --git a/src/core/lib/event_engine/posix_engine/lockfree_event.h b/src/core/lib/event_engine/posix_engine/lockfree_event.h index a9c2635cc91..fb05ae450cb 100644 --- a/src/core/lib/event_engine/posix_engine/lockfree_event.h +++ b/src/core/lib/event_engine/posix_engine/lockfree_event.h @@ -14,13 +14,12 @@ #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_LOCKFREE_EVENT_H #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_LOCKFREE_EVENT_H +#include + #include #include #include "absl/status/status.h" - -#include - #include "src/core/lib/event_engine/posix_engine/posix_engine_closure.h" namespace grpc_event_engine { diff --git a/src/core/lib/event_engine/posix_engine/native_posix_dns_resolver.cc b/src/core/lib/event_engine/posix_engine/native_posix_dns_resolver.cc index 7d4c7a0ac7b..44f23efb71e 100644 --- a/src/core/lib/event_engine/posix_engine/native_posix_dns_resolver.cc +++ b/src/core/lib/event_engine/posix_engine/native_posix_dns_resolver.cc @@ -32,7 +32,6 @@ #include "absl/status/statusor.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" - #include "src/core/lib/event_engine/posix_engine/native_posix_dns_resolver.h" #include "src/core/util/host_port.h" #include "src/core/util/useful.h" diff --git a/src/core/lib/event_engine/posix_engine/native_posix_dns_resolver.h b/src/core/lib/event_engine/posix_engine/native_posix_dns_resolver.h index 693a70fbb43..138f89ac73e 100644 --- a/src/core/lib/event_engine/posix_engine/native_posix_dns_resolver.h +++ b/src/core/lib/event_engine/posix_engine/native_posix_dns_resolver.h @@ -15,12 +15,11 @@ #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_NATIVE_POSIX_DNS_RESOLVER_H #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_NATIVE_POSIX_DNS_RESOLVER_H +#include + #include #include "absl/strings/string_view.h" - -#include - #include "src/core/lib/iomgr/port.h" #ifdef GRPC_POSIX_SOCKET_RESOLVE_ADDRESS diff --git a/src/core/lib/event_engine/posix_engine/posix_endpoint.cc b/src/core/lib/event_engine/posix_engine/posix_endpoint.cc index bf6a78bb23c..ab1e61fbf65 100644 --- a/src/core/lib/event_engine/posix_engine/posix_endpoint.cc +++ b/src/core/lib/event_engine/posix_engine/posix_endpoint.cc @@ -14,6 +14,11 @@ #include "src/core/lib/event_engine/posix_engine/posix_endpoint.h" #include +#include +#include +#include +#include +#include #include #include @@ -32,13 +37,6 @@ #include "absl/status/statusor.h" #include "absl/strings/str_cat.h" #include "absl/types/optional.h" - -#include -#include -#include -#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" diff --git a/src/core/lib/event_engine/posix_engine/posix_endpoint.h b/src/core/lib/event_engine/posix_engine/posix_endpoint.h index 81ec03c7f0f..98d0e169c8a 100644 --- a/src/core/lib/event_engine/posix_engine/posix_endpoint.h +++ b/src/core/lib/event_engine/posix_engine/posix_endpoint.h @@ -19,6 +19,11 @@ // IWYU pragma: no_include +#include +#include +#include +#include + #include #include #include @@ -33,12 +38,6 @@ #include "absl/log/log.h" #include "absl/status/status.h" #include "absl/status/statusor.h" - -#include -#include -#include -#include - #include "src/core/lib/event_engine/extensions/supports_fd.h" #include "src/core/lib/event_engine/posix.h" #include "src/core/lib/event_engine/posix_engine/event_poller.h" diff --git a/src/core/lib/event_engine/posix_engine/posix_engine.cc b/src/core/lib/event_engine/posix_engine/posix_engine.cc index d0683677795..f2275975b0d 100644 --- a/src/core/lib/event_engine/posix_engine/posix_engine.cc +++ b/src/core/lib/event_engine/posix_engine/posix_engine.cc @@ -13,6 +13,12 @@ // limitations under the License. #include "src/core/lib/event_engine/posix_engine/posix_engine.h" +#include +#include +#include +#include +#include + #include #include #include @@ -30,13 +36,6 @@ #include "absl/status/status.h" #include "absl/strings/match.h" #include "absl/strings/str_cat.h" - -#include -#include -#include -#include -#include - #include "src/core/lib/debug/trace.h" #include "src/core/lib/event_engine/ares_resolver.h" #include "src/core/lib/event_engine/forkable.h" diff --git a/src/core/lib/event_engine/posix_engine/posix_engine.h b/src/core/lib/event_engine/posix_engine/posix_engine.h index f2483d11653..82be0bdd0e5 100644 --- a/src/core/lib/event_engine/posix_engine/posix_engine.h +++ b/src/core/lib/event_engine/posix_engine/posix_engine.h @@ -13,6 +13,11 @@ // limitations under the License. #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_POSIX_ENGINE_H #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_POSIX_ENGINE_H +#include +#include +#include +#include + #include #include #include @@ -27,12 +32,6 @@ #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/string_view.h" - -#include -#include -#include -#include - #include "src/core/lib/event_engine/handle_containers.h" #include "src/core/lib/event_engine/posix.h" #include "src/core/lib/event_engine/posix_engine/event_poller.h" diff --git a/src/core/lib/event_engine/posix_engine/posix_engine_closure.h b/src/core/lib/event_engine/posix_engine/posix_engine_closure.h index 084b096c14a..46d06f9c024 100644 --- a/src/core/lib/event_engine/posix_engine/posix_engine_closure.h +++ b/src/core/lib/event_engine/posix_engine/posix_engine_closure.h @@ -14,14 +14,14 @@ #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_POSIX_ENGINE_CLOSURE_H #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_POSIX_ENGINE_CLOSURE_H +#include +#include + #include #include "absl/functional/any_invocable.h" #include "absl/status/status.h" -#include -#include - namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/event_engine/posix_engine/posix_engine_listener.cc b/src/core/lib/event_engine/posix_engine/posix_engine_listener.cc index d8b40ab2f71..ce95139e6e8 100644 --- a/src/core/lib/event_engine/posix_engine/posix_engine_listener.cc +++ b/src/core/lib/event_engine/posix_engine/posix_engine_listener.cc @@ -20,7 +20,9 @@ #ifdef GRPC_POSIX_SOCKET_TCP -#include // IWYU pragma: keep +#include // IWYU pragma: keep +#include +#include #include // IWYU pragma: keep #include // IWYU pragma: keep @@ -36,10 +38,6 @@ #include "absl/status/status.h" #include "absl/strings/str_cat.h" #include "absl/types/optional.h" - -#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" diff --git a/src/core/lib/event_engine/posix_engine/posix_engine_listener.h b/src/core/lib/event_engine/posix_engine/posix_engine_listener.h index 40c43de8c12..1ddbe1b3fb9 100644 --- a/src/core/lib/event_engine/posix_engine/posix_engine_listener.h +++ b/src/core/lib/event_engine/posix_engine/posix_engine_listener.h @@ -14,6 +14,11 @@ #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_POSIX_ENGINE_LISTENER_H #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_POSIX_ENGINE_LISTENER_H +#include +#include +#include +#include +#include #include #include @@ -26,13 +31,6 @@ #include "absl/functional/any_invocable.h" #include "absl/status/status.h" #include "absl/status/statusor.h" - -#include -#include -#include -#include -#include - #include "src/core/lib/event_engine/posix.h" #include "src/core/lib/iomgr/port.h" #include "src/core/util/sync.h" diff --git a/src/core/lib/event_engine/posix_engine/posix_engine_listener_utils.cc b/src/core/lib/event_engine/posix_engine/posix_engine_listener_utils.cc index b3532e2d860..f8db2f28df9 100644 --- a/src/core/lib/event_engine/posix_engine/posix_engine_listener_utils.cc +++ b/src/core/lib/event_engine/posix_engine/posix_engine_listener_utils.cc @@ -14,6 +14,8 @@ #include "src/core/lib/event_engine/posix_engine/posix_engine_listener_utils.h" +#include +#include #include #include #include @@ -27,10 +29,6 @@ #include "absl/status/status.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_replace.h" - -#include -#include - #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/iomgr/port.h" diff --git a/src/core/lib/event_engine/posix_engine/posix_engine_listener_utils.h b/src/core/lib/event_engine/posix_engine/posix_engine_listener_utils.h index e5a9684545a..2fe3f68161c 100644 --- a/src/core/lib/event_engine/posix_engine/posix_engine_listener_utils.h +++ b/src/core/lib/event_engine/posix_engine/posix_engine_listener_utils.h @@ -14,11 +14,10 @@ #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_POSIX_ENGINE_LISTENER_UTILS_H #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_POSIX_ENGINE_LISTENER_UTILS_H -#include "absl/status/statusor.h" - #include #include +#include "absl/status/statusor.h" #include "src/core/lib/event_engine/posix_engine/tcp_socket_utils.h" namespace grpc_event_engine { diff --git a/src/core/lib/event_engine/posix_engine/tcp_socket_utils.cc b/src/core/lib/event_engine/posix_engine/tcp_socket_utils.cc index fad1a7f6730..2631b9926ef 100644 --- a/src/core/lib/event_engine/posix_engine/tcp_socket_utils.cc +++ b/src/core/lib/event_engine/posix_engine/tcp_socket_utils.cc @@ -15,18 +15,16 @@ #include "src/core/lib/event_engine/posix_engine/tcp_socket_utils.h" #include +#include +#include +#include +#include #include #include "absl/cleanup/cleanup.h" #include "absl/status/statusor.h" #include "absl/strings/str_cat.h" #include "absl/types/optional.h" - -#include -#include -#include -#include - #include "src/core/lib/iomgr/port.h" #include "src/core/util/crash.h" // IWYU pragma: keep #include "src/core/util/time.h" @@ -51,7 +49,6 @@ #include "absl/log/check.h" #include "absl/log/log.h" #include "absl/status/status.h" - #include "src/core/lib/event_engine/tcp_socket_utils.h" #include "src/core/util/status_helper.h" #include "src/core/util/strerror.h" diff --git a/src/core/lib/event_engine/posix_engine/tcp_socket_utils.h b/src/core/lib/event_engine/posix_engine/tcp_socket_utils.h index 07bd3308d1d..5a11675cbec 100644 --- a/src/core/lib/event_engine/posix_engine/tcp_socket_utils.h +++ b/src/core/lib/event_engine/posix_engine/tcp_socket_utils.h @@ -15,6 +15,12 @@ #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_TCP_SOCKET_UTILS_H #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_TCP_SOCKET_UTILS_H +#include +#include +#include +#include +#include + #include #include #include @@ -22,13 +28,6 @@ #include "absl/log/check.h" #include "absl/status/status.h" #include "absl/status/statusor.h" - -#include -#include -#include -#include -#include - #include "src/core/lib/iomgr/port.h" #include "src/core/lib/iomgr/socket_mutator.h" #include "src/core/lib/resource_quota/resource_quota.h" diff --git a/src/core/lib/event_engine/posix_engine/timer.cc b/src/core/lib/event_engine/posix_engine/timer.cc index 8e77e251bcc..4f4c303721d 100644 --- a/src/core/lib/event_engine/posix_engine/timer.cc +++ b/src/core/lib/event_engine/posix_engine/timer.cc @@ -18,14 +18,14 @@ #include "src/core/lib/event_engine/posix_engine/timer.h" +#include +#include + #include #include #include #include -#include -#include - #include "src/core/lib/event_engine/posix_engine/timer_heap.h" #include "src/core/util/time.h" #include "src/core/util/useful.h" diff --git a/src/core/lib/event_engine/posix_engine/timer.h b/src/core/lib/event_engine/posix_engine/timer.h index 54f753b91cf..7528ca89c1e 100644 --- a/src/core/lib/event_engine/posix_engine/timer.h +++ b/src/core/lib/event_engine/posix_engine/timer.h @@ -19,6 +19,8 @@ #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_TIMER_H #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_TIMER_H +#include +#include #include #include @@ -28,10 +30,6 @@ #include "absl/base/thread_annotations.h" #include "absl/types/optional.h" - -#include -#include - #include "src/core/lib/event_engine/posix_engine/timer_heap.h" #include "src/core/util/sync.h" #include "src/core/util/time.h" diff --git a/src/core/lib/event_engine/posix_engine/timer_heap.cc b/src/core/lib/event_engine/posix_engine/timer_heap.cc index c3e560ba5cc..85fbdb9e01d 100644 --- a/src/core/lib/event_engine/posix_engine/timer_heap.cc +++ b/src/core/lib/event_engine/posix_engine/timer_heap.cc @@ -18,12 +18,11 @@ #include "src/core/lib/event_engine/posix_engine/timer_heap.h" +#include #include #include -#include - #include "src/core/lib/event_engine/posix_engine/timer.h" namespace grpc_event_engine { diff --git a/src/core/lib/event_engine/posix_engine/timer_heap.h b/src/core/lib/event_engine/posix_engine/timer_heap.h index a13bc206cba..b59eb9b127f 100644 --- a/src/core/lib/event_engine/posix_engine/timer_heap.h +++ b/src/core/lib/event_engine/posix_engine/timer_heap.h @@ -19,11 +19,11 @@ #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_TIMER_HEAP_H #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_TIMER_HEAP_H +#include + #include #include -#include - namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/event_engine/posix_engine/timer_manager.cc b/src/core/lib/event_engine/posix_engine/timer_manager.cc index 8a0373cf86b..4b2097e8b81 100644 --- a/src/core/lib/event_engine/posix_engine/timer_manager.cc +++ b/src/core/lib/event_engine/posix_engine/timer_manager.cc @@ -18,6 +18,9 @@ #include "src/core/lib/event_engine/posix_engine/timer_manager.h" +#include +#include + #include #include @@ -25,10 +28,6 @@ #include "absl/log/log.h" #include "absl/time/time.h" #include "absl/types/optional.h" - -#include -#include - #include "src/core/lib/debug/trace.h" static thread_local bool g_timer_thread; diff --git a/src/core/lib/event_engine/posix_engine/timer_manager.h b/src/core/lib/event_engine/posix_engine/timer_manager.h index 3650a06dfce..c7616db7c62 100644 --- a/src/core/lib/event_engine/posix_engine/timer_manager.h +++ b/src/core/lib/event_engine/posix_engine/timer_manager.h @@ -19,6 +19,8 @@ #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_TIMER_MANAGER_H #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_TIMER_MANAGER_H +#include +#include #include #include @@ -26,10 +28,6 @@ #include "absl/base/thread_annotations.h" #include "absl/types/optional.h" - -#include -#include - #include "src/core/lib/event_engine/forkable.h" #include "src/core/lib/event_engine/posix_engine/timer.h" #include "src/core/lib/event_engine/thread_pool/thread_pool.h" diff --git a/src/core/lib/event_engine/posix_engine/traced_buffer_list.cc b/src/core/lib/event_engine/posix_engine/traced_buffer_list.cc index d908ca76943..2bc411b9d6e 100644 --- a/src/core/lib/event_engine/posix_engine/traced_buffer_list.cc +++ b/src/core/lib/event_engine/posix_engine/traced_buffer_list.cc @@ -14,6 +14,8 @@ #include "src/core/lib/event_engine/posix_engine/traced_buffer_list.h" +#include +#include #include #include #include @@ -23,10 +25,6 @@ #include "absl/functional/any_invocable.h" #include "absl/log/log.h" - -#include -#include - #include "src/core/lib/iomgr/port.h" #include "src/core/util/sync.h" diff --git a/src/core/lib/event_engine/posix_engine/traced_buffer_list.h b/src/core/lib/event_engine/posix_engine/traced_buffer_list.h index 1df29a14243..bd77ea81139 100644 --- a/src/core/lib/event_engine/posix_engine/traced_buffer_list.h +++ b/src/core/lib/event_engine/posix_engine/traced_buffer_list.h @@ -15,15 +15,13 @@ #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_TRACED_BUFFER_LIST_H #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_TRACED_BUFFER_LIST_H +#include +#include #include #include "absl/functional/any_invocable.h" #include "absl/status/status.h" #include "absl/types/optional.h" - -#include -#include - #include "src/core/lib/event_engine/posix_engine/internal_errqueue.h" #include "src/core/lib/iomgr/port.h" #include "src/core/util/sync.h" diff --git a/src/core/lib/event_engine/posix_engine/wakeup_fd_eventfd.cc b/src/core/lib/event_engine/posix_engine/wakeup_fd_eventfd.cc index d6efbd26671..e23df12cdfa 100644 --- a/src/core/lib/event_engine/posix_engine/wakeup_fd_eventfd.cc +++ b/src/core/lib/event_engine/posix_engine/wakeup_fd_eventfd.cc @@ -12,12 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include + #include #include "absl/strings/str_cat.h" - -#include - #include "src/core/lib/iomgr/port.h" #include "src/core/util/crash.h" // IWYU pragma: keep diff --git a/src/core/lib/event_engine/posix_engine/wakeup_fd_eventfd.h b/src/core/lib/event_engine/posix_engine/wakeup_fd_eventfd.h index 6ab9a6eaeb4..62d5c658240 100644 --- a/src/core/lib/event_engine/posix_engine/wakeup_fd_eventfd.h +++ b/src/core/lib/event_engine/posix_engine/wakeup_fd_eventfd.h @@ -14,13 +14,12 @@ #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_WAKEUP_FD_EVENTFD_H #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_WAKEUP_FD_EVENTFD_H +#include + #include #include "absl/status/status.h" #include "absl/status/statusor.h" - -#include - #include "src/core/lib/event_engine/posix_engine/wakeup_fd_posix.h" namespace grpc_event_engine { diff --git a/src/core/lib/event_engine/posix_engine/wakeup_fd_pipe.cc b/src/core/lib/event_engine/posix_engine/wakeup_fd_pipe.cc index 9f2a0959df3..9aa1ba317c5 100644 --- a/src/core/lib/event_engine/posix_engine/wakeup_fd_pipe.cc +++ b/src/core/lib/event_engine/posix_engine/wakeup_fd_pipe.cc @@ -12,13 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include + #include #include #include "absl/strings/str_cat.h" - -#include - #include "src/core/lib/iomgr/port.h" #include "src/core/util/crash.h" // IWYU pragma: keep diff --git a/src/core/lib/event_engine/posix_engine/wakeup_fd_pipe.h b/src/core/lib/event_engine/posix_engine/wakeup_fd_pipe.h index 7676d6cf57b..9884363907c 100644 --- a/src/core/lib/event_engine/posix_engine/wakeup_fd_pipe.h +++ b/src/core/lib/event_engine/posix_engine/wakeup_fd_pipe.h @@ -14,13 +14,12 @@ #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_WAKEUP_FD_PIPE_H #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_WAKEUP_FD_PIPE_H +#include + #include #include "absl/status/status.h" #include "absl/status/statusor.h" - -#include - #include "src/core/lib/event_engine/posix_engine/wakeup_fd_posix.h" namespace grpc_event_engine { diff --git a/src/core/lib/event_engine/posix_engine/wakeup_fd_posix.h b/src/core/lib/event_engine/posix_engine/wakeup_fd_posix.h index 119dab7ecfb..2e7f1574280 100644 --- a/src/core/lib/event_engine/posix_engine/wakeup_fd_posix.h +++ b/src/core/lib/event_engine/posix_engine/wakeup_fd_posix.h @@ -42,10 +42,10 @@ #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_WAKEUP_FD_POSIX_H #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_WAKEUP_FD_POSIX_H -#include "absl/status/status.h" - #include +#include "absl/status/status.h" + namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/event_engine/posix_engine/wakeup_fd_posix_default.cc b/src/core/lib/event_engine/posix_engine/wakeup_fd_posix_default.cc index 35768988b65..71caee017bd 100644 --- a/src/core/lib/event_engine/posix_engine/wakeup_fd_posix_default.cc +++ b/src/core/lib/event_engine/posix_engine/wakeup_fd_posix_default.cc @@ -11,13 +11,12 @@ // 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 "absl/status/status.h" #include "absl/status/statusor.h" - -#include - #include "src/core/lib/event_engine/posix_engine/wakeup_fd_eventfd.h" #include "src/core/lib/event_engine/posix_engine/wakeup_fd_pipe.h" #include "src/core/lib/event_engine/posix_engine/wakeup_fd_posix.h" diff --git a/src/core/lib/event_engine/posix_engine/wakeup_fd_posix_default.h b/src/core/lib/event_engine/posix_engine/wakeup_fd_posix_default.h index 40e9381576a..51f766fe760 100644 --- a/src/core/lib/event_engine/posix_engine/wakeup_fd_posix_default.h +++ b/src/core/lib/event_engine/posix_engine/wakeup_fd_posix_default.h @@ -14,12 +14,12 @@ #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_WAKEUP_FD_POSIX_DEFAULT_H #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_WAKEUP_FD_POSIX_DEFAULT_H +#include + #include #include "absl/status/statusor.h" -#include - namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/event_engine/query_extensions.h b/src/core/lib/event_engine/query_extensions.h index 2b39214e635..a9c7e7b8fff 100644 --- a/src/core/lib/event_engine/query_extensions.h +++ b/src/core/lib/event_engine/query_extensions.h @@ -14,11 +14,11 @@ #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_QUERY_EXTENSIONS_H #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_QUERY_EXTENSIONS_H -#include "absl/strings/string_view.h" - #include #include +#include "absl/strings/string_view.h" + namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/event_engine/ref_counted_dns_resolver_interface.h b/src/core/lib/event_engine/ref_counted_dns_resolver_interface.h index 107ba10f75b..3de70e7cd38 100644 --- a/src/core/lib/event_engine/ref_counted_dns_resolver_interface.h +++ b/src/core/lib/event_engine/ref_counted_dns_resolver_interface.h @@ -15,13 +15,11 @@ #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_REF_COUNTED_DNS_RESOLVER_INTERFACE_H #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_REF_COUNTED_DNS_RESOLVER_INTERFACE_H -#include - -#include "absl/strings/string_view.h" - #include #include +#include +#include "absl/strings/string_view.h" #include "src/core/util/orphanable.h" namespace grpc_event_engine { diff --git a/src/core/lib/event_engine/resolved_address.cc b/src/core/lib/event_engine/resolved_address.cc index 95c37586ae2..1a41663bedd 100644 --- a/src/core/lib/event_engine/resolved_address.cc +++ b/src/core/lib/event_engine/resolved_address.cc @@ -14,13 +14,11 @@ #include "src/core/lib/iomgr/resolved_address.h" -#include - -#include "absl/log/check.h" - #include #include +#include +#include "absl/log/check.h" #include "src/core/lib/event_engine/resolved_address_internal.h" // IWYU pragma: no_include diff --git a/src/core/lib/event_engine/slice.cc b/src/core/lib/event_engine/slice.cc index 7d4a6c4a051..ea6994631ac 100644 --- a/src/core/lib/event_engine/slice.cc +++ b/src/core/lib/event_engine/slice.cc @@ -14,17 +14,15 @@ #include "src/core/lib/slice/slice.h" +#include +#include +#include #include #include #include #include "absl/log/check.h" - -#include -#include -#include - #include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/slice/slice_refcount.h" diff --git a/src/core/lib/event_engine/slice_buffer.cc b/src/core/lib/event_engine/slice_buffer.cc index 4a1aa804837..5b8ad807ad7 100644 --- a/src/core/lib/event_engine/slice_buffer.cc +++ b/src/core/lib/event_engine/slice_buffer.cc @@ -12,12 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - #include #include #include #include +#include #include "src/core/lib/slice/slice.h" diff --git a/src/core/lib/event_engine/tcp_socket_utils.cc b/src/core/lib/event_engine/tcp_socket_utils.cc index 1353249817d..d4ef7a8bb48 100644 --- a/src/core/lib/event_engine/tcp_socket_utils.cc +++ b/src/core/lib/event_engine/tcp_socket_utils.cc @@ -58,7 +58,6 @@ #include "absl/status/status.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" - #include "src/core/lib/iomgr/resolved_address.h" #include "src/core/util/host_port.h" #include "src/core/util/status_helper.h" diff --git a/src/core/lib/event_engine/tcp_socket_utils.h b/src/core/lib/event_engine/tcp_socket_utils.h index d048a124b06..c8f25fe45fb 100644 --- a/src/core/lib/event_engine/tcp_socket_utils.h +++ b/src/core/lib/event_engine/tcp_socket_utils.h @@ -14,14 +14,14 @@ #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_TCP_SOCKET_UTILS_H #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_TCP_SOCKET_UTILS_H +#include +#include + #include #include "absl/status/statusor.h" #include "absl/types/optional.h" -#include -#include - namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/event_engine/thread_pool/thread_count.cc b/src/core/lib/event_engine/thread_pool/thread_count.cc index faeffe1f896..c2010a2a448 100644 --- a/src/core/lib/event_engine/thread_pool/thread_count.cc +++ b/src/core/lib/event_engine/thread_pool/thread_count.cc @@ -13,6 +13,7 @@ // limitations under the License. #include "src/core/lib/event_engine/thread_pool/thread_count.h" +#include #include #include @@ -22,9 +23,6 @@ #include "absl/strings/str_format.h" #include "absl/time/clock.h" #include "absl/time/time.h" - -#include - #include "src/core/util/time.h" namespace grpc_event_engine { diff --git a/src/core/lib/event_engine/thread_pool/thread_count.h b/src/core/lib/event_engine/thread_pool/thread_count.h index 7bca370e9e1..cbd10fcfd71 100644 --- a/src/core/lib/event_engine/thread_pool/thread_count.h +++ b/src/core/lib/event_engine/thread_pool/thread_count.h @@ -14,6 +14,9 @@ #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_THREAD_POOL_THREAD_COUNT_H #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_THREAD_POOL_THREAD_COUNT_H +#include +#include + #include #include #include @@ -22,10 +25,6 @@ #include #include "absl/base/thread_annotations.h" - -#include -#include - #include "src/core/util/sync.h" #include "src/core/util/time.h" #include "src/core/util/useful.h" diff --git a/src/core/lib/event_engine/thread_pool/thread_pool.h b/src/core/lib/event_engine/thread_pool/thread_pool.h index 2590d891a30..e4648d1dbd3 100644 --- a/src/core/lib/event_engine/thread_pool/thread_pool.h +++ b/src/core/lib/event_engine/thread_pool/thread_pool.h @@ -13,15 +13,13 @@ // limitations under the License. #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_THREAD_POOL_THREAD_POOL_H #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_THREAD_POOL_THREAD_POOL_H +#include +#include #include #include #include "absl/functional/any_invocable.h" - -#include -#include - #include "src/core/lib/event_engine/forkable.h" namespace grpc_event_engine { diff --git a/src/core/lib/event_engine/thread_pool/thread_pool_factory.cc b/src/core/lib/event_engine/thread_pool/thread_pool_factory.cc index bea6d8d526c..e3a3799b6a4 100644 --- a/src/core/lib/event_engine/thread_pool/thread_pool_factory.cc +++ b/src/core/lib/event_engine/thread_pool/thread_pool_factory.cc @@ -11,12 +11,11 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. +#include #include #include -#include - #include "src/core/lib/event_engine/forkable.h" #include "src/core/lib/event_engine/thread_pool/thread_pool.h" #include "src/core/lib/event_engine/thread_pool/work_stealing_thread_pool.h" diff --git a/src/core/lib/event_engine/thread_pool/work_stealing_thread_pool.cc b/src/core/lib/event_engine/thread_pool/work_stealing_thread_pool.cc index 852cf0f3915..a8f35bb1cfd 100644 --- a/src/core/lib/event_engine/thread_pool/work_stealing_thread_pool.cc +++ b/src/core/lib/event_engine/thread_pool/work_stealing_thread_pool.cc @@ -17,6 +17,8 @@ // #include "src/core/lib/event_engine/thread_pool/work_stealing_thread_pool.h" +#include +#include #include #include @@ -31,10 +33,6 @@ #include "absl/time/clock.h" #include "absl/time/time.h" #include "absl/types/optional.h" - -#include -#include - #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" diff --git a/src/core/lib/event_engine/thread_pool/work_stealing_thread_pool.h b/src/core/lib/event_engine/thread_pool/work_stealing_thread_pool.h index 69beaa7cddd..a0c79f64da0 100644 --- a/src/core/lib/event_engine/thread_pool/work_stealing_thread_pool.h +++ b/src/core/lib/event_engine/thread_pool/work_stealing_thread_pool.h @@ -18,6 +18,9 @@ #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_THREAD_POOL_WORK_STEALING_THREAD_POOL_H #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_THREAD_POOL_WORK_STEALING_THREAD_POOL_H +#include +#include +#include #include #include @@ -27,11 +30,6 @@ #include "absl/base/thread_annotations.h" #include "absl/container/flat_hash_set.h" #include "absl/functional/any_invocable.h" - -#include -#include -#include - #include "src/core/lib/event_engine/thread_pool/thread_count.h" #include "src/core/lib/event_engine/thread_pool/thread_pool.h" #include "src/core/lib/event_engine/work_queue/basic_work_queue.h" diff --git a/src/core/lib/event_engine/thready_event_engine/thready_event_engine.cc b/src/core/lib/event_engine/thready_event_engine/thready_event_engine.cc index 5475f2e45a0..94b53e9081b 100644 --- a/src/core/lib/event_engine/thready_event_engine/thready_event_engine.cc +++ b/src/core/lib/event_engine/thready_event_engine/thready_event_engine.cc @@ -14,13 +14,13 @@ #include "src/core/lib/event_engine/thready_event_engine/thready_event_engine.h" +#include + #include #include #include #include -#include - #include "src/core/util/crash.h" #include "src/core/util/sync.h" #include "src/core/util/thd.h" diff --git a/src/core/lib/event_engine/thready_event_engine/thready_event_engine.h b/src/core/lib/event_engine/thready_event_engine/thready_event_engine.h index 8b87d90a757..02f90c7a771 100644 --- a/src/core/lib/event_engine/thready_event_engine/thready_event_engine.h +++ b/src/core/lib/event_engine/thready_event_engine/thready_event_engine.h @@ -15,6 +15,11 @@ #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_THREADY_EVENT_ENGINE_THREADY_EVENT_ENGINE_H #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_THREADY_EVENT_ENGINE_THREADY_EVENT_ENGINE_H +#include +#include +#include +#include + #include #include @@ -23,11 +28,6 @@ #include "absl/status/statusor.h" #include "absl/strings/string_view.h" -#include -#include -#include -#include - namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/event_engine/time_util.cc b/src/core/lib/event_engine/time_util.cc index d7b663581d1..ab542b1e258 100644 --- a/src/core/lib/event_engine/time_util.cc +++ b/src/core/lib/event_engine/time_util.cc @@ -13,11 +13,11 @@ // limitations under the License. #include "src/core/lib/event_engine/time_util.h" -#include - #include #include +#include + namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/event_engine/time_util.h b/src/core/lib/event_engine/time_util.h index 813b6cda8f8..14ec99ab5d1 100644 --- a/src/core/lib/event_engine/time_util.h +++ b/src/core/lib/event_engine/time_util.h @@ -14,10 +14,9 @@ #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_TIME_UTIL_H #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_TIME_UTIL_H -#include - #include #include +#include namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/event_engine/utils.cc b/src/core/lib/event_engine/utils.cc index d0d1b436c5d..f2a202315ce 100644 --- a/src/core/lib/event_engine/utils.cc +++ b/src/core/lib/event_engine/utils.cc @@ -13,15 +13,13 @@ // limitations under the License. #include "src/core/lib/event_engine/utils.h" +#include +#include #include #include #include "absl/strings/str_cat.h" - -#include -#include - #include "src/core/util/time.h" namespace grpc_event_engine { diff --git a/src/core/lib/event_engine/utils.h b/src/core/lib/event_engine/utils.h index 5edfcd890f0..45675ee8d88 100644 --- a/src/core/lib/event_engine/utils.h +++ b/src/core/lib/event_engine/utils.h @@ -14,13 +14,12 @@ #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_UTILS_H #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_UTILS_H +#include +#include #include #include -#include -#include - #include "src/core/util/time.h" namespace grpc_event_engine { diff --git a/src/core/lib/event_engine/windows/.clang-format b/src/core/lib/event_engine/windows/.clang-format deleted file mode 100644 index 5f150ef6edb..00000000000 --- a/src/core/lib/event_engine/windows/.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/src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc b/src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc index 3723b3463ed..3bfd15537e6 100644 --- a/src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc +++ b/src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc @@ -18,17 +18,14 @@ #if GRPC_ARES == 1 && defined(GRPC_WINDOWS_SOCKET_ARES_EV_DRIVER) -#include - #include +#include +#include #include "absl/functional/any_invocable.h" #include "absl/log/check.h" #include "absl/status/status.h" #include "absl/strings/str_format.h" - -#include - #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/event_engine/ares_resolver.h" #include "src/core/lib/event_engine/grpc_polled_fd.h" diff --git a/src/core/lib/event_engine/windows/grpc_polled_fd_windows.h b/src/core/lib/event_engine/windows/grpc_polled_fd_windows.h index e16c8e80e9e..f0efeaccfcc 100644 --- a/src/core/lib/event_engine/windows/grpc_polled_fd_windows.h +++ b/src/core/lib/event_engine/windows/grpc_polled_fd_windows.h @@ -21,15 +21,13 @@ #if GRPC_ARES == 1 && defined(GRPC_WINDOWS_SOCKET_ARES_EV_DRIVER) -#include - #include +#include + +#include #include "absl/functional/any_invocable.h" #include "absl/status/status.h" - -#include - #include "src/core/lib/event_engine/common_closures.h" #include "src/core/lib/event_engine/grpc_polled_fd.h" #include "src/core/lib/event_engine/windows/iocp.h" diff --git a/src/core/lib/event_engine/windows/iocp.cc b/src/core/lib/event_engine/windows/iocp.cc index 74d875ba2ab..b3458b3e05a 100644 --- a/src/core/lib/event_engine/windows/iocp.cc +++ b/src/core/lib/event_engine/windows/iocp.cc @@ -15,14 +15,13 @@ #ifdef GPR_WINDOWS +#include +#include + #include #include "absl/log/check.h" #include "absl/strings/str_format.h" - -#include -#include - #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/windows/iocp.h" diff --git a/src/core/lib/event_engine/windows/iocp.h b/src/core/lib/event_engine/windows/iocp.h index 9c972ed0f92..812f773b85c 100644 --- a/src/core/lib/event_engine/windows/iocp.h +++ b/src/core/lib/event_engine/windows/iocp.h @@ -18,10 +18,9 @@ #ifdef GPR_WINDOWS -#include "absl/status/status.h" - #include +#include "absl/status/status.h" #include "src/core/lib/event_engine/poller.h" #include "src/core/lib/event_engine/thread_pool/thread_pool.h" #include "src/core/lib/event_engine/windows/win_socket.h" diff --git a/src/core/lib/event_engine/windows/native_windows_dns_resolver.cc b/src/core/lib/event_engine/windows/native_windows_dns_resolver.cc index d8114497b11..6a1caaf9116 100644 --- a/src/core/lib/event_engine/windows/native_windows_dns_resolver.cc +++ b/src/core/lib/event_engine/windows/native_windows_dns_resolver.cc @@ -14,6 +14,7 @@ #include #ifdef GPR_WINDOWS +#include #include #include #include @@ -22,9 +23,6 @@ #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" - -#include - #include "src/core/lib/event_engine/windows/native_windows_dns_resolver.h" #include "src/core/lib/iomgr/error.h" #include "src/core/util/host_port.h" diff --git a/src/core/lib/event_engine/windows/win_socket.cc b/src/core/lib/event_engine/windows/win_socket.cc index 79fc2bec4fe..482d4bb06f7 100644 --- a/src/core/lib/event_engine/windows/win_socket.cc +++ b/src/core/lib/event_engine/windows/win_socket.cc @@ -14,12 +14,11 @@ #include #ifdef GPR_WINDOWS -#include "absl/log/check.h" -#include "absl/log/log.h" - #include #include +#include "absl/log/check.h" +#include "absl/log/log.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/windows/win_socket.h" diff --git a/src/core/lib/event_engine/windows/win_socket.h b/src/core/lib/event_engine/windows/win_socket.h index 4256179c070..6300279efe6 100644 --- a/src/core/lib/event_engine/windows/win_socket.h +++ b/src/core/lib/event_engine/windows/win_socket.h @@ -18,11 +18,10 @@ #ifdef GPR_WINDOWS -#include "absl/base/thread_annotations.h" -#include "absl/functional/any_invocable.h" - #include +#include "absl/base/thread_annotations.h" +#include "absl/functional/any_invocable.h" #include "src/core/lib/event_engine/thread_pool/thread_pool.h" #include "src/core/util/debug_location.h" #include "src/core/util/sync.h" diff --git a/src/core/lib/event_engine/windows/windows_endpoint.cc b/src/core/lib/event_engine/windows/windows_endpoint.cc index ec4118c7fd2..3b16c060de6 100644 --- a/src/core/lib/event_engine/windows/windows_endpoint.cc +++ b/src/core/lib/event_engine/windows/windows_endpoint.cc @@ -15,16 +15,15 @@ #ifdef GPR_WINDOWS +#include +#include + #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" - -#include -#include - #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/windows/windows_endpoint.h" diff --git a/src/core/lib/event_engine/windows/windows_engine.cc b/src/core/lib/event_engine/windows/windows_engine.cc index 31e2eb03569..6a1fb634fe5 100644 --- a/src/core/lib/event_engine/windows/windows_engine.cc +++ b/src/core/lib/event_engine/windows/windows_engine.cc @@ -15,6 +15,12 @@ #ifdef GPR_WINDOWS +#include +#include +#include +#include +#include + #include #include @@ -23,13 +29,6 @@ #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/string_view.h" - -#include -#include -#include -#include -#include - #include "src/core/lib/event_engine/channel_args_endpoint_config.h" #include "src/core/lib/event_engine/common_closures.h" #include "src/core/lib/event_engine/handle_containers.h" diff --git a/src/core/lib/event_engine/windows/windows_engine.h b/src/core/lib/event_engine/windows/windows_engine.h index 98ca81e1a52..c9a597b5713 100644 --- a/src/core/lib/event_engine/windows/windows_engine.h +++ b/src/core/lib/event_engine/windows/windows_engine.h @@ -20,17 +20,16 @@ #ifdef GPR_WINDOWS -#include - -#include "absl/status/status.h" -#include "absl/status/statusor.h" -#include "absl/strings/string_view.h" - #include #include #include #include +#include + +#include "absl/status/status.h" +#include "absl/status/statusor.h" +#include "absl/strings/string_view.h" #include "src/core/lib/event_engine/ares_resolver.h" #include "src/core/lib/event_engine/handle_containers.h" #include "src/core/lib/event_engine/posix_engine/timer_manager.h" diff --git a/src/core/lib/event_engine/windows/windows_listener.cc b/src/core/lib/event_engine/windows/windows_listener.cc index 2bba1a6e818..63b973cf213 100644 --- a/src/core/lib/event_engine/windows/windows_listener.cc +++ b/src/core/lib/event_engine/windows/windows_listener.cc @@ -19,7 +19,6 @@ #include "absl/log/log.h" #include "absl/status/status.h" #include "absl/strings/str_format.h" - #include "src/core/lib/event_engine/tcp_socket_utils.h" #include "src/core/lib/event_engine/windows/iocp.h" #include "src/core/lib/event_engine/windows/win_socket.h" diff --git a/src/core/lib/event_engine/windows/windows_listener.h b/src/core/lib/event_engine/windows/windows_listener.h index 8e0a5bd0f95..4dd254d7d10 100644 --- a/src/core/lib/event_engine/windows/windows_listener.h +++ b/src/core/lib/event_engine/windows/windows_listener.h @@ -18,14 +18,13 @@ #ifdef GPR_WINDOWS +#include +#include + #include #include "absl/base/thread_annotations.h" #include "absl/status/statusor.h" - -#include -#include - #include "src/core/lib/event_engine/common_closures.h" #include "src/core/lib/event_engine/thread_pool/thread_pool.h" #include "src/core/lib/event_engine/windows/iocp.h" diff --git a/src/core/lib/event_engine/work_queue/basic_work_queue.cc b/src/core/lib/event_engine/work_queue/basic_work_queue.cc index 40bfcf7cd5d..629debf2bc8 100644 --- a/src/core/lib/event_engine/work_queue/basic_work_queue.cc +++ b/src/core/lib/event_engine/work_queue/basic_work_queue.cc @@ -13,10 +13,10 @@ // limitations under the License. #include "src/core/lib/event_engine/work_queue/basic_work_queue.h" -#include - #include +#include + #include "src/core/lib/event_engine/common_closures.h" #include "src/core/util/sync.h" diff --git a/src/core/lib/event_engine/work_queue/basic_work_queue.h b/src/core/lib/event_engine/work_queue/basic_work_queue.h index 93ac366831e..20da2977742 100644 --- a/src/core/lib/event_engine/work_queue/basic_work_queue.h +++ b/src/core/lib/event_engine/work_queue/basic_work_queue.h @@ -13,16 +13,14 @@ // limitations under the License. #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_WORK_QUEUE_BASIC_WORK_QUEUE_H #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_WORK_QUEUE_BASIC_WORK_QUEUE_H +#include +#include #include #include #include "absl/base/thread_annotations.h" #include "absl/functional/any_invocable.h" - -#include -#include - #include "src/core/lib/event_engine/work_queue/work_queue.h" #include "src/core/util/sync.h" diff --git a/src/core/lib/event_engine/work_queue/work_queue.h b/src/core/lib/event_engine/work_queue/work_queue.h index 73c6a74ab21..393a1bce6a0 100644 --- a/src/core/lib/event_engine/work_queue/work_queue.h +++ b/src/core/lib/event_engine/work_queue/work_queue.h @@ -14,13 +14,12 @@ #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_WORK_QUEUE_WORK_QUEUE_H #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_WORK_QUEUE_WORK_QUEUE_H +#include +#include #include #include "absl/functional/any_invocable.h" -#include -#include - namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/experiments/config.cc b/src/core/lib/experiments/config.cc index cab35e0f04a..f2ec5d1a0db 100644 --- a/src/core/lib/experiments/config.cc +++ b/src/core/lib/experiments/config.cc @@ -14,6 +14,7 @@ #include "src/core/lib/experiments/config.h" +#include #include #include @@ -30,9 +31,6 @@ #include "absl/strings/str_split.h" #include "absl/strings/string_view.h" #include "absl/strings/strip.h" - -#include - #include "src/core/lib/config/config_vars.h" #include "src/core/lib/experiments/experiments.h" #include "src/core/util/crash.h" // IWYU pragma: keep diff --git a/src/core/lib/experiments/config.h b/src/core/lib/experiments/config.h index 921875b99bb..e74f7c6b716 100644 --- a/src/core/lib/experiments/config.h +++ b/src/core/lib/experiments/config.h @@ -15,6 +15,7 @@ #ifndef GRPC_SRC_CORE_LIB_EXPERIMENTS_CONFIG_H #define GRPC_SRC_CORE_LIB_EXPERIMENTS_CONFIG_H +#include #include #include @@ -23,8 +24,6 @@ #include "absl/functional/any_invocable.h" #include "absl/strings/string_view.h" -#include - // #define GRPC_EXPERIMENTS_ARE_FINAL namespace grpc_core { diff --git a/src/core/lib/iomgr/buffer_list.cc b/src/core/lib/iomgr/buffer_list.cc index 91bfc45a021..1cc2cbb4e9c 100644 --- a/src/core/lib/iomgr/buffer_list.cc +++ b/src/core/lib/iomgr/buffer_list.cc @@ -18,11 +18,10 @@ #include "src/core/lib/iomgr/buffer_list.h" -#include "absl/log/log.h" - #include #include +#include "absl/log/log.h" #include "src/core/lib/iomgr/port.h" #include "src/core/util/crash.h" #include "src/core/util/sync.h" diff --git a/src/core/lib/iomgr/buffer_list.h b/src/core/lib/iomgr/buffer_list.h index 6805c53c08d..47d390354a8 100644 --- a/src/core/lib/iomgr/buffer_list.h +++ b/src/core/lib/iomgr/buffer_list.h @@ -19,11 +19,10 @@ #ifndef GRPC_SRC_CORE_LIB_IOMGR_BUFFER_LIST_H #define GRPC_SRC_CORE_LIB_IOMGR_BUFFER_LIST_H -#include "absl/types/optional.h" - #include #include +#include "absl/types/optional.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/internal_errqueue.h" #include "src/core/lib/iomgr/port.h" diff --git a/src/core/lib/iomgr/call_combiner.cc b/src/core/lib/iomgr/call_combiner.cc index e20cc0a0986..8459f415157 100644 --- a/src/core/lib/iomgr/call_combiner.cc +++ b/src/core/lib/iomgr/call_combiner.cc @@ -18,13 +18,11 @@ #include "src/core/lib/iomgr/call_combiner.h" +#include #include #include "absl/log/check.h" #include "absl/log/log.h" - -#include - #include "src/core/telemetry/stats.h" #include "src/core/telemetry/stats_data.h" #include "src/core/util/crash.h" diff --git a/src/core/lib/iomgr/call_combiner.h b/src/core/lib/iomgr/call_combiner.h index 23488f51cfc..8e4b7189798 100644 --- a/src/core/lib/iomgr/call_combiner.h +++ b/src/core/lib/iomgr/call_combiner.h @@ -19,14 +19,12 @@ #ifndef GRPC_SRC_CORE_LIB_IOMGR_CALL_COMBINER_H #define GRPC_SRC_CORE_LIB_IOMGR_CALL_COMBINER_H +#include +#include #include #include "absl/container/inlined_vector.h" #include "absl/log/log.h" - -#include -#include - #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/dynamic_annotations.h" #include "src/core/lib/iomgr/exec_ctx.h" diff --git a/src/core/lib/iomgr/cfstream_handle.cc b/src/core/lib/iomgr/cfstream_handle.cc index e70393f6abd..0b64b87f3dd 100644 --- a/src/core/lib/iomgr/cfstream_handle.cc +++ b/src/core/lib/iomgr/cfstream_handle.cc @@ -23,13 +23,11 @@ #ifdef GRPC_CFSTREAM #import - -#include "absl/log/log.h" - #include #include #include +#include "absl/log/log.h" #include "src/core/lib/debug/trace.h" #import "src/core/lib/iomgr/cfstream_handle.h" #include "src/core/lib/iomgr/closure.h" diff --git a/src/core/lib/iomgr/closure.cc b/src/core/lib/iomgr/closure.cc index 12ff26a9156..bbc81f8445e 100644 --- a/src/core/lib/iomgr/closure.cc +++ b/src/core/lib/iomgr/closure.cc @@ -14,10 +14,10 @@ #include "src/core/lib/iomgr/closure.h" -#include "absl/strings/str_format.h" - #include +#include "absl/strings/str_format.h" + std::string grpc_closure::DebugString() const { #ifdef NDEBUG return absl::StrFormat("%p", this); diff --git a/src/core/lib/iomgr/closure.h b/src/core/lib/iomgr/closure.h index cb08c23e7c7..cf01653e9d8 100644 --- a/src/core/lib/iomgr/closure.h +++ b/src/core/lib/iomgr/closure.h @@ -20,14 +20,12 @@ #define GRPC_SRC_CORE_LIB_IOMGR_CLOSURE_H #include +#include +#include #include #include "absl/log/check.h" #include "absl/log/log.h" - -#include -#include - #include "src/core/lib/iomgr/error.h" #include "src/core/util/crash.h" #include "src/core/util/debug_location.h" diff --git a/src/core/lib/iomgr/combiner.cc b/src/core/lib/iomgr/combiner.cc index 31f7b204af9..81f33c70a2b 100644 --- a/src/core/lib/iomgr/combiner.cc +++ b/src/core/lib/iomgr/combiner.cc @@ -19,15 +19,13 @@ #include "src/core/lib/iomgr/combiner.h" #include +#include +#include #include #include #include "absl/log/check.h" #include "absl/log/log.h" - -#include -#include - #include "src/core/lib/experiments/experiments.h" #include "src/core/lib/iomgr/executor.h" #include "src/core/lib/iomgr/iomgr_internal.h" diff --git a/src/core/lib/iomgr/combiner.h b/src/core/lib/iomgr/combiner.h index af15e83af29..f7fd6bd6955 100644 --- a/src/core/lib/iomgr/combiner.h +++ b/src/core/lib/iomgr/combiner.h @@ -19,10 +19,9 @@ #ifndef GRPC_SRC_CORE_LIB_IOMGR_COMBINER_H #define GRPC_SRC_CORE_LIB_IOMGR_COMBINER_H -#include - #include #include +#include #include "src/core/lib/debug/trace.h" #include "src/core/lib/iomgr/exec_ctx.h" diff --git a/src/core/lib/iomgr/endpoint.h b/src/core/lib/iomgr/endpoint.h index c4b70abe4f3..9825d21a6b5 100644 --- a/src/core/lib/iomgr/endpoint.h +++ b/src/core/lib/iomgr/endpoint.h @@ -19,13 +19,12 @@ #ifndef GRPC_SRC_CORE_LIB_IOMGR_ENDPOINT_H #define GRPC_SRC_CORE_LIB_IOMGR_ENDPOINT_H -#include "absl/strings/string_view.h" - #include #include #include #include +#include "absl/strings/string_view.h" #include "src/core/lib/iomgr/pollset.h" #include "src/core/lib/iomgr/pollset_set.h" diff --git a/src/core/lib/iomgr/endpoint_cfstream.cc b/src/core/lib/iomgr/endpoint_cfstream.cc index c542c6ae6bc..3177567e948 100644 --- a/src/core/lib/iomgr/endpoint_cfstream.cc +++ b/src/core/lib/iomgr/endpoint_cfstream.cc @@ -23,14 +23,12 @@ #ifdef GRPC_CFSTREAM_ENDPOINT #import - -#include "absl/log/check.h" -#include "absl/log/log.h" - #include #include #include +#include "absl/log/check.h" +#include "absl/log/log.h" #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/iomgr/cfstream_handle.h" #include "src/core/lib/iomgr/closure.h" diff --git a/src/core/lib/iomgr/endpoint_pair_posix.cc b/src/core/lib/iomgr/endpoint_pair_posix.cc index 85fb3849f29..04c574560c0 100644 --- a/src/core/lib/iomgr/endpoint_pair_posix.cc +++ b/src/core/lib/iomgr/endpoint_pair_posix.cc @@ -24,6 +24,7 @@ #include #include +#include #include #include #include @@ -32,9 +33,6 @@ #include "absl/log/check.h" #include "absl/strings/str_cat.h" - -#include - #include "src/core/lib/event_engine/channel_args_endpoint_config.h" #include "src/core/lib/iomgr/endpoint_pair.h" #include "src/core/lib/iomgr/socket_utils_posix.h" diff --git a/src/core/lib/iomgr/endpoint_pair_windows.cc b/src/core/lib/iomgr/endpoint_pair_windows.cc index f8a746624e6..f30f691323d 100644 --- a/src/core/lib/iomgr/endpoint_pair_windows.cc +++ b/src/core/lib/iomgr/endpoint_pair_windows.cc @@ -27,7 +27,6 @@ #include "absl/log/check.h" #include "absl/log/log.h" - #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/iomgr/endpoint_pair.h" #include "src/core/lib/iomgr/sockaddr.h" diff --git a/src/core/lib/iomgr/error.cc b/src/core/lib/iomgr/error.cc index d637ab6d20c..90f535bcf5e 100644 --- a/src/core/lib/iomgr/error.cc +++ b/src/core/lib/iomgr/error.cc @@ -17,6 +17,10 @@ // #include "src/core/lib/iomgr/error.h" +#include +#include +#include +#include #include #include @@ -24,12 +28,6 @@ #include "absl/log/log.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" - -#include -#include -#include -#include - #include "src/core/util/crash.h" #ifdef GPR_WINDOWS diff --git a/src/core/lib/iomgr/error.h b/src/core/lib/iomgr/error.h index e1fb98107c1..0171c504811 100644 --- a/src/core/lib/iomgr/error.h +++ b/src/core/lib/iomgr/error.h @@ -19,17 +19,15 @@ #ifndef GRPC_SRC_CORE_LIB_IOMGR_ERROR_H #define GRPC_SRC_CORE_LIB_IOMGR_ERROR_H -#include -#include - -#include "absl/log/check.h" -#include "absl/status/status.h" - #include #include #include #include +#include +#include +#include "absl/log/check.h" +#include "absl/status/status.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/util/crash.h" diff --git a/src/core/lib/iomgr/error_cfstream.cc b/src/core/lib/iomgr/error_cfstream.cc index 49f5b0aaddf..b9f7cdf1992 100644 --- a/src/core/lib/iomgr/error_cfstream.cc +++ b/src/core/lib/iomgr/error_cfstream.cc @@ -20,13 +20,11 @@ #ifdef GRPC_CFSTREAM #include +#include #include #include "absl/strings/str_format.h" - -#include - #include "src/core/lib/iomgr/error.h" #define MAX_ERROR_DESCRIPTION 256 diff --git a/src/core/lib/iomgr/ev_apple.cc b/src/core/lib/iomgr/ev_apple.cc index 73ded9294d7..e20f05e5185 100644 --- a/src/core/lib/iomgr/ev_apple.cc +++ b/src/core/lib/iomgr/ev_apple.cc @@ -34,7 +34,6 @@ #include #include "absl/time/time.h" - #include "src/core/lib/iomgr/ev_apple.h" #include "src/core/util/thd.h" #include "src/core/util/time_util.h" diff --git a/src/core/lib/iomgr/ev_epoll1_linux.cc b/src/core/lib/iomgr/ev_epoll1_linux.cc index ff347ac69d6..a290c3d1bdc 100644 --- a/src/core/lib/iomgr/ev_epoll1_linux.cc +++ b/src/core/lib/iomgr/ev_epoll1_linux.cc @@ -27,6 +27,8 @@ #include #include #include +#include +#include #include #include #include @@ -43,10 +45,6 @@ #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" #include "absl/strings/str_join.h" - -#include -#include - #include "src/core/lib/iomgr/block_annotate.h" #include "src/core/lib/iomgr/ev_epoll1_linux.h" #include "src/core/lib/iomgr/ev_posix.h" diff --git a/src/core/lib/iomgr/ev_poll_posix.cc b/src/core/lib/iomgr/ev_poll_posix.cc index 9e955d8c094..32d42c36e27 100644 --- a/src/core/lib/iomgr/ev_poll_posix.cc +++ b/src/core/lib/iomgr/ev_poll_posix.cc @@ -25,6 +25,7 @@ #include #include +#include #include #include #include @@ -37,9 +38,6 @@ #include "absl/log/log.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" - -#include - #include "src/core/lib/iomgr/block_annotate.h" #include "src/core/lib/iomgr/ev_poll_posix.h" #include "src/core/lib/iomgr/iomgr_internal.h" diff --git a/src/core/lib/iomgr/ev_posix.cc b/src/core/lib/iomgr/ev_posix.cc index e195c940d87..055ca6efb5e 100644 --- a/src/core/lib/iomgr/ev_posix.cc +++ b/src/core/lib/iomgr/ev_posix.cc @@ -23,15 +23,13 @@ #ifdef GRPC_POSIX_SOCKET_EV +#include +#include #include #include "absl/log/log.h" #include "absl/strings/str_format.h" #include "absl/strings/str_split.h" - -#include -#include - #include "src/core/lib/config/config_vars.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/iomgr/ev_epoll1_linux.h" diff --git a/src/core/lib/iomgr/ev_posix.h b/src/core/lib/iomgr/ev_posix.h index 8573f0568bc..1e40d81f020 100644 --- a/src/core/lib/iomgr/ev_posix.h +++ b/src/core/lib/iomgr/ev_posix.h @@ -23,9 +23,8 @@ #ifdef GRPC_POSIX_SOCKET_EV -#include - #include +#include #include "src/core/lib/debug/trace.h" #include "src/core/lib/iomgr/exec_ctx.h" diff --git a/src/core/lib/iomgr/event_engine_shims/closure.cc b/src/core/lib/iomgr/event_engine_shims/closure.cc index 8a362210b80..921401941cf 100644 --- a/src/core/lib/iomgr/event_engine_shims/closure.cc +++ b/src/core/lib/iomgr/event_engine_shims/closure.cc @@ -13,13 +13,12 @@ // limitations under the License. #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 #include +#include "absl/functional/any_invocable.h" +#include "absl/log/log.h" +#include "absl/status/status.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/transport/error_utils.h" diff --git a/src/core/lib/iomgr/event_engine_shims/closure.h b/src/core/lib/iomgr/event_engine_shims/closure.h index 87b4e60bee1..2272f68fed7 100644 --- a/src/core/lib/iomgr/event_engine_shims/closure.h +++ b/src/core/lib/iomgr/event_engine_shims/closure.h @@ -14,11 +14,10 @@ #ifndef GRPC_SRC_CORE_LIB_IOMGR_EVENT_ENGINE_SHIMS_CLOSURE_H #define GRPC_SRC_CORE_LIB_IOMGR_EVENT_ENGINE_SHIMS_CLOSURE_H -#include "absl/functional/any_invocable.h" - #include #include +#include "absl/functional/any_invocable.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" diff --git a/src/core/lib/iomgr/event_engine_shims/endpoint.cc b/src/core/lib/iomgr/event_engine_shims/endpoint.cc index 28b1ef42bf1..5fec956179e 100644 --- a/src/core/lib/iomgr/event_engine_shims/endpoint.cc +++ b/src/core/lib/iomgr/event_engine_shims/endpoint.cc @@ -13,6 +13,13 @@ // limitations under the License. #include "src/core/lib/iomgr/event_engine_shims/endpoint.h" +#include +#include +#include +#include +#include +#include + #include #include #include @@ -23,14 +30,6 @@ #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/string_view.h" - -#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" diff --git a/src/core/lib/iomgr/event_engine_shims/endpoint.h b/src/core/lib/iomgr/event_engine_shims/endpoint.h index 2ff27081503..5e59157aa68 100644 --- a/src/core/lib/iomgr/event_engine_shims/endpoint.h +++ b/src/core/lib/iomgr/event_engine_shims/endpoint.h @@ -13,11 +13,11 @@ // limitations under the License. #ifndef GRPC_SRC_CORE_LIB_IOMGR_EVENT_ENGINE_SHIMS_ENDPOINT_H #define GRPC_SRC_CORE_LIB_IOMGR_EVENT_ENGINE_SHIMS_ENDPOINT_H -#include - #include #include +#include + #include "src/core/lib/iomgr/endpoint.h" namespace grpc_event_engine { diff --git a/src/core/lib/iomgr/event_engine_shims/tcp_client.cc b/src/core/lib/iomgr/event_engine_shims/tcp_client.cc index 2880415e192..16d27f005a2 100644 --- a/src/core/lib/iomgr/event_engine_shims/tcp_client.cc +++ b/src/core/lib/iomgr/event_engine_shims/tcp_client.cc @@ -13,13 +13,12 @@ // limitations under the License. #include "src/core/lib/iomgr/event_engine_shims/tcp_client.h" -#include "absl/status/status.h" -#include "absl/status/statusor.h" - #include #include #include +#include "absl/status/status.h" +#include "absl/status/statusor.h" #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" diff --git a/src/core/lib/iomgr/exec_ctx.cc b/src/core/lib/iomgr/exec_ctx.cc index 6bb16390008..23d4248eaa9 100644 --- a/src/core/lib/iomgr/exec_ctx.cc +++ b/src/core/lib/iomgr/exec_ctx.cc @@ -18,13 +18,12 @@ #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 "absl/log/check.h" +#include "absl/log/log.h" +#include "absl/strings/str_format.h" #include "src/core/lib/iomgr/combiner.h" #include "src/core/lib/iomgr/error.h" #include "src/core/util/crash.h" diff --git a/src/core/lib/iomgr/exec_ctx.h b/src/core/lib/iomgr/exec_ctx.h index 0bda1d9af88..2b608ca9a4d 100644 --- a/src/core/lib/iomgr/exec_ctx.h +++ b/src/core/lib/iomgr/exec_ctx.h @@ -19,22 +19,21 @@ #ifndef GRPC_SRC_CORE_LIB_IOMGR_EXEC_CTX_H #define GRPC_SRC_CORE_LIB_IOMGR_EXEC_CTX_H -#include - #include +#include + #if __APPLE__ // Provides TARGET_OS_IPHONE #include #endif -#include "absl/log/check.h" - #include #include #include #include +#include "absl/log/check.h" #include "src/core/lib/experiments/experiments.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/util/debug_location.h" diff --git a/src/core/lib/iomgr/executor.cc b/src/core/lib/iomgr/executor.cc index 9c427b6fd12..b9ff3a5f78f 100644 --- a/src/core/lib/iomgr/executor.cc +++ b/src/core/lib/iomgr/executor.cc @@ -18,17 +18,15 @@ #include "src/core/lib/iomgr/executor.h" -#include - -#include "absl/log/check.h" -#include "absl/log/log.h" -#include "absl/strings/str_format.h" - #include #include #include #include +#include +#include "absl/log/check.h" +#include "absl/log/log.h" +#include "absl/strings/str_format.h" #include "src/core/lib/debug/trace_impl.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/iomgr_internal.h" diff --git a/src/core/lib/iomgr/fork_posix.cc b/src/core/lib/iomgr/fork_posix.cc index 37059aaa815..0d784ea53cc 100644 --- a/src/core/lib/iomgr/fork_posix.cc +++ b/src/core/lib/iomgr/fork_posix.cc @@ -26,13 +26,11 @@ #include #endif -#include - -#include "absl/log/log.h" - #include #include +#include +#include "absl/log/log.h" #include "src/core/lib/iomgr/ev_posix.h" #include "src/core/lib/iomgr/executor.h" #include "src/core/lib/iomgr/timer_manager.h" diff --git a/src/core/lib/iomgr/fork_windows.cc b/src/core/lib/iomgr/fork_windows.cc index 84d0609e2a0..baf9e212469 100644 --- a/src/core/lib/iomgr/fork_windows.cc +++ b/src/core/lib/iomgr/fork_windows.cc @@ -22,10 +22,10 @@ #ifndef GRPC_POSIX_FORK -#include "absl/log/log.h" - #include +#include "absl/log/log.h" + // // NOTE: FORKING IS NOT GENERALLY SUPPORTED, THIS IS ONLY INTENDED TO WORK // AROUND VERY SPECIFIC USE CASES. diff --git a/src/core/lib/iomgr/internal_errqueue.cc b/src/core/lib/iomgr/internal_errqueue.cc index 65199cd8e35..d5386498a53 100644 --- a/src/core/lib/iomgr/internal_errqueue.cc +++ b/src/core/lib/iomgr/internal_errqueue.cc @@ -14,10 +14,9 @@ #include "src/core/lib/iomgr/internal_errqueue.h" -#include "absl/log/log.h" - #include +#include "absl/log/log.h" #include "src/core/lib/iomgr/port.h" #ifdef GRPC_POSIX_SOCKET_TCP diff --git a/src/core/lib/iomgr/iocp_windows.cc b/src/core/lib/iomgr/iocp_windows.cc index 51eae975fbc..12b8cb31c63 100644 --- a/src/core/lib/iomgr/iocp_windows.cc +++ b/src/core/lib/iomgr/iocp_windows.cc @@ -22,16 +22,14 @@ #ifdef GRPC_WINSOCK_SOCKET +#include +#include #include #include #include "absl/log/check.h" #include "absl/log/log.h" - -#include -#include - #include "src/core/lib/iomgr/iocp_windows.h" #include "src/core/lib/iomgr/iomgr_internal.h" #include "src/core/lib/iomgr/socket_windows.h" diff --git a/src/core/lib/iomgr/iomgr.cc b/src/core/lib/iomgr/iomgr.cc index a4fce10be34..39e0504d0d7 100644 --- a/src/core/lib/iomgr/iomgr.cc +++ b/src/core/lib/iomgr/iomgr.cc @@ -18,17 +18,15 @@ #include "src/core/lib/iomgr/iomgr.h" -#include -#include -#include - -#include "absl/log/log.h" - #include #include #include #include +#include +#include +#include +#include "absl/log/log.h" #include "src/core/lib/config/config_vars.h" #include "src/core/lib/iomgr/buffer_list.h" #include "src/core/lib/iomgr/exec_ctx.h" diff --git a/src/core/lib/iomgr/iomgr.h b/src/core/lib/iomgr/iomgr.h index 3c4a5987f19..280471fae87 100644 --- a/src/core/lib/iomgr/iomgr.h +++ b/src/core/lib/iomgr/iomgr.h @@ -19,9 +19,8 @@ #ifndef GRPC_SRC_CORE_LIB_IOMGR_IOMGR_H #define GRPC_SRC_CORE_LIB_IOMGR_IOMGR_H -#include - #include +#include #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/port.h" diff --git a/src/core/lib/iomgr/iomgr_internal.cc b/src/core/lib/iomgr/iomgr_internal.cc index 81c1b829247..f5bb42e53d5 100644 --- a/src/core/lib/iomgr/iomgr_internal.cc +++ b/src/core/lib/iomgr/iomgr_internal.cc @@ -18,9 +18,8 @@ #include "src/core/lib/iomgr/iomgr_internal.h" -#include - #include +#include static grpc_iomgr_platform_vtable* iomgr_platform_vtable = nullptr; diff --git a/src/core/lib/iomgr/iomgr_internal.h b/src/core/lib/iomgr/iomgr_internal.h index a3a8ceb178a..c0d34a9d0a5 100644 --- a/src/core/lib/iomgr/iomgr_internal.h +++ b/src/core/lib/iomgr/iomgr_internal.h @@ -19,9 +19,8 @@ #ifndef GRPC_SRC_CORE_LIB_IOMGR_IOMGR_INTERNAL_H #define GRPC_SRC_CORE_LIB_IOMGR_IOMGR_INTERNAL_H -#include - #include +#include #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" diff --git a/src/core/lib/iomgr/iomgr_windows.cc b/src/core/lib/iomgr/iomgr_windows.cc index fe1d24a3492..2d8716c54ee 100644 --- a/src/core/lib/iomgr/iomgr_windows.cc +++ b/src/core/lib/iomgr/iomgr_windows.cc @@ -23,7 +23,6 @@ #ifdef GRPC_WINSOCK_SOCKET #include "absl/log/check.h" - #include "src/core/lib/experiments/experiments.h" #include "src/core/lib/iomgr/iocp_windows.h" #include "src/core/lib/iomgr/iomgr.h" diff --git a/src/core/lib/iomgr/lockfree_event.cc b/src/core/lib/iomgr/lockfree_event.cc index 53700d13749..42023ef4615 100644 --- a/src/core/lib/iomgr/lockfree_event.cc +++ b/src/core/lib/iomgr/lockfree_event.cc @@ -18,11 +18,10 @@ #include "src/core/lib/iomgr/lockfree_event.h" -#include "absl/log/check.h" -#include "absl/log/log.h" - #include +#include "absl/log/check.h" +#include "absl/log/log.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/util/crash.h" diff --git a/src/core/lib/iomgr/polling_entity.cc b/src/core/lib/iomgr/polling_entity.cc index 918af4a7f65..8a5ad277f24 100644 --- a/src/core/lib/iomgr/polling_entity.cc +++ b/src/core/lib/iomgr/polling_entity.cc @@ -18,12 +18,11 @@ #include "src/core/lib/iomgr/polling_entity.h" -#include "absl/log/check.h" -#include "absl/strings/str_format.h" - #include #include +#include "absl/log/check.h" +#include "absl/strings/str_format.h" #include "src/core/util/crash.h" grpc_polling_entity grpc_polling_entity_create_from_pollset_set( diff --git a/src/core/lib/iomgr/pollset_set_windows.cc b/src/core/lib/iomgr/pollset_set_windows.cc index 46dd8d20977..c40eccf95e4 100644 --- a/src/core/lib/iomgr/pollset_set_windows.cc +++ b/src/core/lib/iomgr/pollset_set_windows.cc @@ -16,9 +16,8 @@ // // -#include - #include +#include #include "src/core/lib/iomgr/port.h" diff --git a/src/core/lib/iomgr/resolve_address.cc b/src/core/lib/iomgr/resolve_address.cc index a6130701fec..3a0d1b106e1 100644 --- a/src/core/lib/iomgr/resolve_address.cc +++ b/src/core/lib/iomgr/resolve_address.cc @@ -17,12 +17,11 @@ // #include "src/core/lib/iomgr/resolve_address.h" -#include "absl/strings/str_cat.h" - #include #include #include +#include "absl/strings/str_cat.h" #include "src/core/util/crash.h" #include "src/core/util/no_destruct.h" diff --git a/src/core/lib/iomgr/resolve_address.h b/src/core/lib/iomgr/resolve_address.h index c8c94b00c0b..5a8279ae9c4 100644 --- a/src/core/lib/iomgr/resolve_address.h +++ b/src/core/lib/iomgr/resolve_address.h @@ -19,14 +19,12 @@ #ifndef GRPC_SRC_CORE_LIB_IOMGR_RESOLVE_ADDRESS_H #define GRPC_SRC_CORE_LIB_IOMGR_RESOLVE_ADDRESS_H +#include +#include #include #include "absl/container/flat_hash_set.h" #include "absl/status/statusor.h" - -#include -#include - #include "src/core/lib/event_engine/handle_containers.h" #include "src/core/lib/iomgr/pollset_set.h" #include "src/core/lib/iomgr/port.h" diff --git a/src/core/lib/iomgr/resolve_address_impl.h b/src/core/lib/iomgr/resolve_address_impl.h index a6e072dd919..4c3cbe0d92b 100644 --- a/src/core/lib/iomgr/resolve_address_impl.h +++ b/src/core/lib/iomgr/resolve_address_impl.h @@ -17,9 +17,8 @@ #ifndef GRPC_SRC_CORE_LIB_IOMGR_RESOLVE_ADDRESS_IMPL_H #define GRPC_SRC_CORE_LIB_IOMGR_RESOLVE_ADDRESS_IMPL_H -#include - #include +#include #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/port.h" diff --git a/src/core/lib/iomgr/resolve_address_posix.cc b/src/core/lib/iomgr/resolve_address_posix.cc index 0dd2e449575..fe1d4c99a93 100644 --- a/src/core/lib/iomgr/resolve_address_posix.cc +++ b/src/core/lib/iomgr/resolve_address_posix.cc @@ -21,12 +21,11 @@ #include "src/core/lib/iomgr/port.h" #ifdef GRPC_POSIX_SOCKET_RESOLVE_ADDRESS -#include -#include - #include #include #include +#include +#include #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/iomgr/block_annotate.h" diff --git a/src/core/lib/iomgr/resolve_address_posix.h b/src/core/lib/iomgr/resolve_address_posix.h index 15986358e80..cb37cbc9a75 100644 --- a/src/core/lib/iomgr/resolve_address_posix.h +++ b/src/core/lib/iomgr/resolve_address_posix.h @@ -17,10 +17,10 @@ #ifndef GRPC_SRC_CORE_LIB_IOMGR_RESOLVE_ADDRESS_POSIX_H #define GRPC_SRC_CORE_LIB_IOMGR_RESOLVE_ADDRESS_POSIX_H -#include - #include +#include + #include "src/core/lib/iomgr/port.h" #include "src/core/lib/iomgr/resolve_address.h" diff --git a/src/core/lib/iomgr/resolve_address_windows.cc b/src/core/lib/iomgr/resolve_address_windows.cc index 9db5b689954..1dc7ee3d1fc 100644 --- a/src/core/lib/iomgr/resolve_address_windows.cc +++ b/src/core/lib/iomgr/resolve_address_windows.cc @@ -19,6 +19,10 @@ #include "src/core/lib/iomgr/port.h" #ifdef GRPC_WINSOCK_SOCKET +#include +#include +#include +#include #include #include #include @@ -26,12 +30,6 @@ #include #include "absl/strings/str_format.h" - -#include -#include -#include -#include - #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/iomgr/block_annotate.h" diff --git a/src/core/lib/iomgr/resolve_address_windows.h b/src/core/lib/iomgr/resolve_address_windows.h index eea5c44111e..6d608efd2e8 100644 --- a/src/core/lib/iomgr/resolve_address_windows.h +++ b/src/core/lib/iomgr/resolve_address_windows.h @@ -17,10 +17,10 @@ #ifndef GRPC_SRC_CORE_LIB_IOMGR_RESOLVE_ADDRESS_WINDOWS_H #define GRPC_SRC_CORE_LIB_IOMGR_RESOLVE_ADDRESS_WINDOWS_H -#include - #include +#include + #include "src/core/lib/iomgr/port.h" #include "src/core/lib/iomgr/resolve_address.h" diff --git a/src/core/lib/iomgr/resolved_address.h b/src/core/lib/iomgr/resolved_address.h index e16f7fc27f9..c622bdb5126 100644 --- a/src/core/lib/iomgr/resolved_address.h +++ b/src/core/lib/iomgr/resolved_address.h @@ -15,9 +15,8 @@ #ifndef GRPC_SRC_CORE_LIB_IOMGR_RESOLVED_ADDRESS_H #define GRPC_SRC_CORE_LIB_IOMGR_RESOLVED_ADDRESS_H -#include - #include +#include #include "src/core/lib/iomgr/port.h" diff --git a/src/core/lib/iomgr/sockaddr_utils_posix.cc b/src/core/lib/iomgr/sockaddr_utils_posix.cc index 8fc4d5a186e..a522df8aecd 100644 --- a/src/core/lib/iomgr/sockaddr_utils_posix.cc +++ b/src/core/lib/iomgr/sockaddr_utils_posix.cc @@ -30,6 +30,8 @@ #else #include #endif +#include +#include #include #include #include @@ -38,10 +40,6 @@ #include #include "absl/log/check.h" - -#include -#include - #include "src/core/lib/iomgr/sockaddr.h" #include "src/core/util/crash.h" diff --git a/src/core/lib/iomgr/socket_mutator.h b/src/core/lib/iomgr/socket_mutator.h index e919d3caaa4..9ce180b3452 100644 --- a/src/core/lib/iomgr/socket_mutator.h +++ b/src/core/lib/iomgr/socket_mutator.h @@ -19,11 +19,10 @@ #ifndef GRPC_SRC_CORE_LIB_IOMGR_SOCKET_MUTATOR_H #define GRPC_SRC_CORE_LIB_IOMGR_SOCKET_MUTATOR_H -#include - #include #include #include +#include /// How is an fd to be used? typedef enum { diff --git a/src/core/lib/iomgr/socket_utils.h b/src/core/lib/iomgr/socket_utils.h index 75d3082677d..f6c4c27d6de 100644 --- a/src/core/lib/iomgr/socket_utils.h +++ b/src/core/lib/iomgr/socket_utils.h @@ -19,9 +19,8 @@ #ifndef GRPC_SRC_CORE_LIB_IOMGR_SOCKET_UTILS_H #define GRPC_SRC_CORE_LIB_IOMGR_SOCKET_UTILS_H -#include - #include +#include // TODO(juanlishen): The following functions might be simple enough to implement // ourselves, so that they don't cause any portability hassle. diff --git a/src/core/lib/iomgr/socket_utils_common_posix.cc b/src/core/lib/iomgr/socket_utils_common_posix.cc index 49b1c349795..8b1af9db729 100644 --- a/src/core/lib/iomgr/socket_utils_common_posix.cc +++ b/src/core/lib/iomgr/socket_utils_common_posix.cc @@ -35,6 +35,9 @@ #else #include #endif +#include +#include +#include #include #include #include @@ -46,11 +49,6 @@ #include "absl/log/check.h" #include "absl/log/log.h" #include "absl/strings/str_cat.h" - -#include -#include -#include - #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/iomgr/sockaddr.h" #include "src/core/util/crash.h" diff --git a/src/core/lib/iomgr/socket_utils_posix.cc b/src/core/lib/iomgr/socket_utils_posix.cc index ebd2d586069..aa356e591c8 100644 --- a/src/core/lib/iomgr/socket_utils_posix.cc +++ b/src/core/lib/iomgr/socket_utils_posix.cc @@ -16,19 +16,17 @@ // // -#include "absl/types/optional.h" - #include +#include "absl/types/optional.h" #include "src/core/lib/iomgr/port.h" #ifdef GRPC_POSIX_SOCKETUTILS #include +#include #include #include -#include - #include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/iomgr/socket_utils_posix.h" #include "src/core/util/crash.h" diff --git a/src/core/lib/iomgr/socket_windows.cc b/src/core/lib/iomgr/socket_windows.cc index 6ace1af6bc4..8ec4eaa1366 100644 --- a/src/core/lib/iomgr/socket_windows.cc +++ b/src/core/lib/iomgr/socket_windows.cc @@ -25,15 +25,13 @@ #include // must be included after winsock2.h +#include +#include #include #include "absl/log/check.h" #include "absl/log/log.h" #include "absl/strings/str_format.h" - -#include -#include - #include "src/core/lib/iomgr/iocp_windows.h" #include "src/core/lib/iomgr/iomgr_internal.h" #include "src/core/lib/iomgr/pollset.h" diff --git a/src/core/lib/iomgr/socket_windows.h b/src/core/lib/iomgr/socket_windows.h index 418685a5d3d..3c272b72c6e 100644 --- a/src/core/lib/iomgr/socket_windows.h +++ b/src/core/lib/iomgr/socket_windows.h @@ -24,10 +24,9 @@ #include "src/core/lib/iomgr/port.h" #ifdef GRPC_WINSOCK_SOCKET -#include - #include #include +#include #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/iomgr_internal.h" diff --git a/src/core/lib/iomgr/tcp_client_cfstream.cc b/src/core/lib/iomgr/tcp_client_cfstream.cc index c091737b96c..141a9c76f52 100644 --- a/src/core/lib/iomgr/tcp_client_cfstream.cc +++ b/src/core/lib/iomgr/tcp_client_cfstream.cc @@ -24,15 +24,13 @@ #ifdef GRPC_CFSTREAM_CLIENT #include -#include -#include - -#include "absl/log/log.h" - #include #include #include +#include +#include +#include "absl/log/log.h" #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/event_engine/shim.h" #include "src/core/lib/iomgr/cfstream_handle.h" diff --git a/src/core/lib/iomgr/tcp_client_posix.cc b/src/core/lib/iomgr/tcp_client_posix.cc index a66807cf111..9394ec75783 100644 --- a/src/core/lib/iomgr/tcp_client_posix.cc +++ b/src/core/lib/iomgr/tcp_client_posix.cc @@ -24,6 +24,8 @@ #ifdef GRPC_POSIX_SOCKET_TCP_CLIENT #include +#include +#include #include #include #include @@ -32,10 +34,6 @@ #include "absl/log/check.h" #include "absl/log/log.h" #include "absl/strings/str_cat.h" - -#include -#include - #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/event_engine/resolved_address_internal.h" #include "src/core/lib/event_engine/shim.h" diff --git a/src/core/lib/iomgr/tcp_client_windows.cc b/src/core/lib/iomgr/tcp_client_windows.cc index c19e81d8131..5cc135d809d 100644 --- a/src/core/lib/iomgr/tcp_client_windows.cc +++ b/src/core/lib/iomgr/tcp_client_windows.cc @@ -16,21 +16,19 @@ // // -#include - #include +#include #include "src/core/lib/iomgr/port.h" #ifdef GRPC_WINSOCK_SOCKET -#include "absl/log/check.h" - #include #include #include #include +#include "absl/log/check.h" #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/event_engine/shim.h" #include "src/core/lib/iomgr/event_engine_shims/tcp_client.h" diff --git a/src/core/lib/iomgr/tcp_posix.cc b/src/core/lib/iomgr/tcp_posix.cc index a53d983db33..1b45c36efff 100644 --- a/src/core/lib/iomgr/tcp_posix.cc +++ b/src/core/lib/iomgr/tcp_posix.cc @@ -16,21 +16,25 @@ // // +#include +#include + #include "absl/base/thread_annotations.h" #include "absl/status/status.h" #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" #include "absl/types/optional.h" - -#include -#include - #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/port.h" #ifdef GRPC_POSIX_SOCKET_TCP #include +#include +#include +#include +#include +#include #include #include #include @@ -47,13 +51,6 @@ #include "absl/log/check.h" #include "absl/log/log.h" - -#include -#include -#include -#include -#include - #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/experiments/experiments.h" diff --git a/src/core/lib/iomgr/tcp_server.h b/src/core/lib/iomgr/tcp_server.h index 8b1feece209..5f5197bbc4f 100644 --- a/src/core/lib/iomgr/tcp_server.h +++ b/src/core/lib/iomgr/tcp_server.h @@ -19,13 +19,13 @@ #ifndef GRPC_SRC_CORE_LIB_IOMGR_TCP_SERVER_H #define GRPC_SRC_CORE_LIB_IOMGR_TCP_SERVER_H -#include - #include #include #include #include +#include + #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/resolve_address.h" diff --git a/src/core/lib/iomgr/tcp_server_posix.cc b/src/core/lib/iomgr/tcp_server_posix.cc index fdd3d96c63e..357412fa9ee 100644 --- a/src/core/lib/iomgr/tcp_server_posix.cc +++ b/src/core/lib/iomgr/tcp_server_posix.cc @@ -16,11 +16,11 @@ // // -#include - #include #include +#include + // FIXME: "posix" files shouldn't be depending on _GNU_SOURCE #ifndef _GNU_SOURCE #define _GNU_SOURCE @@ -32,6 +32,12 @@ #include #include +#include +#include +#include +#include +#include +#include #include #include #include @@ -47,14 +53,6 @@ #include "absl/log/log.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" - -#include -#include -#include -#include -#include -#include - #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/event_engine/memory_allocator_factory.h" diff --git a/src/core/lib/iomgr/tcp_server_utils_posix.h b/src/core/lib/iomgr/tcp_server_utils_posix.h index fcf97da7926..a726c750279 100644 --- a/src/core/lib/iomgr/tcp_server_utils_posix.h +++ b/src/core/lib/iomgr/tcp_server_utils_posix.h @@ -19,12 +19,11 @@ #ifndef GRPC_SRC_CORE_LIB_IOMGR_TCP_SERVER_UTILS_POSIX_H #define GRPC_SRC_CORE_LIB_IOMGR_TCP_SERVER_UTILS_POSIX_H +#include + #include #include "absl/container/flat_hash_map.h" - -#include - #include "src/core/lib/event_engine/posix.h" #include "src/core/lib/iomgr/ev_posix.h" #include "src/core/lib/iomgr/resolve_address.h" diff --git a/src/core/lib/iomgr/tcp_server_utils_posix_common.cc b/src/core/lib/iomgr/tcp_server_utils_posix_common.cc index 7ec14525002..638e3221614 100644 --- a/src/core/lib/iomgr/tcp_server_utils_posix_common.cc +++ b/src/core/lib/iomgr/tcp_server_utils_posix_common.cc @@ -24,6 +24,8 @@ #ifdef GRPC_POSIX_SOCKET_TCP_SERVER_UTILS_COMMON #include +#include +#include #include #include #include @@ -34,10 +36,6 @@ #include "absl/log/check.h" #include "absl/log/log.h" #include "absl/strings/str_cat.h" - -#include -#include - #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/sockaddr.h" diff --git a/src/core/lib/iomgr/tcp_server_utils_posix_ifaddrs.cc b/src/core/lib/iomgr/tcp_server_utils_posix_ifaddrs.cc index 89c69d8beb2..2dad0bb1be4 100644 --- a/src/core/lib/iomgr/tcp_server_utils_posix_ifaddrs.cc +++ b/src/core/lib/iomgr/tcp_server_utils_posix_ifaddrs.cc @@ -23,6 +23,7 @@ #ifdef GRPC_HAVE_IFADDRS #include +#include #include #include #include @@ -33,9 +34,6 @@ #include "absl/log/check.h" #include "absl/log/log.h" #include "absl/strings/str_cat.h" - -#include - #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/sockaddr.h" diff --git a/src/core/lib/iomgr/tcp_server_windows.cc b/src/core/lib/iomgr/tcp_server_windows.cc index ed32fcb25b0..e5fcac64277 100644 --- a/src/core/lib/iomgr/tcp_server_windows.cc +++ b/src/core/lib/iomgr/tcp_server_windows.cc @@ -22,15 +22,6 @@ #ifdef GRPC_WINSOCK_SOCKET -#include -#include - -#include - -#include "absl/log/check.h" -#include "absl/log/log.h" -#include "absl/strings/str_cat.h" - #include #include #include @@ -39,7 +30,14 @@ #include #include #include +#include +#include + +#include +#include "absl/log/check.h" +#include "absl/log/log.h" +#include "absl/strings/str_cat.h" #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/event_engine/memory_allocator_factory.h" #include "src/core/lib/event_engine/resolved_address_internal.h" diff --git a/src/core/lib/iomgr/tcp_windows.cc b/src/core/lib/iomgr/tcp_windows.cc index 9574531c57d..e52ca28089f 100644 --- a/src/core/lib/iomgr/tcp_windows.cc +++ b/src/core/lib/iomgr/tcp_windows.cc @@ -22,15 +22,13 @@ #ifdef GRPC_WINSOCK_SOCKET -#include - -#include "absl/log/check.h" -#include "absl/log/log.h" - #include #include #include +#include +#include "absl/log/check.h" +#include "absl/log/log.h" #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/iomgr/iocp_windows.h" #include "src/core/lib/iomgr/sockaddr.h" diff --git a/src/core/lib/iomgr/timer.h b/src/core/lib/iomgr/timer.h index 299331f0320..5d84066f942 100644 --- a/src/core/lib/iomgr/timer.h +++ b/src/core/lib/iomgr/timer.h @@ -19,12 +19,12 @@ #ifndef GRPC_SRC_CORE_LIB_IOMGR_TIMER_H #define GRPC_SRC_CORE_LIB_IOMGR_TIMER_H -#include - #include #include #include +#include + #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/iomgr.h" #include "src/core/lib/iomgr/port.h" diff --git a/src/core/lib/iomgr/timer_generic.cc b/src/core/lib/iomgr/timer_generic.cc index 4d940942c47..3e5f604603a 100644 --- a/src/core/lib/iomgr/timer_generic.cc +++ b/src/core/lib/iomgr/timer_generic.cc @@ -16,6 +16,10 @@ // // +#include +#include +#include +#include #include #include @@ -24,12 +28,6 @@ #include "absl/log/log.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" - -#include -#include -#include -#include - #include "src/core/lib/debug/trace.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/port.h" diff --git a/src/core/lib/iomgr/timer_heap.cc b/src/core/lib/iomgr/timer_heap.cc index 8f7d950e699..617f76ade0f 100644 --- a/src/core/lib/iomgr/timer_heap.cc +++ b/src/core/lib/iomgr/timer_heap.cc @@ -18,10 +18,9 @@ #include "src/core/lib/iomgr/timer_heap.h" -#include - #include #include +#include #include "src/core/lib/iomgr/port.h" #include "src/core/util/useful.h" diff --git a/src/core/lib/iomgr/timer_manager.cc b/src/core/lib/iomgr/timer_manager.cc index 5d2015ef50c..9a3362e0ef4 100644 --- a/src/core/lib/iomgr/timer_manager.cc +++ b/src/core/lib/iomgr/timer_manager.cc @@ -18,14 +18,12 @@ #include "src/core/lib/iomgr/timer_manager.h" +#include +#include #include #include "absl/log/check.h" #include "absl/log/log.h" - -#include -#include - #include "src/core/lib/debug/trace.h" #include "src/core/lib/iomgr/timer.h" #include "src/core/util/crash.h" diff --git a/src/core/lib/iomgr/timer_manager.h b/src/core/lib/iomgr/timer_manager.h index c2e662b4943..47b6c132bdc 100644 --- a/src/core/lib/iomgr/timer_manager.h +++ b/src/core/lib/iomgr/timer_manager.h @@ -19,9 +19,8 @@ #ifndef GRPC_SRC_CORE_LIB_IOMGR_TIMER_MANAGER_H #define GRPC_SRC_CORE_LIB_IOMGR_TIMER_MANAGER_H -#include - #include +#include // Timer Manager tries to keep only one thread waiting for the next timeout at // all times, and thus effectively preventing the thundering herd problem. diff --git a/src/core/lib/iomgr/unix_sockets_posix.cc b/src/core/lib/iomgr/unix_sockets_posix.cc index 01a18602ff6..90ae7817d78 100644 --- a/src/core/lib/iomgr/unix_sockets_posix.cc +++ b/src/core/lib/iomgr/unix_sockets_posix.cc @@ -33,11 +33,10 @@ #include #endif // GPR_WINDOWS -#include "absl/log/check.h" -#include "absl/strings/str_cat.h" - #include +#include "absl/log/check.h" +#include "absl/strings/str_cat.h" #include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/iomgr/unix_sockets_posix.h" diff --git a/src/core/lib/iomgr/unix_sockets_posix.h b/src/core/lib/iomgr/unix_sockets_posix.h index d63a56e8d00..f6e6418a312 100644 --- a/src/core/lib/iomgr/unix_sockets_posix.h +++ b/src/core/lib/iomgr/unix_sockets_posix.h @@ -19,13 +19,12 @@ #ifndef GRPC_SRC_CORE_LIB_IOMGR_UNIX_SOCKETS_POSIX_H #define GRPC_SRC_CORE_LIB_IOMGR_UNIX_SOCKETS_POSIX_H -#include - -#include "absl/strings/string_view.h" - #include #include +#include + +#include "absl/strings/string_view.h" #include "src/core/lib/iomgr/port.h" #include "src/core/lib/iomgr/resolve_address.h" diff --git a/src/core/lib/iomgr/vsock.cc b/src/core/lib/iomgr/vsock.cc index 45a769998bf..a830668cf4c 100644 --- a/src/core/lib/iomgr/vsock.cc +++ b/src/core/lib/iomgr/vsock.cc @@ -21,14 +21,12 @@ #ifdef GRPC_HAVE_VSOCK +#include #include #include #include #include "absl/strings/str_cat.h" - -#include - #include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/transport/error_utils.h" diff --git a/src/core/lib/iomgr/vsock.h b/src/core/lib/iomgr/vsock.h index 08280c32a0a..1bd3a2c71fe 100644 --- a/src/core/lib/iomgr/vsock.h +++ b/src/core/lib/iomgr/vsock.h @@ -19,13 +19,12 @@ #ifndef GRPC_SRC_CORE_LIB_IOMGR_VSOCK_H #define GRPC_SRC_CORE_LIB_IOMGR_VSOCK_H -#include - -#include "absl/strings/string_view.h" - #include #include +#include + +#include "absl/strings/string_view.h" #include "src/core/lib/iomgr/port.h" #include "src/core/lib/iomgr/resolve_address.h" diff --git a/src/core/lib/iomgr/wakeup_fd_pipe.cc b/src/core/lib/iomgr/wakeup_fd_pipe.cc index e2640d263c9..9fc196e18a6 100644 --- a/src/core/lib/iomgr/wakeup_fd_pipe.cc +++ b/src/core/lib/iomgr/wakeup_fd_pipe.cc @@ -27,7 +27,6 @@ #include #include "absl/log/log.h" - #include "src/core/lib/iomgr/socket_utils_posix.h" #include "src/core/lib/iomgr/wakeup_fd_pipe.h" #include "src/core/lib/iomgr/wakeup_fd_posix.h" diff --git a/src/core/lib/promise/activity.cc b/src/core/lib/promise/activity.cc index 7f495ddb1b3..1a0a52d7b64 100644 --- a/src/core/lib/promise/activity.cc +++ b/src/core/lib/promise/activity.cc @@ -14,6 +14,7 @@ #include "src/core/lib/promise/activity.h" +#include #include #include @@ -22,9 +23,6 @@ #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" #include "absl/strings/str_join.h" - -#include - #include "src/core/util/atomic_utils.h" namespace grpc_core { diff --git a/src/core/lib/promise/activity.h b/src/core/lib/promise/activity.h index b84fc473b62..1bb57bb3f78 100644 --- a/src/core/lib/promise/activity.h +++ b/src/core/lib/promise/activity.h @@ -15,6 +15,7 @@ #ifndef GRPC_SRC_CORE_LIB_PROMISE_ACTIVITY_H #define GRPC_SRC_CORE_LIB_PROMISE_ACTIVITY_H +#include #include #include @@ -28,9 +29,6 @@ #include "absl/status/status.h" #include "absl/strings/str_cat.h" #include "absl/types/optional.h" - -#include - #include "src/core/lib/debug/trace.h" #include "src/core/lib/promise/context.h" #include "src/core/lib/promise/detail/promise_factory.h" diff --git a/src/core/lib/promise/all_ok.h b/src/core/lib/promise/all_ok.h index 63abaf754d1..72d9d3815b3 100644 --- a/src/core/lib/promise/all_ok.h +++ b/src/core/lib/promise/all_ok.h @@ -15,15 +15,14 @@ #ifndef GRPC_SRC_CORE_LIB_PROMISE_ALL_OK_H #define GRPC_SRC_CORE_LIB_PROMISE_ALL_OK_H +#include + #include #include #include "absl/meta/type_traits.h" #include "absl/status/status.h" #include "absl/status/statusor.h" - -#include - #include "src/core/lib/promise/detail/join_state.h" #include "src/core/lib/promise/map.h" #include "src/core/lib/promise/poll.h" diff --git a/src/core/lib/promise/arena_promise.h b/src/core/lib/promise/arena_promise.h index 7f4bb0de563..e03d6280829 100644 --- a/src/core/lib/promise/arena_promise.h +++ b/src/core/lib/promise/arena_promise.h @@ -15,6 +15,7 @@ #ifndef GRPC_SRC_CORE_LIB_PROMISE_ARENA_PROMISE_H #define GRPC_SRC_CORE_LIB_PROMISE_ARENA_PROMISE_H +#include #include #include @@ -23,9 +24,6 @@ #include #include "absl/meta/type_traits.h" - -#include - #include "src/core/lib/promise/context.h" #include "src/core/lib/promise/poll.h" #include "src/core/lib/resource_quota/arena.h" diff --git a/src/core/lib/promise/context.h b/src/core/lib/promise/context.h index c720dfe35b1..a0eed9396e8 100644 --- a/src/core/lib/promise/context.h +++ b/src/core/lib/promise/context.h @@ -15,13 +15,12 @@ #ifndef GRPC_SRC_CORE_LIB_PROMISE_CONTEXT_H #define GRPC_SRC_CORE_LIB_PROMISE_CONTEXT_H +#include + #include #include "absl/log/check.h" #include "absl/meta/type_traits.h" - -#include - #include "src/core/util/down_cast.h" namespace grpc_core { diff --git a/src/core/lib/promise/detail/join_state.h b/src/core/lib/promise/detail/join_state.h index 032f6b304f0..767ca8d787d 100644 --- a/src/core/lib/promise/detail/join_state.h +++ b/src/core/lib/promise/detail/join_state.h @@ -17,15 +17,14 @@ // This file is generated by tools/codegen/core/gen_join.py +#include + #include #include #include #include "absl/log/check.h" #include "absl/log/log.h" - -#include - #include "src/core/lib/debug/trace.h" #include "src/core/lib/promise/detail/promise_like.h" #include "src/core/lib/promise/poll.h" diff --git a/src/core/lib/promise/detail/promise_factory.h b/src/core/lib/promise/detail/promise_factory.h index 1e507743929..49dc25c3301 100644 --- a/src/core/lib/promise/detail/promise_factory.h +++ b/src/core/lib/promise/detail/promise_factory.h @@ -15,14 +15,13 @@ #ifndef GRPC_SRC_CORE_LIB_PROMISE_DETAIL_PROMISE_FACTORY_H #define GRPC_SRC_CORE_LIB_PROMISE_DETAIL_PROMISE_FACTORY_H +#include + #include #include #include #include "absl/meta/type_traits.h" - -#include - #include "src/core/lib/promise/detail/promise_like.h" // PromiseFactory is an adaptor class. diff --git a/src/core/lib/promise/detail/promise_like.h b/src/core/lib/promise/detail/promise_like.h index 60a7fcc26b0..8515e8b46fb 100644 --- a/src/core/lib/promise/detail/promise_like.h +++ b/src/core/lib/promise/detail/promise_like.h @@ -15,13 +15,12 @@ #ifndef GRPC_SRC_CORE_LIB_PROMISE_DETAIL_PROMISE_LIKE_H #define GRPC_SRC_CORE_LIB_PROMISE_DETAIL_PROMISE_LIKE_H +#include + #include #include "absl/functional/any_invocable.h" #include "absl/meta/type_traits.h" - -#include - #include "src/core/lib/promise/poll.h" // A Promise is a callable object that returns Poll for some T. diff --git a/src/core/lib/promise/detail/seq_state.h b/src/core/lib/promise/detail/seq_state.h index 47810f19141..da9880044ce 100644 --- a/src/core/lib/promise/detail/seq_state.h +++ b/src/core/lib/promise/detail/seq_state.h @@ -17,6 +17,7 @@ // This file is generated by tools/codegen/core/gen_seq.py +#include #include #include @@ -25,9 +26,6 @@ #include "absl/log/check.h" #include "absl/log/log.h" #include "absl/strings/str_cat.h" - -#include - #include "src/core/lib/debug/trace.h" #include "src/core/lib/promise/detail/promise_factory.h" #include "src/core/lib/promise/detail/promise_like.h" diff --git a/src/core/lib/promise/detail/status.h b/src/core/lib/promise/detail/status.h index 42847c6ba6d..d33c32644cf 100644 --- a/src/core/lib/promise/detail/status.h +++ b/src/core/lib/promise/detail/status.h @@ -15,14 +15,14 @@ #ifndef GRPC_SRC_CORE_LIB_PROMISE_DETAIL_STATUS_H #define GRPC_SRC_CORE_LIB_PROMISE_DETAIL_STATUS_H +#include + #include #include "absl/log/check.h" #include "absl/status/status.h" #include "absl/status/statusor.h" -#include - // Helpers for dealing with absl::Status/StatusOr generically namespace grpc_core { diff --git a/src/core/lib/promise/event_engine_wakeup_scheduler.h b/src/core/lib/promise/event_engine_wakeup_scheduler.h index eedd48357c3..3e494beaa6f 100644 --- a/src/core/lib/promise/event_engine_wakeup_scheduler.h +++ b/src/core/lib/promise/event_engine_wakeup_scheduler.h @@ -15,14 +15,13 @@ #ifndef GRPC_SRC_CORE_LIB_PROMISE_EVENT_ENGINE_WAKEUP_SCHEDULER_H #define GRPC_SRC_CORE_LIB_PROMISE_EVENT_ENGINE_WAKEUP_SCHEDULER_H +#include +#include + #include #include #include "absl/log/check.h" - -#include -#include - #include "src/core/lib/iomgr/exec_ctx.h" namespace grpc_core { diff --git a/src/core/lib/promise/exec_ctx_wakeup_scheduler.h b/src/core/lib/promise/exec_ctx_wakeup_scheduler.h index cc36e1ff747..c66fc233b21 100644 --- a/src/core/lib/promise/exec_ctx_wakeup_scheduler.h +++ b/src/core/lib/promise/exec_ctx_wakeup_scheduler.h @@ -15,10 +15,9 @@ #ifndef GRPC_SRC_CORE_LIB_PROMISE_EXEC_CTX_WAKEUP_SCHEDULER_H #define GRPC_SRC_CORE_LIB_PROMISE_EXEC_CTX_WAKEUP_SCHEDULER_H -#include "absl/status/status.h" - #include +#include "absl/status/status.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" diff --git a/src/core/lib/promise/for_each.h b/src/core/lib/promise/for_each.h index 5fcaf0094a0..c990f249845 100644 --- a/src/core/lib/promise/for_each.h +++ b/src/core/lib/promise/for_each.h @@ -15,6 +15,7 @@ #ifndef GRPC_SRC_CORE_LIB_PROMISE_FOR_EACH_H #define GRPC_SRC_CORE_LIB_PROMISE_FOR_EACH_H +#include #include #include @@ -24,9 +25,6 @@ #include "absl/log/log.h" #include "absl/status/status.h" #include "absl/strings/str_cat.h" - -#include - #include "src/core/lib/debug/trace.h" #include "src/core/lib/promise/activity.h" #include "src/core/lib/promise/detail/promise_factory.h" diff --git a/src/core/lib/promise/if.h b/src/core/lib/promise/if.h index d75aec9a5ff..55d18aa74c7 100644 --- a/src/core/lib/promise/if.h +++ b/src/core/lib/promise/if.h @@ -15,14 +15,13 @@ #ifndef GRPC_SRC_CORE_LIB_PROMISE_IF_H #define GRPC_SRC_CORE_LIB_PROMISE_IF_H +#include + #include #include #include "absl/status/statusor.h" #include "absl/types/variant.h" - -#include - #include "src/core/lib/promise/detail/promise_factory.h" #include "src/core/lib/promise/detail/promise_like.h" #include "src/core/lib/promise/poll.h" diff --git a/src/core/lib/promise/inter_activity_latch.h b/src/core/lib/promise/inter_activity_latch.h index c5e89626505..a5a614dcf9f 100644 --- a/src/core/lib/promise/inter_activity_latch.h +++ b/src/core/lib/promise/inter_activity_latch.h @@ -15,6 +15,7 @@ #ifndef GRPC_SRC_CORE_LIB_PROMISE_INTER_ACTIVITY_LATCH_H #define GRPC_SRC_CORE_LIB_PROMISE_INTER_ACTIVITY_LATCH_H +#include #include #include @@ -22,9 +23,6 @@ #include "absl/base/thread_annotations.h" #include "absl/log/log.h" #include "absl/strings/str_cat.h" - -#include - #include "src/core/lib/debug/trace.h" #include "src/core/lib/promise/activity.h" #include "src/core/lib/promise/poll.h" diff --git a/src/core/lib/promise/inter_activity_pipe.h b/src/core/lib/promise/inter_activity_pipe.h index f6a2144dadb..08e71608e31 100644 --- a/src/core/lib/promise/inter_activity_pipe.h +++ b/src/core/lib/promise/inter_activity_pipe.h @@ -15,6 +15,7 @@ #ifndef GRPC_SRC_CORE_LIB_PROMISE_INTER_ACTIVITY_PIPE_H #define GRPC_SRC_CORE_LIB_PROMISE_INTER_ACTIVITY_PIPE_H +#include #include #include @@ -22,9 +23,6 @@ #include "absl/base/thread_annotations.h" #include "absl/types/optional.h" - -#include - #include "src/core/lib/promise/activity.h" #include "src/core/lib/promise/poll.h" #include "src/core/util/ref_counted.h" diff --git a/src/core/lib/promise/interceptor_list.h b/src/core/lib/promise/interceptor_list.h index d75e6452892..a36f90d1142 100644 --- a/src/core/lib/promise/interceptor_list.h +++ b/src/core/lib/promise/interceptor_list.h @@ -15,6 +15,7 @@ #ifndef GRPC_SRC_CORE_LIB_PROMISE_INTERCEPTOR_LIST_H #define GRPC_SRC_CORE_LIB_PROMISE_INTERCEPTOR_LIST_H +#include #include #include @@ -27,9 +28,6 @@ #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" #include "absl/types/optional.h" - -#include - #include "src/core/lib/promise/context.h" #include "src/core/lib/promise/detail/promise_factory.h" #include "src/core/lib/promise/poll.h" diff --git a/src/core/lib/promise/join.h b/src/core/lib/promise/join.h index 0206baabccc..81619e33142 100644 --- a/src/core/lib/promise/join.h +++ b/src/core/lib/promise/join.h @@ -15,14 +15,12 @@ #ifndef GRPC_SRC_CORE_LIB_PROMISE_JOIN_H #define GRPC_SRC_CORE_LIB_PROMISE_JOIN_H +#include #include #include #include "absl/meta/type_traits.h" - -#include - #include "src/core/lib/promise/detail/join_state.h" #include "src/core/lib/promise/map.h" diff --git a/src/core/lib/promise/latch.h b/src/core/lib/promise/latch.h index 10f4776117f..63e298016b8 100644 --- a/src/core/lib/promise/latch.h +++ b/src/core/lib/promise/latch.h @@ -15,6 +15,7 @@ #ifndef GRPC_SRC_CORE_LIB_PROMISE_LATCH_H #define GRPC_SRC_CORE_LIB_PROMISE_LATCH_H +#include #include #include @@ -24,9 +25,6 @@ #include "absl/log/check.h" #include "absl/log/log.h" #include "absl/strings/str_cat.h" - -#include - #include "src/core/lib/debug/trace.h" #include "src/core/lib/promise/activity.h" #include "src/core/lib/promise/poll.h" diff --git a/src/core/lib/promise/loop.h b/src/core/lib/promise/loop.h index a7e4195cdea..768746f7b60 100644 --- a/src/core/lib/promise/loop.h +++ b/src/core/lib/promise/loop.h @@ -15,14 +15,13 @@ #ifndef GRPC_SRC_CORE_LIB_PROMISE_LOOP_H #define GRPC_SRC_CORE_LIB_PROMISE_LOOP_H +#include + #include #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/types/variant.h" - -#include - #include "src/core/lib/promise/detail/promise_factory.h" #include "src/core/lib/promise/poll.h" #include "src/core/util/construct_destruct.h" diff --git a/src/core/lib/promise/map.h b/src/core/lib/promise/map.h index 3ba8c19c2f6..52023fd2dc7 100644 --- a/src/core/lib/promise/map.h +++ b/src/core/lib/promise/map.h @@ -15,13 +15,12 @@ #ifndef GRPC_SRC_CORE_LIB_PROMISE_MAP_H #define GRPC_SRC_CORE_LIB_PROMISE_MAP_H +#include #include #include #include -#include - #include "src/core/lib/promise/detail/promise_like.h" #include "src/core/lib/promise/poll.h" diff --git a/src/core/lib/promise/map_pipe.h b/src/core/lib/promise/map_pipe.h index 2915a9376b5..1888100fbb5 100644 --- a/src/core/lib/promise/map_pipe.h +++ b/src/core/lib/promise/map_pipe.h @@ -15,11 +15,10 @@ #ifndef GRPC_SRC_CORE_LIB_PROMISE_MAP_PIPE_H #define GRPC_SRC_CORE_LIB_PROMISE_MAP_PIPE_H -#include "absl/log/log.h" -#include "absl/status/status.h" - #include +#include "absl/log/log.h" +#include "absl/status/status.h" #include "src/core/lib/promise/detail/promise_factory.h" #include "src/core/lib/promise/for_each.h" #include "src/core/lib/promise/map.h" diff --git a/src/core/lib/promise/mpsc.h b/src/core/lib/promise/mpsc.h index 02c8d2f97a4..fa77ecb03fb 100644 --- a/src/core/lib/promise/mpsc.h +++ b/src/core/lib/promise/mpsc.h @@ -15,6 +15,7 @@ #ifndef GRPC_SRC_CORE_LIB_PROMISE_MPSC_H #define GRPC_SRC_CORE_LIB_PROMISE_MPSC_H +#include #include #include @@ -25,9 +26,6 @@ #include "absl/base/thread_annotations.h" #include "absl/log/check.h" - -#include - #include "src/core/lib/promise/activity.h" #include "src/core/lib/promise/poll.h" #include "src/core/lib/promise/wait_set.h" diff --git a/src/core/lib/promise/observable.h b/src/core/lib/promise/observable.h index 0f500d66317..671348ff9a2 100644 --- a/src/core/lib/promise/observable.h +++ b/src/core/lib/promise/observable.h @@ -15,12 +15,11 @@ #ifndef GRPC_SRC_CORE_LIB_PROMISE_OBSERVABLE_H #define GRPC_SRC_CORE_LIB_PROMISE_OBSERVABLE_H +#include + #include "absl/container/flat_hash_set.h" #include "absl/functional/any_invocable.h" #include "absl/log/check.h" - -#include - #include "src/core/lib/promise/activity.h" #include "src/core/lib/promise/poll.h" #include "src/core/util/sync.h" diff --git a/src/core/lib/promise/party.cc b/src/core/lib/promise/party.cc index 79c310c9806..ed0e3af639b 100644 --- a/src/core/lib/promise/party.cc +++ b/src/core/lib/promise/party.cc @@ -14,6 +14,8 @@ #include "src/core/lib/promise/party.h" +#include + #include #include @@ -21,9 +23,6 @@ #include "absl/log/check.h" #include "absl/log/log.h" #include "absl/strings/str_format.h" - -#include - #include "src/core/lib/event_engine/event_engine_context.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/promise/activity.h" diff --git a/src/core/lib/promise/party.h b/src/core/lib/promise/party.h index d2051aa6083..9066c3a7de3 100644 --- a/src/core/lib/promise/party.h +++ b/src/core/lib/promise/party.h @@ -15,6 +15,8 @@ #ifndef GRPC_SRC_CORE_LIB_PROMISE_PARTY_H #define GRPC_SRC_CORE_LIB_PROMISE_PARTY_H +#include +#include #include #include @@ -27,10 +29,6 @@ #include "absl/log/check.h" #include "absl/log/log.h" #include "absl/strings/string_view.h" - -#include -#include - #include "src/core/lib/debug/trace.h" #include "src/core/lib/promise/activity.h" #include "src/core/lib/promise/context.h" diff --git a/src/core/lib/promise/pipe.h b/src/core/lib/promise/pipe.h index f3dac4532af..71ce810b704 100644 --- a/src/core/lib/promise/pipe.h +++ b/src/core/lib/promise/pipe.h @@ -15,6 +15,7 @@ #ifndef GRPC_SRC_CORE_LIB_PROMISE_PIPE_H #define GRPC_SRC_CORE_LIB_PROMISE_PIPE_H +#include #include #include @@ -27,9 +28,6 @@ #include "absl/strings/str_cat.h" #include "absl/types/optional.h" #include "absl/types/variant.h" - -#include - #include "src/core/lib/promise/activity.h" #include "src/core/lib/promise/context.h" #include "src/core/lib/promise/if.h" diff --git a/src/core/lib/promise/poll.h b/src/core/lib/promise/poll.h index 9b895cea032..879a5f42335 100644 --- a/src/core/lib/promise/poll.h +++ b/src/core/lib/promise/poll.h @@ -15,15 +15,14 @@ #ifndef GRPC_SRC_CORE_LIB_PROMISE_POLL_H #define GRPC_SRC_CORE_LIB_PROMISE_POLL_H +#include + #include #include #include "absl/log/check.h" #include "absl/strings/str_format.h" #include "absl/types/optional.h" - -#include - #include "src/core/util/construct_destruct.h" namespace grpc_core { diff --git a/src/core/lib/promise/prioritized_race.h b/src/core/lib/promise/prioritized_race.h index bd179c33313..166c4d2dad1 100644 --- a/src/core/lib/promise/prioritized_race.h +++ b/src/core/lib/promise/prioritized_race.h @@ -15,10 +15,10 @@ #ifndef GRPC_SRC_CORE_LIB_PROMISE_PRIORITIZED_RACE_H #define GRPC_SRC_CORE_LIB_PROMISE_PRIORITIZED_RACE_H -#include - #include +#include + namespace grpc_core { namespace promise_detail { diff --git a/src/core/lib/promise/promise.h b/src/core/lib/promise/promise.h index cb26a165071..b5ac75d73d2 100644 --- a/src/core/lib/promise/promise.h +++ b/src/core/lib/promise/promise.h @@ -15,15 +15,14 @@ #ifndef GRPC_SRC_CORE_LIB_PROMISE_PROMISE_H #define GRPC_SRC_CORE_LIB_PROMISE_PROMISE_H +#include + #include #include "absl/functional/any_invocable.h" #include "absl/log/log.h" #include "absl/status/status.h" #include "absl/types/optional.h" - -#include - #include "src/core/lib/promise/detail/promise_like.h" #include "src/core/lib/promise/poll.h" diff --git a/src/core/lib/promise/promise_mutex.h b/src/core/lib/promise/promise_mutex.h index b7014da2494..c17750ff066 100644 --- a/src/core/lib/promise/promise_mutex.h +++ b/src/core/lib/promise/promise_mutex.h @@ -15,12 +15,11 @@ #ifndef GRPC_SRC_CORE_LIB_PROMISE_PROMISE_MUTEX_H #define GRPC_SRC_CORE_LIB_PROMISE_PROMISE_MUTEX_H +#include + #include #include "absl/log/check.h" - -#include - #include "src/core/lib/promise/activity.h" #include "src/core/lib/promise/poll.h" diff --git a/src/core/lib/promise/race.h b/src/core/lib/promise/race.h index 83de1a617d7..a17fc074b7d 100644 --- a/src/core/lib/promise/race.h +++ b/src/core/lib/promise/race.h @@ -15,10 +15,10 @@ #ifndef GRPC_SRC_CORE_LIB_PROMISE_RACE_H #define GRPC_SRC_CORE_LIB_PROMISE_RACE_H -#include - #include +#include + namespace grpc_core { namespace promise_detail { diff --git a/src/core/lib/promise/seq.h b/src/core/lib/promise/seq.h index 40051ae4939..80cd2981308 100644 --- a/src/core/lib/promise/seq.h +++ b/src/core/lib/promise/seq.h @@ -15,12 +15,11 @@ #ifndef GRPC_SRC_CORE_LIB_PROMISE_SEQ_H #define GRPC_SRC_CORE_LIB_PROMISE_SEQ_H +#include #include #include -#include - #include "src/core/lib/promise/detail/basic_seq.h" #include "src/core/lib/promise/detail/promise_like.h" #include "src/core/lib/promise/detail/seq_state.h" diff --git a/src/core/lib/promise/sleep.cc b/src/core/lib/promise/sleep.cc index d31e2a82595..53ae975660f 100644 --- a/src/core/lib/promise/sleep.cc +++ b/src/core/lib/promise/sleep.cc @@ -14,11 +14,11 @@ #include "src/core/lib/promise/sleep.h" -#include - #include #include +#include + #include "src/core/lib/event_engine/event_engine_context.h" // IWYU pragma: keep #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/promise/activity.h" diff --git a/src/core/lib/promise/sleep.h b/src/core/lib/promise/sleep.h index 0ae4232d7b7..83885a07790 100644 --- a/src/core/lib/promise/sleep.h +++ b/src/core/lib/promise/sleep.h @@ -15,14 +15,13 @@ #ifndef GRPC_SRC_CORE_LIB_PROMISE_SLEEP_H #define GRPC_SRC_CORE_LIB_PROMISE_SLEEP_H +#include +#include + #include #include #include "absl/status/status.h" - -#include -#include - #include "src/core/lib/promise/activity.h" #include "src/core/lib/promise/poll.h" #include "src/core/util/time.h" diff --git a/src/core/lib/promise/status_flag.h b/src/core/lib/promise/status_flag.h index 250dce50504..1152694b1f0 100644 --- a/src/core/lib/promise/status_flag.h +++ b/src/core/lib/promise/status_flag.h @@ -15,6 +15,8 @@ #ifndef GRPC_SRC_CORE_LIB_PROMISE_STATUS_FLAG_H #define GRPC_SRC_CORE_LIB_PROMISE_STATUS_FLAG_H +#include + #include #include "absl/log/check.h" @@ -22,9 +24,6 @@ #include "absl/status/statusor.h" #include "absl/strings/str_cat.h" #include "absl/types/optional.h" - -#include - #include "src/core/lib/promise/detail/status.h" namespace grpc_core { diff --git a/src/core/lib/promise/switch.h b/src/core/lib/promise/switch.h index eed6e89928b..1bb05507ef2 100644 --- a/src/core/lib/promise/switch.h +++ b/src/core/lib/promise/switch.h @@ -15,11 +15,11 @@ #ifndef GRPC_SRC_CORE_LIB_PROMISE_SWITCH_H #define GRPC_SRC_CORE_LIB_PROMISE_SWITCH_H +#include + #include #include -#include - #include "src/core/lib/promise/detail/promise_factory.h" #include "src/core/lib/promise/if.h" diff --git a/src/core/lib/promise/try_join.h b/src/core/lib/promise/try_join.h index 5cde944fe41..e80eaee9a89 100644 --- a/src/core/lib/promise/try_join.h +++ b/src/core/lib/promise/try_join.h @@ -15,6 +15,8 @@ #ifndef GRPC_SRC_CORE_LIB_PROMISE_TRY_JOIN_H #define GRPC_SRC_CORE_LIB_PROMISE_TRY_JOIN_H +#include + #include #include @@ -22,9 +24,6 @@ #include "absl/meta/type_traits.h" #include "absl/status/status.h" #include "absl/status/statusor.h" - -#include - #include "src/core/lib/promise/detail/join_state.h" #include "src/core/lib/promise/map.h" #include "src/core/lib/promise/poll.h" diff --git a/src/core/lib/promise/try_seq.h b/src/core/lib/promise/try_seq.h index 7cda223ac67..e7a09b4ab7d 100644 --- a/src/core/lib/promise/try_seq.h +++ b/src/core/lib/promise/try_seq.h @@ -15,6 +15,7 @@ #ifndef GRPC_SRC_CORE_LIB_PROMISE_TRY_SEQ_H #define GRPC_SRC_CORE_LIB_PROMISE_TRY_SEQ_H +#include #include #include @@ -24,9 +25,6 @@ #include "absl/meta/type_traits.h" #include "absl/status/status.h" #include "absl/status/statusor.h" - -#include - #include "src/core/lib/promise/detail/basic_seq.h" #include "src/core/lib/promise/detail/promise_like.h" #include "src/core/lib/promise/detail/seq_state.h" diff --git a/src/core/lib/promise/wait_for_callback.h b/src/core/lib/promise/wait_for_callback.h index 6aabfe57970..cdebb5f085a 100644 --- a/src/core/lib/promise/wait_for_callback.h +++ b/src/core/lib/promise/wait_for_callback.h @@ -15,13 +15,12 @@ #ifndef GRPC_SRC_CORE_LIB_PROMISE_WAIT_FOR_CALLBACK_H #define GRPC_SRC_CORE_LIB_PROMISE_WAIT_FOR_CALLBACK_H +#include + #include #include #include "absl/base/thread_annotations.h" - -#include - #include "src/core/lib/promise/activity.h" #include "src/core/lib/promise/poll.h" #include "src/core/util/sync.h" diff --git a/src/core/lib/promise/wait_set.h b/src/core/lib/promise/wait_set.h index d58788a057c..a625f01433b 100644 --- a/src/core/lib/promise/wait_set.h +++ b/src/core/lib/promise/wait_set.h @@ -15,13 +15,12 @@ #ifndef GRPC_SRC_CORE_LIB_PROMISE_WAIT_SET_H #define GRPC_SRC_CORE_LIB_PROMISE_WAIT_SET_H +#include + #include #include "absl/container/flat_hash_set.h" #include "absl/hash/hash.h" - -#include - #include "src/core/lib/promise/activity.h" #include "src/core/lib/promise/poll.h" diff --git a/src/core/lib/resource_quota/api.cc b/src/core/lib/resource_quota/api.cc index 113685e08f4..8438fdc35f5 100644 --- a/src/core/lib/resource_quota/api.cc +++ b/src/core/lib/resource_quota/api.cc @@ -14,6 +14,9 @@ #include "src/core/lib/resource_quota/api.h" +#include +#include +#include #include #include @@ -22,11 +25,6 @@ #include #include "absl/strings/str_cat.h" - -#include -#include -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/resource_quota/memory_quota.h" diff --git a/src/core/lib/resource_quota/api.h b/src/core/lib/resource_quota/api.h index f1a60fb3772..9d80d576afb 100644 --- a/src/core/lib/resource_quota/api.h +++ b/src/core/lib/resource_quota/api.h @@ -15,11 +15,10 @@ #ifndef GRPC_SRC_CORE_LIB_RESOURCE_QUOTA_API_H #define GRPC_SRC_CORE_LIB_RESOURCE_QUOTA_API_H -#include - #include #include #include +#include #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/resource_quota/resource_quota.h" diff --git a/src/core/lib/resource_quota/arena.cc b/src/core/lib/resource_quota/arena.cc index 4fb33b266f7..e3b24dc739b 100644 --- a/src/core/lib/resource_quota/arena.cc +++ b/src/core/lib/resource_quota/arena.cc @@ -18,14 +18,13 @@ #include "src/core/lib/resource_quota/arena.h" +#include +#include + #include #include #include "absl/log/log.h" - -#include -#include - #include "src/core/lib/resource_quota/resource_quota.h" #include "src/core/util/alloc.h" namespace grpc_core { diff --git a/src/core/lib/resource_quota/arena.h b/src/core/lib/resource_quota/arena.h index fd962df93a8..fa46c07c664 100644 --- a/src/core/lib/resource_quota/arena.h +++ b/src/core/lib/resource_quota/arena.h @@ -25,6 +25,8 @@ #ifndef GRPC_SRC_CORE_LIB_RESOURCE_QUOTA_ARENA_H #define GRPC_SRC_CORE_LIB_RESOURCE_QUOTA_ARENA_H +#include +#include #include #include @@ -32,9 +34,6 @@ #include #include -#include -#include - #include "src/core/lib/promise/context.h" #include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/util/alloc.h" diff --git a/src/core/lib/resource_quota/connection_quota.cc b/src/core/lib/resource_quota/connection_quota.cc index 846883f78c3..021628c3695 100644 --- a/src/core/lib/resource_quota/connection_quota.cc +++ b/src/core/lib/resource_quota/connection_quota.cc @@ -14,13 +14,13 @@ #include "src/core/lib/resource_quota/connection_quota.h" +#include + #include #include #include "absl/log/check.h" -#include - namespace grpc_core { ConnectionQuota::ConnectionQuota() = default; diff --git a/src/core/lib/resource_quota/connection_quota.h b/src/core/lib/resource_quota/connection_quota.h index ac0aa6cdb29..4181a1878a1 100644 --- a/src/core/lib/resource_quota/connection_quota.h +++ b/src/core/lib/resource_quota/connection_quota.h @@ -15,13 +15,12 @@ #ifndef GRPC_SRC_CORE_LIB_RESOURCE_QUOTA_CONNECTION_QUOTA_H #define GRPC_SRC_CORE_LIB_RESOURCE_QUOTA_CONNECTION_QUOTA_H +#include + #include #include #include "absl/base/thread_annotations.h" - -#include - #include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/util/ref_counted.h" #include "src/core/util/ref_counted_ptr.h" diff --git a/src/core/lib/resource_quota/memory_quota.cc b/src/core/lib/resource_quota/memory_quota.cc index ee785e62adf..a69792a7d10 100644 --- a/src/core/lib/resource_quota/memory_quota.cc +++ b/src/core/lib/resource_quota/memory_quota.cc @@ -14,6 +14,9 @@ #include "src/core/lib/resource_quota/memory_quota.h" +#include +#include +#include #include #include @@ -29,11 +32,6 @@ #include "absl/log/log.h" #include "absl/status/status.h" #include "absl/strings/str_cat.h" - -#include -#include -#include - #include "src/core/lib/debug/trace.h" #include "src/core/lib/promise/exec_ctx_wakeup_scheduler.h" #include "src/core/lib/promise/loop.h" diff --git a/src/core/lib/resource_quota/memory_quota.h b/src/core/lib/resource_quota/memory_quota.h index 39c7d83a48a..85395b448d3 100644 --- a/src/core/lib/resource_quota/memory_quota.h +++ b/src/core/lib/resource_quota/memory_quota.h @@ -15,6 +15,9 @@ #ifndef GRPC_SRC_CORE_LIB_RESOURCE_QUOTA_MEMORY_QUOTA_H #define GRPC_SRC_CORE_LIB_RESOURCE_QUOTA_MEMORY_QUOTA_H +#include +#include +#include #include #include @@ -32,11 +35,6 @@ #include "absl/log/log.h" #include "absl/strings/string_view.h" #include "absl/types/optional.h" - -#include -#include -#include - #include "src/core/lib/debug/trace.h" #include "src/core/lib/experiments/experiments.h" #include "src/core/lib/promise/activity.h" diff --git a/src/core/lib/resource_quota/periodic_update.cc b/src/core/lib/resource_quota/periodic_update.cc index b7f9e9b9c03..f75cddc041a 100644 --- a/src/core/lib/resource_quota/periodic_update.cc +++ b/src/core/lib/resource_quota/periodic_update.cc @@ -14,10 +14,10 @@ #include "src/core/lib/resource_quota/periodic_update.h" -#include - #include +#include + #include "src/core/util/useful.h" namespace grpc_core { diff --git a/src/core/lib/resource_quota/periodic_update.h b/src/core/lib/resource_quota/periodic_update.h index 7a91510ef77..950df574815 100644 --- a/src/core/lib/resource_quota/periodic_update.h +++ b/src/core/lib/resource_quota/periodic_update.h @@ -15,14 +15,12 @@ #ifndef GRPC_SRC_CORE_LIB_RESOURCE_QUOTA_PERIODIC_UPDATE_H #define GRPC_SRC_CORE_LIB_RESOURCE_QUOTA_PERIODIC_UPDATE_H +#include #include #include #include "absl/functional/function_ref.h" - -#include - #include "src/core/util/time.h" namespace grpc_core { diff --git a/src/core/lib/resource_quota/resource_quota.h b/src/core/lib/resource_quota/resource_quota.h index 0704a162eef..ffe61903255 100644 --- a/src/core/lib/resource_quota/resource_quota.h +++ b/src/core/lib/resource_quota/resource_quota.h @@ -15,15 +15,14 @@ #ifndef GRPC_SRC_CORE_LIB_RESOURCE_QUOTA_RESOURCE_QUOTA_H #define GRPC_SRC_CORE_LIB_RESOURCE_QUOTA_RESOURCE_QUOTA_H -#include -#include - -#include "absl/strings/string_view.h" - #include #include #include +#include +#include + +#include "absl/strings/string_view.h" #include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/lib/resource_quota/thread_quota.h" #include "src/core/util/cpp_impl_of.h" diff --git a/src/core/lib/resource_quota/thread_quota.cc b/src/core/lib/resource_quota/thread_quota.cc index 73e8b224402..381375427e2 100644 --- a/src/core/lib/resource_quota/thread_quota.cc +++ b/src/core/lib/resource_quota/thread_quota.cc @@ -14,10 +14,10 @@ #include "src/core/lib/resource_quota/thread_quota.h" -#include "absl/log/check.h" - #include +#include "absl/log/check.h" + namespace grpc_core { ThreadQuota::ThreadQuota() = default; diff --git a/src/core/lib/resource_quota/thread_quota.h b/src/core/lib/resource_quota/thread_quota.h index 965436f20df..18a6e13e7f1 100644 --- a/src/core/lib/resource_quota/thread_quota.h +++ b/src/core/lib/resource_quota/thread_quota.h @@ -15,13 +15,12 @@ #ifndef GRPC_SRC_CORE_LIB_RESOURCE_QUOTA_THREAD_QUOTA_H #define GRPC_SRC_CORE_LIB_RESOURCE_QUOTA_THREAD_QUOTA_H +#include + #include #include #include "absl/base/thread_annotations.h" - -#include - #include "src/core/util/ref_counted.h" #include "src/core/util/ref_counted_ptr.h" #include "src/core/util/sync.h" diff --git a/src/core/lib/security/authorization/audit_logging.cc b/src/core/lib/security/authorization/audit_logging.cc index 2f8ac055c1c..4a6b8b97b25 100644 --- a/src/core/lib/security/authorization/audit_logging.cc +++ b/src/core/lib/security/authorization/audit_logging.cc @@ -18,6 +18,10 @@ #include "src/core/lib/security/authorization/audit_logging.h" +#include +#include +#include + #include #include #include @@ -27,11 +31,6 @@ #include "absl/status/statusor.h" #include "absl/strings/str_format.h" #include "absl/strings/string_view.h" - -#include -#include -#include - #include "src/core/lib/security/authorization/stdout_logger.h" #include "src/core/util/sync.h" diff --git a/src/core/lib/security/authorization/audit_logging.h b/src/core/lib/security/authorization/audit_logging.h index 1f97120cd60..899e0dcc131 100644 --- a/src/core/lib/security/authorization/audit_logging.h +++ b/src/core/lib/security/authorization/audit_logging.h @@ -19,17 +19,16 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_AUDIT_LOGGING_H #define GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_AUDIT_LOGGING_H +#include +#include +#include + #include #include #include "absl/base/thread_annotations.h" #include "absl/status/statusor.h" #include "absl/strings/string_view.h" - -#include -#include -#include - #include "src/core/util/sync.h" namespace grpc_core { diff --git a/src/core/lib/security/authorization/authorization_engine.h b/src/core/lib/security/authorization/authorization_engine.h index 4dca42bea85..dcd8ec5d4fe 100644 --- a/src/core/lib/security/authorization/authorization_engine.h +++ b/src/core/lib/security/authorization/authorization_engine.h @@ -15,10 +15,10 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_AUTHORIZATION_ENGINE_H #define GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_AUTHORIZATION_ENGINE_H -#include - #include +#include + #include "src/core/lib/security/authorization/evaluate_args.h" #include "src/core/util/ref_counted.h" diff --git a/src/core/lib/security/authorization/authorization_policy_provider.h b/src/core/lib/security/authorization/authorization_policy_provider.h index 6dfdc8fb875..ce0a9c7604f 100644 --- a/src/core/lib/security/authorization/authorization_policy_provider.h +++ b/src/core/lib/security/authorization/authorization_policy_provider.h @@ -15,12 +15,11 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_AUTHORIZATION_POLICY_PROVIDER_H #define GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_AUTHORIZATION_POLICY_PROVIDER_H -#include "absl/strings/string_view.h" - #include #include #include +#include "absl/strings/string_view.h" #include "src/core/lib/security/authorization/authorization_engine.h" #include "src/core/util/dual_ref_counted.h" #include "src/core/util/ref_counted_ptr.h" diff --git a/src/core/lib/security/authorization/cel_authorization_engine.cc b/src/core/lib/security/authorization/cel_authorization_engine.cc index d2d14ebbb8b..47d8f37a007 100644 --- a/src/core/lib/security/authorization/cel_authorization_engine.cc +++ b/src/core/lib/security/authorization/cel_authorization_engine.cc @@ -14,6 +14,7 @@ #include "src/core/lib/security/authorization/cel_authorization_engine.h" +#include #include #include @@ -26,8 +27,6 @@ #include "upb/base/string_view.h" #include "upb/message/map.h" -#include - namespace grpc_core { namespace { diff --git a/src/core/lib/security/authorization/cel_authorization_engine.h b/src/core/lib/security/authorization/cel_authorization_engine.h index 5122b96cab5..03ea185d0bb 100644 --- a/src/core/lib/security/authorization/cel_authorization_engine.h +++ b/src/core/lib/security/authorization/cel_authorization_engine.h @@ -16,6 +16,8 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_CEL_AUTHORIZATION_ENGINE_H #define GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_CEL_AUTHORIZATION_ENGINE_H +#include + #include #include #include @@ -24,13 +26,10 @@ #include "absl/container/flat_hash_set.h" #include "envoy/config/rbac/v3/rbac.upb.h" #include "google/api/expr/v1alpha1/syntax.upb.h" -#include "upb/mem/arena.hpp" - -#include - #include "src/core/lib/security/authorization/evaluate_args.h" #include "src/core/lib/security/authorization/mock_cel/activation.h" #include "src/core/lib/security/authorization/mock_cel/cel_value.h" +#include "upb/mem/arena.hpp" namespace grpc_core { diff --git a/src/core/lib/security/authorization/evaluate_args.cc b/src/core/lib/security/authorization/evaluate_args.cc index 0a4e23d1923..ca572e13d45 100644 --- a/src/core/lib/security/authorization/evaluate_args.cc +++ b/src/core/lib/security/authorization/evaluate_args.cc @@ -14,6 +14,8 @@ #include "src/core/lib/security/authorization/evaluate_args.h" +#include +#include #include #include "absl/log/log.h" @@ -21,10 +23,6 @@ #include "absl/status/statusor.h" #include "absl/strings/match.h" #include "absl/strings/numbers.h" - -#include -#include - #include "src/core/handshaker/endpoint_info/endpoint_info_handshaker.h" #include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/security/credentials/tls/tls_utils.h" diff --git a/src/core/lib/security/authorization/evaluate_args.h b/src/core/lib/security/authorization/evaluate_args.h index 69cf2ac4ee8..226df0aac8d 100644 --- a/src/core/lib/security/authorization/evaluate_args.h +++ b/src/core/lib/security/authorization/evaluate_args.h @@ -15,15 +15,14 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_EVALUATE_ARGS_H #define GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_EVALUATE_ARGS_H +#include +#include + #include #include #include "absl/strings/string_view.h" #include "absl/types/optional.h" - -#include -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/iomgr/resolved_address.h" #include "src/core/lib/transport/metadata_batch.h" diff --git a/src/core/lib/security/authorization/grpc_authorization_engine.cc b/src/core/lib/security/authorization/grpc_authorization_engine.cc index 4fed6af4fed..a2b38af3d39 100644 --- a/src/core/lib/security/authorization/grpc_authorization_engine.cc +++ b/src/core/lib/security/authorization/grpc_authorization_engine.cc @@ -14,14 +14,13 @@ #include "src/core/lib/security/authorization/grpc_authorization_engine.h" +#include + #include #include #include #include "absl/log/check.h" - -#include - #include "src/core/lib/security/authorization/audit_logging.h" #include "src/core/lib/security/authorization/authorization_engine.h" diff --git a/src/core/lib/security/authorization/grpc_authorization_engine.h b/src/core/lib/security/authorization/grpc_authorization_engine.h index 1ac877a5f4c..514d5343b04 100644 --- a/src/core/lib/security/authorization/grpc_authorization_engine.h +++ b/src/core/lib/security/authorization/grpc_authorization_engine.h @@ -15,15 +15,14 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_GRPC_AUTHORIZATION_ENGINE_H #define GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_GRPC_AUTHORIZATION_ENGINE_H +#include +#include #include #include #include #include -#include -#include - #include "src/core/lib/security/authorization/authorization_engine.h" #include "src/core/lib/security/authorization/evaluate_args.h" #include "src/core/lib/security/authorization/matchers.h" diff --git a/src/core/lib/security/authorization/grpc_authorization_policy_provider.cc b/src/core/lib/security/authorization/grpc_authorization_policy_provider.cc index 171fd61b3f1..8830bf5e599 100644 --- a/src/core/lib/security/authorization/grpc_authorization_policy_provider.cc +++ b/src/core/lib/security/authorization/grpc_authorization_policy_provider.cc @@ -14,21 +14,19 @@ #include "src/core/lib/security/authorization/grpc_authorization_policy_provider.h" -#include - -#include - -#include "absl/log/check.h" -#include "absl/log/log.h" -#include "absl/types/optional.h" - #include #include #include #include #include #include +#include + +#include +#include "absl/log/check.h" +#include "absl/log/log.h" +#include "absl/types/optional.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/security/authorization/grpc_authorization_engine.h" diff --git a/src/core/lib/security/authorization/grpc_authorization_policy_provider.h b/src/core/lib/security/authorization/grpc_authorization_policy_provider.h index f7e6aff40d7..bac11102126 100644 --- a/src/core/lib/security/authorization/grpc_authorization_policy_provider.h +++ b/src/core/lib/security/authorization/grpc_authorization_policy_provider.h @@ -15,6 +15,10 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_GRPC_AUTHORIZATION_POLICY_PROVIDER_H #define GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_GRPC_AUTHORIZATION_POLICY_PROVIDER_H +#include +#include +#include + #include #include #include @@ -23,11 +27,6 @@ #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/string_view.h" - -#include -#include -#include - #include "src/core/lib/security/authorization/authorization_engine.h" #include "src/core/lib/security/authorization/authorization_policy_provider.h" #include "src/core/lib/security/authorization/rbac_translator.h" diff --git a/src/core/lib/security/authorization/grpc_server_authz_filter.cc b/src/core/lib/security/authorization/grpc_server_authz_filter.cc index 540b2af1f67..8e3c1e2f276 100644 --- a/src/core/lib/security/authorization/grpc_server_authz_filter.cc +++ b/src/core/lib/security/authorization/grpc_server_authz_filter.cc @@ -14,6 +14,8 @@ #include "src/core/lib/security/authorization/grpc_server_authz_filter.h" +#include + #include #include #include @@ -22,9 +24,6 @@ #include "absl/log/log.h" #include "absl/status/status.h" #include "absl/strings/str_join.h" - -#include - #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/channel/promise_based_filter.h" #include "src/core/lib/debug/trace.h" diff --git a/src/core/lib/security/authorization/grpc_server_authz_filter.h b/src/core/lib/security/authorization/grpc_server_authz_filter.h index 733142cfca3..10ad7281059 100644 --- a/src/core/lib/security/authorization/grpc_server_authz_filter.h +++ b/src/core/lib/security/authorization/grpc_server_authz_filter.h @@ -15,11 +15,10 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_GRPC_SERVER_AUTHZ_FILTER_H #define GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_GRPC_SERVER_AUTHZ_FILTER_H -#include "absl/status/statusor.h" - #include #include +#include "absl/status/statusor.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" diff --git a/src/core/lib/security/authorization/matchers.cc b/src/core/lib/security/authorization/matchers.cc index 887f74e79ed..c113514f233 100644 --- a/src/core/lib/security/authorization/matchers.cc +++ b/src/core/lib/security/authorization/matchers.cc @@ -14,6 +14,8 @@ #include "src/core/lib/security/authorization/matchers.h" +#include +#include #include #include @@ -22,10 +24,6 @@ #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/string_view.h" - -#include -#include - #include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/address_utils/sockaddr_utils.h" diff --git a/src/core/lib/security/authorization/matchers.h b/src/core/lib/security/authorization/matchers.h index eaadd07b4e7..ce413534ef5 100644 --- a/src/core/lib/security/authorization/matchers.h +++ b/src/core/lib/security/authorization/matchers.h @@ -15,6 +15,7 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_MATCHERS_H #define GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_MATCHERS_H +#include #include #include @@ -22,9 +23,6 @@ #include #include "absl/types/optional.h" - -#include - #include "src/core/lib/iomgr/resolved_address.h" #include "src/core/lib/security/authorization/evaluate_args.h" #include "src/core/lib/security/authorization/rbac_policy.h" diff --git a/src/core/lib/security/authorization/mock_cel/activation.h b/src/core/lib/security/authorization/mock_cel/activation.h index 174aeac91e7..ca3cb392a25 100644 --- a/src/core/lib/security/authorization/mock_cel/activation.h +++ b/src/core/lib/security/authorization/mock_cel/activation.h @@ -15,10 +15,9 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_MOCK_CEL_ACTIVATION_H #define GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_MOCK_CEL_ACTIVATION_H -#include "absl/strings/string_view.h" - #include +#include "absl/strings/string_view.h" #include "src/core/lib/security/authorization/mock_cel/cel_value.h" namespace grpc_core { diff --git a/src/core/lib/security/authorization/mock_cel/cel_expr_builder_factory.h b/src/core/lib/security/authorization/mock_cel/cel_expr_builder_factory.h index 873d085ffe8..b9f94b15523 100644 --- a/src/core/lib/security/authorization/mock_cel/cel_expr_builder_factory.h +++ b/src/core/lib/security/authorization/mock_cel/cel_expr_builder_factory.h @@ -15,10 +15,10 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_MOCK_CEL_CEL_EXPR_BUILDER_FACTORY_H #define GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_MOCK_CEL_CEL_EXPR_BUILDER_FACTORY_H -#include - #include +#include + #include "src/core/lib/security/authorization/mock_cel/cel_expression.h" #include "src/core/lib/security/authorization/mock_cel/flat_expr_builder.h" diff --git a/src/core/lib/security/authorization/mock_cel/cel_expression.h b/src/core/lib/security/authorization/mock_cel/cel_expression.h index 8e4a8b0c042..63da5c943b9 100644 --- a/src/core/lib/security/authorization/mock_cel/cel_expression.h +++ b/src/core/lib/security/authorization/mock_cel/cel_expression.h @@ -15,15 +15,14 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_MOCK_CEL_CEL_EXPRESSION_H #define GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_MOCK_CEL_CEL_EXPRESSION_H +#include + #include #include #include "absl/status/status.h" #include "absl/status/statusor.h" #include "google/api/expr/v1alpha1/syntax.upb.h" - -#include - #include "src/core/lib/security/authorization/mock_cel/activation.h" #include "src/core/lib/security/authorization/mock_cel/cel_value.h" diff --git a/src/core/lib/security/authorization/mock_cel/cel_value.h b/src/core/lib/security/authorization/mock_cel/cel_value.h index 5a7531121aa..2137595fe4f 100644 --- a/src/core/lib/security/authorization/mock_cel/cel_value.h +++ b/src/core/lib/security/authorization/mock_cel/cel_value.h @@ -30,6 +30,7 @@ // std::string* msg("test"); // CelValue value = CelValue::CreateString(msg); +#include #include #include @@ -39,8 +40,6 @@ #include "absl/strings/string_view.h" #include "absl/types/span.h" -#include - namespace grpc_core { namespace mock_cel { diff --git a/src/core/lib/security/authorization/mock_cel/evaluator_core.h b/src/core/lib/security/authorization/mock_cel/evaluator_core.h index 09f0add6c81..232db020d66 100644 --- a/src/core/lib/security/authorization/mock_cel/evaluator_core.h +++ b/src/core/lib/security/authorization/mock_cel/evaluator_core.h @@ -15,14 +15,13 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_MOCK_CEL_EVALUATOR_CORE_H #define GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_MOCK_CEL_EVALUATOR_CORE_H +#include + #include #include #include "absl/status/statusor.h" #include "google/api/expr/v1alpha1/syntax.upb.h" - -#include - #include "src/core/lib/security/authorization/mock_cel/activation.h" #include "src/core/lib/security/authorization/mock_cel/cel_expression.h" #include "src/core/lib/security/authorization/mock_cel/cel_value.h" diff --git a/src/core/lib/security/authorization/mock_cel/flat_expr_builder.h b/src/core/lib/security/authorization/mock_cel/flat_expr_builder.h index 608d9d9cfa1..bd4993e3917 100644 --- a/src/core/lib/security/authorization/mock_cel/flat_expr_builder.h +++ b/src/core/lib/security/authorization/mock_cel/flat_expr_builder.h @@ -15,6 +15,8 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_MOCK_CEL_FLAT_EXPR_BUILDER_H #define GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_MOCK_CEL_FLAT_EXPR_BUILDER_H +#include + #include #include #include @@ -23,9 +25,6 @@ #include "absl/status/status.h" #include "absl/status/statusor.h" #include "google/api/expr/v1alpha1/syntax.upb.h" - -#include - #include "src/core/lib/security/authorization/mock_cel/cel_expression.h" #include "src/core/lib/security/authorization/mock_cel/evaluator_core.h" diff --git a/src/core/lib/security/authorization/rbac_policy.cc b/src/core/lib/security/authorization/rbac_policy.cc index 6dfa7b3e3cf..de2ade9f16f 100644 --- a/src/core/lib/security/authorization/rbac_policy.cc +++ b/src/core/lib/security/authorization/rbac_policy.cc @@ -14,14 +14,14 @@ #include "src/core/lib/security/authorization/rbac_policy.h" +#include + #include #include "absl/strings/str_format.h" #include "absl/strings/str_join.h" #include "absl/strings/string_view.h" -#include - namespace grpc_core { // diff --git a/src/core/lib/security/authorization/rbac_policy.h b/src/core/lib/security/authorization/rbac_policy.h index 03b4e283cde..9ad0bb0bca7 100644 --- a/src/core/lib/security/authorization/rbac_policy.h +++ b/src/core/lib/security/authorization/rbac_policy.h @@ -15,6 +15,8 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_RBAC_POLICY_H #define GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_RBAC_POLICY_H +#include +#include #include #include @@ -23,10 +25,6 @@ #include #include "absl/types/optional.h" - -#include -#include - #include "src/core/util/matchers.h" namespace grpc_core { diff --git a/src/core/lib/security/authorization/rbac_translator.cc b/src/core/lib/security/authorization/rbac_translator.cc index 342f9248371..7c3863e6824 100644 --- a/src/core/lib/security/authorization/rbac_translator.cc +++ b/src/core/lib/security/authorization/rbac_translator.cc @@ -14,6 +14,9 @@ #include "src/core/lib/security/authorization/rbac_translator.h" +#include +#include +#include #include #include @@ -31,11 +34,6 @@ #include "absl/strings/str_format.h" #include "absl/strings/string_view.h" #include "absl/strings/strip.h" - -#include -#include -#include - #include "src/core/lib/security/authorization/audit_logging.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_reader.h" diff --git a/src/core/lib/security/authorization/rbac_translator.h b/src/core/lib/security/authorization/rbac_translator.h index 18c1fed3b99..446583452a0 100644 --- a/src/core/lib/security/authorization/rbac_translator.h +++ b/src/core/lib/security/authorization/rbac_translator.h @@ -15,12 +15,11 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_RBAC_TRANSLATOR_H #define GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_RBAC_TRANSLATOR_H +#include + #include "absl/status/statusor.h" #include "absl/strings/string_view.h" #include "absl/types/optional.h" - -#include - #include "src/core/lib/security/authorization/rbac_policy.h" namespace grpc_core { diff --git a/src/core/lib/security/authorization/stdout_logger.cc b/src/core/lib/security/authorization/stdout_logger.cc index 9314d21a0e6..f2fc5eaa6a6 100644 --- a/src/core/lib/security/authorization/stdout_logger.cc +++ b/src/core/lib/security/authorization/stdout_logger.cc @@ -14,6 +14,10 @@ #include "src/core/lib/security/authorization/stdout_logger.h" +#include +#include +#include + #include #include #include @@ -25,10 +29,6 @@ #include "absl/time/clock.h" #include "absl/time/time.h" -#include -#include -#include - namespace grpc_core { namespace experimental { diff --git a/src/core/lib/security/authorization/stdout_logger.h b/src/core/lib/security/authorization/stdout_logger.h index a2186af7fb0..cc03d3a3252 100644 --- a/src/core/lib/security/authorization/stdout_logger.h +++ b/src/core/lib/security/authorization/stdout_logger.h @@ -15,16 +15,16 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_STDOUT_LOGGER_H #define GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_STDOUT_LOGGER_H +#include +#include +#include + #include #include #include "absl/status/statusor.h" #include "absl/strings/string_view.h" -#include -#include -#include - namespace grpc_core { namespace experimental { diff --git a/src/core/lib/security/certificate_provider/certificate_provider_factory.h b/src/core/lib/security/certificate_provider/certificate_provider_factory.h index 9da32e9233f..72412caa4e5 100644 --- a/src/core/lib/security/certificate_provider/certificate_provider_factory.h +++ b/src/core/lib/security/certificate_provider/certificate_provider_factory.h @@ -19,14 +19,13 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_CERTIFICATE_PROVIDER_CERTIFICATE_PROVIDER_FACTORY_H #define GRPC_SRC_CORE_LIB_SECURITY_CERTIFICATE_PROVIDER_CERTIFICATE_PROVIDER_FACTORY_H -#include - -#include "absl/strings/string_view.h" - #include #include #include +#include + +#include "absl/strings/string_view.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_args.h" #include "src/core/util/ref_counted.h" diff --git a/src/core/lib/security/certificate_provider/certificate_provider_registry.cc b/src/core/lib/security/certificate_provider/certificate_provider_registry.cc index 7a213fdc884..40b9a6a90c9 100644 --- a/src/core/lib/security/certificate_provider/certificate_provider_registry.cc +++ b/src/core/lib/security/certificate_provider/certificate_provider_registry.cc @@ -18,14 +18,14 @@ #include "src/core/lib/security/certificate_provider/certificate_provider_registry.h" +#include + #include #include #include "absl/log/check.h" #include "absl/log/log.h" -#include - namespace grpc_core { void CertificateProviderRegistry::Builder::RegisterCertificateProviderFactory( diff --git a/src/core/lib/security/certificate_provider/certificate_provider_registry.h b/src/core/lib/security/certificate_provider/certificate_provider_registry.h index 84eee65d392..636884528d6 100644 --- a/src/core/lib/security/certificate_provider/certificate_provider_registry.h +++ b/src/core/lib/security/certificate_provider/certificate_provider_registry.h @@ -19,14 +19,13 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_CERTIFICATE_PROVIDER_CERTIFICATE_PROVIDER_REGISTRY_H #define GRPC_SRC_CORE_LIB_SECURITY_CERTIFICATE_PROVIDER_CERTIFICATE_PROVIDER_REGISTRY_H +#include + #include #include #include #include "absl/strings/string_view.h" - -#include - #include "src/core/lib/security/certificate_provider/certificate_provider_factory.h" namespace grpc_core { diff --git a/src/core/lib/security/context/security_context.cc b/src/core/lib/security/context/security_context.cc index 67a219d9038..46fe754b728 100644 --- a/src/core/lib/security/context/security_context.cc +++ b/src/core/lib/security/context/security_context.cc @@ -18,19 +18,17 @@ #include "src/core/lib/security/context/security_context.h" -#include - -#include - -#include "absl/log/check.h" -#include "absl/log/log.h" - #include #include #include #include #include +#include + +#include +#include "absl/log/check.h" +#include "absl/log/log.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/iomgr/exec_ctx.h" diff --git a/src/core/lib/security/context/security_context.h b/src/core/lib/security/context/security_context.h index cc3b21620a5..1a5b7afa320 100644 --- a/src/core/lib/security/context/security_context.h +++ b/src/core/lib/security/context/security_context.h @@ -19,19 +19,17 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_CONTEXT_SECURITY_CONTEXT_H #define GRPC_SRC_CORE_LIB_SECURITY_CONTEXT_SECURITY_CONTEXT_H -#include - -#include -#include - -#include "absl/strings/string_view.h" - #include #include #include #include #include +#include + +#include +#include +#include "absl/strings/string_view.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/security/credentials/credentials.h" // IWYU pragma: keep diff --git a/src/core/lib/security/credentials/alts/alts_credentials.cc b/src/core/lib/security/credentials/alts/alts_credentials.cc index 45888d0e808..1e58abcf215 100644 --- a/src/core/lib/security/credentials/alts/alts_credentials.cc +++ b/src/core/lib/security/credentials/alts/alts_credentials.cc @@ -18,13 +18,13 @@ #include "src/core/lib/security/credentials/alts/alts_credentials.h" -#include - #include #include #include #include +#include + #include "src/core/lib/security/credentials/alts/check_gcp_environment.h" #include "src/core/lib/security/credentials/alts/grpc_alts_credentials_options.h" #include "src/core/lib/security/security_connector/alts/alts_security_connector.h" diff --git a/src/core/lib/security/credentials/alts/check_gcp_environment.cc b/src/core/lib/security/credentials/alts/check_gcp_environment.cc index 864620c9a5a..37628d18321 100644 --- a/src/core/lib/security/credentials/alts/check_gcp_environment.cc +++ b/src/core/lib/security/credentials/alts/check_gcp_environment.cc @@ -19,14 +19,13 @@ #include "src/core/lib/security/credentials/alts/check_gcp_environment.h" #include +#include +#include #include #include #include "absl/log/log.h" -#include -#include - const size_t kBiosDataBufferSize = 256; static char* trim(const char* src) { diff --git a/src/core/lib/security/credentials/alts/check_gcp_environment_linux.cc b/src/core/lib/security/credentials/alts/check_gcp_environment_linux.cc index c4d767a3d2b..47bb4b73c4d 100644 --- a/src/core/lib/security/credentials/alts/check_gcp_environment_linux.cc +++ b/src/core/lib/security/credentials/alts/check_gcp_environment_linux.cc @@ -20,10 +20,9 @@ #ifdef GPR_LINUX -#include - #include #include +#include #include "src/core/lib/security/credentials/alts/check_gcp_environment.h" diff --git a/src/core/lib/security/credentials/alts/check_gcp_environment_no_op.cc b/src/core/lib/security/credentials/alts/check_gcp_environment_no_op.cc index 4de3a24eae6..bf64fe60a36 100644 --- a/src/core/lib/security/credentials/alts/check_gcp_environment_no_op.cc +++ b/src/core/lib/security/credentials/alts/check_gcp_environment_no_op.cc @@ -21,7 +21,6 @@ #if !defined(GPR_LINUX) && !defined(GPR_WINDOWS) #include "absl/log/log.h" - #include "src/core/lib/security/credentials/alts/check_gcp_environment.h" #include "src/core/util/crash.h" diff --git a/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc b/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc index df6a6240974..462ba6bcb31 100644 --- a/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc +++ b/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc @@ -20,14 +20,13 @@ #ifdef GPR_WINDOWS +#include +#include #include #include #include #include -#include -#include - #include "src/core/lib/security/credentials/alts/check_gcp_environment.h" #include "src/core/util/crash.h" diff --git a/src/core/lib/security/credentials/alts/grpc_alts_credentials_client_options.cc b/src/core/lib/security/credentials/alts/grpc_alts_credentials_client_options.cc index a6053a5d810..37a1856713a 100644 --- a/src/core/lib/security/credentials/alts/grpc_alts_credentials_client_options.cc +++ b/src/core/lib/security/credentials/alts/grpc_alts_credentials_client_options.cc @@ -16,13 +16,12 @@ // // -#include "absl/log/log.h" - #include #include #include #include +#include "absl/log/log.h" #include "src/core/lib/security/credentials/alts/grpc_alts_credentials_options.h" #include "src/core/tsi/alts/handshaker/transport_security_common_api.h" diff --git a/src/core/lib/security/credentials/alts/grpc_alts_credentials_options.cc b/src/core/lib/security/credentials/alts/grpc_alts_credentials_options.cc index 6b11ab3f623..a52dfe96173 100644 --- a/src/core/lib/security/credentials/alts/grpc_alts_credentials_options.cc +++ b/src/core/lib/security/credentials/alts/grpc_alts_credentials_options.cc @@ -18,11 +18,11 @@ #include "src/core/lib/security/credentials/alts/grpc_alts_credentials_options.h" -#include "absl/log/log.h" - #include #include +#include "absl/log/log.h" + grpc_alts_credentials_options* grpc_alts_credentials_options_copy( const grpc_alts_credentials_options* options) { if (options != nullptr && options->vtable != nullptr && diff --git a/src/core/lib/security/credentials/call_creds_util.cc b/src/core/lib/security/credentials/call_creds_util.cc index 3acc0708f62..e97ba305f17 100644 --- a/src/core/lib/security/credentials/call_creds_util.cc +++ b/src/core/lib/security/credentials/call_creds_util.cc @@ -16,16 +16,14 @@ #include "src/core/lib/security/credentials/call_creds_util.h" +#include +#include #include #include "absl/log/check.h" #include "absl/log/log.h" #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" - -#include -#include - #include "src/core/lib/security/context/security_context.h" #include "src/core/lib/security/security_connector/security_connector.h" #include "src/core/lib/transport/metadata_batch.h" diff --git a/src/core/lib/security/credentials/call_creds_util.h b/src/core/lib/security/credentials/call_creds_util.h index 6e95f100f94..62fd38a5df7 100644 --- a/src/core/lib/security/credentials/call_creds_util.h +++ b/src/core/lib/security/credentials/call_creds_util.h @@ -17,12 +17,12 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_CALL_CREDS_UTIL_H #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_CALL_CREDS_UTIL_H -#include - #include #include #include +#include + #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/transport/transport.h" diff --git a/src/core/lib/security/credentials/channel_creds_registry.h b/src/core/lib/security/credentials/channel_creds_registry.h index 17771ff8d9e..881bb607792 100644 --- a/src/core/lib/security/credentials/channel_creds_registry.h +++ b/src/core/lib/security/credentials/channel_creds_registry.h @@ -17,15 +17,14 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_CHANNEL_CREDS_REGISTRY_H #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_CHANNEL_CREDS_REGISTRY_H +#include + #include #include #include #include #include "absl/strings/string_view.h" - -#include - #include "src/core/util/json/json.h" #include "src/core/util/json/json_args.h" #include "src/core/util/ref_counted.h" diff --git a/src/core/lib/security/credentials/channel_creds_registry_init.cc b/src/core/lib/security/credentials/channel_creds_registry_init.cc index de2f7d143b9..cf55ff2da64 100644 --- a/src/core/lib/security/credentials/channel_creds_registry_init.cc +++ b/src/core/lib/security/credentials/channel_creds_registry_init.cc @@ -16,13 +16,6 @@ // // -#include -#include -#include -#include - -#include "absl/strings/string_view.h" - #include #include #include @@ -30,6 +23,12 @@ #include #include +#include +#include +#include +#include + +#include "absl/strings/string_view.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/security/credentials/channel_creds_registry.h" #include "src/core/lib/security/credentials/credentials.h" diff --git a/src/core/lib/security/credentials/composite/composite_credentials.cc b/src/core/lib/security/credentials/composite/composite_credentials.cc index d5d8c76baf4..81b6463421f 100644 --- a/src/core/lib/security/credentials/composite/composite_credentials.cc +++ b/src/core/lib/security/credentials/composite/composite_credentials.cc @@ -18,6 +18,8 @@ #include "src/core/lib/security/credentials/composite/composite_credentials.h" +#include + #include #include #include @@ -25,9 +27,6 @@ #include "absl/log/check.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_join.h" - -#include - #include "src/core/lib/debug/trace.h" #include "src/core/lib/promise/try_seq.h" #include "src/core/lib/transport/metadata_batch.h" diff --git a/src/core/lib/security/credentials/composite/composite_credentials.h b/src/core/lib/security/credentials/composite/composite_credentials.h index 64b05de2cf1..ff2728f0b4a 100644 --- a/src/core/lib/security/credentials/composite/composite_credentials.h +++ b/src/core/lib/security/credentials/composite/composite_credentials.h @@ -19,19 +19,18 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_COMPOSITE_COMPOSITE_CREDENTIALS_H #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_COMPOSITE_COMPOSITE_CREDENTIALS_H -#include -#include -#include -#include - -#include "absl/status/statusor.h" - #include #include #include #include #include +#include +#include +#include +#include + +#include "absl/status/statusor.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/promise/arena_promise.h" #include "src/core/lib/security/credentials/credentials.h" diff --git a/src/core/lib/security/credentials/credentials.cc b/src/core/lib/security/credentials/credentials.cc index 6f43677d8f0..69a0180b93c 100644 --- a/src/core/lib/security/credentials/credentials.cc +++ b/src/core/lib/security/credentials/credentials.cc @@ -18,14 +18,12 @@ #include "src/core/lib/security/credentials/credentials.h" +#include #include #include #include "absl/log/check.h" #include "absl/log/log.h" - -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/iomgr/exec_ctx.h" diff --git a/src/core/lib/security/credentials/credentials.h b/src/core/lib/security/credentials/credentials.h index 57f0eaaa62b..2daef3c6b00 100644 --- a/src/core/lib/security/credentials/credentials.h +++ b/src/core/lib/security/credentials/credentials.h @@ -19,14 +19,6 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_CREDENTIALS_H #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_CREDENTIALS_H -#include -#include -#include - -#include "absl/log/check.h" -#include "absl/status/statusor.h" -#include "absl/strings/string_view.h" - #include #include #include @@ -34,6 +26,13 @@ #include #include +#include +#include +#include + +#include "absl/log/check.h" +#include "absl/status/statusor.h" +#include "absl/strings/string_view.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/promise/arena_promise.h" #include "src/core/lib/security/security_connector/security_connector.h" diff --git a/src/core/lib/security/credentials/external/aws_external_account_credentials.cc b/src/core/lib/security/credentials/external/aws_external_account_credentials.cc index 3348e3c5aba..13a46dadda1 100644 --- a/src/core/lib/security/credentials/external/aws_external_account_credentials.cc +++ b/src/core/lib/security/credentials/external/aws_external_account_credentials.cc @@ -15,6 +15,13 @@ // #include "src/core/lib/security/credentials/external/aws_external_account_credentials.h" +#include +#include +#include +#include +#include +#include +#include #include #include @@ -28,15 +35,6 @@ #include "absl/strings/str_replace.h" #include "absl/strings/string_view.h" #include "absl/types/optional.h" - -#include -#include -#include -#include -#include -#include -#include - #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/util/env.h" diff --git a/src/core/lib/security/credentials/external/aws_external_account_credentials.h b/src/core/lib/security/credentials/external/aws_external_account_credentials.h index 3ccac92ad7a..a8a2f19ae47 100644 --- a/src/core/lib/security/credentials/external/aws_external_account_credentials.h +++ b/src/core/lib/security/credentials/external/aws_external_account_credentials.h @@ -17,15 +17,14 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_EXTERNAL_AWS_EXTERNAL_ACCOUNT_CREDENTIALS_H #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_EXTERNAL_AWS_EXTERNAL_ACCOUNT_CREDENTIALS_H +#include + #include #include #include #include #include "absl/strings/string_view.h" - -#include - #include "src/core/lib/iomgr/error.h" #include "src/core/lib/security/credentials/external/aws_request_signer.h" #include "src/core/lib/security/credentials/external/external_account_credentials.h" diff --git a/src/core/lib/security/credentials/external/aws_request_signer.cc b/src/core/lib/security/credentials/external/aws_request_signer.cc index 87ca4b37918..82fb3fc814d 100644 --- a/src/core/lib/security/credentials/external/aws_request_signer.cc +++ b/src/core/lib/security/credentials/external/aws_request_signer.cc @@ -15,14 +15,15 @@ // #include "src/core/lib/security/credentials/external/aws_request_signer.h" -#include -#include - +#include #include #include #include #include +#include +#include + #include "absl/status/statusor.h" #include "absl/strings/ascii.h" #include "absl/strings/escaping.h" @@ -34,8 +35,6 @@ #include "absl/time/clock.h" #include "absl/time/time.h" -#include - namespace grpc_core { namespace { diff --git a/src/core/lib/security/credentials/external/aws_request_signer.h b/src/core/lib/security/credentials/external/aws_request_signer.h index 59a5390f795..12ef21342b9 100644 --- a/src/core/lib/security/credentials/external/aws_request_signer.h +++ b/src/core/lib/security/credentials/external/aws_request_signer.h @@ -17,11 +17,11 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_EXTERNAL_AWS_REQUEST_SIGNER_H #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_EXTERNAL_AWS_REQUEST_SIGNER_H +#include + #include #include -#include - #include "src/core/lib/iomgr/error.h" #include "src/core/util/uri.h" diff --git a/src/core/lib/security/credentials/external/external_account_credentials.cc b/src/core/lib/security/credentials/external/external_account_credentials.cc index 7c4955bc09d..9f240d9b051 100644 --- a/src/core/lib/security/credentials/external/external_account_credentials.cc +++ b/src/core/lib/security/credentials/external/external_account_credentials.cc @@ -15,6 +15,13 @@ #include "src/core/lib/security/credentials/external/external_account_credentials.h" +#include +#include +#include +#include +#include +#include +#include #include #include @@ -36,15 +43,6 @@ #include "absl/strings/strip.h" #include "absl/time/clock.h" #include "absl/time/time.h" - -#include -#include -#include -#include -#include -#include -#include - #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/credentials/external/aws_external_account_credentials.h" #include "src/core/lib/security/credentials/external/file_external_account_credentials.h" diff --git a/src/core/lib/security/credentials/external/external_account_credentials.h b/src/core/lib/security/credentials/external/external_account_credentials.h index 3323d21bbf0..bf6a5f1df81 100644 --- a/src/core/lib/security/credentials/external/external_account_credentials.h +++ b/src/core/lib/security/credentials/external/external_account_credentials.h @@ -17,6 +17,8 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_EXTERNAL_EXTERNAL_ACCOUNT_CREDENTIALS_H #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_EXTERNAL_EXTERNAL_ACCOUNT_CREDENTIALS_H +#include +#include #include #include @@ -25,10 +27,6 @@ #include #include "absl/strings/string_view.h" - -#include -#include - #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/polling_entity.h" diff --git a/src/core/lib/security/credentials/external/file_external_account_credentials.cc b/src/core/lib/security/credentials/external/file_external_account_credentials.cc index 6c8e1f06062..a02fb698c37 100644 --- a/src/core/lib/security/credentials/external/file_external_account_credentials.cc +++ b/src/core/lib/security/credentials/external/file_external_account_credentials.cc @@ -15,17 +15,16 @@ // #include "src/core/lib/security/credentials/external/file_external_account_credentials.h" +#include +#include +#include + #include #include #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/string_view.h" - -#include -#include -#include - #include "src/core/lib/slice/slice.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/util/json/json.h" diff --git a/src/core/lib/security/credentials/external/file_external_account_credentials.h b/src/core/lib/security/credentials/external/file_external_account_credentials.h index 093f0a02809..2428f92d21a 100644 --- a/src/core/lib/security/credentials/external/file_external_account_credentials.h +++ b/src/core/lib/security/credentials/external/file_external_account_credentials.h @@ -17,14 +17,13 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_EXTERNAL_FILE_EXTERNAL_ACCOUNT_CREDENTIALS_H #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_EXTERNAL_FILE_EXTERNAL_ACCOUNT_CREDENTIALS_H +#include + #include #include #include #include "absl/strings/string_view.h" - -#include - #include "src/core/lib/iomgr/error.h" #include "src/core/lib/security/credentials/external/external_account_credentials.h" #include "src/core/util/ref_counted_ptr.h" diff --git a/src/core/lib/security/credentials/external/url_external_account_credentials.cc b/src/core/lib/security/credentials/external/url_external_account_credentials.cc index 39efb91d8f3..502700a4d64 100644 --- a/src/core/lib/security/credentials/external/url_external_account_credentials.cc +++ b/src/core/lib/security/credentials/external/url_external_account_credentials.cc @@ -15,6 +15,13 @@ // #include "src/core/lib/security/credentials/external/url_external_account_credentials.h" +#include +#include +#include +#include +#include +#include +#include #include #include @@ -27,15 +34,6 @@ #include "absl/strings/str_format.h" #include "absl/strings/str_split.h" #include "absl/strings/string_view.h" - -#include -#include -#include -#include -#include -#include -#include - #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/transport/error_utils.h" diff --git a/src/core/lib/security/credentials/external/url_external_account_credentials.h b/src/core/lib/security/credentials/external/url_external_account_credentials.h index d7a28777d2d..6d9e2c7fa97 100644 --- a/src/core/lib/security/credentials/external/url_external_account_credentials.h +++ b/src/core/lib/security/credentials/external/url_external_account_credentials.h @@ -17,15 +17,14 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_EXTERNAL_URL_EXTERNAL_ACCOUNT_CREDENTIALS_H #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_EXTERNAL_URL_EXTERNAL_ACCOUNT_CREDENTIALS_H +#include + #include #include #include #include #include "absl/strings/string_view.h" - -#include - #include "src/core/lib/iomgr/error.h" #include "src/core/lib/security/credentials/external/external_account_credentials.h" #include "src/core/util/http_client/httpcli.h" diff --git a/src/core/lib/security/credentials/fake/fake_credentials.cc b/src/core/lib/security/credentials/fake/fake_credentials.cc index 1e0f6f33eb4..aa61a12b68c 100644 --- a/src/core/lib/security/credentials/fake/fake_credentials.cc +++ b/src/core/lib/security/credentials/fake/fake_credentials.cc @@ -18,15 +18,13 @@ #include "src/core/lib/security/credentials/fake/fake_credentials.h" +#include #include #include #include #include "absl/strings/string_view.h" - -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/promise/promise.h" #include "src/core/lib/security/security_connector/fake/fake_security_connector.h" diff --git a/src/core/lib/security/credentials/fake/fake_credentials.h b/src/core/lib/security/credentials/fake/fake_credentials.h index fe4fb414593..77fe27268f9 100644 --- a/src/core/lib/security/credentials/fake/fake_credentials.h +++ b/src/core/lib/security/credentials/fake/fake_credentials.h @@ -19,16 +19,15 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_FAKE_FAKE_CREDENTIALS_H #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_FAKE_FAKE_CREDENTIALS_H -#include - -#include "absl/status/statusor.h" - #include #include #include #include #include +#include + +#include "absl/status/statusor.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/promise/arena_promise.h" #include "src/core/lib/security/credentials/credentials.h" diff --git a/src/core/lib/security/credentials/gcp_service_account_identity/gcp_service_account_identity_credentials.cc b/src/core/lib/security/credentials/gcp_service_account_identity/gcp_service_account_identity_credentials.cc index 8b3c8c8701d..31d00e7bfd3 100644 --- a/src/core/lib/security/credentials/gcp_service_account_identity/gcp_service_account_identity_credentials.cc +++ b/src/core/lib/security/credentials/gcp_service_account_identity/gcp_service_account_identity_credentials.cc @@ -16,6 +16,8 @@ #include "src/core/lib/security/credentials/gcp_service_account_identity/gcp_service_account_identity_credentials.h" +#include + #include "absl/functional/any_invocable.h" #include "absl/status/status.h" #include "absl/status/statusor.h" @@ -23,9 +25,6 @@ #include "absl/strings/str_cat.h" #include "absl/strings/str_split.h" #include "absl/strings/string_view.h" - -#include - #include "src/core/lib/iomgr/error.h" #include "src/core/lib/transport/metadata.h" #include "src/core/lib/transport/status_conversion.h" diff --git a/src/core/lib/security/credentials/gcp_service_account_identity/gcp_service_account_identity_credentials.h b/src/core/lib/security/credentials/gcp_service_account_identity/gcp_service_account_identity_credentials.h index 2e75547c402..7e3dfaa2abb 100644 --- a/src/core/lib/security/credentials/gcp_service_account_identity/gcp_service_account_identity_credentials.h +++ b/src/core/lib/security/credentials/gcp_service_account_identity/gcp_service_account_identity_credentials.h @@ -17,12 +17,12 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_GCP_SERVICE_ACCOUNT_IDENTITY_GCP_SERVICE_ACCOUNT_IDENTITY_CREDENTIALS_H #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_GCP_SERVICE_ACCOUNT_IDENTITY_GCP_SERVICE_ACCOUNT_IDENTITY_CREDENTIALS_H -#include -#include - #include #include +#include +#include + #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/polling_entity.h" #include "src/core/lib/security/credentials/credentials.h" diff --git a/src/core/lib/security/credentials/google_default/credentials_generic.cc b/src/core/lib/security/credentials/google_default/credentials_generic.cc index f09e5681c88..f07616d85ba 100644 --- a/src/core/lib/security/credentials/google_default/credentials_generic.cc +++ b/src/core/lib/security/credentials/google_default/credentials_generic.cc @@ -16,14 +16,13 @@ // // +#include + #include #include "absl/log/log.h" #include "absl/strings/str_cat.h" #include "absl/types/optional.h" - -#include - #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/credentials/google_default/google_default_credentials.h" #include "src/core/util/env.h" diff --git a/src/core/lib/security/credentials/google_default/google_default_credentials.cc b/src/core/lib/security/credentials/google_default/google_default_credentials.cc index 6581194e911..71999011093 100644 --- a/src/core/lib/security/credentials/google_default/google_default_credentials.cc +++ b/src/core/lib/security/credentials/google_default/google_default_credentials.cc @@ -18,6 +18,14 @@ #include "src/core/lib/security/credentials/google_default/google_default_credentials.h" +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -30,16 +38,6 @@ #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" #include "absl/types/optional.h" - -#include -#include -#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/iomgr/closure.h" diff --git a/src/core/lib/security/credentials/google_default/google_default_credentials.h b/src/core/lib/security/credentials/google_default/google_default_credentials.h index 889aebde57b..f9dc94e960e 100644 --- a/src/core/lib/security/credentials/google_default/google_default_credentials.h +++ b/src/core/lib/security/credentials/google_default/google_default_credentials.h @@ -18,13 +18,13 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_GOOGLE_DEFAULT_GOOGLE_DEFAULT_CREDENTIALS_H #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_GOOGLE_DEFAULT_GOOGLE_DEFAULT_CREDENTIALS_H -#include - #include #include #include #include +#include + #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/security_connector/security_connector.h" diff --git a/src/core/lib/security/credentials/iam/iam_credentials.cc b/src/core/lib/security/credentials/iam/iam_credentials.cc index 8d855978676..15a7cd653ce 100644 --- a/src/core/lib/security/credentials/iam/iam_credentials.cc +++ b/src/core/lib/security/credentials/iam/iam_credentials.cc @@ -18,6 +18,7 @@ #include "src/core/lib/security/credentials/iam/iam_credentials.h" +#include #include #include @@ -26,9 +27,6 @@ #include "absl/log/check.h" #include "absl/strings/str_format.h" #include "absl/strings/string_view.h" - -#include - #include "src/core/lib/debug/trace.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/promise/promise.h" diff --git a/src/core/lib/security/credentials/iam/iam_credentials.h b/src/core/lib/security/credentials/iam/iam_credentials.h index aa8426048f1..837892211d0 100644 --- a/src/core/lib/security/credentials/iam/iam_credentials.h +++ b/src/core/lib/security/credentials/iam/iam_credentials.h @@ -19,15 +19,14 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_IAM_IAM_CREDENTIALS_H #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_IAM_IAM_CREDENTIALS_H -#include - -#include "absl/status/statusor.h" -#include "absl/types/optional.h" - #include #include #include +#include + +#include "absl/status/statusor.h" +#include "absl/types/optional.h" #include "src/core/lib/promise/arena_promise.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/slice/slice.h" diff --git a/src/core/lib/security/credentials/insecure/insecure_credentials.cc b/src/core/lib/security/credentials/insecure/insecure_credentials.cc index a4900ff3281..e9960725cc5 100644 --- a/src/core/lib/security/credentials/insecure/insecure_credentials.cc +++ b/src/core/lib/security/credentials/insecure/insecure_credentials.cc @@ -18,10 +18,10 @@ #include "src/core/lib/security/credentials/insecure/insecure_credentials.h" -#include - #include +#include + #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/security/security_connector/insecure/insecure_security_connector.h" diff --git a/src/core/lib/security/credentials/jwt/json_token.cc b/src/core/lib/security/credentials/jwt/json_token.cc index 64c0f425985..eac638a1283 100644 --- a/src/core/lib/security/credentials/jwt/json_token.cc +++ b/src/core/lib/security/credentials/jwt/json_token.cc @@ -18,31 +18,28 @@ #include "src/core/lib/security/credentials/jwt/json_token.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include #include -#include -#include -#include -#include - #include "absl/log/check.h" #include "absl/log/log.h" #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/escaping.h" - -#include -#include -#include -#include -#include -#include -#include - #include "src/core/lib/iomgr/error.h" #include "src/core/lib/security/util/json_util.h" #include "src/core/util/json/json_reader.h" diff --git a/src/core/lib/security/credentials/jwt/json_token.h b/src/core/lib/security/credentials/jwt/json_token.h index 5576b643ce1..ab4544dbf52 100644 --- a/src/core/lib/security/credentials/jwt/json_token.h +++ b/src/core/lib/security/credentials/jwt/json_token.h @@ -19,10 +19,9 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_JWT_JSON_TOKEN_H #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_JWT_JSON_TOKEN_H -#include - #include #include +#include #include "src/core/util/json/json.h" diff --git a/src/core/lib/security/credentials/jwt/jwt_credentials.cc b/src/core/lib/security/credentials/jwt/jwt_credentials.cc index ab3cb4af773..c6239b7bc71 100644 --- a/src/core/lib/security/credentials/jwt/jwt_credentials.cc +++ b/src/core/lib/security/credentials/jwt/jwt_credentials.cc @@ -17,6 +17,12 @@ #include "src/core/lib/security/credentials/jwt/jwt_credentials.h" +#include +#include +#include +#include +#include +#include #include #include @@ -28,14 +34,6 @@ #include "absl/log/log.h" #include "absl/status/status.h" #include "absl/strings/str_cat.h" - -#include -#include -#include -#include -#include -#include - #include "src/core/lib/debug/trace.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/promise/promise.h" diff --git a/src/core/lib/security/credentials/jwt/jwt_credentials.h b/src/core/lib/security/credentials/jwt/jwt_credentials.h index 26dfa169ad4..e666bfac489 100644 --- a/src/core/lib/security/credentials/jwt/jwt_credentials.h +++ b/src/core/lib/security/credentials/jwt/jwt_credentials.h @@ -19,6 +19,11 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_JWT_JWT_CREDENTIALS_H #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_JWT_JWT_CREDENTIALS_H +#include +#include +#include +#include +#include #include #include @@ -28,13 +33,6 @@ #include "absl/strings/string_view.h" #include "absl/time/time.h" #include "absl/types/optional.h" - -#include -#include -#include -#include -#include - #include "src/core/lib/promise/arena_promise.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/credentials/jwt/json_token.h" diff --git a/src/core/lib/security/credentials/jwt/jwt_verifier.cc b/src/core/lib/security/credentials/jwt/jwt_verifier.cc index 5f45ece8056..4d34a06d0dc 100644 --- a/src/core/lib/security/credentials/jwt/jwt_verifier.cc +++ b/src/core/lib/security/credentials/jwt/jwt_verifier.cc @@ -18,16 +18,8 @@ #include "src/core/lib/security/credentials/jwt/jwt_verifier.h" +#include #include -#include -#include - -#include -#include -#include -#include -#include - #include #include #include @@ -35,25 +27,30 @@ #include #include #include +#include +#include -#include +#include +#include +#include +#include +#include #if OPENSSL_VERSION_NUMBER >= 0x30000000L #include #endif -#include "absl/log/check.h" -#include "absl/log/log.h" -#include "absl/status/status.h" -#include "absl/status/statusor.h" -#include "absl/strings/escaping.h" -#include "absl/strings/string_view.h" - #include #include #include #include #include +#include "absl/log/check.h" +#include "absl/log/log.h" +#include "absl/status/status.h" +#include "absl/status/statusor.h" +#include "absl/strings/escaping.h" +#include "absl/strings/string_view.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" diff --git a/src/core/lib/security/credentials/jwt/jwt_verifier.h b/src/core/lib/security/credentials/jwt/jwt_verifier.h index 9ff8ca53831..955e7efed72 100644 --- a/src/core/lib/security/credentials/jwt/jwt_verifier.h +++ b/src/core/lib/security/credentials/jwt/jwt_verifier.h @@ -19,10 +19,9 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_JWT_JWT_VERIFIER_H #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_JWT_JWT_VERIFIER_H -#include - #include #include +#include #include "src/core/lib/iomgr/iomgr_fwd.h" #include "src/core/util/json/json.h" diff --git a/src/core/lib/security/credentials/local/local_credentials.cc b/src/core/lib/security/credentials/local/local_credentials.cc index 94f975d6d7d..21495ff55d0 100644 --- a/src/core/lib/security/credentials/local/local_credentials.cc +++ b/src/core/lib/security/credentials/local/local_credentials.cc @@ -18,11 +18,11 @@ #include "src/core/lib/security/credentials/local/local_credentials.h" -#include - #include #include +#include + #include "src/core/lib/security/security_connector/local/local_security_connector.h" grpc_core::RefCountedPtr diff --git a/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc b/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc index 216c038cbf2..0e7f7eb33cf 100644 --- a/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc +++ b/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc @@ -18,6 +18,15 @@ #include "src/core/lib/security/credentials/oauth2/oauth2_credentials.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -34,17 +43,6 @@ #include "absl/strings/str_format.h" #include "absl/strings/str_join.h" #include "absl/strings/string_view.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include - #include "src/core/lib/debug/trace.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/pollset_set.h" diff --git a/src/core/lib/security/credentials/oauth2/oauth2_credentials.h b/src/core/lib/security/credentials/oauth2/oauth2_credentials.h index bb91c8a524f..5cba69234d6 100644 --- a/src/core/lib/security/credentials/oauth2/oauth2_credentials.h +++ b/src/core/lib/security/credentials/oauth2/oauth2_credentials.h @@ -19,6 +19,12 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_OAUTH2_OAUTH2_CREDENTIALS_H #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_OAUTH2_OAUTH2_CREDENTIALS_H +#include +#include +#include +#include +#include + #include #include #include @@ -26,13 +32,6 @@ #include "absl/status/statusor.h" #include "absl/strings/string_view.h" #include "absl/types/optional.h" - -#include -#include -#include -#include -#include - #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/polling_entity.h" diff --git a/src/core/lib/security/credentials/plugin/plugin_credentials.cc b/src/core/lib/security/credentials/plugin/plugin_credentials.cc index 8fa2bcc6575..1e0bae22f94 100644 --- a/src/core/lib/security/credentials/plugin/plugin_credentials.cc +++ b/src/core/lib/security/credentials/plugin/plugin_credentials.cc @@ -18,6 +18,9 @@ #include "src/core/lib/security/credentials/plugin/plugin_credentials.h" +#include +#include + #include #include @@ -26,10 +29,6 @@ #include "absl/status/status.h" #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" - -#include -#include - #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/promise/promise.h" diff --git a/src/core/lib/security/credentials/plugin/plugin_credentials.h b/src/core/lib/security/credentials/plugin/plugin_credentials.h index 113955240c1..2c25fae8f22 100644 --- a/src/core/lib/security/credentials/plugin/plugin_credentials.h +++ b/src/core/lib/security/credentials/plugin/plugin_credentials.h @@ -19,6 +19,12 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_PLUGIN_PLUGIN_CREDENTIALS_H #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_PLUGIN_PLUGIN_CREDENTIALS_H +#include +#include +#include +#include +#include +#include #include #include @@ -27,14 +33,6 @@ #include "absl/container/inlined_vector.h" #include "absl/status/statusor.h" - -#include -#include -#include -#include -#include -#include - #include "src/core/lib/debug/trace.h" #include "src/core/lib/promise/activity.h" #include "src/core/lib/promise/arena_promise.h" diff --git a/src/core/lib/security/credentials/ssl/ssl_credentials.cc b/src/core/lib/security/credentials/ssl/ssl_credentials.cc index 86eb4518c8e..c434cb73678 100644 --- a/src/core/lib/security/credentials/ssl/ssl_credentials.cc +++ b/src/core/lib/security/credentials/ssl/ssl_credentials.cc @@ -18,6 +18,10 @@ #include "src/core/lib/security/credentials/ssl/ssl_credentials.h" +#include +#include +#include +#include #include #include @@ -26,12 +30,6 @@ #include "absl/log/check.h" #include "absl/log/log.h" #include "absl/types/optional.h" - -#include -#include -#include -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/security/security_connector/ssl_utils.h" diff --git a/src/core/lib/security/credentials/ssl/ssl_credentials.h b/src/core/lib/security/credentials/ssl/ssl_credentials.h index ab4c9a12767..d0f947a537c 100644 --- a/src/core/lib/security/credentials/ssl/ssl_credentials.h +++ b/src/core/lib/security/credentials/ssl/ssl_credentials.h @@ -18,16 +18,14 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_SSL_SSL_CREDENTIALS_H #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_SSL_SSL_CREDENTIALS_H -#include - -#include "absl/log/check.h" - #include #include #include #include #include +#include +#include "absl/log/check.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/security_connector/security_connector.h" diff --git a/src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.cc b/src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.cc index 2472244f2c5..23ec403f16e 100644 --- a/src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.cc +++ b/src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.cc @@ -16,13 +16,13 @@ #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.h" -#include "absl/log/check.h" -#include "absl/status/status.h" - #include #include #include +#include "absl/log/check.h" +#include "absl/status/status.h" + void grpc_tls_certificate_distributor::SetKeyMaterials( const std::string& cert_name, absl::optional pem_root_certs, absl::optional pem_key_cert_pairs) { diff --git a/src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.h b/src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.h index f34e664d581..dd295d1cab7 100644 --- a/src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.h +++ b/src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.h @@ -17,6 +17,8 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_TLS_GRPC_TLS_CERTIFICATE_DISTRIBUTOR_H #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_TLS_GRPC_TLS_CERTIFICATE_DISTRIBUTOR_H +#include + #include #include #include @@ -27,9 +29,6 @@ #include "absl/base/thread_annotations.h" #include "absl/strings/string_view.h" #include "absl/types/optional.h" - -#include - #include "src/core/lib/iomgr/error.h" #include "src/core/lib/security/security_connector/ssl_utils.h" #include "src/core/util/ref_counted.h" diff --git a/src/core/lib/security/credentials/tls/grpc_tls_certificate_match.cc b/src/core/lib/security/credentials/tls/grpc_tls_certificate_match.cc index a7ebb6cbdb2..f7a9a05c42c 100644 --- a/src/core/lib/security/credentials/tls/grpc_tls_certificate_match.cc +++ b/src/core/lib/security/credentials/tls/grpc_tls_certificate_match.cc @@ -14,6 +14,7 @@ // limitations under the License. // +#include #include #include #include @@ -23,9 +24,6 @@ #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/string_view.h" - -#include - #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h" namespace grpc_core { diff --git a/src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.cc b/src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.cc index 0bcabaa6505..db6c5bf98a5 100644 --- a/src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.cc +++ b/src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.cc @@ -16,6 +16,10 @@ #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h" +#include +#include +#include +#include #include #include @@ -27,12 +31,6 @@ #include "absl/log/log.h" #include "absl/status/status.h" #include "absl/strings/string_view.h" - -#include -#include -#include -#include - #include "src/core/lib/debug/trace.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" diff --git a/src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h b/src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h index cca18a1baeb..56f227d5ad4 100644 --- a/src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h +++ b/src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h @@ -17,6 +17,9 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_TLS_GRPC_TLS_CERTIFICATE_PROVIDER_H #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_TLS_GRPC_TLS_CERTIFICATE_PROVIDER_H +#include +#include +#include #include #include @@ -27,11 +30,6 @@ #include "absl/status/statusor.h" #include "absl/strings/string_view.h" #include "absl/types/optional.h" - -#include -#include -#include - #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.h" #include "src/core/lib/security/security_connector/ssl_utils.h" #include "src/core/util/ref_counted.h" diff --git a/src/core/lib/security/credentials/tls/grpc_tls_certificate_verifier.cc b/src/core/lib/security/credentials/tls/grpc_tls_certificate_verifier.cc index 1be015dcba7..47447ed536c 100644 --- a/src/core/lib/security/credentials/tls/grpc_tls_certificate_verifier.cc +++ b/src/core/lib/security/credentials/tls/grpc_tls_certificate_verifier.cc @@ -16,6 +16,9 @@ #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_verifier.h" +#include +#include +#include #include #include @@ -23,11 +26,6 @@ #include "absl/log/check.h" #include "absl/strings/string_view.h" - -#include -#include -#include - #include "src/core/lib/debug/trace.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/security/credentials/tls/tls_utils.h" diff --git a/src/core/lib/security/credentials/tls/grpc_tls_certificate_verifier.h b/src/core/lib/security/credentials/tls/grpc_tls_certificate_verifier.h index 5e021948d2f..3b80d9bc852 100644 --- a/src/core/lib/security/credentials/tls/grpc_tls_certificate_verifier.h +++ b/src/core/lib/security/credentials/tls/grpc_tls_certificate_verifier.h @@ -17,18 +17,17 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_TLS_GRPC_TLS_CERTIFICATE_VERIFIER_H #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_TLS_GRPC_TLS_CERTIFICATE_VERIFIER_H +#include +#include +#include +#include + #include #include #include "absl/base/thread_annotations.h" #include "absl/log/check.h" #include "absl/status/status.h" - -#include -#include -#include -#include - #include "src/core/util/ref_counted.h" #include "src/core/util/sync.h" #include "src/core/util/unique_type_name.h" diff --git a/src/core/lib/security/credentials/tls/grpc_tls_credentials_options.cc b/src/core/lib/security/credentials/tls/grpc_tls_credentials_options.cc index 3176dc10caa..69f73476cae 100644 --- a/src/core/lib/security/credentials/tls/grpc_tls_credentials_options.cc +++ b/src/core/lib/security/credentials/tls/grpc_tls_credentials_options.cc @@ -18,14 +18,13 @@ #include "src/core/lib/security/credentials/tls/grpc_tls_credentials_options.h" +#include +#include + #include #include "absl/log/check.h" #include "absl/log/log.h" - -#include -#include - #include "src/core/lib/debug/trace.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/tsi/ssl_transport_security.h" diff --git a/src/core/lib/security/credentials/tls/grpc_tls_crl_provider.cc b/src/core/lib/security/credentials/tls/grpc_tls_crl_provider.cc index ce1fc4dd1d0..72a113cd592 100644 --- a/src/core/lib/security/credentials/tls/grpc_tls_crl_provider.cc +++ b/src/core/lib/security/credentials/tls/grpc_tls_crl_provider.cc @@ -18,9 +18,8 @@ #include "src/core/lib/security/credentials/tls/grpc_tls_crl_provider.h" -#include - #include +#include // IWYU pragma: no_include #include @@ -41,7 +40,6 @@ #include "absl/strings/str_cat.h" #include "absl/strings/str_join.h" #include "absl/types/span.h" - #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/slice/slice.h" diff --git a/src/core/lib/security/credentials/tls/grpc_tls_crl_provider.h b/src/core/lib/security/credentials/tls/grpc_tls_crl_provider.h index b9188740c5e..109d1aa4c41 100644 --- a/src/core/lib/security/credentials/tls/grpc_tls_crl_provider.h +++ b/src/core/lib/security/credentials/tls/grpc_tls_crl_provider.h @@ -19,6 +19,11 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_TLS_GRPC_TLS_CRL_PROVIDER_H #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_TLS_GRPC_TLS_CRL_PROVIDER_H +#include +#include +#include +#include + #include #include #include @@ -26,19 +31,12 @@ #include #include -#include - #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 -#include -#include - #include "src/core/util/directory_reader.h" #include "src/core/util/sync.h" #include "src/core/util/time.h" diff --git a/src/core/lib/security/credentials/tls/tls_credentials.cc b/src/core/lib/security/credentials/tls/tls_credentials.cc index 5fd5abf419e..acb0d0154ee 100644 --- a/src/core/lib/security/credentials/tls/tls_credentials.cc +++ b/src/core/lib/security/credentials/tls/tls_credentials.cc @@ -18,18 +18,17 @@ #include "src/core/lib/security/credentials/tls/tls_credentials.h" +#include +#include +#include +#include + #include #include #include #include "absl/log/log.h" #include "absl/types/optional.h" - -#include -#include -#include -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_verifier.h" #include "src/core/lib/security/credentials/tls/grpc_tls_credentials_options.h" diff --git a/src/core/lib/security/credentials/tls/tls_utils.cc b/src/core/lib/security/credentials/tls/tls_utils.cc index 3b17ad3f7f2..296839a8aea 100644 --- a/src/core/lib/security/credentials/tls/tls_utils.cc +++ b/src/core/lib/security/credentials/tls/tls_utils.cc @@ -18,6 +18,7 @@ #include "src/core/lib/security/credentials/tls/tls_utils.h" +#include #include #include @@ -27,8 +28,6 @@ #include "absl/strings/match.h" #include "absl/strings/str_cat.h" -#include - namespace grpc_core { // Based on diff --git a/src/core/lib/security/credentials/tls/tls_utils.h b/src/core/lib/security/credentials/tls/tls_utils.h index c26f4e38bbd..d5d2f640a7b 100644 --- a/src/core/lib/security/credentials/tls/tls_utils.h +++ b/src/core/lib/security/credentials/tls/tls_utils.h @@ -19,14 +19,14 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_TLS_TLS_UTILS_H #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_TLS_TLS_UTILS_H +#include +#include + #include #include #include "absl/strings/string_view.h" -#include -#include - namespace grpc_core { // Matches \a subject_alternative_name with \a matcher. Returns true if there diff --git a/src/core/lib/security/credentials/token_fetcher/token_fetcher_credentials.h b/src/core/lib/security/credentials/token_fetcher/token_fetcher_credentials.h index 6283c044be8..94359e3727a 100644 --- a/src/core/lib/security/credentials/token_fetcher/token_fetcher_credentials.h +++ b/src/core/lib/security/credentials/token_fetcher/token_fetcher_credentials.h @@ -17,6 +17,8 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_TOKEN_FETCHER_TOKEN_FETCHER_CREDENTIALS_H #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_TOKEN_FETCHER_TOKEN_FETCHER_CREDENTIALS_H +#include + #include #include #include @@ -25,9 +27,6 @@ #include "absl/functional/any_invocable.h" #include "absl/status/statusor.h" #include "absl/types/variant.h" - -#include - #include "src/core/lib/iomgr/polling_entity.h" #include "src/core/lib/promise/arena_promise.h" #include "src/core/lib/security/credentials/credentials.h" diff --git a/src/core/lib/security/credentials/xds/xds_credentials.cc b/src/core/lib/security/credentials/xds/xds_credentials.cc index a0e017498e2..2a98d0ec6e5 100644 --- a/src/core/lib/security/credentials/xds/xds_credentials.cc +++ b/src/core/lib/security/credentials/xds/xds_credentials.cc @@ -18,13 +18,12 @@ #include "src/core/lib/security/credentials/xds/xds_credentials.h" -#include "absl/log/check.h" -#include "absl/types/optional.h" - #include #include #include +#include "absl/log/check.h" +#include "absl/types/optional.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h" #include "src/core/lib/security/credentials/tls/grpc_tls_credentials_options.h" diff --git a/src/core/lib/security/credentials/xds/xds_credentials.h b/src/core/lib/security/credentials/xds/xds_credentials.h index 554d7a57f26..53c16afcbcd 100644 --- a/src/core/lib/security/credentials/xds/xds_credentials.h +++ b/src/core/lib/security/credentials/xds/xds_credentials.h @@ -19,6 +19,10 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_XDS_XDS_CREDENTIALS_H #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_XDS_XDS_CREDENTIALS_H +#include +#include +#include +#include #include #include @@ -27,12 +31,6 @@ #include #include "absl/status/status.h" - -#include -#include -#include -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_verifier.h" diff --git a/src/core/lib/security/security_connector/alts/alts_security_connector.cc b/src/core/lib/security/security_connector/alts/alts_security_connector.cc index f30cecdd01a..a026a72f7f7 100644 --- a/src/core/lib/security/security_connector/alts/alts_security_connector.cc +++ b/src/core/lib/security/security_connector/alts/alts_security_connector.cc @@ -18,6 +18,13 @@ #include "src/core/lib/security/security_connector/alts/alts_security_connector.h" +#include +#include +#include +#include +#include +#include +#include #include #include @@ -28,15 +35,6 @@ #include "absl/status/status.h" #include "absl/strings/string_view.h" #include "absl/types/optional.h" - -#include -#include -#include -#include -#include -#include -#include - #include "src/core/handshaker/handshaker.h" #include "src/core/handshaker/security/security_handshaker.h" #include "src/core/lib/channel/channel_args.h" diff --git a/src/core/lib/security/security_connector/fake/fake_security_connector.cc b/src/core/lib/security/security_connector/fake/fake_security_connector.cc index 20425dc2c91..b0373236168 100644 --- a/src/core/lib/security/security_connector/fake/fake_security_connector.cc +++ b/src/core/lib/security/security_connector/fake/fake_security_connector.cc @@ -18,6 +18,11 @@ #include "src/core/lib/security/security_connector/fake/fake_security_connector.h" +#include +#include +#include +#include +#include #include #include @@ -31,13 +36,6 @@ #include "absl/strings/str_format.h" #include "absl/strings/string_view.h" #include "absl/types/optional.h" - -#include -#include -#include -#include -#include - #include "src/core/handshaker/handshaker.h" #include "src/core/handshaker/security/security_handshaker.h" #include "src/core/lib/channel/channel_args.h" diff --git a/src/core/lib/security/security_connector/insecure/insecure_security_connector.cc b/src/core/lib/security/security_connector/insecure/insecure_security_connector.cc index 79ea0cd337c..da250fea598 100644 --- a/src/core/lib/security/security_connector/insecure/insecure_security_connector.cc +++ b/src/core/lib/security/security_connector/insecure/insecure_security_connector.cc @@ -18,13 +18,11 @@ #include "src/core/lib/security/security_connector/insecure/insecure_security_connector.h" -#include - -#include "absl/log/check.h" - #include #include +#include +#include "absl/log/check.h" #include "src/core/handshaker/security/security_handshaker.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/iomgr/exec_ctx.h" diff --git a/src/core/lib/security/security_connector/insecure/insecure_security_connector.h b/src/core/lib/security/security_connector/insecure/insecure_security_connector.h index 9fc962b92ca..018689e5f78 100644 --- a/src/core/lib/security/security_connector/insecure/insecure_security_connector.h +++ b/src/core/lib/security/security_connector/insecure/insecure_security_connector.h @@ -19,16 +19,15 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_SECURITY_CONNECTOR_INSECURE_INSECURE_SECURITY_CONNECTOR_H #define GRPC_SRC_CORE_LIB_SECURITY_SECURITY_CONNECTOR_INSECURE_INSECURE_SECURITY_CONNECTOR_H -#include - -#include "absl/status/status.h" -#include "absl/strings/string_view.h" - #include #include #include #include +#include + +#include "absl/status/status.h" +#include "absl/strings/string_view.h" #include "src/core/handshaker/handshaker.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/iomgr/closure.h" diff --git a/src/core/lib/security/security_connector/load_system_roots_supported.cc b/src/core/lib/security/security_connector/load_system_roots_supported.cc index 52b657185a6..11a9c3f4957 100644 --- a/src/core/lib/security/security_connector/load_system_roots_supported.cc +++ b/src/core/lib/security/security_connector/load_system_roots_supported.cc @@ -16,26 +16,24 @@ // // +#include + #include #include #include -#include - #if defined(GPR_LINUX) || defined(GPR_ANDROID) || defined(GPR_FREEBSD) || \ defined(GPR_APPLE) #include #include +#include #include #include #include #include #include "absl/log/log.h" - -#include - #include "src/core/lib/config/config_vars.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/security/security_connector/load_system_roots.h" diff --git a/src/core/lib/security/security_connector/load_system_roots_windows.cc b/src/core/lib/security/security_connector/load_system_roots_windows.cc index 118f013c323..86fd628682c 100644 --- a/src/core/lib/security/security_connector/load_system_roots_windows.cc +++ b/src/core/lib/security/security_connector/load_system_roots_windows.cc @@ -23,13 +23,12 @@ #pragma comment(lib, "crypt32") #include -#include - -#include - #include #include #include +#include + +#include #include "src/core/lib/security/security_connector/load_system_roots.h" #include "src/core/lib/slice/slice_internal.h" diff --git a/src/core/lib/security/security_connector/local/local_security_connector.cc b/src/core/lib/security/security_connector/local/local_security_connector.cc index a61dc6aa4d0..5056494e6b2 100644 --- a/src/core/lib/security/security_connector/local/local_security_connector.cc +++ b/src/core/lib/security/security_connector/local/local_security_connector.cc @@ -18,6 +18,11 @@ #include "src/core/lib/security/security_connector/local/local_security_connector.h" +#include +#include +#include +#include +#include #include #include @@ -30,13 +35,6 @@ #include "absl/strings/match.h" #include "absl/strings/string_view.h" #include "absl/types/optional.h" - -#include -#include -#include -#include -#include - #include "src/core/client_channel/client_channel_filter.h" #include "src/core/handshaker/handshaker.h" #include "src/core/handshaker/security/security_handshaker.h" diff --git a/src/core/lib/security/security_connector/security_connector.cc b/src/core/lib/security/security_connector/security_connector.cc index d3c9906f8b6..481175c76e0 100644 --- a/src/core/lib/security/security_connector/security_connector.cc +++ b/src/core/lib/security/security_connector/security_connector.cc @@ -18,15 +18,13 @@ #include "src/core/lib/security/security_connector/security_connector.h" +#include #include #include #include "absl/log/check.h" #include "absl/log/log.h" - -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/util/debug_location.h" diff --git a/src/core/lib/security/security_connector/security_connector.h b/src/core/lib/security/security_connector/security_connector.h index 2e44b14fe00..4c0b788eef4 100644 --- a/src/core/lib/security/security_connector/security_connector.h +++ b/src/core/lib/security/security_connector/security_connector.h @@ -19,16 +19,15 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_SECURITY_CONNECTOR_SECURITY_CONNECTOR_H #define GRPC_SRC_CORE_LIB_SECURITY_SECURITY_CONNECTOR_SECURITY_CONNECTOR_H -#include - -#include "absl/status/status.h" -#include "absl/strings/string_view.h" - #include #include #include #include +#include + +#include "absl/status/status.h" +#include "absl/strings/string_view.h" #include "src/core/handshaker/handshaker.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/debug/trace.h" diff --git a/src/core/lib/security/security_connector/ssl/ssl_security_connector.cc b/src/core/lib/security/security_connector/ssl/ssl_security_connector.cc index 0ec65282f0c..0c8dc6043f8 100644 --- a/src/core/lib/security/security_connector/ssl/ssl_security_connector.cc +++ b/src/core/lib/security/security_connector/ssl/ssl_security_connector.cc @@ -18,6 +18,8 @@ #include "src/core/lib/security/security_connector/ssl/ssl_security_connector.h" +#include +#include #include #include @@ -30,10 +32,6 @@ #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" #include "absl/strings/string_view.h" - -#include -#include - #include "src/core/handshaker/handshaker.h" #include "src/core/handshaker/security/security_handshaker.h" #include "src/core/lib/channel/channel_args.h" diff --git a/src/core/lib/security/security_connector/ssl/ssl_security_connector.h b/src/core/lib/security/security_connector/ssl/ssl_security_connector.h index 5362e7503bc..436e2c32913 100644 --- a/src/core/lib/security/security_connector/ssl/ssl_security_connector.h +++ b/src/core/lib/security/security_connector/ssl/ssl_security_connector.h @@ -18,13 +18,12 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_SECURITY_CONNECTOR_SSL_SSL_SECURITY_CONNECTOR_H #define GRPC_SRC_CORE_LIB_SECURITY_SECURITY_CONNECTOR_SSL_SSL_SECURITY_CONNECTOR_H -#include - #include #include #include #include #include +#include #include "src/core/lib/security/security_connector/security_connector.h" #include "src/core/tsi/ssl_transport_security.h" diff --git a/src/core/lib/security/security_connector/ssl_utils.cc b/src/core/lib/security/security_connector/ssl_utils.cc index e3078062a89..2fcd67d1e85 100644 --- a/src/core/lib/security/security_connector/ssl_utils.cc +++ b/src/core/lib/security/security_connector/ssl_utils.cc @@ -18,6 +18,14 @@ #include "src/core/lib/security/security_connector/ssl_utils.h" +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -30,16 +38,6 @@ #include "absl/strings/match.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_split.h" - -#include -#include -#include -#include -#include -#include -#include -#include - #include "src/core/ext/transport/chttp2/alpn/alpn.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/config_vars.h" diff --git a/src/core/lib/security/security_connector/ssl_utils.h b/src/core/lib/security/security_connector/ssl_utils.h index f60b679c763..08973d5b7fc 100644 --- a/src/core/lib/security/security_connector/ssl_utils.h +++ b/src/core/lib/security/security_connector/ssl_utils.h @@ -19,6 +19,11 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_SECURITY_CONNECTOR_SSL_UTILS_H #define GRPC_SRC_CORE_LIB_SECURITY_SECURITY_CONNECTOR_SSL_UTILS_H +#include +#include +#include +#include +#include #include #include @@ -28,13 +33,6 @@ #include "absl/status/status.h" #include "absl/strings/string_view.h" - -#include -#include -#include -#include -#include - #include "src/core/lib/iomgr/error.h" #include "src/core/lib/security/security_connector/security_connector.h" #include "src/core/tsi/ssl/key_logging/ssl_key_logging.h" diff --git a/src/core/lib/security/security_connector/tls/tls_security_connector.cc b/src/core/lib/security/security_connector/tls/tls_security_connector.cc index b6c492fe458..d708ce8abfa 100644 --- a/src/core/lib/security/security_connector/tls/tls_security_connector.cc +++ b/src/core/lib/security/security_connector/tls/tls_security_connector.cc @@ -18,6 +18,11 @@ #include "src/core/lib/security/security_connector/tls/tls_security_connector.h" +#include +#include +#include +#include +#include #include #include @@ -29,13 +34,6 @@ #include "absl/log/log.h" #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" - -#include -#include -#include -#include -#include - #include "src/core/handshaker/security/security_handshaker.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/iomgr/exec_ctx.h" diff --git a/src/core/lib/security/security_connector/tls/tls_security_connector.h b/src/core/lib/security/security_connector/tls/tls_security_connector.h index 3c4e90436dc..27e915a6143 100644 --- a/src/core/lib/security/security_connector/tls/tls_security_connector.h +++ b/src/core/lib/security/security_connector/tls/tls_security_connector.h @@ -19,6 +19,11 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_SECURITY_CONNECTOR_TLS_TLS_SECURITY_CONNECTOR_H #define GRPC_SRC_CORE_LIB_SECURITY_SECURITY_CONNECTOR_TLS_TLS_SECURITY_CONNECTOR_H +#include +#include +#include +#include + #include #include @@ -26,12 +31,6 @@ #include "absl/status/status.h" #include "absl/strings/string_view.h" #include "absl/types/optional.h" - -#include -#include -#include -#include - #include "src/core/handshaker/handshaker.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/iomgr/closure.h" diff --git a/src/core/lib/security/transport/auth_filters.h b/src/core/lib/security/transport/auth_filters.h index 71834db4403..fe386211bf0 100644 --- a/src/core/lib/security/transport/auth_filters.h +++ b/src/core/lib/security/transport/auth_filters.h @@ -19,13 +19,12 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_TRANSPORT_AUTH_FILTERS_H #define GRPC_SRC_CORE_LIB_SECURITY_TRANSPORT_AUTH_FILTERS_H -#include "absl/status/statusor.h" - #include #include #include #include +#include "absl/status/statusor.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_stack.h" diff --git a/src/core/lib/security/transport/client_auth_filter.cc b/src/core/lib/security/transport/client_auth_filter.cc index a5740afcfa2..557f6b14450 100644 --- a/src/core/lib/security/transport/client_auth_filter.cc +++ b/src/core/lib/security/transport/client_auth_filter.cc @@ -16,6 +16,12 @@ // // +#include +#include +#include +#include +#include +#include #include #include @@ -25,14 +31,6 @@ #include "absl/status/status.h" #include "absl/status/statusor.h" - -#include -#include -#include -#include -#include -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_stack.h" diff --git a/src/core/lib/security/transport/server_auth_filter.cc b/src/core/lib/security/transport/server_auth_filter.cc index 45e47aaa214..240e7c9d482 100644 --- a/src/core/lib/security/transport/server_auth_filter.cc +++ b/src/core/lib/security/transport/server_auth_filter.cc @@ -16,6 +16,13 @@ // // +#include +#include +#include +#include +#include +#include + #include #include #include @@ -27,14 +34,6 @@ #include "absl/log/log.h" #include "absl/status/status.h" #include "absl/status/statusor.h" - -#include -#include -#include -#include -#include -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_stack.h" diff --git a/src/core/lib/security/util/json_util.cc b/src/core/lib/security/util/json_util.cc index c0b5a5b36cc..2cbc8ec7574 100644 --- a/src/core/lib/security/util/json_util.cc +++ b/src/core/lib/security/util/json_util.cc @@ -18,16 +18,15 @@ #include "src/core/lib/security/util/json_util.h" +#include +#include +#include + #include #include #include #include "absl/strings/str_cat.h" - -#include -#include -#include - #include "src/core/lib/iomgr/error.h" const char* grpc_json_get_string_property(const grpc_core::Json& json, diff --git a/src/core/lib/slice/percent_encoding.cc b/src/core/lib/slice/percent_encoding.cc index 8b51c4d9059..88af7e0a20f 100644 --- a/src/core/lib/slice/percent_encoding.cc +++ b/src/core/lib/slice/percent_encoding.cc @@ -18,15 +18,13 @@ #include "src/core/lib/slice/percent_encoding.h" +#include #include #include #include #include "absl/log/check.h" - -#include - #include "src/core/util/bitset.h" namespace grpc_core { diff --git a/src/core/lib/slice/slice.cc b/src/core/lib/slice/slice.cc index a7ff2198d03..52af6a4e288 100644 --- a/src/core/lib/slice/slice.cc +++ b/src/core/lib/slice/slice.cc @@ -18,16 +18,14 @@ #include "src/core/lib/slice/slice.h" +#include +#include +#include #include #include #include "absl/log/check.h" - -#include -#include -#include - #include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/slice/slice_refcount.h" #include "src/core/util/memory.h" diff --git a/src/core/lib/slice/slice.h b/src/core/lib/slice/slice.h index 5b70fa4ee52..6a84345d838 100644 --- a/src/core/lib/slice/slice.h +++ b/src/core/lib/slice/slice.h @@ -15,6 +15,10 @@ #ifndef GRPC_SRC_CORE_LIB_SLICE_SLICE_H #define GRPC_SRC_CORE_LIB_SLICE_SLICE_H +#include +#include +#include +#include #include #include @@ -23,12 +27,6 @@ #include "absl/log/check.h" #include "absl/strings/string_view.h" - -#include -#include -#include -#include - #include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/slice/slice_refcount.h" #include "src/core/util/debug_location.h" diff --git a/src/core/lib/slice/slice_buffer.cc b/src/core/lib/slice/slice_buffer.cc index 3d07c32334b..37be00ec16c 100644 --- a/src/core/lib/slice/slice_buffer.cc +++ b/src/core/lib/slice/slice_buffer.cc @@ -18,17 +18,15 @@ #include "src/core/lib/slice/slice_buffer.h" -#include - -#include - -#include "absl/log/check.h" - #include #include #include #include +#include +#include + +#include "absl/log/check.h" #include "src/core/lib/slice/slice_internal.h" namespace grpc_core { diff --git a/src/core/lib/slice/slice_buffer.h b/src/core/lib/slice/slice_buffer.h index cfd6d53a3bc..ab6c19d4f55 100644 --- a/src/core/lib/slice/slice_buffer.h +++ b/src/core/lib/slice/slice_buffer.h @@ -15,16 +15,15 @@ #ifndef GRPC_SRC_CORE_LIB_SLICE_SLICE_BUFFER_H #define GRPC_SRC_CORE_LIB_SLICE_SLICE_BUFFER_H +#include +#include +#include #include #include #include #include -#include -#include -#include - #include "src/core/lib/slice/slice.h" // Copy the first n bytes of src into memory pointed to by dst. diff --git a/src/core/lib/slice/slice_internal.h b/src/core/lib/slice/slice_internal.h index 093a77ecfb0..9c05f6fdacd 100644 --- a/src/core/lib/slice/slice_internal.h +++ b/src/core/lib/slice/slice_internal.h @@ -19,6 +19,8 @@ #ifndef GRPC_SRC_CORE_LIB_SLICE_SLICE_INTERNAL_H #define GRPC_SRC_CORE_LIB_SLICE_SLICE_INTERNAL_H +#include +#include #include #include @@ -27,10 +29,6 @@ #include "absl/hash/hash.h" #include "absl/log/check.h" #include "absl/strings/string_view.h" - -#include -#include - #include "src/core/util/memory.h" // Returns a pointer to the first slice in the slice buffer without giving diff --git a/src/core/lib/slice/slice_refcount.h b/src/core/lib/slice/slice_refcount.h index c27bb07a8e7..7ee670114a9 100644 --- a/src/core/lib/slice/slice_refcount.h +++ b/src/core/lib/slice/slice_refcount.h @@ -15,13 +15,12 @@ #ifndef GRPC_SRC_CORE_LIB_SLICE_SLICE_REFCOUNT_H #define GRPC_SRC_CORE_LIB_SLICE_SLICE_REFCOUNT_H +#include #include #include #include -#include - #include "src/core/lib/debug/trace.h" #include "src/core/util/debug_location.h" diff --git a/src/core/lib/slice/slice_string_helpers.h b/src/core/lib/slice/slice_string_helpers.h index 94680e64c20..ea5805e99a0 100644 --- a/src/core/lib/slice/slice_string_helpers.h +++ b/src/core/lib/slice/slice_string_helpers.h @@ -19,10 +19,9 @@ #ifndef GRPC_SRC_CORE_LIB_SLICE_SLICE_STRING_HELPERS_H #define GRPC_SRC_CORE_LIB_SLICE_SLICE_STRING_HELPERS_H -#include - #include #include +#include // Calls gpr_dump on a slice. char* grpc_dump_slice(const grpc_slice& slice, uint32_t flags); diff --git a/src/core/lib/surface/byte_buffer.cc b/src/core/lib/surface/byte_buffer.cc index 06e45623332..3a5b5666832 100644 --- a/src/core/lib/surface/byte_buffer.cc +++ b/src/core/lib/surface/byte_buffer.cc @@ -16,8 +16,6 @@ // // -#include - #include #include #include @@ -25,6 +23,7 @@ #include #include #include +#include #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/slice/slice.h" diff --git a/src/core/lib/surface/byte_buffer_reader.cc b/src/core/lib/surface/byte_buffer_reader.cc index 0516b852a90..52bf3795c90 100644 --- a/src/core/lib/surface/byte_buffer_reader.cc +++ b/src/core/lib/surface/byte_buffer_reader.cc @@ -16,17 +16,15 @@ // // -#include -#include - -#include "absl/log/check.h" - #include #include #include #include #include +#include +#include +#include "absl/log/check.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/slice/slice.h" diff --git a/src/core/lib/surface/call.cc b/src/core/lib/surface/call.cc index 29c4277d284..95f42cf41f8 100644 --- a/src/core/lib/surface/call.cc +++ b/src/core/lib/surface/call.cc @@ -18,6 +18,19 @@ #include "src/core/lib/surface/call.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include @@ -42,21 +55,6 @@ #include "absl/strings/str_format.h" #include "absl/strings/str_join.h" #include "absl/strings/string_view.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - #include "src/core/channelz/channelz.h" #include "src/core/lib/channel/call_finalization.h" #include "src/core/lib/channel/channel_stack.h" diff --git a/src/core/lib/surface/call.h b/src/core/lib/surface/call.h index 8c225b7379d..e95d3686663 100644 --- a/src/core/lib/surface/call.h +++ b/src/core/lib/surface/call.h @@ -19,6 +19,10 @@ #ifndef GRPC_SRC_CORE_LIB_SURFACE_CALL_H #define GRPC_SRC_CORE_LIB_SURFACE_CALL_H +#include +#include +#include +#include #include #include @@ -27,12 +31,6 @@ #include "absl/log/check.h" #include "absl/strings/string_view.h" #include "absl/types/optional.h" - -#include -#include -#include -#include - #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/debug/trace.h" diff --git a/src/core/lib/surface/call_log_batch.cc b/src/core/lib/surface/call_log_batch.cc index 4f6ec2153b6..2162ac2831b 100644 --- a/src/core/lib/surface/call_log_batch.cc +++ b/src/core/lib/surface/call_log_batch.cc @@ -16,6 +16,9 @@ // // +#include +#include +#include #include #include @@ -25,11 +28,6 @@ #include "absl/strings/str_format.h" #include "absl/strings/str_join.h" - -#include -#include -#include - #include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/slice/slice_string_helpers.h" #include "src/core/lib/surface/call.h" diff --git a/src/core/lib/surface/call_test_only.h b/src/core/lib/surface/call_test_only.h index 2b1f98b1102..217f5dfc40e 100644 --- a/src/core/lib/surface/call_test_only.h +++ b/src/core/lib/surface/call_test_only.h @@ -19,11 +19,10 @@ #ifndef GRPC_SRC_CORE_LIB_SURFACE_CALL_TEST_ONLY_H #define GRPC_SRC_CORE_LIB_SURFACE_CALL_TEST_ONLY_H -#include - #include #include #include +#include /// Return the message compression algorithm from \a call. /// diff --git a/src/core/lib/surface/call_utils.cc b/src/core/lib/surface/call_utils.cc index 18a78fb284e..e5949d9d200 100644 --- a/src/core/lib/surface/call_utils.cc +++ b/src/core/lib/surface/call_utils.cc @@ -14,6 +14,19 @@ #include "src/core/lib/surface/call_utils.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include @@ -33,21 +46,6 @@ #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" #include "absl/strings/string_view.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - #include "src/core/lib/channel/status_util.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/promise/activity.h" diff --git a/src/core/lib/surface/call_utils.h b/src/core/lib/surface/call_utils.h index de9c928fa74..269e2f25178 100644 --- a/src/core/lib/surface/call_utils.h +++ b/src/core/lib/surface/call_utils.h @@ -15,6 +15,19 @@ #ifndef GRPC_SRC_CORE_LIB_SURFACE_CALL_UTILS_H #define GRPC_SRC_CORE_LIB_SURFACE_CALL_UTILS_H +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include @@ -31,21 +44,6 @@ #include "absl/status/status.h" #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - #include "src/core/lib/promise/activity.h" #include "src/core/lib/promise/cancel_callback.h" #include "src/core/lib/promise/map.h" diff --git a/src/core/lib/surface/channel.cc b/src/core/lib/surface/channel.cc index 577ab734efa..df13bf3e37b 100644 --- a/src/core/lib/surface/channel.cc +++ b/src/core/lib/surface/channel.cc @@ -16,14 +16,13 @@ #include "src/core/lib/surface/channel.h" -#include "absl/log/check.h" - #include #include #include #include #include +#include "absl/log/check.h" #include "src/core/channelz/channel_trace.h" #include "src/core/channelz/channelz.h" #include "src/core/lib/channel/channel_args.h" diff --git a/src/core/lib/surface/channel.h b/src/core/lib/surface/channel.h index fa8ac5468c8..f5105257ab4 100644 --- a/src/core/lib/surface/channel.h +++ b/src/core/lib/surface/channel.h @@ -17,6 +17,12 @@ #ifndef GRPC_SRC_CORE_LIB_SURFACE_CHANNEL_H #define GRPC_SRC_CORE_LIB_SURFACE_CHANNEL_H +#include +#include +#include +#include +#include + #include #include @@ -24,13 +30,6 @@ #include "absl/status/statusor.h" #include "absl/strings/string_view.h" #include "absl/types/optional.h" - -#include -#include -#include -#include -#include - #include "src/core/channelz/channelz.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/iomgr/iomgr_fwd.h" diff --git a/src/core/lib/surface/channel_create.cc b/src/core/lib/surface/channel_create.cc index ef0fd5ba2c6..d8a243ceb27 100644 --- a/src/core/lib/surface/channel_create.cc +++ b/src/core/lib/surface/channel_create.cc @@ -16,12 +16,11 @@ #include "src/core/lib/surface/channel_create.h" -#include "absl/log/check.h" - #include #include #include +#include "absl/log/check.h" #include "src/core/channelz/channelz.h" #include "src/core/client_channel/client_channel.h" #include "src/core/client_channel/direct_channel.h" diff --git a/src/core/lib/surface/channel_create.h b/src/core/lib/surface/channel_create.h index 0295eb92bc3..187748cc2a3 100644 --- a/src/core/lib/surface/channel_create.h +++ b/src/core/lib/surface/channel_create.h @@ -17,12 +17,11 @@ #ifndef GRPC_SRC_CORE_LIB_SURFACE_CHANNEL_CREATE_H #define GRPC_SRC_CORE_LIB_SURFACE_CHANNEL_CREATE_H +#include + #include #include "absl/status/statusor.h" - -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/surface/channel.h" #include "src/core/lib/surface/channel_stack_type.h" diff --git a/src/core/lib/surface/channel_init.cc b/src/core/lib/surface/channel_init.cc index cebe053e34d..28d04651950 100644 --- a/src/core/lib/surface/channel_init.cc +++ b/src/core/lib/surface/channel_init.cc @@ -18,6 +18,7 @@ #include "src/core/lib/surface/channel_init.h" +#include #include #include @@ -33,9 +34,6 @@ #include "absl/strings/str_join.h" #include "absl/strings/string_view.h" #include "absl/types/optional.h" - -#include - #include "src/core/lib/debug/trace.h" #include "src/core/lib/surface/channel_stack_type.h" #include "src/core/util/crash.h" diff --git a/src/core/lib/surface/channel_init.h b/src/core/lib/surface/channel_init.h index 628620228c5..7374c880a96 100644 --- a/src/core/lib/surface/channel_init.h +++ b/src/core/lib/surface/channel_init.h @@ -19,6 +19,7 @@ #ifndef GRPC_SRC_CORE_LIB_SURFACE_CHANNEL_INIT_H #define GRPC_SRC_CORE_LIB_SURFACE_CHANNEL_INIT_H +#include #include #include @@ -29,9 +30,6 @@ #include "absl/functional/any_invocable.h" #include "absl/log/check.h" - -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_stack_builder.h" diff --git a/src/core/lib/surface/client_call.cc b/src/core/lib/surface/client_call.cc index 05670b2e1bc..7f96a43b8aa 100644 --- a/src/core/lib/surface/client_call.cc +++ b/src/core/lib/surface/client_call.cc @@ -14,6 +14,19 @@ #include "src/core/lib/surface/client_call.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include @@ -29,21 +42,6 @@ #include "absl/log/check.h" #include "absl/status/status.h" #include "absl/strings/string_view.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - #include "src/core/lib/event_engine/event_engine_context.h" #include "src/core/lib/promise/all_ok.h" #include "src/core/lib/promise/status_flag.h" diff --git a/src/core/lib/surface/client_call.h b/src/core/lib/surface/client_call.h index 8180c273ba2..d2f86e93d9d 100644 --- a/src/core/lib/surface/client_call.h +++ b/src/core/lib/surface/client_call.h @@ -15,19 +15,6 @@ #ifndef GRPC_SRC_CORE_LIB_SURFACE_CLIENT_CALL_H #define GRPC_SRC_CORE_LIB_SURFACE_CLIENT_CALL_H -#include -#include -#include -#include - -#include -#include -#include - -#include "absl/status/status.h" -#include "absl/strings/str_format.h" -#include "absl/strings/string_view.h" - #include #include #include @@ -41,7 +28,18 @@ #include #include #include +#include +#include +#include +#include + +#include +#include +#include +#include "absl/status/status.h" +#include "absl/strings/str_format.h" +#include "absl/strings/string_view.h" #include "src/core/lib/promise/status_flag.h" #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/surface/call.h" diff --git a/src/core/lib/surface/completion_queue.cc b/src/core/lib/surface/completion_queue.cc index 9d958defc98..5f25576771d 100644 --- a/src/core/lib/surface/completion_queue.cc +++ b/src/core/lib/surface/completion_queue.cc @@ -17,6 +17,12 @@ // #include "src/core/lib/surface/completion_queue.h" +#include +#include +#include +#include +#include +#include #include #include @@ -32,14 +38,6 @@ #include "absl/status/status.h" #include "absl/strings/str_format.h" #include "absl/strings/str_join.h" - -#include -#include -#include -#include -#include -#include - #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/exec_ctx.h" diff --git a/src/core/lib/surface/completion_queue.h b/src/core/lib/surface/completion_queue.h index 33dcb5ed5c1..5b8a634ddb0 100644 --- a/src/core/lib/surface/completion_queue.h +++ b/src/core/lib/surface/completion_queue.h @@ -21,10 +21,9 @@ // Internal API for completion queues -#include - #include #include +#include #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/iomgr_fwd.h" diff --git a/src/core/lib/surface/completion_queue_factory.cc b/src/core/lib/surface/completion_queue_factory.cc index dae6695b712..c88360772aa 100644 --- a/src/core/lib/surface/completion_queue_factory.cc +++ b/src/core/lib/surface/completion_queue_factory.cc @@ -18,11 +18,10 @@ #include "src/core/lib/surface/completion_queue_factory.h" -#include "absl/log/check.h" - #include #include +#include "absl/log/check.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/surface/completion_queue.h" diff --git a/src/core/lib/surface/event_string.cc b/src/core/lib/surface/event_string.cc index eafe18918f5..f0398ba2532 100644 --- a/src/core/lib/surface/event_string.cc +++ b/src/core/lib/surface/event_string.cc @@ -18,14 +18,14 @@ #include "src/core/lib/surface/event_string.h" +#include + #include #include #include "absl/strings/str_format.h" #include "absl/strings/str_join.h" -#include - static void addhdr(grpc_event* ev, std::vector* buf) { buf->push_back(absl::StrFormat("tag:%p", ev->tag)); } diff --git a/src/core/lib/surface/event_string.h b/src/core/lib/surface/event_string.h index 9677aa84f64..d5709e76451 100644 --- a/src/core/lib/surface/event_string.h +++ b/src/core/lib/surface/event_string.h @@ -19,11 +19,11 @@ #ifndef GRPC_SRC_CORE_LIB_SURFACE_EVENT_STRING_H #define GRPC_SRC_CORE_LIB_SURFACE_EVENT_STRING_H -#include - #include #include +#include + // Returns a string describing an event. Must be later freed with gpr_free() std::string grpc_event_string(grpc_event* ev); diff --git a/src/core/lib/surface/filter_stack_call.cc b/src/core/lib/surface/filter_stack_call.cc index 707d99a59fa..dc6ee088c29 100644 --- a/src/core/lib/surface/filter_stack_call.cc +++ b/src/core/lib/surface/filter_stack_call.cc @@ -14,6 +14,19 @@ #include "src/core/lib/surface/filter_stack_call.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include @@ -29,21 +42,6 @@ #include "absl/status/status.h" #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - #include "src/core/channelz/channelz.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/event_engine/event_engine_context.h" diff --git a/src/core/lib/surface/filter_stack_call.h b/src/core/lib/surface/filter_stack_call.h index b4c304773c9..d9a8866d5e4 100644 --- a/src/core/lib/surface/filter_stack_call.h +++ b/src/core/lib/surface/filter_stack_call.h @@ -15,21 +15,6 @@ #ifndef GRPC_SRC_CORE_LIB_SURFACE_FILTER_STACK_CALL_H #define GRPC_SRC_CORE_LIB_SURFACE_FILTER_STACK_CALL_H -#include -#include -#include -#include - -#include -#include -#include -#include - -#include "absl/log/check.h" -#include "absl/strings/str_cat.h" -#include "absl/strings/str_join.h" -#include "absl/strings/string_view.h" - #include #include #include @@ -43,7 +28,20 @@ #include #include #include +#include +#include +#include +#include + +#include +#include +#include +#include +#include "absl/log/check.h" +#include "absl/strings/str_cat.h" +#include "absl/strings/str_join.h" +#include "absl/strings/string_view.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/iomgr/call_combiner.h" #include "src/core/lib/iomgr/polling_entity.h" diff --git a/src/core/lib/surface/init.cc b/src/core/lib/surface/init.cc index 233f6f97d16..3e2aae160ad 100644 --- a/src/core/lib/surface/init.cc +++ b/src/core/lib/surface/init.cc @@ -18,11 +18,6 @@ #include "src/core/lib/surface/init.h" -#include "absl/base/thread_annotations.h" -#include "absl/log/log.h" -#include "absl/time/clock.h" -#include "absl/time/time.h" - #include #include #include @@ -31,6 +26,10 @@ #include #include +#include "absl/base/thread_annotations.h" +#include "absl/log/log.h" +#include "absl/time/clock.h" +#include "absl/time/time.h" #include "src/core/client_channel/backup_poller.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.h" diff --git a/src/core/lib/surface/init.h b/src/core/lib/surface/init.h index 804b79c5d5b..9f9a4a46880 100644 --- a/src/core/lib/surface/init.h +++ b/src/core/lib/surface/init.h @@ -18,10 +18,10 @@ #ifndef GRPC_SRC_CORE_LIB_SURFACE_INIT_H #define GRPC_SRC_CORE_LIB_SURFACE_INIT_H -#include "absl/time/time.h" - #include +#include "absl/time/time.h" + void grpc_maybe_wait_for_async_shutdown(void); // Returns false if the timeout expired before fully shut down. diff --git a/src/core/lib/surface/lame_client.cc b/src/core/lib/surface/lame_client.cc index 8acfd80986d..64030cfbbe8 100644 --- a/src/core/lib/surface/lame_client.cc +++ b/src/core/lib/surface/lame_client.cc @@ -18,17 +18,16 @@ #include "src/core/lib/surface/lame_client.h" -#include -#include - -#include "absl/status/status.h" -#include "absl/status/statusor.h" - #include #include #include #include +#include +#include + +#include "absl/status/status.h" +#include "absl/status/statusor.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_args_preconditioning.h" #include "src/core/lib/channel/channel_stack.h" diff --git a/src/core/lib/surface/lame_client.h b/src/core/lib/surface/lame_client.h index 970c7630c48..85c4c6e2992 100644 --- a/src/core/lib/surface/lame_client.h +++ b/src/core/lib/surface/lame_client.h @@ -19,15 +19,14 @@ #ifndef GRPC_SRC_CORE_LIB_SURFACE_LAME_CLIENT_H #define GRPC_SRC_CORE_LIB_SURFACE_LAME_CLIENT_H +#include +#include + #include #include "absl/base/thread_annotations.h" #include "absl/status/status.h" #include "absl/status/statusor.h" - -#include -#include - #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" diff --git a/src/core/lib/surface/legacy_channel.cc b/src/core/lib/surface/legacy_channel.cc index ba306525f2c..ba9826e5118 100644 --- a/src/core/lib/surface/legacy_channel.cc +++ b/src/core/lib/surface/legacy_channel.cc @@ -18,18 +18,17 @@ #include "src/core/lib/surface/legacy_channel.h" -#include "absl/base/thread_annotations.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 +#include "absl/base/thread_annotations.h" +#include "absl/log/check.h" +#include "absl/log/log.h" +#include "absl/status/status.h" +#include "absl/types/optional.h" #include "src/core/channelz/channelz.h" #include "src/core/client_channel/client_channel_filter.h" #include "src/core/lib/channel/channel_args.h" diff --git a/src/core/lib/surface/legacy_channel.h b/src/core/lib/surface/legacy_channel.h index 7ca47a6bb22..ee1c3f92c89 100644 --- a/src/core/lib/surface/legacy_channel.h +++ b/src/core/lib/surface/legacy_channel.h @@ -19,15 +19,14 @@ #ifndef GRPC_SRC_CORE_LIB_SURFACE_LEGACY_CHANNEL_H #define GRPC_SRC_CORE_LIB_SURFACE_LEGACY_CHANNEL_H -#include - -#include "absl/status/statusor.h" -#include "absl/types/optional.h" - #include #include #include +#include + +#include "absl/status/statusor.h" +#include "absl/types/optional.h" #include "src/core/client_channel/client_channel_filter.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_fwd.h" diff --git a/src/core/lib/surface/metadata_array.cc b/src/core/lib/surface/metadata_array.cc index 666459e6e0a..ba3e8a36460 100644 --- a/src/core/lib/surface/metadata_array.cc +++ b/src/core/lib/surface/metadata_array.cc @@ -16,11 +16,10 @@ // // -#include - #include #include #include +#include #include "src/core/lib/debug/trace.h" diff --git a/src/core/lib/surface/server_call.cc b/src/core/lib/surface/server_call.cc index 32aadc25da9..ed1d0bb8426 100644 --- a/src/core/lib/surface/server_call.cc +++ b/src/core/lib/surface/server_call.cc @@ -14,18 +14,6 @@ #include "src/core/lib/surface/server_call.h" -#include -#include -#include -#include - -#include -#include -#include - -#include "absl/log/check.h" -#include "absl/strings/string_view.h" - #include #include #include @@ -39,7 +27,17 @@ #include #include #include +#include +#include +#include +#include +#include +#include +#include + +#include "absl/log/check.h" +#include "absl/strings/string_view.h" #include "src/core/lib/promise/all_ok.h" #include "src/core/lib/promise/map.h" #include "src/core/lib/promise/poll.h" diff --git a/src/core/lib/surface/server_call.h b/src/core/lib/surface/server_call.h index dcc9d86606e..a69673adc55 100644 --- a/src/core/lib/surface/server_call.h +++ b/src/core/lib/surface/server_call.h @@ -15,6 +15,19 @@ #ifndef GRPC_SRC_CORE_LIB_SURFACE_SERVER_CALL_H #define GRPC_SRC_CORE_LIB_SURFACE_SERVER_CALL_H +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include @@ -30,21 +43,6 @@ #include "absl/status/status.h" #include "absl/strings/str_format.h" #include "absl/strings/string_view.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - #include "src/core/lib/promise/poll.h" #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/surface/call.h" diff --git a/src/core/lib/surface/validate_metadata.cc b/src/core/lib/surface/validate_metadata.cc index 3a68a673c04..684cad74e53 100644 --- a/src/core/lib/surface/validate_metadata.cc +++ b/src/core/lib/surface/validate_metadata.cc @@ -18,12 +18,11 @@ #include "src/core/lib/surface/validate_metadata.h" -#include "absl/status/status.h" -#include "absl/strings/string_view.h" - #include #include +#include "absl/status/status.h" +#include "absl/strings/string_view.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/util/bitset.h" diff --git a/src/core/lib/surface/validate_metadata.h b/src/core/lib/surface/validate_metadata.h index 03d08939894..f4630ea2d48 100644 --- a/src/core/lib/surface/validate_metadata.h +++ b/src/core/lib/surface/validate_metadata.h @@ -19,16 +19,14 @@ #ifndef GRPC_SRC_CORE_LIB_SURFACE_VALIDATE_METADATA_H #define GRPC_SRC_CORE_LIB_SURFACE_VALIDATE_METADATA_H +#include +#include #include #include #include "absl/log/check.h" #include "absl/strings/string_view.h" - -#include -#include - #include "src/core/lib/iomgr/error.h" namespace grpc_core { diff --git a/src/core/lib/transport/bdp_estimator.cc b/src/core/lib/transport/bdp_estimator.cc index ed2176bea61..90d7cf9429c 100644 --- a/src/core/lib/transport/bdp_estimator.cc +++ b/src/core/lib/transport/bdp_estimator.cc @@ -18,6 +18,7 @@ #include "src/core/lib/transport/bdp_estimator.h" +#include #include #include @@ -26,8 +27,6 @@ #include "absl/log/check.h" #include "absl/log/log.h" -#include - namespace grpc_core { BdpEstimator::BdpEstimator(absl::string_view name) diff --git a/src/core/lib/transport/bdp_estimator.h b/src/core/lib/transport/bdp_estimator.h index 487b04eb35d..c5879d939c3 100644 --- a/src/core/lib/transport/bdp_estimator.h +++ b/src/core/lib/transport/bdp_estimator.h @@ -19,6 +19,8 @@ #ifndef GRPC_SRC_CORE_LIB_TRANSPORT_BDP_ESTIMATOR_H #define GRPC_SRC_CORE_LIB_TRANSPORT_BDP_ESTIMATOR_H +#include +#include #include #include @@ -26,10 +28,6 @@ #include "absl/log/check.h" #include "absl/log/log.h" #include "absl/strings/string_view.h" - -#include -#include - #include "src/core/lib/debug/trace.h" #include "src/core/util/time.h" diff --git a/src/core/lib/transport/call_arena_allocator.cc b/src/core/lib/transport/call_arena_allocator.cc index 729b9fe51bb..a9b15cda290 100644 --- a/src/core/lib/transport/call_arena_allocator.cc +++ b/src/core/lib/transport/call_arena_allocator.cc @@ -14,10 +14,10 @@ #include "src/core/lib/transport/call_arena_allocator.h" -#include - #include +#include + namespace grpc_core { void CallArenaAllocator::FinalizeArena(Arena* arena) { diff --git a/src/core/lib/transport/call_arena_allocator.h b/src/core/lib/transport/call_arena_allocator.h index d52bdf4ecf7..074f9a15772 100644 --- a/src/core/lib/transport/call_arena_allocator.h +++ b/src/core/lib/transport/call_arena_allocator.h @@ -15,13 +15,12 @@ #ifndef GRPC_SRC_CORE_LIB_TRANSPORT_CALL_ARENA_ALLOCATOR_H #define GRPC_SRC_CORE_LIB_TRANSPORT_CALL_ARENA_ALLOCATOR_H +#include #include #include #include -#include - #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/util/ref_counted.h" diff --git a/src/core/lib/transport/call_filters.cc b/src/core/lib/transport/call_filters.cc index 822c266b0b3..a4d945f8067 100644 --- a/src/core/lib/transport/call_filters.cc +++ b/src/core/lib/transport/call_filters.cc @@ -14,11 +14,10 @@ #include "src/core/lib/transport/call_filters.h" -#include "absl/log/check.h" -#include "absl/log/log.h" - #include +#include "absl/log/check.h" +#include "absl/log/log.h" #include "src/core/lib/transport/metadata.h" #include "src/core/util/crash.h" diff --git a/src/core/lib/transport/call_filters.h b/src/core/lib/transport/call_filters.h index 01d4c7614de..3dabd20e2f6 100644 --- a/src/core/lib/transport/call_filters.h +++ b/src/core/lib/transport/call_filters.h @@ -15,6 +15,8 @@ #ifndef GRPC_SRC_CORE_LIB_TRANSPORT_CALL_FILTERS_H #define GRPC_SRC_CORE_LIB_TRANSPORT_CALL_FILTERS_H +#include + #include #include #include @@ -22,9 +24,6 @@ #include #include "absl/log/check.h" - -#include - #include "src/core/lib/promise/if.h" #include "src/core/lib/promise/latch.h" #include "src/core/lib/promise/map.h" diff --git a/src/core/lib/transport/call_final_info.cc b/src/core/lib/transport/call_final_info.cc index e5bf3a5a8a9..5808135551d 100644 --- a/src/core/lib/transport/call_final_info.cc +++ b/src/core/lib/transport/call_final_info.cc @@ -14,10 +14,10 @@ #include "src/core/lib/transport/call_final_info.h" -#include - #include +#include + static void move64bits(uint64_t* from, uint64_t* to) { *to += *from; *from = 0; diff --git a/src/core/lib/transport/call_final_info.h b/src/core/lib/transport/call_final_info.h index fd407df6de8..2182e9df6b6 100644 --- a/src/core/lib/transport/call_final_info.h +++ b/src/core/lib/transport/call_final_info.h @@ -15,12 +15,12 @@ #ifndef GRPC_SRC_CORE_LIB_TRANSPORT_CALL_FINAL_INFO_H #define GRPC_SRC_CORE_LIB_TRANSPORT_CALL_FINAL_INFO_H -#include - #include #include #include +#include + struct grpc_transport_one_way_stats { uint64_t framing_bytes = 0; uint64_t data_bytes = 0; diff --git a/src/core/lib/transport/call_spine.cc b/src/core/lib/transport/call_spine.cc index 29cca71f9a1..93831a87b98 100644 --- a/src/core/lib/transport/call_spine.cc +++ b/src/core/lib/transport/call_spine.cc @@ -14,10 +14,9 @@ #include "src/core/lib/transport/call_spine.h" -#include "absl/functional/any_invocable.h" - #include +#include "absl/functional/any_invocable.h" #include "src/core/lib/event_engine/event_engine_context.h" #include "src/core/lib/promise/for_each.h" #include "src/core/lib/promise/try_seq.h" diff --git a/src/core/lib/transport/call_spine.h b/src/core/lib/transport/call_spine.h index c3d5687b971..a962c308f69 100644 --- a/src/core/lib/transport/call_spine.h +++ b/src/core/lib/transport/call_spine.h @@ -15,10 +15,9 @@ #ifndef GRPC_SRC_CORE_LIB_TRANSPORT_CALL_SPINE_H #define GRPC_SRC_CORE_LIB_TRANSPORT_CALL_SPINE_H -#include "absl/log/check.h" - #include +#include "absl/log/check.h" #include "src/core/lib/promise/detail/status.h" #include "src/core/lib/promise/if.h" #include "src/core/lib/promise/latch.h" diff --git a/src/core/lib/transport/call_state.h b/src/core/lib/transport/call_state.h index 33eca5e66b4..1c58a9d61a5 100644 --- a/src/core/lib/transport/call_state.h +++ b/src/core/lib/transport/call_state.h @@ -15,10 +15,9 @@ #ifndef GRPC_SRC_CORE_LIB_TRANSPORT_CALL_STATE_H #define GRPC_SRC_CORE_LIB_TRANSPORT_CALL_STATE_H -#include "absl/types/optional.h" - #include +#include "absl/types/optional.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/promise/activity.h" #include "src/core/lib/promise/poll.h" diff --git a/src/core/lib/transport/connectivity_state.cc b/src/core/lib/transport/connectivity_state.cc index 9239f34f2be..126f4d2535d 100644 --- a/src/core/lib/transport/connectivity_state.cc +++ b/src/core/lib/transport/connectivity_state.cc @@ -18,10 +18,9 @@ #include "src/core/lib/transport/connectivity_state.h" -#include "absl/log/log.h" - #include +#include "absl/log/log.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" diff --git a/src/core/lib/transport/connectivity_state.h b/src/core/lib/transport/connectivity_state.h index a986c66e9f5..91e64aae485 100644 --- a/src/core/lib/transport/connectivity_state.h +++ b/src/core/lib/transport/connectivity_state.h @@ -19,16 +19,15 @@ #ifndef GRPC_SRC_CORE_LIB_TRANSPORT_CONNECTIVITY_STATE_H #define GRPC_SRC_CORE_LIB_TRANSPORT_CONNECTIVITY_STATE_H +#include +#include + #include #include #include #include #include "absl/status/status.h" - -#include -#include - #include "src/core/lib/debug/trace.h" #include "src/core/util/orphanable.h" #include "src/core/util/work_serializer.h" diff --git a/src/core/lib/transport/error_utils.cc b/src/core/lib/transport/error_utils.cc index 4a59efe3deb..ce28fa82c0a 100644 --- a/src/core/lib/transport/error_utils.cc +++ b/src/core/lib/transport/error_utils.cc @@ -18,13 +18,12 @@ #include "src/core/lib/transport/error_utils.h" +#include +#include #include #include -#include -#include - #include "src/core/lib/transport/status_conversion.h" #include "src/core/util/status_helper.h" diff --git a/src/core/lib/transport/error_utils.h b/src/core/lib/transport/error_utils.h index 9510081d004..2abbe7a6f4c 100644 --- a/src/core/lib/transport/error_utils.h +++ b/src/core/lib/transport/error_utils.h @@ -19,13 +19,12 @@ #ifndef GRPC_SRC_CORE_LIB_TRANSPORT_ERROR_UTILS_H #define GRPC_SRC_CORE_LIB_TRANSPORT_ERROR_UTILS_H -#include - -#include "absl/status/status.h" - #include #include +#include + +#include "absl/status/status.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/transport/http2_errors.h" #include "src/core/util/time.h" diff --git a/src/core/lib/transport/interception_chain.cc b/src/core/lib/transport/interception_chain.cc index 317c6cfa93a..14d8c83f793 100644 --- a/src/core/lib/transport/interception_chain.cc +++ b/src/core/lib/transport/interception_chain.cc @@ -14,10 +14,10 @@ #include "src/core/lib/transport/interception_chain.h" -#include - #include +#include + #include "src/core/lib/transport/call_destination.h" #include "src/core/lib/transport/call_filters.h" #include "src/core/lib/transport/call_spine.h" diff --git a/src/core/lib/transport/interception_chain.h b/src/core/lib/transport/interception_chain.h index a204985afc0..db54104dafa 100644 --- a/src/core/lib/transport/interception_chain.h +++ b/src/core/lib/transport/interception_chain.h @@ -15,11 +15,11 @@ #ifndef GRPC_SRC_CORE_LIB_TRANSPORT_INTERCEPTION_CHAIN_H #define GRPC_SRC_CORE_LIB_TRANSPORT_INTERCEPTION_CHAIN_H +#include + #include #include -#include - #include "src/core/lib/transport/call_destination.h" #include "src/core/lib/transport/call_filters.h" #include "src/core/lib/transport/call_spine.h" diff --git a/src/core/lib/transport/message.cc b/src/core/lib/transport/message.cc index a9435911a57..30f1a3088bb 100644 --- a/src/core/lib/transport/message.cc +++ b/src/core/lib/transport/message.cc @@ -14,11 +14,11 @@ #include "src/core/lib/transport/message.h" -#include "absl/strings/str_cat.h" - #include #include +#include "absl/strings/str_cat.h" + namespace grpc_core { std::string Message::DebugString() const { diff --git a/src/core/lib/transport/metadata_batch.cc b/src/core/lib/transport/metadata_batch.cc index 732a17e11ca..6dcbc0ace2b 100644 --- a/src/core/lib/transport/metadata_batch.cc +++ b/src/core/lib/transport/metadata_batch.cc @@ -14,6 +14,7 @@ #include "src/core/lib/transport/metadata_batch.h" +#include #include #include @@ -25,9 +26,6 @@ #include "absl/strings/match.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" - -#include - #include "src/core/lib/transport/timeout_encoding.h" namespace grpc_core { diff --git a/src/core/lib/transport/metadata_batch.h b/src/core/lib/transport/metadata_batch.h index 4a2ca21bd27..005139af20b 100644 --- a/src/core/lib/transport/metadata_batch.h +++ b/src/core/lib/transport/metadata_batch.h @@ -19,6 +19,9 @@ #ifndef GRPC_SRC_CORE_LIB_TRANSPORT_METADATA_BATCH_H #define GRPC_SRC_CORE_LIB_TRANSPORT_METADATA_BATCH_H +#include +#include +#include #include #include @@ -33,11 +36,6 @@ #include "absl/strings/numbers.h" #include "absl/strings/string_view.h" #include "absl/types/optional.h" - -#include -#include -#include - #include "src/core/lib/compression/compression_internal.h" #include "src/core/lib/experiments/experiments.h" #include "src/core/lib/promise/poll.h" diff --git a/src/core/lib/transport/metadata_compression_traits.h b/src/core/lib/transport/metadata_compression_traits.h index 05f8a9145f8..baa7e0ee906 100644 --- a/src/core/lib/transport/metadata_compression_traits.h +++ b/src/core/lib/transport/metadata_compression_traits.h @@ -15,9 +15,8 @@ #ifndef GRPC_SRC_CORE_LIB_TRANSPORT_METADATA_COMPRESSION_TRAITS_H #define GRPC_SRC_CORE_LIB_TRANSPORT_METADATA_COMPRESSION_TRAITS_H -#include - #include +#include namespace grpc_core { diff --git a/src/core/lib/transport/parsed_metadata.h b/src/core/lib/transport/parsed_metadata.h index 1ea9c9a2e4a..ac529c2e609 100644 --- a/src/core/lib/transport/parsed_metadata.h +++ b/src/core/lib/transport/parsed_metadata.h @@ -15,6 +15,8 @@ #ifndef GRPC_SRC_CORE_LIB_TRANSPORT_PARSED_METADATA_H #define GRPC_SRC_CORE_LIB_TRANSPORT_PARSED_METADATA_H +#include +#include #include #include @@ -28,10 +30,6 @@ #include "absl/strings/match.h" #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" - -#include -#include - #include "src/core/lib/slice/slice.h" #include "src/core/util/time.h" diff --git a/src/core/lib/transport/promise_endpoint.cc b/src/core/lib/transport/promise_endpoint.cc index 90b2e0ce5b8..b151388587f 100644 --- a/src/core/lib/transport/promise_endpoint.cc +++ b/src/core/lib/transport/promise_endpoint.cc @@ -14,6 +14,11 @@ #include "src/core/lib/transport/promise_endpoint.h" +#include +#include +#include +#include + #include #include #include @@ -22,12 +27,6 @@ #include "absl/log/check.h" #include "absl/status/status.h" #include "absl/types/optional.h" - -#include -#include -#include -#include - #include "src/core/lib/slice/slice_buffer.h" #include "src/core/util/sync.h" diff --git a/src/core/lib/transport/promise_endpoint.h b/src/core/lib/transport/promise_endpoint.h index 0e69b82f7a1..18af1a763c4 100644 --- a/src/core/lib/transport/promise_endpoint.h +++ b/src/core/lib/transport/promise_endpoint.h @@ -15,6 +15,11 @@ #ifndef GRPC_SRC_CORE_LIB_TRANSPORT_PROMISE_ENDPOINT_H #define GRPC_SRC_CORE_LIB_TRANSPORT_PROMISE_ENDPOINT_H +#include +#include +#include +#include +#include #include #include @@ -29,13 +34,6 @@ #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/types/optional.h" - -#include -#include -#include -#include -#include - #include "src/core/lib/event_engine/extensions/chaotic_good_extension.h" #include "src/core/lib/event_engine/query_extensions.h" #include "src/core/lib/iomgr/exec_ctx.h" diff --git a/src/core/lib/transport/simple_slice_based_metadata.h b/src/core/lib/transport/simple_slice_based_metadata.h index 01270a645c3..eed4ec06241 100644 --- a/src/core/lib/transport/simple_slice_based_metadata.h +++ b/src/core/lib/transport/simple_slice_based_metadata.h @@ -15,10 +15,9 @@ #ifndef GRPC_SRC_CORE_LIB_TRANSPORT_SIMPLE_SLICE_BASED_METADATA_H #define GRPC_SRC_CORE_LIB_TRANSPORT_SIMPLE_SLICE_BASED_METADATA_H -#include "absl/strings/string_view.h" - #include +#include "absl/strings/string_view.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/transport/parsed_metadata.h" diff --git a/src/core/lib/transport/timeout_encoding.cc b/src/core/lib/transport/timeout_encoding.cc index 57621d835c0..845dbf7a26f 100644 --- a/src/core/lib/transport/timeout_encoding.cc +++ b/src/core/lib/transport/timeout_encoding.cc @@ -18,14 +18,14 @@ #include "src/core/lib/transport/timeout_encoding.h" +#include +#include + #include #include "absl/base/attributes.h" #include "absl/log/check.h" -#include -#include - namespace grpc_core { namespace { diff --git a/src/core/lib/transport/timeout_encoding.h b/src/core/lib/transport/timeout_encoding.h index 9957640a95b..995650bc5b6 100644 --- a/src/core/lib/transport/timeout_encoding.h +++ b/src/core/lib/transport/timeout_encoding.h @@ -19,12 +19,10 @@ #ifndef GRPC_SRC_CORE_LIB_TRANSPORT_TIMEOUT_ENCODING_H #define GRPC_SRC_CORE_LIB_TRANSPORT_TIMEOUT_ENCODING_H +#include #include #include "absl/types/optional.h" - -#include - #include "src/core/lib/slice/slice.h" #include "src/core/util/time.h" diff --git a/src/core/lib/transport/transport.cc b/src/core/lib/transport/transport.cc index 58d0869cf7e..fb189ff168e 100644 --- a/src/core/lib/transport/transport.cc +++ b/src/core/lib/transport/transport.cc @@ -18,6 +18,9 @@ #include "src/core/lib/transport/transport.h" +#include +#include +#include #include #include @@ -26,11 +29,6 @@ #include "absl/status/status.h" #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" - -#include -#include -#include - #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/promise/for_each.h" diff --git a/src/core/lib/transport/transport.h b/src/core/lib/transport/transport.h index 9c34fb1efce..e0ed8b07d3c 100644 --- a/src/core/lib/transport/transport.h +++ b/src/core/lib/transport/transport.h @@ -19,6 +19,11 @@ #ifndef GRPC_SRC_CORE_LIB_TRANSPORT_TRANSPORT_H #define GRPC_SRC_CORE_LIB_TRANSPORT_TRANSPORT_H +#include +#include +#include +#include +#include #include #include #include @@ -32,13 +37,6 @@ #include "absl/status/status.h" #include "absl/strings/string_view.h" #include "absl/types/optional.h" - -#include -#include -#include -#include -#include - #include "src/core/lib/debug/trace.h" #include "src/core/lib/iomgr/call_combiner.h" #include "src/core/lib/iomgr/closure.h" diff --git a/src/core/lib/transport/transport_op_string.cc b/src/core/lib/transport/transport_op_string.cc index 7141161ed08..08b5e4656b6 100644 --- a/src/core/lib/transport/transport_op_string.cc +++ b/src/core/lib/transport/transport_op_string.cc @@ -16,14 +16,13 @@ // // +#include + #include #include #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" - -#include - #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/slice/slice_buffer.h" #include "src/core/lib/transport/connectivity_state.h" diff --git a/src/core/load_balancing/.clang-format b/src/core/load_balancing/.clang-format deleted file mode 100644 index 5f150ef6edb..00000000000 --- a/src/core/load_balancing/.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/src/core/load_balancing/address_filtering.cc b/src/core/load_balancing/address_filtering.cc index fe9834b170d..1a19cfca33a 100644 --- a/src/core/load_balancing/address_filtering.cc +++ b/src/core/load_balancing/address_filtering.cc @@ -16,14 +16,12 @@ #include "src/core/load_balancing/address_filtering.h" +#include #include #include #include "absl/functional/function_ref.h" - -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/iomgr/resolved_address.h" #include "src/core/util/ref_counted_ptr.h" diff --git a/src/core/load_balancing/address_filtering.h b/src/core/load_balancing/address_filtering.h index 7b7fda9ac74..31b45108285 100644 --- a/src/core/load_balancing/address_filtering.h +++ b/src/core/load_balancing/address_filtering.h @@ -17,6 +17,8 @@ #ifndef GRPC_SRC_CORE_LOAD_BALANCING_ADDRESS_FILTERING_H #define GRPC_SRC_CORE_LOAD_BALANCING_ADDRESS_FILTERING_H +#include + #include #include #include @@ -24,9 +26,6 @@ #include "absl/status/statusor.h" #include "absl/strings/string_view.h" - -#include - #include "src/core/resolver/endpoint_addresses.h" #include "src/core/util/ref_counted.h" #include "src/core/util/ref_counted_string.h" diff --git a/src/core/load_balancing/backend_metric_data.h b/src/core/load_balancing/backend_metric_data.h index 1f11e61e947..036298681de 100644 --- a/src/core/load_balancing/backend_metric_data.h +++ b/src/core/load_balancing/backend_metric_data.h @@ -17,12 +17,12 @@ #ifndef GRPC_SRC_CORE_LOAD_BALANCING_BACKEND_METRIC_DATA_H #define GRPC_SRC_CORE_LOAD_BALANCING_BACKEND_METRIC_DATA_H +#include + #include #include "absl/strings/string_view.h" -#include - namespace grpc_core { // Represents backend metrics reported by the backend to the client. diff --git a/src/core/load_balancing/backend_metric_parser.cc b/src/core/load_balancing/backend_metric_parser.cc index 6dc1275a65e..3b65399136a 100644 --- a/src/core/load_balancing/backend_metric_parser.cc +++ b/src/core/load_balancing/backend_metric_parser.cc @@ -16,6 +16,7 @@ #include "src/core/load_balancing/backend_metric_parser.h" +#include #include #include @@ -26,8 +27,6 @@ #include "upb/message/map.h" #include "xds/data/orca/v3/orca_load_report.upb.h" -#include - namespace grpc_core { namespace { diff --git a/src/core/load_balancing/backend_metric_parser.h b/src/core/load_balancing/backend_metric_parser.h index cd499157d0a..c6bf0b08729 100644 --- a/src/core/load_balancing/backend_metric_parser.h +++ b/src/core/load_balancing/backend_metric_parser.h @@ -17,12 +17,10 @@ #ifndef GRPC_SRC_CORE_LOAD_BALANCING_BACKEND_METRIC_PARSER_H #define GRPC_SRC_CORE_LOAD_BALANCING_BACKEND_METRIC_PARSER_H +#include #include #include "absl/strings/string_view.h" - -#include - #include "src/core/load_balancing/backend_metric_data.h" namespace grpc_core { diff --git a/src/core/load_balancing/child_policy_handler.cc b/src/core/load_balancing/child_policy_handler.cc index 4ec9127b555..5f6b545af9d 100644 --- a/src/core/load_balancing/child_policy_handler.cc +++ b/src/core/load_balancing/child_policy_handler.cc @@ -16,6 +16,9 @@ #include "src/core/load_balancing/child_policy_handler.h" +#include +#include + #include #include @@ -24,10 +27,6 @@ #include "absl/status/status.h" #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" - -#include -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/iomgr/pollset_set.h" diff --git a/src/core/load_balancing/child_policy_handler.h b/src/core/load_balancing/child_policy_handler.h index 79b056a4070..e22da5cb322 100644 --- a/src/core/load_balancing/child_policy_handler.h +++ b/src/core/load_balancing/child_policy_handler.h @@ -16,13 +16,12 @@ #ifndef GRPC_SRC_CORE_LOAD_BALANCING_CHILD_POLICY_HANDLER_H #define GRPC_SRC_CORE_LOAD_BALANCING_CHILD_POLICY_HANDLER_H +#include + #include #include "absl/status/status.h" #include "absl/strings/string_view.h" - -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/debug/trace.h" #include "src/core/load_balancing/lb_policy.h" diff --git a/src/core/load_balancing/delegating_helper.h b/src/core/load_balancing/delegating_helper.h index 0852319d8a9..c504797b526 100644 --- a/src/core/load_balancing/delegating_helper.h +++ b/src/core/load_balancing/delegating_helper.h @@ -17,16 +17,15 @@ #ifndef GRPC_SRC_CORE_LOAD_BALANCING_DELEGATING_HELPER_H #define GRPC_SRC_CORE_LOAD_BALANCING_DELEGATING_HELPER_H -#include - -#include "absl/status/status.h" -#include "absl/strings/string_view.h" - #include #include #include #include +#include + +#include "absl/status/status.h" +#include "absl/strings/string_view.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/iomgr/resolved_address.h" #include "src/core/lib/security/credentials/credentials.h" diff --git a/src/core/load_balancing/endpoint_list.cc b/src/core/load_balancing/endpoint_list.cc index 7507aadc5b5..93161132732 100644 --- a/src/core/load_balancing/endpoint_list.cc +++ b/src/core/load_balancing/endpoint_list.cc @@ -16,6 +16,9 @@ #include "src/core/load_balancing/endpoint_list.h" +#include +#include +#include #include #include @@ -27,11 +30,6 @@ #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/types/optional.h" - -#include -#include -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/iomgr/pollset_set.h" diff --git a/src/core/load_balancing/endpoint_list.h b/src/core/load_balancing/endpoint_list.h index eff8663d7e8..4ba3b60753a 100644 --- a/src/core/load_balancing/endpoint_list.h +++ b/src/core/load_balancing/endpoint_list.h @@ -17,6 +17,8 @@ #ifndef GRPC_SRC_CORE_LOAD_BALANCING_ENDPOINT_LIST_H #define GRPC_SRC_CORE_LOAD_BALANCING_ENDPOINT_LIST_H +#include +#include #include #include @@ -26,10 +28,6 @@ #include "absl/functional/function_ref.h" #include "absl/status/status.h" #include "absl/types/optional.h" - -#include -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/iomgr/resolved_address.h" #include "src/core/load_balancing/lb_policy.h" diff --git a/src/core/load_balancing/grpclb/client_load_reporting_filter.cc b/src/core/load_balancing/grpclb/client_load_reporting_filter.cc index 4aff5f14580..90b12f05101 100644 --- a/src/core/load_balancing/grpclb/client_load_reporting_filter.cc +++ b/src/core/load_balancing/grpclb/client_load_reporting_filter.cc @@ -18,15 +18,14 @@ #include "src/core/load_balancing/grpclb/client_load_reporting_filter.h" +#include + #include #include #include #include #include "absl/types/optional.h" - -#include - #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/promise/context.h" #include "src/core/lib/promise/map.h" diff --git a/src/core/load_balancing/grpclb/client_load_reporting_filter.h b/src/core/load_balancing/grpclb/client_load_reporting_filter.h index 87fa1fee21b..07e0c43b8c2 100644 --- a/src/core/load_balancing/grpclb/client_load_reporting_filter.h +++ b/src/core/load_balancing/grpclb/client_load_reporting_filter.h @@ -19,10 +19,9 @@ #ifndef GRPC_SRC_CORE_LOAD_BALANCING_GRPCLB_CLIENT_LOAD_REPORTING_FILTER_H #define GRPC_SRC_CORE_LOAD_BALANCING_GRPCLB_CLIENT_LOAD_REPORTING_FILTER_H -#include "absl/status/statusor.h" - #include +#include "absl/status/statusor.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" diff --git a/src/core/load_balancing/grpclb/grpclb.cc b/src/core/load_balancing/grpclb/grpclb.cc index d6e82fbb134..a214f92c4db 100644 --- a/src/core/load_balancing/grpclb/grpclb.cc +++ b/src/core/load_balancing/grpclb/grpclb.cc @@ -58,6 +58,14 @@ // IWYU pragma: no_include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -83,17 +91,6 @@ #include "absl/strings/string_view.h" #include "absl/types/optional.h" #include "absl/types/variant.h" -#include "upb/mem/arena.hpp" - -#include -#include -#include -#include -#include -#include -#include -#include - #include "src/core/channelz/channelz.h" #include "src/core/client_channel/client_channel_filter.h" #include "src/core/lib/address_utils/sockaddr_utils.h" @@ -144,6 +141,7 @@ #include "src/core/util/useful.h" #include "src/core/util/validation_errors.h" #include "src/core/util/work_serializer.h" +#include "upb/mem/arena.hpp" #define GRPC_GRPCLB_INITIAL_CONNECT_BACKOFF_SECONDS 1 #define GRPC_GRPCLB_RECONNECT_BACKOFF_MULTIPLIER 1.6 diff --git a/src/core/load_balancing/grpclb/grpclb_balancer_addresses.cc b/src/core/load_balancing/grpclb/grpclb_balancer_addresses.cc index a0552c57c70..85b8ff6d6c6 100644 --- a/src/core/load_balancing/grpclb/grpclb_balancer_addresses.cc +++ b/src/core/load_balancing/grpclb/grpclb_balancer_addresses.cc @@ -16,12 +16,11 @@ #include "src/core/load_balancing/grpclb/grpclb_balancer_addresses.h" +#include #include #include -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/util/useful.h" diff --git a/src/core/load_balancing/grpclb/grpclb_client_stats.cc b/src/core/load_balancing/grpclb/grpclb_client_stats.cc index 6ed75719e9c..2f9f0a9842d 100644 --- a/src/core/load_balancing/grpclb/grpclb_client_stats.cc +++ b/src/core/load_balancing/grpclb/grpclb_client_stats.cc @@ -18,11 +18,10 @@ #include "src/core/load_balancing/grpclb/grpclb_client_stats.h" -#include - #include #include #include +#include #include "src/core/util/sync.h" diff --git a/src/core/load_balancing/grpclb/grpclb_client_stats.h b/src/core/load_balancing/grpclb/grpclb_client_stats.h index d03462038f6..332f942fe52 100644 --- a/src/core/load_balancing/grpclb/grpclb_client_stats.h +++ b/src/core/load_balancing/grpclb/grpclb_client_stats.h @@ -19,6 +19,8 @@ #ifndef GRPC_SRC_CORE_LOAD_BALANCING_GRPCLB_GRPCLB_CLIENT_STATS_H #define GRPC_SRC_CORE_LOAD_BALANCING_GRPCLB_GRPCLB_CLIENT_STATS_H +#include +#include #include #include @@ -26,10 +28,6 @@ #include "absl/base/thread_annotations.h" #include "absl/container/inlined_vector.h" - -#include -#include - #include "src/core/util/memory.h" #include "src/core/util/ref_counted.h" #include "src/core/util/sync.h" diff --git a/src/core/load_balancing/grpclb/load_balancer_api.cc b/src/core/load_balancing/grpclb/load_balancer_api.cc index 8cda3230ed5..6fd1eafd9ff 100644 --- a/src/core/load_balancing/grpclb/load_balancer_api.cc +++ b/src/core/load_balancing/grpclb/load_balancer_api.cc @@ -18,6 +18,8 @@ #include "src/core/load_balancing/grpclb/load_balancer_api.h" +#include +#include #include #include @@ -25,13 +27,9 @@ #include "absl/log/log.h" #include "google/protobuf/duration.upb.h" #include "google/protobuf/timestamp.upb.h" -#include "upb/base/string_view.h" - -#include -#include - #include "src/core/util/memory.h" #include "src/proto/grpc/lb/v1/load_balancer.upb.h" +#include "upb/base/string_view.h" namespace grpc_core { diff --git a/src/core/load_balancing/grpclb/load_balancer_api.h b/src/core/load_balancing/grpclb/load_balancer_api.h index ebfdd0c84d6..c2aa2db7713 100644 --- a/src/core/load_balancing/grpclb/load_balancer_api.h +++ b/src/core/load_balancing/grpclb/load_balancer_api.h @@ -18,18 +18,16 @@ #ifndef GRPC_SRC_CORE_LOAD_BALANCING_GRPCLB_LOAD_BALANCER_API_H #define GRPC_SRC_CORE_LOAD_BALANCING_GRPCLB_LOAD_BALANCER_API_H +#include +#include #include #include #include "absl/strings/string_view.h" -#include "upb/mem/arena.h" - -#include -#include - #include "src/core/load_balancing/grpclb/grpclb_client_stats.h" #include "src/core/util/time.h" +#include "upb/mem/arena.h" #define GRPC_GRPCLB_SERVICE_NAME_MAX_LENGTH 128 #define GRPC_GRPCLB_SERVER_IP_ADDRESS_MAX_SIZE 16 diff --git a/src/core/load_balancing/health_check_client.cc b/src/core/load_balancing/health_check_client.cc index b2d3f1ac3a9..0f28c4392ae 100644 --- a/src/core/load_balancing/health_check_client.cc +++ b/src/core/load_balancing/health_check_client.cc @@ -14,6 +14,11 @@ // limitations under the License. // +#include +#include +#include +#include +#include #include #include @@ -31,15 +36,6 @@ #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" #include "absl/types/optional.h" -#include "upb/base/string_view.h" -#include "upb/mem/arena.hpp" - -#include -#include -#include -#include -#include - #include "src/core/channelz/channel_trace.h" #include "src/core/client_channel/client_channel_internal.h" #include "src/core/client_channel/subchannel.h" @@ -62,6 +58,8 @@ #include "src/core/util/sync.h" #include "src/core/util/work_serializer.h" #include "src/proto/grpc/health/v1/health.upb.h" +#include "upb/base/string_view.h" +#include "upb/mem/arena.hpp" namespace grpc_core { diff --git a/src/core/load_balancing/health_check_client.h b/src/core/load_balancing/health_check_client.h index 9fe4c1cdf17..abe778f503d 100644 --- a/src/core/load_balancing/health_check_client.h +++ b/src/core/load_balancing/health_check_client.h @@ -17,10 +17,10 @@ #ifndef GRPC_SRC_CORE_LOAD_BALANCING_HEALTH_CHECK_CLIENT_H #define GRPC_SRC_CORE_LOAD_BALANCING_HEALTH_CHECK_CLIENT_H -#include - #include +#include + #include "src/core/lib/channel/channel_args.h" #include "src/core/load_balancing/subchannel_interface.h" #include "src/core/util/work_serializer.h" diff --git a/src/core/load_balancing/health_check_client_internal.h b/src/core/load_balancing/health_check_client_internal.h index cded2e1df8c..187b3dec0fe 100644 --- a/src/core/load_balancing/health_check_client_internal.h +++ b/src/core/load_balancing/health_check_client_internal.h @@ -17,6 +17,9 @@ #ifndef GRPC_SRC_CORE_LOAD_BALANCING_HEALTH_CHECK_CLIENT_INTERNAL_H #define GRPC_SRC_CORE_LOAD_BALANCING_HEALTH_CHECK_CLIENT_INTERNAL_H +#include +#include + #include #include #include @@ -27,10 +30,6 @@ #include "absl/status/status.h" #include "absl/strings/string_view.h" #include "absl/types/optional.h" - -#include -#include - #include "src/core/client_channel/subchannel.h" #include "src/core/client_channel/subchannel_interface_internal.h" #include "src/core/client_channel/subchannel_stream_client.h" diff --git a/src/core/load_balancing/lb_policy.h b/src/core/load_balancing/lb_policy.h index bbfd775b028..d8116d8cb7a 100644 --- a/src/core/load_balancing/lb_policy.h +++ b/src/core/load_balancing/lb_policy.h @@ -17,6 +17,11 @@ #ifndef GRPC_SRC_CORE_LOAD_BALANCING_LB_POLICY_H #define GRPC_SRC_CORE_LOAD_BALANCING_LB_POLICY_H +#include +#include +#include +#include +#include #include #include @@ -31,13 +36,6 @@ #include "absl/strings/string_view.h" #include "absl/types/optional.h" #include "absl/types/variant.h" - -#include -#include -#include -#include -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/iomgr/iomgr_fwd.h" diff --git a/src/core/load_balancing/lb_policy_factory.h b/src/core/load_balancing/lb_policy_factory.h index d05d356b71d..c8b710b1247 100644 --- a/src/core/load_balancing/lb_policy_factory.h +++ b/src/core/load_balancing/lb_policy_factory.h @@ -17,11 +17,10 @@ #ifndef GRPC_SRC_CORE_LOAD_BALANCING_LB_POLICY_FACTORY_H #define GRPC_SRC_CORE_LOAD_BALANCING_LB_POLICY_FACTORY_H -#include "absl/status/statusor.h" -#include "absl/strings/string_view.h" - #include +#include "absl/status/statusor.h" +#include "absl/strings/string_view.h" #include "src/core/load_balancing/lb_policy.h" #include "src/core/util/json/json.h" #include "src/core/util/orphanable.h" diff --git a/src/core/load_balancing/lb_policy_registry.cc b/src/core/load_balancing/lb_policy_registry.cc index 1aaa2103941..b0b20139f76 100644 --- a/src/core/load_balancing/lb_policy_registry.cc +++ b/src/core/load_balancing/lb_policy_registry.cc @@ -16,6 +16,9 @@ #include "src/core/load_balancing/lb_policy_registry.h" +#include +#include + #include #include #include @@ -29,10 +32,6 @@ #include "absl/strings/str_format.h" #include "absl/strings/str_join.h" #include "absl/strings/string_view.h" - -#include -#include - #include "src/core/load_balancing/lb_policy.h" namespace grpc_core { diff --git a/src/core/load_balancing/lb_policy_registry.h b/src/core/load_balancing/lb_policy_registry.h index e0587f4856a..86bc7ccd2eb 100644 --- a/src/core/load_balancing/lb_policy_registry.h +++ b/src/core/load_balancing/lb_policy_registry.h @@ -17,14 +17,13 @@ #ifndef GRPC_SRC_CORE_LOAD_BALANCING_LB_POLICY_REGISTRY_H #define GRPC_SRC_CORE_LOAD_BALANCING_LB_POLICY_REGISTRY_H +#include + #include #include #include "absl/status/statusor.h" #include "absl/strings/string_view.h" - -#include - #include "src/core/load_balancing/lb_policy.h" #include "src/core/load_balancing/lb_policy_factory.h" #include "src/core/util/json/json.h" diff --git a/src/core/load_balancing/oob_backend_metric.cc b/src/core/load_balancing/oob_backend_metric.cc index 87e9528379e..4b29bd25847 100644 --- a/src/core/load_balancing/oob_backend_metric.cc +++ b/src/core/load_balancing/oob_backend_metric.cc @@ -16,6 +16,12 @@ #include "src/core/load_balancing/oob_backend_metric.h" +#include +#include +#include +#include +#include +#include #include #include @@ -28,16 +34,6 @@ #include "absl/status/status.h" #include "absl/strings/string_view.h" #include "google/protobuf/duration.upb.h" -#include "upb/mem/arena.hpp" -#include "xds/service/orca/v3/orca.upb.h" - -#include -#include -#include -#include -#include -#include - #include "src/core/channelz/channel_trace.h" #include "src/core/client_channel/subchannel.h" #include "src/core/client_channel/subchannel_stream_client.h" @@ -56,6 +52,8 @@ #include "src/core/util/ref_counted_ptr.h" #include "src/core/util/sync.h" #include "src/core/util/time.h" +#include "upb/mem/arena.hpp" +#include "xds/service/orca/v3/orca.upb.h" namespace grpc_core { diff --git a/src/core/load_balancing/oob_backend_metric.h b/src/core/load_balancing/oob_backend_metric.h index 1c594d8e93c..1eacc08e54d 100644 --- a/src/core/load_balancing/oob_backend_metric.h +++ b/src/core/load_balancing/oob_backend_metric.h @@ -17,10 +17,10 @@ #ifndef GRPC_SRC_CORE_LOAD_BALANCING_OOB_BACKEND_METRIC_H #define GRPC_SRC_CORE_LOAD_BALANCING_OOB_BACKEND_METRIC_H -#include - #include +#include + #include "src/core/load_balancing/backend_metric_data.h" #include "src/core/load_balancing/subchannel_interface.h" #include "src/core/util/time.h" diff --git a/src/core/load_balancing/oob_backend_metric_internal.h b/src/core/load_balancing/oob_backend_metric_internal.h index f39e852b01f..647f45d7eaa 100644 --- a/src/core/load_balancing/oob_backend_metric_internal.h +++ b/src/core/load_balancing/oob_backend_metric_internal.h @@ -17,16 +17,15 @@ #ifndef GRPC_SRC_CORE_LOAD_BALANCING_OOB_BACKEND_METRIC_INTERNAL_H #define GRPC_SRC_CORE_LOAD_BALANCING_OOB_BACKEND_METRIC_INTERNAL_H +#include +#include + #include #include #include #include "absl/base/thread_annotations.h" #include "absl/strings/string_view.h" - -#include -#include - #include "src/core/client_channel/subchannel.h" #include "src/core/client_channel/subchannel_interface_internal.h" #include "src/core/client_channel/subchannel_stream_client.h" diff --git a/src/core/load_balancing/outlier_detection/outlier_detection.cc b/src/core/load_balancing/outlier_detection/outlier_detection.cc index aef81b7363d..448f3da2271 100644 --- a/src/core/load_balancing/outlier_detection/outlier_detection.cc +++ b/src/core/load_balancing/outlier_detection/outlier_detection.cc @@ -16,6 +16,9 @@ #include "src/core/load_balancing/outlier_detection/outlier_detection.h" +#include +#include +#include #include #include @@ -39,11 +42,6 @@ #include "absl/status/statusor.h" #include "absl/strings/string_view.h" #include "absl/types/variant.h" - -#include -#include -#include - #include "src/core/client_channel/subchannel_interface_internal.h" #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/channel/channel_args.h" diff --git a/src/core/load_balancing/outlier_detection/outlier_detection.h b/src/core/load_balancing/outlier_detection/outlier_detection.h index d862941e1fa..c035e45c165 100644 --- a/src/core/load_balancing/outlier_detection/outlier_detection.h +++ b/src/core/load_balancing/outlier_detection/outlier_detection.h @@ -17,12 +17,10 @@ #ifndef GRPC_SRC_CORE_LOAD_BALANCING_OUTLIER_DETECTION_OUTLIER_DETECTION_H #define GRPC_SRC_CORE_LOAD_BALANCING_OUTLIER_DETECTION_OUTLIER_DETECTION_H +#include #include // for uint32_t #include "absl/types/optional.h" - -#include - #include "src/core/util/json/json.h" #include "src/core/util/json/json_args.h" #include "src/core/util/json/json_object_loader.h" diff --git a/src/core/load_balancing/pick_first/pick_first.cc b/src/core/load_balancing/pick_first/pick_first.cc index c977a032c5d..c49b8ad2bfb 100644 --- a/src/core/load_balancing/pick_first/pick_first.cc +++ b/src/core/load_balancing/pick_first/pick_first.cc @@ -16,6 +16,10 @@ #include "src/core/load_balancing/pick_first/pick_first.h" +#include +#include +#include +#include #include #include @@ -35,12 +39,6 @@ #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" #include "absl/types/optional.h" - -#include -#include -#include -#include - #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" diff --git a/src/core/load_balancing/priority/priority.cc b/src/core/load_balancing/priority/priority.cc index a747c2ce17f..854ea3c4c79 100644 --- a/src/core/load_balancing/priority/priority.cc +++ b/src/core/load_balancing/priority/priority.cc @@ -14,6 +14,10 @@ // limitations under the License. // +#include +#include +#include +#include #include #include @@ -33,12 +37,6 @@ #include "absl/strings/str_join.h" #include "absl/strings/string_view.h" #include "absl/types/optional.h" - -#include -#include -#include -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.h" diff --git a/src/core/load_balancing/ring_hash/ring_hash.cc b/src/core/load_balancing/ring_hash/ring_hash.cc index 5ca33543983..5613648b1b6 100644 --- a/src/core/load_balancing/ring_hash/ring_hash.cc +++ b/src/core/load_balancing/ring_hash/ring_hash.cc @@ -16,6 +16,10 @@ #include "src/core/load_balancing/ring_hash/ring_hash.h" +#include +#include +#include +#include #include #include @@ -36,12 +40,6 @@ #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" #include "absl/types/optional.h" - -#include -#include -#include -#include - #include "src/core/client_channel/client_channel_internal.h" #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/channel/channel_args.h" diff --git a/src/core/load_balancing/ring_hash/ring_hash.h b/src/core/load_balancing/ring_hash/ring_hash.h index da7e83b215a..95f17cbe81d 100644 --- a/src/core/load_balancing/ring_hash/ring_hash.h +++ b/src/core/load_balancing/ring_hash/ring_hash.h @@ -17,9 +17,8 @@ #ifndef GRPC_SRC_CORE_LOAD_BALANCING_RING_HASH_RING_HASH_H #define GRPC_SRC_CORE_LOAD_BALANCING_RING_HASH_RING_HASH_H -#include - #include +#include #include "src/core/service_config/service_config_call_data.h" #include "src/core/util/json/json.h" diff --git a/src/core/load_balancing/rls/rls.cc b/src/core/load_balancing/rls/rls.cc index a02da17484c..3024ebbef0d 100644 --- a/src/core/load_balancing/rls/rls.cc +++ b/src/core/load_balancing/rls/rls.cc @@ -22,6 +22,17 @@ #include "src/core/load_balancing/rls/rls.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include @@ -51,21 +62,6 @@ #include "absl/strings/str_join.h" #include "absl/strings/string_view.h" #include "absl/types/optional.h" -#include "upb/base/string_view.h" -#include "upb/mem/arena.hpp" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - #include "src/core/channelz/channelz.h" #include "src/core/client_channel/client_channel_filter.h" #include "src/core/lib/channel/channel_args.h" @@ -109,6 +105,8 @@ #include "src/core/util/validation_errors.h" #include "src/core/util/work_serializer.h" #include "src/proto/grpc/lookup/v1/rls.upb.h" +#include "upb/base/string_view.h" +#include "upb/mem/arena.hpp" using ::grpc_event_engine::experimental::EventEngine; diff --git a/src/core/load_balancing/round_robin/round_robin.cc b/src/core/load_balancing/round_robin/round_robin.cc index 5c4c23370ed..44fa7f9104c 100644 --- a/src/core/load_balancing/round_robin/round_robin.cc +++ b/src/core/load_balancing/round_robin/round_robin.cc @@ -14,6 +14,8 @@ // limitations under the License. // +#include +#include #include #include @@ -33,10 +35,6 @@ #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" #include "absl/types/optional.h" - -#include -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.h" diff --git a/src/core/load_balancing/subchannel_interface.h b/src/core/load_balancing/subchannel_interface.h index b2d78fad05f..0042a9f0ea2 100644 --- a/src/core/load_balancing/subchannel_interface.h +++ b/src/core/load_balancing/subchannel_interface.h @@ -17,15 +17,14 @@ #ifndef GRPC_SRC_CORE_LOAD_BALANCING_SUBCHANNEL_INTERFACE_H #define GRPC_SRC_CORE_LOAD_BALANCING_SUBCHANNEL_INTERFACE_H +#include +#include + #include #include #include "absl/status/status.h" #include "absl/strings/string_view.h" - -#include -#include - #include "src/core/lib/iomgr/iomgr_fwd.h" #include "src/core/util/dual_ref_counted.h" #include "src/core/util/ref_counted_ptr.h" diff --git a/src/core/load_balancing/weighted_round_robin/static_stride_scheduler.cc b/src/core/load_balancing/weighted_round_robin/static_stride_scheduler.cc index 785c0ff22d3..e74714db433 100644 --- a/src/core/load_balancing/weighted_round_robin/static_stride_scheduler.cc +++ b/src/core/load_balancing/weighted_round_robin/static_stride_scheduler.cc @@ -16,6 +16,8 @@ #include "src/core/load_balancing/weighted_round_robin/static_stride_scheduler.h" +#include + #include #include #include @@ -25,8 +27,6 @@ #include "absl/functional/any_invocable.h" #include "absl/log/check.h" -#include - namespace grpc_core { namespace { diff --git a/src/core/load_balancing/weighted_round_robin/static_stride_scheduler.h b/src/core/load_balancing/weighted_round_robin/static_stride_scheduler.h index 7245ca9607a..936033848f7 100644 --- a/src/core/load_balancing/weighted_round_robin/static_stride_scheduler.h +++ b/src/core/load_balancing/weighted_round_robin/static_stride_scheduler.h @@ -17,6 +17,7 @@ #ifndef GRPC_SRC_CORE_LOAD_BALANCING_WEIGHTED_ROUND_ROBIN_STATIC_STRIDE_SCHEDULER_H #define GRPC_SRC_CORE_LOAD_BALANCING_WEIGHTED_ROUND_ROBIN_STATIC_STRIDE_SCHEDULER_H +#include #include #include @@ -26,8 +27,6 @@ #include "absl/types/optional.h" #include "absl/types/span.h" -#include - namespace grpc_core { // StaticStrideScheduler implements a stride scheduler without the ability to diff --git a/src/core/load_balancing/weighted_round_robin/weighted_round_robin.cc b/src/core/load_balancing/weighted_round_robin/weighted_round_robin.cc index c0403f84bd1..522b73ece7d 100644 --- a/src/core/load_balancing/weighted_round_robin/weighted_round_robin.cc +++ b/src/core/load_balancing/weighted_round_robin/weighted_round_robin.cc @@ -14,6 +14,9 @@ // limitations under the License. // +#include +#include +#include #include #include @@ -39,11 +42,6 @@ #include "absl/strings/string_view.h" #include "absl/types/optional.h" #include "absl/types/variant.h" - -#include -#include -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.h" diff --git a/src/core/load_balancing/weighted_target/weighted_target.cc b/src/core/load_balancing/weighted_target/weighted_target.cc index 8f5075a3409..bebda9cba0d 100644 --- a/src/core/load_balancing/weighted_target/weighted_target.cc +++ b/src/core/load_balancing/weighted_target/weighted_target.cc @@ -16,6 +16,9 @@ #include "src/core/load_balancing/weighted_target/weighted_target.h" +#include +#include +#include #include #include @@ -37,11 +40,6 @@ #include "absl/strings/str_join.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/config/core_configuration.h" #include "src/core/lib/debug/trace.h" diff --git a/src/core/load_balancing/xds/cds.cc b/src/core/load_balancing/xds/cds.cc index 98072442af5..358d9c41194 100644 --- a/src/core/load_balancing/xds/cds.cc +++ b/src/core/load_balancing/xds/cds.cc @@ -14,6 +14,11 @@ // limitations under the License. // +#include +#include +#include +#include + #include #include #include @@ -31,12 +36,6 @@ #include "absl/strings/string_view.h" #include "absl/types/optional.h" #include "absl/types/variant.h" - -#include -#include -#include -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.h" diff --git a/src/core/load_balancing/xds/xds_cluster_impl.cc b/src/core/load_balancing/xds/xds_cluster_impl.cc index 380ed7b108a..ba655bfb762 100644 --- a/src/core/load_balancing/xds/xds_cluster_impl.cc +++ b/src/core/load_balancing/xds/xds_cluster_impl.cc @@ -14,6 +14,8 @@ // limitations under the License. // +#include +#include #include #include @@ -33,10 +35,6 @@ #include "absl/strings/string_view.h" #include "absl/types/optional.h" #include "absl/types/variant.h" - -#include -#include - #include "src/core/client_channel/client_channel_internal.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" diff --git a/src/core/load_balancing/xds/xds_cluster_manager.cc b/src/core/load_balancing/xds/xds_cluster_manager.cc index 4e72ca1170c..96ad1313aeb 100644 --- a/src/core/load_balancing/xds/xds_cluster_manager.cc +++ b/src/core/load_balancing/xds/xds_cluster_manager.cc @@ -14,6 +14,9 @@ // limitations under the License. // +#include +#include +#include #include #include @@ -32,11 +35,6 @@ #include "absl/strings/str_join.h" #include "absl/strings/string_view.h" #include "absl/types/optional.h" - -#include -#include -#include - #include "src/core/client_channel/client_channel_internal.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" diff --git a/src/core/load_balancing/xds/xds_override_host.cc b/src/core/load_balancing/xds/xds_override_host.cc index 1c64eeb0a13..07d800e8df7 100644 --- a/src/core/load_balancing/xds/xds_override_host.cc +++ b/src/core/load_balancing/xds/xds_override_host.cc @@ -16,6 +16,9 @@ #include "src/core/load_balancing/xds/xds_override_host.h" +#include +#include +#include #include #include @@ -42,11 +45,6 @@ #include "absl/types/optional.h" #include "absl/types/span.h" #include "absl/types/variant.h" - -#include -#include -#include - #include "src/core/client_channel/client_channel_internal.h" #include "src/core/ext/filters/stateful_session/stateful_session_filter.h" #include "src/core/lib/address_utils/parse_address.h" diff --git a/src/core/load_balancing/xds/xds_override_host.h b/src/core/load_balancing/xds/xds_override_host.h index 387a5036491..55317bd4756 100644 --- a/src/core/load_balancing/xds/xds_override_host.h +++ b/src/core/load_balancing/xds/xds_override_host.h @@ -17,10 +17,9 @@ #ifndef GRPC_SRC_CORE_LOAD_BALANCING_XDS_XDS_OVERRIDE_HOST_H #define GRPC_SRC_CORE_LOAD_BALANCING_XDS_XDS_OVERRIDE_HOST_H -#include "absl/strings/string_view.h" - #include +#include "absl/strings/string_view.h" #include "src/core/load_balancing/lb_policy.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_args.h" diff --git a/src/core/load_balancing/xds/xds_wrr_locality.cc b/src/core/load_balancing/xds/xds_wrr_locality.cc index efdb91844d6..6ac208dc5a8 100644 --- a/src/core/load_balancing/xds/xds_wrr_locality.cc +++ b/src/core/load_balancing/xds/xds_wrr_locality.cc @@ -14,6 +14,10 @@ // limitations under the License. // +#include +#include +#include + #include #include #include @@ -26,11 +30,6 @@ #include "absl/strings/str_cat.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/config/core_configuration.h" #include "src/core/lib/debug/trace.h" diff --git a/src/core/resolver/.clang-format b/src/core/resolver/.clang-format deleted file mode 100644 index 5f150ef6edb..00000000000 --- a/src/core/resolver/.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/src/core/resolver/binder/binder_resolver.cc b/src/core/resolver/binder/binder_resolver.cc index 30f7e46cc19..326cee10754 100644 --- a/src/core/resolver/binder/binder_resolver.cc +++ b/src/core/resolver/binder/binder_resolver.cc @@ -12,12 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include + #include #include "absl/status/status.h" - -#include - #include "src/core/lib/iomgr/port.h" // IWYU pragma: keep #include "src/core/util/status_helper.h" @@ -42,7 +41,6 @@ #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" #include "absl/strings/strip.h" - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/iomgr/error.h" diff --git a/src/core/resolver/dns/c_ares/dns_resolver_ares.cc b/src/core/resolver/dns/c_ares/dns_resolver_ares.cc index 564fa165d8d..7f866dff773 100644 --- a/src/core/resolver/dns/c_ares/dns_resolver_ares.cc +++ b/src/core/resolver/dns/c_ares/dns_resolver_ares.cc @@ -14,6 +14,9 @@ // limitations under the License. // +#include +#include +#include #include #include @@ -31,11 +34,6 @@ #include "absl/strings/string_view.h" #include "absl/strings/strip.h" #include "absl/types/optional.h" - -#include -#include -#include - #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/iomgr/closure.h" @@ -60,7 +58,6 @@ #include #include "absl/strings/str_cat.h" - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/config_vars.h" #include "src/core/lib/iomgr/resolve_address.h" diff --git a/src/core/resolver/dns/c_ares/dns_resolver_ares.h b/src/core/resolver/dns/c_ares/dns_resolver_ares.h index d8ce1c25c6b..0eb98efe38b 100644 --- a/src/core/resolver/dns/c_ares/dns_resolver_ares.h +++ b/src/core/resolver/dns/c_ares/dns_resolver_ares.h @@ -14,10 +14,9 @@ #ifndef GRPC_SRC_CORE_RESOLVER_DNS_C_ARES_DNS_RESOLVER_ARES_H #define GRPC_SRC_CORE_RESOLVER_DNS_C_ARES_DNS_RESOLVER_ARES_H -#include "absl/strings/string_view.h" - #include +#include "absl/strings/string_view.h" #include "src/core/lib/config/core_configuration.h" namespace grpc_core { diff --git a/src/core/resolver/dns/c_ares/grpc_ares_ev_driver.h b/src/core/resolver/dns/c_ares/grpc_ares_ev_driver.h index 5a75c6c7431..eeaeddf0cdf 100644 --- a/src/core/resolver/dns/c_ares/grpc_ares_ev_driver.h +++ b/src/core/resolver/dns/c_ares/grpc_ares_ev_driver.h @@ -19,14 +19,12 @@ #ifndef GRPC_SRC_CORE_RESOLVER_DNS_C_ARES_GRPC_ARES_EV_DRIVER_H #define GRPC_SRC_CORE_RESOLVER_DNS_C_ARES_GRPC_ARES_EV_DRIVER_H -#include - #include - -#include "absl/base/thread_annotations.h" - #include +#include + +#include "absl/base/thread_annotations.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/iomgr_fwd.h" diff --git a/src/core/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc b/src/core/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc index 634ab525e84..7341ffba639 100644 --- a/src/core/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc +++ b/src/core/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc @@ -23,6 +23,7 @@ // IWYU pragma: no_include +#include #include #include #include @@ -33,12 +34,9 @@ #include #include -#include - #include "absl/base/thread_annotations.h" #include "absl/log/check.h" #include "absl/strings/str_cat.h" - #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/ev_posix.h" diff --git a/src/core/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc b/src/core/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc index d7757fb9fc4..6f988c8710d 100644 --- a/src/core/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc +++ b/src/core/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc @@ -20,23 +20,20 @@ #include "src/core/lib/iomgr/port.h" // IWYU pragma: keep #if GRPC_ARES == 1 && defined(GRPC_WINDOWS_SOCKET_ARES_EV_DRIVER) +#include +#include +#include +#include +#include #include #include #include #include -#include - #include "absl/functional/any_invocable.h" #include "absl/log/check.h" #include "absl/strings/str_format.h" - -#include -#include -#include -#include - #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/iomgr/iocp_windows.h" #include "src/core/lib/iomgr/sockaddr_windows.h" diff --git a/src/core/resolver/dns/c_ares/grpc_ares_wrapper.cc b/src/core/resolver/dns/c_ares/grpc_ares_wrapper.cc index e0efc6075b6..cad4cfa1918 100644 --- a/src/core/resolver/dns/c_ares/grpc_ares_wrapper.cc +++ b/src/core/resolver/dns/c_ares/grpc_ares_wrapper.cc @@ -16,14 +16,13 @@ // // +#include +#include + #include #include #include "absl/strings/string_view.h" - -#include -#include - #include "src/core/lib/iomgr/sockaddr.h" #include "src/core/util/status_helper.h" @@ -37,26 +36,23 @@ #if GRPC_ARES == 1 +#include +#include +#include +#include +#include #include #include // IWYU pragma: keep #include #include -#include -#include - #include "absl/log/check.h" #include "absl/log/log.h" #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" - -#include -#include -#include - #include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/channel/channel_args.h" diff --git a/src/core/resolver/dns/c_ares/grpc_ares_wrapper.h b/src/core/resolver/dns/c_ares/grpc_ares_wrapper.h index 5ed2f9cc51e..272ef463ac4 100644 --- a/src/core/resolver/dns/c_ares/grpc_ares_wrapper.h +++ b/src/core/resolver/dns/c_ares/grpc_ares_wrapper.h @@ -19,17 +19,14 @@ #ifndef GRPC_SRC_CORE_RESOLVER_DNS_C_ARES_GRPC_ARES_WRAPPER_H #define GRPC_SRC_CORE_RESOLVER_DNS_C_ARES_GRPC_ARES_WRAPPER_H +#include +#include #include #include -#include - #include "absl/base/thread_annotations.h" #include "absl/log/log.h" - -#include - #include "src/core/lib/debug/trace.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" diff --git a/src/core/resolver/dns/dns_resolver_plugin.cc b/src/core/resolver/dns/dns_resolver_plugin.cc index 7e9870543b2..c40f628570e 100644 --- a/src/core/resolver/dns/dns_resolver_plugin.cc +++ b/src/core/resolver/dns/dns_resolver_plugin.cc @@ -13,13 +13,12 @@ // limitations under the License. #include "src/core/resolver/dns/dns_resolver_plugin.h" +#include + #include #include "absl/log/log.h" #include "absl/strings/match.h" - -#include - #include "src/core/lib/config/config_vars.h" #include "src/core/lib/experiments/experiments.h" #include "src/core/resolver/dns/c_ares/dns_resolver_ares.h" diff --git a/src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.cc b/src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.cc index c65b1d506fb..61ed5677943 100644 --- a/src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.cc +++ b/src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.cc @@ -13,6 +13,9 @@ // limitations under the License. #include "src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.h" +#include +#include +#include #include #include @@ -33,11 +36,6 @@ #include "absl/strings/str_cat.h" #include "absl/strings/strip.h" #include "absl/types/optional.h" - -#include -#include -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/event_engine/resolved_address_internal.h" diff --git a/src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.h b/src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.h index 555e91fedef..1a4fb852856 100644 --- a/src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.h +++ b/src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.h @@ -13,10 +13,9 @@ // limitations under the License. #ifndef GRPC_SRC_CORE_RESOLVER_DNS_EVENT_ENGINE_EVENT_ENGINE_CLIENT_CHANNEL_RESOLVER_H #define GRPC_SRC_CORE_RESOLVER_DNS_EVENT_ENGINE_EVENT_ENGINE_CLIENT_CHANNEL_RESOLVER_H -#include "absl/strings/string_view.h" - #include +#include "absl/strings/string_view.h" #include "src/core/resolver/resolver.h" #include "src/core/resolver/resolver_factory.h" #include "src/core/util/orphanable.h" diff --git a/src/core/resolver/dns/event_engine/service_config_helper.cc b/src/core/resolver/dns/event_engine/service_config_helper.cc index ba0b910e327..068ff200292 100644 --- a/src/core/resolver/dns/event_engine/service_config_helper.cc +++ b/src/core/resolver/dns/event_engine/service_config_helper.cc @@ -13,6 +13,7 @@ // limitations under the License. #include "src/core/resolver/dns/event_engine/service_config_helper.h" +#include #include #include @@ -20,9 +21,6 @@ #include "absl/status/statusor.h" #include "absl/strings/string_view.h" - -#include - #include "src/core/util/gethostname.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_args.h" diff --git a/src/core/resolver/dns/event_engine/service_config_helper.h b/src/core/resolver/dns/event_engine/service_config_helper.h index 90bc82a96b6..5c89aa5e1e4 100644 --- a/src/core/resolver/dns/event_engine/service_config_helper.h +++ b/src/core/resolver/dns/event_engine/service_config_helper.h @@ -15,13 +15,13 @@ #ifndef GRPC_SRC_CORE_RESOLVER_DNS_EVENT_ENGINE_SERVICE_CONFIG_HELPER_H #define GRPC_SRC_CORE_RESOLVER_DNS_EVENT_ENGINE_SERVICE_CONFIG_HELPER_H +#include + #include #include "absl/status/statusor.h" #include "absl/strings/string_view.h" -#include - namespace grpc_core { absl::StatusOr ChooseServiceConfig( diff --git a/src/core/resolver/dns/native/dns_resolver.cc b/src/core/resolver/dns/native/dns_resolver.cc index 8ee4b549f65..9c138bae997 100644 --- a/src/core/resolver/dns/native/dns_resolver.cc +++ b/src/core/resolver/dns/native/dns_resolver.cc @@ -14,6 +14,9 @@ // limitations under the License. // +#include +#include + #include #include #include @@ -27,10 +30,6 @@ #include "absl/strings/string_view.h" #include "absl/strings/strip.h" #include "absl/types/optional.h" - -#include -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.h" diff --git a/src/core/resolver/endpoint_addresses.cc b/src/core/resolver/endpoint_addresses.cc index 7fc7d8d3335..aa5f46e3abd 100644 --- a/src/core/resolver/endpoint_addresses.cc +++ b/src/core/resolver/endpoint_addresses.cc @@ -18,6 +18,7 @@ #include "src/core/resolver/endpoint_addresses.h" +#include #include #include @@ -29,9 +30,6 @@ #include "absl/status/statusor.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_join.h" - -#include - #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/util/useful.h" diff --git a/src/core/resolver/endpoint_addresses.h b/src/core/resolver/endpoint_addresses.h index 00a9e659784..bd5c0091be1 100644 --- a/src/core/resolver/endpoint_addresses.h +++ b/src/core/resolver/endpoint_addresses.h @@ -19,15 +19,14 @@ #ifndef GRPC_SRC_CORE_RESOLVER_ENDPOINT_ADDRESSES_H #define GRPC_SRC_CORE_RESOLVER_ENDPOINT_ADDRESSES_H +#include + #include #include #include #include #include "absl/functional/function_ref.h" - -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/iomgr/resolved_address.h" diff --git a/src/core/resolver/fake/fake_resolver.cc b/src/core/resolver/fake/fake_resolver.cc index b2bbaf26193..a3ff19fb353 100644 --- a/src/core/resolver/fake/fake_resolver.cc +++ b/src/core/resolver/fake/fake_resolver.cc @@ -19,15 +19,14 @@ #include "src/core/resolver/fake/fake_resolver.h" +#include + #include #include #include #include "absl/log/check.h" #include "absl/strings/string_view.h" - -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/resolver/resolver_factory.h" diff --git a/src/core/resolver/fake/fake_resolver.h b/src/core/resolver/fake/fake_resolver.h index 5126c741577..c72187bcfc7 100644 --- a/src/core/resolver/fake/fake_resolver.h +++ b/src/core/resolver/fake/fake_resolver.h @@ -17,16 +17,15 @@ #ifndef GRPC_SRC_CORE_RESOLVER_FAKE_FAKE_RESOLVER_H #define GRPC_SRC_CORE_RESOLVER_FAKE_FAKE_RESOLVER_H +#include +#include + #include #include "absl/base/thread_annotations.h" #include "absl/strings/string_view.h" #include "absl/time/time.h" #include "absl/types/optional.h" - -#include -#include - #include "src/core/resolver/resolver.h" #include "src/core/util/notification.h" #include "src/core/util/ref_counted.h" diff --git a/src/core/resolver/google_c2p/google_c2p_resolver.cc b/src/core/resolver/google_c2p/google_c2p_resolver.cc index 42e309f900c..7aa5ee7009c 100644 --- a/src/core/resolver/google_c2p/google_c2p_resolver.cc +++ b/src/core/resolver/google_c2p/google_c2p_resolver.cc @@ -14,6 +14,9 @@ // limitations under the License. // +#include +#include + #include #include #include @@ -28,10 +31,6 @@ #include "absl/strings/string_view.h" #include "absl/strings/strip.h" #include "absl/types/optional.h" - -#include -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/iomgr/polling_entity.h" diff --git a/src/core/resolver/polling_resolver.cc b/src/core/resolver/polling_resolver.cc index 27806f1e5a9..83642ddd1c5 100644 --- a/src/core/resolver/polling_resolver.cc +++ b/src/core/resolver/polling_resolver.cc @@ -16,6 +16,7 @@ #include "src/core/resolver/polling_resolver.h" +#include #include #include @@ -29,9 +30,6 @@ #include "absl/status/statusor.h" #include "absl/strings/str_cat.h" #include "absl/strings/strip.h" - -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/resolver/endpoint_addresses.h" diff --git a/src/core/resolver/polling_resolver.h b/src/core/resolver/polling_resolver.h index fe405c3f1d4..c09ba6653c3 100644 --- a/src/core/resolver/polling_resolver.h +++ b/src/core/resolver/polling_resolver.h @@ -17,15 +17,14 @@ #ifndef GRPC_SRC_CORE_RESOLVER_POLLING_RESOLVER_H #define GRPC_SRC_CORE_RESOLVER_POLLING_RESOLVER_H +#include +#include + #include #include #include "absl/status/status.h" #include "absl/types/optional.h" - -#include -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/iomgr/iomgr_fwd.h" diff --git a/src/core/resolver/resolver.h b/src/core/resolver/resolver.h index 389096c3d8f..5cabc99b270 100644 --- a/src/core/resolver/resolver.h +++ b/src/core/resolver/resolver.h @@ -17,14 +17,13 @@ #ifndef GRPC_SRC_CORE_RESOLVER_RESOLVER_H #define GRPC_SRC_CORE_RESOLVER_RESOLVER_H +#include + #include #include #include "absl/status/status.h" #include "absl/status/statusor.h" - -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/debug/trace.h" #include "src/core/resolver/endpoint_addresses.h" diff --git a/src/core/resolver/resolver_factory.h b/src/core/resolver/resolver_factory.h index 831b67c5cfc..41df42060fc 100644 --- a/src/core/resolver/resolver_factory.h +++ b/src/core/resolver/resolver_factory.h @@ -17,14 +17,13 @@ #ifndef GRPC_SRC_CORE_RESOLVER_RESOLVER_FACTORY_H #define GRPC_SRC_CORE_RESOLVER_RESOLVER_FACTORY_H +#include + #include #include #include "absl/strings/string_view.h" #include "absl/strings/strip.h" - -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/iomgr/iomgr_fwd.h" #include "src/core/resolver/resolver.h" diff --git a/src/core/resolver/resolver_registry.cc b/src/core/resolver/resolver_registry.cc index 3033fb6aecb..56a189bf307 100644 --- a/src/core/resolver/resolver_registry.cc +++ b/src/core/resolver/resolver_registry.cc @@ -16,6 +16,8 @@ #include "src/core/resolver/resolver_registry.h" +#include + #include "absl/log/check.h" #include "absl/log/log.h" #include "absl/status/status.h" @@ -24,8 +26,6 @@ #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" -#include - namespace grpc_core { // diff --git a/src/core/resolver/resolver_registry.h b/src/core/resolver/resolver_registry.h index 5e1d87fbf6b..c25f2524578 100644 --- a/src/core/resolver/resolver_registry.h +++ b/src/core/resolver/resolver_registry.h @@ -17,15 +17,14 @@ #ifndef GRPC_SRC_CORE_RESOLVER_RESOLVER_REGISTRY_H #define GRPC_SRC_CORE_RESOLVER_RESOLVER_REGISTRY_H +#include + #include #include #include #include #include "absl/strings/string_view.h" - -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/iomgr/iomgr_fwd.h" #include "src/core/resolver/resolver.h" diff --git a/src/core/resolver/sockaddr/sockaddr_resolver.cc b/src/core/resolver/sockaddr/sockaddr_resolver.cc index 1cd1ac310cf..6657faa4680 100644 --- a/src/core/resolver/sockaddr/sockaddr_resolver.cc +++ b/src/core/resolver/sockaddr/sockaddr_resolver.cc @@ -14,6 +14,8 @@ // limitations under the License. // +#include + #include #include #include @@ -23,9 +25,6 @@ #include "absl/status/statusor.h" #include "absl/strings/str_split.h" #include "absl/strings/string_view.h" - -#include - #include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" diff --git a/src/core/resolver/xds/xds_config.cc b/src/core/resolver/xds/xds_config.cc index 70158b1c365..b9e7f914513 100644 --- a/src/core/resolver/xds/xds_config.cc +++ b/src/core/resolver/xds/xds_config.cc @@ -23,7 +23,6 @@ #include "absl/strings/str_cat.h" #include "absl/strings/str_join.h" - #include "src/core/util/match.h" namespace grpc_core { diff --git a/src/core/resolver/xds/xds_config.h b/src/core/resolver/xds/xds_config.h index 784db2fc487..b5fb154663b 100644 --- a/src/core/resolver/xds/xds_config.h +++ b/src/core/resolver/xds/xds_config.h @@ -26,7 +26,6 @@ #include "absl/status/statusor.h" #include "absl/strings/string_view.h" #include "absl/types/variant.h" - #include "src/core/util/ref_counted.h" #include "src/core/xds/grpc/xds_cluster.h" #include "src/core/xds/grpc/xds_endpoint.h" diff --git a/src/core/resolver/xds/xds_dependency_manager.cc b/src/core/resolver/xds/xds_dependency_manager.cc index 3ed9fa1da92..ddc0dcdbfd9 100644 --- a/src/core/resolver/xds/xds_dependency_manager.cc +++ b/src/core/resolver/xds/xds_dependency_manager.cc @@ -21,7 +21,6 @@ #include "absl/log/check.h" #include "absl/log/log.h" #include "absl/strings/str_join.h" - #include "src/core/lib/config/core_configuration.h" #include "src/core/load_balancing/xds/xds_channel_args.h" #include "src/core/resolver/fake/fake_resolver.h" diff --git a/src/core/resolver/xds/xds_dependency_manager.h b/src/core/resolver/xds/xds_dependency_manager.h index dcb1738b4f1..5e8ea3a00c0 100644 --- a/src/core/resolver/xds/xds_dependency_manager.h +++ b/src/core/resolver/xds/xds_dependency_manager.h @@ -20,7 +20,6 @@ #include "absl/container/flat_hash_map.h" #include "absl/container/flat_hash_set.h" #include "absl/strings/string_view.h" - #include "src/core/resolver/resolver.h" #include "src/core/resolver/xds/xds_config.h" #include "src/core/util/ref_counted.h" diff --git a/src/core/resolver/xds/xds_resolver.cc b/src/core/resolver/xds/xds_resolver.cc index 833468a7b29..fb9d1da293a 100644 --- a/src/core/resolver/xds/xds_resolver.cc +++ b/src/core/resolver/xds/xds_resolver.cc @@ -14,6 +14,10 @@ // limitations under the License. // +#include +#include +#include +#include #include #include @@ -42,12 +46,6 @@ #include "absl/types/optional.h" #include "absl/types/variant.h" #include "re2/re2.h" - -#include -#include -#include -#include - #include "src/core/client_channel/client_channel_internal.h" #include "src/core/client_channel/config_selector.h" #include "src/core/lib/channel/channel_args.h" diff --git a/src/core/resolver/xds/xds_resolver_attributes.h b/src/core/resolver/xds/xds_resolver_attributes.h index 63f2684f2a1..c0d2795afe4 100644 --- a/src/core/resolver/xds/xds_resolver_attributes.h +++ b/src/core/resolver/xds/xds_resolver_attributes.h @@ -17,10 +17,9 @@ #ifndef GRPC_SRC_CORE_RESOLVER_XDS_XDS_RESOLVER_ATTRIBUTES_H #define GRPC_SRC_CORE_RESOLVER_XDS_XDS_RESOLVER_ATTRIBUTES_H -#include "absl/strings/string_view.h" - #include +#include "absl/strings/string_view.h" #include "src/core/service_config/service_config_call_data.h" #include "src/core/util/unique_type_name.h" #include "src/core/xds/grpc/xds_route_config.h" diff --git a/src/core/server/server.cc b/src/core/server/server.cc index f88eb5925da..5ec784a5c96 100644 --- a/src/core/server/server.cc +++ b/src/core/server/server.cc @@ -16,6 +16,14 @@ #include "src/core/server/server.h" +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include @@ -36,16 +44,6 @@ #include "absl/log/log.h" #include "absl/status/status.h" #include "absl/types/optional.h" - -#include -#include -#include -#include -#include -#include -#include -#include - #include "src/core/channelz/channel_trace.h" #include "src/core/channelz/channelz.h" #include "src/core/lib/channel/channel_args.h" diff --git a/src/core/server/server.h b/src/core/server/server.h index 4bd2273eac3..8f68c333eba 100644 --- a/src/core/server/server.h +++ b/src/core/server/server.h @@ -17,6 +17,12 @@ #ifndef GRPC_SRC_CORE_SERVER_SERVER_H #define GRPC_SRC_CORE_SERVER_SERVER_H +#include +#include +#include +#include +#include +#include #include #include @@ -37,14 +43,6 @@ #include "absl/status/statusor.h" #include "absl/strings/string_view.h" #include "absl/types/optional.h" - -#include -#include -#include -#include -#include -#include - #include "src/core/channelz/channelz.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_fwd.h" diff --git a/src/core/server/server_call_tracer_filter.cc b/src/core/server/server_call_tracer_filter.cc index b4fbdafde9c..692915750d3 100644 --- a/src/core/server/server_call_tracer_filter.cc +++ b/src/core/server/server_call_tracer_filter.cc @@ -16,15 +16,14 @@ #include "src/core/server/server_call_tracer_filter.h" +#include + #include #include #include #include "absl/status/status.h" #include "absl/status/statusor.h" - -#include - #include "src/core/lib/channel/call_finalization.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_fwd.h" diff --git a/src/core/server/server_config_selector.h b/src/core/server/server_config_selector.h index 4d766419809..4e2fda33c77 100644 --- a/src/core/server/server_config_selector.h +++ b/src/core/server/server_config_selector.h @@ -17,13 +17,12 @@ #ifndef GRPC_SRC_CORE_SERVER_SERVER_CONFIG_SELECTOR_H #define GRPC_SRC_CORE_SERVER_SERVER_CONFIG_SELECTOR_H +#include + #include #include "absl/status/statusor.h" #include "absl/strings/string_view.h" - -#include - #include "src/core/lib/transport/metadata_batch.h" #include "src/core/service_config/service_config.h" #include "src/core/service_config/service_config_parser.h" diff --git a/src/core/server/server_config_selector_filter.cc b/src/core/server/server_config_selector_filter.cc index 2f221e61426..53cfb0524aa 100644 --- a/src/core/server/server_config_selector_filter.cc +++ b/src/core/server/server_config_selector_filter.cc @@ -14,6 +14,8 @@ #include "src/core/server/server_config_selector_filter.h" +#include + #include #include #include @@ -23,9 +25,6 @@ #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/types/optional.h" - -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/promise_based_filter.h" #include "src/core/lib/event_engine/event_engine_context.h" diff --git a/src/core/server/xds_channel_stack_modifier.cc b/src/core/server/xds_channel_stack_modifier.cc index 15d2d3378f3..5a31507b138 100644 --- a/src/core/server/xds_channel_stack_modifier.cc +++ b/src/core/server/xds_channel_stack_modifier.cc @@ -18,12 +18,12 @@ #include "src/core/server/xds_channel_stack_modifier.h" +#include + #include #include #include -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/config/core_configuration.h" diff --git a/src/core/server/xds_channel_stack_modifier.h b/src/core/server/xds_channel_stack_modifier.h index 78810478d99..11ec0f06325 100644 --- a/src/core/server/xds_channel_stack_modifier.h +++ b/src/core/server/xds_channel_stack_modifier.h @@ -19,14 +19,13 @@ #ifndef GRPC_SRC_CORE_SERVER_XDS_CHANNEL_STACK_MODIFIER_H #define GRPC_SRC_CORE_SERVER_XDS_CHANNEL_STACK_MODIFIER_H +#include +#include + #include #include #include "absl/strings/string_view.h" - -#include -#include - #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_stack_builder.h" #include "src/core/util/ref_counted.h" diff --git a/src/core/server/xds_server_config_fetcher.cc b/src/core/server/xds_server_config_fetcher.cc index f8b523a293e..35b64a5e19e 100644 --- a/src/core/server/xds_server_config_fetcher.cc +++ b/src/core/server/xds_server_config_fetcher.cc @@ -16,6 +16,12 @@ // // +#include +#include +#include +#include +#include +#include #include #include @@ -39,14 +45,6 @@ #include "absl/strings/string_view.h" #include "absl/types/optional.h" #include "absl/types/variant.h" - -#include -#include -#include -#include -#include -#include - #include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/channel/channel_args.h" diff --git a/src/core/service_config/service_config.h b/src/core/service_config/service_config.h index f9c43c35011..801205ed43e 100644 --- a/src/core/service_config/service_config.h +++ b/src/core/service_config/service_config.h @@ -17,13 +17,11 @@ #ifndef GRPC_SRC_CORE_SERVICE_CONFIG_SERVICE_CONFIG_H #define GRPC_SRC_CORE_SERVICE_CONFIG_SERVICE_CONFIG_H -#include - -#include "absl/strings/string_view.h" - #include #include +#include +#include "absl/strings/string_view.h" #include "src/core/service_config/service_config_parser.h" #include "src/core/util/ref_counted.h" #include "src/core/util/useful.h" diff --git a/src/core/service_config/service_config_call_data.h b/src/core/service_config/service_config_call_data.h index 7c6bbcd2e39..87ead4b6330 100644 --- a/src/core/service_config/service_config_call_data.h +++ b/src/core/service_config/service_config_call_data.h @@ -17,13 +17,12 @@ #ifndef GRPC_SRC_CORE_SERVICE_CONFIG_SERVICE_CONFIG_CALL_DATA_H #define GRPC_SRC_CORE_SERVICE_CONFIG_SERVICE_CONFIG_CALL_DATA_H +#include #include #include #include -#include - #include "src/core/lib/resource_quota/arena.h" #include "src/core/service_config/service_config.h" #include "src/core/service_config/service_config_parser.h" diff --git a/src/core/service_config/service_config_channel_arg_filter.cc b/src/core/service_config/service_config_channel_arg_filter.cc index c17fa1a04d6..635dd184ca5 100644 --- a/src/core/service_config/service_config_channel_arg_filter.cc +++ b/src/core/service_config/service_config_channel_arg_filter.cc @@ -17,6 +17,9 @@ // This filter reads GRPC_ARG_SERVICE_CONFIG and populates ServiceConfigCallData // in the call context per call for direct channels. +#include +#include + #include #include #include @@ -26,10 +29,6 @@ #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/types/optional.h" - -#include -#include - #include "src/core/ext/filters/message_size/message_size_filter.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_fwd.h" diff --git a/src/core/service_config/service_config_impl.cc b/src/core/service_config/service_config_impl.cc index a52442e09ec..f678568957a 100644 --- a/src/core/service_config/service_config_impl.cc +++ b/src/core/service_config/service_config_impl.cc @@ -16,6 +16,7 @@ #include "src/core/service_config/service_config_impl.h" +#include #include #include @@ -25,9 +26,6 @@ #include "absl/status/statusor.h" #include "absl/strings/str_cat.h" #include "absl/types/optional.h" - -#include - #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/slice/slice_internal.h" diff --git a/src/core/service_config/service_config_impl.h b/src/core/service_config/service_config_impl.h index ca1d3d17dfb..9d6ae2a46d3 100644 --- a/src/core/service_config/service_config_impl.h +++ b/src/core/service_config/service_config_impl.h @@ -17,6 +17,8 @@ #ifndef GRPC_SRC_CORE_SERVICE_CONFIG_SERVICE_CONFIG_IMPL_H #define GRPC_SRC_CORE_SERVICE_CONFIG_SERVICE_CONFIG_IMPL_H +#include +#include #include #include @@ -27,10 +29,6 @@ #include "absl/log/check.h" #include "absl/status/statusor.h" #include "absl/strings/string_view.h" - -#include -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/service_config/service_config.h" diff --git a/src/core/service_config/service_config_parser.cc b/src/core/service_config/service_config_parser.cc index e679126375e..b3ff7392514 100644 --- a/src/core/service_config/service_config_parser.cc +++ b/src/core/service_config/service_config_parser.cc @@ -16,14 +16,13 @@ #include "src/core/service_config/service_config_parser.h" +#include #include #include #include "absl/log/log.h" -#include - namespace grpc_core { ServiceConfigParser ServiceConfigParser::Builder::Build() { diff --git a/src/core/service_config/service_config_parser.h b/src/core/service_config/service_config_parser.h index caac10a4bc8..763e7f89785 100644 --- a/src/core/service_config/service_config_parser.h +++ b/src/core/service_config/service_config_parser.h @@ -17,6 +17,7 @@ #ifndef GRPC_SRC_CORE_SERVICE_CONFIG_SERVICE_CONFIG_PARSER_H #define GRPC_SRC_CORE_SERVICE_CONFIG_SERVICE_CONFIG_PARSER_H +#include #include #include @@ -25,9 +26,6 @@ #include #include "absl/strings/string_view.h" - -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/util/json/json.h" #include "src/core/util/validation_errors.h" diff --git a/src/core/telemetry/call_tracer.cc b/src/core/telemetry/call_tracer.cc index 873db2d192b..80191bcbbf3 100644 --- a/src/core/telemetry/call_tracer.cc +++ b/src/core/telemetry/call_tracer.cc @@ -18,14 +18,13 @@ #include "src/core/telemetry/call_tracer.h" +#include + #include #include #include #include "absl/log/check.h" - -#include - #include "src/core/lib/promise/context.h" #include "src/core/telemetry/tcp_tracer.h" diff --git a/src/core/telemetry/call_tracer.h b/src/core/telemetry/call_tracer.h index ab9185e2373..f91fa0b1fe1 100644 --- a/src/core/telemetry/call_tracer.h +++ b/src/core/telemetry/call_tracer.h @@ -19,16 +19,15 @@ #ifndef GRPC_SRC_CORE_TELEMETRY_CALL_TRACER_H #define GRPC_SRC_CORE_TELEMETRY_CALL_TRACER_H +#include +#include + #include #include #include "absl/status/status.h" #include "absl/strings/string_view.h" #include "absl/types/optional.h" - -#include -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/promise/context.h" diff --git a/src/core/telemetry/histogram_view.h b/src/core/telemetry/histogram_view.h index 62018d8b840..42da4be2690 100644 --- a/src/core/telemetry/histogram_view.h +++ b/src/core/telemetry/histogram_view.h @@ -15,9 +15,8 @@ #ifndef GRPC_SRC_CORE_TELEMETRY_HISTOGRAM_VIEW_H #define GRPC_SRC_CORE_TELEMETRY_HISTOGRAM_VIEW_H -#include - #include +#include namespace grpc_core { diff --git a/src/core/telemetry/metrics.cc b/src/core/telemetry/metrics.cc index 45e2ab64bfc..9194a51d6d0 100644 --- a/src/core/telemetry/metrics.cc +++ b/src/core/telemetry/metrics.cc @@ -14,13 +14,12 @@ #include "src/core/telemetry/metrics.h" +#include + #include #include "absl/log/check.h" #include "absl/types/optional.h" - -#include - #include "src/core/util/crash.h" namespace grpc_core { diff --git a/src/core/telemetry/metrics.h b/src/core/telemetry/metrics.h index b61e30d1fef..968534b7920 100644 --- a/src/core/telemetry/metrics.h +++ b/src/core/telemetry/metrics.h @@ -15,6 +15,9 @@ #ifndef GRPC_SRC_CORE_TELEMETRY_METRICS_H #define GRPC_SRC_CORE_TELEMETRY_METRICS_H +#include +#include + #include #include #include @@ -24,10 +27,6 @@ #include "absl/functional/function_ref.h" #include "absl/strings/string_view.h" #include "absl/types/span.h" - -#include -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/slice/slice.h" #include "src/core/telemetry/call_tracer.h" diff --git a/src/core/telemetry/stats.cc b/src/core/telemetry/stats.cc index c5137e71f85..4fff0f7ec37 100644 --- a/src/core/telemetry/stats.cc +++ b/src/core/telemetry/stats.cc @@ -18,6 +18,7 @@ #include "src/core/telemetry/stats.h" +#include #include #include @@ -26,8 +27,6 @@ #include "absl/strings/str_cat.h" #include "absl/strings/str_join.h" -#include - namespace grpc_core { namespace stats_detail { diff --git a/src/core/telemetry/stats.h b/src/core/telemetry/stats.h index 8d783dea5d7..c5b64b429ab 100644 --- a/src/core/telemetry/stats.h +++ b/src/core/telemetry/stats.h @@ -19,6 +19,7 @@ #ifndef GRPC_SRC_CORE_TELEMETRY_STATS_H #define GRPC_SRC_CORE_TELEMETRY_STATS_H +#include #include #include @@ -26,9 +27,6 @@ #include "absl/strings/string_view.h" #include "absl/types/span.h" - -#include - #include "src/core/telemetry/histogram_view.h" #include "src/core/telemetry/stats_data.h" #include "src/core/util/no_destruct.h" diff --git a/src/core/telemetry/stats_data.cc b/src/core/telemetry/stats_data.cc index a357b674844..1b59c68f9c5 100644 --- a/src/core/telemetry/stats_data.cc +++ b/src/core/telemetry/stats_data.cc @@ -16,9 +16,8 @@ #include "src/core/telemetry/stats_data.h" -#include - #include +#include namespace grpc_core { namespace { diff --git a/src/core/telemetry/stats_data.h b/src/core/telemetry/stats_data.h index 1ac7579a994..9961302a868 100644 --- a/src/core/telemetry/stats_data.h +++ b/src/core/telemetry/stats_data.h @@ -17,15 +17,13 @@ #ifndef GRPC_SRC_CORE_TELEMETRY_STATS_DATA_H #define GRPC_SRC_CORE_TELEMETRY_STATS_DATA_H +#include #include #include #include #include "absl/strings/string_view.h" - -#include - #include "src/core/telemetry/histogram_view.h" #include "src/core/util/per_cpu.h" diff --git a/src/core/telemetry/tcp_tracer.h b/src/core/telemetry/tcp_tracer.h index 1068678cab8..ac312d50523 100644 --- a/src/core/telemetry/tcp_tracer.h +++ b/src/core/telemetry/tcp_tracer.h @@ -19,6 +19,7 @@ #ifndef GRPC_SRC_CORE_TELEMETRY_TCP_TRACER_H #define GRPC_SRC_CORE_TELEMETRY_TCP_TRACER_H +#include #include #include @@ -27,8 +28,6 @@ #include "absl/time/time.h" #include "absl/types/optional.h" -#include - namespace grpc_core { // Interface for TCP tracer implementations. Created by CallTracerInterface. diff --git a/src/core/tsi/alts/crypt/aes_gcm.cc b/src/core/tsi/alts/crypt/aes_gcm.cc index a4b908b4bdd..d768f85b216 100644 --- a/src/core/tsi/alts/crypt/aes_gcm.cc +++ b/src/core/tsi/alts/crypt/aes_gcm.cc @@ -16,21 +16,18 @@ // // -#include - -#include - +#include +#include #include #include #include #include #include +#include -#include "absl/types/span.h" - -#include -#include +#include +#include "absl/types/span.h" #include "src/core/tsi/alts/crypt/gsec.h" constexpr size_t kKdfKeyLen = 32; diff --git a/src/core/tsi/alts/crypt/gsec.cc b/src/core/tsi/alts/crypt/gsec.cc index 591ad2bceb5..d8382aa935f 100644 --- a/src/core/tsi/alts/crypt/gsec.cc +++ b/src/core/tsi/alts/crypt/gsec.cc @@ -18,11 +18,10 @@ #include "src/core/tsi/alts/crypt/gsec.h" -#include -#include - #include #include +#include +#include static const char vtable_error_msg[] = "crypter or crypter->vtable has not been initialized properly"; diff --git a/src/core/tsi/alts/crypt/gsec.h b/src/core/tsi/alts/crypt/gsec.h index 0407955d691..726295be26a 100644 --- a/src/core/tsi/alts/crypt/gsec.h +++ b/src/core/tsi/alts/crypt/gsec.h @@ -20,6 +20,9 @@ #define GRPC_SRC_CORE_TSI_ALTS_CRYPT_GSEC_H #include +#include +#include +#include #include #include @@ -28,10 +31,6 @@ #include "absl/types/span.h" -#include -#include -#include - namespace grpc_core { // Provides accessors to all information representing a gsec key. Owns all the diff --git a/src/core/tsi/alts/frame_protector/alts_counter.cc b/src/core/tsi/alts/frame_protector/alts_counter.cc index 5eede6067de..a13887d2a44 100644 --- a/src/core/tsi/alts/frame_protector/alts_counter.cc +++ b/src/core/tsi/alts/frame_protector/alts_counter.cc @@ -18,10 +18,9 @@ #include "src/core/tsi/alts/frame_protector/alts_counter.h" -#include - #include #include +#include static void maybe_copy_error_msg(const char* src, char** dst) { if (dst != nullptr && src != nullptr) { diff --git a/src/core/tsi/alts/frame_protector/alts_counter.h b/src/core/tsi/alts/frame_protector/alts_counter.h index 9ebc0892f73..246d1586653 100644 --- a/src/core/tsi/alts/frame_protector/alts_counter.h +++ b/src/core/tsi/alts/frame_protector/alts_counter.h @@ -19,11 +19,10 @@ #ifndef GRPC_SRC_CORE_TSI_ALTS_FRAME_PROTECTOR_ALTS_COUNTER_H #define GRPC_SRC_CORE_TSI_ALTS_FRAME_PROTECTOR_ALTS_COUNTER_H -#include -#include - #include #include +#include +#include // Main struct for a crypter counter managed within seal/unseal operations. typedef struct alts_counter { diff --git a/src/core/tsi/alts/frame_protector/alts_crypter.cc b/src/core/tsi/alts/frame_protector/alts_crypter.cc index 4938127df89..df767fb8a20 100644 --- a/src/core/tsi/alts/frame_protector/alts_crypter.cc +++ b/src/core/tsi/alts/frame_protector/alts_crypter.cc @@ -18,10 +18,9 @@ #include "src/core/tsi/alts/frame_protector/alts_crypter.h" -#include - #include #include +#include static void maybe_copy_error_msg(const char* src, char** dst) { if (dst != nullptr && src != nullptr) { diff --git a/src/core/tsi/alts/frame_protector/alts_crypter.h b/src/core/tsi/alts/frame_protector/alts_crypter.h index a660b30667c..5964fcbe7d5 100644 --- a/src/core/tsi/alts/frame_protector/alts_crypter.h +++ b/src/core/tsi/alts/frame_protector/alts_crypter.h @@ -19,11 +19,10 @@ #ifndef GRPC_SRC_CORE_TSI_ALTS_FRAME_PROTECTOR_ALTS_CRYPTER_H #define GRPC_SRC_CORE_TSI_ALTS_FRAME_PROTECTOR_ALTS_CRYPTER_H -#include -#include - #include #include +#include +#include #include "src/core/tsi/alts/crypt/gsec.h" diff --git a/src/core/tsi/alts/frame_protector/alts_frame_protector.cc b/src/core/tsi/alts/frame_protector/alts_frame_protector.cc index b8593f225e2..534e8555465 100644 --- a/src/core/tsi/alts/frame_protector/alts_frame_protector.cc +++ b/src/core/tsi/alts/frame_protector/alts_frame_protector.cc @@ -18,6 +18,8 @@ #include "src/core/tsi/alts/frame_protector/alts_frame_protector.h" +#include +#include #include #include @@ -26,10 +28,6 @@ #include "absl/log/log.h" #include "absl/types/span.h" - -#include -#include - #include "src/core/tsi/alts/crypt/gsec.h" #include "src/core/tsi/alts/frame_protector/alts_crypter.h" #include "src/core/tsi/alts/frame_protector/frame_handler.h" diff --git a/src/core/tsi/alts/frame_protector/alts_frame_protector.h b/src/core/tsi/alts/frame_protector/alts_frame_protector.h index e1f7def8164..9ee925243e7 100644 --- a/src/core/tsi/alts/frame_protector/alts_frame_protector.h +++ b/src/core/tsi/alts/frame_protector/alts_frame_protector.h @@ -19,9 +19,8 @@ #ifndef GRPC_SRC_CORE_TSI_ALTS_FRAME_PROTECTOR_ALTS_FRAME_PROTECTOR_H #define GRPC_SRC_CORE_TSI_ALTS_FRAME_PROTECTOR_ALTS_FRAME_PROTECTOR_H -#include - #include +#include #include "src/core/tsi/transport_security_interface.h" diff --git a/src/core/tsi/alts/frame_protector/frame_handler.cc b/src/core/tsi/alts/frame_protector/frame_handler.cc index a4e86f97998..7fcbcce34bb 100644 --- a/src/core/tsi/alts/frame_protector/frame_handler.cc +++ b/src/core/tsi/alts/frame_protector/frame_handler.cc @@ -18,6 +18,8 @@ #include "src/core/tsi/alts/frame_protector/frame_handler.h" +#include +#include #include #include #include @@ -25,10 +27,6 @@ #include #include "absl/log/log.h" - -#include -#include - #include "src/core/util/crash.h" #include "src/core/util/memory.h" diff --git a/src/core/tsi/alts/frame_protector/frame_handler.h b/src/core/tsi/alts/frame_protector/frame_handler.h index f0a32b4409a..62a9bd042a4 100644 --- a/src/core/tsi/alts/frame_protector/frame_handler.h +++ b/src/core/tsi/alts/frame_protector/frame_handler.h @@ -19,11 +19,10 @@ #ifndef GRPC_SRC_CORE_TSI_ALTS_FRAME_PROTECTOR_FRAME_HANDLER_H #define GRPC_SRC_CORE_TSI_ALTS_FRAME_PROTECTOR_FRAME_HANDLER_H +#include #include #include -#include - const size_t kFrameMessageType = 0x06; const size_t kFrameLengthFieldSize = 4; const size_t kFrameMessageTypeFieldSize = 4; diff --git a/src/core/tsi/alts/handshaker/alts_handshaker_client.cc b/src/core/tsi/alts/handshaker/alts_handshaker_client.cc index f5513e574d4..62cbe099c5a 100644 --- a/src/core/tsi/alts/handshaker/alts_handshaker_client.cc +++ b/src/core/tsi/alts/handshaker/alts_handshaker_client.cc @@ -18,17 +18,15 @@ #include "src/core/tsi/alts/handshaker/alts_handshaker_client.h" +#include +#include +#include + #include #include "absl/log/check.h" #include "absl/log/log.h" #include "absl/strings/numbers.h" -#include "upb/mem/arena.hpp" - -#include -#include -#include - #include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/surface/call.h" #include "src/core/lib/surface/channel.h" @@ -38,6 +36,7 @@ #include "src/core/util/crash.h" #include "src/core/util/env.h" #include "src/core/util/sync.h" +#include "upb/mem/arena.hpp" #define TSI_ALTS_INITIAL_BUFFER_SIZE 256 diff --git a/src/core/tsi/alts/handshaker/alts_shared_resource.cc b/src/core/tsi/alts/handshaker/alts_shared_resource.cc index 06d4e5e1936..ec1fe812963 100644 --- a/src/core/tsi/alts/handshaker/alts_shared_resource.cc +++ b/src/core/tsi/alts/handshaker/alts_shared_resource.cc @@ -18,10 +18,9 @@ #include "src/core/tsi/alts/handshaker/alts_shared_resource.h" -#include "absl/log/check.h" - #include +#include "absl/log/check.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/tsi/alts/handshaker/alts_handshaker_client.h" #include "src/core/util/crash.h" diff --git a/src/core/tsi/alts/handshaker/alts_tsi_handshaker.cc b/src/core/tsi/alts/handshaker/alts_tsi_handshaker.cc index 79b497bda7e..b25e14f1d85 100644 --- a/src/core/tsi/alts/handshaker/alts_tsi_handshaker.cc +++ b/src/core/tsi/alts/handshaker/alts_tsi_handshaker.cc @@ -18,14 +18,6 @@ #include "src/core/tsi/alts/handshaker/alts_tsi_handshaker.h" -#include -#include -#include - -#include "absl/log/check.h" -#include "absl/log/log.h" -#include "upb/mem/arena.hpp" - #include #include #include @@ -33,7 +25,12 @@ #include #include #include +#include +#include +#include +#include "absl/log/check.h" +#include "absl/log/log.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/surface/channel.h" @@ -43,6 +40,7 @@ #include "src/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector.h" #include "src/core/util/memory.h" #include "src/core/util/sync.h" +#include "upb/mem/arena.hpp" // Main struct for ALTS TSI handshaker. struct alts_tsi_handshaker { diff --git a/src/core/tsi/alts/handshaker/alts_tsi_utils.cc b/src/core/tsi/alts/handshaker/alts_tsi_utils.cc index 0c4325844bd..cc8f6dc78bd 100644 --- a/src/core/tsi/alts/handshaker/alts_tsi_utils.cc +++ b/src/core/tsi/alts/handshaker/alts_tsi_utils.cc @@ -18,12 +18,11 @@ #include "src/core/tsi/alts/handshaker/alts_tsi_utils.h" -#include "absl/log/check.h" -#include "absl/log/log.h" - #include #include +#include "absl/log/check.h" +#include "absl/log/log.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/slice/slice_internal.h" diff --git a/src/core/tsi/alts/handshaker/transport_security_common_api.cc b/src/core/tsi/alts/handshaker/transport_security_common_api.cc index 9506eaa3b6a..a7881e0d71f 100644 --- a/src/core/tsi/alts/handshaker/transport_security_common_api.cc +++ b/src/core/tsi/alts/handshaker/transport_security_common_api.cc @@ -18,11 +18,11 @@ #include "src/core/tsi/alts/handshaker/transport_security_common_api.h" +#include + #include "absl/log/log.h" #include "upb/mem/arena.hpp" -#include - bool grpc_gcp_rpc_protocol_versions_set_max( grpc_gcp_rpc_protocol_versions* versions, uint32_t max_major, uint32_t max_minor) { diff --git a/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_integrity_only_record_protocol.cc b/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_integrity_only_record_protocol.cc index 89c5dcfaa6f..5bde0334f50 100644 --- a/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_integrity_only_record_protocol.cc +++ b/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_integrity_only_record_protocol.cc @@ -18,14 +18,12 @@ #include "src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_integrity_only_record_protocol.h" +#include +#include #include #include "absl/log/check.h" #include "absl/log/log.h" - -#include -#include - #include "src/core/lib/slice/slice.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol_common.h" diff --git a/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_integrity_only_record_protocol.h b/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_integrity_only_record_protocol.h index eb61d2ff2e3..8bf3a661467 100644 --- a/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_integrity_only_record_protocol.h +++ b/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_integrity_only_record_protocol.h @@ -19,9 +19,8 @@ #ifndef GRPC_SRC_CORE_TSI_ALTS_ZERO_COPY_FRAME_PROTECTOR_ALTS_GRPC_INTEGRITY_ONLY_RECORD_PROTOCOL_H #define GRPC_SRC_CORE_TSI_ALTS_ZERO_COPY_FRAME_PROTECTOR_ALTS_GRPC_INTEGRITY_ONLY_RECORD_PROTOCOL_H -#include - #include +#include #include "src/core/tsi/alts/crypt/gsec.h" #include "src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol.h" diff --git a/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_privacy_integrity_record_protocol.cc b/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_privacy_integrity_record_protocol.cc index 2a568cd446e..cc10ddb8eb4 100644 --- a/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_privacy_integrity_record_protocol.cc +++ b/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_privacy_integrity_record_protocol.cc @@ -18,11 +18,10 @@ #include "src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_privacy_integrity_record_protocol.h" -#include "absl/log/log.h" - #include #include +#include "absl/log/log.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol_common.h" diff --git a/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_privacy_integrity_record_protocol.h b/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_privacy_integrity_record_protocol.h index c4dd9ab152a..0e32bf42570 100644 --- a/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_privacy_integrity_record_protocol.h +++ b/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_privacy_integrity_record_protocol.h @@ -19,9 +19,8 @@ #ifndef GRPC_SRC_CORE_TSI_ALTS_ZERO_COPY_FRAME_PROTECTOR_ALTS_GRPC_PRIVACY_INTEGRITY_RECORD_PROTOCOL_H #define GRPC_SRC_CORE_TSI_ALTS_ZERO_COPY_FRAME_PROTECTOR_ALTS_GRPC_PRIVACY_INTEGRITY_RECORD_PROTOCOL_H -#include - #include +#include #include "src/core/tsi/alts/crypt/gsec.h" #include "src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol.h" diff --git a/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol_common.cc b/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol_common.cc index d4e77898e35..76cf72290cc 100644 --- a/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol_common.cc +++ b/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol_common.cc @@ -18,14 +18,12 @@ #include "src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol_common.h" +#include +#include #include #include "absl/log/check.h" #include "absl/log/log.h" - -#include -#include - #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/util/crash.h" diff --git a/src/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol.cc b/src/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol.cc index 908ed2934fd..68db992e0bf 100644 --- a/src/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol.cc +++ b/src/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol.cc @@ -18,11 +18,10 @@ #include "src/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol.h" -#include -#include - #include #include +#include +#include #include "src/core/tsi/alts/frame_protector/alts_counter.h" #include "src/core/util/crash.h" diff --git a/src/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol.h b/src/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol.h index e29ab55b502..858d19f3b88 100644 --- a/src/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol.h +++ b/src/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol.h @@ -19,9 +19,8 @@ #ifndef GRPC_SRC_CORE_TSI_ALTS_ZERO_COPY_FRAME_PROTECTOR_ALTS_IOVEC_RECORD_PROTOCOL_H #define GRPC_SRC_CORE_TSI_ALTS_ZERO_COPY_FRAME_PROTECTOR_ALTS_IOVEC_RECORD_PROTOCOL_H -#include - #include +#include #include "src/core/tsi/alts/crypt/gsec.h" diff --git a/src/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector.cc b/src/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector.cc index fce90b47f48..cbf009e99ab 100644 --- a/src/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector.cc +++ b/src/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector.cc @@ -18,6 +18,8 @@ #include "src/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector.h" +#include +#include #include #include @@ -25,10 +27,6 @@ #include "absl/log/check.h" #include "absl/log/log.h" - -#include -#include - #include "src/core/tsi/alts/crypt/gsec.h" #include "src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_integrity_only_record_protocol.h" #include "src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_privacy_integrity_record_protocol.h" diff --git a/src/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector.h b/src/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector.h index 42c3dee0d35..d5dbd8c4891 100644 --- a/src/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector.h +++ b/src/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector.h @@ -19,9 +19,8 @@ #ifndef GRPC_SRC_CORE_TSI_ALTS_ZERO_COPY_FRAME_PROTECTOR_ALTS_ZERO_COPY_GRPC_PROTECTOR_H #define GRPC_SRC_CORE_TSI_ALTS_ZERO_COPY_FRAME_PROTECTOR_ALTS_ZERO_COPY_GRPC_PROTECTOR_H -#include - #include +#include #include "src/core/tsi/alts/crypt/gsec.h" #include "src/core/tsi/transport_security_interface.h" diff --git a/src/core/tsi/fake_transport_security.cc b/src/core/tsi/fake_transport_security.cc index e01dce2c687..98c073779b0 100644 --- a/src/core/tsi/fake_transport_security.cc +++ b/src/core/tsi/fake_transport_security.cc @@ -18,15 +18,13 @@ #include "src/core/tsi/fake_transport_security.h" +#include +#include #include #include #include "absl/log/check.h" #include "absl/log/log.h" - -#include -#include - #include "src/core/lib/slice/slice_internal.h" #include "src/core/tsi/transport_security_grpc.h" #include "src/core/tsi/transport_security_interface.h" diff --git a/src/core/tsi/local_transport_security.cc b/src/core/tsi/local_transport_security.cc index bb25a25db41..ced2ef2baa1 100644 --- a/src/core/tsi/local_transport_security.cc +++ b/src/core/tsi/local_transport_security.cc @@ -18,16 +18,14 @@ #include "src/core/tsi/local_transport_security.h" +#include +#include +#include #include #include #include #include "absl/log/log.h" - -#include -#include -#include - #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/tsi/transport_security_grpc.h" #include "src/core/util/crash.h" diff --git a/src/core/tsi/ssl/key_logging/ssl_key_logging.cc b/src/core/tsi/ssl/key_logging/ssl_key_logging.cc index 510a55bfc27..b0f961a41c8 100644 --- a/src/core/tsi/ssl/key_logging/ssl_key_logging.cc +++ b/src/core/tsi/ssl/key_logging/ssl_key_logging.cc @@ -14,13 +14,12 @@ #include "src/core/tsi/ssl/key_logging/ssl_key_logging.h" +#include + #include #include "absl/log/check.h" #include "absl/log/log.h" - -#include - #include "src/core/lib/iomgr/error.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/util/crash.h" diff --git a/src/core/tsi/ssl/key_logging/ssl_key_logging.h b/src/core/tsi/ssl/key_logging/ssl_key_logging.h index c3752c1e7b0..472ddc70a09 100644 --- a/src/core/tsi/ssl/key_logging/ssl_key_logging.h +++ b/src/core/tsi/ssl/key_logging/ssl_key_logging.h @@ -15,18 +15,16 @@ #ifndef GRPC_SRC_CORE_TSI_SSL_KEY_LOGGING_SSL_KEY_LOGGING_H #define GRPC_SRC_CORE_TSI_SSL_KEY_LOGGING_SSL_KEY_LOGGING_H -#include -#include - -#include - -#include "absl/base/thread_annotations.h" - #include #include #include #include +#include + +#include +#include +#include "absl/base/thread_annotations.h" #include "src/core/util/memory.h" #include "src/core/util/ref_counted.h" #include "src/core/util/sync.h" diff --git a/src/core/tsi/ssl/session_cache/ssl_session.h b/src/core/tsi/ssl/session_cache/ssl_session.h index f990f3dfd52..fa57de48983 100644 --- a/src/core/tsi/ssl/session_cache/ssl_session.h +++ b/src/core/tsi/ssl/session_cache/ssl_session.h @@ -19,12 +19,11 @@ #ifndef GRPC_SRC_CORE_TSI_SSL_SESSION_CACHE_SSL_SESSION_H #define GRPC_SRC_CORE_TSI_SSL_SESSION_CACHE_SSL_SESSION_H -#include - -#include - #include #include +#include + +#include #include "src/core/util/ref_counted.h" diff --git a/src/core/tsi/ssl/session_cache/ssl_session_cache.cc b/src/core/tsi/ssl/session_cache/ssl_session_cache.cc index 7c27f36e2ab..6e107c066c5 100644 --- a/src/core/tsi/ssl/session_cache/ssl_session_cache.cc +++ b/src/core/tsi/ssl/session_cache/ssl_session_cache.cc @@ -18,12 +18,11 @@ #include "src/core/tsi/ssl/session_cache/ssl_session_cache.h" -#include "absl/log/check.h" -#include "absl/log/log.h" - #include #include +#include "absl/log/check.h" +#include "absl/log/log.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/tsi/ssl/session_cache/ssl_session.h" #include "src/core/util/crash.h" diff --git a/src/core/tsi/ssl/session_cache/ssl_session_cache.h b/src/core/tsi/ssl/session_cache/ssl_session_cache.h index 024262c9c90..b33b53aebf1 100644 --- a/src/core/tsi/ssl/session_cache/ssl_session_cache.h +++ b/src/core/tsi/ssl/session_cache/ssl_session_cache.h @@ -19,14 +19,13 @@ #ifndef GRPC_SRC_CORE_TSI_SSL_SESSION_CACHE_SSL_SESSION_CACHE_H #define GRPC_SRC_CORE_TSI_SSL_SESSION_CACHE_SSL_SESSION_CACHE_H -#include - -#include - #include #include #include #include +#include + +#include #include "src/core/tsi/ssl/session_cache/ssl_session.h" #include "src/core/util/cpp_impl_of.h" diff --git a/src/core/tsi/ssl/session_cache/ssl_session_openssl.cc b/src/core/tsi/ssl/session_cache/ssl_session_openssl.cc index ad78488415b..f44b4cb7335 100644 --- a/src/core/tsi/ssl/session_cache/ssl_session_openssl.cc +++ b/src/core/tsi/ssl/session_cache/ssl_session_openssl.cc @@ -15,17 +15,15 @@ // limitations under the License. // // -#include "absl/log/check.h" - #include +#include "absl/log/check.h" #include "src/core/tsi/ssl/session_cache/ssl_session.h" #include "src/core/util/crash.h" #ifndef OPENSSL_IS_BORINGSSL #include "absl/memory/memory.h" - #include "src/core/lib/slice/slice.h" // OpenSSL invalidates SSL_SESSION on SSL destruction making it pointless diff --git a/src/core/tsi/ssl_transport_security.cc b/src/core/tsi/ssl_transport_security.cc index 47184174351..dbc47f85f72 100644 --- a/src/core/tsi/ssl_transport_security.cc +++ b/src/core/tsi/ssl_transport_security.cc @@ -18,13 +18,12 @@ #include "src/core/tsi/ssl_transport_security.h" +#include #include #include #include -#include - #include "src/core/lib/surface/init.h" #include "src/core/tsi/transport_security_interface.h" @@ -38,9 +37,12 @@ #include #endif -#include -#include - +#include +#include +#include +#include +#include +#include #include #include // For OPENSSL_free #include @@ -50,19 +52,14 @@ #include #include +#include +#include + #include "absl/log/check.h" #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 -#include -#include - #include "src/core/lib/security/credentials/tls/grpc_tls_crl_provider.h" #include "src/core/tsi/ssl/key_logging/ssl_key_logging.h" #include "src/core/tsi/ssl/session_cache/ssl_session_cache.h" diff --git a/src/core/tsi/ssl_transport_security.h b/src/core/tsi/ssl_transport_security.h index da3b260adbd..39e07011a22 100644 --- a/src/core/tsi/ssl_transport_security.h +++ b/src/core/tsi/ssl_transport_security.h @@ -19,16 +19,14 @@ #ifndef GRPC_SRC_CORE_TSI_SSL_TRANSPORT_SECURITY_H #define GRPC_SRC_CORE_TSI_SSL_TRANSPORT_SECURITY_H -#include - -#include - -#include "absl/strings/string_view.h" - #include #include #include +#include +#include + +#include "absl/strings/string_view.h" #include "src/core/tsi/ssl/key_logging/ssl_key_logging.h" #include "src/core/tsi/ssl_transport_security_utils.h" #include "src/core/tsi/transport_security_interface.h" diff --git a/src/core/tsi/ssl_transport_security_utils.cc b/src/core/tsi/ssl_transport_security_utils.cc index d35baf4e618..5c3b828751e 100644 --- a/src/core/tsi/ssl_transport_security_utils.cc +++ b/src/core/tsi/ssl_transport_security_utils.cc @@ -18,6 +18,7 @@ #include "src/core/tsi/ssl_transport_security_utils.h" +#include #include #include #include @@ -33,9 +34,6 @@ #include "absl/log/log.h" #include "absl/status/status.h" #include "absl/status/statusor.h" - -#include - #include "src/core/tsi/transport_security_interface.h" namespace grpc_core { diff --git a/src/core/tsi/ssl_transport_security_utils.h b/src/core/tsi/ssl_transport_security_utils.h index 5676d8ff3a9..a718627e6a1 100644 --- a/src/core/tsi/ssl_transport_security_utils.h +++ b/src/core/tsi/ssl_transport_security_utils.h @@ -19,16 +19,14 @@ #ifndef GRPC_SRC_CORE_TSI_SSL_TRANSPORT_SECURITY_UTILS_H #define GRPC_SRC_CORE_TSI_SSL_TRANSPORT_SECURITY_UTILS_H +#include +#include #include #include #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/string_view.h" - -#include -#include - #include "src/core/tsi/ssl/key_logging/ssl_key_logging.h" #include "src/core/tsi/transport_security_interface.h" diff --git a/src/core/tsi/ssl_types.h b/src/core/tsi/ssl_types.h index 221636859d1..9fb89952358 100644 --- a/src/core/tsi/ssl_types.h +++ b/src/core/tsi/ssl_types.h @@ -27,9 +27,8 @@ // function // -#include - #include +#include #ifdef OPENSSL_IS_BORINGSSL #define TSI_INT_AS_SIZE(x) ((size_t)(x)) diff --git a/src/core/tsi/transport_security.cc b/src/core/tsi/transport_security.cc index 72ad63df90e..ccbf3664e93 100644 --- a/src/core/tsi/transport_security.cc +++ b/src/core/tsi/transport_security.cc @@ -18,12 +18,11 @@ #include "src/core/tsi/transport_security.h" -#include -#include - #include #include #include +#include +#include // --- tsi_result common implementation. --- diff --git a/src/core/tsi/transport_security.h b/src/core/tsi/transport_security.h index 5fce3e15768..9f4524af212 100644 --- a/src/core/tsi/transport_security.h +++ b/src/core/tsi/transport_security.h @@ -19,9 +19,8 @@ #ifndef GRPC_SRC_CORE_TSI_TRANSPORT_SECURITY_H #define GRPC_SRC_CORE_TSI_TRANSPORT_SECURITY_H -#include - #include +#include #include "src/core/lib/debug/trace.h" #include "src/core/tsi/transport_security_interface.h" diff --git a/src/core/tsi/transport_security_interface.h b/src/core/tsi/transport_security_interface.h index d0b2e03386a..a0c0ad7865f 100644 --- a/src/core/tsi/transport_security_interface.h +++ b/src/core/tsi/transport_security_interface.h @@ -19,13 +19,12 @@ #ifndef GRPC_SRC_CORE_TSI_TRANSPORT_SECURITY_INTERFACE_H #define GRPC_SRC_CORE_TSI_TRANSPORT_SECURITY_INTERFACE_H +#include #include #include #include -#include - #include "src/core/lib/debug/trace.h" // --- tsi result --- diff --git a/src/core/util/.clang-format b/src/core/util/.clang-format deleted file mode 100644 index 64387e9e515..00000000000 --- a/src/core/util/.clang-format +++ /dev/null @@ -1,53 +0,0 @@ ---- -Language: Cpp -BasedOnStyle: Google -DerivePointerAlignment: false -PointerAlignment: Left -IncludeBlocks: Regroup -IncludeCategories: - # port_platform.h is before almost everything - - Regex: '^' - Priority: -100 - # 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/src/core/util/alloc.cc b/src/core/util/alloc.cc index b89d49ff102..2ce94f9db78 100644 --- a/src/core/util/alloc.cc +++ b/src/core/util/alloc.cc @@ -16,15 +16,12 @@ // // +#include #include - #include #include #include "absl/log/check.h" - -#include - #include "src/core/util/crash.h" void* gpr_malloc(size_t size) { diff --git a/src/core/util/atm.cc b/src/core/util/atm.cc index 7e7a6834bb1..536163c110d 100644 --- a/src/core/util/atm.cc +++ b/src/core/util/atm.cc @@ -16,9 +16,8 @@ // // -#include - #include +#include #include "src/core/util/useful.h" diff --git a/src/core/util/avl.h b/src/core/util/avl.h index 23a510e949f..f5bc9b8d888 100644 --- a/src/core/util/avl.h +++ b/src/core/util/avl.h @@ -16,7 +16,6 @@ #define GRPC_SRC_CORE_UTIL_AVL_H #include - #include #include // IWYU pragma: keep diff --git a/src/core/util/backoff.cc b/src/core/util/backoff.cc index edae00cf3c8..4367a47475d 100644 --- a/src/core/util/backoff.cc +++ b/src/core/util/backoff.cc @@ -16,10 +16,10 @@ // // -#include - #include "src/core/util/backoff.h" +#include + #include namespace grpc_core { diff --git a/src/core/util/backoff.h b/src/core/util/backoff.h index 34860793647..78f0948fe8d 100644 --- a/src/core/util/backoff.h +++ b/src/core/util/backoff.h @@ -20,7 +20,6 @@ #define GRPC_SRC_CORE_UTIL_BACKOFF_H #include "absl/random/random.h" - #include "src/core/util/time.h" namespace grpc_core { diff --git a/src/core/util/bitset.h b/src/core/util/bitset.h index eec06814586..91b89d9925e 100644 --- a/src/core/util/bitset.h +++ b/src/core/util/bitset.h @@ -16,7 +16,6 @@ #define GRPC_SRC_CORE_UTIL_BITSET_H #include - #include #include diff --git a/src/core/util/chunked_vector.h b/src/core/util/chunked_vector.h index b85c7e2e7ae..d3a1d6ba930 100644 --- a/src/core/util/chunked_vector.h +++ b/src/core/util/chunked_vector.h @@ -22,7 +22,6 @@ #include #include "absl/log/check.h" - #include "src/core/lib/resource_quota/arena.h" #include "src/core/util/manual_constructor.h" diff --git a/src/core/util/crash.cc b/src/core/util/crash.cc index 9ab5a9852ba..c77412e2b96 100644 --- a/src/core/util/crash.cc +++ b/src/core/util/crash.cc @@ -12,10 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - #include "src/core/util/crash.h" +#include #include #include diff --git a/src/core/util/crash.h b/src/core/util/crash.h index 9d0b19a5d0a..ece32088903 100644 --- a/src/core/util/crash.h +++ b/src/core/util/crash.h @@ -18,7 +18,6 @@ #include #include "absl/strings/string_view.h" - #include "src/core/util/debug_location.h" namespace grpc_core { diff --git a/src/core/util/dual_ref_counted.h b/src/core/util/dual_ref_counted.h index 6f3e3c43af6..4742c62bc2c 100644 --- a/src/core/util/dual_ref_counted.h +++ b/src/core/util/dual_ref_counted.h @@ -24,7 +24,6 @@ #include "absl/log/check.h" #include "absl/log/log.h" - #include "src/core/util/debug_location.h" #include "src/core/util/down_cast.h" #include "src/core/util/orphanable.h" diff --git a/src/core/util/event_log.cc b/src/core/util/event_log.cc index 6bb1427f89e..66611150e6f 100644 --- a/src/core/util/event_log.cc +++ b/src/core/util/event_log.cc @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - #include "src/core/util/event_log.h" +#include + #include #include diff --git a/src/core/util/event_log.h b/src/core/util/event_log.h index f77967d57f2..47254348db5 100644 --- a/src/core/util/event_log.h +++ b/src/core/util/event_log.h @@ -16,7 +16,6 @@ #define GRPC_SRC_CORE_UTIL_EVENT_LOG_H #include - #include #include @@ -26,7 +25,6 @@ #include "absl/base/thread_annotations.h" #include "absl/strings/string_view.h" #include "absl/types/span.h" - #include "src/core/util/per_cpu.h" #include "src/core/util/sync.h" #include "src/core/util/time_precise.h" diff --git a/src/core/util/examine_stack.cc b/src/core/util/examine_stack.cc index 96799b2a30c..a47f12472ca 100644 --- a/src/core/util/examine_stack.cc +++ b/src/core/util/examine_stack.cc @@ -16,10 +16,10 @@ // // -#include - #include "src/core/util/examine_stack.h" +#include + namespace grpc_core { gpr_current_stack_trace_func g_current_stack_trace_provider = nullptr; diff --git a/src/core/util/fork.cc b/src/core/util/fork.cc index 35b211b42ff..27415423f1b 100644 --- a/src/core/util/fork.cc +++ b/src/core/util/fork.cc @@ -16,16 +16,15 @@ // // -#include - #include "src/core/util/fork.h" -#include - #include +#include #include #include +#include + #include "src/core/lib/config/config_vars.h" #include "src/core/lib/event_engine/thread_local.h" #include "src/core/util/no_destruct.h" diff --git a/src/core/util/gcp_metadata_query.cc b/src/core/util/gcp_metadata_query.cc index 3543e46fa0e..cc9fd80cd1b 100644 --- a/src/core/util/gcp_metadata_query.cc +++ b/src/core/util/gcp_metadata_query.cc @@ -16,10 +16,12 @@ // // -#include - #include "src/core/util/gcp_metadata_query.h" +#include +#include +#include +#include #include #include @@ -31,11 +33,6 @@ #include "absl/status/statusor.h" #include "absl/strings/str_format.h" #include "absl/strings/string_view.h" - -#include -#include -#include - #include "src/core/lib/debug/trace.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/util/ref_counted_ptr.h" diff --git a/src/core/util/gcp_metadata_query.h b/src/core/util/gcp_metadata_query.h index b2abde5cd4a..a72ff5ae4d0 100644 --- a/src/core/util/gcp_metadata_query.h +++ b/src/core/util/gcp_metadata_query.h @@ -23,7 +23,6 @@ #include "absl/functional/any_invocable.h" #include "absl/status/statusor.h" - #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/polling_entity.h" diff --git a/src/core/util/gethostname_host_name_max.cc b/src/core/util/gethostname_host_name_max.cc index def6984395d..d446d67c35c 100644 --- a/src/core/util/gethostname_host_name_max.cc +++ b/src/core/util/gethostname_host_name_max.cc @@ -23,11 +23,10 @@ #ifdef GRPC_POSIX_HOST_NAME_MAX +#include #include #include -#include - char* grpc_gethostname() { char* hostname = static_cast(gpr_malloc(HOST_NAME_MAX)); if (gethostname(hostname, HOST_NAME_MAX) != 0) { diff --git a/src/core/util/gethostname_sysconf.cc b/src/core/util/gethostname_sysconf.cc index 414a02118a0..78d38cc869b 100644 --- a/src/core/util/gethostname_sysconf.cc +++ b/src/core/util/gethostname_sysconf.cc @@ -23,9 +23,8 @@ #ifdef GRPC_POSIX_SYSCONF -#include - #include +#include char* grpc_gethostname() { size_t host_name_max = (size_t)sysconf(_SC_HOST_NAME_MAX); diff --git a/src/core/util/gpr_time.cc b/src/core/util/gpr_time.cc index ae2bd82f5bc..9368e51416b 100644 --- a/src/core/util/gpr_time.cc +++ b/src/core/util/gpr_time.cc @@ -18,17 +18,14 @@ // Generic implementation of time calls. +#include #include - +#include #include #include #include #include "absl/log/check.h" - -#include -#include - #include "src/core/util/crash.h" int gpr_time_cmp(gpr_timespec a, gpr_timespec b) { diff --git a/src/core/util/grpc_if_nametoindex.h b/src/core/util/grpc_if_nametoindex.h index ad1f3fcc224..237cd034da8 100644 --- a/src/core/util/grpc_if_nametoindex.h +++ b/src/core/util/grpc_if_nametoindex.h @@ -20,7 +20,6 @@ #define GRPC_SRC_CORE_UTIL_GRPC_IF_NAMETOINDEX_H #include - #include // Returns the interface index corresponding to the interface "name" provided. diff --git a/src/core/util/grpc_if_nametoindex_posix.cc b/src/core/util/grpc_if_nametoindex_posix.cc index 1ec5f15cc99..1d5b866e5e0 100644 --- a/src/core/util/grpc_if_nametoindex_posix.cc +++ b/src/core/util/grpc_if_nametoindex_posix.cc @@ -26,7 +26,6 @@ #include #include "absl/log/log.h" - #include "src/core/util/crash.h" #include "src/core/util/grpc_if_nametoindex.h" diff --git a/src/core/util/grpc_if_nametoindex_unsupported.cc b/src/core/util/grpc_if_nametoindex_unsupported.cc index 767f41b67f6..cabca947c60 100644 --- a/src/core/util/grpc_if_nametoindex_unsupported.cc +++ b/src/core/util/grpc_if_nametoindex_unsupported.cc @@ -23,7 +23,6 @@ #if GRPC_IF_NAMETOINDEX == 0 || !defined(GRPC_POSIX_SOCKET_IF_NAMETOINDEX) #include "absl/log/log.h" - #include "src/core/util/crash.h" #include "src/core/util/grpc_if_nametoindex.h" diff --git a/src/core/util/host_port.cc b/src/core/util/host_port.cc index dad028d0b4a..3f2608951e3 100644 --- a/src/core/util/host_port.cc +++ b/src/core/util/host_port.cc @@ -16,10 +16,9 @@ // // -#include - #include "src/core/util/host_port.h" +#include #include #include "absl/log/check.h" diff --git a/src/core/util/http_client/format_request.cc b/src/core/util/http_client/format_request.cc index 1d785835e2b..8c56935dad0 100644 --- a/src/core/util/http_client/format_request.cc +++ b/src/core/util/http_client/format_request.cc @@ -16,10 +16,10 @@ // // -#include - #include "src/core/util/http_client/format_request.h" +#include +#include #include #include @@ -31,9 +31,6 @@ #include "absl/strings/str_format.h" #include "absl/strings/str_join.h" #include "absl/strings/string_view.h" - -#include - #include "src/core/util/http_client/httpcli.h" static void fill_common_header(const grpc_http_request* request, diff --git a/src/core/util/http_client/format_request.h b/src/core/util/http_client/format_request.h index ab9d6a9d7d5..e123234ce5c 100644 --- a/src/core/util/http_client/format_request.h +++ b/src/core/util/http_client/format_request.h @@ -19,9 +19,8 @@ #ifndef GRPC_SRC_CORE_UTIL_HTTP_CLIENT_FORMAT_REQUEST_H #define GRPC_SRC_CORE_UTIL_HTTP_CLIENT_FORMAT_REQUEST_H -#include - #include +#include #include "src/core/util/http_client/parser.h" diff --git a/src/core/util/http_client/httpcli.cc b/src/core/util/http_client/httpcli.cc index c7b52e2de54..0eb2292d9b1 100644 --- a/src/core/util/http_client/httpcli.cc +++ b/src/core/util/http_client/httpcli.cc @@ -16,10 +16,12 @@ // // -#include - #include "src/core/util/http_client/httpcli.h" +#include +#include +#include +#include #include #include @@ -29,11 +31,6 @@ #include "absl/log/check.h" #include "absl/status/status.h" #include "absl/strings/str_format.h" - -#include -#include -#include - #include "src/core/handshaker/handshaker.h" #include "src/core/handshaker/handshaker_registry.h" #include "src/core/handshaker/tcp_connect/tcp_connect_handshaker.h" diff --git a/src/core/util/http_client/httpcli.h b/src/core/util/http_client/httpcli.h index b041d190e07..8857d0df014 100644 --- a/src/core/util/http_client/httpcli.h +++ b/src/core/util/http_client/httpcli.h @@ -19,8 +19,9 @@ #ifndef GRPC_SRC_CORE_UTIL_HTTP_CLIENT_HTTPCLI_H #define GRPC_SRC_CORE_UTIL_HTTP_CLIENT_HTTPCLI_H +#include +#include #include - #include #include @@ -32,10 +33,6 @@ #include "absl/status/statusor.h" #include "absl/strings/string_view.h" #include "absl/types/optional.h" - -#include -#include - #include "src/core/handshaker/handshaker.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint.h" diff --git a/src/core/util/http_client/httpcli_security_connector.cc b/src/core/util/http_client/httpcli_security_connector.cc index 45156af53d1..ac1e522bb99 100644 --- a/src/core/util/http_client/httpcli_security_connector.cc +++ b/src/core/util/http_client/httpcli_security_connector.cc @@ -16,8 +16,13 @@ // // +#include +#include +#include +#include +#include #include - +#include #include #include @@ -27,14 +32,6 @@ #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" #include "absl/types/optional.h" - -#include -#include -#include -#include -#include -#include - #include "src/core/handshaker/handshaker.h" #include "src/core/handshaker/security/security_handshaker.h" #include "src/core/lib/channel/channel_args.h" diff --git a/src/core/util/http_client/httpcli_ssl_credentials.h b/src/core/util/http_client/httpcli_ssl_credentials.h index e06668f65b5..6593d66a3d6 100644 --- a/src/core/util/http_client/httpcli_ssl_credentials.h +++ b/src/core/util/http_client/httpcli_ssl_credentials.h @@ -17,9 +17,8 @@ #ifndef GRPC_SRC_CORE_UTIL_HTTP_CLIENT_HTTPCLI_SSL_CREDENTIALS_H #define GRPC_SRC_CORE_UTIL_HTTP_CLIENT_HTTPCLI_SSL_CREDENTIALS_H -#include - #include +#include #include "src/core/util/ref_counted_ptr.h" diff --git a/src/core/util/http_client/parser.cc b/src/core/util/http_client/parser.cc index b0c7416c6c9..a490f212ee9 100644 --- a/src/core/util/http_client/parser.cc +++ b/src/core/util/http_client/parser.cc @@ -16,10 +16,10 @@ // // -#include - #include "src/core/util/http_client/parser.h" +#include +#include #include #include @@ -28,8 +28,6 @@ #include "absl/log/log.h" #include "absl/status/status.h" -#include - static char* buf2str(void* buffer, size_t length) { char* out = static_cast(gpr_malloc(length + 1)); memcpy(out, buffer, length); diff --git a/src/core/util/http_client/parser.h b/src/core/util/http_client/parser.h index 01727e0e4df..d1bdf767a89 100644 --- a/src/core/util/http_client/parser.h +++ b/src/core/util/http_client/parser.h @@ -19,13 +19,11 @@ #ifndef GRPC_SRC_CORE_UTIL_HTTP_CLIENT_PARSER_H #define GRPC_SRC_CORE_UTIL_HTTP_CLIENT_PARSER_H +#include #include - #include #include -#include - #include "src/core/lib/debug/trace.h" #include "src/core/lib/iomgr/error.h" diff --git a/src/core/util/iphone/cpu.cc b/src/core/util/iphone/cpu.cc index 26c3726fc13..820246594c7 100644 --- a/src/core/util/iphone/cpu.cc +++ b/src/core/util/iphone/cpu.cc @@ -16,9 +16,8 @@ // // -#include - #include +#include #ifdef GPR_CPU_IPHONE diff --git a/src/core/util/json/json.h b/src/core/util/json/json.h index 9dbc95e3b94..a160fd3237f 100644 --- a/src/core/util/json/json.h +++ b/src/core/util/json/json.h @@ -17,9 +17,8 @@ #ifndef GRPC_SRC_CORE_UTIL_JSON_JSON_H #define GRPC_SRC_CORE_UTIL_JSON_JSON_H -#include - #include +#include namespace grpc_core { diff --git a/src/core/util/json/json_channel_args.h b/src/core/util/json/json_channel_args.h index fe64a377faa..ad5b1c1f897 100644 --- a/src/core/util/json/json_channel_args.h +++ b/src/core/util/json/json_channel_args.h @@ -19,7 +19,6 @@ #include "absl/strings/string_view.h" #include "absl/types/optional.h" - #include "src/core/lib/channel/channel_args.h" #include "src/core/util/json/json_args.h" diff --git a/src/core/util/json/json_object_loader.cc b/src/core/util/json/json_object_loader.cc index 0d6dd4588a5..0eb496f5a87 100644 --- a/src/core/util/json/json_object_loader.cc +++ b/src/core/util/json/json_object_loader.cc @@ -12,18 +12,17 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - #include "src/core/util/json/json_object_loader.h" +#include +#include + #include #include "absl/strings/ascii.h" #include "absl/strings/str_cat.h" #include "absl/strings/strip.h" -#include - namespace grpc_core { namespace json_detail { diff --git a/src/core/util/json/json_object_loader.h b/src/core/util/json/json_object_loader.h index 1c1e8c565e1..96bd8655b91 100644 --- a/src/core/util/json/json_object_loader.h +++ b/src/core/util/json/json_object_loader.h @@ -31,7 +31,6 @@ #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" #include "absl/types/optional.h" - #include "src/core/util/json/json.h" #include "src/core/util/json/json_args.h" #include "src/core/util/no_destruct.h" diff --git a/src/core/util/json/json_reader.cc b/src/core/util/json/json_reader.cc index bda35becad4..a93bb15a97e 100644 --- a/src/core/util/json/json_reader.cc +++ b/src/core/util/json/json_reader.cc @@ -14,8 +14,8 @@ // limitations under the License. // +#include #include - #include #include @@ -34,9 +34,6 @@ #include "absl/strings/str_join.h" #include "absl/strings/string_view.h" #include "absl/types/variant.h" - -#include - #include "src/core/util/json/json.h" #include "src/core/util/match.h" diff --git a/src/core/util/json/json_reader.h b/src/core/util/json/json_reader.h index 2b16d911981..127b3808807 100644 --- a/src/core/util/json/json_reader.h +++ b/src/core/util/json/json_reader.h @@ -21,7 +21,6 @@ #include "absl/status/statusor.h" #include "absl/strings/string_view.h" - #include "src/core/util/json/json.h" namespace grpc_core { diff --git a/src/core/util/json/json_util.cc b/src/core/util/json/json_util.cc index 88fdbb6755c..181882d7316 100644 --- a/src/core/util/json/json_util.cc +++ b/src/core/util/json/json_util.cc @@ -16,10 +16,10 @@ // // -#include - #include "src/core/util/json/json_util.h" +#include + #include "src/core/util/json/json_args.h" #include "src/core/util/json/json_object_loader.h" #include "src/core/util/no_destruct.h" diff --git a/src/core/util/json/json_util.h b/src/core/util/json/json_util.h index a8abf9efb88..7cb5b8b1103 100644 --- a/src/core/util/json/json_util.h +++ b/src/core/util/json/json_util.h @@ -31,7 +31,6 @@ #include "absl/strings/numbers.h" #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" - #include "src/core/lib/iomgr/error.h" #include "src/core/util/json/json.h" #include "src/core/util/time.h" diff --git a/src/core/util/json/json_writer.cc b/src/core/util/json/json_writer.cc index 009b31a4afc..37721f95228 100644 --- a/src/core/util/json/json_writer.cc +++ b/src/core/util/json/json_writer.cc @@ -17,7 +17,6 @@ // #include - #include #include @@ -27,7 +26,6 @@ #include #include "absl/strings/string_view.h" - #include "src/core/util/json/json.h" namespace grpc_core { diff --git a/src/core/util/latent_see.cc b/src/core/util/latent_see.cc index c8331144407..277ed57b3c5 100644 --- a/src/core/util/latent_see.cc +++ b/src/core/util/latent_see.cc @@ -24,7 +24,6 @@ #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" #include "absl/types/optional.h" - #include "src/core/util/ring_buffer.h" #include "src/core/util/sync.h" diff --git a/src/core/util/latent_see.h b/src/core/util/latent_see.h index 1ace01110a6..f801c3c8685 100644 --- a/src/core/util/latent_see.h +++ b/src/core/util/latent_see.h @@ -34,7 +34,6 @@ #include "absl/functional/any_invocable.h" #include "absl/log/log.h" #include "absl/strings/string_view.h" - #include "src/core/util/per_cpu.h" #include "src/core/util/ring_buffer.h" #include "src/core/util/sync.h" diff --git a/src/core/util/linux/cpu.cc b/src/core/util/linux/cpu.cc index 61f1d5d58ff..41730292e89 100644 --- a/src/core/util/linux/cpu.cc +++ b/src/core/util/linux/cpu.cc @@ -25,15 +25,13 @@ #ifdef GPR_CPU_LINUX #include +#include +#include #include #include #include #include "absl/log/log.h" - -#include -#include - #include "src/core/util/crash.h" #include "src/core/util/strerror.h" diff --git a/src/core/util/load_file.cc b/src/core/util/load_file.cc index 91ec375ba65..2fda3c55e62 100644 --- a/src/core/util/load_file.cc +++ b/src/core/util/load_file.cc @@ -12,11 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - #include "src/core/util/load_file.h" #include +#include +#include +#include #include #include @@ -24,9 +25,6 @@ #include "absl/status/status.h" #include "absl/strings/str_cat.h" -#include -#include - namespace grpc_core { // Loads the content of a file into a slice. add_null_terminator will add a NULL diff --git a/src/core/util/load_file.h b/src/core/util/load_file.h index 5d3f7aa784f..980e0c11af6 100644 --- a/src/core/util/load_file.h +++ b/src/core/util/load_file.h @@ -20,7 +20,6 @@ #include #include "absl/status/statusor.h" - #include "src/core/lib/slice/slice.h" namespace grpc_core { diff --git a/src/core/util/log.cc b/src/core/util/log.cc index cc353fcbd64..fb0119947c3 100644 --- a/src/core/util/log.cc +++ b/src/core/util/log.cc @@ -16,10 +16,12 @@ // // -#include - #include "absl/log/log.h" +#include +#include +#include +#include #include #include @@ -27,11 +29,6 @@ #include "absl/log/globals.h" #include "absl/strings/match.h" #include "absl/strings/str_cat.h" - -#include -#include -#include - #include "src/core/lib/config/config_vars.h" #include "src/core/util/crash.h" #include "src/core/util/string.h" diff --git a/src/core/util/manual_constructor.h b/src/core/util/manual_constructor.h index 38d4695753f..10bf8155827 100644 --- a/src/core/util/manual_constructor.h +++ b/src/core/util/manual_constructor.h @@ -22,7 +22,6 @@ // manually construct a region of memory with some type #include - #include #include diff --git a/src/core/util/match.h b/src/core/util/match.h index 69b91f2fc9b..32d1445f9b3 100644 --- a/src/core/util/match.h +++ b/src/core/util/match.h @@ -20,7 +20,6 @@ #include #include "absl/types/variant.h" - #include "src/core/util/overload.h" namespace grpc_core { diff --git a/src/core/util/matchers.cc b/src/core/util/matchers.cc index a0a8b786bec..d4f6c3bd7e1 100644 --- a/src/core/util/matchers.cc +++ b/src/core/util/matchers.cc @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - #include "src/core/util/matchers.h" +#include + #include #include "absl/status/status.h" diff --git a/src/core/util/matchers.h b/src/core/util/matchers.h index 69992106b45..922e0632bc7 100644 --- a/src/core/util/matchers.h +++ b/src/core/util/matchers.h @@ -16,7 +16,6 @@ #define GRPC_SRC_CORE_UTIL_MATCHERS_H #include - #include #include diff --git a/src/core/util/memory.h b/src/core/util/memory.h index eae0aaa4b83..9ced5cf2f64 100644 --- a/src/core/util/memory.h +++ b/src/core/util/memory.h @@ -19,13 +19,12 @@ #ifndef GRPC_SRC_CORE_UTIL_MEMORY_H #define GRPC_SRC_CORE_UTIL_MEMORY_H +#include #include #include #include -#include - namespace grpc_core { class DefaultDeleteChar { diff --git a/src/core/util/mpscq.cc b/src/core/util/mpscq.cc index 45258346443..fd998e8c905 100644 --- a/src/core/util/mpscq.cc +++ b/src/core/util/mpscq.cc @@ -16,10 +16,10 @@ // // -#include - #include "src/core/util/mpscq.h" +#include + namespace grpc_core { // diff --git a/src/core/util/mpscq.h b/src/core/util/mpscq.h index b4d48f78c3d..44502a0b352 100644 --- a/src/core/util/mpscq.h +++ b/src/core/util/mpscq.h @@ -24,7 +24,6 @@ #include #include "absl/log/check.h" - #include "src/core/util/sync.h" namespace grpc_core { diff --git a/src/core/util/msys/tmpfile.cc b/src/core/util/msys/tmpfile.cc index 69eb209b149..5d7cf6484c6 100644 --- a/src/core/util/msys/tmpfile.cc +++ b/src/core/util/msys/tmpfile.cc @@ -20,14 +20,13 @@ #ifdef GPR_MSYS_TMPFILE +#include +#include #include #include #include #include -#include -#include - #include "src/core/util/crash.h" #include "src/core/util/string_windows.h" #include "src/core/util/tmpfile.h" diff --git a/src/core/util/notification.h b/src/core/util/notification.h index 45acff0fda7..4fca3d26cb5 100644 --- a/src/core/util/notification.h +++ b/src/core/util/notification.h @@ -19,7 +19,6 @@ #include "absl/time/clock.h" #include "absl/time/time.h" - #include "src/core/util/sync.h" namespace grpc_core { diff --git a/src/core/util/per_cpu.cc b/src/core/util/per_cpu.cc index 8412f399173..13098726bc7 100644 --- a/src/core/util/per_cpu.cc +++ b/src/core/util/per_cpu.cc @@ -12,11 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - #include "src/core/util/per_cpu.h" #include +#include #include "src/core/util/useful.h" diff --git a/src/core/util/per_cpu.h b/src/core/util/per_cpu.h index 492ea2832b4..69648aa57fe 100644 --- a/src/core/util/per_cpu.h +++ b/src/core/util/per_cpu.h @@ -15,8 +15,8 @@ #ifndef GRPC_SRC_CORE_UTIL_PER_CPU_H #define GRPC_SRC_CORE_UTIL_PER_CPU_H +#include #include - #include #include @@ -24,8 +24,6 @@ #include #include -#include - // Sharded collections of objects // This used to be per-cpu, now it's much less so - but still a way to limit // contention. diff --git a/src/core/util/posix/cpu.cc b/src/core/util/posix/cpu.cc index 93e6cce0614..92a9e45635e 100644 --- a/src/core/util/posix/cpu.cc +++ b/src/core/util/posix/cpu.cc @@ -21,15 +21,13 @@ #if defined(GPR_CPU_POSIX) #include +#include +#include #include #include #include #include "absl/log/log.h" - -#include -#include - #include "src/core/util/crash.h" #include "src/core/util/useful.h" diff --git a/src/core/util/posix/stat.cc b/src/core/util/posix/stat.cc index e4c870f8dbd..5de6f456321 100644 --- a/src/core/util/posix/stat.cc +++ b/src/core/util/posix/stat.cc @@ -29,7 +29,6 @@ #include "absl/log/check.h" #include "absl/log/log.h" - #include "src/core/util/stat.h" #include "src/core/util/strerror.h" diff --git a/src/core/util/posix/string.cc b/src/core/util/posix/string.cc index 51a16d33cba..f7fad2b9f93 100644 --- a/src/core/util/posix/string.cc +++ b/src/core/util/posix/string.cc @@ -20,13 +20,12 @@ #ifdef GPR_POSIX_STRING +#include +#include #include #include #include -#include -#include - int gpr_asprintf(char** strp, const char* format, ...) { va_list args; int ret; diff --git a/src/core/util/posix/sync.cc b/src/core/util/posix/sync.cc index 255eec517a3..5529ee05c23 100644 --- a/src/core/util/posix/sync.cc +++ b/src/core/util/posix/sync.cc @@ -22,14 +22,12 @@ !defined(GPR_CUSTOM_SYNC) #include -#include - -#include "absl/log/check.h" - #include #include #include +#include +#include "absl/log/check.h" #include "src/core/util/crash.h" void gpr_mu_init(gpr_mu* mu) { diff --git a/src/core/util/posix/thd.cc b/src/core/util/posix/thd.cc index 6987e3ff2cd..764882dd676 100644 --- a/src/core/util/posix/thd.cc +++ b/src/core/util/posix/thd.cc @@ -19,7 +19,6 @@ // Posix implementation for gpr threads. #include - #include #include @@ -27,6 +26,9 @@ #ifdef GPR_POSIX_SYNC +#include +#include +#include #include #include #include @@ -34,11 +36,6 @@ #include "absl/log/check.h" #include "absl/log/log.h" - -#include -#include -#include - #include "src/core/util/crash.h" #include "src/core/util/fork.h" #include "src/core/util/strerror.h" diff --git a/src/core/util/posix/time.cc b/src/core/util/posix/time.cc index a425a4721c6..ff444682101 100644 --- a/src/core/util/posix/time.cc +++ b/src/core/util/posix/time.cc @@ -28,11 +28,10 @@ #ifdef __linux__ #include #endif -#include "absl/log/check.h" - #include #include +#include "absl/log/check.h" #include "src/core/util/crash.h" static struct timespec timespec_from_gpr(gpr_timespec gts) { diff --git a/src/core/util/posix/tmpfile.cc b/src/core/util/posix/tmpfile.cc index 51b900a3527..832391f1599 100644 --- a/src/core/util/posix/tmpfile.cc +++ b/src/core/util/posix/tmpfile.cc @@ -21,16 +21,14 @@ #ifdef GPR_POSIX_TMPFILE #include +#include +#include #include #include #include #include "absl/log/check.h" #include "absl/log/log.h" - -#include -#include - #include "src/core/util/crash.h" #include "src/core/util/strerror.h" #include "src/core/util/string.h" diff --git a/src/core/util/random_early_detection.cc b/src/core/util/random_early_detection.cc index 882a7d530e9..d011ca25dc8 100644 --- a/src/core/util/random_early_detection.cc +++ b/src/core/util/random_early_detection.cc @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - #include "src/core/util/random_early_detection.h" +#include + #include "absl/random/distributions.h" namespace grpc_core { diff --git a/src/core/util/random_early_detection.h b/src/core/util/random_early_detection.h index fb2ea8f51a4..6ff1c67fd12 100644 --- a/src/core/util/random_early_detection.h +++ b/src/core/util/random_early_detection.h @@ -16,7 +16,6 @@ #define GRPC_SRC_CORE_UTIL_RANDOM_EARLY_DETECTION_H #include - #include #include diff --git a/src/core/util/ref_counted.h b/src/core/util/ref_counted.h index e32472d1c80..413e5d4f42a 100644 --- a/src/core/util/ref_counted.h +++ b/src/core/util/ref_counted.h @@ -27,7 +27,6 @@ #include "absl/log/check.h" #include "absl/log/log.h" - #include "src/core/util/atomic_utils.h" #include "src/core/util/debug_location.h" #include "src/core/util/down_cast.h" diff --git a/src/core/util/ref_counted_ptr.h b/src/core/util/ref_counted_ptr.h index 28829bc0d20..601cc45e2dc 100644 --- a/src/core/util/ref_counted_ptr.h +++ b/src/core/util/ref_counted_ptr.h @@ -20,7 +20,6 @@ #define GRPC_SRC_CORE_UTIL_REF_COUNTED_PTR_H #include - #include #include @@ -28,7 +27,6 @@ #include #include "absl/hash/hash.h" - #include "src/core/util/debug_location.h" #include "src/core/util/down_cast.h" diff --git a/src/core/util/ref_counted_string.cc b/src/core/util/ref_counted_string.cc index 2b3f6f66b36..6c2945adb9c 100644 --- a/src/core/util/ref_counted_string.cc +++ b/src/core/util/ref_counted_string.cc @@ -14,16 +14,14 @@ // limitations under the License. // -#include - #include "src/core/util/ref_counted_string.h" +#include +#include #include #include -#include - namespace grpc_core { RefCountedPtr RefCountedString::Make(absl::string_view src) { diff --git a/src/core/util/ref_counted_string.h b/src/core/util/ref_counted_string.h index ed3e93089ae..936d9c5742f 100644 --- a/src/core/util/ref_counted_string.h +++ b/src/core/util/ref_counted_string.h @@ -18,13 +18,11 @@ #define GRPC_SRC_CORE_UTIL_REF_COUNTED_STRING_H #include - #include #include #include "absl/strings/string_view.h" - #include "src/core/util/ref_counted.h" #include "src/core/util/ref_counted_ptr.h" diff --git a/src/core/util/spinlock.h b/src/core/util/spinlock.h index b95d324e988..fdbce0cad6d 100644 --- a/src/core/util/spinlock.h +++ b/src/core/util/spinlock.h @@ -19,9 +19,8 @@ #ifndef GRPC_SRC_CORE_UTIL_SPINLOCK_H #define GRPC_SRC_CORE_UTIL_SPINLOCK_H -#include - #include +#include // Simple spinlock. No backoff strategy, gpr_spinlock_lock is almost always // a concurrency code smell. Code must _never_ block while holding a spinlock diff --git a/src/core/util/stat.h b/src/core/util/stat.h index e947c0a5de9..d3b5d4a6638 100644 --- a/src/core/util/stat.h +++ b/src/core/util/stat.h @@ -18,7 +18,6 @@ #define GRPC_SRC_CORE_UTIL_STAT_H #include - #include #include "absl/status/status.h" diff --git a/src/core/util/status_helper.cc b/src/core/util/status_helper.cc index 339500e2b0c..3d69b20fde5 100644 --- a/src/core/util/status_helper.cc +++ b/src/core/util/status_helper.cc @@ -16,10 +16,9 @@ // // -#include - #include "src/core/util/status_helper.h" +#include #include #include @@ -34,11 +33,10 @@ #include "absl/time/clock.h" #include "google/protobuf/any.upb.h" #include "google/rpc/status.upb.h" -#include "upb/base/string_view.h" -#include "upb/mem/arena.hpp" - #include "src/core/lib/slice/percent_encoding.h" #include "src/core/lib/slice/slice.h" +#include "upb/base/string_view.h" +#include "upb/mem/arena.hpp" namespace grpc_core { diff --git a/src/core/util/status_helper.h b/src/core/util/status_helper.h index e2e089ce25e..d7fb53da7a5 100644 --- a/src/core/util/status_helper.h +++ b/src/core/util/status_helper.h @@ -20,7 +20,6 @@ #define GRPC_SRC_CORE_UTIL_STATUS_HELPER_H #include - #include #include @@ -30,7 +29,6 @@ #include "absl/strings/string_view.h" #include "absl/time/time.h" #include "absl/types/optional.h" - #include "src/core/util/debug_location.h" extern "C" { diff --git a/src/core/util/strerror.cc b/src/core/util/strerror.cc index 868acee2c06..06ad2ea092a 100644 --- a/src/core/util/strerror.cc +++ b/src/core/util/strerror.cc @@ -12,10 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - #include "src/core/util/strerror.h" +#include #include #include "absl/strings/str_format.h" diff --git a/src/core/util/string.cc b/src/core/util/string.cc index 3048a432a63..036a23afbb2 100644 --- a/src/core/util/string.cc +++ b/src/core/util/string.cc @@ -16,11 +16,12 @@ // // -#include - #include "src/core/util/string.h" #include +#include +#include +#include #include #include #include @@ -30,10 +31,6 @@ #include "absl/strings/str_cat.h" #include "absl/time/time.h" - -#include -#include - #include "src/core/util/crash.h" #include "src/core/util/useful.h" diff --git a/src/core/util/string.h b/src/core/util/string.h index 66f3d0f8344..018980a2a89 100644 --- a/src/core/util/string.h +++ b/src/core/util/string.h @@ -20,14 +20,12 @@ #define GRPC_SRC_CORE_UTIL_STRING_H #include - +#include #include #include #include -#include - // String utility functions // Flags for gpr_dump function. diff --git a/src/core/util/subprocess_posix.cc b/src/core/util/subprocess_posix.cc index b421d50549c..ef4512b3734 100644 --- a/src/core/util/subprocess_posix.cc +++ b/src/core/util/subprocess_posix.cc @@ -21,6 +21,7 @@ #ifdef GPR_POSIX_SUBPROCESS #include +#include #include #include #include @@ -31,9 +32,6 @@ #include "absl/log/check.h" #include "absl/log/log.h" #include "absl/strings/substitute.h" - -#include - #include "src/core/util/memory.h" #include "src/core/util/strerror.h" #include "src/core/util/subprocess.h" diff --git a/src/core/util/subprocess_windows.cc b/src/core/util/subprocess_windows.cc index c8760ec3ee7..71fd6497e78 100644 --- a/src/core/util/subprocess_windows.cc +++ b/src/core/util/subprocess_windows.cc @@ -20,6 +20,7 @@ #ifdef GPR_WINDOWS_SUBPROCESS +#include #include #include #include @@ -27,9 +28,6 @@ #include "absl/log/log.h" #include "absl/strings/str_join.h" #include "absl/types/span.h" - -#include - #include "src/core/util/crash.h" #include "src/core/util/string.h" #include "src/core/util/subprocess.h" diff --git a/src/core/util/sync.cc b/src/core/util/sync.cc index dd3db7e6423..7a5f24409ee 100644 --- a/src/core/util/sync.cc +++ b/src/core/util/sync.cc @@ -18,15 +18,13 @@ // Generic implementation of synchronization primitives. -#include - #include - -#include "absl/log/check.h" - #include +#include #include +#include "absl/log/check.h" + // Number of mutexes to allocate for events, to avoid lock contention. // Should be a prime. enum { event_sync_partitions = 31 }; diff --git a/src/core/util/sync.h b/src/core/util/sync.h index c85d9e2ad77..77d1a54206f 100644 --- a/src/core/util/sync.h +++ b/src/core/util/sync.h @@ -20,13 +20,12 @@ #define GRPC_SRC_CORE_UTIL_SYNC_H #include +#include #include "absl/base/thread_annotations.h" #include "absl/log/check.h" #include "absl/synchronization/mutex.h" -#include - #ifndef GPR_ABSEIL_SYNC #include "src/core/util/time_util.h" #endif diff --git a/src/core/util/sync_abseil.cc b/src/core/util/sync_abseil.cc index 9e837022532..688e4665612 100644 --- a/src/core/util/sync_abseil.cc +++ b/src/core/util/sync_abseil.cc @@ -21,17 +21,15 @@ #if defined(GPR_ABSEIL_SYNC) && !defined(GPR_CUSTOM_SYNC) #include +#include +#include +#include #include #include "absl/base/call_once.h" #include "absl/synchronization/mutex.h" #include "absl/time/clock.h" #include "absl/time/time.h" - -#include -#include -#include - #include "src/core/util/crash.h" #include "src/core/util/time_util.h" diff --git a/src/core/util/table.h b/src/core/util/table.h index bd35c4963a8..d2ea9d42a97 100644 --- a/src/core/util/table.h +++ b/src/core/util/table.h @@ -16,7 +16,6 @@ #define GRPC_SRC_CORE_UTIL_TABLE_H #include - #include #include @@ -26,7 +25,6 @@ #include "absl/meta/type_traits.h" #include "absl/utility/utility.h" - #include "src/core/util/bitset.h" namespace grpc_core { diff --git a/src/core/util/tchar.cc b/src/core/util/tchar.cc index f558b4cbc1d..ee9634be76a 100644 --- a/src/core/util/tchar.cc +++ b/src/core/util/tchar.cc @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - #include "src/core/util/tchar.h" +#include + #ifdef GPR_WINDOWS namespace grpc_core { diff --git a/src/core/util/thd.h b/src/core/util/thd.h index ec0ae599f7f..61f229af97e 100644 --- a/src/core/util/thd.h +++ b/src/core/util/thd.h @@ -22,7 +22,7 @@ /// Internal thread interface. #include - +#include #include #include @@ -31,8 +31,6 @@ #include "absl/functional/any_invocable.h" #include "absl/log/check.h" -#include - namespace grpc_core { namespace internal { diff --git a/src/core/util/time.cc b/src/core/util/time.cc index c5f899bc473..a15242f3b03 100644 --- a/src/core/util/time.cc +++ b/src/core/util/time.cc @@ -12,10 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - #include "src/core/util/time.h" +#include +#include + #include #include #include @@ -25,9 +26,6 @@ #include "absl/log/check.h" #include "absl/log/log.h" #include "absl/strings/str_format.h" - -#include - #include "src/core/util/no_destruct.h" // IWYU pragma: no_include diff --git a/src/core/util/time.h b/src/core/util/time.h index cf242eba1cb..c51b3cf63ed 100644 --- a/src/core/util/time.h +++ b/src/core/util/time.h @@ -15,8 +15,9 @@ #ifndef GRPC_SRC_CORE_UTIL_TIME_H #define GRPC_SRC_CORE_UTIL_TIME_H +#include #include - +#include #include #include @@ -24,10 +25,6 @@ #include #include "absl/types/optional.h" - -#include -#include - #include "src/core/util/time_precise.h" #include "src/core/util/useful.h" diff --git a/src/core/util/time_averaged_stats.cc b/src/core/util/time_averaged_stats.cc index dc6db49a011..caf52f72751 100644 --- a/src/core/util/time_averaged_stats.cc +++ b/src/core/util/time_averaged_stats.cc @@ -16,10 +16,10 @@ // // -#include - #include "src/core/util/time_averaged_stats.h" +#include + namespace grpc_core { TimeAveragedStats::TimeAveragedStats(double init_avg, double regress_weight, diff --git a/src/core/util/time_precise.cc b/src/core/util/time_precise.cc index 5274789c70e..0fe62929ef2 100644 --- a/src/core/util/time_precise.cc +++ b/src/core/util/time_precise.cc @@ -23,12 +23,11 @@ #include #endif +#include + #include #include "absl/log/log.h" - -#include - #include "src/core/util/crash.h" #include "src/core/util/time_precise.h" diff --git a/src/core/util/time_precise.h b/src/core/util/time_precise.h index 9decb6d4cfd..285b710ab0a 100644 --- a/src/core/util/time_precise.h +++ b/src/core/util/time_precise.h @@ -20,7 +20,6 @@ #define GRPC_SRC_CORE_UTIL_TIME_PRECISE_H #include - #include // Depending on the platform gpr_get_cycle_counter() can have a resolution as diff --git a/src/core/util/time_util.cc b/src/core/util/time_util.cc index 4730e79184a..d20dca30e52 100644 --- a/src/core/util/time_util.cc +++ b/src/core/util/time_util.cc @@ -14,17 +14,15 @@ // limitations under the License. // -#include - #include "src/core/util/time_util.h" +#include +#include #include #include #include "absl/log/check.h" -#include - namespace grpc_core { gpr_timespec ToGprTimeSpec(absl::Duration duration) { diff --git a/src/core/util/time_util.h b/src/core/util/time_util.h index 61ad6d11a5b..29e599e5c96 100644 --- a/src/core/util/time_util.h +++ b/src/core/util/time_util.h @@ -18,11 +18,10 @@ #define GRPC_SRC_CORE_UTIL_TIME_UTIL_H #include +#include #include "absl/time/time.h" -#include - namespace grpc_core { // Converts absl::Duration to gpr_timespec(GPR_TIMESPAN) diff --git a/src/core/util/tmpfile.h b/src/core/util/tmpfile.h index d1ed3d0558c..ecda0c0611a 100644 --- a/src/core/util/tmpfile.h +++ b/src/core/util/tmpfile.h @@ -20,7 +20,6 @@ #define GRPC_SRC_CORE_UTIL_TMPFILE_H #include - #include // Creates a temporary file from a prefix. diff --git a/src/core/util/unique_type_name.h b/src/core/util/unique_type_name.h index 29e63d8404f..fa723dc8d0c 100644 --- a/src/core/util/unique_type_name.h +++ b/src/core/util/unique_type_name.h @@ -22,7 +22,6 @@ #include #include "absl/strings/string_view.h" - #include "src/core/util/useful.h" // Provides a type name that is unique by instance rather than by diff --git a/src/core/util/uri.cc b/src/core/util/uri.cc index 82fb29d46e1..e6a94e57173 100644 --- a/src/core/util/uri.cc +++ b/src/core/util/uri.cc @@ -14,11 +14,10 @@ // limitations under the License. // -#include - #include "src/core/util/uri.h" #include +#include #include #include diff --git a/src/core/util/uuid_v4.cc b/src/core/util/uuid_v4.cc index b0847a8d33e..7cbf7cb7020 100644 --- a/src/core/util/uuid_v4.cc +++ b/src/core/util/uuid_v4.cc @@ -16,10 +16,10 @@ // // -#include - #include "src/core/util/uuid_v4.h" +#include + #include "absl/strings/str_format.h" namespace grpc_core { diff --git a/src/core/util/uuid_v4.h b/src/core/util/uuid_v4.h index e7bf52c6409..84e8e576780 100644 --- a/src/core/util/uuid_v4.h +++ b/src/core/util/uuid_v4.h @@ -20,7 +20,6 @@ #define GRPC_SRC_CORE_UTIL_UUID_V4_H #include - #include #include diff --git a/src/core/util/validation_errors.cc b/src/core/util/validation_errors.cc index 047ea420161..5ab09f6d76d 100644 --- a/src/core/util/validation_errors.cc +++ b/src/core/util/validation_errors.cc @@ -12,10 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - #include "src/core/util/validation_errors.h" +#include #include #include diff --git a/src/core/util/validation_errors.h b/src/core/util/validation_errors.h index 5c075c12cce..4038d927c9a 100644 --- a/src/core/util/validation_errors.h +++ b/src/core/util/validation_errors.h @@ -16,7 +16,6 @@ #define GRPC_SRC_CORE_UTIL_VALIDATION_ERRORS_H #include - #include #include diff --git a/src/core/util/windows/directory_reader.cc b/src/core/util/windows/directory_reader.cc index 02c7916798c..9ae07c6357b 100644 --- a/src/core/util/windows/directory_reader.cc +++ b/src/core/util/windows/directory_reader.cc @@ -29,7 +29,6 @@ #include "absl/status/statusor.h" #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" - #include "src/core/util/directory_reader.h" namespace grpc_core { diff --git a/src/core/util/windows/stat.cc b/src/core/util/windows/stat.cc index 8a08d087a5e..5ac15a407cf 100644 --- a/src/core/util/windows/stat.cc +++ b/src/core/util/windows/stat.cc @@ -24,7 +24,6 @@ #include "absl/log/check.h" #include "absl/log/log.h" - #include "src/core/util/crash.h" #include "src/core/util/stat.h" #include "src/core/util/strerror.h" diff --git a/src/core/util/windows/string.cc b/src/core/util/windows/string.cc index c95c4b3fb16..abe4d0a9867 100644 --- a/src/core/util/windows/string.cc +++ b/src/core/util/windows/string.cc @@ -22,13 +22,12 @@ #ifdef GPR_WINDOWS_STRING +#include +#include #include #include #include -#include -#include - #include "src/core/util/string.h" int gpr_asprintf(char** strp, const char* format, ...) { diff --git a/src/core/util/windows/string_util.cc b/src/core/util/windows/string_util.cc index 105ce0636c9..3cc97fbc2c0 100644 --- a/src/core/util/windows/string_util.cc +++ b/src/core/util/windows/string_util.cc @@ -24,17 +24,15 @@ // Some platforms (namely msys) need wchar to be included BEFORE // anything else, especially strsafe.h. -#include - +#include +#include +#include #include #include #include #include #include - -#include -#include -#include +#include #include "src/core/util/string.h" #include "src/core/util/tchar.h" diff --git a/src/core/util/windows/sync.cc b/src/core/util/windows/sync.cc index 84c06503e2f..593037c5019 100644 --- a/src/core/util/windows/sync.cc +++ b/src/core/util/windows/sync.cc @@ -23,11 +23,10 @@ #if defined(GPR_WINDOWS) && !defined(GPR_ABSEIL_SYNC) && \ !defined(GPR_CUSTOM_SYNC) -#include "absl/log/check.h" - #include #include +#include "absl/log/check.h" #include "src/core/util/crash.h" void gpr_mu_init(gpr_mu* mu) { diff --git a/src/core/util/windows/thd.cc b/src/core/util/windows/thd.cc index 0423e21baa2..464d8a6d06c 100644 --- a/src/core/util/windows/thd.cc +++ b/src/core/util/windows/thd.cc @@ -21,16 +21,14 @@ #ifdef GPR_WINDOWS -#include - -#include "absl/log/check.h" -#include "absl/log/log.h" - #include #include #include #include +#include +#include "absl/log/check.h" +#include "absl/log/log.h" #include "src/core/util/crash.h" #include "src/core/util/memory.h" #include "src/core/util/thd.h" diff --git a/src/core/util/windows/time.cc b/src/core/util/windows/time.cc index 62151a2b6a5..696083856a3 100644 --- a/src/core/util/windows/time.cc +++ b/src/core/util/windows/time.cc @@ -22,14 +22,12 @@ #ifdef GPR_WINDOWS_TIME +#include #include #include #include #include "absl/log/check.h" - -#include - #include "src/core/util/crash.h" #include "src/core/util/time_precise.h" diff --git a/src/core/util/windows/tmpfile.cc b/src/core/util/windows/tmpfile.cc index 44119406582..9acbf77e57c 100644 --- a/src/core/util/windows/tmpfile.cc +++ b/src/core/util/windows/tmpfile.cc @@ -20,14 +20,13 @@ #ifdef GPR_WINDOWS_TMPFILE +#include +#include #include #include #include #include -#include -#include - #include "src/core/util/crash.h" #include "src/core/util/tchar.h" #include "src/core/util/tmpfile.h" diff --git a/src/core/util/work_serializer.cc b/src/core/util/work_serializer.cc index 35c509f5828..c9e0b1d9f45 100644 --- a/src/core/util/work_serializer.cc +++ b/src/core/util/work_serializer.cc @@ -14,10 +14,10 @@ // limitations under the License. // -#include - #include "src/core/util/work_serializer.h" +#include +#include #include #include @@ -31,9 +31,6 @@ #include "absl/container/inlined_vector.h" #include "absl/log/check.h" #include "absl/log/log.h" - -#include - #include "src/core/lib/debug/trace.h" #include "src/core/lib/experiments/experiments.h" #include "src/core/lib/iomgr/exec_ctx.h" diff --git a/src/core/util/work_serializer.h b/src/core/util/work_serializer.h index 780fa4fb05e..d7bc41554d3 100644 --- a/src/core/util/work_serializer.h +++ b/src/core/util/work_serializer.h @@ -17,15 +17,13 @@ #ifndef GRPC_SRC_CORE_UTIL_WORK_SERIALIZER_H #define GRPC_SRC_CORE_UTIL_WORK_SERIALIZER_H +#include #include #include #include #include "absl/base/thread_annotations.h" - -#include - #include "src/core/util/debug_location.h" #include "src/core/util/orphanable.h" diff --git a/src/core/xds/grpc/certificate_provider_store.cc b/src/core/xds/grpc/certificate_provider_store.cc index aef0c6c0783..1e7b9199d61 100644 --- a/src/core/xds/grpc/certificate_provider_store.cc +++ b/src/core/xds/grpc/certificate_provider_store.cc @@ -18,12 +18,11 @@ #include "src/core/xds/grpc/certificate_provider_store.h" -#include "absl/log/log.h" -#include "absl/strings/str_cat.h" - #include #include +#include "absl/log/log.h" +#include "absl/strings/str_cat.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/security/certificate_provider/certificate_provider_registry.h" diff --git a/src/core/xds/grpc/certificate_provider_store.h b/src/core/xds/grpc/certificate_provider_store.h index 239d5ca74af..f5b01ca8a44 100644 --- a/src/core/xds/grpc/certificate_provider_store.h +++ b/src/core/xds/grpc/certificate_provider_store.h @@ -19,16 +19,15 @@ #ifndef GRPC_SRC_CORE_XDS_GRPC_CERTIFICATE_PROVIDER_STORE_H #define GRPC_SRC_CORE_XDS_GRPC_CERTIFICATE_PROVIDER_STORE_H +#include +#include + #include #include #include #include "absl/base/thread_annotations.h" #include "absl/strings/string_view.h" - -#include -#include - #include "src/core/lib/security/certificate_provider/certificate_provider_factory.h" #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.h" #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h" diff --git a/src/core/xds/grpc/file_watcher_certificate_provider_factory.cc b/src/core/xds/grpc/file_watcher_certificate_provider_factory.cc index bbb76cfc22b..dd52e46d8e6 100644 --- a/src/core/xds/grpc/file_watcher_certificate_provider_factory.cc +++ b/src/core/xds/grpc/file_watcher_certificate_provider_factory.cc @@ -18,6 +18,9 @@ #include "src/core/xds/grpc/file_watcher_certificate_provider_factory.h" +#include +#include + #include #include #include @@ -26,10 +29,6 @@ #include "absl/log/log.h" #include "absl/strings/str_format.h" #include "absl/strings/str_join.h" - -#include -#include - #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h" diff --git a/src/core/xds/grpc/file_watcher_certificate_provider_factory.h b/src/core/xds/grpc/file_watcher_certificate_provider_factory.h index 493e993648c..ab50c1844f4 100644 --- a/src/core/xds/grpc/file_watcher_certificate_provider_factory.h +++ b/src/core/xds/grpc/file_watcher_certificate_provider_factory.h @@ -19,13 +19,12 @@ #ifndef GRPC_SRC_CORE_XDS_GRPC_FILE_WATCHER_CERTIFICATE_PROVIDER_FACTORY_H #define GRPC_SRC_CORE_XDS_GRPC_FILE_WATCHER_CERTIFICATE_PROVIDER_FACTORY_H -#include - -#include "absl/strings/string_view.h" - #include #include +#include + +#include "absl/strings/string_view.h" #include "src/core/lib/security/certificate_provider/certificate_provider_factory.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_args.h" diff --git a/src/core/xds/grpc/xds_audit_logger_registry.cc b/src/core/xds/grpc/xds_audit_logger_registry.cc index ef041a4c933..a57e4295d89 100644 --- a/src/core/xds/grpc/xds_audit_logger_registry.cc +++ b/src/core/xds/grpc/xds_audit_logger_registry.cc @@ -16,6 +16,8 @@ #include "src/core/xds/grpc/xds_audit_logger_registry.h" +#include + #include #include @@ -25,9 +27,6 @@ #include "absl/types/optional.h" #include "envoy/config/core/v3/extension.upb.h" #include "envoy/config/rbac/v3/rbac.upb.h" - -#include - #include "src/core/lib/security/authorization/audit_logging.h" #include "src/core/util/match.h" #include "src/core/util/validation_errors.h" diff --git a/src/core/xds/grpc/xds_audit_logger_registry.h b/src/core/xds/grpc/xds_audit_logger_registry.h index 92f7aadd302..cb35fd53d86 100644 --- a/src/core/xds/grpc/xds_audit_logger_registry.h +++ b/src/core/xds/grpc/xds_audit_logger_registry.h @@ -17,14 +17,13 @@ #ifndef GRPC_SRC_CORE_XDS_GRPC_XDS_AUDIT_LOGGER_REGISTRY_H #define GRPC_SRC_CORE_XDS_GRPC_XDS_AUDIT_LOGGER_REGISTRY_H +#include + #include #include #include "absl/strings/string_view.h" #include "envoy/config/rbac/v3/rbac.upb.h" - -#include - #include "src/core/util/json/json.h" #include "src/core/util/validation_errors.h" #include "src/core/xds/xds_client/xds_resource_type.h" diff --git a/src/core/xds/grpc/xds_bootstrap_grpc.cc b/src/core/xds/grpc/xds_bootstrap_grpc.cc index 34fbd8f1331..227aafc77f7 100644 --- a/src/core/xds/grpc/xds_bootstrap_grpc.cc +++ b/src/core/xds/grpc/xds_bootstrap_grpc.cc @@ -16,6 +16,8 @@ #include "src/core/xds/grpc/xds_bootstrap_grpc.h" +#include +#include #include #include @@ -30,10 +32,6 @@ #include "absl/strings/str_join.h" #include "absl/strings/string_view.h" #include "absl/types/optional.h" - -#include -#include - #include "src/core/util/json/json.h" #include "src/core/util/json/json_object_loader.h" #include "src/core/util/json/json_reader.h" diff --git a/src/core/xds/grpc/xds_bootstrap_grpc.h b/src/core/xds/grpc/xds_bootstrap_grpc.h index ba13d2bddf3..94a006a17b2 100644 --- a/src/core/xds/grpc/xds_bootstrap_grpc.h +++ b/src/core/xds/grpc/xds_bootstrap_grpc.h @@ -17,6 +17,8 @@ #ifndef GRPC_SRC_CORE_XDS_GRPC_XDS_BOOTSTRAP_GRPC_H #define GRPC_SRC_CORE_XDS_GRPC_XDS_BOOTSTRAP_GRPC_H +#include + #include #include #include @@ -25,9 +27,6 @@ #include "absl/status/statusor.h" #include "absl/strings/string_view.h" #include "absl/types/optional.h" - -#include - #include "src/core/util/json/json.h" #include "src/core/util/json/json_args.h" #include "src/core/util/json/json_object_loader.h" diff --git a/src/core/xds/grpc/xds_certificate_provider.cc b/src/core/xds/grpc/xds_certificate_provider.cc index fecc658d364..bf73d434ec9 100644 --- a/src/core/xds/grpc/xds_certificate_provider.cc +++ b/src/core/xds/grpc/xds_certificate_provider.cc @@ -18,14 +18,13 @@ #include "src/core/xds/grpc/xds_certificate_provider.h" +#include + #include #include "absl/functional/bind_front.h" #include "absl/log/check.h" #include "absl/types/optional.h" - -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/security/security_connector/ssl_utils.h" diff --git a/src/core/xds/grpc/xds_certificate_provider.h b/src/core/xds/grpc/xds_certificate_provider.h index 52b535af2db..1b916a879a4 100644 --- a/src/core/xds/grpc/xds_certificate_provider.h +++ b/src/core/xds/grpc/xds_certificate_provider.h @@ -19,6 +19,10 @@ #ifndef GRPC_SRC_CORE_XDS_GRPC_XDS_CERTIFICATE_PROVIDER_H #define GRPC_SRC_CORE_XDS_GRPC_XDS_CERTIFICATE_PROVIDER_H +#include +#include +#include + #include #include #include @@ -26,11 +30,6 @@ #include "absl/base/thread_annotations.h" #include "absl/strings/string_view.h" - -#include -#include -#include - #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.h" #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h" #include "src/core/util/matchers.h" diff --git a/src/core/xds/grpc/xds_client_grpc.cc b/src/core/xds/grpc/xds_client_grpc.cc index bc47f168b71..db3bcacb5ba 100644 --- a/src/core/xds/grpc/xds_client_grpc.cc +++ b/src/core/xds/grpc/xds_client_grpc.cc @@ -16,6 +16,13 @@ #include "src/core/xds/grpc/xds_client_grpc.h" +#include +#include +#include +#include +#include +#include + #include #include #include @@ -30,15 +37,6 @@ #include "absl/strings/string_view.h" #include "absl/types/optional.h" #include "envoy/service/status/v3/csds.upb.h" -#include "upb/base/string_view.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/event_engine/channel_args_endpoint_config.h" @@ -64,6 +62,7 @@ #include "src/core/xds/xds_client/xds_channel_args.h" #include "src/core/xds/xds_client/xds_client.h" #include "src/core/xds/xds_client/xds_transport.h" +#include "upb/base/string_view.h" // If gRPC is built with -DGRPC_XDS_USER_AGENT_NAME_SUFFIX="...", that string // will be appended to the user agent name reported to the xDS server. diff --git a/src/core/xds/grpc/xds_client_grpc.h b/src/core/xds/grpc/xds_client_grpc.h index bf6828f20f6..f52fdfc1dba 100644 --- a/src/core/xds/grpc/xds_client_grpc.h +++ b/src/core/xds/grpc/xds_client_grpc.h @@ -17,14 +17,13 @@ #ifndef GRPC_SRC_CORE_XDS_GRPC_XDS_CLIENT_GRPC_H #define GRPC_SRC_CORE_XDS_GRPC_XDS_CLIENT_GRPC_H +#include +#include + #include #include "absl/status/statusor.h" #include "absl/strings/string_view.h" - -#include -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/iomgr/iomgr_fwd.h" #include "src/core/resolver/endpoint_addresses.h" diff --git a/src/core/xds/grpc/xds_cluster.cc b/src/core/xds/grpc/xds_cluster.cc index 09a7454d80f..b7633fa8fc7 100644 --- a/src/core/xds/grpc/xds_cluster.cc +++ b/src/core/xds/grpc/xds_cluster.cc @@ -18,7 +18,6 @@ #include "absl/strings/str_cat.h" #include "absl/strings/str_join.h" - #include "src/core/util/json/json_writer.h" #include "src/core/util/match.h" #include "src/core/util/time.h" diff --git a/src/core/xds/grpc/xds_cluster.h b/src/core/xds/grpc/xds_cluster.h index 7eea5d0b0fd..a2c6982acb1 100644 --- a/src/core/xds/grpc/xds_cluster.h +++ b/src/core/xds/grpc/xds_cluster.h @@ -23,7 +23,6 @@ #include "absl/container/flat_hash_map.h" #include "absl/types/optional.h" #include "absl/types/variant.h" - #include "src/core/load_balancing/outlier_detection/outlier_detection.h" #include "src/core/util/json/json.h" #include "src/core/xds/grpc/xds_common_types.h" diff --git a/src/core/xds/grpc/xds_cluster_parser.cc b/src/core/xds/grpc/xds_cluster_parser.cc index 1a6bbc2e2b6..5d1ff0540e6 100644 --- a/src/core/xds/grpc/xds_cluster_parser.cc +++ b/src/core/xds/grpc/xds_cluster_parser.cc @@ -44,9 +44,6 @@ #include "google/protobuf/duration.upb.h" #include "google/protobuf/struct.upb.h" #include "google/protobuf/wrappers.upb.h" -#include "upb/base/string_view.h" -#include "upb/text/encode.h" - #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.h" #include "src/core/load_balancing/lb_policy_registry.h" @@ -61,6 +58,8 @@ #include "src/core/xds/grpc/xds_metadata_parser.h" #include "src/core/xds/xds_client/lrs_client.h" #include "src/core/xds/xds_client/xds_backend_metric_propagation.h" +#include "upb/base/string_view.h" +#include "upb/text/encode.h" namespace grpc_core { diff --git a/src/core/xds/grpc/xds_cluster_parser.h b/src/core/xds/grpc/xds_cluster_parser.h index 109818a079f..59981e8ec2e 100644 --- a/src/core/xds/grpc/xds_cluster_parser.h +++ b/src/core/xds/grpc/xds_cluster_parser.h @@ -22,12 +22,11 @@ #include "envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.h" #include "envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.h" #include "envoy/extensions/upstreams/http/v3/http_protocol_options.upbdefs.h" -#include "upb/reflection/def.h" - #include "src/core/xds/grpc/xds_cluster.h" #include "src/core/xds/xds_client/xds_client.h" #include "src/core/xds/xds_client/xds_resource_type.h" #include "src/core/xds/xds_client/xds_resource_type_impl.h" +#include "upb/reflection/def.h" namespace grpc_core { diff --git a/src/core/xds/grpc/xds_cluster_specifier_plugin.cc b/src/core/xds/grpc/xds_cluster_specifier_plugin.cc index 8d77160224e..9e30ea84167 100644 --- a/src/core/xds/grpc/xds_cluster_specifier_plugin.cc +++ b/src/core/xds/grpc/xds_cluster_specifier_plugin.cc @@ -16,6 +16,8 @@ #include "src/core/xds/grpc/xds_cluster_specifier_plugin.h" +#include +#include #include #include @@ -25,17 +27,13 @@ #include "absl/status/statusor.h" #include "absl/strings/str_cat.h" #include "absl/types/variant.h" -#include "upb/base/status.hpp" -#include "upb/json/encode.h" -#include "upb/mem/arena.hpp" - -#include -#include - #include "src/core/util/json/json.h" #include "src/core/util/json/json_reader.h" #include "src/proto/grpc/lookup/v1/rls_config.upb.h" #include "src/proto/grpc/lookup/v1/rls_config.upbdefs.h" +#include "upb/base/status.hpp" +#include "upb/json/encode.h" +#include "upb/mem/arena.hpp" namespace grpc_core { diff --git a/src/core/xds/grpc/xds_cluster_specifier_plugin.h b/src/core/xds/grpc/xds_cluster_specifier_plugin.h index 4735ab749bc..4ae87310904 100644 --- a/src/core/xds/grpc/xds_cluster_specifier_plugin.h +++ b/src/core/xds/grpc/xds_cluster_specifier_plugin.h @@ -17,19 +17,18 @@ #ifndef GRPC_SRC_CORE_XDS_GRPC_XDS_CLUSTER_SPECIFIER_PLUGIN_H #define GRPC_SRC_CORE_XDS_GRPC_XDS_CLUSTER_SPECIFIER_PLUGIN_H +#include + #include #include #include #include "absl/strings/string_view.h" -#include "upb/mem/arena.h" -#include "upb/reflection/def.h" - -#include - #include "src/core/util/json/json.h" #include "src/core/util/validation_errors.h" #include "src/core/xds/grpc/xds_common_types.h" +#include "upb/mem/arena.h" +#include "upb/reflection/def.h" namespace grpc_core { diff --git a/src/core/xds/grpc/xds_common_types.cc b/src/core/xds/grpc/xds_common_types.cc index f1a84590602..0679d184b59 100644 --- a/src/core/xds/grpc/xds_common_types.cc +++ b/src/core/xds/grpc/xds_common_types.cc @@ -19,7 +19,6 @@ #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" #include "absl/strings/str_join.h" - #include "src/core/util/match.h" namespace grpc_core { diff --git a/src/core/xds/grpc/xds_common_types.h b/src/core/xds/grpc/xds_common_types.h index 5bd838f1b77..b8c4ea1378d 100644 --- a/src/core/xds/grpc/xds_common_types.h +++ b/src/core/xds/grpc/xds_common_types.h @@ -22,7 +22,6 @@ #include "absl/strings/string_view.h" #include "absl/types/variant.h" - #include "src/core/util/json/json.h" #include "src/core/util/matchers.h" #include "src/core/util/validation_errors.h" diff --git a/src/core/xds/grpc/xds_common_types_parser.cc b/src/core/xds/grpc/xds_common_types_parser.cc index 8470b87d6b1..164fecc6728 100644 --- a/src/core/xds/grpc/xds_common_types_parser.cc +++ b/src/core/xds/grpc/xds_common_types_parser.cc @@ -16,6 +16,8 @@ #include "src/core/xds/grpc/xds_common_types_parser.h" +#include +#include #include #include @@ -36,19 +38,15 @@ #include "google/protobuf/struct.upb.h" #include "google/protobuf/struct.upbdefs.h" #include "google/protobuf/wrappers.upb.h" -#include "upb/base/status.hpp" -#include "upb/json/encode.h" -#include "upb/mem/arena.h" -#include "xds/type/v3/typed_struct.upb.h" - -#include -#include - #include "src/core/util/env.h" #include "src/core/util/json/json_reader.h" #include "src/core/util/upb_utils.h" #include "src/core/xds/grpc/xds_bootstrap_grpc.h" #include "src/core/xds/xds_client/xds_client.h" +#include "upb/base/status.hpp" +#include "upb/json/encode.h" +#include "upb/mem/arena.h" +#include "xds/type/v3/typed_struct.upb.h" namespace grpc_core { diff --git a/src/core/xds/grpc/xds_common_types_parser.h b/src/core/xds/grpc/xds_common_types_parser.h index 0db17b5f847..529e7abbd13 100644 --- a/src/core/xds/grpc/xds_common_types_parser.h +++ b/src/core/xds/grpc/xds_common_types_parser.h @@ -23,7 +23,6 @@ #include "google/protobuf/duration.upb.h" #include "google/protobuf/struct.upb.h" #include "google/protobuf/wrappers.upb.h" - #include "src/core/util/time.h" #include "src/core/util/validation_errors.h" #include "src/core/xds/grpc/xds_common_types.h" diff --git a/src/core/xds/grpc/xds_endpoint.h b/src/core/xds/grpc/xds_endpoint.h index 4a07e5871c0..a74541d2543 100644 --- a/src/core/xds/grpc/xds_endpoint.h +++ b/src/core/xds/grpc/xds_endpoint.h @@ -24,7 +24,6 @@ #include "absl/base/thread_annotations.h" #include "absl/random/random.h" - #include "src/core/resolver/endpoint_addresses.h" #include "src/core/util/ref_counted.h" #include "src/core/util/ref_counted_ptr.h" diff --git a/src/core/xds/grpc/xds_endpoint_parser.cc b/src/core/xds/grpc/xds_endpoint_parser.cc index bc11c1651e4..886052ae7cc 100644 --- a/src/core/xds/grpc/xds_endpoint_parser.cc +++ b/src/core/xds/grpc/xds_endpoint_parser.cc @@ -16,6 +16,7 @@ #include "src/core/xds/grpc/xds_endpoint_parser.h" +#include #include #include @@ -39,10 +40,6 @@ #include "envoy/config/endpoint/v3/endpoint_components.upb.h" #include "envoy/type/v3/percent.upb.h" #include "google/protobuf/wrappers.upb.h" -#include "upb/text/encode.h" - -#include - #include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/channel/channel_args.h" @@ -55,6 +52,7 @@ #include "src/core/xds/grpc/xds_common_types_parser.h" #include "src/core/xds/grpc/xds_health_status.h" #include "src/core/xds/xds_client/xds_resource_type.h" +#include "upb/text/encode.h" // IWYU pragma: no_include "absl/meta/type_traits.h" diff --git a/src/core/xds/grpc/xds_endpoint_parser.h b/src/core/xds/grpc/xds_endpoint_parser.h index ababdd775bf..e543bab6356 100644 --- a/src/core/xds/grpc/xds_endpoint_parser.h +++ b/src/core/xds/grpc/xds_endpoint_parser.h @@ -19,12 +19,11 @@ #include "absl/strings/string_view.h" #include "envoy/config/endpoint/v3/endpoint.upbdefs.h" -#include "upb/reflection/def.h" - #include "src/core/xds/grpc/xds_endpoint.h" #include "src/core/xds/xds_client/xds_client.h" #include "src/core/xds/xds_client/xds_resource_type.h" #include "src/core/xds/xds_client/xds_resource_type_impl.h" +#include "upb/reflection/def.h" namespace grpc_core { diff --git a/src/core/xds/grpc/xds_health_status.h b/src/core/xds/grpc/xds_health_status.h index 6f4e346a268..0f4c5bf0b00 100644 --- a/src/core/xds/grpc/xds_health_status.h +++ b/src/core/xds/grpc/xds_health_status.h @@ -22,7 +22,6 @@ #include "absl/strings/string_view.h" #include "absl/types/optional.h" #include "absl/types/span.h" - #include "src/core/resolver/endpoint_addresses.h" // Channel arg key for xDS health status. diff --git a/src/core/xds/grpc/xds_http_fault_filter.cc b/src/core/xds/grpc/xds_http_fault_filter.cc index bf078f9d0d0..cc5b22bcb15 100644 --- a/src/core/xds/grpc/xds_http_fault_filter.cc +++ b/src/core/xds/grpc/xds_http_fault_filter.cc @@ -16,6 +16,9 @@ #include "src/core/xds/grpc/xds_http_fault_filter.h" +#include +#include +#include #include #include @@ -30,11 +33,6 @@ #include "envoy/extensions/filters/http/fault/v3/fault.upbdefs.h" #include "envoy/type/v3/percent.upb.h" #include "google/protobuf/wrappers.upb.h" - -#include -#include -#include - #include "src/core/ext/filters/fault_injection/fault_injection_filter.h" #include "src/core/ext/filters/fault_injection/fault_injection_service_config_parser.h" #include "src/core/lib/channel/channel_args.h" diff --git a/src/core/xds/grpc/xds_http_fault_filter.h b/src/core/xds/grpc/xds_http_fault_filter.h index d36b7761e17..0fb5d2b6c91 100644 --- a/src/core/xds/grpc/xds_http_fault_filter.h +++ b/src/core/xds/grpc/xds_http_fault_filter.h @@ -17,19 +17,18 @@ #ifndef GRPC_SRC_CORE_XDS_GRPC_XDS_HTTP_FAULT_FILTER_H #define GRPC_SRC_CORE_XDS_GRPC_XDS_HTTP_FAULT_FILTER_H +#include + #include "absl/status/statusor.h" #include "absl/strings/string_view.h" #include "absl/types/optional.h" -#include "upb/reflection/def.h" - -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_fwd.h" #include "src/core/util/validation_errors.h" #include "src/core/xds/grpc/xds_common_types.h" #include "src/core/xds/grpc/xds_http_filter.h" #include "src/core/xds/xds_client/xds_resource_type.h" +#include "upb/reflection/def.h" namespace grpc_core { diff --git a/src/core/xds/grpc/xds_http_filter.h b/src/core/xds/grpc/xds_http_filter.h index 888b5db75b0..4625b44ca3e 100644 --- a/src/core/xds/grpc/xds_http_filter.h +++ b/src/core/xds/grpc/xds_http_filter.h @@ -23,8 +23,6 @@ #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" #include "absl/types/optional.h" -#include "upb/reflection/def.h" - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/transport/interception_chain.h" @@ -33,6 +31,7 @@ #include "src/core/util/validation_errors.h" #include "src/core/xds/grpc/xds_common_types.h" #include "src/core/xds/xds_client/xds_resource_type.h" +#include "upb/reflection/def.h" namespace grpc_core { diff --git a/src/core/xds/grpc/xds_http_filter_registry.cc b/src/core/xds/grpc/xds_http_filter_registry.cc index 9decfded32d..38222b521af 100644 --- a/src/core/xds/grpc/xds_http_filter_registry.cc +++ b/src/core/xds/grpc/xds_http_filter_registry.cc @@ -16,6 +16,8 @@ #include "src/core/xds/grpc/xds_http_filter_registry.h" +#include + #include #include #include @@ -24,9 +26,6 @@ #include "absl/types/variant.h" #include "envoy/extensions/filters/http/router/v3/router.upb.h" #include "envoy/extensions/filters/http/router/v3/router.upbdefs.h" - -#include - #include "src/core/util/json/json.h" #include "src/core/xds/grpc/xds_http_fault_filter.h" #include "src/core/xds/grpc/xds_http_gcp_authn_filter.h" diff --git a/src/core/xds/grpc/xds_http_filter_registry.h b/src/core/xds/grpc/xds_http_filter_registry.h index 79547d35d86..a34ad7625a7 100644 --- a/src/core/xds/grpc/xds_http_filter_registry.h +++ b/src/core/xds/grpc/xds_http_filter_registry.h @@ -26,8 +26,6 @@ #include "absl/status/statusor.h" #include "absl/strings/string_view.h" #include "absl/types/optional.h" -#include "upb/reflection/def.h" - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/transport/interception_chain.h" @@ -35,6 +33,7 @@ #include "src/core/xds/grpc/xds_common_types.h" #include "src/core/xds/grpc/xds_http_filter.h" #include "src/core/xds/xds_client/xds_resource_type.h" +#include "upb/reflection/def.h" namespace grpc_core { diff --git a/src/core/xds/grpc/xds_http_gcp_authn_filter.cc b/src/core/xds/grpc/xds_http_gcp_authn_filter.cc index 72e964fe74a..11de97f5c6b 100644 --- a/src/core/xds/grpc/xds_http_gcp_authn_filter.cc +++ b/src/core/xds/grpc/xds_http_gcp_authn_filter.cc @@ -16,6 +16,8 @@ #include "src/core/xds/grpc/xds_http_gcp_authn_filter.h" +#include + #include #include @@ -24,9 +26,6 @@ #include "absl/types/variant.h" #include "envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.upb.h" #include "envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.upbdefs.h" - -#include - #include "src/core/ext/filters/gcp_authentication/gcp_authentication_filter.h" #include "src/core/ext/filters/gcp_authentication/gcp_authentication_service_config_parser.h" #include "src/core/lib/channel/channel_args.h" diff --git a/src/core/xds/grpc/xds_http_gcp_authn_filter.h b/src/core/xds/grpc/xds_http_gcp_authn_filter.h index 5a015e2ad81..11d07912bd2 100644 --- a/src/core/xds/grpc/xds_http_gcp_authn_filter.h +++ b/src/core/xds/grpc/xds_http_gcp_authn_filter.h @@ -20,14 +20,13 @@ #include "absl/status/statusor.h" #include "absl/strings/string_view.h" #include "absl/types/optional.h" -#include "upb/reflection/def.h" - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_fwd.h" #include "src/core/util/validation_errors.h" #include "src/core/xds/grpc/xds_common_types.h" #include "src/core/xds/grpc/xds_http_filter.h" #include "src/core/xds/xds_client/xds_resource_type.h" +#include "upb/reflection/def.h" namespace grpc_core { diff --git a/src/core/xds/grpc/xds_http_rbac_filter.cc b/src/core/xds/grpc/xds_http_rbac_filter.cc index 381a2c31fdb..af819a7117e 100644 --- a/src/core/xds/grpc/xds_http_rbac_filter.cc +++ b/src/core/xds/grpc/xds_http_rbac_filter.cc @@ -16,6 +16,8 @@ #include "src/core/xds/grpc/xds_http_rbac_filter.h" +#include +#include #include #include @@ -38,11 +40,6 @@ #include "envoy/type/matcher/v3/string.upb.h" #include "envoy/type/v3/range.upb.h" #include "google/protobuf/wrappers.upb.h" -#include "upb/message/map.h" - -#include -#include - #include "src/core/ext/filters/rbac/rbac_filter.h" #include "src/core/ext/filters/rbac/rbac_service_config_parser.h" #include "src/core/lib/channel/channel_args.h" @@ -55,6 +52,7 @@ #include "src/core/xds/grpc/xds_bootstrap_grpc.h" #include "src/core/xds/grpc/xds_common_types_parser.h" #include "src/core/xds/xds_client/xds_client.h" +#include "upb/message/map.h" namespace grpc_core { diff --git a/src/core/xds/grpc/xds_http_rbac_filter.h b/src/core/xds/grpc/xds_http_rbac_filter.h index 47a0f01c33c..b5533057750 100644 --- a/src/core/xds/grpc/xds_http_rbac_filter.h +++ b/src/core/xds/grpc/xds_http_rbac_filter.h @@ -17,19 +17,18 @@ #ifndef GRPC_SRC_CORE_XDS_GRPC_XDS_HTTP_RBAC_FILTER_H #define GRPC_SRC_CORE_XDS_GRPC_XDS_HTTP_RBAC_FILTER_H +#include + #include "absl/status/statusor.h" #include "absl/strings/string_view.h" #include "absl/types/optional.h" -#include "upb/reflection/def.h" - -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_fwd.h" #include "src/core/util/validation_errors.h" #include "src/core/xds/grpc/xds_common_types.h" #include "src/core/xds/grpc/xds_http_filter.h" #include "src/core/xds/xds_client/xds_resource_type.h" +#include "upb/reflection/def.h" namespace grpc_core { diff --git a/src/core/xds/grpc/xds_http_stateful_session_filter.cc b/src/core/xds/grpc/xds_http_stateful_session_filter.cc index a1442a1f392..acdc66551de 100644 --- a/src/core/xds/grpc/xds_http_stateful_session_filter.cc +++ b/src/core/xds/grpc/xds_http_stateful_session_filter.cc @@ -16,6 +16,9 @@ #include "src/core/xds/grpc/xds_http_stateful_session_filter.h" +#include +#include + #include #include @@ -28,10 +31,6 @@ #include "envoy/extensions/http/stateful_session/cookie/v3/cookie.upb.h" #include "envoy/extensions/http/stateful_session/cookie/v3/cookie.upbdefs.h" #include "envoy/type/http/v3/cookie.upb.h" - -#include -#include - #include "src/core/ext/filters/stateful_session/stateful_session_filter.h" #include "src/core/ext/filters/stateful_session/stateful_session_service_config_parser.h" #include "src/core/lib/channel/channel_args.h" diff --git a/src/core/xds/grpc/xds_http_stateful_session_filter.h b/src/core/xds/grpc/xds_http_stateful_session_filter.h index 8327a7759f0..6dccd4b1a19 100644 --- a/src/core/xds/grpc/xds_http_stateful_session_filter.h +++ b/src/core/xds/grpc/xds_http_stateful_session_filter.h @@ -17,19 +17,18 @@ #ifndef GRPC_SRC_CORE_XDS_GRPC_XDS_HTTP_STATEFUL_SESSION_FILTER_H #define GRPC_SRC_CORE_XDS_GRPC_XDS_HTTP_STATEFUL_SESSION_FILTER_H +#include + #include "absl/status/statusor.h" #include "absl/strings/string_view.h" #include "absl/types/optional.h" -#include "upb/reflection/def.h" - -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_fwd.h" #include "src/core/util/validation_errors.h" #include "src/core/xds/grpc/xds_common_types.h" #include "src/core/xds/grpc/xds_http_filter.h" #include "src/core/xds/xds_client/xds_resource_type.h" +#include "upb/reflection/def.h" namespace grpc_core { diff --git a/src/core/xds/grpc/xds_lb_policy_registry.cc b/src/core/xds/grpc/xds_lb_policy_registry.cc index f126855eb2b..cff37249417 100644 --- a/src/core/xds/grpc/xds_lb_policy_registry.cc +++ b/src/core/xds/grpc/xds_lb_policy_registry.cc @@ -16,6 +16,8 @@ #include "src/core/xds/grpc/xds_lb_policy_registry.h" +#include +#include #include #include @@ -31,10 +33,6 @@ #include "envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb.h" #include "envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb.h" #include "google/protobuf/wrappers.upb.h" - -#include -#include - #include "src/core/lib/config/core_configuration.h" #include "src/core/load_balancing/lb_policy_registry.h" #include "src/core/util/time.h" diff --git a/src/core/xds/grpc/xds_lb_policy_registry.h b/src/core/xds/grpc/xds_lb_policy_registry.h index 2396cb8a88d..06dcaa19c75 100644 --- a/src/core/xds/grpc/xds_lb_policy_registry.h +++ b/src/core/xds/grpc/xds_lb_policy_registry.h @@ -17,14 +17,13 @@ #ifndef GRPC_SRC_CORE_XDS_GRPC_XDS_LB_POLICY_REGISTRY_H #define GRPC_SRC_CORE_XDS_GRPC_XDS_LB_POLICY_REGISTRY_H +#include + #include #include #include "absl/strings/string_view.h" #include "envoy/config/cluster/v3/cluster.upb.h" - -#include - #include "src/core/util/json/json.h" #include "src/core/util/validation_errors.h" #include "src/core/xds/xds_client/xds_resource_type.h" diff --git a/src/core/xds/grpc/xds_listener.cc b/src/core/xds/grpc/xds_listener.cc index c67483c41a6..1bbff1e7918 100644 --- a/src/core/xds/grpc/xds_listener.cc +++ b/src/core/xds/grpc/xds_listener.cc @@ -19,7 +19,6 @@ #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" #include "absl/strings/str_join.h" - #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/util/match.h" diff --git a/src/core/xds/grpc/xds_listener.h b/src/core/xds/grpc/xds_listener.h index 29b51923283..823a2a4f7f5 100644 --- a/src/core/xds/grpc/xds_listener.h +++ b/src/core/xds/grpc/xds_listener.h @@ -29,7 +29,6 @@ #include "absl/types/optional.h" #include "absl/types/variant.h" - #include "src/core/lib/iomgr/resolved_address.h" #include "src/core/util/time.h" #include "src/core/xds/grpc/xds_common_types.h" diff --git a/src/core/xds/grpc/xds_listener_parser.cc b/src/core/xds/grpc/xds_listener_parser.cc index 3449b5875da..325705e30bb 100644 --- a/src/core/xds/grpc/xds_listener_parser.cc +++ b/src/core/xds/grpc/xds_listener_parser.cc @@ -16,6 +16,7 @@ #include "src/core/xds/grpc/xds_listener_parser.h" +#include #include #include @@ -43,10 +44,6 @@ #include "google/protobuf/any.upb.h" #include "google/protobuf/duration.upb.h" #include "google/protobuf/wrappers.upb.h" -#include "upb/text/encode.h" - -#include - #include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/debug/trace.h" @@ -59,6 +56,7 @@ #include "src/core/xds/grpc/xds_common_types_parser.h" #include "src/core/xds/grpc/xds_route_config_parser.h" #include "src/core/xds/xds_client/xds_resource_type.h" +#include "upb/text/encode.h" namespace grpc_core { diff --git a/src/core/xds/grpc/xds_listener_parser.h b/src/core/xds/grpc/xds_listener_parser.h index 1a0e1e95004..908da7b995b 100644 --- a/src/core/xds/grpc/xds_listener_parser.h +++ b/src/core/xds/grpc/xds_listener_parser.h @@ -20,14 +20,13 @@ #include "absl/strings/string_view.h" #include "envoy/config/listener/v3/listener.upbdefs.h" #include "envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.h" -#include "upb/reflection/def.h" - #include "src/core/xds/grpc/xds_bootstrap_grpc.h" #include "src/core/xds/grpc/xds_http_filter_registry.h" #include "src/core/xds/grpc/xds_listener.h" #include "src/core/xds/xds_client/xds_client.h" #include "src/core/xds/xds_client/xds_resource_type.h" #include "src/core/xds/xds_client/xds_resource_type_impl.h" +#include "upb/reflection/def.h" namespace grpc_core { diff --git a/src/core/xds/grpc/xds_metadata.h b/src/core/xds/grpc/xds_metadata.h index 94857712136..63e2178ffb0 100644 --- a/src/core/xds/grpc/xds_metadata.h +++ b/src/core/xds/grpc/xds_metadata.h @@ -24,7 +24,6 @@ #include "absl/container/flat_hash_map.h" #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" - #include "src/core/util/down_cast.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_writer.h" diff --git a/src/core/xds/grpc/xds_metadata_parser.cc b/src/core/xds/grpc/xds_metadata_parser.cc index cb355371c47..1ec9e7a106a 100644 --- a/src/core/xds/grpc/xds_metadata_parser.cc +++ b/src/core/xds/grpc/xds_metadata_parser.cc @@ -23,15 +23,14 @@ #include "absl/types/variant.h" #include "envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.upb.h" #include "envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.upbdefs.h" -#include "upb/base/string_view.h" -#include "upb/text/encode.h" - #include "src/core/util/env.h" #include "src/core/util/string.h" #include "src/core/util/upb_utils.h" #include "src/core/util/validation_errors.h" #include "src/core/xds/grpc/xds_common_types.h" #include "src/core/xds/grpc/xds_common_types_parser.h" +#include "upb/base/string_view.h" +#include "upb/text/encode.h" namespace grpc_core { diff --git a/src/core/xds/grpc/xds_metadata_parser.h b/src/core/xds/grpc/xds_metadata_parser.h index a3cca589308..7cb9d55daa7 100644 --- a/src/core/xds/grpc/xds_metadata_parser.h +++ b/src/core/xds/grpc/xds_metadata_parser.h @@ -18,7 +18,6 @@ #define GRPC_SRC_CORE_XDS_GRPC_XDS_METADATA_PARSER_H #include "envoy/config/core/v3/base.upb.h" - #include "src/core/util/validation_errors.h" #include "src/core/xds/grpc/xds_metadata.h" #include "src/core/xds/xds_client/xds_resource_type.h" diff --git a/src/core/xds/grpc/xds_route_config.cc b/src/core/xds/grpc/xds_route_config.cc index 82d670207ee..5c94d6a8824 100644 --- a/src/core/xds/grpc/xds_route_config.cc +++ b/src/core/xds/grpc/xds_route_config.cc @@ -26,7 +26,6 @@ #include "absl/types/optional.h" #include "absl/types/variant.h" #include "re2/re2.h" - #include "src/core/util/match.h" #include "src/core/util/matchers.h" diff --git a/src/core/xds/grpc/xds_route_config.h b/src/core/xds/grpc/xds_route_config.h index b6af799af1c..8b562ecab11 100644 --- a/src/core/xds/grpc/xds_route_config.h +++ b/src/core/xds/grpc/xds_route_config.h @@ -28,7 +28,6 @@ #include "absl/types/optional.h" #include "absl/types/variant.h" #include "re2/re2.h" - #include "src/core/lib/channel/status_util.h" #include "src/core/util/matchers.h" #include "src/core/util/time.h" diff --git a/src/core/xds/grpc/xds_route_config_parser.cc b/src/core/xds/grpc/xds_route_config_parser.cc index 55ffc7ced1a..fc94e71e07b 100644 --- a/src/core/xds/grpc/xds_route_config_parser.cc +++ b/src/core/xds/grpc/xds_route_config_parser.cc @@ -16,6 +16,8 @@ #include "src/core/xds/grpc/xds_route_config_parser.h" +#include +#include #include #include @@ -51,13 +53,6 @@ #include "google/protobuf/duration.upb.h" #include "google/protobuf/wrappers.upb.h" #include "re2/re2.h" -#include "upb/base/string_view.h" -#include "upb/message/map.h" -#include "upb/text/encode.h" - -#include -#include - #include "src/core/lib/channel/status_util.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.h" @@ -78,6 +73,9 @@ #include "src/core/xds/grpc/xds_http_filter_registry.h" #include "src/core/xds/grpc/xds_routing.h" #include "src/core/xds/xds_client/xds_resource_type.h" +#include "upb/base/string_view.h" +#include "upb/message/map.h" +#include "upb/text/encode.h" namespace grpc_core { diff --git a/src/core/xds/grpc/xds_route_config_parser.h b/src/core/xds/grpc/xds_route_config_parser.h index 644c55e7198..d5909c9fcf8 100644 --- a/src/core/xds/grpc/xds_route_config_parser.h +++ b/src/core/xds/grpc/xds_route_config_parser.h @@ -17,6 +17,7 @@ #ifndef GRPC_SRC_CORE_XDS_GRPC_XDS_ROUTE_CONFIG_PARSER_H #define GRPC_SRC_CORE_XDS_GRPC_XDS_ROUTE_CONFIG_PARSER_H +#include #include #include @@ -31,10 +32,6 @@ #include "envoy/config/route/v3/route.upb.h" #include "envoy/config/route/v3/route.upbdefs.h" #include "re2/re2.h" -#include "upb/reflection/def.h" - -#include - #include "src/core/lib/channel/status_util.h" #include "src/core/util/time.h" #include "src/core/util/validation_errors.h" @@ -45,6 +42,7 @@ #include "src/core/xds/xds_client/xds_client.h" #include "src/core/xds/xds_client/xds_resource_type.h" #include "src/core/xds/xds_client/xds_resource_type_impl.h" +#include "upb/reflection/def.h" namespace grpc_core { diff --git a/src/core/xds/grpc/xds_routing.cc b/src/core/xds/grpc/xds_routing.cc index 2d8668326be..95f6cb7446f 100644 --- a/src/core/xds/grpc/xds_routing.cc +++ b/src/core/xds/grpc/xds_routing.cc @@ -18,6 +18,7 @@ #include "src/core/xds/grpc/xds_routing.h" +#include #include #include @@ -30,9 +31,6 @@ #include "absl/status/statusor.h" #include "absl/strings/match.h" #include "absl/strings/str_cat.h" - -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/util/matchers.h" #include "src/core/xds/grpc/xds_http_filter.h" diff --git a/src/core/xds/grpc/xds_routing.h b/src/core/xds/grpc/xds_routing.h index 696599d8463..85309137635 100644 --- a/src/core/xds/grpc/xds_routing.h +++ b/src/core/xds/grpc/xds_routing.h @@ -19,6 +19,7 @@ #ifndef GRPC_SRC_CORE_XDS_GRPC_XDS_ROUTING_H #define GRPC_SRC_CORE_XDS_GRPC_XDS_ROUTING_H +#include #include #include @@ -28,9 +29,6 @@ #include "absl/status/statusor.h" #include "absl/strings/string_view.h" #include "absl/types/optional.h" - -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/xds/grpc/xds_http_filter_registry.h" diff --git a/src/core/xds/grpc/xds_server_grpc.cc b/src/core/xds/grpc/xds_server_grpc.cc index dca1d0b87c0..99654977e81 100644 --- a/src/core/xds/grpc/xds_server_grpc.cc +++ b/src/core/xds/grpc/xds_server_grpc.cc @@ -25,7 +25,6 @@ #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" - #include "src/core/lib/config/core_configuration.h" #include "src/core/util/json/json_reader.h" #include "src/core/util/json/json_writer.h" diff --git a/src/core/xds/grpc/xds_transport_grpc.cc b/src/core/xds/grpc/xds_transport_grpc.cc index 5bc75266959..ef0186a2f8a 100644 --- a/src/core/xds/grpc/xds_transport_grpc.cc +++ b/src/core/xds/grpc/xds_transport_grpc.cc @@ -16,16 +16,6 @@ #include "src/core/xds/grpc/xds_transport_grpc.h" -#include - -#include -#include -#include -#include - -#include "absl/log/check.h" -#include "absl/strings/str_cat.h" - #include #include #include @@ -35,7 +25,15 @@ #include #include #include +#include +#include +#include +#include +#include + +#include "absl/log/check.h" +#include "absl/strings/str_cat.h" #include "src/core/client_channel/client_channel_filter.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_fwd.h" diff --git a/src/core/xds/grpc/xds_transport_grpc.h b/src/core/xds/grpc/xds_transport_grpc.h index 7615d19f6c8..b057c054ae3 100644 --- a/src/core/xds/grpc/xds_transport_grpc.h +++ b/src/core/xds/grpc/xds_transport_grpc.h @@ -17,18 +17,17 @@ #ifndef GRPC_SRC_CORE_XDS_GRPC_XDS_TRANSPORT_GRPC_H #define GRPC_SRC_CORE_XDS_GRPC_XDS_TRANSPORT_GRPC_H +#include +#include +#include +#include + #include #include #include #include "absl/container/flat_hash_map.h" #include "absl/status/status.h" - -#include -#include -#include -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" diff --git a/src/core/xds/xds_client/lrs_client.cc b/src/core/xds/xds_client/lrs_client.cc index d8059321d9e..3ff9d42c0a9 100644 --- a/src/core/xds/xds_client/lrs_client.cc +++ b/src/core/xds/xds_client/lrs_client.cc @@ -16,6 +16,8 @@ #include "src/core/xds/xds_client/lrs_client.h" +#include + #include #include #include @@ -31,13 +33,6 @@ #include "envoy/service/load_stats/v3/lrs.upb.h" #include "envoy/service/load_stats/v3/lrs.upbdefs.h" #include "google/protobuf/duration.upb.h" -#include "upb/base/string_view.h" -#include "upb/mem/arena.h" -#include "upb/reflection/def.h" -#include "upb/text/encode.h" - -#include - #include "src/core/lib/debug/trace.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/util/backoff.h" @@ -52,6 +47,10 @@ #include "src/core/xds/xds_client/xds_api.h" #include "src/core/xds/xds_client/xds_bootstrap.h" #include "src/core/xds/xds_client/xds_locality.h" +#include "upb/base/string_view.h" +#include "upb/mem/arena.h" +#include "upb/reflection/def.h" +#include "upb/text/encode.h" #define GRPC_XDS_INITIAL_CONNECT_BACKOFF_SECONDS 1 #define GRPC_XDS_RECONNECT_BACKOFF_MULTIPLIER 1.6 diff --git a/src/core/xds/xds_client/lrs_client.h b/src/core/xds/xds_client/lrs_client.h index 36fabc56fe3..eef921d953f 100644 --- a/src/core/xds/xds_client/lrs_client.h +++ b/src/core/xds/xds_client/lrs_client.h @@ -17,6 +17,8 @@ #ifndef GRPC_SRC_CORE_XDS_XDS_CLIENT_LRS_CLIENT_H #define GRPC_SRC_CORE_XDS_XDS_CLIENT_LRS_CLIENT_H +#include + #include #include #include @@ -28,10 +30,6 @@ #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/string_view.h" -#include "upb/reflection/def.hpp" - -#include - #include "src/core/lib/debug/trace.h" #include "src/core/load_balancing/backend_metric_data.h" #include "src/core/util/dual_ref_counted.h" @@ -50,6 +48,7 @@ #include "src/core/xds/xds_client/xds_metrics.h" #include "src/core/xds/xds_client/xds_resource_type.h" #include "src/core/xds/xds_client/xds_transport.h" +#include "upb/reflection/def.hpp" namespace grpc_core { diff --git a/src/core/xds/xds_client/xds_api.cc b/src/core/xds/xds_client/xds_api.cc index 50522961920..5223aa16795 100644 --- a/src/core/xds/xds_client/xds_api.cc +++ b/src/core/xds/xds_client/xds_api.cc @@ -16,6 +16,9 @@ #include "src/core/xds/xds_client/xds_api.h" +#include +#include +#include #include #include @@ -38,19 +41,14 @@ #include "google/protobuf/struct.upb.h" #include "google/protobuf/timestamp.upb.h" #include "google/rpc/status.upb.h" +#include "src/core/util/json/json.h" +#include "src/core/util/upb_utils.h" +#include "src/core/xds/xds_client/xds_client.h" #include "upb/base/string_view.h" #include "upb/mem/arena.hpp" #include "upb/reflection/def.h" #include "upb/text/encode.h" -#include -#include -#include - -#include "src/core/util/json/json.h" -#include "src/core/util/upb_utils.h" -#include "src/core/xds/xds_client/xds_client.h" - // IWYU pragma: no_include "upb/msg_internal.h" namespace grpc_core { diff --git a/src/core/xds/xds_client/xds_api.h b/src/core/xds/xds_client/xds_api.h index 207e78a297a..74d688dddef 100644 --- a/src/core/xds/xds_client/xds_api.h +++ b/src/core/xds/xds_client/xds_api.h @@ -17,6 +17,7 @@ #ifndef GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_API_H #define GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_API_H +#include #include #include @@ -29,16 +30,13 @@ #include "absl/strings/string_view.h" #include "envoy/admin/v3/config_dump_shared.upb.h" #include "envoy/service/status/v3/csds.upb.h" -#include "upb/mem/arena.h" -#include "upb/reflection/def.hpp" - -#include - #include "src/core/lib/debug/trace.h" #include "src/core/util/ref_counted_ptr.h" #include "src/core/util/time.h" #include "src/core/xds/xds_client/xds_bootstrap.h" #include "src/core/xds/xds_client/xds_locality.h" +#include "upb/mem/arena.h" +#include "upb/reflection/def.hpp" namespace grpc_core { diff --git a/src/core/xds/xds_client/xds_backend_metric_propagation.cc b/src/core/xds/xds_client/xds_backend_metric_propagation.cc index 1d514a0f25c..edb2f852f71 100644 --- a/src/core/xds/xds_client/xds_backend_metric_propagation.cc +++ b/src/core/xds/xds_client/xds_backend_metric_propagation.cc @@ -20,7 +20,6 @@ #include "absl/strings/str_cat.h" #include "absl/strings/str_join.h" - #include "src/core/util/useful.h" namespace grpc_core { diff --git a/src/core/xds/xds_client/xds_backend_metric_propagation.h b/src/core/xds/xds_client/xds_backend_metric_propagation.h index 4216c0ac47e..3b9af885f71 100644 --- a/src/core/xds/xds_client/xds_backend_metric_propagation.h +++ b/src/core/xds/xds_client/xds_backend_metric_propagation.h @@ -20,7 +20,6 @@ #include #include "absl/container/flat_hash_set.h" - #include "src/core/util/ref_counted.h" #include "src/core/util/ref_counted_ptr.h" diff --git a/src/core/xds/xds_client/xds_bootstrap.cc b/src/core/xds/xds_client/xds_bootstrap.cc index b6f5edfc9e2..718ac64bab3 100644 --- a/src/core/xds/xds_client/xds_bootstrap.cc +++ b/src/core/xds/xds_client/xds_bootstrap.cc @@ -16,10 +16,9 @@ #include "src/core/xds/xds_client/xds_bootstrap.h" -#include "absl/types/optional.h" - #include +#include "absl/types/optional.h" #include "src/core/util/env.h" #include "src/core/util/string.h" diff --git a/src/core/xds/xds_client/xds_bootstrap.h b/src/core/xds/xds_client/xds_bootstrap.h index cd802bbfa63..62f929b4c9d 100644 --- a/src/core/xds/xds_client/xds_bootstrap.h +++ b/src/core/xds/xds_client/xds_bootstrap.h @@ -17,10 +17,10 @@ #ifndef GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_BOOTSTRAP_H #define GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_BOOTSTRAP_H -#include - #include +#include + #include "src/core/util/json/json.h" namespace grpc_core { diff --git a/src/core/xds/xds_client/xds_client.cc b/src/core/xds/xds_client/xds_client.cc index 6381f8ba38c..d9b13e2980d 100644 --- a/src/core/xds/xds_client/xds_client.cc +++ b/src/core/xds/xds_client/xds_client.cc @@ -16,6 +16,8 @@ #include "src/core/xds/xds_client/xds_client.h" +#include +#include #include #include @@ -40,12 +42,6 @@ #include "envoy/service/status/v3/csds.upb.h" #include "google/protobuf/any.upb.h" #include "google/protobuf/timestamp.upb.h" -#include "upb/base/string_view.h" -#include "upb/mem/arena.h" - -#include -#include - #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/util/backoff.h" #include "src/core/util/debug_location.h" @@ -57,6 +53,8 @@ #include "src/core/xds/xds_client/xds_api.h" #include "src/core/xds/xds_client/xds_bootstrap.h" #include "src/core/xds/xds_client/xds_locality.h" +#include "upb/base/string_view.h" +#include "upb/mem/arena.h" #define GRPC_XDS_INITIAL_CONNECT_BACKOFF_SECONDS 1 #define GRPC_XDS_RECONNECT_BACKOFF_MULTIPLIER 1.6 diff --git a/src/core/xds/xds_client/xds_client.h b/src/core/xds/xds_client/xds_client.h index b5d4faa0b90..5b97b363d14 100644 --- a/src/core/xds/xds_client/xds_client.h +++ b/src/core/xds/xds_client/xds_client.h @@ -17,6 +17,9 @@ #ifndef GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_CLIENT_H #define GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_CLIENT_H +#include +#include + #include #include #include @@ -28,11 +31,6 @@ #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/string_view.h" -#include "upb/reflection/def.hpp" - -#include -#include - #include "src/core/lib/debug/trace.h" #include "src/core/util/dual_ref_counted.h" #include "src/core/util/orphanable.h" @@ -48,6 +46,7 @@ #include "src/core/xds/xds_client/xds_metrics.h" #include "src/core/xds/xds_client/xds_resource_type.h" #include "src/core/xds/xds_client/xds_transport.h" +#include "upb/reflection/def.hpp" namespace grpc_core { diff --git a/src/core/xds/xds_client/xds_locality.h b/src/core/xds/xds_client/xds_locality.h index 3223ff48c34..7fb469ba415 100644 --- a/src/core/xds/xds_client/xds_locality.h +++ b/src/core/xds/xds_client/xds_locality.h @@ -24,7 +24,6 @@ #include "absl/strings/str_format.h" #include "absl/strings/string_view.h" - #include "src/core/resolver/endpoint_addresses.h" #include "src/core/util/ref_counted.h" #include "src/core/util/ref_counted_ptr.h" diff --git a/src/core/xds/xds_client/xds_metrics.h b/src/core/xds/xds_client/xds_metrics.h index 5262e02e084..6e562296396 100644 --- a/src/core/xds/xds_client/xds_metrics.h +++ b/src/core/xds/xds_client/xds_metrics.h @@ -17,10 +17,10 @@ #ifndef GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_METRICS_H #define GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_METRICS_H -#include "absl/strings/string_view.h" - #include +#include "absl/strings/string_view.h" + namespace grpc_core { // An interface for XdsClient to report metrics. diff --git a/src/core/xds/xds_client/xds_resource_type.h b/src/core/xds/xds_client/xds_resource_type.h index dade8ce0f83..642ff2e7119 100644 --- a/src/core/xds/xds_client/xds_resource_type.h +++ b/src/core/xds/xds_client/xds_resource_type.h @@ -16,19 +16,18 @@ #ifndef GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_RESOURCE_TYPE_H #define GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_RESOURCE_TYPE_H +#include + #include #include #include "absl/status/statusor.h" #include "absl/strings/string_view.h" #include "absl/types/optional.h" -#include "upb/mem/arena.h" -#include "upb/reflection/def.h" - -#include - #include "src/core/lib/debug/trace.h" #include "src/core/xds/xds_client/xds_bootstrap.h" +#include "upb/mem/arena.h" +#include "upb/reflection/def.h" namespace grpc_core { diff --git a/src/core/xds/xds_client/xds_resource_type_impl.h b/src/core/xds/xds_client/xds_resource_type_impl.h index a927f796b5e..0b97edb6aa0 100644 --- a/src/core/xds/xds_client/xds_resource_type_impl.h +++ b/src/core/xds/xds_client/xds_resource_type_impl.h @@ -16,13 +16,12 @@ #ifndef GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_RESOURCE_TYPE_IMPL_H #define GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_RESOURCE_TYPE_IMPL_H +#include + #include #include #include "absl/strings/string_view.h" - -#include - #include "src/core/util/ref_counted_ptr.h" #include "src/core/xds/xds_client/xds_client.h" #include "src/core/xds/xds_client/xds_resource_type.h" diff --git a/src/core/xds/xds_client/xds_transport.h b/src/core/xds/xds_client/xds_transport.h index b471b31477c..9d7f98f6bf5 100644 --- a/src/core/xds/xds_client/xds_transport.h +++ b/src/core/xds/xds_client/xds_transport.h @@ -22,7 +22,6 @@ #include "absl/status/status.h" #include "absl/strings/string_view.h" - #include "src/core/util/dual_ref_counted.h" #include "src/core/util/orphanable.h" #include "src/core/xds/xds_client/xds_bootstrap.h" diff --git a/src/cpp/client/call_credentials.cc b/src/cpp/client/call_credentials.cc index 88ccd07ea1f..3ecc72d5980 100644 --- a/src/cpp/client/call_credentials.cc +++ b/src/cpp/client/call_credentials.cc @@ -12,12 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "absl/log/check.h" -#include "absl/strings/str_cat.h" - #include #include +#include "absl/log/check.h" +#include "absl/strings/str_cat.h" #include "src/core/lib/security/credentials/credentials.h" namespace grpc { diff --git a/src/cpp/client/channel_cc.cc b/src/cpp/client/channel_cc.cc index 457f9db37aa..e99c416d175 100644 --- a/src/cpp/client/channel_cc.cc +++ b/src/cpp/client/channel_cc.cc @@ -16,15 +16,6 @@ // // -#include -#include -#include -#include -#include -#include - -#include "absl/log/check.h" - #include #include #include @@ -41,6 +32,14 @@ #include #include +#include +#include +#include +#include +#include +#include + +#include "absl/log/check.h" #include "src/core/lib/iomgr/iomgr.h" namespace grpc { diff --git a/src/cpp/client/channel_credentials.cc b/src/cpp/client/channel_credentials.cc index 321af7783da..e27643c2846 100644 --- a/src/cpp/client/channel_credentials.cc +++ b/src/cpp/client/channel_credentials.cc @@ -11,16 +11,16 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -#include -#include -#include - #include #include #include #include #include +#include +#include +#include + namespace grpc { ChannelCredentials::ChannelCredentials(grpc_channel_credentials* c_creds) diff --git a/src/cpp/client/client_context.cc b/src/cpp/client/client_context.cc index ac480c87153..e338d440b9c 100644 --- a/src/cpp/client/client_context.cc +++ b/src/cpp/client/client_context.cc @@ -16,17 +16,6 @@ // // -#include - -#include -#include -#include -#include -#include - -#include "absl/log/check.h" -#include "absl/strings/str_format.h" - #include #include #include @@ -40,7 +29,16 @@ #include #include #include +#include + +#include +#include +#include +#include +#include +#include "absl/log/check.h" +#include "absl/strings/str_format.h" #include "src/core/util/crash.h" namespace grpc { diff --git a/src/cpp/client/create_channel.cc b/src/cpp/client/create_channel.cc index a2db03ae9ea..5385e3094e0 100644 --- a/src/cpp/client/create_channel.cc +++ b/src/cpp/client/create_channel.cc @@ -16,11 +16,6 @@ // // -#include -#include -#include -#include - #include #include #include @@ -31,6 +26,11 @@ #include #include +#include +#include +#include +#include + #include "src/cpp/client/create_channel_internal.h" namespace grpc { diff --git a/src/cpp/client/create_channel_internal.cc b/src/cpp/client/create_channel_internal.cc index e54910f46a3..31b6fa013ab 100644 --- a/src/cpp/client/create_channel_internal.cc +++ b/src/cpp/client/create_channel_internal.cc @@ -18,13 +18,13 @@ #include "src/cpp/client/create_channel_internal.h" +#include + #include #include #include #include -#include - namespace grpc { std::shared_ptr CreateChannelInternal( diff --git a/src/cpp/client/create_channel_internal.h b/src/cpp/client/create_channel_internal.h index 264ad575aac..02e555e77bb 100644 --- a/src/cpp/client/create_channel_internal.h +++ b/src/cpp/client/create_channel_internal.h @@ -19,14 +19,14 @@ #ifndef GRPC_SRC_CPP_CLIENT_CREATE_CHANNEL_INTERNAL_H #define GRPC_SRC_CPP_CLIENT_CREATE_CHANNEL_INTERNAL_H -#include -#include -#include - #include #include #include +#include +#include +#include + namespace grpc { std::shared_ptr CreateChannelInternal( diff --git a/src/cpp/client/create_channel_posix.cc b/src/cpp/client/create_channel_posix.cc index e1d6653ed55..9f25b4bfbb8 100644 --- a/src/cpp/client/create_channel_posix.cc +++ b/src/cpp/client/create_channel_posix.cc @@ -16,11 +16,6 @@ // // -#include -#include -#include -#include - #include #include #include @@ -30,6 +25,11 @@ #include #include +#include +#include +#include +#include + #include "src/cpp/client/create_channel_internal.h" namespace grpc { diff --git a/src/cpp/client/cronet_credentials.cc b/src/cpp/client/cronet_credentials.cc index da133a62f9c..0bae55aa657 100644 --- a/src/cpp/client/cronet_credentials.cc +++ b/src/cpp/client/cronet_credentials.cc @@ -16,11 +16,6 @@ // // -#include -#include -#include -#include - #include #include #include @@ -29,6 +24,11 @@ #include #include +#include +#include +#include +#include + #include "src/cpp/client/create_channel_internal.h" namespace grpc { diff --git a/src/cpp/client/global_callback_hook.cc b/src/cpp/client/global_callback_hook.cc index 2431508b7b3..e117214d1cc 100644 --- a/src/cpp/client/global_callback_hook.cc +++ b/src/cpp/client/global_callback_hook.cc @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include + #include #include "absl/base/no_destructor.h" #include "absl/log/check.h" -#include - namespace grpc { static absl::NoDestructor> g_callback_hook( diff --git a/src/cpp/client/insecure_credentials.cc b/src/cpp/client/insecure_credentials.cc index 0f3d000bd29..89dcadfc409 100644 --- a/src/cpp/client/insecure_credentials.cc +++ b/src/cpp/client/insecure_credentials.cc @@ -15,8 +15,6 @@ // limitations under the License. // // -#include - #include #include #include @@ -24,6 +22,8 @@ #include #include +#include + namespace grpc { namespace { class InsecureChannelCredentialsImpl final : public ChannelCredentials { diff --git a/src/cpp/client/secure_credentials.cc b/src/cpp/client/secure_credentials.cc index 5c1804fbc66..e46561afb64 100644 --- a/src/cpp/client/secure_credentials.cc +++ b/src/cpp/client/secure_credentials.cc @@ -18,19 +18,6 @@ #include "src/cpp/client/secure_credentials.h" -#include - -#include -#include -#include - -#include "absl/log/check.h" -#include "absl/log/log.h" -#include "absl/status/status.h" -#include "absl/status/statusor.h" -#include "absl/strings/str_join.h" -#include "absl/types/optional.h" - #include #include #include @@ -45,7 +32,18 @@ #include #include #include +#include + +#include +#include +#include +#include "absl/log/check.h" +#include "absl/log/log.h" +#include "absl/status/status.h" +#include "absl/status/statusor.h" +#include "absl/strings/str_join.h" +#include "absl/types/optional.h" #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/security/util/json_util.h" #include "src/core/util/env.h" diff --git a/src/cpp/client/xds_credentials.cc b/src/cpp/client/xds_credentials.cc index e3fefd04c47..b9771e2d340 100644 --- a/src/cpp/client/xds_credentials.cc +++ b/src/cpp/client/xds_credentials.cc @@ -16,14 +16,14 @@ // // -#include - -#include "absl/log/check.h" - #include #include #include +#include + +#include "absl/log/check.h" + namespace grpc { class XdsChannelCredentialsImpl final : public ChannelCredentials { public: diff --git a/src/cpp/common/alarm.cc b/src/cpp/common/alarm.cc index 770b07085e3..7617ca64670 100644 --- a/src/cpp/common/alarm.cc +++ b/src/cpp/common/alarm.cc @@ -15,14 +15,6 @@ // // -#include -#include -#include -#include - -#include "absl/log/check.h" -#include "absl/status/status.h" - #include #include #include @@ -32,6 +24,13 @@ #include #include +#include +#include +#include +#include + +#include "absl/log/check.h" +#include "absl/status/status.h" #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" diff --git a/src/cpp/common/alts_context.cc b/src/cpp/common/alts_context.cc index b8fed615a42..cdcf53ee59e 100644 --- a/src/cpp/common/alts_context.cc +++ b/src/cpp/common/alts_context.cc @@ -16,19 +16,17 @@ // // +#include +#include #include #include #include -#include "upb/base/string_view.h" -#include "upb/message/map.h" - -#include -#include - #include "src/proto/grpc/gcp/altscontext.upb.h" #include "src/proto/grpc/gcp/transport_security_common.upb.h" +#include "upb/base/string_view.h" +#include "upb/message/map.h" namespace grpc { namespace experimental { diff --git a/src/cpp/common/alts_util.cc b/src/cpp/common/alts_util.cc index df1a8a8cf5b..1a0a2149b1f 100644 --- a/src/cpp/common/alts_util.cc +++ b/src/cpp/common/alts_util.cc @@ -16,14 +16,6 @@ // // -#include -#include -#include -#include - -#include "absl/log/log.h" -#include "upb/mem/arena.hpp" - #include #include #include @@ -31,8 +23,15 @@ #include #include +#include +#include +#include +#include + +#include "absl/log/log.h" #include "src/core/tsi/alts/handshaker/alts_tsi_handshaker.h" #include "src/proto/grpc/gcp/altscontext.upb.h" +#include "upb/mem/arena.hpp" namespace grpc { namespace experimental { diff --git a/src/cpp/common/auth_property_iterator.cc b/src/cpp/common/auth_property_iterator.cc index 10e71d3a174..854e999115e 100644 --- a/src/cpp/common/auth_property_iterator.cc +++ b/src/cpp/common/auth_property_iterator.cc @@ -16,12 +16,12 @@ // // -#include - #include #include #include +#include + namespace grpc { AuthPropertyIterator::AuthPropertyIterator() diff --git a/src/cpp/common/channel_arguments.cc b/src/cpp/common/channel_arguments.cc index fc09938b99f..af1838571ca 100644 --- a/src/cpp/common/channel_arguments.cc +++ b/src/cpp/common/channel_arguments.cc @@ -15,19 +15,18 @@ // limitations under the License. // // -#include -#include -#include -#include - -#include "absl/log/check.h" - #include #include #include #include #include +#include +#include +#include +#include + +#include "absl/log/check.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/socket_mutator.h" diff --git a/src/cpp/common/completion_queue_cc.cc b/src/cpp/common/completion_queue_cc.cc index 88396bfbbc6..ebaf659acc2 100644 --- a/src/cpp/common/completion_queue_cc.cc +++ b/src/cpp/common/completion_queue_cc.cc @@ -15,12 +15,6 @@ // // -#include - -#include "absl/base/thread_annotations.h" -#include "absl/log/check.h" -#include "absl/log/log.h" - #include #include #include @@ -29,6 +23,11 @@ #include #include +#include + +#include "absl/base/thread_annotations.h" +#include "absl/log/check.h" +#include "absl/log/log.h" #include "src/core/util/sync.h" #include "src/core/util/thd.h" #include "src/core/util/useful.h" diff --git a/src/cpp/common/insecure_create_auth_context.cc b/src/cpp/common/insecure_create_auth_context.cc index b4c02d39b36..785357e1806 100644 --- a/src/cpp/common/insecure_create_auth_context.cc +++ b/src/cpp/common/insecure_create_auth_context.cc @@ -15,11 +15,11 @@ // limitations under the License. // // -#include - #include #include +#include + namespace grpc { std::shared_ptr CreateAuthContext(grpc_call* call) { diff --git a/src/cpp/common/resource_quota_cc.cc b/src/cpp/common/resource_quota_cc.cc index 075a4f71d76..253edd04ba4 100644 --- a/src/cpp/common/resource_quota_cc.cc +++ b/src/cpp/common/resource_quota_cc.cc @@ -16,13 +16,12 @@ // // +#include +#include #include #include -#include -#include - namespace grpc { ResourceQuota::ResourceQuota() : impl_(grpc_resource_quota_create(nullptr)) {} diff --git a/src/cpp/common/secure_auth_context.cc b/src/cpp/common/secure_auth_context.cc index c1b69efe4d5..ccf362b58be 100644 --- a/src/cpp/common/secure_auth_context.cc +++ b/src/cpp/common/secure_auth_context.cc @@ -18,10 +18,10 @@ #include "src/cpp/common/secure_auth_context.h" -#include - #include +#include + namespace grpc { std::vector SecureAuthContext::GetPeerIdentity() const { diff --git a/src/cpp/common/secure_auth_context.h b/src/cpp/common/secure_auth_context.h index 8da3e971c22..405036faa05 100644 --- a/src/cpp/common/secure_auth_context.h +++ b/src/cpp/common/secure_auth_context.h @@ -19,13 +19,13 @@ #ifndef GRPC_SRC_CPP_COMMON_SECURE_AUTH_CONTEXT_H #define GRPC_SRC_CPP_COMMON_SECURE_AUTH_CONTEXT_H -#include -#include - #include #include #include +#include +#include + #include "src/core/lib/security/context/security_context.h" #include "src/core/util/ref_counted_ptr.h" diff --git a/src/cpp/common/secure_create_auth_context.cc b/src/cpp/common/secure_create_auth_context.cc index 8492655b4aa..3c1caeaccb5 100644 --- a/src/cpp/common/secure_create_auth_context.cc +++ b/src/cpp/common/secure_create_auth_context.cc @@ -15,12 +15,12 @@ // limitations under the License. // // -#include - #include #include #include +#include + #include "src/core/lib/security/context/security_context.h" #include "src/core/util/ref_counted_ptr.h" #include "src/cpp/common/secure_auth_context.h" diff --git a/src/cpp/common/tls_certificate_provider.cc b/src/cpp/common/tls_certificate_provider.cc index 88c684b3a45..091e478b9ba 100644 --- a/src/cpp/common/tls_certificate_provider.cc +++ b/src/cpp/common/tls_certificate_provider.cc @@ -14,15 +14,14 @@ // limitations under the License. // -#include -#include - -#include "absl/log/check.h" - #include #include #include +#include +#include + +#include "absl/log/check.h" #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h" namespace grpc { diff --git a/src/cpp/common/tls_certificate_verifier.cc b/src/cpp/common/tls_certificate_verifier.cc index d298cf26773..dfbd2e1c3e1 100644 --- a/src/cpp/common/tls_certificate_verifier.cc +++ b/src/cpp/common/tls_certificate_verifier.cc @@ -14,16 +14,6 @@ // limitations under the License. // -#include - -#include -#include -#include -#include -#include - -#include "absl/log/check.h" - #include #include #include @@ -33,6 +23,15 @@ #include #include #include +#include + +#include +#include +#include +#include +#include + +#include "absl/log/check.h" namespace grpc { namespace experimental { diff --git a/src/cpp/common/tls_credentials_options.cc b/src/cpp/common/tls_credentials_options.cc index 74e74128322..339a714bd2d 100644 --- a/src/cpp/common/tls_credentials_options.cc +++ b/src/cpp/common/tls_credentials_options.cc @@ -16,11 +16,6 @@ // // -#include -#include - -#include "absl/log/check.h" - #include #include #include @@ -30,6 +25,11 @@ #include #include +#include +#include + +#include "absl/log/check.h" + namespace grpc { namespace experimental { diff --git a/src/cpp/common/validate_service_config.cc b/src/cpp/common/validate_service_config.cc index f8f662d87b3..6869617036a 100644 --- a/src/cpp/common/validate_service_config.cc +++ b/src/cpp/common/validate_service_config.cc @@ -16,14 +16,13 @@ // // +#include +#include + #include #include "absl/status/status.h" #include "absl/status/statusor.h" - -#include -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/service_config/service_config.h" #include "src/core/service_config/service_config_impl.h" diff --git a/src/cpp/common/version_cc.cc b/src/cpp/common/version_cc.cc index 44824d66f72..dbfe28ab0a5 100644 --- a/src/cpp/common/version_cc.cc +++ b/src/cpp/common/version_cc.cc @@ -16,10 +16,10 @@ // // -#include - #include +#include + namespace grpc { std::string Version() { return GRPC_CPP_VERSION_STRING; } } // namespace grpc diff --git a/src/cpp/ext/chaotic_good.cc b/src/cpp/ext/chaotic_good.cc index 7268598118e..31c36231a9c 100644 --- a/src/cpp/ext/chaotic_good.cc +++ b/src/cpp/ext/chaotic_good.cc @@ -14,10 +14,10 @@ #include "src/cpp/ext/chaotic_good.h" -#include - #include +#include + #include "src/core/ext/transport/chaotic_good/client/chaotic_good_connector.h" #include "src/core/ext/transport/chaotic_good/server/chaotic_good_server.h" diff --git a/src/cpp/ext/chaotic_good.h b/src/cpp/ext/chaotic_good.h index b203f473e59..73fed2bd632 100644 --- a/src/cpp/ext/chaotic_good.h +++ b/src/cpp/ext/chaotic_good.h @@ -15,11 +15,11 @@ #ifndef GRPC_SRC_CPP_EXT_CHAOTIC_GOOD_H #define GRPC_SRC_CPP_EXT_CHAOTIC_GOOD_H -#include - #include #include +#include + namespace grpc { std::shared_ptr ChaoticGoodInsecureChannelCredentials(); diff --git a/src/cpp/ext/csm/csm_observability.cc b/src/cpp/ext/csm/csm_observability.cc index a5f61794660..66a2194f0e5 100644 --- a/src/cpp/ext/csm/csm_observability.cc +++ b/src/cpp/ext/csm/csm_observability.cc @@ -18,6 +18,9 @@ #include "src/cpp/ext/csm/csm_observability.h" +#include +#include + #include #include #include @@ -30,10 +33,6 @@ #include "opentelemetry/sdk/metrics/meter_provider.h" #include "opentelemetry/sdk/resource/resource.h" #include "opentelemetry/sdk/resource/resource_detector.h" - -#include -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/util/uri.h" #include "src/core/xds/grpc/xds_enabled_server.h" diff --git a/src/cpp/ext/csm/csm_observability.h b/src/cpp/ext/csm/csm_observability.h index 8e623cb4edf..a42831a4f4a 100644 --- a/src/cpp/ext/csm/csm_observability.h +++ b/src/cpp/ext/csm/csm_observability.h @@ -19,10 +19,9 @@ #ifndef GRPC_SRC_CPP_EXT_CSM_CSM_OBSERVABILITY_H #define GRPC_SRC_CPP_EXT_CSM_CSM_OBSERVABILITY_H -#include "absl/strings/string_view.h" - #include +#include "absl/strings/string_view.h" #include "src/core/lib/channel/channel_args.h" namespace grpc { diff --git a/src/cpp/ext/csm/metadata_exchange.cc b/src/cpp/ext/csm/metadata_exchange.cc index bd922460fb9..5934554d10d 100644 --- a/src/cpp/ext/csm/metadata_exchange.cc +++ b/src/cpp/ext/csm/metadata_exchange.cc @@ -18,6 +18,8 @@ #include "src/cpp/ext/csm/metadata_exchange.h" +#include +#include #include #include @@ -34,11 +36,6 @@ #include "absl/types/optional.h" #include "absl/types/variant.h" #include "opentelemetry/sdk/resource/semantic_conventions.h" -#include "upb/base/string_view.h" - -#include -#include - #include "src/core/lib/iomgr/error.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/telemetry/call_tracer.h" @@ -48,6 +45,7 @@ #include "src/core/util/json/json_reader.h" #include "src/core/util/load_file.h" #include "src/cpp/ext/otel/key_value_iterable.h" +#include "upb/base/string_view.h" namespace grpc { namespace internal { diff --git a/src/cpp/ext/csm/metadata_exchange.h b/src/cpp/ext/csm/metadata_exchange.h index 4487dcbb74e..0830acdd7ef 100644 --- a/src/cpp/ext/csm/metadata_exchange.h +++ b/src/cpp/ext/csm/metadata_exchange.h @@ -19,6 +19,8 @@ #ifndef GRPC_SRC_CPP_EXT_CSM_METADATA_EXCHANGE_H #define GRPC_SRC_CPP_EXT_CSM_METADATA_EXCHANGE_H +#include + #include #include #include @@ -27,13 +29,10 @@ #include "absl/strings/string_view.h" #include "google/protobuf/struct.upb.h" #include "opentelemetry/sdk/common/attribute_utils.h" -#include "upb/mem/arena.hpp" - -#include - #include "src/core/lib/slice/slice.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/cpp/ext/otel/otel_plugin.h" +#include "upb/mem/arena.hpp" namespace grpc { namespace internal { diff --git a/src/cpp/ext/filters/census/client_filter.cc b/src/cpp/ext/filters/census/client_filter.cc index 001c1fa8d18..d865b75147c 100644 --- a/src/cpp/ext/filters/census/client_filter.cc +++ b/src/cpp/ext/filters/census/client_filter.cc @@ -18,6 +18,12 @@ #include "src/cpp/ext/filters/census/client_filter.h" +#include +#include +#include +#include +#include +#include #include #include @@ -42,14 +48,6 @@ #include "opencensus/trace/span.h" #include "opencensus/trace/span_context.h" #include "opencensus/trace/status_code.h" - -#include -#include -#include -#include -#include -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/experiments/experiments.h" diff --git a/src/cpp/ext/filters/census/client_filter.h b/src/cpp/ext/filters/census/client_filter.h index 8e2f4057c3b..e1ee13b087f 100644 --- a/src/cpp/ext/filters/census/client_filter.h +++ b/src/cpp/ext/filters/census/client_filter.h @@ -19,12 +19,11 @@ #ifndef GRPC_SRC_CPP_EXT_FILTERS_CENSUS_CLIENT_FILTER_H #define GRPC_SRC_CPP_EXT_FILTERS_CENSUS_CLIENT_FILTER_H -#include "absl/status/statusor.h" - #include #include #include +#include "absl/status/statusor.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" diff --git a/src/cpp/ext/filters/census/context.cc b/src/cpp/ext/filters/census/context.cc index 21d10f1fd28..2545b34e7ad 100644 --- a/src/cpp/ext/filters/census/context.cc +++ b/src/cpp/ext/filters/census/context.cc @@ -18,15 +18,14 @@ #include "src/cpp/ext/filters/census/context.h" +#include + #include #include "opencensus/tags/context_util.h" #include "opencensus/tags/tag_map.h" #include "opencensus/trace/context_util.h" #include "opencensus/trace/propagation/grpc_trace_bin.h" - -#include - #include "src/core/lib/transport/transport.h" #include "src/cpp/ext/filters/census/grpc_plugin.h" #include "src/cpp/ext/filters/census/rpc_encoding.h" diff --git a/src/cpp/ext/filters/census/context.h b/src/cpp/ext/filters/census/context.h index 503823a427e..fcee9407139 100644 --- a/src/cpp/ext/filters/census/context.h +++ b/src/cpp/ext/filters/census/context.h @@ -19,6 +19,11 @@ #ifndef GRPC_SRC_CPP_EXT_FILTERS_CENSUS_CONTEXT_H #define GRPC_SRC_CPP_EXT_FILTERS_CENSUS_CONTEXT_H +#include +#include +#include +#include +#include #include #include @@ -26,13 +31,6 @@ #include "absl/strings/strip.h" #include "opencensus/trace/span.h" #include "opencensus/trace/span_context.h" - -#include -#include -#include -#include -#include - #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/slice/slice.h" diff --git a/src/cpp/ext/filters/census/grpc_plugin.cc b/src/cpp/ext/filters/census/grpc_plugin.cc index f41d6d687e8..cb407b21cdb 100644 --- a/src/cpp/ext/filters/census/grpc_plugin.cc +++ b/src/cpp/ext/filters/census/grpc_plugin.cc @@ -18,17 +18,16 @@ #include "src/cpp/ext/filters/census/grpc_plugin.h" +#include +#include +#include + #include #include "absl/base/attributes.h" #include "absl/strings/string_view.h" #include "opencensus/tags/tag_key.h" #include "opencensus/trace/span.h" - -#include -#include -#include - #include "src/core/ext/filters/logging/logging_filter.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/surface/channel_stack_type.h" diff --git a/src/cpp/ext/filters/census/grpc_plugin.h b/src/cpp/ext/filters/census/grpc_plugin.h index 553857c96b7..af647d33af1 100644 --- a/src/cpp/ext/filters/census/grpc_plugin.h +++ b/src/cpp/ext/filters/census/grpc_plugin.h @@ -19,6 +19,9 @@ #ifndef GRPC_SRC_CPP_EXT_FILTERS_CENSUS_GRPC_PLUGIN_H #define GRPC_SRC_CPP_EXT_FILTERS_CENSUS_GRPC_PLUGIN_H +#include +#include + #include #include #include @@ -30,9 +33,6 @@ #include "opencensus/tags/tag_key.h" #include "opencensus/tags/tag_map.h" -#include -#include - namespace grpc { // The following using declarations have been added to prevent breaking users diff --git a/src/cpp/ext/filters/census/measures.cc b/src/cpp/ext/filters/census/measures.cc index 5710d04dc6e..c5f0d973d6e 100644 --- a/src/cpp/ext/filters/census/measures.cc +++ b/src/cpp/ext/filters/census/measures.cc @@ -18,11 +18,10 @@ #include "src/cpp/ext/filters/census/measures.h" -#include "opencensus/stats/stats.h" - #include #include +#include "opencensus/stats/stats.h" #include "src/cpp/ext/filters/census/grpc_plugin.h" namespace grpc { diff --git a/src/cpp/ext/filters/census/measures.h b/src/cpp/ext/filters/census/measures.h index 78a58c6732a..5d0f39022c5 100644 --- a/src/cpp/ext/filters/census/measures.h +++ b/src/cpp/ext/filters/census/measures.h @@ -19,10 +19,10 @@ #ifndef GRPC_SRC_CPP_EXT_FILTERS_CENSUS_MEASURES_H #define GRPC_SRC_CPP_EXT_FILTERS_CENSUS_MEASURES_H -#include "opencensus/stats/stats.h" - #include +#include "opencensus/stats/stats.h" + namespace grpc { ::opencensus::stats::MeasureInt64 RpcClientSentMessagesPerRpc(); diff --git a/src/cpp/ext/filters/census/open_census_call_tracer.h b/src/cpp/ext/filters/census/open_census_call_tracer.h index 2b98d4cb861..6b50bc0c756 100644 --- a/src/cpp/ext/filters/census/open_census_call_tracer.h +++ b/src/cpp/ext/filters/census/open_census_call_tracer.h @@ -19,6 +19,9 @@ #ifndef GRPC_SRC_CPP_EXT_FILTERS_CENSUS_OPEN_CENSUS_CALL_TRACER_H #define GRPC_SRC_CPP_EXT_FILTERS_CENSUS_OPEN_CENSUS_CALL_TRACER_H +#include +#include +#include #include #include @@ -33,11 +36,6 @@ #include "opencensus/trace/span_context.h" #include "opencensus/trace/span_id.h" #include "opencensus/trace/trace_id.h" - -#include -#include -#include - #include "src/core/lib/iomgr/error.h" #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/slice/slice.h" diff --git a/src/cpp/ext/filters/census/rpc_encoding.h b/src/cpp/ext/filters/census/rpc_encoding.h index a42b4d8c9e6..ad474d81e1b 100644 --- a/src/cpp/ext/filters/census/rpc_encoding.h +++ b/src/cpp/ext/filters/census/rpc_encoding.h @@ -19,14 +19,13 @@ #ifndef GRPC_SRC_CPP_EXT_FILTERS_CENSUS_RPC_ENCODING_H #define GRPC_SRC_CPP_EXT_FILTERS_CENSUS_RPC_ENCODING_H +#include #include #include #include "absl/base/internal/endian.h" #include "absl/strings/string_view.h" -#include - namespace grpc { namespace internal { diff --git a/src/cpp/ext/filters/census/server_call_tracer.cc b/src/cpp/ext/filters/census/server_call_tracer.cc index e98b21ec0bc..bb6fb57f793 100644 --- a/src/cpp/ext/filters/census/server_call_tracer.cc +++ b/src/cpp/ext/filters/census/server_call_tracer.cc @@ -18,6 +18,9 @@ #include "src/cpp/ext/filters/census/server_call_tracer.h" +#include +#include +#include #include #include @@ -40,11 +43,6 @@ #include "opencensus/trace/span_context.h" #include "opencensus/trace/span_id.h" #include "opencensus/trace/trace_id.h" - -#include -#include -#include - #include "src/core/lib/iomgr/error.h" #include "src/core/lib/promise/context.h" #include "src/core/lib/resource_quota/arena.h" diff --git a/src/cpp/ext/filters/census/views.cc b/src/cpp/ext/filters/census/views.cc index 068c9089413..3fa27ff57a6 100644 --- a/src/cpp/ext/filters/census/views.cc +++ b/src/cpp/ext/filters/census/views.cc @@ -16,14 +16,13 @@ // // +#include +#include + #include #include "absl/time/time.h" #include "opencensus/stats/stats.h" - -#include -#include - #include "src/cpp/ext/filters/census/grpc_plugin.h" namespace grpc { diff --git a/src/cpp/ext/gcp/environment_autodetect.cc b/src/cpp/ext/gcp/environment_autodetect.cc index 77f74608ee3..98365f3164f 100644 --- a/src/cpp/ext/gcp/environment_autodetect.cc +++ b/src/cpp/ext/gcp/environment_autodetect.cc @@ -18,6 +18,11 @@ #include "src/cpp/ext/gcp/environment_autodetect.h" +#include +#include +#include +#include + #include #include @@ -27,12 +32,6 @@ #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/types/optional.h" - -#include -#include -#include -#include - #include "src/core/lib/debug/trace.h" #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/iomgr/closure.h" diff --git a/src/cpp/ext/gcp/environment_autodetect.h b/src/cpp/ext/gcp/environment_autodetect.h index b45eb9ed2c1..21ccfdf47a7 100644 --- a/src/cpp/ext/gcp/environment_autodetect.h +++ b/src/cpp/ext/gcp/environment_autodetect.h @@ -17,6 +17,9 @@ #ifndef GRPC_SRC_CPP_EXT_GCP_ENVIRONMENT_AUTODETECT_H #define GRPC_SRC_CPP_EXT_GCP_ENVIRONMENT_AUTODETECT_H +#include +#include + #include #include #include @@ -25,10 +28,6 @@ #include "absl/base/thread_annotations.h" #include "absl/functional/any_invocable.h" #include "absl/status/status.h" - -#include -#include - #include "src/core/util/sync.h" namespace grpc { diff --git a/src/cpp/ext/gcp/observability.cc b/src/cpp/ext/gcp/observability.cc index ef508c89dd9..ba60e112724 100644 --- a/src/cpp/ext/gcp/observability.cc +++ b/src/cpp/ext/gcp/observability.cc @@ -14,6 +14,13 @@ // limitations under the License. // +#include +#include +#include +#include +#include +#include +#include #include #include @@ -37,15 +44,6 @@ #include "opencensus/stats/stats.h" #include "opencensus/trace/sampler.h" #include "opencensus/trace/trace_config.h" - -#include -#include -#include -#include -#include -#include -#include - #include "src/core/ext/filters/logging/logging_filter.h" #include "src/core/util/crash.h" #include "src/core/util/notification.h" diff --git a/src/cpp/ext/gcp/observability_config.cc b/src/cpp/ext/gcp/observability_config.cc index f6ffcf94d6a..64246249f01 100644 --- a/src/cpp/ext/gcp/observability_config.cc +++ b/src/cpp/ext/gcp/observability_config.cc @@ -16,6 +16,9 @@ #include "src/cpp/ext/gcp/observability_config.h" +#include +#include +#include #include #include @@ -27,11 +30,6 @@ #include "absl/strings/str_split.h" #include "absl/strings/string_view.h" #include "absl/types/optional.h" - -#include -#include -#include - #include "src/core/lib/iomgr/error.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/transport/error_utils.h" diff --git a/src/cpp/ext/gcp/observability_config.h b/src/cpp/ext/gcp/observability_config.h index 5fb18f3fae6..bc7d347a6e8 100644 --- a/src/cpp/ext/gcp/observability_config.h +++ b/src/cpp/ext/gcp/observability_config.h @@ -17,6 +17,7 @@ #ifndef GRPC_SRC_CPP_EXT_GCP_OBSERVABILITY_CONFIG_H #define GRPC_SRC_CPP_EXT_GCP_OBSERVABILITY_CONFIG_H +#include #include #include @@ -26,9 +27,6 @@ #include "absl/status/statusor.h" #include "absl/strings/string_view.h" #include "absl/types/optional.h" - -#include - #include "src/core/util/json/json.h" #include "src/core/util/json/json_args.h" #include "src/core/util/json/json_object_loader.h" diff --git a/src/cpp/ext/gcp/observability_logging_sink.cc b/src/cpp/ext/gcp/observability_logging_sink.cc index 0a370d87606..302cbc7be4d 100644 --- a/src/cpp/ext/gcp/observability_logging_sink.cc +++ b/src/cpp/ext/gcp/observability_logging_sink.cc @@ -18,6 +18,14 @@ #include "src/cpp/ext/gcp/observability_logging_sink.h" +#include +#include +#include +#include +#include +#include +#include + #include #include #include @@ -33,15 +41,6 @@ #include "google/logging/v2/logging.grpc.pb.h" #include "google/logging/v2/logging.pb.h" #include "google/protobuf/text_format.h" - -#include -#include -#include -#include -#include -#include -#include - #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/util/env.h" #include "src/core/util/json/json.h" diff --git a/src/cpp/ext/gcp/observability_logging_sink.h b/src/cpp/ext/gcp/observability_logging_sink.h index f4703721f3d..a61765118c2 100644 --- a/src/cpp/ext/gcp/observability_logging_sink.h +++ b/src/cpp/ext/gcp/observability_logging_sink.h @@ -19,6 +19,8 @@ #ifndef GRPC_SRC_CPP_EXT_GCP_OBSERVABILITY_LOGGING_SINK_H #define GRPC_SRC_CPP_EXT_GCP_OBSERVABILITY_LOGGING_SINK_H +#include +#include #include #include @@ -30,10 +32,6 @@ #include "absl/base/thread_annotations.h" #include "absl/strings/string_view.h" #include "google/logging/v2/logging.grpc.pb.h" - -#include -#include - #include "src/core/ext/filters/logging/logging_sink.h" #include "src/core/util/sync.h" #include "src/cpp/ext/gcp/environment_autodetect.h" diff --git a/src/cpp/ext/otel/key_value_iterable.h b/src/cpp/ext/otel/key_value_iterable.h index caad77aee36..b3d8d7d747f 100644 --- a/src/cpp/ext/otel/key_value_iterable.h +++ b/src/cpp/ext/otel/key_value_iterable.h @@ -19,6 +19,7 @@ #ifndef GRPC_SRC_CPP_EXT_OTEL_KEY_VALUE_ITERABLE_H #define GRPC_SRC_CPP_EXT_OTEL_KEY_VALUE_ITERABLE_H +#include #include #include @@ -31,9 +32,6 @@ #include "opentelemetry/common/key_value_iterable.h" #include "opentelemetry/nostd/function_ref.h" #include "opentelemetry/nostd/string_view.h" - -#include - #include "src/cpp/ext/otel/otel_plugin.h" namespace grpc { diff --git a/src/cpp/ext/otel/otel_client_call_tracer.cc b/src/cpp/ext/otel/otel_client_call_tracer.cc index 88750fca3e3..bf5b3aba61f 100644 --- a/src/cpp/ext/otel/otel_client_call_tracer.cc +++ b/src/cpp/ext/otel/otel_client_call_tracer.cc @@ -18,6 +18,9 @@ #include "src/cpp/ext/otel/otel_client_call_tracer.h" +#include +#include +#include #include #include @@ -38,11 +41,6 @@ #include "absl/types/span.h" #include "opentelemetry/context/context.h" #include "opentelemetry/metrics/sync_instruments.h" - -#include -#include -#include - #include "src/core/client_channel/client_channel_filter.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/channel/status_util.h" diff --git a/src/cpp/ext/otel/otel_client_call_tracer.h b/src/cpp/ext/otel/otel_client_call_tracer.h index c94219f2152..e489c7fa5f3 100644 --- a/src/cpp/ext/otel/otel_client_call_tracer.h +++ b/src/cpp/ext/otel/otel_client_call_tracer.h @@ -19,6 +19,8 @@ #ifndef GRPC_SRC_CPP_EXT_OTEL_OTEL_CLIENT_CALL_TRACER_H #define GRPC_SRC_CPP_EXT_OTEL_OTEL_CLIENT_CALL_TRACER_H +#include +#include #include #include @@ -28,10 +30,6 @@ #include "absl/status/status.h" #include "absl/strings/string_view.h" #include "absl/time/time.h" - -#include -#include - #include "src/core/lib/iomgr/error.h" #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/slice/slice.h" diff --git a/src/cpp/ext/otel/otel_plugin.cc b/src/cpp/ext/otel/otel_plugin.cc index 7f71ec517f6..c55c4584358 100644 --- a/src/cpp/ext/otel/otel_plugin.cc +++ b/src/cpp/ext/otel/otel_plugin.cc @@ -18,6 +18,10 @@ #include "src/cpp/ext/otel/otel_plugin.h" +#include +#include +#include + #include #include #include @@ -29,11 +33,6 @@ #include "opentelemetry/nostd/shared_ptr.h" #include "opentelemetry/nostd/unique_ptr.h" #include "opentelemetry/nostd/variant.h" - -#include -#include -#include - #include "src/core/client_channel/client_channel_filter.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" diff --git a/src/cpp/ext/otel/otel_plugin.h b/src/cpp/ext/otel/otel_plugin.h index 9b0c4328673..2199596ed62 100644 --- a/src/cpp/ext/otel/otel_plugin.h +++ b/src/cpp/ext/otel/otel_plugin.h @@ -19,6 +19,9 @@ #ifndef GRPC_SRC_CPP_EXT_OTEL_OTEL_PLUGIN_H #define GRPC_SRC_CPP_EXT_OTEL_OTEL_PLUGIN_H +#include +#include +#include #include #include @@ -37,11 +40,6 @@ #include "opentelemetry/metrics/observer_result.h" #include "opentelemetry/metrics/sync_instruments.h" #include "opentelemetry/nostd/shared_ptr.h" - -#include -#include -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/telemetry/metrics.h" diff --git a/src/cpp/ext/otel/otel_server_call_tracer.cc b/src/cpp/ext/otel/otel_server_call_tracer.cc index 6fd4785672d..0e5d42febad 100644 --- a/src/cpp/ext/otel/otel_server_call_tracer.cc +++ b/src/cpp/ext/otel/otel_server_call_tracer.cc @@ -18,6 +18,8 @@ #include "src/cpp/ext/otel/otel_server_call_tracer.h" +#include + #include #include #include @@ -32,9 +34,6 @@ #include "absl/types/span.h" #include "opentelemetry/context/context.h" #include "opentelemetry/metrics/sync_instruments.h" - -#include - #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/channel/status_util.h" #include "src/core/lib/experiments/experiments.h" diff --git a/src/cpp/ext/otel/otel_server_call_tracer.h b/src/cpp/ext/otel/otel_server_call_tracer.h index 9d13d669b6d..b4f32f6ae84 100644 --- a/src/cpp/ext/otel/otel_server_call_tracer.h +++ b/src/cpp/ext/otel/otel_server_call_tracer.h @@ -19,10 +19,9 @@ #ifndef GRPC_SRC_CPP_EXT_OTEL_OTEL_SERVER_CALL_TRACER_H #define GRPC_SRC_CPP_EXT_OTEL_OTEL_SERVER_CALL_TRACER_H -#include "absl/strings/strip.h" - #include +#include "absl/strings/strip.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/telemetry/call_tracer.h" #include "src/cpp/ext/otel/otel_plugin.h" diff --git a/src/cpp/ext/proto_server_reflection.cc b/src/cpp/ext/proto_server_reflection.cc index 95a30d892a9..075fc72ef3c 100644 --- a/src/cpp/ext/proto_server_reflection.cc +++ b/src/cpp/ext/proto_server_reflection.cc @@ -18,13 +18,13 @@ #include "src/cpp/ext/proto_server_reflection.h" -#include -#include - #include #include #include +#include +#include + // IWYU pragma: no_include "google/protobuf/descriptor.h" // IWYU pragma: no_include // IWYU pragma: no_include "src/proto/grpc/reflection/v1/reflection.pb.h" diff --git a/src/cpp/ext/proto_server_reflection.h b/src/cpp/ext/proto_server_reflection.h index 989e0bd3e23..9f1ba787ff0 100644 --- a/src/cpp/ext/proto_server_reflection.h +++ b/src/cpp/ext/proto_server_reflection.h @@ -19,18 +19,18 @@ #ifndef GRPC_SRC_CPP_EXT_PROTO_SERVER_REFLECTION_H #define GRPC_SRC_CPP_EXT_PROTO_SERVER_REFLECTION_H -#include -#include -#include -#include -#include - #include #include #include #include #include +#include +#include +#include +#include +#include + #include "src/proto/grpc/reflection/v1/reflection.grpc.pb.h" #include "src/proto/grpc/reflection/v1alpha/reflection.grpc.pb.h" diff --git a/src/cpp/ext/proto_server_reflection_plugin.cc b/src/cpp/ext/proto_server_reflection_plugin.cc index 4299884055d..d880fc127a1 100644 --- a/src/cpp/ext/proto_server_reflection_plugin.cc +++ b/src/cpp/ext/proto_server_reflection_plugin.cc @@ -16,14 +16,14 @@ // // -#include -#include - #include #include #include #include +#include +#include + #include "src/core/lib/config/config_vars.h" #include "src/cpp/ext/proto_server_reflection.h" diff --git a/src/cpp/server/authorization_policy_provider.cc b/src/cpp/server/authorization_policy_provider.cc index bc34cdf44f8..efd67c7d968 100644 --- a/src/cpp/server/authorization_policy_provider.cc +++ b/src/cpp/server/authorization_policy_provider.cc @@ -12,15 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include -#include - #include #include #include #include #include +#include +#include + namespace grpc { namespace experimental { diff --git a/src/cpp/server/backend_metric_recorder.cc b/src/cpp/server/backend_metric_recorder.cc index 40a19f3a72f..6670878c7c2 100644 --- a/src/cpp/server/backend_metric_recorder.cc +++ b/src/cpp/server/backend_metric_recorder.cc @@ -16,6 +16,8 @@ #include "src/cpp/server/backend_metric_recorder.h" +#include +#include #include #include @@ -25,10 +27,6 @@ #include #include "absl/log/log.h" - -#include -#include - #include "src/core/lib/debug/trace.h" #include "src/core/load_balancing/backend_metric_data.h" diff --git a/src/cpp/server/backend_metric_recorder.h b/src/cpp/server/backend_metric_recorder.h index 0863d2b6a31..a556cb9b57f 100644 --- a/src/cpp/server/backend_metric_recorder.h +++ b/src/cpp/server/backend_metric_recorder.h @@ -19,6 +19,10 @@ #ifndef GRPC_SRC_CPP_SERVER_BACKEND_METRIC_RECORDER_H #define GRPC_SRC_CPP_SERVER_BACKEND_METRIC_RECORDER_H +#include +#include +#include +#include #include #include @@ -26,12 +30,6 @@ #include "absl/base/thread_annotations.h" #include "absl/strings/string_view.h" - -#include -#include -#include -#include - #include "src/core/ext/filters/backend_metrics/backend_metric_provider.h" #include "src/core/load_balancing/backend_metric_data.h" diff --git a/src/cpp/server/channel_argument_option.cc b/src/cpp/server/channel_argument_option.cc index 8ddad683cfd..957f99f79ed 100644 --- a/src/cpp/server/channel_argument_option.cc +++ b/src/cpp/server/channel_argument_option.cc @@ -16,15 +16,15 @@ // // -#include -#include -#include - #include #include #include #include +#include +#include +#include + namespace grpc { std::unique_ptr MakeChannelArgumentOption( diff --git a/src/cpp/server/channelz/channelz_service.cc b/src/cpp/server/channelz/channelz_service.cc index 5b9b2ff2553..3d2dbfe089f 100644 --- a/src/cpp/server/channelz/channelz_service.cc +++ b/src/cpp/server/channelz/channelz_service.cc @@ -18,12 +18,12 @@ #include "src/cpp/server/channelz/channelz_service.h" -#include - #include #include #include +#include + // IWYU pragma: no_include "google/protobuf/json/json.h" // IWYU pragma: no_include "google/protobuf/util/json_util.h" diff --git a/src/cpp/server/channelz/channelz_service_plugin.cc b/src/cpp/server/channelz/channelz_service_plugin.cc index a3d842ca145..e69b707e7bf 100644 --- a/src/cpp/server/channelz/channelz_service_plugin.cc +++ b/src/cpp/server/channelz/channelz_service_plugin.cc @@ -16,15 +16,15 @@ // // -#include -#include - #include #include #include #include #include +#include +#include + #include "src/cpp/server/channelz/channelz_service.h" namespace grpc { diff --git a/src/cpp/server/csds/csds.cc b/src/cpp/server/csds/csds.cc index d82d2b381c6..bda3a3e0112 100644 --- a/src/cpp/server/csds/csds.cc +++ b/src/cpp/server/csds/csds.cc @@ -18,17 +18,17 @@ #include "src/cpp/server/csds/csds.h" +#include +#include +#include +#include + #include #include #include "absl/status/status.h" #include "absl/status/statusor.h" -#include -#include -#include -#include - namespace grpc { namespace xds { namespace experimental { diff --git a/src/cpp/server/dynamic_thread_pool.h b/src/cpp/server/dynamic_thread_pool.h index 30da5d1de52..90be3414c7f 100644 --- a/src/cpp/server/dynamic_thread_pool.h +++ b/src/cpp/server/dynamic_thread_pool.h @@ -19,11 +19,11 @@ #ifndef GRPC_SRC_CPP_SERVER_DYNAMIC_THREAD_POOL_H #define GRPC_SRC_CPP_SERVER_DYNAMIC_THREAD_POOL_H +#include + #include #include -#include - #include "src/core/lib/event_engine/default_event_engine.h" #include "src/cpp/server/thread_pool_interface.h" diff --git a/src/cpp/server/external_connection_acceptor_impl.cc b/src/cpp/server/external_connection_acceptor_impl.cc index 208ac0a37f2..5623dbfa36c 100644 --- a/src/cpp/server/external_connection_acceptor_impl.cc +++ b/src/cpp/server/external_connection_acceptor_impl.cc @@ -18,16 +18,16 @@ #include "src/cpp/server/external_connection_acceptor_impl.h" +#include +#include +#include + #include #include #include "absl/log/check.h" #include "absl/log/log.h" -#include -#include -#include - namespace grpc { namespace internal { namespace { diff --git a/src/cpp/server/external_connection_acceptor_impl.h b/src/cpp/server/external_connection_acceptor_impl.h index 3e23eb8a0c0..2ff036fe9ec 100644 --- a/src/cpp/server/external_connection_acceptor_impl.h +++ b/src/cpp/server/external_connection_acceptor_impl.h @@ -19,13 +19,13 @@ #ifndef GRPC_SRC_CPP_SERVER_EXTERNAL_CONNECTION_ACCEPTOR_IMPL_H #define GRPC_SRC_CPP_SERVER_EXTERNAL_CONNECTION_ACCEPTOR_IMPL_H -#include -#include - #include #include #include +#include +#include + #include "src/core/lib/iomgr/tcp_server.h" #include "src/core/util/sync.h" diff --git a/src/cpp/server/health/default_health_check_service.cc b/src/cpp/server/health/default_health_check_service.cc index 179bdf7a2ed..bb86083bb54 100644 --- a/src/cpp/server/health/default_health_check_service.cc +++ b/src/cpp/server/health/default_health_check_service.cc @@ -18,6 +18,11 @@ #include "src/cpp/server/health/default_health_check_service.h" +#include +#include +#include +#include +#include #include #include @@ -25,17 +30,10 @@ #include "absl/log/check.h" #include "absl/log/log.h" +#include "src/proto/grpc/health/v1/health.upb.h" #include "upb/base/string_view.h" #include "upb/mem/arena.hpp" -#include -#include -#include -#include -#include - -#include "src/proto/grpc/health/v1/health.upb.h" - #define MAX_SERVICE_NAME_LENGTH 200 namespace grpc { diff --git a/src/cpp/server/health/default_health_check_service.h b/src/cpp/server/health/default_health_check_service.h index 042b057b08f..3a12f66f3a6 100644 --- a/src/cpp/server/health/default_health_check_service.h +++ b/src/cpp/server/health/default_health_check_service.h @@ -19,14 +19,6 @@ #ifndef GRPC_SRC_CPP_SERVER_HEALTH_DEFAULT_HEALTH_CHECK_SERVICE_H #define GRPC_SRC_CPP_SERVER_HEALTH_DEFAULT_HEALTH_CHECK_SERVICE_H -#include - -#include -#include -#include - -#include "absl/base/thread_annotations.h" - #include #include #include @@ -34,7 +26,13 @@ #include #include #include +#include +#include +#include +#include + +#include "absl/base/thread_annotations.h" #include "src/core/util/ref_counted.h" #include "src/core/util/ref_counted_ptr.h" diff --git a/src/cpp/server/health/health_check_service_server_builder_option.cc b/src/cpp/server/health/health_check_service_server_builder_option.cc index c4eac98b470..d353c9c4129 100644 --- a/src/cpp/server/health/health_check_service_server_builder_option.cc +++ b/src/cpp/server/health/health_check_service_server_builder_option.cc @@ -16,15 +16,15 @@ // // -#include -#include -#include - #include #include #include #include +#include +#include +#include + namespace grpc { HealthCheckServiceServerBuilderOption::HealthCheckServiceServerBuilderOption( diff --git a/src/cpp/server/insecure_server_credentials.cc b/src/cpp/server/insecure_server_credentials.cc index a48b9cb93c7..3636fc057c8 100644 --- a/src/cpp/server/insecure_server_credentials.cc +++ b/src/cpp/server/insecure_server_credentials.cc @@ -16,13 +16,13 @@ // // -#include - #include #include #include #include +#include + namespace grpc { namespace { class InsecureServerCredentialsImpl final : public ServerCredentials { diff --git a/src/cpp/server/load_reporter/constants.h b/src/cpp/server/load_reporter/constants.h index 13b29946441..840a53b9c14 100644 --- a/src/cpp/server/load_reporter/constants.h +++ b/src/cpp/server/load_reporter/constants.h @@ -19,11 +19,10 @@ #ifndef GRPC_SRC_CPP_SERVER_LOAD_REPORTER_CONSTANTS_H #define GRPC_SRC_CPP_SERVER_LOAD_REPORTER_CONSTANTS_H +#include #include #include -#include - namespace grpc { namespace load_reporter { diff --git a/src/cpp/server/load_reporter/get_cpu_stats.h b/src/cpp/server/load_reporter/get_cpu_stats.h index 76d91ede495..876202cc148 100644 --- a/src/cpp/server/load_reporter/get_cpu_stats.h +++ b/src/cpp/server/load_reporter/get_cpu_stats.h @@ -19,12 +19,11 @@ #ifndef GRPC_SRC_CPP_SERVER_LOAD_REPORTER_GET_CPU_STATS_H #define GRPC_SRC_CPP_SERVER_LOAD_REPORTER_GET_CPU_STATS_H +#include #include #include -#include - namespace grpc { namespace load_reporter { diff --git a/src/cpp/server/load_reporter/get_cpu_stats_linux.cc b/src/cpp/server/load_reporter/get_cpu_stats_linux.cc index 4742481c373..ee2fa144c16 100644 --- a/src/cpp/server/load_reporter/get_cpu_stats_linux.cc +++ b/src/cpp/server/load_reporter/get_cpu_stats_linux.cc @@ -16,10 +16,10 @@ // // -#include - #include +#include + #ifdef GPR_LINUX #include diff --git a/src/cpp/server/load_reporter/get_cpu_stats_unsupported.cc b/src/cpp/server/load_reporter/get_cpu_stats_unsupported.cc index debc4a556b6..70b8c0851e3 100644 --- a/src/cpp/server/load_reporter/get_cpu_stats_unsupported.cc +++ b/src/cpp/server/load_reporter/get_cpu_stats_unsupported.cc @@ -21,7 +21,6 @@ #if !defined(GPR_LINUX) && !defined(GPR_WINDOWS) && !defined(GPR_APPLE) #include "absl/log/log.h" - #include "src/core/util/crash.h" #include "src/cpp/server/load_reporter/get_cpu_stats.h" diff --git a/src/cpp/server/load_reporter/load_data_store.cc b/src/cpp/server/load_reporter/load_data_store.cc index 649c073efe1..5faa03a4fad 100644 --- a/src/cpp/server/load_reporter/load_data_store.cc +++ b/src/cpp/server/load_reporter/load_data_store.cc @@ -18,6 +18,7 @@ #include "src/cpp/server/load_reporter/load_data_store.h" +#include #include #include @@ -28,9 +29,6 @@ #include "absl/log/check.h" #include "absl/log/log.h" - -#include - #include "src/core/lib/iomgr/socket_utils.h" #include "src/cpp/server/load_reporter/constants.h" diff --git a/src/cpp/server/load_reporter/load_data_store.h b/src/cpp/server/load_reporter/load_data_store.h index efb102c0909..e27b64ce2e7 100644 --- a/src/cpp/server/load_reporter/load_data_store.h +++ b/src/cpp/server/load_reporter/load_data_store.h @@ -19,6 +19,8 @@ #ifndef GRPC_SRC_CPP_SERVER_LOAD_REPORTER_LOAD_DATA_STORE_H #define GRPC_SRC_CPP_SERVER_LOAD_REPORTER_LOAD_DATA_STORE_H +#include +#include #include #include @@ -28,9 +30,6 @@ #include #include -#include -#include - namespace grpc { namespace load_reporter { diff --git a/src/cpp/server/load_reporter/load_reporter.cc b/src/cpp/server/load_reporter/load_reporter.cc index 6af88e8ba7f..c2aae6635fc 100644 --- a/src/cpp/server/load_reporter/load_reporter.cc +++ b/src/cpp/server/load_reporter/load_reporter.cc @@ -18,6 +18,7 @@ #include "src/cpp/server/load_reporter/load_reporter.h" +#include #include #include @@ -30,9 +31,6 @@ #include "absl/log/check.h" #include "absl/log/log.h" #include "opencensus/tags/tag_key.h" - -#include - #include "src/cpp/server/load_reporter/constants.h" #include "src/cpp/server/load_reporter/get_cpu_stats.h" diff --git a/src/cpp/server/load_reporter/load_reporter.h b/src/cpp/server/load_reporter/load_reporter.h index 4b08ca05bfc..b0123724b6a 100644 --- a/src/cpp/server/load_reporter/load_reporter.h +++ b/src/cpp/server/load_reporter/load_reporter.h @@ -19,6 +19,8 @@ #ifndef GRPC_SRC_CPP_SERVER_LOAD_REPORTER_LOAD_REPORTER_H #define GRPC_SRC_CPP_SERVER_LOAD_REPORTER_LOAD_REPORTER_H +#include +#include #include #include @@ -31,13 +33,8 @@ #include #include -#include - #include "opencensus/stats/stats.h" #include "opencensus/tags/tag_key.h" - -#include - #include "src/core/util/sync.h" #include "src/cpp/server/load_reporter/load_data_store.h" #include "src/proto/grpc/lb/v1/load_reporter.grpc.pb.h" diff --git a/src/cpp/server/load_reporter/load_reporter_async_service_impl.cc b/src/cpp/server/load_reporter/load_reporter_async_service_impl.cc index fc452fc8ced..6b0adc5b254 100644 --- a/src/cpp/server/load_reporter/load_reporter_async_service_impl.cc +++ b/src/cpp/server/load_reporter/load_reporter_async_service_impl.cc @@ -18,17 +18,14 @@ #include "src/cpp/server/load_reporter/load_reporter_async_service_impl.h" -#include - #include - -#include "absl/log/check.h" -#include "absl/log/log.h" - #include #include #include +#include +#include "absl/log/check.h" +#include "absl/log/log.h" #include "src/cpp/server/load_reporter/constants.h" // IWYU pragma: no_include "google/protobuf/duration.pb.h" diff --git a/src/cpp/server/load_reporter/load_reporter_async_service_impl.h b/src/cpp/server/load_reporter/load_reporter_async_service_impl.h index 80210b4af7d..e5597a38188 100644 --- a/src/cpp/server/load_reporter/load_reporter_async_service_impl.h +++ b/src/cpp/server/load_reporter/load_reporter_async_service_impl.h @@ -19,6 +19,11 @@ #ifndef GRPC_SRC_CPP_SERVER_LOAD_REPORTER_LOAD_REPORTER_ASYNC_SERVICE_IMPL_H #define GRPC_SRC_CPP_SERVER_LOAD_REPORTER_LOAD_REPORTER_ASYNC_SERVICE_IMPL_H +#include +#include +#include +#include +#include #include #include @@ -28,13 +33,6 @@ #include #include "absl/log/check.h" - -#include -#include -#include -#include -#include - #include "src/core/util/sync.h" #include "src/core/util/thd.h" #include "src/cpp/server/load_reporter/load_reporter.h" diff --git a/src/cpp/server/load_reporter/load_reporting_service_server_builder_option.cc b/src/cpp/server/load_reporter/load_reporting_service_server_builder_option.cc index ec1926beb1a..665a63fbf9d 100644 --- a/src/cpp/server/load_reporter/load_reporting_service_server_builder_option.cc +++ b/src/cpp/server/load_reporter/load_reporting_service_server_builder_option.cc @@ -16,16 +16,16 @@ // // -#include -#include -#include - #include #include #include #include #include +#include +#include +#include + #include "src/cpp/server/load_reporter/load_reporting_service_server_builder_plugin.h" namespace grpc { diff --git a/src/cpp/server/load_reporter/load_reporting_service_server_builder_plugin.cc b/src/cpp/server/load_reporter/load_reporting_service_server_builder_plugin.cc index 766386178ed..248145aa311 100644 --- a/src/cpp/server/load_reporter/load_reporting_service_server_builder_plugin.cc +++ b/src/cpp/server/load_reporter/load_reporting_service_server_builder_plugin.cc @@ -18,12 +18,12 @@ #include "src/cpp/server/load_reporter/load_reporting_service_server_builder_plugin.h" -#include - #include #include #include +#include + namespace grpc { namespace load_reporter { diff --git a/src/cpp/server/load_reporter/load_reporting_service_server_builder_plugin.h b/src/cpp/server/load_reporter/load_reporting_service_server_builder_plugin.h index c1370ec348e..7492fe22d6d 100644 --- a/src/cpp/server/load_reporter/load_reporting_service_server_builder_plugin.h +++ b/src/cpp/server/load_reporter/load_reporting_service_server_builder_plugin.h @@ -19,15 +19,15 @@ #ifndef GRPC_SRC_CPP_SERVER_LOAD_REPORTER_LOAD_REPORTING_SERVICE_SERVER_BUILDER_PLUGIN_H #define GRPC_SRC_CPP_SERVER_LOAD_REPORTER_LOAD_REPORTING_SERVICE_SERVER_BUILDER_PLUGIN_H -#include -#include - #include #include #include #include #include +#include +#include + #include "src/cpp/server/load_reporter/load_reporter_async_service_impl.h" namespace grpc { diff --git a/src/cpp/server/load_reporter/util.cc b/src/cpp/server/load_reporter/util.cc index 043d4ebb480..4d2ddc9c42c 100644 --- a/src/cpp/server/load_reporter/util.cc +++ b/src/cpp/server/load_reporter/util.cc @@ -16,6 +16,10 @@ // // +#include +#include +#include +#include #include #include @@ -23,11 +27,6 @@ #include "absl/log/log.h" -#include -#include -#include -#include - namespace grpc { namespace load_reporter { namespace experimental { diff --git a/src/cpp/server/orca/orca_service.cc b/src/cpp/server/orca/orca_service.cc index 45829844e8f..6d5175d87e4 100644 --- a/src/cpp/server/orca/orca_service.cc +++ b/src/cpp/server/orca/orca_service.cc @@ -14,23 +14,6 @@ // limitations under the License. // -#include - -#include -#include -#include - -#include "absl/base/thread_annotations.h" -#include "absl/log/check.h" -#include "absl/strings/string_view.h" -#include "absl/time/time.h" -#include "absl/types/optional.h" -#include "google/protobuf/duration.upb.h" -#include "upb/base/string_view.h" -#include "upb/mem/arena.hpp" -#include "xds/data/orca/v3/orca_load_report.upb.h" -#include "xds/service/orca/v3/orca.upb.h" - #include #include #include @@ -43,7 +26,18 @@ #include #include #include +#include + +#include +#include +#include +#include "absl/base/thread_annotations.h" +#include "absl/log/check.h" +#include "absl/strings/string_view.h" +#include "absl/time/time.h" +#include "absl/types/optional.h" +#include "google/protobuf/duration.upb.h" #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/load_balancing/backend_metric_data.h" @@ -52,6 +46,10 @@ #include "src/core/util/ref_counted_ptr.h" #include "src/core/util/time.h" #include "src/cpp/server/backend_metric_recorder.h" +#include "upb/base/string_view.h" +#include "upb/mem/arena.hpp" +#include "xds/data/orca/v3/orca_load_report.upb.h" +#include "xds/service/orca/v3/orca.upb.h" namespace grpc { namespace experimental { diff --git a/src/cpp/server/secure_server_credentials.cc b/src/cpp/server/secure_server_credentials.cc index 4a68e8e33c2..a522a9fdcdd 100644 --- a/src/cpp/server/secure_server_credentials.cc +++ b/src/cpp/server/secure_server_credentials.cc @@ -18,10 +18,6 @@ #include "src/cpp/server/secure_server_credentials.h" -#include -#include -#include - #include #include #include @@ -30,6 +26,10 @@ #include #include +#include +#include +#include + #include "src/cpp/common/secure_auth_context.h" namespace grpc { diff --git a/src/cpp/server/secure_server_credentials.h b/src/cpp/server/secure_server_credentials.h index 3167b257a4b..cb1b9927f77 100644 --- a/src/cpp/server/secure_server_credentials.h +++ b/src/cpp/server/secure_server_credentials.h @@ -19,13 +19,13 @@ #ifndef GRPC_SRC_CPP_SERVER_SECURE_SERVER_CREDENTIALS_H #define GRPC_SRC_CPP_SERVER_SECURE_SERVER_CREDENTIALS_H -#include - #include #include #include #include +#include + #include "src/cpp/server/thread_pool_interface.h" namespace grpc { diff --git a/src/cpp/server/server_builder.cc b/src/cpp/server/server_builder.cc index b20aa88113c..1e611449931 100644 --- a/src/cpp/server/server_builder.cc +++ b/src/cpp/server/server_builder.cc @@ -16,18 +16,6 @@ // // -#include -#include - -#include -#include -#include -#include -#include - -#include "absl/log/check.h" -#include "absl/log/log.h" - #include #include #include @@ -47,7 +35,17 @@ #include #include #include +#include +#include +#include +#include +#include +#include +#include + +#include "absl/log/check.h" +#include "absl/log/log.h" #include "src/core/ext/transport/chttp2/server/chttp2_server.h" #include "src/core/server/server.h" #include "src/core/util/string.h" diff --git a/src/cpp/server/server_cc.cc b/src/cpp/server/server_cc.cc index 8996e78b4d8..49cb31dcb48 100644 --- a/src/cpp/server/server_cc.cc +++ b/src/cpp/server/server_cc.cc @@ -15,24 +15,6 @@ // // -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "absl/log/check.h" -#include "absl/log/log.h" -#include "absl/status/status.h" - #include #include #include @@ -67,7 +49,23 @@ #include #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "absl/log/check.h" +#include "absl/log/log.h" +#include "absl/status/status.h" #include "src/core/ext/transport/inproc/inproc_transport.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/iomgr.h" diff --git a/src/cpp/server/server_context.cc b/src/cpp/server/server_context.cc index ed1080aeaf6..ca8e3a4728f 100644 --- a/src/cpp/server/server_context.cc +++ b/src/cpp/server/server_context.cc @@ -17,22 +17,6 @@ // #include - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "absl/log/check.h" -#include "absl/log/log.h" -#include "absl/strings/str_format.h" -#include "absl/strings/string_view.h" - #include #include #include @@ -56,6 +40,20 @@ #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "absl/log/check.h" +#include "absl/log/log.h" +#include "absl/strings/str_format.h" +#include "absl/strings/string_view.h" #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/surface/call.h" #include "src/core/util/crash.h" diff --git a/src/cpp/server/xds_server_credentials.cc b/src/cpp/server/xds_server_credentials.cc index df05e254d45..6ce2d70570b 100644 --- a/src/cpp/server/xds_server_credentials.cc +++ b/src/cpp/server/xds_server_credentials.cc @@ -16,14 +16,14 @@ // // -#include - -#include "absl/log/check.h" - #include #include #include +#include + +#include "absl/log/check.h" + namespace grpc { std::shared_ptr XdsServerCredentials( diff --git a/src/cpp/thread_manager/thread_manager.cc b/src/cpp/thread_manager/thread_manager.cc index 3128e1c6f41..6cdf78c95bc 100644 --- a/src/cpp/thread_manager/thread_manager.cc +++ b/src/cpp/thread_manager/thread_manager.cc @@ -23,7 +23,6 @@ #include "absl/log/check.h" #include "absl/log/log.h" #include "absl/strings/str_format.h" - #include "src/core/lib/resource_quota/resource_quota.h" #include "src/core/util/crash.h" #include "src/core/util/ref_counted_ptr.h" diff --git a/src/cpp/util/byte_buffer_cc.cc b/src/cpp/util/byte_buffer_cc.cc index 687df553505..939e38d19e4 100644 --- a/src/cpp/util/byte_buffer_cc.cc +++ b/src/cpp/util/byte_buffer_cc.cc @@ -16,9 +16,6 @@ // // -#include -#include - #include #include #include @@ -28,6 +25,9 @@ #include #include +#include +#include + namespace grpc { Status ByteBuffer::TrySingleSlice(Slice* slice) const { diff --git a/src/cpp/util/status.cc b/src/cpp/util/status.cc index 3fcaebf8ad0..7d2bdd5566d 100644 --- a/src/cpp/util/status.cc +++ b/src/cpp/util/status.cc @@ -16,10 +16,10 @@ // // -#include - #include +#include + namespace grpc { const Status& Status::OK = Status(); diff --git a/src/cpp/util/string_ref.cc b/src/cpp/util/string_ref.cc index 67b2e018a6f..ed60bc6683c 100644 --- a/src/cpp/util/string_ref.cc +++ b/src/cpp/util/string_ref.cc @@ -16,9 +16,8 @@ // // -#include - #include +#include namespace grpc { diff --git a/src/cpp/util/time_cc.cc b/src/cpp/util/time_cc.cc index 458a0e0cf75..64e164a020c 100644 --- a/src/cpp/util/time_cc.cc +++ b/src/cpp/util/time_cc.cc @@ -16,12 +16,12 @@ // // -#include -#include - #include #include +#include +#include + // IWYU pragma: no_include using std::chrono::duration_cast; diff --git a/src/objective-c/tests/CppCronetTests/TestHelper.h b/src/objective-c/tests/CppCronetTests/TestHelper.h index 738161918ed..886c696eca2 100644 --- a/src/objective-c/tests/CppCronetTests/TestHelper.h +++ b/src/objective-c/tests/CppCronetTests/TestHelper.h @@ -20,15 +20,14 @@ #define GRPC_TEST_CPP_IOS_CRONETTESTS_TESTHELPER_H #import - -#import -#import - #import #import #import #import +#import +#import + #import "src/proto/grpc/testing/echo.grpc.pb.h" const char* const kServerFinishAfterNReads = "server_finish_after_n_reads"; diff --git a/src/python/grpcio_observability/grpc_observability/client_call_tracer.cc b/src/python/grpcio_observability/grpc_observability/client_call_tracer.cc index 21c6521f922..66b83488752 100644 --- a/src/python/grpcio_observability/grpc_observability/client_call_tracer.cc +++ b/src/python/grpcio_observability/grpc_observability/client_call_tracer.cc @@ -14,6 +14,7 @@ #include "client_call_tracer.h" +#include #include #include @@ -25,9 +26,6 @@ #include "metadata_exchange.h" #include "observability_util.h" #include "python_observability_context.h" - -#include - #include "src/core/lib/experiments/experiments.h" #include "src/core/lib/slice/slice.h" diff --git a/src/python/grpcio_observability/grpc_observability/client_call_tracer.h b/src/python/grpcio_observability/grpc_observability/client_call_tracer.h index bb1b97813f5..34d7196ba74 100644 --- a/src/python/grpcio_observability/grpc_observability/client_call_tracer.h +++ b/src/python/grpcio_observability/grpc_observability/client_call_tracer.h @@ -15,6 +15,7 @@ #ifndef GRPC_PYTHON_OPENCENSUS_CLIENT_CALL_TRACER_H #define GRPC_PYTHON_OPENCENSUS_CLIENT_CALL_TRACER_H +#include #include #include @@ -27,9 +28,6 @@ #include "absl/time/time.h" #include "metadata_exchange.h" #include "python_observability_context.h" - -#include - #include "src/core/telemetry/call_tracer.h" namespace grpc_observability { diff --git a/src/python/grpcio_observability/grpc_observability/metadata_exchange.cc b/src/python/grpcio_observability/grpc_observability/metadata_exchange.cc index b11ed1d9386..dae2f5e0edf 100644 --- a/src/python/grpcio_observability/grpc_observability/metadata_exchange.cc +++ b/src/python/grpcio_observability/grpc_observability/metadata_exchange.cc @@ -18,6 +18,7 @@ #include "metadata_exchange.h" +#include #include #include @@ -27,9 +28,6 @@ #include "absl/strings/string_view.h" #include "constants.h" - -#include - #include "src/core/telemetry/call_tracer.h" namespace grpc_observability { diff --git a/src/python/grpcio_observability/grpc_observability/metadata_exchange.h b/src/python/grpcio_observability/grpc_observability/metadata_exchange.h index dd971b6b1e5..592a78179a4 100644 --- a/src/python/grpcio_observability/grpc_observability/metadata_exchange.h +++ b/src/python/grpcio_observability/grpc_observability/metadata_exchange.h @@ -30,7 +30,6 @@ #include "absl/strings/string_view.h" #include "constants.h" #include "python_observability_context.h" - #include "src/core/lib/transport/metadata_batch.h" namespace grpc_observability { diff --git a/src/python/grpcio_observability/grpc_observability/observability_util.h b/src/python/grpcio_observability/grpc_observability/observability_util.h index e86ade06afd..5978e26c49f 100644 --- a/src/python/grpcio_observability/grpc_observability/observability_util.h +++ b/src/python/grpcio_observability/grpc_observability/observability_util.h @@ -15,6 +15,7 @@ #ifndef OBSERVABILITY_MAIN_H #define OBSERVABILITY_MAIN_H +#include #include #include @@ -29,8 +30,6 @@ #include "constants.h" #include "python_observability_context.h" -#include - namespace grpc_observability { struct CensusData { diff --git a/src/python/grpcio_observability/grpc_observability/python_observability_context.cc b/src/python/grpcio_observability/grpc_observability/python_observability_context.cc index 5cc7c41beee..bca2455c87e 100644 --- a/src/python/grpcio_observability/grpc_observability/python_observability_context.cc +++ b/src/python/grpcio_observability/grpc_observability/python_observability_context.cc @@ -24,7 +24,6 @@ #include "absl/random/random.h" #include "absl/strings/escaping.h" #include "rpc_encoding.h" - #include "src/core/lib/transport/transport.h" namespace grpc_observability { diff --git a/src/python/grpcio_observability/grpc_observability/python_observability_context.h b/src/python/grpcio_observability/grpc_observability/python_observability_context.h index 16b05d63128..9c347098933 100644 --- a/src/python/grpcio_observability/grpc_observability/python_observability_context.h +++ b/src/python/grpcio_observability/grpc_observability/python_observability_context.h @@ -15,6 +15,7 @@ #ifndef GRPC_PYTHON_OBSERVABILITY_H #define GRPC_PYTHON_OBSERVABILITY_H +#include #include #include @@ -29,9 +30,6 @@ #include "absl/time/time.h" #include "constants.h" #include "sampler.h" - -#include - #include "src/core/lib/channel/channel_stack.h" namespace grpc_observability { diff --git a/src/python/grpcio_observability/grpc_observability/rpc_encoding.h b/src/python/grpcio_observability/grpc_observability/rpc_encoding.h index 4fd5c94ea46..f73f4b84e18 100644 --- a/src/python/grpcio_observability/grpc_observability/rpc_encoding.h +++ b/src/python/grpcio_observability/grpc_observability/rpc_encoding.h @@ -15,14 +15,13 @@ #ifndef GRPC_PYTHON_OPENCENSUS_RPC_ENCODING_H #define GRPC_PYTHON_OPENCENSUS_RPC_ENCODING_H +#include #include #include #include "absl/base/internal/endian.h" #include "absl/strings/string_view.h" -#include - namespace grpc_observability { // TODO(xuanwn): Reuse c++ rpc_encoding file. diff --git a/src/python/grpcio_observability/grpc_observability/server_call_tracer.cc b/src/python/grpcio_observability/grpc_observability/server_call_tracer.cc index bc19a8e672d..4695758b908 100644 --- a/src/python/grpcio_observability/grpc_observability/server_call_tracer.cc +++ b/src/python/grpcio_observability/grpc_observability/server_call_tracer.cc @@ -14,6 +14,7 @@ #include "server_call_tracer.h" +#include #include #include @@ -32,9 +33,6 @@ #include "constants.h" #include "observability_util.h" #include "python_observability_context.h" - -#include - #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/experiments/experiments.h" #include "src/core/lib/iomgr/error.h" diff --git a/src/python/grpcio_observability/grpc_observability/server_call_tracer.h b/src/python/grpcio_observability/grpc_observability/server_call_tracer.h index f125b9cca62..ccb4a21bd3b 100644 --- a/src/python/grpcio_observability/grpc_observability/server_call_tracer.h +++ b/src/python/grpcio_observability/grpc_observability/server_call_tracer.h @@ -15,6 +15,8 @@ #ifndef GRPC_PYTHON_OPENCENSUS_SERVER_CALL_TRACER_H #define GRPC_PYTHON_OPENCENSUS_SERVER_CALL_TRACER_H +#include + #include #include "absl/strings/string_view.h" @@ -22,9 +24,6 @@ #include "constants.h" #include "metadata_exchange.h" #include "python_observability_context.h" - -#include - #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/slice/slice.h" #include "src/core/telemetry/call_tracer.h" diff --git a/src/ruby/ext/grpc/rb_byte_buffer.c b/src/ruby/ext/grpc/rb_byte_buffer.c index ffd95330d2a..f71516f0bf8 100644 --- a/src/ruby/ext/grpc/rb_byte_buffer.c +++ b/src/ruby/ext/grpc/rb_byte_buffer.c @@ -20,13 +20,13 @@ #include "rb_byte_buffer.h" -#include "rb_grpc.h" -#include "rb_grpc_imports.generated.h" - #include #include #include +#include "rb_grpc.h" +#include "rb_grpc_imports.generated.h" + grpc_byte_buffer* grpc_rb_s_to_byte_buffer(char* string, size_t length) { grpc_slice slice = grpc_slice_from_copied_buffer(string, length); grpc_byte_buffer* buffer = grpc_raw_byte_buffer_create(&slice, 1); diff --git a/src/ruby/ext/grpc/rb_call.c b/src/ruby/ext/grpc/rb_call.c index 2ef9b6a54f7..0f3b33da801 100644 --- a/src/ruby/ext/grpc/rb_call.c +++ b/src/ruby/ext/grpc/rb_call.c @@ -20,17 +20,17 @@ #include "rb_call.h" +#include +#include +#include +#include + #include "rb_byte_buffer.h" #include "rb_call_credentials.h" #include "rb_completion_queue.h" #include "rb_grpc.h" #include "rb_grpc_imports.generated.h" -#include -#include -#include -#include - /* grpc_rb_cCall is the Call class whose instances proxy grpc_call. */ static VALUE grpc_rb_cCall; diff --git a/src/ruby/ext/grpc/rb_call_credentials.c b/src/ruby/ext/grpc/rb_call_credentials.c index 8c69c82b1e3..9957f3937e7 100644 --- a/src/ruby/ext/grpc/rb_call_credentials.c +++ b/src/ruby/ext/grpc/rb_call_credentials.c @@ -20,6 +20,11 @@ #include "rb_call_credentials.h" +#include +#include +#include +#include +#include #include #include "rb_call.h" @@ -27,12 +32,6 @@ #include "rb_grpc.h" #include "rb_grpc_imports.generated.h" -#include -#include -#include -#include -#include - /* grpc_rb_cCallCredentials is the ruby class that proxies * grpc_call_credentials */ static VALUE grpc_rb_cCallCredentials = Qnil; diff --git a/src/ruby/ext/grpc/rb_channel.c b/src/ruby/ext/grpc/rb_channel.c index 2c800d8b9ec..76d2f39f17d 100644 --- a/src/ruby/ext/grpc/rb_channel.c +++ b/src/ruby/ext/grpc/rb_channel.c @@ -20,6 +20,12 @@ #include "rb_channel.h" +#include +#include +#include +#include +#include +#include #include #include "rb_byte_buffer.h" @@ -32,13 +38,6 @@ #include "rb_server.h" #include "rb_xds_channel_credentials.h" -#include -#include -#include -#include -#include -#include - /* id_channel is the name of the hidden ivar that preserves a reference to the * channel on a call, so that calls are not GCed before their channel. */ static ID id_channel; diff --git a/src/ruby/ext/grpc/rb_channel_args.c b/src/ruby/ext/grpc/rb_channel_args.c index 4c252397e2a..d7f67297be6 100644 --- a/src/ruby/ext/grpc/rb_channel_args.c +++ b/src/ruby/ext/grpc/rb_channel_args.c @@ -20,14 +20,14 @@ #include "rb_channel_args.h" -#include "rb_grpc.h" -#include "rb_grpc_imports.generated.h" - #include #include #include #include +#include "rb_grpc.h" +#include "rb_grpc_imports.generated.h" + static rb_data_type_t grpc_rb_channel_args_data_type = { "grpc_channel_args", {GRPC_RB_GC_NOT_MARKED, diff --git a/src/ruby/ext/grpc/rb_channel_credentials.c b/src/ruby/ext/grpc/rb_channel_credentials.c index e570bfb707f..9b1931954be 100644 --- a/src/ruby/ext/grpc/rb_channel_credentials.c +++ b/src/ruby/ext/grpc/rb_channel_credentials.c @@ -20,17 +20,16 @@ #include "rb_channel_credentials.h" -#include - -#include "rb_call_credentials.h" -#include "rb_grpc.h" -#include "rb_grpc_imports.generated.h" - #include #include #include #include #include +#include + +#include "rb_call_credentials.h" +#include "rb_grpc.h" +#include "rb_grpc_imports.generated.h" /* grpc_rb_cChannelCredentials is the ruby class that proxies grpc_channel_credentials. */ diff --git a/src/ruby/ext/grpc/rb_channel_credentials.h b/src/ruby/ext/grpc/rb_channel_credentials.h index 75bda4b25ad..ecc02e449ba 100644 --- a/src/ruby/ext/grpc/rb_channel_credentials.h +++ b/src/ruby/ext/grpc/rb_channel_credentials.h @@ -21,9 +21,8 @@ #include -#include - #include +#include /* Initializes the ruby ChannelCredentials class. */ void Init_grpc_channel_credentials(); diff --git a/src/ruby/ext/grpc/rb_completion_queue.c b/src/ruby/ext/grpc/rb_completion_queue.c index 6a4bb9c3072..91047ec14cc 100644 --- a/src/ruby/ext/grpc/rb_completion_queue.c +++ b/src/ruby/ext/grpc/rb_completion_queue.c @@ -20,15 +20,14 @@ #include "rb_completion_queue.h" +#include +#include +#include #include #include "rb_grpc.h" #include "rb_grpc_imports.generated.h" -#include -#include -#include - /* Used to allow grpc_completion_queue_next call to release the GIL */ typedef struct next_call_stack { grpc_completion_queue* cq; diff --git a/src/ruby/ext/grpc/rb_compression_options.c b/src/ruby/ext/grpc/rb_compression_options.c index a38790faf79..062d5362c3e 100644 --- a/src/ruby/ext/grpc/rb_compression_options.c +++ b/src/ruby/ext/grpc/rb_compression_options.c @@ -20,12 +20,6 @@ #include "rb_compression_options.h" -#include - -#include "rb_byte_buffer.h" -#include "rb_grpc.h" -#include "rb_grpc_imports.generated.h" - #include #include #include @@ -33,6 +27,11 @@ #include #include #include +#include + +#include "rb_byte_buffer.h" +#include "rb_grpc.h" +#include "rb_grpc_imports.generated.h" static VALUE grpc_rb_cCompressionOptions = Qnil; diff --git a/src/ruby/ext/grpc/rb_event_thread.c b/src/ruby/ext/grpc/rb_event_thread.c index 0d7ec2ea2f4..014dd2dcd88 100644 --- a/src/ruby/ext/grpc/rb_event_thread.c +++ b/src/ruby/ext/grpc/rb_event_thread.c @@ -20,17 +20,16 @@ #include "rb_event_thread.h" +#include +#include +#include +#include #include #include #include "rb_grpc.h" #include "rb_grpc_imports.generated.h" -#include -#include -#include -#include - typedef struct grpc_rb_event { // callback will be called with argument while holding the GVL void (*callback)(void*); diff --git a/src/ruby/ext/grpc/rb_grpc.c b/src/ruby/ext/grpc/rb_grpc.c index b26ddf357c0..ac66b590782 100644 --- a/src/ruby/ext/grpc/rb_grpc.c +++ b/src/ruby/ext/grpc/rb_grpc.c @@ -20,6 +20,9 @@ #include "rb_grpc.h" +#include +#include +#include #include #include #include @@ -39,10 +42,6 @@ #include "rb_xds_channel_credentials.h" #include "rb_xds_server_credentials.h" -#include -#include -#include - #ifdef GPR_LINUX #include #include diff --git a/src/ruby/ext/grpc/rb_grpc.h b/src/ruby/ext/grpc/rb_grpc.h index 7518b79e390..01b7e0d4c78 100644 --- a/src/ruby/ext/grpc/rb_grpc.h +++ b/src/ruby/ext/grpc/rb_grpc.h @@ -21,9 +21,8 @@ #include -#include - #include +#include /* grpc_rb_mGrpcCore is the module containing the ruby wrapper GRPC classes. */ extern VALUE grpc_rb_mGrpcCore; diff --git a/src/ruby/ext/grpc/rb_server.c b/src/ruby/ext/grpc/rb_server.c index 09e8788b9ed..f80b40ae70e 100644 --- a/src/ruby/ext/grpc/rb_server.c +++ b/src/ruby/ext/grpc/rb_server.c @@ -20,6 +20,12 @@ #include "rb_server.h" +#include +#include +#include +#include +#include + #include "rb_byte_buffer.h" #include "rb_call.h" #include "rb_channel_args.h" @@ -29,12 +35,6 @@ #include "rb_server_credentials.h" #include "rb_xds_server_credentials.h" -#include -#include -#include -#include -#include - /* grpc_rb_cServer is the ruby class that proxies grpc_server. */ static VALUE grpc_rb_cServer = Qnil; diff --git a/src/ruby/ext/grpc/rb_server_credentials.c b/src/ruby/ext/grpc/rb_server_credentials.c index 73c754d5352..121f888f897 100644 --- a/src/ruby/ext/grpc/rb_server_credentials.c +++ b/src/ruby/ext/grpc/rb_server_credentials.c @@ -20,14 +20,14 @@ #include "rb_server_credentials.h" -#include "rb_grpc.h" -#include "rb_grpc_imports.generated.h" - #include #include #include #include +#include "rb_grpc.h" +#include "rb_grpc_imports.generated.h" + /* grpc_rb_cServerCredentials is the ruby class that proxies grpc_server_credentials. */ static VALUE grpc_rb_cServerCredentials = Qnil; diff --git a/src/ruby/ext/grpc/rb_server_credentials.h b/src/ruby/ext/grpc/rb_server_credentials.h index 64b22715d99..35db1ed328f 100644 --- a/src/ruby/ext/grpc/rb_server_credentials.h +++ b/src/ruby/ext/grpc/rb_server_credentials.h @@ -21,10 +21,9 @@ #include -#include - #include #include +#include /* Initializes the ruby ServerCredentials class. */ void Init_grpc_server_credentials(); diff --git a/src/ruby/ext/grpc/rb_xds_channel_credentials.c b/src/ruby/ext/grpc/rb_xds_channel_credentials.c index 56b08d99287..124bc8b3378 100644 --- a/src/ruby/ext/grpc/rb_xds_channel_credentials.c +++ b/src/ruby/ext/grpc/rb_xds_channel_credentials.c @@ -20,6 +20,11 @@ #include "rb_xds_channel_credentials.h" +#include +#include +#include +#include +#include #include #include "rb_call_credentials.h" @@ -27,12 +32,6 @@ #include "rb_grpc.h" #include "rb_grpc_imports.generated.h" -#include -#include -#include -#include -#include - /* grpc_rb_cXdsChannelCredentials is the ruby class that proxies grpc_channel_credentials. */ static VALUE grpc_rb_cXdsChannelCredentials = Qnil; diff --git a/src/ruby/ext/grpc/rb_xds_channel_credentials.h b/src/ruby/ext/grpc/rb_xds_channel_credentials.h index 5eba040ba17..a66f974413b 100644 --- a/src/ruby/ext/grpc/rb_xds_channel_credentials.h +++ b/src/ruby/ext/grpc/rb_xds_channel_credentials.h @@ -21,9 +21,8 @@ #include -#include - #include +#include /* Initializes the ruby ChannelCredentials class. */ void Init_grpc_xds_channel_credentials(); diff --git a/src/ruby/ext/grpc/rb_xds_server_credentials.c b/src/ruby/ext/grpc/rb_xds_server_credentials.c index 8186d0eb49e..703e3e99b4b 100644 --- a/src/ruby/ext/grpc/rb_xds_server_credentials.c +++ b/src/ruby/ext/grpc/rb_xds_server_credentials.c @@ -20,15 +20,15 @@ #include "rb_xds_server_credentials.h" -#include "rb_grpc.h" -#include "rb_grpc_imports.generated.h" -#include "rb_server_credentials.h" - #include #include #include #include +#include "rb_grpc.h" +#include "rb_grpc_imports.generated.h" +#include "rb_server_credentials.h" + /* grpc_rb_cXdsServerCredentials is the ruby class that proxies grpc_server_credentials. */ static VALUE grpc_rb_cXdsServerCredentials = Qnil; diff --git a/src/ruby/ext/grpc/rb_xds_server_credentials.h b/src/ruby/ext/grpc/rb_xds_server_credentials.h index 3ec1ced8e4b..59de9824a63 100644 --- a/src/ruby/ext/grpc/rb_xds_server_credentials.h +++ b/src/ruby/ext/grpc/rb_xds_server_credentials.h @@ -21,10 +21,9 @@ #include -#include - #include #include +#include /* Initializes the ruby XdsServerCredentials class. */ void Init_grpc_xds_server_credentials(); diff --git a/test/core/address_utils/parse_address_test.cc b/test/core/address_utils/parse_address_test.cc index 41b9df4bd5d..3bc09f0490a 100644 --- a/test/core/address_utils/parse_address_test.cc +++ b/test/core/address_utils/parse_address_test.cc @@ -32,15 +32,14 @@ #include #endif +#include + #include #include "absl/log/log.h" #include "absl/status/status.h" #include "absl/strings/match.h" #include "gtest/gtest.h" - -#include - #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/port.h" #include "src/core/lib/iomgr/sockaddr.h" diff --git a/test/core/address_utils/parse_address_with_named_scope_id_test.cc b/test/core/address_utils/parse_address_with_named_scope_id_test.cc index c8e85ad1e26..0924eb2b33f 100644 --- a/test/core/address_utils/parse_address_with_named_scope_id_test.cc +++ b/test/core/address_utils/parse_address_with_named_scope_id_test.cc @@ -16,16 +16,17 @@ // // +#include #include #include #include #include - -#include #ifdef GRPC_HAVE_UNIX_SOCKET #include #endif +#include + #include #include "absl/log/log.h" @@ -33,9 +34,6 @@ #include "absl/status/statusor.h" #include "absl/strings/str_format.h" #include "gtest/gtest.h" - -#include - #include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/resolved_address.h" diff --git a/test/core/address_utils/sockaddr_utils_fuzzer_test.cc b/test/core/address_utils/sockaddr_utils_fuzzer_test.cc index 8c63854a203..08b80672f16 100644 --- a/test/core/address_utils/sockaddr_utils_fuzzer_test.cc +++ b/test/core/address_utils/sockaddr_utils_fuzzer_test.cc @@ -21,7 +21,6 @@ #include "absl/log/check.h" #include "absl/status/statusor.h" - #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/iomgr/resolve_address.h" #include "src/core/lib/iomgr/resolved_address.h" diff --git a/test/core/address_utils/sockaddr_utils_test.cc b/test/core/address_utils/sockaddr_utils_test.cc index 83de472f102..234e4fe9896 100644 --- a/test/core/address_utils/sockaddr_utils_test.cc +++ b/test/core/address_utils/sockaddr_utils_test.cc @@ -17,6 +17,7 @@ #include "src/core/lib/address_utils/sockaddr_utils.h" #include +#include #include #include @@ -24,9 +25,6 @@ #include "absl/status/statusor.h" #include "absl/strings/str_cat.h" #include "gtest/gtest.h" - -#include - #include "src/core/lib/iomgr/port.h" #include "src/core/lib/iomgr/resolved_address.h" #ifdef GRPC_HAVE_UNIX_SOCKET @@ -43,7 +41,6 @@ #include #include "absl/log/check.h" - #include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/iomgr/socket_utils.h" diff --git a/test/core/bad_client/bad_client.cc b/test/core/bad_client/bad_client.cc index f338e2dc0a4..83c05a2ad9b 100644 --- a/test/core/bad_client/bad_client.cc +++ b/test/core/bad_client/bad_client.cc @@ -18,18 +18,16 @@ #include "test/core/bad_client/bad_client.h" -#include -#include - -#include "absl/log/check.h" -#include "absl/log/log.h" - #include #include #include #include #include +#include +#include +#include "absl/log/check.h" +#include "absl/log/log.h" #include "src/core/channelz/channelz.h" #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" #include "src/core/lib/channel/channel_args.h" diff --git a/test/core/bad_client/bad_client.h b/test/core/bad_client/bad_client.h index 57a8d92c6e6..fba8a07b354 100644 --- a/test/core/bad_client/bad_client.h +++ b/test/core/bad_client/bad_client.h @@ -19,11 +19,10 @@ #ifndef GRPC_TEST_CORE_BAD_CLIENT_BAD_CLIENT_H #define GRPC_TEST_CORE_BAD_CLIENT_BAD_CLIENT_H -#include -#include - #include #include +#include +#include #define GRPC_BAD_CLIENT_REGISTERED_METHOD "/registered/bar" #define GRPC_BAD_CLIENT_REGISTERED_HOST "localhost" diff --git a/test/core/bad_client/tests/bad_streaming_id.cc b/test/core/bad_client/tests/bad_streaming_id.cc index 4cd7cbc5778..a8018ae6acd 100644 --- a/test/core/bad_client/tests/bad_streaming_id.cc +++ b/test/core/bad_client/tests/bad_streaming_id.cc @@ -16,14 +16,12 @@ // // -#include - +#include #include -#include "absl/log/check.h" - -#include +#include +#include "absl/log/check.h" #include "src/core/server/server.h" #include "test/core/bad_client/bad_client.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/bad_client/tests/badreq.cc b/test/core/bad_client/tests/badreq.cc index 27a01496d97..7cfa2ace385 100644 --- a/test/core/bad_client/tests/badreq.cc +++ b/test/core/bad_client/tests/badreq.cc @@ -16,10 +16,9 @@ // // -#include "absl/log/check.h" - #include +#include "absl/log/check.h" #include "src/core/server/server.h" #include "test/core/bad_client/bad_client.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/bad_client/tests/connection_prefix.cc b/test/core/bad_client/tests/connection_prefix.cc index 1aa899ab707..c1c34a25d94 100644 --- a/test/core/bad_client/tests/connection_prefix.cc +++ b/test/core/bad_client/tests/connection_prefix.cc @@ -16,10 +16,9 @@ // // -#include "absl/log/check.h" - #include +#include "absl/log/check.h" #include "src/core/server/server.h" #include "test/core/bad_client/bad_client.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/bad_client/tests/duplicate_header.cc b/test/core/bad_client/tests/duplicate_header.cc index b31c9663218..919ae4eeefb 100644 --- a/test/core/bad_client/tests/duplicate_header.cc +++ b/test/core/bad_client/tests/duplicate_header.cc @@ -16,14 +16,12 @@ // // -#include - -#include "absl/log/check.h" - #include #include #include +#include +#include "absl/log/check.h" #include "src/core/util/time.h" #include "test/core/bad_client/bad_client.h" #include "test/core/end2end/cq_verifier.h" diff --git a/test/core/bad_client/tests/head_of_line_blocking.cc b/test/core/bad_client/tests/head_of_line_blocking.cc index 2a46c836780..bce31bc893d 100644 --- a/test/core/bad_client/tests/head_of_line_blocking.cc +++ b/test/core/bad_client/tests/head_of_line_blocking.cc @@ -16,18 +16,16 @@ // // +#include +#include +#include +#include #include #include #include #include "absl/log/check.h" - -#include -#include -#include -#include - #include "test/core/bad_client/bad_client.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/bad_client/tests/headers.cc b/test/core/bad_client/tests/headers.cc index 0aa31a507c3..468f19a34d1 100644 --- a/test/core/bad_client/tests/headers.cc +++ b/test/core/bad_client/tests/headers.cc @@ -16,10 +16,9 @@ // // -#include "absl/log/check.h" - #include +#include "absl/log/check.h" #include "src/core/server/server.h" #include "test/core/bad_client/bad_client.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/bad_client/tests/initial_settings_frame.cc b/test/core/bad_client/tests/initial_settings_frame.cc index deca4fdaebd..d4231c9c373 100644 --- a/test/core/bad_client/tests/initial_settings_frame.cc +++ b/test/core/bad_client/tests/initial_settings_frame.cc @@ -16,12 +16,11 @@ // // -#include "absl/log/check.h" -#include "absl/strings/str_cat.h" - #include #include +#include "absl/log/check.h" +#include "absl/strings/str_cat.h" #include "src/core/lib/experiments/experiments.h" #include "src/core/server/server.h" #include "test/core/bad_client/bad_client.h" diff --git a/test/core/bad_client/tests/out_of_bounds.cc b/test/core/bad_client/tests/out_of_bounds.cc index 04cdf739c41..9abb44f777c 100644 --- a/test/core/bad_client/tests/out_of_bounds.cc +++ b/test/core/bad_client/tests/out_of_bounds.cc @@ -16,14 +16,12 @@ // // -#include - +#include #include -#include "absl/log/check.h" - -#include +#include +#include "absl/log/check.h" #include "src/core/server/server.h" #include "test/core/bad_client/bad_client.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/bad_client/tests/server_registered_method.cc b/test/core/bad_client/tests/server_registered_method.cc index 731eeb91acc..04adbc14a16 100644 --- a/test/core/bad_client/tests/server_registered_method.cc +++ b/test/core/bad_client/tests/server_registered_method.cc @@ -16,12 +16,11 @@ // // -#include "absl/log/check.h" - #include #include #include +#include "absl/log/check.h" #include "src/core/server/server.h" #include "test/core/bad_client/bad_client.h" #include "test/core/end2end/cq_verifier.h" diff --git a/test/core/bad_client/tests/simple_request.cc b/test/core/bad_client/tests/simple_request.cc index 6732d76147d..52db06cccb3 100644 --- a/test/core/bad_client/tests/simple_request.cc +++ b/test/core/bad_client/tests/simple_request.cc @@ -12,11 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "absl/log/check.h" - #include #include +#include "absl/log/check.h" #include "src/core/server/server.h" #include "test/core/bad_client/bad_client.h" #include "test/core/end2end/cq_verifier.h" diff --git a/test/core/bad_client/tests/unknown_frame.cc b/test/core/bad_client/tests/unknown_frame.cc index a7c908ca483..1357b3208af 100644 --- a/test/core/bad_client/tests/unknown_frame.cc +++ b/test/core/bad_client/tests/unknown_frame.cc @@ -16,14 +16,12 @@ // // -#include - +#include #include -#include "absl/log/check.h" - -#include +#include +#include "absl/log/check.h" #include "src/core/server/server.h" #include "test/core/bad_client/bad_client.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/bad_client/tests/window_overflow.cc b/test/core/bad_client/tests/window_overflow.cc index 3137921591e..6cf962bb42a 100644 --- a/test/core/bad_client/tests/window_overflow.cc +++ b/test/core/bad_client/tests/window_overflow.cc @@ -12,16 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include +#include #include #include #include #include "absl/log/check.h" - -#include -#include - #include "src/core/server/server.h" #include "test/core/bad_client/bad_client.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/bad_connection/close_fd_test.cc b/test/core/bad_connection/close_fd_test.cc index 41bd7021a0f..258a4cbe30e 100644 --- a/test/core/bad_connection/close_fd_test.cc +++ b/test/core/bad_connection/close_fd_test.cc @@ -21,19 +21,17 @@ // an RPC call is in progress. // // -#include - -#include "absl/log/check.h" -#include "absl/log/log.h" -#include "absl/status/statusor.h" -#include "absl/strings/str_format.h" - #include #include #include #include #include +#include +#include "absl/log/check.h" +#include "absl/log/log.h" +#include "absl/status/statusor.h" +#include "absl/strings/str_format.h" #include "src/core/channelz/channelz.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/iomgr/endpoint.h" @@ -49,12 +47,11 @@ // This test won't work except with posix sockets enabled #ifdef GRPC_POSIX_SOCKET_TCP -#include -#include - #include #include #include +#include +#include #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" #include "src/core/lib/iomgr/endpoint_pair.h" diff --git a/test/core/bad_ssl/bad_ssl_test.cc b/test/core/bad_ssl/bad_ssl_test.cc index 51fad155944..d7a367c5868 100644 --- a/test/core/bad_ssl/bad_ssl_test.cc +++ b/test/core/bad_ssl/bad_ssl_test.cc @@ -16,13 +16,6 @@ // // -#include -#include - -#include - -#include "absl/log/check.h" - #include #include #include @@ -33,7 +26,12 @@ #include #include #include +#include +#include +#include + +#include "absl/log/check.h" #include "src/core/util/env.h" #include "src/core/util/host_port.h" #include "src/core/util/subprocess.h" diff --git a/test/core/bad_ssl/server_common.cc b/test/core/bad_ssl/server_common.cc index e76708b1969..a503b1dc835 100644 --- a/test/core/bad_ssl/server_common.cc +++ b/test/core/bad_ssl/server_common.cc @@ -18,13 +18,11 @@ #include "test/core/bad_ssl/server_common.h" +#include #include #include "absl/log/check.h" #include "absl/log/log.h" - -#include - #include "test/core/test_util/cmdline.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/bad_ssl/servers/alpn.cc b/test/core/bad_ssl/servers/alpn.cc index 285488747c8..af6bebf6213 100644 --- a/test/core/bad_ssl/servers/alpn.cc +++ b/test/core/bad_ssl/servers/alpn.cc @@ -18,15 +18,13 @@ #include "src/core/ext/transport/chttp2/alpn/alpn.h" -#include - -#include "absl/log/check.h" - #include #include #include #include +#include +#include "absl/log/check.h" #include "src/core/lib/iomgr/error.h" #include "src/core/util/useful.h" #include "test/core/bad_ssl/server_common.h" diff --git a/test/core/bad_ssl/servers/cert.cc b/test/core/bad_ssl/servers/cert.cc index 30d1b7fc8fd..e7f37f0a011 100644 --- a/test/core/bad_ssl/servers/cert.cc +++ b/test/core/bad_ssl/servers/cert.cc @@ -16,13 +16,12 @@ // // -#include "absl/log/check.h" - #include #include #include #include +#include "absl/log/check.h" #include "src/core/lib/iomgr/error.h" #include "test/core/bad_ssl/server_common.h" #include "test/core/test_util/tls_utils.h" diff --git a/test/core/call/batch_builder.h b/test/core/call/batch_builder.h index 40202ea25dc..fec948b8b62 100644 --- a/test/core/call/batch_builder.h +++ b/test/core/call/batch_builder.h @@ -17,7 +17,6 @@ #include "absl/strings/str_cat.h" #include "gtest/gtest.h" - #include "src/core/lib/slice/slice.h" #include "test/core/end2end/cq_verifier.h" diff --git a/test/core/call/bm_client_call.cc b/test/core/call/bm_client_call.cc index 78e4a2a4196..b79ae1f9caf 100644 --- a/test/core/call/bm_client_call.cc +++ b/test/core/call/bm_client_call.cc @@ -13,7 +13,6 @@ // limitations under the License. #include - #include #include "src/core/lib/event_engine/default_event_engine.h" diff --git a/test/core/call/call_utils_test.cc b/test/core/call/call_utils_test.cc index f9a8fdae345..323b3069394 100644 --- a/test/core/call/call_utils_test.cc +++ b/test/core/call/call_utils_test.cc @@ -14,12 +14,12 @@ #include "src/core/lib/surface/call_utils.h" +#include + #include #include "gtest/gtest.h" -#include - namespace grpc_core { TEST(CallUtils, AreWriteFlagsValid) { diff --git a/test/core/call/client_call_test.cc b/test/core/call/client_call_test.cc index ef9ba6cd1a4..78225dbea07 100644 --- a/test/core/call/client_call_test.cc +++ b/test/core/call/client_call_test.cc @@ -14,11 +14,10 @@ #include "src/core/lib/surface/client_call.h" -#include "absl/status/status.h" - #include #include +#include "absl/status/status.h" #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/transport/metadata.h" #include "src/core/util/debug_location.h" diff --git a/test/core/call/request_buffer_test.cc b/test/core/call/request_buffer_test.cc index 98aba0ac495..9e9f9a3fc6a 100644 --- a/test/core/call/request_buffer_test.cc +++ b/test/core/call/request_buffer_test.cc @@ -15,7 +15,6 @@ #include "src/core/call/request_buffer.h" #include "gtest/gtest.h" - #include "test/core/promise/poll_matcher.h" using testing::Mock; diff --git a/test/core/call/server_call_test.cc b/test/core/call/server_call_test.cc index b42f0503203..6e1db3b4d92 100644 --- a/test/core/call/server_call_test.cc +++ b/test/core/call/server_call_test.cc @@ -14,13 +14,12 @@ #include "src/core/lib/surface/server_call.h" -#include - -#include "absl/status/status.h" - #include #include +#include + +#include "absl/status/status.h" #include "src/core/channelz/channelz.h" #include "src/core/lib/promise/promise.h" #include "src/core/lib/resource_quota/arena.h" diff --git a/test/core/call/yodel/fuzzer_main.cc b/test/core/call/yodel/fuzzer_main.cc index 0f14c28eb51..7e7f37224f0 100644 --- a/test/core/call/yodel/fuzzer_main.cc +++ b/test/core/call/yodel/fuzzer_main.cc @@ -12,14 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - +#include #include +#include #include "absl/log/check.h" - -#include - #include "src/core/lib/config/config_vars.h" #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/experiments/config.h" diff --git a/test/core/call/yodel/test_main.cc b/test/core/call/yodel/test_main.cc index 22b1ff3d561..5cdd9dead55 100644 --- a/test/core/call/yodel/test_main.cc +++ b/test/core/call/yodel/test_main.cc @@ -13,7 +13,6 @@ // limitations under the License. #include "absl/random/random.h" - #include "src/core/lib/debug/trace.h" #include "test/core/call/yodel/yodel_test.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/call/yodel/yodel_test.cc b/test/core/call/yodel/yodel_test.cc index ccd31f35fb9..f9969184867 100644 --- a/test/core/call/yodel/yodel_test.cc +++ b/test/core/call/yodel/yodel_test.cc @@ -17,7 +17,6 @@ #include #include "absl/random/random.h" - #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/timer_manager.h" diff --git a/test/core/call/yodel/yodel_test.h b/test/core/call/yodel/yodel_test.h index 7ccb97e7d6a..518e6f0e64f 100644 --- a/test/core/call/yodel/yodel_test.h +++ b/test/core/call/yodel/yodel_test.h @@ -15,14 +15,13 @@ #ifndef GRPC_TEST_CORE_CALL_YODEL_YODEL_TEST_H #define GRPC_TEST_CORE_CALL_YODEL_YODEL_TEST_H +#include + #include "absl/functional/any_invocable.h" #include "absl/log/log.h" #include "absl/random/bit_gen_ref.h" #include "absl/strings/string_view.h" #include "gtest/gtest.h" - -#include - #include "src/core/lib/event_engine/event_engine_context.h" #include "src/core/lib/promise/cancel_callback.h" #include "src/core/lib/promise/detail/promise_factory.h" diff --git a/test/core/channel/call_finalization_test.cc b/test/core/channel/call_finalization_test.cc index 9e7ba84794d..fc07e704681 100644 --- a/test/core/channel/call_finalization_test.cc +++ b/test/core/channel/call_finalization_test.cc @@ -14,14 +14,13 @@ #include "src/core/lib/channel/call_finalization.h" +#include + #include #include #include "absl/strings/str_cat.h" #include "gtest/gtest.h" - -#include - #include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/lib/resource_quota/resource_quota.h" #include "src/core/util/ref_counted_ptr.h" diff --git a/test/core/channel/channel_args_test.cc b/test/core/channel/channel_args_test.cc index bb19b352e21..d79acdbc2e3 100644 --- a/test/core/channel/channel_args_test.cc +++ b/test/core/channel/channel_args_test.cc @@ -18,18 +18,16 @@ #include "src/core/lib/channel/channel_args.h" -#include - -#include "absl/log/check.h" -#include "absl/log/log.h" -#include "gtest/gtest.h" - #include #include #include #include #include +#include +#include "absl/log/check.h" +#include "absl/log/log.h" +#include "gtest/gtest.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/util/notification.h" #include "src/core/util/ref_counted.h" diff --git a/test/core/channel/channel_stack_builder_test.cc b/test/core/channel/channel_stack_builder_test.cc index 82bda202df4..1c6ed8995f0 100644 --- a/test/core/channel/channel_stack_builder_test.cc +++ b/test/core/channel/channel_stack_builder_test.cc @@ -18,15 +18,14 @@ #include "src/core/lib/channel/channel_stack_builder.h" +#include + #include #include #include #include "absl/status/status.h" #include "gtest/gtest.h" - -#include - #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/channel/channel_stack_builder_impl.h" #include "src/core/lib/iomgr/closure.h" diff --git a/test/core/channel/channel_stack_test.cc b/test/core/channel/channel_stack_test.cc index 1c722beb282..31d5e5fd216 100644 --- a/test/core/channel/channel_stack_test.cc +++ b/test/core/channel/channel_stack_test.cc @@ -18,12 +18,11 @@ #include "src/core/lib/channel/channel_stack.h" +#include + #include "absl/status/status.h" #include "absl/types/optional.h" #include "gtest/gtest.h" - -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_args_preconditioning.h" #include "src/core/lib/config/core_configuration.h" diff --git a/test/core/channel/minimal_stack_is_minimal_test.cc b/test/core/channel/minimal_stack_is_minimal_test.cc index d06f98fba2e..c207c274f80 100644 --- a/test/core/channel/minimal_stack_is_minimal_test.cc +++ b/test/core/channel/minimal_stack_is_minimal_test.cc @@ -29,6 +29,9 @@ // configurations and assess whether such a change is correct and desirable. // +#include +#include + #include #include #include @@ -38,10 +41,6 @@ #include "absl/memory/memory.h" #include "absl/strings/string_view.h" #include "gtest/gtest.h" - -#include -#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" diff --git a/test/core/channel/server_call_tracer_factory_test.cc b/test/core/channel/server_call_tracer_factory_test.cc index 821087f9d93..c38b9dd737c 100644 --- a/test/core/channel/server_call_tracer_factory_test.cc +++ b/test/core/channel/server_call_tracer_factory_test.cc @@ -15,7 +15,6 @@ #include #include "gtest/gtest.h" - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/resource_quota/arena.h" #include "src/core/telemetry/call_tracer.h" diff --git a/test/core/channelz/channel_trace_test.cc b/test/core/channelz/channel_trace_test.cc index e3fab992eb8..72834781eb5 100644 --- a/test/core/channelz/channel_trace_test.cc +++ b/test/core/channelz/channel_trace_test.cc @@ -18,6 +18,10 @@ #include "src/core/channelz/channel_trace.h" +#include +#include +#include +#include #include #include @@ -27,12 +31,6 @@ #include "absl/synchronization/notification.h" #include "gmock/gmock.h" #include "gtest/gtest.h" - -#include -#include -#include -#include - #include "src/core/channelz/channelz.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/iomgr/exec_ctx.h" diff --git a/test/core/channelz/channelz_registry_test.cc b/test/core/channelz/channelz_registry_test.cc index 29110f3f5c1..3dbd7a80b9e 100644 --- a/test/core/channelz/channelz_registry_test.cc +++ b/test/core/channelz/channelz_registry_test.cc @@ -24,7 +24,6 @@ #include #include "gtest/gtest.h" - #include "src/core/channelz/channelz.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/channelz/channelz_test.cc b/test/core/channelz/channelz_test.cc index a43950eefbb..ce58754cb74 100644 --- a/test/core/channelz/channelz_test.cc +++ b/test/core/channelz/channelz_test.cc @@ -18,6 +18,14 @@ #include "src/core/channelz/channelz.h" +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -29,16 +37,6 @@ #include "absl/status/status.h" #include "absl/status/statusor.h" #include "gtest/gtest.h" - -#include -#include -#include -#include -#include -#include -#include -#include - #include "src/core/channelz/channelz_registry.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/event_engine/default_event_engine.h" diff --git a/test/core/client_channel/bm_client_channel.cc b/test/core/client_channel/bm_client_channel.cc index 1ee51257c9f..566da748da9 100644 --- a/test/core/client_channel/bm_client_channel.cc +++ b/test/core/client_channel/bm_client_channel.cc @@ -13,12 +13,10 @@ // limitations under the License. #include +#include #include "absl/memory/memory.h" #include "absl/strings/string_view.h" - -#include - #include "src/core/client_channel/client_channel.h" #include "src/core/lib/address_utils/parse_address.h" #include "test/core/transport/call_spine_benchmarks.h" diff --git a/test/core/client_channel/bm_load_balanced_call_destination.cc b/test/core/client_channel/bm_load_balanced_call_destination.cc index f3a52f40ae9..555e51bdcc5 100644 --- a/test/core/client_channel/bm_load_balanced_call_destination.cc +++ b/test/core/client_channel/bm_load_balanced_call_destination.cc @@ -13,12 +13,10 @@ // limitations under the License. #include +#include #include "absl/memory/memory.h" #include "absl/strings/string_view.h" - -#include - #include "src/core/client_channel/load_balanced_call_destination.h" #include "src/core/lib/address_utils/parse_address.h" #include "test/core/transport/call_spine_benchmarks.h" diff --git a/test/core/client_channel/client_channel_service_config_test.cc b/test/core/client_channel/client_channel_service_config_test.cc index 28ffddf7f31..67b6af99e43 100644 --- a/test/core/client_channel/client_channel_service_config_test.cc +++ b/test/core/client_channel/client_channel_service_config_test.cc @@ -16,13 +16,12 @@ #include "src/core/client_channel/client_channel_service_config.h" -#include "absl/status/status.h" -#include "absl/status/statusor.h" -#include "gtest/gtest.h" - #include #include +#include "absl/status/status.h" +#include "absl/status/statusor.h" +#include "gtest/gtest.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/service_config/service_config.h" diff --git a/test/core/client_channel/client_channel_test.cc b/test/core/client_channel/client_channel_test.cc index 2c624c3b9c9..4dc980f5855 100644 --- a/test/core/client_channel/client_channel_test.cc +++ b/test/core/client_channel/client_channel_test.cc @@ -14,15 +14,14 @@ #include "src/core/client_channel/client_channel.h" +#include + #include #include #include "absl/log/log.h" #include "absl/strings/string_view.h" #include "gtest/gtest.h" - -#include - #include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/channel/promise_based_filter.h" #include "src/core/lib/config/core_configuration.h" diff --git a/test/core/client_channel/connected_subchannel_test.cc b/test/core/client_channel/connected_subchannel_test.cc index 98f5b26207f..619577d719e 100644 --- a/test/core/client_channel/connected_subchannel_test.cc +++ b/test/core/client_channel/connected_subchannel_test.cc @@ -12,15 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include + #include #include #include "absl/status/status.h" #include "absl/strings/string_view.h" #include "gtest/gtest.h" - -#include - #include "src/core/client_channel/client_channel.h" #include "src/core/client_channel/local_subchannel_pool.h" #include "src/core/lib/address_utils/parse_address.h" diff --git a/test/core/client_channel/lb_metadata_test.cc b/test/core/client_channel/lb_metadata_test.cc index 0ad10a62971..3d88972714c 100644 --- a/test/core/client_channel/lb_metadata_test.cc +++ b/test/core/client_channel/lb_metadata_test.cc @@ -20,7 +20,6 @@ #include "absl/strings/string_view.h" #include "gtest/gtest.h" - #include "src/core/lib/slice/slice.h" #include "src/core/lib/transport/metadata_batch.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/client_channel/load_balanced_call_destination_test.cc b/test/core/client_channel/load_balanced_call_destination_test.cc index 399f7bddc5a..268ea7825d4 100644 --- a/test/core/client_channel/load_balanced_call_destination_test.cc +++ b/test/core/client_channel/load_balanced_call_destination_test.cc @@ -14,6 +14,8 @@ #include "src/core/client_channel/load_balanced_call_destination.h" +#include + #include #include #include @@ -21,9 +23,6 @@ #include "absl/strings/string_view.h" #include "gmock/gmock.h" #include "gtest/gtest.h" - -#include - #include "test/core/call/yodel/yodel_test.h" using testing::StrictMock; diff --git a/test/core/client_channel/retry_service_config_test.cc b/test/core/client_channel/retry_service_config_test.cc index 5578e18ed11..b44bf119ec9 100644 --- a/test/core/client_channel/retry_service_config_test.cc +++ b/test/core/client_channel/retry_service_config_test.cc @@ -16,15 +16,14 @@ #include "src/core/client_channel/retry_service_config.h" -#include "absl/status/status.h" -#include "absl/status/statusor.h" -#include "gtest/gtest.h" - #include #include #include #include +#include "absl/status/status.h" +#include "absl/status/statusor.h" +#include "gtest/gtest.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/service_config/service_config.h" diff --git a/test/core/client_channel/retry_throttle_test.cc b/test/core/client_channel/retry_throttle_test.cc index 78cda1694ad..f8463ba83d4 100644 --- a/test/core/client_channel/retry_throttle_test.cc +++ b/test/core/client_channel/retry_throttle_test.cc @@ -19,7 +19,6 @@ #include "src/core/client_channel/retry_throttle.h" #include "gtest/gtest.h" - #include "test/core/test_util/test_config.h" namespace grpc_core { diff --git a/test/core/client_channel/subchannel_args_test.cc b/test/core/client_channel/subchannel_args_test.cc index 3750a8dc42b..b7f3aa3287b 100644 --- a/test/core/client_channel/subchannel_args_test.cc +++ b/test/core/client_channel/subchannel_args_test.cc @@ -14,14 +14,13 @@ // limitations under the License. // +#include +#include + #include #include "absl/types/optional.h" #include "gtest/gtest.h" - -#include -#include - #include "src/core/client_channel/subchannel.h" #include "src/core/client_channel/subchannel_pool_interface.h" #include "src/core/lib/channel/channel_args.h" diff --git a/test/core/compiler_bugs/miscompile_with_no_unique_address_test.cc b/test/core/compiler_bugs/miscompile_with_no_unique_address_test.cc index 49d723884ca..81aa23d06cf 100644 --- a/test/core/compiler_bugs/miscompile_with_no_unique_address_test.cc +++ b/test/core/compiler_bugs/miscompile_with_no_unique_address_test.cc @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include + #include #include "gtest/gtest.h" -#include - // Make a template argument to test which bit pattern remains in A's destructor // to try and detect similar bugs in non-MSAN builds (none have been detected // yet thankfully) diff --git a/test/core/compression/compression_test.cc b/test/core/compression/compression_test.cc index 9ed5b61b042..09a84548dd6 100644 --- a/test/core/compression/compression_test.cc +++ b/test/core/compression/compression_test.cc @@ -16,6 +16,8 @@ // // +#include +#include #include #include @@ -23,10 +25,6 @@ #include "absl/log/log.h" #include "gtest/gtest.h" - -#include -#include - #include "src/core/util/useful.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/compression/message_compress_fuzzer.cc b/test/core/compression/message_compress_fuzzer.cc index 64abbf21a4f..8b98844d910 100644 --- a/test/core/compression/message_compress_fuzzer.cc +++ b/test/core/compression/message_compress_fuzzer.cc @@ -16,13 +16,12 @@ // // -#include -#include - #include #include #include #include +#include +#include #include "src/core/lib/compression/message_compress.h" diff --git a/test/core/compression/message_compress_test.cc b/test/core/compression/message_compress_test.cc index e8aac4237a6..7bf558af1fa 100644 --- a/test/core/compression/message_compress_test.cc +++ b/test/core/compression/message_compress_test.cc @@ -18,6 +18,8 @@ #include "src/core/lib/compression/message_compress.h" +#include +#include #include #include #include @@ -26,10 +28,6 @@ #include "absl/log/log.h" #include "gtest/gtest.h" - -#include -#include - #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/util/useful.h" #include "test/core/test_util/slice_splitter.h" diff --git a/test/core/compression/message_decompress_fuzzer.cc b/test/core/compression/message_decompress_fuzzer.cc index 4996705182b..58b324de716 100644 --- a/test/core/compression/message_decompress_fuzzer.cc +++ b/test/core/compression/message_decompress_fuzzer.cc @@ -16,13 +16,12 @@ // // -#include -#include - #include #include #include #include +#include +#include #include "src/core/lib/compression/message_compress.h" diff --git a/test/core/config/core_configuration_test.cc b/test/core/config/core_configuration_test.cc index bf2e10b1890..3a391a8f097 100644 --- a/test/core/config/core_configuration_test.cc +++ b/test/core/config/core_configuration_test.cc @@ -14,13 +14,13 @@ #include "src/core/lib/config/core_configuration.h" +#include + #include #include #include #include -#include - namespace grpc_core { // Allow substitution of config builder - in real code this would iterate diff --git a/test/core/config/load_config_test.cc b/test/core/config/load_config_test.cc index 7d9ac207163..8c34bb0b651 100644 --- a/test/core/config/load_config_test.cc +++ b/test/core/config/load_config_test.cc @@ -16,7 +16,6 @@ #include "absl/flags/flag.h" #include "gtest/gtest.h" - #include "src/core/util/env.h" ABSL_FLAG(std::vector, comma_separated_strings, {}, ""); diff --git a/test/core/end2end/bad_server_response_test.cc b/test/core/end2end/bad_server_response_test.cc index f76151aa9d3..1badbcb5391 100644 --- a/test/core/end2end/bad_server_response_test.cc +++ b/test/core/end2end/bad_server_response_test.cc @@ -16,17 +16,6 @@ // // -#include -#include -#include - -#include -#include -#include - -#include "absl/log/check.h" -#include "absl/log/log.h" - #include #include #include @@ -38,7 +27,16 @@ #include #include #include +#include +#include +#include + +#include +#include +#include +#include "absl/log/check.h" +#include "absl/log/log.h" #include "src/core/lib/event_engine/shim.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint.h" diff --git a/test/core/end2end/connection_refused_test.cc b/test/core/end2end/connection_refused_test.cc index 436b2fb5730..e87fbcf3c64 100644 --- a/test/core/end2end/connection_refused_test.cc +++ b/test/core/end2end/connection_refused_test.cc @@ -16,13 +16,6 @@ // // -#include - -#include - -#include "absl/log/check.h" -#include "absl/log/log.h" - #include #include #include @@ -31,7 +24,12 @@ #include #include #include +#include + +#include +#include "absl/log/check.h" +#include "absl/log/log.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/util/host_port.h" diff --git a/test/core/end2end/cq_verifier.cc b/test/core/end2end/cq_verifier.cc index d1a322bc989..2b606807b41 100644 --- a/test/core/end2end/cq_verifier.cc +++ b/test/core/end2end/cq_verifier.cc @@ -18,6 +18,12 @@ #include "test/core/end2end/cq_verifier.h" +#include +#include +#include +#include +#include +#include #include #include #include @@ -36,14 +42,6 @@ #include "absl/strings/str_join.h" #include "absl/strings/string_view.h" #include "gtest/gtest.h" - -#include -#include -#include -#include -#include -#include - #include "src/core/lib/compression/message_compress.h" #include "src/core/lib/surface/event_string.h" #include "src/core/util/crash.h" diff --git a/test/core/end2end/cq_verifier.h b/test/core/end2end/cq_verifier.h index d86d3248958..856822807fa 100644 --- a/test/core/end2end/cq_verifier.h +++ b/test/core/end2end/cq_verifier.h @@ -19,6 +19,10 @@ #ifndef GRPC_TEST_CORE_END2END_CQ_VERIFIER_H #define GRPC_TEST_CORE_END2END_CQ_VERIFIER_H +#include +#include +#include +#include #include #include @@ -28,12 +32,6 @@ #include "absl/container/flat_hash_map.h" #include "absl/functional/any_invocable.h" #include "absl/types/variant.h" - -#include -#include -#include -#include - #include "src/core/util/debug_location.h" #include "src/core/util/time.h" diff --git a/test/core/end2end/dualstack_socket_test.cc b/test/core/end2end/dualstack_socket_test.cc index 44fc736e5ca..cbe48b86785 100644 --- a/test/core/end2end/dualstack_socket_test.cc +++ b/test/core/end2end/dualstack_socket_test.cc @@ -16,6 +16,11 @@ // // +#include +#include +#include +#include + #include #include #include @@ -23,18 +28,16 @@ #include "absl/log/check.h" #include "absl/log/log.h" #include "absl/status/statusor.h" - -#include -#include -#include -#include - #include "src/core/lib/iomgr/port.h" #include "src/core/lib/iomgr/resolved_address.h" // This test won't work except with posix sockets enabled #ifdef GRPC_POSIX_SOCKET_EV +#include +#include +#include +#include #include #include @@ -43,12 +46,6 @@ #include "absl/strings/str_join.h" #include "absl/strings/str_split.h" #include "absl/strings/string_view.h" - -#include -#include -#include -#include - #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/resolve_address.h" diff --git a/test/core/end2end/end2end_test_fuzzer.cc b/test/core/end2end/end2end_test_fuzzer.cc index e74627117a2..331ad4b998b 100644 --- a/test/core/end2end/end2end_test_fuzzer.cc +++ b/test/core/end2end/end2end_test_fuzzer.cc @@ -14,6 +14,8 @@ #include "test/core/end2end/end2end_test_fuzzer.h" +#include +#include #include #include @@ -24,12 +26,7 @@ #include #include -#include - #include "absl/log/check.h" - -#include - #include "src/core/lib/config/config_vars.h" #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/experiments/config.h" diff --git a/test/core/end2end/end2end_test_main.cc b/test/core/end2end/end2end_test_main.cc index 8d40eb90900..c9b0d0f0050 100644 --- a/test/core/end2end/end2end_test_main.cc +++ b/test/core/end2end/end2end_test_main.cc @@ -19,7 +19,6 @@ #include "absl/strings/str_cat.h" #include "absl/types/optional.h" #include "gtest/gtest.h" - #include "src/core/lib/config/config_vars.h" #include "test/core/end2end/end2end_tests.h" #include "test/core/end2end/fixtures/h2_tls_common.h" diff --git a/test/core/end2end/end2end_test_suites.cc b/test/core/end2end/end2end_test_suites.cc index 4b74ff032be..4b111ad1586 100644 --- a/test/core/end2end/end2end_test_suites.cc +++ b/test/core/end2end/end2end_test_suites.cc @@ -12,6 +12,16 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -33,18 +43,6 @@ #include "absl/strings/str_format.h" #include "absl/types/optional.h" #include "gtest/gtest.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - #include "src/core/ext/transport/chaotic_good/client/chaotic_good_connector.h" #include "src/core/ext/transport/chaotic_good/server/chaotic_good_server.h" #include "src/core/lib/channel/channel_args.h" diff --git a/test/core/end2end/end2end_tests.h b/test/core/end2end/end2end_tests.h index 9dc89e93a87..b358e9456e6 100644 --- a/test/core/end2end/end2end_tests.h +++ b/test/core/end2end/end2end_tests.h @@ -15,6 +15,16 @@ #ifndef GRPC_TEST_CORE_END2END_END2END_TESTS_H #define GRPC_TEST_CORE_END2END_END2END_TESTS_H +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -36,18 +46,6 @@ #include "absl/types/optional.h" #include "absl/types/variant.h" #include "gtest/gtest.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/config_vars.h" #include "src/core/lib/slice/slice.h" diff --git a/test/core/end2end/fixtures/h2_oauth2_common.h b/test/core/end2end/fixtures/h2_oauth2_common.h index 92d873d313c..fe52b1c8656 100644 --- a/test/core/end2end/fixtures/h2_oauth2_common.h +++ b/test/core/end2end/fixtures/h2_oauth2_common.h @@ -15,10 +15,6 @@ #ifndef GRPC_TEST_CORE_END2END_FIXTURES_H2_OAUTH2_COMMON_H #define GRPC_TEST_CORE_END2END_FIXTURES_H2_OAUTH2_COMMON_H -#include - -#include "absl/log/check.h" - #include #include #include @@ -26,7 +22,9 @@ #include #include #include +#include +#include "absl/log/check.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/security/credentials/credentials.h" diff --git a/test/core/end2end/fixtures/h2_ssl_cred_reload_fixture.h b/test/core/end2end/fixtures/h2_ssl_cred_reload_fixture.h index cbe17d19a13..cf8a611f40b 100644 --- a/test/core/end2end/fixtures/h2_ssl_cred_reload_fixture.h +++ b/test/core/end2end/fixtures/h2_ssl_cred_reload_fixture.h @@ -15,10 +15,6 @@ #ifndef GRPC_TEST_CORE_END2END_FIXTURES_H2_SSL_CRED_RELOAD_FIXTURE_H #define GRPC_TEST_CORE_END2END_FIXTURES_H2_SSL_CRED_RELOAD_FIXTURE_H -#include - -#include "absl/log/check.h" - #include #include #include @@ -26,7 +22,9 @@ #include #include #include +#include +#include "absl/log/check.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/security/credentials/ssl/ssl_credentials.h" diff --git a/test/core/end2end/fixtures/h2_ssl_tls_common.h b/test/core/end2end/fixtures/h2_ssl_tls_common.h index ce346b3175e..d97ca4ad9f5 100644 --- a/test/core/end2end/fixtures/h2_ssl_tls_common.h +++ b/test/core/end2end/fixtures/h2_ssl_tls_common.h @@ -15,10 +15,6 @@ #ifndef GRPC_TEST_CORE_END2END_FIXTURES_H2_SSL_TLS_COMMON_H #define GRPC_TEST_CORE_END2END_FIXTURES_H2_SSL_TLS_COMMON_H -#include - -#include "absl/log/check.h" - #include #include #include @@ -26,7 +22,9 @@ #include #include #include +#include +#include "absl/log/check.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/security/credentials/ssl/ssl_credentials.h" diff --git a/test/core/end2end/fixtures/h2_tls_common.h b/test/core/end2end/fixtures/h2_tls_common.h index c7a5ffd1d73..1c325dc7e8c 100644 --- a/test/core/end2end/fixtures/h2_tls_common.h +++ b/test/core/end2end/fixtures/h2_tls_common.h @@ -19,14 +19,6 @@ #ifndef GRPC_TEST_CORE_END2END_FIXTURES_H2_TLS_COMMON_H #define GRPC_TEST_CORE_END2END_FIXTURES_H2_TLS_COMMON_H -#include -#include - -#include - -#include "absl/log/check.h" -#include "absl/strings/string_view.h" - #include #include #include @@ -34,7 +26,13 @@ #include #include #include +#include +#include +#include + +#include "absl/log/check.h" +#include "absl/strings/string_view.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/security/credentials/tls/grpc_tls_credentials_options.h" diff --git a/test/core/end2end/fixtures/http_proxy_fixture.cc b/test/core/end2end/fixtures/http_proxy_fixture.cc index 88b65d3de94..c5f77bcf27f 100644 --- a/test/core/end2end/fixtures/http_proxy_fixture.cc +++ b/test/core/end2end/fixtures/http_proxy_fixture.cc @@ -18,6 +18,11 @@ #include "test/core/end2end/fixtures/http_proxy_fixture.h" +#include +#include +#include +#include +#include #include #include @@ -33,13 +38,6 @@ #include "absl/strings/escaping.h" #include "absl/strings/str_cat.h" #include "absl/strings/strip.h" - -#include -#include -#include -#include -#include - #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_args_preconditioning.h" diff --git a/test/core/end2end/fixtures/inproc_fixture.h b/test/core/end2end/fixtures/inproc_fixture.h index 4f08c3773fd..7a70aa138a7 100644 --- a/test/core/end2end/fixtures/inproc_fixture.h +++ b/test/core/end2end/fixtures/inproc_fixture.h @@ -15,10 +15,9 @@ #ifndef GRPC_TEST_CORE_END2END_FIXTURES_INPROC_FIXTURE_H #define GRPC_TEST_CORE_END2END_FIXTURES_INPROC_FIXTURE_H -#include "absl/functional/any_invocable.h" - #include +#include "absl/functional/any_invocable.h" #include "src/core/ext/transport/inproc/inproc_transport.h" #include "src/core/lib/channel/channel_args.h" #include "test/core/end2end/end2end_tests.h" diff --git a/test/core/end2end/fixtures/local_util.cc b/test/core/end2end/fixtures/local_util.cc index 63bc96b9052..c9ae9c5f1ce 100644 --- a/test/core/end2end/fixtures/local_util.cc +++ b/test/core/end2end/fixtures/local_util.cc @@ -18,16 +18,15 @@ #include "test/core/end2end/fixtures/local_util.h" +#include +#include +#include #include #include #include "absl/log/check.h" -#include -#include -#include - static void process_auth_failure(void* state, grpc_auth_context* /*ctx*/, const grpc_metadata* /*md*/, size_t /*md_count*/, diff --git a/test/core/end2end/fixtures/local_util.h b/test/core/end2end/fixtures/local_util.h index fc9f8d8af5c..e7f3ce3c2d2 100644 --- a/test/core/end2end/fixtures/local_util.h +++ b/test/core/end2end/fixtures/local_util.h @@ -19,13 +19,12 @@ #ifndef GRPC_TEST_CORE_END2END_FIXTURES_LOCAL_UTIL_H #define GRPC_TEST_CORE_END2END_FIXTURES_LOCAL_UTIL_H -#include - -#include "absl/functional/any_invocable.h" - #include #include +#include + +#include "absl/functional/any_invocable.h" #include "src/core/lib/channel/channel_args.h" #include "test/core/end2end/end2end_tests.h" diff --git a/test/core/end2end/fixtures/proxy.cc b/test/core/end2end/fixtures/proxy.cc index 1d78ebcd2b7..728eddfc70d 100644 --- a/test/core/end2end/fixtures/proxy.cc +++ b/test/core/end2end/fixtures/proxy.cc @@ -18,15 +18,6 @@ #include "test/core/end2end/fixtures/proxy.h" -#include - -#include -#include -#include - -#include "absl/log/check.h" -#include "absl/log/log.h" - #include #include #include @@ -35,7 +26,14 @@ #include #include #include +#include + +#include +#include +#include +#include "absl/log/check.h" +#include "absl/log/log.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/surface/call.h" #include "src/core/util/crash.h" diff --git a/test/core/end2end/fixtures/secure_fixture.h b/test/core/end2end/fixtures/secure_fixture.h index 4586994981b..20e488f427b 100644 --- a/test/core/end2end/fixtures/secure_fixture.h +++ b/test/core/end2end/fixtures/secure_fixture.h @@ -15,16 +15,15 @@ #ifndef GRPC_TEST_CORE_END2END_FIXTURES_SECURE_FIXTURE_H #define GRPC_TEST_CORE_END2END_FIXTURES_SECURE_FIXTURE_H +#include +#include +#include + #include #include #include "absl/functional/any_invocable.h" #include "absl/log/check.h" - -#include -#include -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/util/host_port.h" #include "test/core/end2end/end2end_tests.h" diff --git a/test/core/end2end/fixtures/sockpair_fixture.h b/test/core/end2end/fixtures/sockpair_fixture.h index cedc002695f..ce3616c22cf 100644 --- a/test/core/end2end/fixtures/sockpair_fixture.h +++ b/test/core/end2end/fixtures/sockpair_fixture.h @@ -15,6 +15,10 @@ #ifndef GRPC_TEST_CORE_END2END_FIXTURES_SOCKPAIR_FIXTURE_H #define GRPC_TEST_CORE_END2END_FIXTURES_SOCKPAIR_FIXTURE_H +#include +#include +#include + #include #include "absl/functional/any_invocable.h" @@ -22,11 +26,6 @@ #include "absl/status/status.h" #include "absl/status/statusor.h" #include "gtest/gtest.h" - -#include -#include -#include - #include "src/core/channelz/channelz.h" #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" #include "src/core/lib/channel/channel_args.h" diff --git a/test/core/end2end/fuzzers/api_fuzzer.cc b/test/core/end2end/fuzzers/api_fuzzer.cc index c4e960a7d9a..2cc58bdf76b 100644 --- a/test/core/end2end/fuzzers/api_fuzzer.cc +++ b/test/core/end2end/fuzzers/api_fuzzer.cc @@ -16,6 +16,12 @@ // // +#include +#include +#include +#include +#include +#include #include #include @@ -36,14 +42,6 @@ #include "absl/time/clock.h" #include "absl/time/time.h" #include "absl/types/optional.h" - -#include -#include -#include -#include -#include -#include - #include "src/core/ext/transport/inproc/inproc_transport.h" #include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/channel/channel_args.h" diff --git a/test/core/end2end/fuzzers/client_fuzzer.cc b/test/core/end2end/fuzzers/client_fuzzer.cc index 9278eb8d0e5..b44a42e8fa6 100644 --- a/test/core/end2end/fuzzers/client_fuzzer.cc +++ b/test/core/end2end/fuzzers/client_fuzzer.cc @@ -12,16 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include +#include +#include + #include #include "absl/log/check.h" #include "absl/status/statusor.h" #include "absl/types/optional.h" - -#include -#include -#include - #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_args_preconditioning.h" diff --git a/test/core/end2end/fuzzers/connector_fuzzer.h b/test/core/end2end/fuzzers/connector_fuzzer.h index 64b78aeb0bf..458851fa7cd 100644 --- a/test/core/end2end/fuzzers/connector_fuzzer.h +++ b/test/core/end2end/fuzzers/connector_fuzzer.h @@ -16,7 +16,6 @@ #define GRPC_TEST_CORE_END2END_FUZZERS_CONNECTOR_FUZZER_H #include "absl/functional/function_ref.h" - #include "src/core/client_channel/connector.h" #include "src/core/lib/security/security_connector/security_connector.h" #include "test/core/end2end/fuzzers/fuzzer_input.pb.h" diff --git a/test/core/end2end/fuzzers/fuzzing_common.cc b/test/core/end2end/fuzzers/fuzzing_common.cc index 820af4ab182..85d6ec51d26 100644 --- a/test/core/end2end/fuzzers/fuzzing_common.cc +++ b/test/core/end2end/fuzzers/fuzzing_common.cc @@ -18,6 +18,13 @@ #include "test/core/end2end/fuzzers/fuzzing_common.h" +#include +#include +#include +#include +#include +#include +#include #include #include @@ -27,15 +34,6 @@ #include "absl/log/log.h" #include "absl/strings/str_cat.h" #include "absl/types/optional.h" - -#include -#include -#include -#include -#include -#include -#include - #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/experiments/config.h" #include "src/core/lib/iomgr/exec_ctx.h" diff --git a/test/core/end2end/fuzzers/fuzzing_common.h b/test/core/end2end/fuzzers/fuzzing_common.h index b365c698e2d..5f287fae66b 100644 --- a/test/core/end2end/fuzzers/fuzzing_common.h +++ b/test/core/end2end/fuzzers/fuzzing_common.h @@ -19,6 +19,7 @@ #ifndef GRPC_TEST_CORE_END2END_FUZZERS_FUZZING_COMMON_H #define GRPC_TEST_CORE_END2END_FUZZERS_FUZZING_COMMON_H +#include #include #include @@ -30,9 +31,6 @@ #include "absl/log/check.h" #include "absl/types/span.h" - -#include - #include "src/core/lib/resource_quota/resource_quota.h" #include "src/core/util/ref_counted_ptr.h" #include "src/core/util/time.h" diff --git a/test/core/end2end/fuzzers/network_input.cc b/test/core/end2end/fuzzers/network_input.cc index 0afd8d1b95d..6a91a74d9ca 100644 --- a/test/core/end2end/fuzzers/network_input.cc +++ b/test/core/end2end/fuzzers/network_input.cc @@ -14,6 +14,7 @@ #include "test/core/end2end/fuzzers/network_input.h" +#include #include #include @@ -26,9 +27,6 @@ #include "absl/log/log.h" #include "absl/strings/string_view.h" #include "absl/types/span.h" - -#include - #include "src/core/ext/transport/chaotic_good/frame_header.h" #include "src/core/ext/transport/chttp2/transport/frame.h" #include "src/core/ext/transport/chttp2/transport/varint.h" diff --git a/test/core/end2end/fuzzers/server_fuzzer.cc b/test/core/end2end/fuzzers/server_fuzzer.cc index ebf7034caec..1983ff9316e 100644 --- a/test/core/end2end/fuzzers/server_fuzzer.cc +++ b/test/core/end2end/fuzzers/server_fuzzer.cc @@ -12,15 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - -#include "absl/log/check.h" -#include "absl/types/optional.h" - #include #include #include +#include + +#include "absl/log/check.h" +#include "absl/types/optional.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/experiments/config.h" #include "src/core/lib/iomgr/exec_ctx.h" diff --git a/test/core/end2end/fuzzers/server_fuzzer.h b/test/core/end2end/fuzzers/server_fuzzer.h index c8e42730348..621bb70ac4f 100644 --- a/test/core/end2end/fuzzers/server_fuzzer.h +++ b/test/core/end2end/fuzzers/server_fuzzer.h @@ -15,10 +15,9 @@ #ifndef GRPC_TEST_CORE_END2END_FUZZERS_SERVER_FUZZER_H #define GRPC_TEST_CORE_END2END_FUZZERS_SERVER_FUZZER_H -#include "absl/functional/function_ref.h" - #include +#include "absl/functional/function_ref.h" #include "src/core/lib/channel/channel_args.h" #include "test/core/end2end/fuzzers/fuzzer_input.pb.h" diff --git a/test/core/end2end/fuzzers/server_fuzzer_chaotic_good.cc b/test/core/end2end/fuzzers/server_fuzzer_chaotic_good.cc index 6d688e655a2..09070be455f 100644 --- a/test/core/end2end/fuzzers/server_fuzzer_chaotic_good.cc +++ b/test/core/end2end/fuzzers/server_fuzzer_chaotic_good.cc @@ -12,10 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "absl/log/check.h" - #include +#include "absl/log/check.h" #include "src/core/ext/transport/chaotic_good/server/chaotic_good_server.h" #include "src/core/lib/event_engine/tcp_socket_utils.h" #include "src/libfuzzer/libfuzzer_macro.h" diff --git a/test/core/end2end/goaway_server_test.cc b/test/core/end2end/goaway_server_test.cc index 2ebc094e210..ef2e6840c2d 100644 --- a/test/core/end2end/goaway_server_test.cc +++ b/test/core/end2end/goaway_server_test.cc @@ -16,6 +16,16 @@ // // +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -32,18 +42,6 @@ #include "absl/status/statusor.h" #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/experiments/experiments.h" diff --git a/test/core/end2end/h2_ssl_cert_test.cc b/test/core/end2end/h2_ssl_cert_test.cc index d9509266d0f..716b1faa0ad 100644 --- a/test/core/end2end/h2_ssl_cert_test.cc +++ b/test/core/end2end/h2_ssl_cert_test.cc @@ -16,6 +16,16 @@ // // +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -28,18 +38,6 @@ #include "absl/log/log.h" #include "absl/types/optional.h" #include "gtest/gtest.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/config_vars.h" #include "src/core/util/time.h" diff --git a/test/core/end2end/h2_ssl_session_reuse_test.cc b/test/core/end2end/h2_ssl_session_reuse_test.cc index 882f09995e8..7bb518425b4 100644 --- a/test/core/end2end/h2_ssl_session_reuse_test.cc +++ b/test/core/end2end/h2_ssl_session_reuse_test.cc @@ -16,15 +16,6 @@ // // -#include - -#include - -#include - -#include "absl/log/check.h" -#include "absl/types/optional.h" - #include #include #include @@ -34,7 +25,13 @@ #include #include #include +#include +#include +#include + +#include "absl/log/check.h" +#include "absl/types/optional.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/config_vars.h" #include "src/core/lib/iomgr/error.h" diff --git a/test/core/end2end/h2_tls_peer_property_external_verifier_test.cc b/test/core/end2end/h2_tls_peer_property_external_verifier_test.cc index a9f74bed935..9d232edf911 100644 --- a/test/core/end2end/h2_tls_peer_property_external_verifier_test.cc +++ b/test/core/end2end/h2_tls_peer_property_external_verifier_test.cc @@ -15,16 +15,6 @@ // limitations under the License. // // -#include -#include - -#include - -#include - -#include "absl/log/check.h" -#include "absl/types/optional.h" - #include #include #include @@ -34,7 +24,14 @@ #include #include #include +#include +#include +#include +#include + +#include "absl/log/check.h" +#include "absl/types/optional.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/config_vars.h" #include "src/core/lib/iomgr/error.h" diff --git a/test/core/end2end/invalid_call_argument_test.cc b/test/core/end2end/invalid_call_argument_test.cc index ee7caff77ca..d587079a0e2 100644 --- a/test/core/end2end/invalid_call_argument_test.cc +++ b/test/core/end2end/invalid_call_argument_test.cc @@ -16,16 +16,6 @@ // // -#include -#include - -#include -#include -#include - -#include "absl/log/check.h" -#include "absl/log/log.h" - #include #include #include @@ -35,7 +25,15 @@ #include #include #include +#include +#include +#include +#include +#include + +#include "absl/log/check.h" +#include "absl/log/log.h" #include "src/core/util/host_port.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/test_util/port.h" diff --git a/test/core/end2end/no_server_test.cc b/test/core/end2end/no_server_test.cc index 5e8d9add4fd..f03b3225d70 100644 --- a/test/core/end2end/no_server_test.cc +++ b/test/core/end2end/no_server_test.cc @@ -16,6 +16,13 @@ // // +#include +#include +#include +#include +#include +#include +#include #include #include @@ -25,15 +32,6 @@ #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/time/time.h" - -#include -#include -#include -#include -#include -#include -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/resolver/endpoint_addresses.h" diff --git a/test/core/end2end/tests/bad_ping.cc b/test/core/end2end/tests/bad_ping.cc index 1a556d5ee52..adc5d8529f5 100644 --- a/test/core/end2end/tests/bad_ping.cc +++ b/test/core/end2end/tests/bad_ping.cc @@ -16,13 +16,12 @@ // // -#include - -#include "gtest/gtest.h" - #include #include +#include + +#include "gtest/gtest.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" diff --git a/test/core/end2end/tests/binary_metadata.cc b/test/core/end2end/tests/binary_metadata.cc index a96ce818304..8b08e161521 100644 --- a/test/core/end2end/tests/binary_metadata.cc +++ b/test/core/end2end/tests/binary_metadata.cc @@ -16,13 +16,12 @@ // // -#include - -#include "gtest/gtest.h" - #include #include +#include + +#include "gtest/gtest.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/slice/slice.h" #include "src/core/util/time.h" diff --git a/test/core/end2end/tests/call_creds.cc b/test/core/end2end/tests/call_creds.cc index b19d555005b..115d368c473 100644 --- a/test/core/end2end/tests/call_creds.cc +++ b/test/core/end2end/tests/call_creds.cc @@ -16,17 +16,16 @@ // // -#include - -#include "absl/log/log.h" -#include "absl/types/optional.h" -#include "gtest/gtest.h" - #include #include #include #include +#include + +#include "absl/log/log.h" +#include "absl/types/optional.h" +#include "gtest/gtest.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/util/time.h" diff --git a/test/core/end2end/tests/call_host_override.cc b/test/core/end2end/tests/call_host_override.cc index ee847552969..7c90de9486a 100644 --- a/test/core/end2end/tests/call_host_override.cc +++ b/test/core/end2end/tests/call_host_override.cc @@ -16,14 +16,13 @@ // // +#include +#include + #include #include "absl/types/optional.h" #include "gtest/gtest.h" - -#include -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" diff --git a/test/core/end2end/tests/cancel_after_accept.cc b/test/core/end2end/tests/cancel_after_accept.cc index e22063354de..fde403d5b5a 100644 --- a/test/core/end2end/tests/cancel_after_accept.cc +++ b/test/core/end2end/tests/cancel_after_accept.cc @@ -16,15 +16,14 @@ // // +#include +#include + #include #include "absl/strings/str_cat.h" #include "gmock/gmock.h" #include "gtest/gtest.h" - -#include -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" diff --git a/test/core/end2end/tests/cancel_after_client_done.cc b/test/core/end2end/tests/cancel_after_client_done.cc index 8ca9e005ba8..a25bde486b4 100644 --- a/test/core/end2end/tests/cancel_after_client_done.cc +++ b/test/core/end2end/tests/cancel_after_client_done.cc @@ -16,13 +16,12 @@ // // +#include + #include #include "gmock/gmock.h" #include "gtest/gtest.h" - -#include - #include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" #include "test/core/end2end/tests/cancel_test_helpers.h" diff --git a/test/core/end2end/tests/cancel_after_invoke.cc b/test/core/end2end/tests/cancel_after_invoke.cc index aeaf45bd2f1..6c66eae9f4d 100644 --- a/test/core/end2end/tests/cancel_after_invoke.cc +++ b/test/core/end2end/tests/cancel_after_invoke.cc @@ -16,13 +16,12 @@ // // +#include + #include #include "gmock/gmock.h" #include "gtest/gtest.h" - -#include - #include "src/core/ext/transport/chttp2/transport/internal.h" #include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" diff --git a/test/core/end2end/tests/cancel_after_round_trip.cc b/test/core/end2end/tests/cancel_after_round_trip.cc index 00f268683a4..f225f1ad80d 100644 --- a/test/core/end2end/tests/cancel_after_round_trip.cc +++ b/test/core/end2end/tests/cancel_after_round_trip.cc @@ -16,15 +16,14 @@ // // +#include +#include + #include #include "absl/strings/str_cat.h" #include "gmock/gmock.h" #include "gtest/gtest.h" - -#include -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" diff --git a/test/core/end2end/tests/cancel_before_invoke.cc b/test/core/end2end/tests/cancel_before_invoke.cc index 6c5e07d6d63..942acef1941 100644 --- a/test/core/end2end/tests/cancel_before_invoke.cc +++ b/test/core/end2end/tests/cancel_before_invoke.cc @@ -16,12 +16,11 @@ // // +#include + #include #include "gtest/gtest.h" - -#include - #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/end2end/tests/cancel_with_status.cc b/test/core/end2end/tests/cancel_with_status.cc index 4673ade3698..f80779ad96f 100644 --- a/test/core/end2end/tests/cancel_with_status.cc +++ b/test/core/end2end/tests/cancel_with_status.cc @@ -16,14 +16,13 @@ // // -#include - -#include "gtest/gtest.h" - #include #include #include +#include + +#include "gtest/gtest.h" #include "src/core/ext/transport/chttp2/transport/internal.h" #include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" diff --git a/test/core/end2end/tests/channelz.cc b/test/core/end2end/tests/channelz.cc index dcd363a1051..7332b428a22 100644 --- a/test/core/end2end/tests/channelz.cc +++ b/test/core/end2end/tests/channelz.cc @@ -18,14 +18,13 @@ #include "src/core/channelz/channelz.h" +#include +#include + #include #include "gmock/gmock.h" #include "gtest/gtest.h" - -#include -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/surface/channel.h" #include "src/core/server/server.h" diff --git a/test/core/end2end/tests/client_streaming.cc b/test/core/end2end/tests/client_streaming.cc index 2cf6a617556..372e3d377b6 100644 --- a/test/core/end2end/tests/client_streaming.cc +++ b/test/core/end2end/tests/client_streaming.cc @@ -16,12 +16,11 @@ // // +#include + #include #include "gtest/gtest.h" - -#include - #include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" diff --git a/test/core/end2end/tests/compressed_payload.cc b/test/core/end2end/tests/compressed_payload.cc index cbae272da8e..0df335bca87 100644 --- a/test/core/end2end/tests/compressed_payload.cc +++ b/test/core/end2end/tests/compressed_payload.cc @@ -16,6 +16,10 @@ // // +#include +#include +#include +#include #include #include @@ -24,12 +28,6 @@ #include "absl/strings/string_view.h" #include "gtest/gtest.h" - -#include -#include -#include -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/util/bitset.h" #include "src/core/util/time.h" diff --git a/test/core/end2end/tests/connectivity.cc b/test/core/end2end/tests/connectivity.cc index 00e83236e4d..364489fdb05 100644 --- a/test/core/end2end/tests/connectivity.cc +++ b/test/core/end2end/tests/connectivity.cc @@ -16,12 +16,11 @@ // // -#include "gmock/gmock.h" -#include "gtest/gtest.h" - #include #include +#include "gmock/gmock.h" +#include "gtest/gtest.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" diff --git a/test/core/end2end/tests/default_host.cc b/test/core/end2end/tests/default_host.cc index fe5100dd845..5a84e9acdcd 100644 --- a/test/core/end2end/tests/default_host.cc +++ b/test/core/end2end/tests/default_host.cc @@ -16,14 +16,13 @@ // // +#include + #include #include "absl/types/optional.h" #include "gmock/gmock.h" #include "gtest/gtest.h" - -#include - #include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" diff --git a/test/core/end2end/tests/disappearing_server.cc b/test/core/end2end/tests/disappearing_server.cc index a42853b538b..31badc9f9b7 100644 --- a/test/core/end2end/tests/disappearing_server.cc +++ b/test/core/end2end/tests/disappearing_server.cc @@ -16,13 +16,12 @@ // // +#include + #include #include "absl/log/log.h" #include "gtest/gtest.h" - -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" diff --git a/test/core/end2end/tests/filter_causes_close.cc b/test/core/end2end/tests/filter_causes_close.cc index feae6776991..e1836375f1c 100644 --- a/test/core/end2end/tests/filter_causes_close.cc +++ b/test/core/end2end/tests/filter_causes_close.cc @@ -16,6 +16,7 @@ // // +#include #include #include @@ -23,9 +24,6 @@ #include "absl/status/status.h" #include "gtest/gtest.h" - -#include - #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/channel/promise_based_filter.h" diff --git a/test/core/end2end/tests/filter_init_fails.cc b/test/core/end2end/tests/filter_init_fails.cc index 5183489db1e..c258ee74221 100644 --- a/test/core/end2end/tests/filter_init_fails.cc +++ b/test/core/end2end/tests/filter_init_fails.cc @@ -16,6 +16,8 @@ // // +#include + #include #include @@ -23,9 +25,6 @@ #include "absl/types/optional.h" #include "gmock/gmock.h" #include "gtest/gtest.h" - -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_stack.h" diff --git a/test/core/end2end/tests/filtered_metadata.cc b/test/core/end2end/tests/filtered_metadata.cc index 5f14a22a85b..ac3da1a9370 100644 --- a/test/core/end2end/tests/filtered_metadata.cc +++ b/test/core/end2end/tests/filtered_metadata.cc @@ -16,14 +16,13 @@ // // +#include + #include #include "absl/strings/string_view.h" #include "absl/types/optional.h" #include "gtest/gtest.h" - -#include - #include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" diff --git a/test/core/end2end/tests/graceful_server_shutdown.cc b/test/core/end2end/tests/graceful_server_shutdown.cc index 34390d02f07..8e72b926272 100644 --- a/test/core/end2end/tests/graceful_server_shutdown.cc +++ b/test/core/end2end/tests/graceful_server_shutdown.cc @@ -16,12 +16,11 @@ // // +#include + #include #include "gtest/gtest.h" - -#include - #include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" diff --git a/test/core/end2end/tests/grpc_authz.cc b/test/core/end2end/tests/grpc_authz.cc index 48553dd0357..7763d831da7 100644 --- a/test/core/end2end/tests/grpc_authz.cc +++ b/test/core/end2end/tests/grpc_authz.cc @@ -12,17 +12,16 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - -#include "absl/log/check.h" -#include "absl/status/status.h" -#include "gtest/gtest.h" - #include #include #include #include +#include + +#include "absl/log/check.h" +#include "absl/status/status.h" +#include "gtest/gtest.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/security/authorization/authorization_policy_provider.h" #include "src/core/lib/security/authorization/grpc_authorization_policy_provider.h" diff --git a/test/core/end2end/tests/high_initial_seqno.cc b/test/core/end2end/tests/high_initial_seqno.cc index e9dd5cd39a7..5708bda98db 100644 --- a/test/core/end2end/tests/high_initial_seqno.cc +++ b/test/core/end2end/tests/high_initial_seqno.cc @@ -16,13 +16,12 @@ // // -#include - -#include "gtest/gtest.h" - #include #include +#include + +#include "gtest/gtest.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" diff --git a/test/core/end2end/tests/hpack_size.cc b/test/core/end2end/tests/hpack_size.cc index 766a00cbe99..f42894e18b7 100644 --- a/test/core/end2end/tests/hpack_size.cc +++ b/test/core/end2end/tests/hpack_size.cc @@ -16,6 +16,8 @@ // // +#include +#include #include #include @@ -24,10 +26,6 @@ #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" #include "gtest/gtest.h" - -#include -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/util/no_destruct.h" #include "test/core/end2end/end2end_tests.h" diff --git a/test/core/end2end/tests/http2_stats.cc b/test/core/end2end/tests/http2_stats.cc index 51561dbbe17..9e33da9ad5d 100644 --- a/test/core/end2end/tests/http2_stats.cc +++ b/test/core/end2end/tests/http2_stats.cc @@ -12,6 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include +#include + #include #include #include @@ -23,10 +26,6 @@ #include "absl/strings/string_view.h" #include "absl/time/time.h" #include "gtest/gtest.h" - -#include -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_stack.h" diff --git a/test/core/end2end/tests/invoke_large_request.cc b/test/core/end2end/tests/invoke_large_request.cc index 3302ee48e89..2b3ba1ba511 100644 --- a/test/core/end2end/tests/invoke_large_request.cc +++ b/test/core/end2end/tests/invoke_large_request.cc @@ -16,15 +16,13 @@ // // +#include +#include #include #include #include "gtest/gtest.h" - -#include -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/slice/slice.h" #include "src/core/util/time.h" diff --git a/test/core/end2end/tests/keepalive_timeout.cc b/test/core/end2end/tests/keepalive_timeout.cc index 9c94b653c84..e60f8b29c97 100644 --- a/test/core/end2end/tests/keepalive_timeout.cc +++ b/test/core/end2end/tests/keepalive_timeout.cc @@ -16,14 +16,13 @@ // // +#include +#include + #include #include "absl/strings/string_view.h" #include "gtest/gtest.h" - -#include -#include - #include "src/core/ext/transport/chttp2/transport/internal.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/config_vars.h" diff --git a/test/core/end2end/tests/large_metadata.cc b/test/core/end2end/tests/large_metadata.cc index 9f053983980..b22b75d29d9 100644 --- a/test/core/end2end/tests/large_metadata.cc +++ b/test/core/end2end/tests/large_metadata.cc @@ -16,16 +16,14 @@ // // +#include +#include #include #include #include "gmock/gmock.h" #include "gtest/gtest.h" - -#include -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" diff --git a/test/core/end2end/tests/max_concurrent_streams.cc b/test/core/end2end/tests/max_concurrent_streams.cc index 1b0d301b724..9c644dbe69c 100644 --- a/test/core/end2end/tests/max_concurrent_streams.cc +++ b/test/core/end2end/tests/max_concurrent_streams.cc @@ -16,13 +16,12 @@ // // -#include - -#include "gtest/gtest.h" - #include #include +#include + +#include "gtest/gtest.h" #include "src/core/ext/transport/chttp2/transport/internal.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/util/time.h" diff --git a/test/core/end2end/tests/max_connection_age.cc b/test/core/end2end/tests/max_connection_age.cc index 0938eb2393c..88a0b2b3915 100644 --- a/test/core/end2end/tests/max_connection_age.cc +++ b/test/core/end2end/tests/max_connection_age.cc @@ -16,16 +16,14 @@ // // +#include +#include #include #include #include "gmock/gmock.h" #include "gtest/gtest.h" - -#include -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" diff --git a/test/core/end2end/tests/max_connection_idle.cc b/test/core/end2end/tests/max_connection_idle.cc index 1dfbd2f6ede..1d139e862ac 100644 --- a/test/core/end2end/tests/max_connection_idle.cc +++ b/test/core/end2end/tests/max_connection_idle.cc @@ -16,16 +16,15 @@ // // +#include +#include +#include + #include #include "absl/types/optional.h" #include "gmock/gmock.h" #include "gtest/gtest.h" - -#include -#include -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" diff --git a/test/core/end2end/tests/max_message_length.cc b/test/core/end2end/tests/max_message_length.cc index 5a70f2cdfa9..a7154fcb2d2 100644 --- a/test/core/end2end/tests/max_message_length.cc +++ b/test/core/end2end/tests/max_message_length.cc @@ -16,14 +16,13 @@ // // +#include +#include + #include #include "gmock/gmock.h" #include "gtest/gtest.h" - -#include -#include - #include "src/core/lib/channel/channel_args.h" #include "test/core/end2end/end2end_tests.h" diff --git a/test/core/end2end/tests/negative_deadline.cc b/test/core/end2end/tests/negative_deadline.cc index c1c5392c1bf..1fdf6771325 100644 --- a/test/core/end2end/tests/negative_deadline.cc +++ b/test/core/end2end/tests/negative_deadline.cc @@ -16,12 +16,11 @@ // // +#include + #include #include "gtest/gtest.h" - -#include - #include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" diff --git a/test/core/end2end/tests/no_logging.cc b/test/core/end2end/tests/no_logging.cc index e144dda3d1d..0bae8cf6270 100644 --- a/test/core/end2end/tests/no_logging.cc +++ b/test/core/end2end/tests/no_logging.cc @@ -16,6 +16,9 @@ // // +#include +#include + #include #include #include @@ -32,10 +35,6 @@ #include "absl/strings/string_view.h" #include "absl/types/optional.h" #include "gtest/gtest.h" - -#include -#include - #include "src/core/lib/debug/trace.h" #include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" diff --git a/test/core/end2end/tests/payload.cc b/test/core/end2end/tests/payload.cc index 31c5456dee4..edc97835ba8 100644 --- a/test/core/end2end/tests/payload.cc +++ b/test/core/end2end/tests/payload.cc @@ -16,12 +16,11 @@ // // +#include + #include #include "gtest/gtest.h" - -#include - #include "src/core/lib/slice/slice.h" #include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" diff --git a/test/core/end2end/tests/ping.cc b/test/core/end2end/tests/ping.cc index 70b2fbb57c2..73094b8feb2 100644 --- a/test/core/end2end/tests/ping.cc +++ b/test/core/end2end/tests/ping.cc @@ -16,12 +16,11 @@ // // -#include "gmock/gmock.h" -#include "gtest/gtest.h" - #include #include +#include "gmock/gmock.h" +#include "gtest/gtest.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" diff --git a/test/core/end2end/tests/ping_pong_streaming.cc b/test/core/end2end/tests/ping_pong_streaming.cc index 9cfd8bb92a9..784db17c7ad 100644 --- a/test/core/end2end/tests/ping_pong_streaming.cc +++ b/test/core/end2end/tests/ping_pong_streaming.cc @@ -16,10 +16,10 @@ // // -#include - #include +#include + #include "src/core/lib/slice/slice.h" #include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" diff --git a/test/core/end2end/tests/proxy_auth.cc b/test/core/end2end/tests/proxy_auth.cc index 9b2b3897b83..23bcdbaff5e 100644 --- a/test/core/end2end/tests/proxy_auth.cc +++ b/test/core/end2end/tests/proxy_auth.cc @@ -16,13 +16,12 @@ // // +#include + #include #include "absl/types/optional.h" #include "gtest/gtest.h" - -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" diff --git a/test/core/end2end/tests/registered_call.cc b/test/core/end2end/tests/registered_call.cc index 1dc13b5acd5..e5779d67103 100644 --- a/test/core/end2end/tests/registered_call.cc +++ b/test/core/end2end/tests/registered_call.cc @@ -16,10 +16,9 @@ // // -#include "gtest/gtest.h" - #include +#include "gtest/gtest.h" #include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" diff --git a/test/core/end2end/tests/request_with_flags.cc b/test/core/end2end/tests/request_with_flags.cc index 60db5aae583..12d25f13f05 100644 --- a/test/core/end2end/tests/request_with_flags.cc +++ b/test/core/end2end/tests/request_with_flags.cc @@ -16,6 +16,10 @@ // // +#include +#include +#include +#include #include #include @@ -24,12 +28,6 @@ #include "absl/types/optional.h" #include "gtest/gtest.h" - -#include -#include -#include -#include - #include "src/core/lib/transport/transport.h" #include "src/core/util/time.h" #include "test/core/end2end/cq_verifier.h" diff --git a/test/core/end2end/tests/request_with_payload.cc b/test/core/end2end/tests/request_with_payload.cc index d2da70e6ec6..76cdf6c95e8 100644 --- a/test/core/end2end/tests/request_with_payload.cc +++ b/test/core/end2end/tests/request_with_payload.cc @@ -16,12 +16,11 @@ // // +#include + #include #include "gtest/gtest.h" - -#include - #include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" diff --git a/test/core/end2end/tests/resource_quota_server.cc b/test/core/end2end/tests/resource_quota_server.cc index 4b25143b5ec..637eee793c7 100644 --- a/test/core/end2end/tests/resource_quota_server.cc +++ b/test/core/end2end/tests/resource_quota_server.cc @@ -16,6 +16,9 @@ // // +#include +#include +#include #include #include @@ -24,11 +27,6 @@ #include "absl/log/log.h" #include "absl/strings/str_format.h" #include "gtest/gtest.h" - -#include -#include -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/experiments/experiments.h" #include "src/core/lib/slice/slice.h" diff --git a/test/core/end2end/tests/retry.cc b/test/core/end2end/tests/retry.cc index 22e3434e553..e2a9361336a 100644 --- a/test/core/end2end/tests/retry.cc +++ b/test/core/end2end/tests/retry.cc @@ -16,14 +16,13 @@ // // +#include +#include + #include #include "absl/types/optional.h" #include "gtest/gtest.h" - -#include -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" diff --git a/test/core/end2end/tests/retry_cancel_after_first_attempt_starts.cc b/test/core/end2end/tests/retry_cancel_after_first_attempt_starts.cc index cf33d718760..abef13e894c 100644 --- a/test/core/end2end/tests/retry_cancel_after_first_attempt_starts.cc +++ b/test/core/end2end/tests/retry_cancel_after_first_attempt_starts.cc @@ -14,12 +14,11 @@ // limitations under the License. // +#include + #include #include "absl/types/optional.h" - -#include - #include "src/core/ext/transport/chttp2/transport/internal.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/util/time.h" diff --git a/test/core/end2end/tests/retry_cancel_during_delay.cc b/test/core/end2end/tests/retry_cancel_during_delay.cc index 255d31ffe87..f30324170f5 100644 --- a/test/core/end2end/tests/retry_cancel_during_delay.cc +++ b/test/core/end2end/tests/retry_cancel_during_delay.cc @@ -14,15 +14,14 @@ // limitations under the License. // +#include +#include + #include #include "absl/strings/str_format.h" #include "absl/types/optional.h" #include "gtest/gtest.h" - -#include -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" diff --git a/test/core/end2end/tests/retry_cancel_with_multiple_send_batches.cc b/test/core/end2end/tests/retry_cancel_with_multiple_send_batches.cc index 0fa65238d88..026bfc18278 100644 --- a/test/core/end2end/tests/retry_cancel_with_multiple_send_batches.cc +++ b/test/core/end2end/tests/retry_cancel_with_multiple_send_batches.cc @@ -16,6 +16,9 @@ // // +#include +#include + #include #include @@ -23,10 +26,6 @@ #include "absl/strings/str_format.h" #include "absl/types/optional.h" #include "gtest/gtest.h" - -#include -#include - #include "src/core/ext/transport/chttp2/transport/internal.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_fwd.h" diff --git a/test/core/end2end/tests/retry_cancellation.cc b/test/core/end2end/tests/retry_cancellation.cc index fd26c53c513..be20108ba49 100644 --- a/test/core/end2end/tests/retry_cancellation.cc +++ b/test/core/end2end/tests/retry_cancellation.cc @@ -16,14 +16,13 @@ // // +#include +#include + #include #include "absl/types/optional.h" #include "gtest/gtest.h" - -#include -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" diff --git a/test/core/end2end/tests/retry_disabled.cc b/test/core/end2end/tests/retry_disabled.cc index be335e8cd6d..9d86e113f5b 100644 --- a/test/core/end2end/tests/retry_disabled.cc +++ b/test/core/end2end/tests/retry_disabled.cc @@ -16,14 +16,13 @@ // // +#include +#include + #include #include "absl/types/optional.h" #include "gtest/gtest.h" - -#include -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" diff --git a/test/core/end2end/tests/retry_exceeds_buffer_size_in_delay.cc b/test/core/end2end/tests/retry_exceeds_buffer_size_in_delay.cc index 0171d6a828d..c819437c2b4 100644 --- a/test/core/end2end/tests/retry_exceeds_buffer_size_in_delay.cc +++ b/test/core/end2end/tests/retry_exceeds_buffer_size_in_delay.cc @@ -14,14 +14,13 @@ // limitations under the License. // +#include +#include + #include #include "absl/types/optional.h" #include "gtest/gtest.h" - -#include -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" diff --git a/test/core/end2end/tests/retry_exceeds_buffer_size_in_initial_batch.cc b/test/core/end2end/tests/retry_exceeds_buffer_size_in_initial_batch.cc index 90ac8edd5a0..7a6340c790e 100644 --- a/test/core/end2end/tests/retry_exceeds_buffer_size_in_initial_batch.cc +++ b/test/core/end2end/tests/retry_exceeds_buffer_size_in_initial_batch.cc @@ -16,14 +16,13 @@ // // +#include +#include + #include #include "absl/types/optional.h" #include "gtest/gtest.h" - -#include -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" diff --git a/test/core/end2end/tests/retry_exceeds_buffer_size_in_subsequent_batch.cc b/test/core/end2end/tests/retry_exceeds_buffer_size_in_subsequent_batch.cc index f962de41719..0edc8a9cfda 100644 --- a/test/core/end2end/tests/retry_exceeds_buffer_size_in_subsequent_batch.cc +++ b/test/core/end2end/tests/retry_exceeds_buffer_size_in_subsequent_batch.cc @@ -16,14 +16,13 @@ // // +#include +#include + #include #include "absl/types/optional.h" #include "gtest/gtest.h" - -#include -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" diff --git a/test/core/end2end/tests/retry_lb_drop.cc b/test/core/end2end/tests/retry_lb_drop.cc index abe92f8f9ac..f09cb785251 100644 --- a/test/core/end2end/tests/retry_lb_drop.cc +++ b/test/core/end2end/tests/retry_lb_drop.cc @@ -14,6 +14,10 @@ // limitations under the License. // +#include +#include +#include + #include #include #include @@ -24,11 +28,6 @@ #include "absl/status/statusor.h" #include "absl/strings/string_view.h" #include "gtest/gtest.h" - -#include -#include -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/load_balancing/lb_policy.h" diff --git a/test/core/end2end/tests/retry_lb_fail.cc b/test/core/end2end/tests/retry_lb_fail.cc index 77ef319f3e3..7eed6fe21b3 100644 --- a/test/core/end2end/tests/retry_lb_fail.cc +++ b/test/core/end2end/tests/retry_lb_fail.cc @@ -14,15 +14,14 @@ // limitations under the License. // +#include +#include + #include #include #include "absl/status/status.h" #include "gtest/gtest.h" - -#include -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/util/time.h" diff --git a/test/core/end2end/tests/retry_non_retriable_status.cc b/test/core/end2end/tests/retry_non_retriable_status.cc index 4051f38daa6..b0ce4bc5c10 100644 --- a/test/core/end2end/tests/retry_non_retriable_status.cc +++ b/test/core/end2end/tests/retry_non_retriable_status.cc @@ -16,14 +16,13 @@ // // +#include +#include + #include #include "absl/types/optional.h" #include "gtest/gtest.h" - -#include -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" diff --git a/test/core/end2end/tests/retry_non_retriable_status_before_trailers.cc b/test/core/end2end/tests/retry_non_retriable_status_before_trailers.cc index 07340b8d7f9..dfb33ba1ec3 100644 --- a/test/core/end2end/tests/retry_non_retriable_status_before_trailers.cc +++ b/test/core/end2end/tests/retry_non_retriable_status_before_trailers.cc @@ -16,14 +16,13 @@ // // +#include +#include + #include #include "absl/types/optional.h" #include "gtest/gtest.h" - -#include -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" diff --git a/test/core/end2end/tests/retry_per_attempt_recv_timeout.cc b/test/core/end2end/tests/retry_per_attempt_recv_timeout.cc index d21ce8ae7c3..f114ad330fd 100644 --- a/test/core/end2end/tests/retry_per_attempt_recv_timeout.cc +++ b/test/core/end2end/tests/retry_per_attempt_recv_timeout.cc @@ -14,15 +14,14 @@ // limitations under the License. // +#include +#include + #include #include "absl/strings/str_format.h" #include "absl/types/optional.h" #include "gtest/gtest.h" - -#include -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" diff --git a/test/core/end2end/tests/retry_per_attempt_recv_timeout_on_last_attempt.cc b/test/core/end2end/tests/retry_per_attempt_recv_timeout_on_last_attempt.cc index f0447521b8c..0bb835fbca8 100644 --- a/test/core/end2end/tests/retry_per_attempt_recv_timeout_on_last_attempt.cc +++ b/test/core/end2end/tests/retry_per_attempt_recv_timeout_on_last_attempt.cc @@ -14,15 +14,14 @@ // limitations under the License. // +#include +#include + #include #include "absl/strings/str_format.h" #include "absl/types/optional.h" #include "gtest/gtest.h" - -#include -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" diff --git a/test/core/end2end/tests/retry_recv_initial_metadata.cc b/test/core/end2end/tests/retry_recv_initial_metadata.cc index 2c4d44e6e1a..24021d4dbfa 100644 --- a/test/core/end2end/tests/retry_recv_initial_metadata.cc +++ b/test/core/end2end/tests/retry_recv_initial_metadata.cc @@ -16,14 +16,13 @@ // // +#include +#include + #include #include "absl/types/optional.h" #include "gtest/gtest.h" - -#include -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" diff --git a/test/core/end2end/tests/retry_recv_message.cc b/test/core/end2end/tests/retry_recv_message.cc index a2fcbc5ebd0..93d282684e9 100644 --- a/test/core/end2end/tests/retry_recv_message.cc +++ b/test/core/end2end/tests/retry_recv_message.cc @@ -16,14 +16,13 @@ // // +#include +#include + #include #include "absl/types/optional.h" #include "gtest/gtest.h" - -#include -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" diff --git a/test/core/end2end/tests/retry_recv_message_replay.cc b/test/core/end2end/tests/retry_recv_message_replay.cc index 1260785976a..31f11c01567 100644 --- a/test/core/end2end/tests/retry_recv_message_replay.cc +++ b/test/core/end2end/tests/retry_recv_message_replay.cc @@ -16,16 +16,15 @@ // // +#include +#include + #include #include #include "absl/status/status.h" #include "absl/types/optional.h" #include "gtest/gtest.h" - -#include -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_stack.h" diff --git a/test/core/end2end/tests/retry_recv_trailing_metadata_error.cc b/test/core/end2end/tests/retry_recv_trailing_metadata_error.cc index ab8a0fe4e34..9f986707f50 100644 --- a/test/core/end2end/tests/retry_recv_trailing_metadata_error.cc +++ b/test/core/end2end/tests/retry_recv_trailing_metadata_error.cc @@ -14,16 +14,15 @@ // limitations under the License. // +#include +#include + #include #include #include "absl/status/status.h" #include "absl/types/optional.h" #include "gtest/gtest.h" - -#include -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_stack.h" diff --git a/test/core/end2end/tests/retry_send_initial_metadata_refs.cc b/test/core/end2end/tests/retry_send_initial_metadata_refs.cc index 2f99da1ed2f..2f8bc7ea21a 100644 --- a/test/core/end2end/tests/retry_send_initial_metadata_refs.cc +++ b/test/core/end2end/tests/retry_send_initial_metadata_refs.cc @@ -16,15 +16,14 @@ // // -#include - -#include "absl/types/optional.h" -#include "gtest/gtest.h" - #include #include #include +#include + +#include "absl/types/optional.h" +#include "gtest/gtest.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" diff --git a/test/core/end2end/tests/retry_send_op_fails.cc b/test/core/end2end/tests/retry_send_op_fails.cc index 46ac40cff79..96cc4b0197a 100644 --- a/test/core/end2end/tests/retry_send_op_fails.cc +++ b/test/core/end2end/tests/retry_send_op_fails.cc @@ -16,16 +16,15 @@ // // +#include +#include + #include #include #include "absl/status/status.h" #include "absl/types/optional.h" #include "gtest/gtest.h" - -#include -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_stack.h" diff --git a/test/core/end2end/tests/retry_send_recv_batch.cc b/test/core/end2end/tests/retry_send_recv_batch.cc index 5f9ac9c7aa4..0708bd6665d 100644 --- a/test/core/end2end/tests/retry_send_recv_batch.cc +++ b/test/core/end2end/tests/retry_send_recv_batch.cc @@ -14,13 +14,12 @@ // limitations under the License. // -#include - -#include "gtest/gtest.h" - #include #include +#include + +#include "gtest/gtest.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" diff --git a/test/core/end2end/tests/retry_server_pushback_delay.cc b/test/core/end2end/tests/retry_server_pushback_delay.cc index 58507c833c3..b1acf7c3802 100644 --- a/test/core/end2end/tests/retry_server_pushback_delay.cc +++ b/test/core/end2end/tests/retry_server_pushback_delay.cc @@ -16,14 +16,13 @@ // // +#include +#include + #include #include "absl/types/optional.h" #include "gtest/gtest.h" - -#include -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" diff --git a/test/core/end2end/tests/retry_server_pushback_disabled.cc b/test/core/end2end/tests/retry_server_pushback_disabled.cc index 33226294b89..e63f92a3b3c 100644 --- a/test/core/end2end/tests/retry_server_pushback_disabled.cc +++ b/test/core/end2end/tests/retry_server_pushback_disabled.cc @@ -16,14 +16,13 @@ // // +#include +#include + #include #include "absl/types/optional.h" #include "gtest/gtest.h" - -#include -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" diff --git a/test/core/end2end/tests/retry_streaming.cc b/test/core/end2end/tests/retry_streaming.cc index 57b081803ac..62efed732ee 100644 --- a/test/core/end2end/tests/retry_streaming.cc +++ b/test/core/end2end/tests/retry_streaming.cc @@ -16,15 +16,14 @@ // // +#include +#include + #include #include "absl/types/optional.h" #include "gmock/gmock.h" #include "gtest/gtest.h" - -#include -#include - #include "src/core/channelz/channelz.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/surface/channel.h" diff --git a/test/core/end2end/tests/retry_streaming_after_commit.cc b/test/core/end2end/tests/retry_streaming_after_commit.cc index 2e642d4852f..c882b77d708 100644 --- a/test/core/end2end/tests/retry_streaming_after_commit.cc +++ b/test/core/end2end/tests/retry_streaming_after_commit.cc @@ -16,14 +16,13 @@ // // +#include +#include + #include #include "absl/types/optional.h" #include "gtest/gtest.h" - -#include -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" diff --git a/test/core/end2end/tests/retry_streaming_succeeds_before_replay_finished.cc b/test/core/end2end/tests/retry_streaming_succeeds_before_replay_finished.cc index 1d2e1f54d81..52cfc2b3659 100644 --- a/test/core/end2end/tests/retry_streaming_succeeds_before_replay_finished.cc +++ b/test/core/end2end/tests/retry_streaming_succeeds_before_replay_finished.cc @@ -16,14 +16,13 @@ // // +#include +#include + #include #include "absl/types/optional.h" #include "gtest/gtest.h" - -#include -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" diff --git a/test/core/end2end/tests/retry_throttled.cc b/test/core/end2end/tests/retry_throttled.cc index a0ca05f8757..0f973c59a66 100644 --- a/test/core/end2end/tests/retry_throttled.cc +++ b/test/core/end2end/tests/retry_throttled.cc @@ -16,14 +16,13 @@ // // +#include +#include + #include #include "absl/types/optional.h" #include "gtest/gtest.h" - -#include -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" diff --git a/test/core/end2end/tests/retry_too_many_attempts.cc b/test/core/end2end/tests/retry_too_many_attempts.cc index b68b5c14853..6cbbe9529ef 100644 --- a/test/core/end2end/tests/retry_too_many_attempts.cc +++ b/test/core/end2end/tests/retry_too_many_attempts.cc @@ -16,14 +16,13 @@ // // +#include +#include + #include #include "absl/types/optional.h" #include "gtest/gtest.h" - -#include -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" diff --git a/test/core/end2end/tests/retry_transparent_goaway.cc b/test/core/end2end/tests/retry_transparent_goaway.cc index 40352a5148f..e26882ca11e 100644 --- a/test/core/end2end/tests/retry_transparent_goaway.cc +++ b/test/core/end2end/tests/retry_transparent_goaway.cc @@ -14,16 +14,15 @@ // limitations under the License. // +#include +#include + #include #include #include "absl/status/status.h" #include "absl/types/optional.h" #include "gtest/gtest.h" - -#include -#include - #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/config/core_configuration.h" diff --git a/test/core/end2end/tests/retry_transparent_max_concurrent_streams.cc b/test/core/end2end/tests/retry_transparent_max_concurrent_streams.cc index 75e4c8a9264..fd8eadff762 100644 --- a/test/core/end2end/tests/retry_transparent_max_concurrent_streams.cc +++ b/test/core/end2end/tests/retry_transparent_max_concurrent_streams.cc @@ -14,15 +14,14 @@ // limitations under the License. // -#include - -#include "absl/types/optional.h" -#include "gtest/gtest.h" - #include #include #include +#include + +#include "absl/types/optional.h" +#include "gtest/gtest.h" #include "src/core/ext/transport/chttp2/transport/internal.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/util/time.h" diff --git a/test/core/end2end/tests/retry_transparent_not_sent_on_wire.cc b/test/core/end2end/tests/retry_transparent_not_sent_on_wire.cc index 1a7ca65aae6..9b3366397f1 100644 --- a/test/core/end2end/tests/retry_transparent_not_sent_on_wire.cc +++ b/test/core/end2end/tests/retry_transparent_not_sent_on_wire.cc @@ -14,6 +14,8 @@ // limitations under the License. // +#include +#include #include #include @@ -22,10 +24,6 @@ #include "absl/status/status.h" #include "absl/types/optional.h" #include "gtest/gtest.h" - -#include -#include - #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/config/core_configuration.h" diff --git a/test/core/end2end/tests/retry_unref_before_finish.cc b/test/core/end2end/tests/retry_unref_before_finish.cc index 5c6a460c23d..c38fcb99c12 100644 --- a/test/core/end2end/tests/retry_unref_before_finish.cc +++ b/test/core/end2end/tests/retry_unref_before_finish.cc @@ -14,13 +14,12 @@ // limitations under the License. // -#include - -#include "gtest/gtest.h" - #include #include +#include + +#include "gtest/gtest.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" diff --git a/test/core/end2end/tests/retry_unref_before_recv.cc b/test/core/end2end/tests/retry_unref_before_recv.cc index 569e8114d6b..83766e89bfa 100644 --- a/test/core/end2end/tests/retry_unref_before_recv.cc +++ b/test/core/end2end/tests/retry_unref_before_recv.cc @@ -14,14 +14,13 @@ // limitations under the License. // +#include +#include + #include #include "absl/types/optional.h" #include "gtest/gtest.h" - -#include -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" diff --git a/test/core/end2end/tests/server_finishes_request.cc b/test/core/end2end/tests/server_finishes_request.cc index b1df0a39904..ff03a272f7d 100644 --- a/test/core/end2end/tests/server_finishes_request.cc +++ b/test/core/end2end/tests/server_finishes_request.cc @@ -16,12 +16,11 @@ // // +#include + #include #include "gtest/gtest.h" - -#include - #include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" diff --git a/test/core/end2end/tests/server_streaming.cc b/test/core/end2end/tests/server_streaming.cc index fd4e34d9afc..0d64489aa44 100644 --- a/test/core/end2end/tests/server_streaming.cc +++ b/test/core/end2end/tests/server_streaming.cc @@ -16,14 +16,13 @@ // // +#include + #include #include "absl/log/check.h" #include "absl/log/log.h" #include "gtest/gtest.h" - -#include - #include "src/core/util/time.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/end2end_tests.h" diff --git a/test/core/end2end/tests/shutdown_finishes_calls.cc b/test/core/end2end/tests/shutdown_finishes_calls.cc index 03e83c57c62..39dc5ceb0c0 100644 --- a/test/core/end2end/tests/shutdown_finishes_calls.cc +++ b/test/core/end2end/tests/shutdown_finishes_calls.cc @@ -16,13 +16,12 @@ // // -#include - -#include "gtest/gtest.h" - #include #include +#include + +#include "gtest/gtest.h" #include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/end2end/tests/simple_delayed_request.cc b/test/core/end2end/tests/simple_delayed_request.cc index e9c61145e2b..952f983f2e8 100644 --- a/test/core/end2end/tests/simple_delayed_request.cc +++ b/test/core/end2end/tests/simple_delayed_request.cc @@ -16,15 +16,14 @@ // // -#include - -#include "absl/log/log.h" -#include "gtest/gtest.h" - #include #include #include +#include + +#include "absl/log/log.h" +#include "gtest/gtest.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" diff --git a/test/core/end2end/tests/simple_metadata.cc b/test/core/end2end/tests/simple_metadata.cc index 4d1df2c05ff..265a71a5b74 100644 --- a/test/core/end2end/tests/simple_metadata.cc +++ b/test/core/end2end/tests/simple_metadata.cc @@ -16,12 +16,11 @@ // // +#include + #include #include "gtest/gtest.h" - -#include - #include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" diff --git a/test/core/end2end/tests/simple_request.cc b/test/core/end2end/tests/simple_request.cc index 5236e9692da..15a62333d64 100644 --- a/test/core/end2end/tests/simple_request.cc +++ b/test/core/end2end/tests/simple_request.cc @@ -16,6 +16,7 @@ // // +#include #include #include @@ -27,9 +28,6 @@ #include "absl/types/optional.h" #include "gmock/gmock.h" #include "gtest/gtest.h" - -#include - #include "src/core/telemetry/stats.h" #include "src/core/telemetry/stats_data.h" #include "src/core/util/time.h" diff --git a/test/core/end2end/tests/streaming_error_response.cc b/test/core/end2end/tests/streaming_error_response.cc index 3ac939ed861..5efecd10671 100644 --- a/test/core/end2end/tests/streaming_error_response.cc +++ b/test/core/end2end/tests/streaming_error_response.cc @@ -19,12 +19,11 @@ /// \file Verify that status ordering rules are obeyed. /// \ref doc/status_ordering.md +#include + #include #include "gtest/gtest.h" - -#include - #include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" diff --git a/test/core/end2end/tests/timeout_before_request_call.cc b/test/core/end2end/tests/timeout_before_request_call.cc index 3a7217ed49d..e6b1c59f295 100644 --- a/test/core/end2end/tests/timeout_before_request_call.cc +++ b/test/core/end2end/tests/timeout_before_request_call.cc @@ -12,17 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include +#include +#include #include #include #include "absl/log/log.h" #include "gtest/gtest.h" - -#include -#include -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/slice/slice.h" #include "src/core/util/time.h" diff --git a/test/core/end2end/tests/trailing_metadata.cc b/test/core/end2end/tests/trailing_metadata.cc index 268b699b427..d1eb7781937 100644 --- a/test/core/end2end/tests/trailing_metadata.cc +++ b/test/core/end2end/tests/trailing_metadata.cc @@ -16,12 +16,11 @@ // // +#include + #include #include "gtest/gtest.h" - -#include - #include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" diff --git a/test/core/end2end/tests/write_buffering.cc b/test/core/end2end/tests/write_buffering.cc index d3956f80031..c29bcca9d28 100644 --- a/test/core/end2end/tests/write_buffering.cc +++ b/test/core/end2end/tests/write_buffering.cc @@ -16,13 +16,12 @@ // // -#include - -#include "gtest/gtest.h" - #include #include +#include + +#include "gtest/gtest.h" #include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" diff --git a/test/core/end2end/tests/write_buffering_at_end.cc b/test/core/end2end/tests/write_buffering_at_end.cc index 064e979e8fb..517a8820a10 100644 --- a/test/core/end2end/tests/write_buffering_at_end.cc +++ b/test/core/end2end/tests/write_buffering_at_end.cc @@ -16,13 +16,12 @@ // // -#include - -#include "gtest/gtest.h" - #include #include +#include + +#include "gtest/gtest.h" #include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" diff --git a/test/core/event_engine/cf/cf_engine_test.cc b/test/core/event_engine/cf/cf_engine_test.cc index 07ed18aa994..f6ac8c0ac6e 100644 --- a/test/core/event_engine/cf/cf_engine_test.cc +++ b/test/core/event_engine/cf/cf_engine_test.cc @@ -16,6 +16,9 @@ #ifdef GPR_APPLE +#include +#include + #include #include "absl/log/check.h" @@ -23,10 +26,6 @@ #include "absl/strings/str_format.h" #include "gmock/gmock.h" #include "gtest/gtest.h" - -#include -#include - #include "src/core/lib/event_engine/cf_engine/cf_engine.h" #include "src/core/lib/event_engine/channel_args_endpoint_config.h" #include "src/core/lib/event_engine/tcp_socket_utils.h" diff --git a/test/core/event_engine/common_closures_test.cc b/test/core/event_engine/common_closures_test.cc index a09d2061d69..b3a8fa39bbf 100644 --- a/test/core/event_engine/common_closures_test.cc +++ b/test/core/event_engine/common_closures_test.cc @@ -14,13 +14,12 @@ #include "src/core/lib/event_engine/common_closures.h" +#include + #include #include "absl/functional/any_invocable.h" #include "gtest/gtest.h" - -#include - #include "src/core/util/notification.h" using ::grpc_event_engine::experimental::AnyInvocableClosure; diff --git a/test/core/event_engine/default_engine_methods_test.cc b/test/core/event_engine/default_engine_methods_test.cc index 030be18a504..04a415c1d9d 100644 --- a/test/core/event_engine/default_engine_methods_test.cc +++ b/test/core/event_engine/default_engine_methods_test.cc @@ -11,6 +11,12 @@ // 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 +#include +#include + #include #include #include @@ -22,13 +28,6 @@ #include "absl/time/clock.h" #include "absl/time/time.h" #include "gtest/gtest.h" - -#include -#include -#include -#include -#include - #include "src/core/lib/event_engine/default_event_engine.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/event_engine/endpoint_config_test.cc b/test/core/event_engine/endpoint_config_test.cc index 5a23b5e3263..f406481f9ec 100644 --- a/test/core/event_engine/endpoint_config_test.cc +++ b/test/core/event_engine/endpoint_config_test.cc @@ -11,13 +11,12 @@ // 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 "absl/types/optional.h" #include "gtest/gtest.h" - -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/event_engine/channel_args_endpoint_config.h" diff --git a/test/core/event_engine/event_engine_test_utils.cc b/test/core/event_engine/event_engine_test_utils.cc index 65b609a63d4..c2a02d4dad5 100644 --- a/test/core/event_engine/event_engine_test_utils.cc +++ b/test/core/event_engine/event_engine_test_utils.cc @@ -14,6 +14,11 @@ #include "test/core/event_engine/event_engine_test_utils.h" +#include +#include +#include +#include +#include #include #include @@ -30,13 +35,6 @@ #include "absl/strings/str_cat.h" #include "absl/time/clock.h" #include "absl/time/time.h" - -#include -#include -#include -#include -#include - #include "src/core/lib/event_engine/channel_args_endpoint_config.h" #include "src/core/lib/event_engine/tcp_socket_utils.h" #include "src/core/lib/resource_quota/memory_quota.h" diff --git a/test/core/event_engine/event_engine_test_utils.h b/test/core/event_engine/event_engine_test_utils.h index fa0f3622e1a..1cc09380fc5 100644 --- a/test/core/event_engine/event_engine_test_utils.h +++ b/test/core/event_engine/event_engine_test_utils.h @@ -15,6 +15,9 @@ #ifndef GRPC_TEST_CORE_EVENT_ENGINE_EVENT_ENGINE_TEST_UTILS_H #define GRPC_TEST_CORE_EVENT_ENGINE_EVENT_ENGINE_TEST_UTILS_H +#include +#include + #include #include #include @@ -27,10 +30,6 @@ #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/string_view.h" - -#include -#include - #include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/util/notification.h" #include "src/core/util/sync.h" diff --git a/test/core/event_engine/factory_test.cc b/test/core/event_engine/factory_test.cc index 370a7577f72..b8239dce4fe 100644 --- a/test/core/event_engine/factory_test.cc +++ b/test/core/event_engine/factory_test.cc @@ -12,14 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - -#include "gtest/gtest.h" - #include #include #include +#include + +#include "gtest/gtest.h" #include "src/core/lib/event_engine/default_event_engine.h" #include "test/core/event_engine/util/aborting_event_engine.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/event_engine/forkable_test.cc b/test/core/event_engine/forkable_test.cc index 86dbe636593..2b1da1d0b09 100644 --- a/test/core/event_engine/forkable_test.cc +++ b/test/core/event_engine/forkable_test.cc @@ -28,7 +28,6 @@ #include "absl/log/log.h" #include "absl/types/optional.h" #include "gtest/gtest.h" - #include "src/core/lib/config/config_vars.h" #include "src/core/util/no_destruct.h" diff --git a/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.cc b/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.cc index 1bc8a7a203e..7c24b1abfb8 100644 --- a/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.cc +++ b/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.cc @@ -14,6 +14,8 @@ #include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h" +#include +#include #include #include @@ -26,10 +28,6 @@ #include "absl/log/check.h" #include "absl/memory/memory.h" #include "absl/strings/str_cat.h" - -#include -#include - #include "src/core/lib/debug/trace.h" #include "src/core/lib/event_engine/tcp_socket_utils.h" #include "src/core/lib/iomgr/port.h" diff --git a/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h b/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h index 6ff76e32a23..180943c882c 100644 --- a/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h +++ b/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h @@ -15,6 +15,11 @@ #ifndef GRPC_TEST_CORE_EVENT_ENGINE_FUZZING_EVENT_ENGINE_FUZZING_EVENT_ENGINE_H #define GRPC_TEST_CORE_EVENT_ENGINE_FUZZING_EVENT_ENGINE_FUZZING_EVENT_ENGINE_H +#include +#include +#include +#include +#include #include #include @@ -34,13 +39,6 @@ #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/types/optional.h" - -#include -#include -#include -#include -#include - #include "src/core/lib/event_engine/time_util.h" #include "src/core/util/no_destruct.h" #include "src/core/util/sync.h" diff --git a/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine_unittest.cc b/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine_unittest.cc index e5eb79fccc3..0d89448a2f7 100644 --- a/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine_unittest.cc +++ b/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine_unittest.cc @@ -16,11 +16,10 @@ #include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h" -#include "absl/synchronization/notification.h" -#include "gtest/gtest.h" - #include +#include "absl/synchronization/notification.h" +#include "gtest/gtest.h" #include "src/core/util/time.h" using ::grpc_event_engine::experimental::FuzzingEventEngine; diff --git a/test/core/event_engine/handle_tests.cc b/test/core/event_engine/handle_tests.cc index 9e082c23a0e..864d9547246 100644 --- a/test/core/event_engine/handle_tests.cc +++ b/test/core/event_engine/handle_tests.cc @@ -11,14 +11,14 @@ // 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 #include "absl/strings/str_cat.h" #include "gtest/gtest.h" -#include -#include - using ::grpc_event_engine::experimental::EventEngine; template diff --git a/test/core/event_engine/mock_event_engine.h b/test/core/event_engine/mock_event_engine.h index 62266bdb12d..9036e7af6d1 100644 --- a/test/core/event_engine/mock_event_engine.h +++ b/test/core/event_engine/mock_event_engine.h @@ -15,6 +15,10 @@ #ifndef GRPC_TEST_CORE_EVENT_ENGINE_MOCK_EVENT_ENGINE_H #define GRPC_TEST_CORE_EVENT_ENGINE_MOCK_EVENT_ENGINE_H +#include +#include +#include + #include #include "absl/functional/any_invocable.h" @@ -22,10 +26,6 @@ #include "absl/status/statusor.h" #include "gmock/gmock.h" -#include -#include -#include - namespace grpc_event_engine { namespace experimental { diff --git a/test/core/event_engine/posix/event_poller_posix_test.cc b/test/core/event_engine/posix/event_poller_posix_test.cc index 673c4f9c78a..87ab1fc8038 100644 --- a/test/core/event_engine/posix/event_poller_posix_test.cc +++ b/test/core/event_engine/posix/event_poller_posix_test.cc @@ -12,6 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include #include #include @@ -28,9 +29,6 @@ #include "absl/strings/str_split.h" #include "absl/strings/string_view.h" #include "gtest/gtest.h" - -#include - #include "src/core/lib/config/config_vars.h" #include "src/core/lib/event_engine/poller.h" #include "src/core/lib/event_engine/posix_engine/wakeup_fd_pipe.h" @@ -46,6 +44,8 @@ #include #include +#include +#include #include #include #include @@ -54,10 +54,6 @@ #include "absl/log/log.h" #include "absl/status/status.h" - -#include -#include - #include "src/core/lib/event_engine/common_closures.h" #include "src/core/lib/event_engine/posix_engine/event_poller.h" #include "src/core/lib/event_engine/posix_engine/event_poller_posix_default.h" diff --git a/test/core/event_engine/posix/lock_free_event_test.cc b/test/core/event_engine/posix/lock_free_event_test.cc index f53aea94ad5..1b0ffac0d37 100644 --- a/test/core/event_engine/posix/lock_free_event_test.cc +++ b/test/core/event_engine/posix/lock_free_event_test.cc @@ -12,22 +12,20 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include +#include +#include + #include #include #include #include #include -#include - #include "absl/functional/any_invocable.h" #include "absl/status/status.h" #include "absl/time/time.h" #include "gtest/gtest.h" - -#include -#include - #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/event_engine/posix_engine/event_poller.h" #include "src/core/lib/event_engine/posix_engine/lockfree_event.h" diff --git a/test/core/event_engine/posix/log_too_many_open_files_test.cc b/test/core/event_engine/posix/log_too_many_open_files_test.cc index c87b879a286..8b2dc68679a 100644 --- a/test/core/event_engine/posix/log_too_many_open_files_test.cc +++ b/test/core/event_engine/posix/log_too_many_open_files_test.cc @@ -21,7 +21,6 @@ #include "absl/status/statusor.h" #include "gmock/gmock.h" #include "gtest/gtest.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/util/strerror.h" diff --git a/test/core/event_engine/posix/posix_endpoint_test.cc b/test/core/event_engine/posix/posix_endpoint_test.cc index a8ec3af12c5..5ad8bb7d937 100644 --- a/test/core/event_engine/posix/posix_endpoint_test.cc +++ b/test/core/event_engine/posix/posix_endpoint_test.cc @@ -14,6 +14,10 @@ #include "src/core/lib/event_engine/posix_engine/posix_endpoint.h" +#include +#include +#include + #include #include #include @@ -30,11 +34,6 @@ #include "absl/strings/str_split.h" #include "absl/strings/string_view.h" #include "gtest/gtest.h" - -#include -#include -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/config_vars.h" #include "src/core/lib/event_engine/channel_args_endpoint_config.h" diff --git a/test/core/event_engine/posix/posix_engine_listener_utils_test.cc b/test/core/event_engine/posix/posix_engine_listener_utils_test.cc index 319d8098b06..1e44d7633ad 100644 --- a/test/core/event_engine/posix/posix_engine_listener_utils_test.cc +++ b/test/core/event_engine/posix/posix_engine_listener_utils_test.cc @@ -12,6 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include #include #include #include @@ -23,9 +24,6 @@ #include "absl/status/statusor.h" #include "absl/strings/str_cat.h" #include "gtest/gtest.h" - -#include - #include "src/core/lib/iomgr/port.h" // This test won't work except with posix sockets enabled @@ -34,7 +32,6 @@ #include #include "absl/log/log.h" - #include "src/core/lib/event_engine/channel_args_endpoint_config.h" #include "src/core/lib/event_engine/posix_engine/posix_engine_listener_utils.h" #include "src/core/lib/event_engine/posix_engine/tcp_socket_utils.h" diff --git a/test/core/event_engine/posix/posix_engine_test_utils.cc b/test/core/event_engine/posix/posix_engine_test_utils.cc index 30c7f408804..88da5686515 100644 --- a/test/core/event_engine/posix/posix_engine_test_utils.cc +++ b/test/core/event_engine/posix/posix_engine_test_utils.cc @@ -22,7 +22,6 @@ #include "absl/log/log.h" #include "absl/strings/str_format.h" - #include "src/core/util/crash.h" namespace grpc_event_engine { diff --git a/test/core/event_engine/posix/posix_engine_test_utils.h b/test/core/event_engine/posix/posix_engine_test_utils.h index 33deec80818..34e83c4a124 100644 --- a/test/core/event_engine/posix/posix_engine_test_utils.h +++ b/test/core/event_engine/posix/posix_engine_test_utils.h @@ -15,12 +15,11 @@ #ifndef GRPC_TEST_CORE_EVENT_ENGINE_POSIX_POSIX_ENGINE_TEST_UTILS_H #define GRPC_TEST_CORE_EVENT_ENGINE_POSIX_POSIX_ENGINE_TEST_UTILS_H +#include + #include #include "absl/functional/any_invocable.h" - -#include - #include "src/core/lib/event_engine/posix_engine/event_poller.h" namespace grpc_event_engine { diff --git a/test/core/event_engine/posix/posix_event_engine_connect_test.cc b/test/core/event_engine/posix/posix_event_engine_connect_test.cc index 989e6c9f341..19f2819c51e 100644 --- a/test/core/event_engine/posix/posix_event_engine_connect_test.cc +++ b/test/core/event_engine/posix/posix_event_engine_connect_test.cc @@ -13,6 +13,9 @@ // limitations under the License. #include #include +#include +#include +#include #include #include #include @@ -34,11 +37,6 @@ #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" #include "gtest/gtest.h" - -#include -#include -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/event_engine/channel_args_endpoint_config.h" #include "src/core/lib/event_engine/posix_engine/posix_engine.h" diff --git a/test/core/event_engine/posix/tcp_posix_socket_utils_test.cc b/test/core/event_engine/posix/tcp_posix_socket_utils_test.cc index 0e1099b57aa..99db037a195 100644 --- a/test/core/event_engine/posix/tcp_posix_socket_utils_test.cc +++ b/test/core/event_engine/posix/tcp_posix_socket_utils_test.cc @@ -12,6 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include #include #include @@ -19,9 +20,6 @@ #include "absl/status/status.h" #include "gtest/gtest.h" - -#include - #include "src/core/lib/iomgr/port.h" // IWYU pragma: no_include @@ -29,11 +27,10 @@ // This test won't work except with posix sockets enabled #ifdef GRPC_POSIX_SOCKET_UTILS_COMMON +#include #include #include -#include - #include "src/core/lib/event_engine/posix_engine/tcp_socket_utils.h" #include "src/core/lib/iomgr/socket_mutator.h" #include "src/core/util/useful.h" diff --git a/test/core/event_engine/posix/timer_heap_test.cc b/test/core/event_engine/posix/timer_heap_test.cc index ee1a82e6e0b..5d71ee6f52e 100644 --- a/test/core/event_engine/posix/timer_heap_test.cc +++ b/test/core/event_engine/posix/timer_heap_test.cc @@ -27,7 +27,6 @@ #include "absl/log/check.h" #include "gmock/gmock.h" #include "gtest/gtest.h" - #include "src/core/lib/event_engine/posix_engine/timer.h" #include "src/core/util/bitset.h" diff --git a/test/core/event_engine/posix/timer_list_test.cc b/test/core/event_engine/posix/timer_list_test.cc index 0fae801fb94..ca3aa663949 100644 --- a/test/core/event_engine/posix/timer_list_test.cc +++ b/test/core/event_engine/posix/timer_list_test.cc @@ -16,6 +16,9 @@ // // +#include +#include + #include #include #include @@ -23,10 +26,6 @@ #include "absl/types/optional.h" #include "gmock/gmock.h" #include "gtest/gtest.h" - -#include -#include - #include "src/core/lib/event_engine/posix_engine/timer.h" #include "src/core/util/time.h" diff --git a/test/core/event_engine/posix/timer_manager_test.cc b/test/core/event_engine/posix/timer_manager_test.cc index 1cfe58a2d80..40f53540b75 100644 --- a/test/core/event_engine/posix/timer_manager_test.cc +++ b/test/core/event_engine/posix/timer_manager_test.cc @@ -14,6 +14,8 @@ #include "src/core/lib/event_engine/posix_engine/timer_manager.h" +#include + #include #include #include @@ -23,9 +25,6 @@ #include "absl/time/clock.h" #include "absl/time/time.h" #include "gtest/gtest.h" - -#include - #include "src/core/lib/event_engine/common_closures.h" #include "src/core/lib/event_engine/posix_engine/timer.h" #include "src/core/lib/event_engine/thread_pool/thread_pool.h" diff --git a/test/core/event_engine/posix/traced_buffer_list_test.cc b/test/core/event_engine/posix/traced_buffer_list_test.cc index 9e267fe1d3f..1d460aac166 100644 --- a/test/core/event_engine/posix/traced_buffer_list_test.cc +++ b/test/core/event_engine/posix/traced_buffer_list_test.cc @@ -14,16 +14,14 @@ #include "src/core/lib/event_engine/posix_engine/traced_buffer_list.h" +#include +#include #include #include #include "absl/log/check.h" #include "gtest/gtest.h" - -#include -#include - #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/port.h" #include "src/core/util/time.h" diff --git a/test/core/event_engine/posix/wakeup_fd_posix_test.cc b/test/core/event_engine/posix/wakeup_fd_posix_test.cc index b9872eede12..e2d11bba602 100644 --- a/test/core/event_engine/posix/wakeup_fd_posix_test.cc +++ b/test/core/event_engine/posix/wakeup_fd_posix_test.cc @@ -18,7 +18,6 @@ #include "absl/status/statusor.h" #include "gtest/gtest.h" - #include "src/core/lib/event_engine/posix_engine/wakeup_fd_eventfd.h" #include "src/core/lib/event_engine/posix_engine/wakeup_fd_pipe.h" diff --git a/test/core/event_engine/query_extensions_test.cc b/test/core/event_engine/query_extensions_test.cc index d657f43b81f..0c10b76cc29 100644 --- a/test/core/event_engine/query_extensions_test.cc +++ b/test/core/event_engine/query_extensions_test.cc @@ -13,16 +13,15 @@ // limitations under the License. #include "src/core/lib/event_engine/query_extensions.h" +#include +#include +#include + #include #include "absl/functional/any_invocable.h" #include "absl/status/status.h" #include "gtest/gtest.h" - -#include -#include -#include - #include "src/core/util/crash.h" namespace grpc_event_engine { diff --git a/test/core/event_engine/slice_buffer_test.cc b/test/core/event_engine/slice_buffer_test.cc index 0a0c26f9520..a3221ac6743 100644 --- a/test/core/event_engine/slice_buffer_test.cc +++ b/test/core/event_engine/slice_buffer_test.cc @@ -12,6 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include +#include +#include +#include +#include #include #include @@ -20,12 +25,6 @@ #include "absl/log/check.h" #include "gtest/gtest.h" -#include -#include -#include -#include -#include - using ::grpc_event_engine::experimental::Slice; using ::grpc_event_engine::experimental::SliceBuffer; diff --git a/test/core/event_engine/smoke_test.cc b/test/core/event_engine/smoke_test.cc index e557a8c4e45..0a53992b15e 100644 --- a/test/core/event_engine/smoke_test.cc +++ b/test/core/event_engine/smoke_test.cc @@ -11,15 +11,14 @@ // 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 "gmock/gmock.h" -#include "gtest/gtest.h" - #include #include #include +#include + +#include "gmock/gmock.h" +#include "gtest/gtest.h" #include "test/core/test_util/test_config.h" namespace { diff --git a/test/core/event_engine/tcp_socket_utils_test.cc b/test/core/event_engine/tcp_socket_utils_test.cc index 53ce735e478..fc926592685 100644 --- a/test/core/event_engine/tcp_socket_utils_test.cc +++ b/test/core/event_engine/tcp_socket_utils_test.cc @@ -14,7 +14,6 @@ #include "src/core/lib/event_engine/tcp_socket_utils.h" #include - #include #include "src/core/lib/iomgr/port.h" // IWYU pragma: keep @@ -45,13 +44,12 @@ #endif // GPR_WINDOWS #endif // GRPC_HAVE_UNIX_SOCKET +#include + #include "absl/log/check.h" #include "absl/status/status.h" #include "absl/status/statusor.h" #include "gtest/gtest.h" - -#include - #include "src/core/lib/iomgr/sockaddr.h" namespace grpc_event_engine { diff --git a/test/core/event_engine/test_init.cc b/test/core/event_engine/test_init.cc index 2b7600ce0d2..1a342794345 100644 --- a/test/core/event_engine/test_init.cc +++ b/test/core/event_engine/test_init.cc @@ -13,12 +13,12 @@ // limitations under the License. #include "test/core/event_engine/test_init.h" +#include + #include #include "absl/strings/str_cat.h" -#include - namespace grpc_event_engine { namespace experimental { diff --git a/test/core/event_engine/test_init.h b/test/core/event_engine/test_init.h index 7ab584d07f3..2af682f523f 100644 --- a/test/core/event_engine/test_init.h +++ b/test/core/event_engine/test_init.h @@ -13,11 +13,11 @@ // limitations under the License. #ifndef GRPC_TEST_CORE_EVENT_ENGINE_TEST_INIT_H #define GRPC_TEST_CORE_EVENT_ENGINE_TEST_INIT_H +#include + #include "absl/status/status.h" #include "absl/strings/string_view.h" -#include - namespace grpc_event_engine { namespace experimental { diff --git a/test/core/event_engine/test_suite/event_engine_test_framework.cc b/test/core/event_engine/test_suite/event_engine_test_framework.cc index 962d9e4d074..2affed14094 100644 --- a/test/core/event_engine/test_suite/event_engine_test_framework.cc +++ b/test/core/event_engine/test_suite/event_engine_test_framework.cc @@ -13,9 +13,8 @@ // limitations under the License. #include "test/core/event_engine/test_suite/event_engine_test_framework.h" -#include - #include +#include absl::AnyInvocable< std::shared_ptr()>* diff --git a/test/core/event_engine/test_suite/event_engine_test_framework.h b/test/core/event_engine/test_suite/event_engine_test_framework.h index 0f2b768637a..afb57911e2b 100644 --- a/test/core/event_engine/test_suite/event_engine_test_framework.h +++ b/test/core/event_engine/test_suite/event_engine_test_framework.h @@ -14,16 +14,15 @@ #ifndef GRPC_TEST_CORE_EVENT_ENGINE_TEST_SUITE_EVENT_ENGINE_TEST_FRAMEWORK_H #define GRPC_TEST_CORE_EVENT_ENGINE_TEST_SUITE_EVENT_ENGINE_TEST_FRAMEWORK_H +#include +#include + #include #include -#include - #include "absl/functional/any_invocable.h" #include "absl/log/check.h" -#include - extern absl::AnyInvocable< std::shared_ptr()>* g_ee_factory; diff --git a/test/core/event_engine/test_suite/fuzzing_event_engine_test.cc b/test/core/event_engine/test_suite/fuzzing_event_engine_test.cc index afd288bcc0a..e2c718f9166 100644 --- a/test/core/event_engine/test_suite/fuzzing_event_engine_test.cc +++ b/test/core/event_engine/test_suite/fuzzing_event_engine_test.cc @@ -14,10 +14,10 @@ #include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h" -#include - #include +#include + #include "test/core/event_engine/test_suite/event_engine_test_framework.h" #include "test/core/event_engine/test_suite/tests/timer_test.h" diff --git a/test/core/event_engine/test_suite/posix/oracle_event_engine_posix.cc b/test/core/event_engine/test_suite/posix/oracle_event_engine_posix.cc index 3efef67009f..b5f0c70ceb9 100644 --- a/test/core/event_engine/test_suite/posix/oracle_event_engine_posix.cc +++ b/test/core/event_engine/test_suite/posix/oracle_event_engine_posix.cc @@ -14,6 +14,8 @@ #include "test/core/event_engine/test_suite/posix/oracle_event_engine_posix.h" +#include +#include #include #include #include @@ -30,10 +32,6 @@ #include "absl/strings/str_format.h" #include "absl/time/clock.h" #include "absl/time/time.h" - -#include -#include - #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/iomgr/resolved_address.h" #include "src/core/util/crash.h" diff --git a/test/core/event_engine/test_suite/posix/oracle_event_engine_posix.h b/test/core/event_engine/test_suite/posix/oracle_event_engine_posix.h index 94fbb928832..6db3489c030 100644 --- a/test/core/event_engine/test_suite/posix/oracle_event_engine_posix.h +++ b/test/core/event_engine/test_suite/posix/oracle_event_engine_posix.h @@ -15,6 +15,11 @@ #ifndef GRPC_TEST_CORE_EVENT_ENGINE_TEST_SUITE_POSIX_ORACLE_EVENT_ENGINE_POSIX_H #define GRPC_TEST_CORE_EVENT_ENGINE_TEST_SUITE_POSIX_ORACLE_EVENT_ENGINE_POSIX_H +#include +#include +#include +#include + #include #include #include @@ -24,12 +29,6 @@ #include "absl/functional/any_invocable.h" #include "absl/status/status.h" #include "absl/status/statusor.h" - -#include -#include -#include -#include - #include "src/core/util/crash.h" #include "src/core/util/notification.h" #include "src/core/util/sync.h" diff --git a/test/core/event_engine/test_suite/posix_event_engine_native_dns_test.cc b/test/core/event_engine/test_suite/posix_event_engine_native_dns_test.cc index fc864f89078..682d4402d80 100644 --- a/test/core/event_engine/test_suite/posix_event_engine_native_dns_test.cc +++ b/test/core/event_engine/test_suite/posix_event_engine_native_dns_test.cc @@ -11,14 +11,13 @@ // 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 #include #include -#include - -#include - #include "src/core/lib/config/config_vars.h" #include "src/core/lib/event_engine/posix_engine/posix_engine.h" #include "test/core/event_engine/test_suite/event_engine_test_framework.h" diff --git a/test/core/event_engine/test_suite/posix_event_engine_test.cc b/test/core/event_engine/test_suite/posix_event_engine_test.cc index 26c34c9a9f8..605431a95dd 100644 --- a/test/core/event_engine/test_suite/posix_event_engine_test.cc +++ b/test/core/event_engine/test_suite/posix_event_engine_test.cc @@ -11,11 +11,10 @@ // 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 -#include +#include #include "src/core/lib/event_engine/posix_engine/posix_engine.h" #include "test/core/event_engine/test_suite/event_engine_test_framework.h" diff --git a/test/core/event_engine/test_suite/tests/client_test.cc b/test/core/event_engine/test_suite/tests/client_test.cc index c6bd435a3cb..fd6c22067d5 100644 --- a/test/core/event_engine/test_suite/tests/client_test.cc +++ b/test/core/event_engine/test_suite/tests/client_test.cc @@ -12,6 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include +#include +#include + #include #include #include @@ -29,11 +33,6 @@ #include "absl/time/clock.h" #include "absl/time/time.h" #include "gtest/gtest.h" - -#include -#include -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/event_engine/channel_args_endpoint_config.h" #include "src/core/lib/event_engine/tcp_socket_utils.h" diff --git a/test/core/event_engine/test_suite/tests/dns_test.cc b/test/core/event_engine/test_suite/tests/dns_test.cc index a50102970ed..1613085a42d 100644 --- a/test/core/event_engine/test_suite/tests/dns_test.cc +++ b/test/core/event_engine/test_suite/tests/dns_test.cc @@ -15,6 +15,9 @@ // IWYU pragma: no_include // IWYU pragma: no_include +#include +#include + #include #include #include @@ -31,10 +34,6 @@ #include "absl/types/optional.h" #include "gmock/gmock.h" #include "gtest/gtest.h" - -#include -#include - #include "src/core/lib/config/config_vars.h" #include "src/core/lib/event_engine/tcp_socket_utils.h" #include "src/core/lib/iomgr/sockaddr.h" diff --git a/test/core/event_engine/test_suite/tests/server_test.cc b/test/core/event_engine/test_suite/tests/server_test.cc index 88e64ef04e0..630dc7c7dd5 100644 --- a/test/core/event_engine/test_suite/tests/server_test.cc +++ b/test/core/event_engine/test_suite/tests/server_test.cc @@ -12,6 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include +#include +#include + #include #include #include @@ -29,11 +33,6 @@ #include "absl/time/clock.h" #include "absl/time/time.h" #include "gtest/gtest.h" - -#include -#include -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/event_engine/channel_args_endpoint_config.h" #include "src/core/lib/event_engine/tcp_socket_utils.h" diff --git a/test/core/event_engine/test_suite/tests/timer_test.cc b/test/core/event_engine/test_suite/tests/timer_test.cc index c4a4e5cc35a..bc25e6e1bbc 100644 --- a/test/core/event_engine/test_suite/tests/timer_test.cc +++ b/test/core/event_engine/test_suite/tests/timer_test.cc @@ -12,6 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include + #include #include #include @@ -31,9 +33,6 @@ #include "absl/time/time.h" #include "gmock/gmock.h" #include "gtest/gtest.h" - -#include - #include "src/core/lib/event_engine/time_util.h" #include "src/core/util/sync.h" #include "test/core/event_engine/test_suite/event_engine_test_framework.h" diff --git a/test/core/event_engine/test_suite/thready_posix_event_engine_test.cc b/test/core/event_engine/test_suite/thready_posix_event_engine_test.cc index 43088eb5bb3..6ebd37ffb39 100644 --- a/test/core/event_engine/test_suite/thready_posix_event_engine_test.cc +++ b/test/core/event_engine/test_suite/thready_posix_event_engine_test.cc @@ -11,11 +11,10 @@ // 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 -#include +#include #include "src/core/lib/event_engine/posix_engine/posix_engine.h" #include "src/core/lib/event_engine/thready_event_engine/thready_event_engine.h" diff --git a/test/core/event_engine/test_suite/tools/echo_client.cc b/test/core/event_engine/test_suite/tools/echo_client.cc index 76749f58309..f44ddae72e6 100644 --- a/test/core/event_engine/test_suite/tools/echo_client.cc +++ b/test/core/event_engine/test_suite/tools/echo_client.cc @@ -11,13 +11,12 @@ // 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 #include "absl/log/check.h" -#include -#include - // The echo client wraps an EventEngine::Connect and EventEngine::Endpoint // implementations, allowing third-party TCP listeners to interact with your // EventEngine client. Example usage: @@ -31,6 +30,10 @@ // bazel run // //test/core/event_engine/test_suite/tools:my_event_engine_echo_client +#include +#include +#include + #include #include #include @@ -43,11 +46,6 @@ #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/str_format.h" - -#include -#include -#include - #include "src/core/lib/channel/channel_args_preconditioning.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/event_engine/channel_args_endpoint_config.h" diff --git a/test/core/event_engine/test_suite/tools/posix_event_engine_factory.cc b/test/core/event_engine/test_suite/tools/posix_event_engine_factory.cc index 9b7d2ae8a5a..c107ef47f3b 100644 --- a/test/core/event_engine/test_suite/tools/posix_event_engine_factory.cc +++ b/test/core/event_engine/test_suite/tools/posix_event_engine_factory.cc @@ -12,14 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include +#include + #include #include "absl/functional/any_invocable.h" #include "absl/log/check.h" - -#include -#include - #include "src/core/lib/iomgr/port.h" #ifdef GRPC_POSIX_SOCKET_TCP diff --git a/test/core/event_engine/test_suite/tools/windows_event_engine_factory.cc b/test/core/event_engine/test_suite/tools/windows_event_engine_factory.cc index 98f591fe604..2fa66748d82 100644 --- a/test/core/event_engine/test_suite/tools/windows_event_engine_factory.cc +++ b/test/core/event_engine/test_suite/tools/windows_event_engine_factory.cc @@ -12,14 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include +#include + #include #include "absl/functional/any_invocable.h" #include "absl/log/check.h" -#include -#include - #ifdef GPR_WINDOWS #include "src/core/lib/event_engine/windows/windows_engine.h" diff --git a/test/core/event_engine/thread_pool_test.cc b/test/core/event_engine/thread_pool_test.cc index 29f32d16691..1c4d29c44e7 100644 --- a/test/core/event_engine/thread_pool_test.cc +++ b/test/core/event_engine/thread_pool_test.cc @@ -13,6 +13,9 @@ // limitations under the License. #include "src/core/lib/event_engine/thread_pool/thread_pool.h" +#include +#include + #include #include #include @@ -26,10 +29,6 @@ #include "absl/time/clock.h" #include "absl/time/time.h" #include "gtest/gtest.h" - -#include -#include - #include "src/core/lib/event_engine/thread_pool/thread_count.h" #include "src/core/lib/event_engine/thread_pool/work_stealing_thread_pool.h" #include "src/core/util/notification.h" diff --git a/test/core/event_engine/util/aborting_event_engine.h b/test/core/event_engine/util/aborting_event_engine.h index ecc2db968dd..9c49a2b2b6a 100644 --- a/test/core/event_engine/util/aborting_event_engine.h +++ b/test/core/event_engine/util/aborting_event_engine.h @@ -14,6 +14,10 @@ #ifndef GRPC_TEST_CORE_EVENT_ENGINE_UTIL_ABORTING_EVENT_ENGINE_H #define GRPC_TEST_CORE_EVENT_ENGINE_UTIL_ABORTING_EVENT_ENGINE_H +#include +#include +#include +#include #include #include @@ -22,11 +26,6 @@ #include "absl/status/status.h" #include "absl/status/statusor.h" -#include -#include -#include -#include - namespace grpc_event_engine { namespace experimental { diff --git a/test/core/event_engine/windows/create_sockpair.cc b/test/core/event_engine/windows/create_sockpair.cc index 3817f98ac6f..7de56720da7 100644 --- a/test/core/event_engine/windows/create_sockpair.cc +++ b/test/core/event_engine/windows/create_sockpair.cc @@ -20,7 +20,6 @@ #include "absl/log/check.h" #include "absl/log/log.h" #include "absl/status/status.h" - #include "src/core/lib/event_engine/windows/win_socket.h" #include "src/core/lib/iomgr/error.h" #include "test/core/event_engine/windows/create_sockpair.h" diff --git a/test/core/event_engine/windows/iocp_test.cc b/test/core/event_engine/windows/iocp_test.cc index b5ee504c643..9e798ff7e21 100644 --- a/test/core/event_engine/windows/iocp_test.cc +++ b/test/core/event_engine/windows/iocp_test.cc @@ -14,19 +14,17 @@ #include #ifdef GPR_WINDOWS -#include - #include +#include +#include #include +#include + #include "absl/log/log.h" #include "absl/status/status.h" #include "absl/time/time.h" #include "absl/types/variant.h" - -#include -#include - #include "src/core/lib/event_engine/common_closures.h" #include "src/core/lib/event_engine/poller.h" #include "src/core/lib/event_engine/thread_pool/thread_pool.h" diff --git a/test/core/event_engine/windows/win_socket_test.cc b/test/core/event_engine/windows/win_socket_test.cc index daa3c5360f5..e0902a81bd3 100644 --- a/test/core/event_engine/windows/win_socket_test.cc +++ b/test/core/event_engine/windows/win_socket_test.cc @@ -15,14 +15,12 @@ #include #ifdef GPR_WINDOWS +#include +#include #include #include "absl/status/status.h" #include "absl/time/time.h" - -#include -#include - #include "src/core/lib/event_engine/common_closures.h" #include "src/core/lib/event_engine/thread_pool/thread_pool.h" #include "src/core/lib/event_engine/windows/iocp.h" diff --git a/test/core/event_engine/windows/windows_endpoint_test.cc b/test/core/event_engine/windows/windows_endpoint_test.cc index 9ada4bbf471..e06b3928350 100644 --- a/test/core/event_engine/windows/windows_endpoint_test.cc +++ b/test/core/event_engine/windows/windows_endpoint_test.cc @@ -16,13 +16,11 @@ #ifdef GPR_WINDOWS -#include - -#include "absl/status/status.h" - #include #include +#include +#include "absl/status/status.h" #include "src/core/lib/event_engine/channel_args_endpoint_config.h" #include "src/core/lib/event_engine/thread_pool/thread_pool.h" #include "src/core/lib/event_engine/windows/iocp.h" diff --git a/test/core/event_engine/work_queue/basic_work_queue_fuzzer.cc b/test/core/event_engine/work_queue/basic_work_queue_fuzzer.cc index be59f7ecdb8..9481282ea5e 100644 --- a/test/core/event_engine/work_queue/basic_work_queue_fuzzer.cc +++ b/test/core/event_engine/work_queue/basic_work_queue_fuzzer.cc @@ -11,6 +11,8 @@ // 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 #include @@ -19,10 +21,6 @@ #include "absl/functional/any_invocable.h" #include "absl/types/optional.h" - -#include -#include - #include "src/core/lib/event_engine/common_closures.h" #include "src/core/lib/event_engine/work_queue/basic_work_queue.h" #include "src/libfuzzer/libfuzzer_macro.h" diff --git a/test/core/event_engine/work_queue/basic_work_queue_test.cc b/test/core/event_engine/work_queue/basic_work_queue_test.cc index e5658f85c0a..a8ecefb928b 100644 --- a/test/core/event_engine/work_queue/basic_work_queue_test.cc +++ b/test/core/event_engine/work_queue/basic_work_queue_test.cc @@ -13,15 +13,14 @@ // limitations under the License. #include "src/core/lib/event_engine/work_queue/basic_work_queue.h" +#include +#include + #include #include #include "absl/functional/any_invocable.h" #include "gtest/gtest.h" - -#include -#include - #include "src/core/lib/event_engine/common_closures.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/experiments/experiments_tag_test.cc b/test/core/experiments/experiments_tag_test.cc index 51643148209..63d42a7bd3b 100644 --- a/test/core/experiments/experiments_tag_test.cc +++ b/test/core/experiments/experiments_tag_test.cc @@ -12,6 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include + #include #include "absl/status/status.h" @@ -20,9 +22,6 @@ #include "absl/strings/string_view.h" #include "absl/strings/strip.h" #include "gtest/gtest.h" - -#include - #include "src/core/lib/config/config_vars.h" #include "src/core/lib/experiments/config.h" #include "test/core/experiments/fixtures/experiments.h" diff --git a/test/core/experiments/experiments_test.cc b/test/core/experiments/experiments_test.cc index f604efa05ff..2964104c3dd 100644 --- a/test/core/experiments/experiments_test.cc +++ b/test/core/experiments/experiments_test.cc @@ -16,12 +16,11 @@ #include "test/core/experiments/fixtures/experiments.h" +#include + #include #include "gtest/gtest.h" - -#include - #include "src/core/lib/experiments/config.h" #ifndef GRPC_EXPERIMENTS_ARE_FINAL diff --git a/test/core/ext/filters/event_engine_client_channel_resolver/resolver_fuzzer.cc b/test/core/ext/filters/event_engine_client_channel_resolver/resolver_fuzzer.cc index 56e8783629b..202ead109fb 100644 --- a/test/core/ext/filters/event_engine_client_channel_resolver/resolver_fuzzer.cc +++ b/test/core/ext/filters/event_engine_client_channel_resolver/resolver_fuzzer.cc @@ -11,6 +11,9 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. +#include +#include + #include #include #include @@ -25,10 +28,6 @@ #include "absl/status/statusor.h" #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" - -#include -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/event_engine/tcp_socket_utils.h" diff --git a/test/core/ext/filters/rbac/rbac_service_config_parser_test.cc b/test/core/ext/filters/rbac/rbac_service_config_parser_test.cc index 369ebcc468d..43985c9d5c6 100644 --- a/test/core/ext/filters/rbac/rbac_service_config_parser_test.cc +++ b/test/core/ext/filters/rbac/rbac_service_config_parser_test.cc @@ -14,6 +14,10 @@ #include "src/core/ext/filters/rbac/rbac_service_config_parser.h" +#include +#include +#include + #include #include #include @@ -23,11 +27,6 @@ #include "absl/strings/string_view.h" #include "gmock/gmock.h" #include "gtest/gtest.h" - -#include -#include -#include - #include "src/core/lib/security/authorization/audit_logging.h" #include "src/core/service_config/service_config.h" #include "src/core/service_config/service_config_impl.h" diff --git a/test/core/filters/bm_http_client_filter.cc b/test/core/filters/bm_http_client_filter.cc index 967af7ab6a4..0e295d86fec 100644 --- a/test/core/filters/bm_http_client_filter.cc +++ b/test/core/filters/bm_http_client_filter.cc @@ -13,11 +13,9 @@ // limitations under the License. #include - -#include "absl/strings/string_view.h" - #include +#include "absl/strings/string_view.h" #include "src/core/ext/filters/http/client/http_client_filter.h" #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/transport/connectivity_state.h" diff --git a/test/core/filters/client_auth_filter_test.cc b/test/core/filters/client_auth_filter_test.cc index f6a29e17d89..b4cdef1abe5 100644 --- a/test/core/filters/client_auth_filter_test.cc +++ b/test/core/filters/client_auth_filter_test.cc @@ -12,6 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include +#include +#include +#include + #include #include @@ -20,12 +25,6 @@ #include "absl/strings/string_view.h" #include "gmock/gmock.h" #include "gtest/gtest.h" - -#include -#include -#include -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/promise_based_filter.h" #include "src/core/lib/promise/arena_promise.h" diff --git a/test/core/filters/client_authority_filter_test.cc b/test/core/filters/client_authority_filter_test.cc index cdb99d9999d..62e85416ac6 100644 --- a/test/core/filters/client_authority_filter_test.cc +++ b/test/core/filters/client_authority_filter_test.cc @@ -14,15 +14,14 @@ #include "src/core/ext/filters/http/client_authority_filter.h" +#include + #include #include "absl/status/status.h" #include "absl/strings/string_view.h" #include "gmock/gmock.h" #include "gtest/gtest.h" - -#include - #include "test/core/filters/filter_test.h" using ::testing::StrictMock; diff --git a/test/core/filters/filter_test.cc b/test/core/filters/filter_test.cc index 11ff4cfa087..e710abc43b9 100644 --- a/test/core/filters/filter_test.cc +++ b/test/core/filters/filter_test.cc @@ -14,6 +14,8 @@ #include "test/core/filters/filter_test.h" +#include + #include #include #include @@ -24,9 +26,6 @@ #include "absl/strings/str_format.h" #include "absl/types/optional.h" #include "gtest/gtest.h" - -#include - #include "src/core/lib/channel/call_finalization.h" #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/iomgr/timer_manager.h" diff --git a/test/core/filters/filter_test.h b/test/core/filters/filter_test.h index 4c193efce31..13a9a80e8a1 100644 --- a/test/core/filters/filter_test.h +++ b/test/core/filters/filter_test.h @@ -15,6 +15,9 @@ #ifndef GRPC_TEST_CORE_FILTERS_FILTER_TEST_H #define GRPC_TEST_CORE_FILTERS_FILTER_TEST_H +#include +#include +#include #include #include @@ -25,17 +28,11 @@ #include #include -#include - #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/escaping.h" #include "absl/strings/string_view.h" #include "gmock/gmock.h" - -#include -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/promise_based_filter.h" #include "src/core/lib/resource_quota/arena.h" diff --git a/test/core/filters/filter_test_test.cc b/test/core/filters/filter_test_test.cc index ec836316f86..6da52c84be4 100644 --- a/test/core/filters/filter_test_test.cc +++ b/test/core/filters/filter_test_test.cc @@ -14,6 +14,8 @@ #include "test/core/filters/filter_test.h" +#include + #include #include #include @@ -22,9 +24,6 @@ #include "absl/status/statusor.h" #include "gmock/gmock.h" #include "gtest/gtest.h" - -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/promise_based_filter.h" #include "src/core/lib/promise/activity.h" diff --git a/test/core/filters/gcp_authentication_filter_test.cc b/test/core/filters/gcp_authentication_filter_test.cc index 5f3880fa998..e75706b4ea0 100644 --- a/test/core/filters/gcp_authentication_filter_test.cc +++ b/test/core/filters/gcp_authentication_filter_test.cc @@ -22,7 +22,6 @@ #include "absl/strings/string_view.h" #include "gmock/gmock.h" #include "gtest/gtest.h" - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/promise_based_filter.h" #include "src/core/lib/security/context/security_context.h" diff --git a/test/core/handshake/client_ssl.cc b/test/core/handshake/client_ssl.cc index 3032abf8ced..1a8035cc104 100644 --- a/test/core/handshake/client_ssl.cc +++ b/test/core/handshake/client_ssl.cc @@ -16,21 +16,18 @@ // // +#include +#include +#include #include -#include -#include - #include #include +#include +#include #include "absl/base/thread_annotations.h" #include "absl/strings/str_format.h" #include "gtest/gtest.h" - -#include -#include -#include - #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/port.h" #include "test/core/test_util/test_config.h" @@ -40,6 +37,11 @@ // This test won't work except with posix sockets enabled #ifdef GRPC_POSIX_SOCKET_TCP +#include +#include +#include +#include +#include #include #include #include @@ -47,16 +49,8 @@ #include -#include -#include - #include "absl/log/log.h" #include "absl/strings/str_cat.h" - -#include -#include -#include - #include "src/core/lib/debug/trace.h" #include "src/core/util/crash.h" #include "src/core/util/sync.h" diff --git a/test/core/handshake/http_proxy_mapper_test.cc b/test/core/handshake/http_proxy_mapper_test.cc index 1c7d40e022d..30741b71589 100644 --- a/test/core/handshake/http_proxy_mapper_test.cc +++ b/test/core/handshake/http_proxy_mapper_test.cc @@ -18,15 +18,14 @@ #include "src/core/handshaker/http_connect/http_proxy_mapper.h" +#include + #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/str_format.h" #include "absl/types/optional.h" #include "gmock/gmock.h" #include "gtest/gtest.h" - -#include - #include "src/core/handshaker/http_connect/http_connect_handshaker.h" #include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/address_utils/sockaddr_utils.h" diff --git a/test/core/handshake/readahead_handshaker_server_ssl.cc b/test/core/handshake/readahead_handshaker_server_ssl.cc index 9b4203ec6f2..e8401f084f6 100644 --- a/test/core/handshake/readahead_handshaker_server_ssl.cc +++ b/test/core/handshake/readahead_handshaker_server_ssl.cc @@ -16,14 +16,13 @@ // // +#include + #include #include "absl/base/thread_annotations.h" #include "absl/strings/string_view.h" #include "gtest/gtest.h" - -#include - #include "src/core/handshaker/handshaker.h" #include "src/core/handshaker/handshaker_factory.h" #include "src/core/handshaker/handshaker_registry.h" diff --git a/test/core/handshake/server_ssl.cc b/test/core/handshake/server_ssl.cc index 9776d7330e4..7910251502e 100644 --- a/test/core/handshake/server_ssl.cc +++ b/test/core/handshake/server_ssl.cc @@ -19,7 +19,6 @@ #include #include "gtest/gtest.h" - #include "test/core/handshake/server_ssl_common.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/handshake/server_ssl_common.cc b/test/core/handshake/server_ssl_common.cc index 7a8910fac34..a026e7c9fba 100644 --- a/test/core/handshake/server_ssl_common.cc +++ b/test/core/handshake/server_ssl_common.cc @@ -18,7 +18,18 @@ #include "test/core/handshake/server_ssl_common.h" +#include +#include +#include +#include +#include +#include +#include #include +#include +#include +#include +#include #include #include #include @@ -28,24 +39,10 @@ #include -#include -#include -#include -#include - #include "absl/base/thread_annotations.h" #include "absl/log/check.h" #include "absl/log/log.h" #include "absl/strings/str_cat.h" - -#include -#include -#include -#include -#include -#include -#include - #include "src/core/lib/iomgr/error.h" #include "src/core/util/crash.h" #include "src/core/util/sync.h" diff --git a/test/core/handshake/verify_peer_options.cc b/test/core/handshake/verify_peer_options.cc index 626dc964468..96e9d4cd79c 100644 --- a/test/core/handshake/verify_peer_options.cc +++ b/test/core/handshake/verify_peer_options.cc @@ -22,6 +22,12 @@ #ifdef GRPC_POSIX_SOCKET_TCP #include +#include +#include +#include +#include +#include +#include #include #include #include @@ -29,18 +35,9 @@ #include -#include -#include - #include "absl/log/check.h" #include "absl/log/log.h" #include "absl/strings/str_cat.h" - -#include -#include -#include -#include - #include "src/core/util/crash.h" #include "src/core/util/thd.h" #include "test/core/test_util/port.h" diff --git a/test/core/http/format_request_test.cc b/test/core/http/format_request_test.cc index 31c73d88100..2d2deb6d4bb 100644 --- a/test/core/http/format_request_test.cc +++ b/test/core/http/format_request_test.cc @@ -23,7 +23,6 @@ #include #include "gtest/gtest.h" - #include "src/core/lib/slice/slice_internal.h" #include "src/core/util/http_client/httpcli.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/http/httpcli_test.cc b/test/core/http/httpcli_test.cc index 0f9b26ab912..53b6236ba0d 100644 --- a/test/core/http/httpcli_test.cc +++ b/test/core/http/httpcli_test.cc @@ -18,6 +18,14 @@ #include "src/core/util/http_client/httpcli.h" +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -26,23 +34,12 @@ #include #include -#include -#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/time/clock.h" #include "absl/time/time.h" - -#include -#include -#include -#include -#include -#include - #include "src/core/lib/iomgr/pollset.h" #include "src/core/lib/iomgr/pollset_set.h" #include "src/core/lib/security/credentials/credentials.h" diff --git a/test/core/http/httpcli_test_util.cc b/test/core/http/httpcli_test_util.cc index f47bb1d61a8..6ba8c6d1d7d 100644 --- a/test/core/http/httpcli_test_util.cc +++ b/test/core/http/httpcli_test_util.cc @@ -16,6 +16,10 @@ #include "test/core/http/httpcli_test_util.h" +#include +#include +#include +#include #include #include @@ -26,12 +30,6 @@ #include "absl/log/log.h" #include "absl/strings/str_cat.h" #include "absl/types/optional.h" - -#include -#include -#include -#include - #include "src/core/lib/config/config_vars.h" #include "src/core/util/subprocess.h" #include "test/core/test_util/port.h" diff --git a/test/core/http/httpscli_test.cc b/test/core/http/httpscli_test.cc index 11596745a6d..0f051f6a860 100644 --- a/test/core/http/httpscli_test.cc +++ b/test/core/http/httpscli_test.cc @@ -16,6 +16,12 @@ // // +#include +#include +#include +#include +#include +#include #include #include @@ -26,21 +32,12 @@ #include #include -#include - #include "absl/log/check.h" #include "absl/log/log.h" #include "absl/status/statusor.h" #include "absl/strings/str_format.h" #include "absl/time/clock.h" #include "absl/time/time.h" - -#include -#include -#include -#include -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" diff --git a/test/core/http/parser_test.cc b/test/core/http/parser_test.cc index 4e3f508338a..a7ff86e5cc6 100644 --- a/test/core/http/parser_test.cc +++ b/test/core/http/parser_test.cc @@ -18,6 +18,7 @@ #include "src/core/util/http_client/parser.h" +#include #include #include @@ -26,9 +27,6 @@ #include "absl/status/status.h" #include "absl/strings/str_format.h" #include "gtest/gtest.h" - -#include - #include "src/core/util/useful.h" #include "test/core/test_util/slice_splitter.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/http/request_fuzzer.cc b/test/core/http/request_fuzzer.cc index 7ca890c7e01..aef8b6424f5 100644 --- a/test/core/http/request_fuzzer.cc +++ b/test/core/http/request_fuzzer.cc @@ -16,11 +16,10 @@ // // -#include -#include - #include #include +#include +#include #include "src/core/util/http_client/parser.h" diff --git a/test/core/http/response_fuzzer.cc b/test/core/http/response_fuzzer.cc index e2cadb79eb8..377098028e3 100644 --- a/test/core/http/response_fuzzer.cc +++ b/test/core/http/response_fuzzer.cc @@ -16,11 +16,10 @@ // // -#include -#include - #include #include +#include +#include #include "src/core/util/http_client/parser.h" diff --git a/test/core/iomgr/buffer_list_test.cc b/test/core/iomgr/buffer_list_test.cc index d6620314c29..f80a2a53ff9 100644 --- a/test/core/iomgr/buffer_list_test.cc +++ b/test/core/iomgr/buffer_list_test.cc @@ -18,13 +18,11 @@ #include "src/core/lib/iomgr/buffer_list.h" -#include - -#include "absl/log/check.h" - #include #include +#include +#include "absl/log/check.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/internal_errqueue.h" #include "src/core/lib/iomgr/port.h" diff --git a/test/core/iomgr/combiner_test.cc b/test/core/iomgr/combiner_test.cc index 1e3daba3978..7c7d66e918d 100644 --- a/test/core/iomgr/combiner_test.cc +++ b/test/core/iomgr/combiner_test.cc @@ -18,12 +18,11 @@ #include "src/core/lib/iomgr/combiner.h" -#include - -#include - #include #include +#include + +#include #include "src/core/util/crash.h" #include "src/core/util/notification.h" diff --git a/test/core/iomgr/endpoint_pair_test.cc b/test/core/iomgr/endpoint_pair_test.cc index 76518fa5cd0..532d40203fa 100644 --- a/test/core/iomgr/endpoint_pair_test.cc +++ b/test/core/iomgr/endpoint_pair_test.cc @@ -18,18 +18,16 @@ #include "src/core/lib/iomgr/endpoint_pair.h" -#include - -#include - -#include "absl/log/check.h" -#include "absl/log/log.h" - #include #include #include #include +#include + +#include +#include "absl/log/check.h" +#include "absl/log/log.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/event_engine/channel_args_endpoint_config.h" #include "src/core/lib/event_engine/default_event_engine.h" diff --git a/test/core/iomgr/endpoint_tests.cc b/test/core/iomgr/endpoint_tests.cc index 5f0044bb6f0..b20245aad53 100644 --- a/test/core/iomgr/endpoint_tests.cc +++ b/test/core/iomgr/endpoint_tests.cc @@ -18,17 +18,15 @@ #include "test/core/iomgr/endpoint_tests.h" +#include +#include +#include #include #include #include #include "absl/log/check.h" #include "absl/log/log.h" - -#include -#include -#include - #include "src/core/lib/iomgr/error.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/util/crash.h" diff --git a/test/core/iomgr/error_test.cc b/test/core/iomgr/error_test.cc index 93ce01db702..2ff779733bb 100644 --- a/test/core/iomgr/error_test.cc +++ b/test/core/iomgr/error_test.cc @@ -18,16 +18,13 @@ #include "src/core/lib/iomgr/error.h" -#include - #include - -#include "absl/log/log.h" -#include "absl/strings/str_cat.h" - #include #include +#include +#include "absl/log/log.h" +#include "absl/strings/str_cat.h" #include "src/core/util/crash.h" #include "src/core/util/strerror.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/iomgr/fd_conservation_posix_test.cc b/test/core/iomgr/fd_conservation_posix_test.cc index 8a75b4f41e2..8d1f7844cbb 100644 --- a/test/core/iomgr/fd_conservation_posix_test.cc +++ b/test/core/iomgr/fd_conservation_posix_test.cc @@ -16,12 +16,10 @@ // // +#include #include #include "absl/log/check.h" - -#include - #include "src/core/lib/iomgr/endpoint_pair.h" #include "src/core/lib/iomgr/iomgr.h" #include "src/core/util/crash.h" diff --git a/test/core/iomgr/fd_posix_test.cc b/test/core/iomgr/fd_posix_test.cc index 4de02c79db3..875bbf5e0be 100644 --- a/test/core/iomgr/fd_posix_test.cc +++ b/test/core/iomgr/fd_posix_test.cc @@ -27,6 +27,10 @@ #include #include #include +#include +#include +#include +#include #include #include #include @@ -38,12 +42,6 @@ #include "absl/log/log.h" #include "absl/strings/str_format.h" - -#include -#include -#include -#include - #include "src/core/lib/iomgr/ev_posix.h" #include "src/core/lib/iomgr/iomgr.h" #include "src/core/lib/iomgr/socket_utils_posix.h" diff --git a/test/core/iomgr/grpc_ipv6_loopback_available_test.cc b/test/core/iomgr/grpc_ipv6_loopback_available_test.cc index e1d615ea9ca..db1da269193 100644 --- a/test/core/iomgr/grpc_ipv6_loopback_available_test.cc +++ b/test/core/iomgr/grpc_ipv6_loopback_available_test.cc @@ -16,9 +16,8 @@ // // -#include - #include +#include #include "src/core/lib/iomgr/port.h" #include "src/core/util/crash.h" diff --git a/test/core/iomgr/pollset_windows_starvation_test.cc b/test/core/iomgr/pollset_windows_starvation_test.cc index dc75b1f61d6..b921e19f162 100644 --- a/test/core/iomgr/pollset_windows_starvation_test.cc +++ b/test/core/iomgr/pollset_windows_starvation_test.cc @@ -15,11 +15,11 @@ // limitations under the License. // // -#include - #include #include +#include + #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/iocp_windows.h" #include "src/core/lib/iomgr/iomgr_internal.h" diff --git a/test/core/iomgr/resolve_address_posix_test.cc b/test/core/iomgr/resolve_address_posix_test.cc index 1c0eecfa04c..0d3deea8ba4 100644 --- a/test/core/iomgr/resolve_address_posix_test.cc +++ b/test/core/iomgr/resolve_address_posix_test.cc @@ -16,24 +16,21 @@ // // +#include +#include +#include +#include +#include #include #include #include #include -#include - #include "absl/flags/flag.h" #include "absl/flags/parse.h" #include "absl/log/log.h" #include "absl/strings/str_format.h" - -#include -#include -#include -#include - #include "src/core/lib/config/config_vars.h" #include "src/core/lib/iomgr/executor.h" #include "src/core/lib/iomgr/iomgr.h" diff --git a/test/core/iomgr/resolve_address_test.cc b/test/core/iomgr/resolve_address_test.cc index 97da4df464c..db0c041c470 100644 --- a/test/core/iomgr/resolve_address_test.cc +++ b/test/core/iomgr/resolve_address_test.cc @@ -18,22 +18,19 @@ #include "src/core/lib/iomgr/resolve_address.h" -#include - #include #include +#include +#include +#include +#include #include +#include #include "absl/functional/bind_front.h" #include "absl/log/check.h" #include "absl/log/log.h" #include "absl/strings/match.h" - -#include -#include -#include -#include - #include "src/core/lib/config/config_vars.h" #include "src/core/lib/iomgr/executor.h" #include "src/core/lib/iomgr/iomgr.h" diff --git a/test/core/iomgr/socket_utils_test.cc b/test/core/iomgr/socket_utils_test.cc index 861ea5eae25..fa492c8c204 100644 --- a/test/core/iomgr/socket_utils_test.cc +++ b/test/core/iomgr/socket_utils_test.cc @@ -22,17 +22,14 @@ #ifdef GRPC_POSIX_SOCKET_UTILS_COMMON #include +#include +#include +#include #include #include #include -#include - #include "absl/log/check.h" - -#include -#include - #include "src/core/lib/iomgr/socket_mutator.h" #include "src/core/lib/iomgr/socket_utils_posix.h" #include "src/core/util/crash.h" diff --git a/test/core/iomgr/tcp_client_posix_test.cc b/test/core/iomgr/tcp_client_posix_test.cc index 6a567765b38..bdfb8a9ab9d 100644 --- a/test/core/iomgr/tcp_client_posix_test.cc +++ b/test/core/iomgr/tcp_client_posix_test.cc @@ -30,6 +30,9 @@ #include #include +#include +#include +#include #include #include #include @@ -37,11 +40,6 @@ #include #include "absl/log/log.h" - -#include -#include -#include - #include "src/core/lib/event_engine/channel_args_endpoint_config.h" #include "src/core/lib/iomgr/iomgr.h" #include "src/core/lib/iomgr/pollset_set.h" diff --git a/test/core/iomgr/tcp_posix_test.cc b/test/core/iomgr/tcp_posix_test.cc index 897df84cf3e..35a7018075b 100644 --- a/test/core/iomgr/tcp_posix_test.cc +++ b/test/core/iomgr/tcp_posix_test.cc @@ -17,7 +17,6 @@ // #include "absl/time/time.h" - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/iomgr/port.h" #include "src/core/util/notification.h" @@ -28,21 +27,18 @@ #include #include +#include +#include +#include +#include #include #include #include #include #include -#include - #include "absl/log/check.h" #include "absl/log/log.h" - -#include -#include -#include - #include "src/core/lib/event_engine/channel_args_endpoint_config.h" #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/event_engine/posix.h" diff --git a/test/core/iomgr/tcp_server_posix_test.cc b/test/core/iomgr/tcp_server_posix_test.cc index 09c4a5c0d83..86a7e30ab32 100644 --- a/test/core/iomgr/tcp_server_posix_test.cc +++ b/test/core/iomgr/tcp_server_posix_test.cc @@ -39,16 +39,15 @@ #include #endif -#include -#include - -#include "absl/log/log.h" - #include #include #include #include +#include +#include + +#include "absl/log/log.h" #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/event_engine/channel_args_endpoint_config.h" #include "src/core/lib/iomgr/error.h" diff --git a/test/core/iomgr/timer_heap_test.cc b/test/core/iomgr/timer_heap_test.cc index 3e2b907e7b5..4882fb2fda2 100644 --- a/test/core/iomgr/timer_heap_test.cc +++ b/test/core/iomgr/timer_heap_test.cc @@ -18,15 +18,12 @@ #include "src/core/lib/iomgr/timer_heap.h" +#include +#include #include #include -#include - #include "absl/log/log.h" - -#include - #include "src/core/lib/iomgr/port.h" #include "src/core/util/crash.h" #include "src/core/util/useful.h" diff --git a/test/core/iomgr/timer_list_test.cc b/test/core/iomgr/timer_list_test.cc index cd0a5221d60..ffe81cd0a5e 100644 --- a/test/core/iomgr/timer_list_test.cc +++ b/test/core/iomgr/timer_list_test.cc @@ -16,6 +16,7 @@ // // +#include #include #include @@ -23,9 +24,6 @@ #include "absl/log/check.h" #include "absl/log/log.h" - -#include - #include "src/core/lib/debug/trace.h" #include "src/core/lib/iomgr/iomgr_internal.h" #include "src/core/lib/iomgr/port.h" diff --git a/test/core/json/fuzzer.cc b/test/core/json/fuzzer.cc index bc17d74af3d..3191f0a00c4 100644 --- a/test/core/json/fuzzer.cc +++ b/test/core/json/fuzzer.cc @@ -16,15 +16,13 @@ // // +#include #include #include #include "absl/log/check.h" #include "absl/status/statusor.h" #include "absl/strings/string_view.h" - -#include - #include "src/core/util/json/json_reader.h" #include "src/core/util/json/json_writer.h" diff --git a/test/core/json/json_object_loader_test.cc b/test/core/json/json_object_loader_test.cc index aad3567f86b..385c8ef93bb 100644 --- a/test/core/json/json_object_loader_test.cc +++ b/test/core/json/json_object_loader_test.cc @@ -14,14 +14,13 @@ #include "src/core/util/json/json_object_loader.h" +#include + #include #include "absl/status/status.h" #include "gmock/gmock.h" #include "gtest/gtest.h" - -#include - #include "src/core/util/json/json_reader.h" #include "src/core/util/json/json_writer.h" #include "src/core/util/ref_counted.h" diff --git a/test/core/json/json_test.cc b/test/core/json/json_test.cc index cf9f68cf212..2e44c6636ad 100644 --- a/test/core/json/json_test.cc +++ b/test/core/json/json_test.cc @@ -29,7 +29,6 @@ #include "absl/strings/str_cat.h" #include "gmock/gmock.h" #include "gtest/gtest.h" - #include "src/core/util/json/json_reader.h" #include "src/core/util/json/json_writer.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/load_balancing/bm_picker.cc b/test/core/load_balancing/bm_picker.cc index 51aee364d3f..b596ef553bc 100644 --- a/test/core/load_balancing/bm_picker.cc +++ b/test/core/load_balancing/bm_picker.cc @@ -12,14 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - #include - -#include "absl/strings/string_view.h" - #include +#include + +#include "absl/strings/string_view.h" #include "src/core/client_channel/subchannel_interface_internal.h" #include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/config/core_configuration.h" diff --git a/test/core/load_balancing/lb_policy_test_lib.h b/test/core/load_balancing/lb_policy_test_lib.h index 00c21dcd9a3..2280ae6833f 100644 --- a/test/core/load_balancing/lb_policy_test_lib.h +++ b/test/core/load_balancing/lb_policy_test_lib.h @@ -17,6 +17,10 @@ #ifndef GRPC_TEST_CORE_LOAD_BALANCING_LB_POLICY_TEST_LIB_H #define GRPC_TEST_CORE_LOAD_BALANCING_LB_POLICY_TEST_LIB_H +#include +#include +#include +#include #include #include @@ -48,12 +52,6 @@ #include "absl/types/variant.h" #include "gmock/gmock.h" #include "gtest/gtest.h" - -#include -#include -#include -#include - #include "src/core/client_channel/client_channel_internal.h" #include "src/core/client_channel/subchannel_interface_internal.h" #include "src/core/client_channel/subchannel_pool_interface.h" diff --git a/test/core/load_balancing/outlier_detection_lb_config_parser_test.cc b/test/core/load_balancing/outlier_detection_lb_config_parser_test.cc index b5145f451ff..1793807fc55 100644 --- a/test/core/load_balancing/outlier_detection_lb_config_parser_test.cc +++ b/test/core/load_balancing/outlier_detection_lb_config_parser_test.cc @@ -14,15 +14,14 @@ // limitations under the License. // +#include + #include #include "absl/status/status.h" #include "absl/status/statusor.h" #include "gmock/gmock.h" #include "gtest/gtest.h" - -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/service_config/service_config.h" #include "src/core/service_config/service_config_impl.h" diff --git a/test/core/load_balancing/outlier_detection_test.cc b/test/core/load_balancing/outlier_detection_test.cc index e92c3bc4e84..d73a4ed54bf 100644 --- a/test/core/load_balancing/outlier_detection_test.cc +++ b/test/core/load_balancing/outlier_detection_test.cc @@ -14,6 +14,8 @@ // limitations under the License. // +#include +#include #include #include @@ -31,10 +33,6 @@ #include "absl/types/optional.h" #include "absl/types/span.h" #include "gtest/gtest.h" - -#include -#include - #include "src/core/load_balancing/backend_metric_data.h" #include "src/core/load_balancing/lb_policy.h" #include "src/core/resolver/endpoint_addresses.h" diff --git a/test/core/load_balancing/pick_first_test.cc b/test/core/load_balancing/pick_first_test.cc index 0f07d6fd39d..75bf64c8328 100644 --- a/test/core/load_balancing/pick_first_test.cc +++ b/test/core/load_balancing/pick_first_test.cc @@ -16,6 +16,8 @@ #include "src/core/load_balancing/pick_first/pick_first.h" +#include +#include #include #include @@ -33,10 +35,6 @@ #include "absl/types/span.h" #include "gmock/gmock.h" #include "gtest/gtest.h" - -#include -#include - #include "src/core/lib/experiments/experiments.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/load_balancing/lb_policy.h" diff --git a/test/core/load_balancing/ring_hash_test.cc b/test/core/load_balancing/ring_hash_test.cc index 0861cdcb5db..522f5794921 100644 --- a/test/core/load_balancing/ring_hash_test.cc +++ b/test/core/load_balancing/ring_hash_test.cc @@ -16,6 +16,8 @@ #include "src/core/load_balancing/ring_hash/ring_hash.h" +#include +#include #include #include @@ -30,10 +32,6 @@ #include "absl/strings/strip.h" #include "absl/types/optional.h" #include "gtest/gtest.h" - -#include -#include - #include "src/core/load_balancing/lb_policy.h" #include "src/core/resolver/endpoint_addresses.h" #include "src/core/util/json/json.h" diff --git a/test/core/load_balancing/rls_lb_config_parser_test.cc b/test/core/load_balancing/rls_lb_config_parser_test.cc index edf3e8127bf..a710284f471 100644 --- a/test/core/load_balancing/rls_lb_config_parser_test.cc +++ b/test/core/load_balancing/rls_lb_config_parser_test.cc @@ -14,15 +14,14 @@ // limitations under the License. // +#include + #include #include "absl/status/status.h" #include "absl/status/statusor.h" #include "gmock/gmock.h" #include "gtest/gtest.h" - -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/service_config/service_config.h" #include "src/core/service_config/service_config_impl.h" diff --git a/test/core/load_balancing/round_robin_test.cc b/test/core/load_balancing/round_robin_test.cc index 78da9b904f3..0eb2a3ef372 100644 --- a/test/core/load_balancing/round_robin_test.cc +++ b/test/core/load_balancing/round_robin_test.cc @@ -14,6 +14,8 @@ // limitations under the License. // +#include + #include #include @@ -21,9 +23,6 @@ #include "absl/strings/string_view.h" #include "absl/types/span.h" #include "gtest/gtest.h" - -#include - #include "src/core/resolver/endpoint_addresses.h" #include "src/core/util/orphanable.h" #include "src/core/util/ref_counted_ptr.h" diff --git a/test/core/load_balancing/static_stride_scheduler_benchmark.cc b/test/core/load_balancing/static_stride_scheduler_benchmark.cc index aba086e7e40..06edb74f976 100644 --- a/test/core/load_balancing/static_stride_scheduler_benchmark.cc +++ b/test/core/load_balancing/static_stride_scheduler_benchmark.cc @@ -14,19 +14,18 @@ // limitations under the License. // +#include + #include #include #include #include -#include - #include "absl/algorithm/container.h" #include "absl/log/check.h" #include "absl/random/random.h" #include "absl/types/optional.h" #include "absl/types/span.h" - #include "src/core/load_balancing/weighted_round_robin/static_stride_scheduler.h" #include "src/core/util/no_destruct.h" diff --git a/test/core/load_balancing/weighted_round_robin_config_test.cc b/test/core/load_balancing/weighted_round_robin_config_test.cc index 5da2fb5a006..eac134bd823 100644 --- a/test/core/load_balancing/weighted_round_robin_config_test.cc +++ b/test/core/load_balancing/weighted_round_robin_config_test.cc @@ -14,14 +14,13 @@ // limitations under the License. // +#include + #include #include "absl/status/status.h" #include "absl/status/statusor.h" #include "gtest/gtest.h" - -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/service_config/service_config.h" #include "src/core/service_config/service_config_impl.h" diff --git a/test/core/load_balancing/weighted_round_robin_test.cc b/test/core/load_balancing/weighted_round_robin_test.cc index 8faa6c693e1..274d6543bf8 100644 --- a/test/core/load_balancing/weighted_round_robin_test.cc +++ b/test/core/load_balancing/weighted_round_robin_test.cc @@ -14,6 +14,8 @@ // limitations under the License. // +#include +#include #include #include @@ -36,10 +38,6 @@ #include "absl/types/optional.h" #include "absl/types/span.h" #include "gtest/gtest.h" - -#include -#include - #include "src/core/load_balancing/backend_metric_data.h" #include "src/core/load_balancing/lb_policy.h" #include "src/core/load_balancing/weighted_target/weighted_target.h" diff --git a/test/core/load_balancing/xds_override_host_lb_config_parser_test.cc b/test/core/load_balancing/xds_override_host_lb_config_parser_test.cc index 3407ababe59..fb14dd90c34 100644 --- a/test/core/load_balancing/xds_override_host_lb_config_parser_test.cc +++ b/test/core/load_balancing/xds_override_host_lb_config_parser_test.cc @@ -14,14 +14,13 @@ // limitations under the License. // +#include + #include #include "absl/status/status.h" #include "absl/status/statusor.h" #include "gtest/gtest.h" - -#include - #include "src/core/client_channel/client_channel_service_config.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/load_balancing/xds/xds_override_host.h" diff --git a/test/core/load_balancing/xds_override_host_test.cc b/test/core/load_balancing/xds_override_host_test.cc index 4352b6db370..e487b6ab323 100644 --- a/test/core/load_balancing/xds_override_host_test.cc +++ b/test/core/load_balancing/xds_override_host_test.cc @@ -14,6 +14,8 @@ // limitations under the License. // +#include +#include #include #include @@ -33,10 +35,6 @@ #include "absl/types/span.h" #include "gmock/gmock.h" #include "gtest/gtest.h" - -#include -#include - #include "src/core/ext/filters/stateful_session/stateful_session_filter.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/load_balancing/lb_policy.h" diff --git a/test/core/memory_usage/callback_client.cc b/test/core/memory_usage/callback_client.cc index 449fcbd34fe..0f0630517ac 100644 --- a/test/core/memory_usage/callback_client.cc +++ b/test/core/memory_usage/callback_client.cc @@ -16,6 +16,11 @@ // // +#include +#include +#include +#include +#include #include #include @@ -31,13 +36,6 @@ #include "absl/log/log.h" #include "absl/strings/match.h" #include "absl/strings/str_cat.h" - -#include -#include -#include -#include -#include - #include "src/core/util/notification.h" #include "src/cpp/ext/chaotic_good.h" #include "src/proto/grpc/testing/benchmark_service.grpc.pb.h" diff --git a/test/core/memory_usage/callback_server.cc b/test/core/memory_usage/callback_server.cc index c630b4dc816..81a08b38725 100644 --- a/test/core/memory_usage/callback_server.cc +++ b/test/core/memory_usage/callback_server.cc @@ -16,6 +16,11 @@ // // +#include +#include +#include +#include +#include #include #include @@ -26,13 +31,6 @@ #include "absl/flags/parse.h" #include "absl/log/check.h" #include "absl/log/log.h" - -#include -#include -#include -#include -#include - #include "src/cpp/ext/chaotic_good.h" #include "src/proto/grpc/testing/benchmark_service.grpc.pb.h" #include "src/proto/grpc/testing/messages.pb.h" diff --git a/test/core/memory_usage/client.cc b/test/core/memory_usage/client.cc index 003b108e6dd..6591f48e294 100644 --- a/test/core/memory_usage/client.cc +++ b/test/core/memory_usage/client.cc @@ -16,6 +16,16 @@ // // +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include @@ -30,18 +40,6 @@ #include "absl/log/check.h" #include "absl/log/log.h" #include "absl/strings/match.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - #include "src/core/ext/transport/chaotic_good/client/chaotic_good_connector.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/slice/slice_internal.h" diff --git a/test/core/memory_usage/memory_usage_test.cc b/test/core/memory_usage/memory_usage_test.cc index 798b90093da..04349e9bb10 100644 --- a/test/core/memory_usage/memory_usage_test.cc +++ b/test/core/memory_usage/memory_usage_test.cc @@ -16,6 +16,11 @@ // // +#include +#include +#include +#include +#include #include #include #include @@ -38,13 +43,6 @@ #include "absl/strings/str_split.h" #include "absl/strings/string_view.h" #include "google/protobuf/wrappers.pb.h" - -#include -#include -#include -#include -#include - #include "src/core/lib/config/config_vars.h" #include "src/core/util/env.h" #include "src/core/util/subprocess.h" diff --git a/test/core/memory_usage/server.cc b/test/core/memory_usage/server.cc index 4f41754d06c..294a10c95b4 100644 --- a/test/core/memory_usage/server.cc +++ b/test/core/memory_usage/server.cc @@ -26,17 +26,6 @@ #include #endif -#include -#include -#include - -#include "absl/base/attributes.h" -#include "absl/flags/flag.h" -#include "absl/flags/parse.h" -#include "absl/log/check.h" -#include "absl/log/log.h" -#include "absl/status/status.h" - #include #include #include @@ -47,6 +36,16 @@ #include #include +#include +#include +#include + +#include "absl/base/attributes.h" +#include "absl/flags/flag.h" +#include "absl/flags/parse.h" +#include "absl/log/check.h" +#include "absl/log/log.h" +#include "absl/status/status.h" #include "src/core/ext/transport/chaotic_good/server/chaotic_good_server.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/util/host_port.h" diff --git a/test/core/message_size/message_size_service_config_test.cc b/test/core/message_size/message_size_service_config_test.cc index 65fd3a11118..ed15404a886 100644 --- a/test/core/message_size/message_size_service_config_test.cc +++ b/test/core/message_size/message_size_service_config_test.cc @@ -14,6 +14,8 @@ // limitations under the License. // +#include +#include #include #include @@ -21,10 +23,6 @@ #include "absl/status/status.h" #include "absl/status/statusor.h" #include "gtest/gtest.h" - -#include -#include - #include "src/core/ext/filters/message_size/message_size_filter.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" diff --git a/test/core/nanopb/fuzzer_response.cc b/test/core/nanopb/fuzzer_response.cc index a952cf558dc..75b7c196536 100644 --- a/test/core/nanopb/fuzzer_response.cc +++ b/test/core/nanopb/fuzzer_response.cc @@ -16,11 +16,10 @@ // // +#include #include #include -#include - #include "test/core/test_util/test_config.h" bool squelch = true; diff --git a/test/core/nanopb/fuzzer_serverlist.cc b/test/core/nanopb/fuzzer_serverlist.cc index 278f4c4cbfa..e58e855ebe1 100644 --- a/test/core/nanopb/fuzzer_serverlist.cc +++ b/test/core/nanopb/fuzzer_serverlist.cc @@ -16,11 +16,10 @@ // // +#include #include #include -#include - #include "test/core/test_util/test_config.h" bool squelch = true; diff --git a/test/core/network_benchmarks/low_level_ping_pong.cc b/test/core/network_benchmarks/low_level_ping_pong.cc index 9211b83e7ea..44b990eb5ee 100644 --- a/test/core/network_benchmarks/low_level_ping_pong.cc +++ b/test/core/network_benchmarks/low_level_ping_pong.cc @@ -33,14 +33,12 @@ #ifdef __linux__ #include #endif +#include +#include #include #include "absl/log/check.h" #include "absl/log/log.h" - -#include -#include - #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/socket_utils_posix.h" #include "src/core/util/strerror.h" diff --git a/test/core/promise/activity_test.cc b/test/core/promise/activity_test.cc index eccd2c8c9bc..45edfc35eec 100644 --- a/test/core/promise/activity_test.cc +++ b/test/core/promise/activity_test.cc @@ -22,7 +22,6 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" - #include "src/core/lib/promise/join.h" #include "src/core/lib/promise/poll.h" #include "src/core/lib/promise/promise.h" diff --git a/test/core/promise/arena_promise_test.cc b/test/core/promise/arena_promise_test.cc index 2f4da3b2c5d..f51d26f114d 100644 --- a/test/core/promise/arena_promise_test.cc +++ b/test/core/promise/arena_promise_test.cc @@ -14,13 +14,12 @@ #include "src/core/lib/promise/arena_promise.h" +#include + #include #include #include "gtest/gtest.h" - -#include - #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/lib/resource_quota/resource_quota.h" diff --git a/test/core/promise/bm_party.cc b/test/core/promise/bm_party.cc index c271a4d240a..c6976e62a19 100644 --- a/test/core/promise/bm_party.cc +++ b/test/core/promise/bm_party.cc @@ -13,7 +13,6 @@ // limitations under the License. #include - #include #include "src/core/lib/event_engine/default_event_engine.h" diff --git a/test/core/promise/cancel_callback_test.cc b/test/core/promise/cancel_callback_test.cc index 64ca6d0a8ce..3a674a009f6 100644 --- a/test/core/promise/cancel_callback_test.cc +++ b/test/core/promise/cancel_callback_test.cc @@ -18,7 +18,6 @@ #include #include "gtest/gtest.h" - #include "src/core/lib/promise/poll.h" namespace grpc_core { diff --git a/test/core/promise/event_engine_wakeup_scheduler_test.cc b/test/core/promise/event_engine_wakeup_scheduler_test.cc index 739c1a25f4e..4972de90245 100644 --- a/test/core/promise/event_engine_wakeup_scheduler_test.cc +++ b/test/core/promise/event_engine_wakeup_scheduler_test.cc @@ -14,16 +14,14 @@ #include "src/core/lib/promise/event_engine_wakeup_scheduler.h" +#include +#include #include #include #include "absl/status/status.h" #include "gtest/gtest.h" - -#include -#include - #include "src/core/lib/promise/activity.h" #include "src/core/lib/promise/poll.h" #include "src/core/util/notification.h" diff --git a/test/core/promise/exec_ctx_wakeup_scheduler_test.cc b/test/core/promise/exec_ctx_wakeup_scheduler_test.cc index 27d1c49bdb6..d7fb2449bc1 100644 --- a/test/core/promise/exec_ctx_wakeup_scheduler_test.cc +++ b/test/core/promise/exec_ctx_wakeup_scheduler_test.cc @@ -20,7 +20,6 @@ #include "absl/status/status.h" #include "gtest/gtest.h" - #include "src/core/lib/promise/activity.h" #include "src/core/lib/promise/poll.h" diff --git a/test/core/promise/for_each_test.cc b/test/core/promise/for_each_test.cc index ea0f63732c1..c1863b6e4ea 100644 --- a/test/core/promise/for_each_test.cc +++ b/test/core/promise/for_each_test.cc @@ -14,13 +14,12 @@ #include "src/core/lib/promise/for_each.h" +#include + #include #include "gmock/gmock.h" #include "gtest/gtest.h" - -#include - #include "src/core/lib/promise/activity.h" #include "src/core/lib/promise/inter_activity_pipe.h" #include "src/core/lib/promise/join.h" diff --git a/test/core/promise/inter_activity_latch_test.cc b/test/core/promise/inter_activity_latch_test.cc index 925062c561b..d71ce40cae5 100644 --- a/test/core/promise/inter_activity_latch_test.cc +++ b/test/core/promise/inter_activity_latch_test.cc @@ -14,11 +14,10 @@ #include "src/core/lib/promise/inter_activity_latch.h" -#include "absl/status/status.h" -#include "gtest/gtest.h" - #include +#include "absl/status/status.h" +#include "gtest/gtest.h" #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/promise/event_engine_wakeup_scheduler.h" #include "src/core/lib/promise/seq.h" diff --git a/test/core/promise/inter_activity_pipe_test.cc b/test/core/promise/inter_activity_pipe_test.cc index a81ac5c1822..6493ff35b2d 100644 --- a/test/core/promise/inter_activity_pipe_test.cc +++ b/test/core/promise/inter_activity_pipe_test.cc @@ -18,7 +18,6 @@ #include "absl/status/status.h" #include "gtest/gtest.h" - #include "src/core/lib/promise/seq.h" #include "test/core/promise/test_wakeup_schedulers.h" diff --git a/test/core/promise/interceptor_list_test.cc b/test/core/promise/interceptor_list_test.cc index d52ba611006..6797c4dfe5a 100644 --- a/test/core/promise/interceptor_list_test.cc +++ b/test/core/promise/interceptor_list_test.cc @@ -14,12 +14,11 @@ #include "src/core/lib/promise/interceptor_list.h" +#include + #include #include "gtest/gtest.h" - -#include - #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/lib/resource_quota/resource_quota.h" diff --git a/test/core/promise/join_test.cc b/test/core/promise/join_test.cc index 7e60d65732f..2fd6b21dc96 100644 --- a/test/core/promise/join_test.cc +++ b/test/core/promise/join_test.cc @@ -19,7 +19,6 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" - #include "src/core/lib/promise/poll.h" #include "test/core/promise/poll_matcher.h" diff --git a/test/core/promise/latch_test.cc b/test/core/promise/latch_test.cc index b1af24bd4bf..8fef26a0d40 100644 --- a/test/core/promise/latch_test.cc +++ b/test/core/promise/latch_test.cc @@ -20,7 +20,6 @@ #include "absl/status/status.h" #include "gmock/gmock.h" #include "gtest/gtest.h" - #include "src/core/lib/promise/activity.h" #include "src/core/lib/promise/join.h" #include "src/core/lib/promise/seq.h" diff --git a/test/core/promise/loop_test.cc b/test/core/promise/loop_test.cc index 42362327915..7ec3a1060ef 100644 --- a/test/core/promise/loop_test.cc +++ b/test/core/promise/loop_test.cc @@ -18,7 +18,6 @@ #include #include "gtest/gtest.h" - #include "src/core/lib/promise/seq.h" namespace grpc_core { diff --git a/test/core/promise/map_pipe_test.cc b/test/core/promise/map_pipe_test.cc index 5b702f2f8d0..5f891a36191 100644 --- a/test/core/promise/map_pipe_test.cc +++ b/test/core/promise/map_pipe_test.cc @@ -14,14 +14,13 @@ #include "src/core/lib/promise/map_pipe.h" +#include + #include #include #include "gmock/gmock.h" #include "gtest/gtest.h" - -#include - #include "src/core/lib/promise/activity.h" #include "src/core/lib/promise/for_each.h" #include "src/core/lib/promise/join.h" diff --git a/test/core/promise/map_test.cc b/test/core/promise/map_test.cc index 85697084084..cd6f373f3fe 100644 --- a/test/core/promise/map_test.cc +++ b/test/core/promise/map_test.cc @@ -18,7 +18,6 @@ #include "absl/functional/any_invocable.h" #include "gtest/gtest.h" - #include "src/core/lib/promise/promise.h" #include "test/core/promise/poll_matcher.h" diff --git a/test/core/promise/mpsc_test.cc b/test/core/promise/mpsc_test.cc index 0a486edff72..fd852b088de 100644 --- a/test/core/promise/mpsc_test.cc +++ b/test/core/promise/mpsc_test.cc @@ -14,15 +14,14 @@ #include "src/core/lib/promise/mpsc.h" +#include + #include #include #include "absl/types/optional.h" #include "gmock/gmock.h" #include "gtest/gtest.h" - -#include - #include "src/core/lib/promise/activity.h" #include "src/core/lib/promise/promise.h" #include "test/core/promise/poll_matcher.h" diff --git a/test/core/promise/observable_test.cc b/test/core/promise/observable_test.cc index 45fb438ebd1..8de6dd56812 100644 --- a/test/core/promise/observable_test.cc +++ b/test/core/promise/observable_test.cc @@ -14,6 +14,8 @@ #include "src/core/lib/promise/observable.h" +#include + #include #include #include @@ -22,9 +24,6 @@ #include "absl/strings/str_join.h" #include "gmock/gmock.h" #include "gtest/gtest.h" - -#include - #include "src/core/lib/promise/loop.h" #include "src/core/lib/promise/map.h" #include "src/core/util/notification.h" diff --git a/test/core/promise/party_test.cc b/test/core/promise/party_test.cc index 09075395bf4..540163333fa 100644 --- a/test/core/promise/party_test.cc +++ b/test/core/promise/party_test.cc @@ -14,6 +14,9 @@ #include "src/core/lib/promise/party.h" +#include +#include +#include #include #include @@ -25,11 +28,6 @@ #include "absl/base/thread_annotations.h" #include "absl/log/log.h" #include "gtest/gtest.h" - -#include -#include -#include - #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/event_engine/event_engine_context.h" #include "src/core/lib/iomgr/exec_ctx.h" diff --git a/test/core/promise/pipe_test.cc b/test/core/promise/pipe_test.cc index b74f29df2e8..d1cffb08d97 100644 --- a/test/core/promise/pipe_test.cc +++ b/test/core/promise/pipe_test.cc @@ -14,6 +14,9 @@ #include "src/core/lib/promise/pipe.h" +#include +#include + #include #include #include @@ -22,10 +25,6 @@ #include "absl/status/status.h" #include "gmock/gmock.h" #include "gtest/gtest.h" - -#include -#include - #include "src/core/lib/promise/activity.h" #include "src/core/lib/promise/join.h" #include "src/core/lib/promise/map.h" diff --git a/test/core/promise/prioritized_race_test.cc b/test/core/promise/prioritized_race_test.cc index c663fe041d0..53bc0830719 100644 --- a/test/core/promise/prioritized_race_test.cc +++ b/test/core/promise/prioritized_race_test.cc @@ -17,7 +17,6 @@ #include #include "gtest/gtest.h" - #include "src/core/lib/promise/poll.h" namespace grpc_core { diff --git a/test/core/promise/promise_factory_test.cc b/test/core/promise/promise_factory_test.cc index 3690d78e5cc..f6418c3ed47 100644 --- a/test/core/promise/promise_factory_test.cc +++ b/test/core/promise/promise_factory_test.cc @@ -16,7 +16,6 @@ #include "absl/functional/bind_front.h" #include "gtest/gtest.h" - #include "src/core/lib/promise/poll.h" namespace grpc_core { diff --git a/test/core/promise/promise_fuzzer.cc b/test/core/promise/promise_fuzzer.cc index 0b70153d023..28214f96f4b 100644 --- a/test/core/promise/promise_fuzzer.cc +++ b/test/core/promise/promise_fuzzer.cc @@ -23,7 +23,6 @@ #include "absl/log/check.h" #include "absl/status/status.h" #include "absl/types/optional.h" - #include "src/core/lib/promise/activity.h" #include "src/core/lib/promise/join.h" #include "src/core/lib/promise/map.h" diff --git a/test/core/promise/promise_mutex_test.cc b/test/core/promise/promise_mutex_test.cc index 9ef2c778d65..8bbadd03925 100644 --- a/test/core/promise/promise_mutex_test.cc +++ b/test/core/promise/promise_mutex_test.cc @@ -19,7 +19,6 @@ #include "absl/status/status.h" #include "gtest/gtest.h" - #include "src/core/lib/promise/activity.h" #include "src/core/lib/promise/join.h" #include "src/core/lib/promise/promise.h" diff --git a/test/core/promise/race_test.cc b/test/core/promise/race_test.cc index 16fbdb13d0a..4369fa81472 100644 --- a/test/core/promise/race_test.cc +++ b/test/core/promise/race_test.cc @@ -17,7 +17,6 @@ #include #include "gtest/gtest.h" - #include "src/core/lib/promise/poll.h" namespace grpc_core { diff --git a/test/core/promise/sleep_test.cc b/test/core/promise/sleep_test.cc index eaa816294da..842320d4eff 100644 --- a/test/core/promise/sleep_test.cc +++ b/test/core/promise/sleep_test.cc @@ -14,6 +14,8 @@ #include "src/core/lib/promise/sleep.h" +#include + #include #include #include @@ -23,9 +25,6 @@ #include "absl/log/log.h" #include "gmock/gmock.h" #include "gtest/gtest.h" - -#include - #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/event_engine/event_engine_context.h" #include "src/core/lib/iomgr/exec_ctx.h" diff --git a/test/core/promise/try_seq_metadata_test.cc b/test/core/promise/try_seq_metadata_test.cc index 34c74a83211..1f8c583a810 100644 --- a/test/core/promise/try_seq_metadata_test.cc +++ b/test/core/promise/try_seq_metadata_test.cc @@ -12,13 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - -#include "gtest/gtest.h" - #include #include +#include + +#include "gtest/gtest.h" #include "src/core/lib/promise/poll.h" #include "src/core/lib/promise/try_seq.h" #include "src/core/lib/transport/metadata_batch.h" diff --git a/test/core/promise/wait_for_callback_test.cc b/test/core/promise/wait_for_callback_test.cc index 25f5771379c..f710717ba78 100644 --- a/test/core/promise/wait_for_callback_test.cc +++ b/test/core/promise/wait_for_callback_test.cc @@ -16,7 +16,6 @@ #include "absl/status/status.h" #include "gtest/gtest.h" - #include "src/core/lib/promise/map.h" #include "src/core/util/notification.h" #include "test/core/promise/test_wakeup_schedulers.h" diff --git a/test/core/resolver/binder_resolver_test.cc b/test/core/resolver/binder_resolver_test.cc index 7f6d3b9f14c..fa8430fb11f 100644 --- a/test/core/resolver/binder_resolver_test.cc +++ b/test/core/resolver/binder_resolver_test.cc @@ -20,7 +20,6 @@ #include "absl/status/status.h" #include "absl/status/statusor.h" #include "gtest/gtest.h" - #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/iomgr/port.h" #include "src/core/lib/iomgr/resolved_address.h" @@ -43,10 +42,9 @@ #include #endif // GPR_WINDOWS -#include "absl/log/log.h" - #include +#include "absl/log/log.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/resolver/resolver_registry.h" diff --git a/test/core/resolver/dns_resolver_cooldown_test.cc b/test/core/resolver/dns_resolver_cooldown_test.cc index ad7b6a3a8c3..8682a1b2553 100644 --- a/test/core/resolver/dns_resolver_cooldown_test.cc +++ b/test/core/resolver/dns_resolver_cooldown_test.cc @@ -16,6 +16,13 @@ // // +#include +#include +#include +#include +#include +#include +#include #include #include @@ -29,15 +36,6 @@ #include "absl/status/statusor.h" #include "absl/strings/string_view.h" #include "gtest/gtest.h" - -#include -#include -#include -#include -#include -#include -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/event_engine/default_event_engine.h" diff --git a/test/core/resolver/dns_resolver_test.cc b/test/core/resolver/dns_resolver_test.cc index 4bf8a069c8b..9a80fbc2787 100644 --- a/test/core/resolver/dns_resolver_test.cc +++ b/test/core/resolver/dns_resolver_test.cc @@ -25,7 +25,6 @@ #include "absl/status/statusor.h" #include "absl/strings/string_view.h" #include "gtest/gtest.h" - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/config_vars.h" #include "src/core/lib/config/core_configuration.h" diff --git a/test/core/resolver/endpoint_addresses_test.cc b/test/core/resolver/endpoint_addresses_test.cc index dafb5a54aac..1d2c848aea2 100644 --- a/test/core/resolver/endpoint_addresses_test.cc +++ b/test/core/resolver/endpoint_addresses_test.cc @@ -16,6 +16,8 @@ #include "src/core/resolver/endpoint_addresses.h" +#include + #include #include "absl/log/check.h" @@ -23,9 +25,6 @@ #include "absl/strings/string_view.h" #include "gmock/gmock.h" #include "gtest/gtest.h" - -#include - #include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/iomgr/resolved_address.h" diff --git a/test/core/resolver/fake_resolver_test.cc b/test/core/resolver/fake_resolver_test.cc index 9b14b43d431..2f4b7621b39 100644 --- a/test/core/resolver/fake_resolver_test.cc +++ b/test/core/resolver/fake_resolver_test.cc @@ -18,6 +18,7 @@ #include "src/core/resolver/fake/fake_resolver.h" +#include #include #include @@ -34,9 +35,6 @@ #include "absl/strings/str_format.h" #include "absl/synchronization/notification.h" #include "gtest/gtest.h" - -#include - #include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" diff --git a/test/core/resolver/google_c2p_resolver_test.cc b/test/core/resolver/google_c2p_resolver_test.cc index 96ddc587c4e..52e9d57b5ae 100644 --- a/test/core/resolver/google_c2p_resolver_test.cc +++ b/test/core/resolver/google_c2p_resolver_test.cc @@ -14,6 +14,11 @@ // limitations under the License. // +#include +#include +#include +#include +#include #include #include @@ -25,13 +30,6 @@ #include "absl/strings/str_format.h" #include "gtest/gtest.h" - -#include -#include -#include -#include -#include - #include "src/core/util/env.h" #include "test/core/test_util/fake_udp_and_tcp_server.h" #include "test/core/test_util/port.h" diff --git a/test/core/resolver/sockaddr_resolver_test.cc b/test/core/resolver/sockaddr_resolver_test.cc index faf90400364..94559aca191 100644 --- a/test/core/resolver/sockaddr_resolver_test.cc +++ b/test/core/resolver/sockaddr_resolver_test.cc @@ -24,7 +24,6 @@ #include "absl/status/status.h" #include "absl/status/statusor.h" #include "gtest/gtest.h" - #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/iomgr/exec_ctx.h" diff --git a/test/core/resource_quota/arena_test.cc b/test/core/resource_quota/arena_test.cc index 997b7760d22..bac5cf13e6e 100644 --- a/test/core/resource_quota/arena_test.cc +++ b/test/core/resource_quota/arena_test.cc @@ -18,6 +18,8 @@ #include "src/core/lib/resource_quota/arena.h" +#include +#include #include #include @@ -31,10 +33,6 @@ #include "absl/strings/str_join.h" #include "gmock/gmock.h" #include "gtest/gtest.h" - -#include -#include - #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/resource_quota/resource_quota.h" #include "src/core/util/ref_counted_ptr.h" diff --git a/test/core/resource_quota/memory_quota_fuzzer.cc b/test/core/resource_quota/memory_quota_fuzzer.cc index 654f20e291a..a3296fb43fb 100644 --- a/test/core/resource_quota/memory_quota_fuzzer.cc +++ b/test/core/resource_quota/memory_quota_fuzzer.cc @@ -12,6 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include +#include +#include #include #include @@ -24,11 +27,6 @@ #include "absl/status/status.h" #include "absl/strings/str_cat.h" #include "absl/types/optional.h" - -#include -#include -#include - #include "src/core/lib/debug/trace.h" #include "src/core/lib/experiments/config.h" #include "src/core/lib/iomgr/closure.h" diff --git a/test/core/resource_quota/memory_quota_stress_test.cc b/test/core/resource_quota/memory_quota_stress_test.cc index a8086810cc7..eb8c66127d3 100644 --- a/test/core/resource_quota/memory_quota_stress_test.cc +++ b/test/core/resource_quota/memory_quota_stress_test.cc @@ -12,6 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include +#include #include #include @@ -29,10 +31,6 @@ #include "absl/strings/str_cat.h" #include "absl/types/optional.h" #include "gtest/gtest.h" - -#include -#include - #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/util/sync.h" diff --git a/test/core/resource_quota/memory_quota_test.cc b/test/core/resource_quota/memory_quota_test.cc index 245fe892c97..31993f03377 100644 --- a/test/core/resource_quota/memory_quota_test.cc +++ b/test/core/resource_quota/memory_quota_test.cc @@ -14,6 +14,9 @@ #include "src/core/lib/resource_quota/memory_quota.h" +#include +#include + #include #include #include @@ -23,10 +26,6 @@ #include #include "gtest/gtest.h" - -#include -#include - #include "src/core/lib/iomgr/exec_ctx.h" #include "test/core/resource_quota/call_checker.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/resource_quota/periodic_update_test.cc b/test/core/resource_quota/periodic_update_test.cc index 90d98913693..4ae6709e18d 100644 --- a/test/core/resource_quota/periodic_update_test.cc +++ b/test/core/resource_quota/periodic_update_test.cc @@ -14,6 +14,8 @@ #include "src/core/lib/resource_quota/periodic_update.h" +#include +#include #include #include @@ -21,10 +23,6 @@ #include #include "gtest/gtest.h" - -#include -#include - #include "src/core/lib/iomgr/exec_ctx.h" namespace grpc_core { diff --git a/test/core/resource_quota/resource_quota_test.cc b/test/core/resource_quota/resource_quota_test.cc index 3ea0046f773..c0dfd8da44e 100644 --- a/test/core/resource_quota/resource_quota_test.cc +++ b/test/core/resource_quota/resource_quota_test.cc @@ -15,7 +15,6 @@ #include "src/core/lib/resource_quota/resource_quota.h" #include "gtest/gtest.h" - #include "test/core/test_util/test_config.h" namespace grpc_core { diff --git a/test/core/security/alts_credentials_fuzzer.cc b/test/core/security/alts_credentials_fuzzer.cc index 9f76b2bf738..80d2a065a86 100644 --- a/test/core/security/alts_credentials_fuzzer.cc +++ b/test/core/security/alts_credentials_fuzzer.cc @@ -16,16 +16,14 @@ // // -#include - -#include "absl/log/check.h" - #include #include #include #include #include +#include +#include "absl/log/check.h" #include "src/core/lib/security/credentials/alts/alts_credentials.h" #include "src/core/lib/security/credentials/alts/check_gcp_environment.h" #include "src/core/lib/security/credentials/alts/grpc_alts_credentials_options.h" diff --git a/test/core/security/alts_security_connector_test.cc b/test/core/security/alts_security_connector_test.cc index 02a7cf5e1a4..f215eee5a78 100644 --- a/test/core/security/alts_security_connector_test.cc +++ b/test/core/security/alts_security_connector_test.cc @@ -18,17 +18,14 @@ #include "src/core/lib/security/security_connector/alts/alts_security_connector.h" +#include +#include +#include #include #include #include -#include - #include "absl/log/log.h" - -#include -#include - #include "src/core/lib/security/context/security_context.h" #include "src/core/lib/transport/transport.h" #include "src/core/tsi/alts/handshaker/alts_tsi_handshaker.h" diff --git a/test/core/security/auth_context_test.cc b/test/core/security/auth_context_test.cc index 9443712cc91..64efbb79590 100644 --- a/test/core/security/auth_context_test.cc +++ b/test/core/security/auth_context_test.cc @@ -16,12 +16,10 @@ // // -#include - #include +#include #include "absl/log/log.h" - #include "src/core/lib/security/context/security_context.h" #include "src/core/util/crash.h" #include "src/core/util/ref_counted_ptr.h" diff --git a/test/core/security/authorization_matchers_test.cc b/test/core/security/authorization_matchers_test.cc index 3ce899e2a36..9cc15c665be 100644 --- a/test/core/security/authorization_matchers_test.cc +++ b/test/core/security/authorization_matchers_test.cc @@ -12,13 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - #include -#include - #include #include +#include + +#include #include "src/core/lib/security/authorization/evaluate_args.h" #include "src/core/lib/security/authorization/matchers.h" diff --git a/test/core/security/aws_request_signer_test.cc b/test/core/security/aws_request_signer_test.cc index 89c2d962ee7..11d93f5580d 100644 --- a/test/core/security/aws_request_signer_test.cc +++ b/test/core/security/aws_request_signer_test.cc @@ -17,11 +17,9 @@ #include "src/core/lib/security/credentials/external/aws_request_signer.h" #include - -#include "absl/log/check.h" - #include +#include "absl/log/check.h" #include "test/core/test_util/test_config.h" namespace testing { diff --git a/test/core/security/certificate_provider_registry_test.cc b/test/core/security/certificate_provider_registry_test.cc index cca80deeb35..f4f1b48aa08 100644 --- a/test/core/security/certificate_provider_registry_test.cc +++ b/test/core/security/certificate_provider_registry_test.cc @@ -19,7 +19,6 @@ #include "src/core/lib/security/certificate_provider/certificate_provider_registry.h" #include - #include #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h" diff --git a/test/core/security/channel_creds_registry_test.cc b/test/core/security/channel_creds_registry_test.cc index 399e26a58ea..f2a207ce439 100644 --- a/test/core/security/channel_creds_registry_test.cc +++ b/test/core/security/channel_creds_registry_test.cc @@ -19,12 +19,10 @@ #include "src/core/lib/security/credentials/channel_creds_registry.h" #include +#include #include #include "absl/types/optional.h" - -#include - #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/security/credentials/composite/composite_credentials.h" #include "src/core/lib/security/credentials/fake/fake_credentials.h" diff --git a/test/core/security/check_gcp_environment_linux_test.cc b/test/core/security/check_gcp_environment_linux_test.cc index b4122a8051e..2730ca757fe 100644 --- a/test/core/security/check_gcp_environment_linux_test.cc +++ b/test/core/security/check_gcp_environment_linux_test.cc @@ -16,13 +16,11 @@ // // -#include -#include - -#include - #include #include +#include +#include +#include #include "src/core/lib/security/credentials/alts/check_gcp_environment.h" #include "src/core/util/crash.h" diff --git a/test/core/security/check_gcp_environment_windows_test.cc b/test/core/security/check_gcp_environment_windows_test.cc index 7d1db40d69f..7659144350a 100644 --- a/test/core/security/check_gcp_environment_windows_test.cc +++ b/test/core/security/check_gcp_environment_windows_test.cc @@ -16,13 +16,11 @@ // // -#include -#include - -#include - #include #include +#include +#include +#include #include "src/core/lib/security/credentials/alts/check_gcp_environment.h" #include "src/core/util/crash.h" diff --git a/test/core/security/create_jwt.cc b/test/core/security/create_jwt.cc index f4f84a4ff4b..7d6c1188557 100644 --- a/test/core/security/create_jwt.cc +++ b/test/core/security/create_jwt.cc @@ -16,12 +16,11 @@ // // -#include -#include - #include #include #include +#include +#include #include "src/core/lib/security/credentials/jwt/jwt_credentials.h" #include "src/core/util/crash.h" diff --git a/test/core/security/credentials_test.cc b/test/core/security/credentials_test.cc index da207a6474b..f075bb32f91 100644 --- a/test/core/security/credentials_test.cc +++ b/test/core/security/credentials_test.cc @@ -18,29 +18,26 @@ #include "src/core/lib/security/credentials/credentials.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include -#include -#include - #include "absl/log/check.h" #include "absl/log/log.h" #include "absl/strings/match.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" #include "absl/strings/str_replace.h" - -#include -#include -#include -#include -#include -#include -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/timer_manager.h" diff --git a/test/core/security/evaluate_args_test.cc b/test/core/security/evaluate_args_test.cc index 0599416a898..91c954b0406 100644 --- a/test/core/security/evaluate_args_test.cc +++ b/test/core/security/evaluate_args_test.cc @@ -15,9 +15,8 @@ #include "src/core/lib/security/authorization/evaluate_args.h" #include -#include - #include +#include #include "src/core/lib/address_utils/sockaddr_utils.h" #include "test/core/test_util/evaluate_args_test_util.h" diff --git a/test/core/security/fetch_oauth2.cc b/test/core/security/fetch_oauth2.cc index b99d41f9dce..35c34eb3ef8 100644 --- a/test/core/security/fetch_oauth2.cc +++ b/test/core/security/fetch_oauth2.cc @@ -16,12 +16,6 @@ // // -#include -#include - -#include "absl/log/check.h" -#include "absl/log/log.h" - #include #include #include @@ -29,7 +23,11 @@ #include #include #include +#include +#include +#include "absl/log/check.h" +#include "absl/log/log.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/util/json_util.h" diff --git a/test/core/security/grpc_alts_credentials_options_test.cc b/test/core/security/grpc_alts_credentials_options_test.cc index 77f41ef7a8d..7884aa87885 100644 --- a/test/core/security/grpc_alts_credentials_options_test.cc +++ b/test/core/security/grpc_alts_credentials_options_test.cc @@ -18,14 +18,12 @@ #include "src/core/lib/security/credentials/alts/grpc_alts_credentials_options.h" +#include +#include #include #include #include -#include - -#include - #include "src/core/util/crash.h" #define ALTS_CLIENT_OPTIONS_TEST_TARGET_SERVICE_ACCOUNT_1 "abc@google.com" diff --git a/test/core/security/grpc_audit_logging_test.cc b/test/core/security/grpc_audit_logging_test.cc index 415a6089fa9..d6113a68e91 100644 --- a/test/core/security/grpc_audit_logging_test.cc +++ b/test/core/security/grpc_audit_logging_test.cc @@ -16,21 +16,19 @@ // // +#include +#include +#include + #include #include -#include - #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/numbers.h" #include "absl/strings/string_view.h" #include "absl/time/clock.h" #include "absl/time/time.h" - -#include -#include - #include "src/core/lib/security/authorization/audit_logging.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_reader.h" diff --git a/test/core/security/grpc_authorization_engine_test.cc b/test/core/security/grpc_authorization_engine_test.cc index 03f6b7d6a0d..4535c9c1287 100644 --- a/test/core/security/grpc_authorization_engine_test.cc +++ b/test/core/security/grpc_authorization_engine_test.cc @@ -14,14 +14,13 @@ #include "src/core/lib/security/authorization/grpc_authorization_engine.h" -#include - #include -#include - #include #include #include +#include + +#include #include "src/core/lib/security/authorization/audit_logging.h" #include "src/core/util/json/json.h" diff --git a/test/core/security/grpc_authorization_policy_provider_test.cc b/test/core/security/grpc_authorization_policy_provider_test.cc index bf1c6d81a28..0af5f2db8c3 100644 --- a/test/core/security/grpc_authorization_policy_provider_test.cc +++ b/test/core/security/grpc_authorization_policy_provider_test.cc @@ -15,10 +15,9 @@ #include "src/core/lib/security/authorization/grpc_authorization_policy_provider.h" #include -#include - #include #include +#include #include "src/core/lib/security/authorization/grpc_authorization_engine.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/security/grpc_tls_certificate_distributor_test.cc b/test/core/security/grpc_tls_certificate_distributor_test.cc index c3459b22370..374969aeca1 100644 --- a/test/core/security/grpc_tls_certificate_distributor_test.cc +++ b/test/core/security/grpc_tls_certificate_distributor_test.cc @@ -16,19 +16,17 @@ #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.h" +#include +#include +#include +#include + #include #include #include #include -#include -#include - #include "absl/log/check.h" - -#include -#include - #include "src/core/lib/slice/slice_internal.h" #include "src/core/util/crash.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/security/grpc_tls_certificate_provider_test.cc b/test/core/security/grpc_tls_certificate_provider_test.cc index d0ce58ecafb..32f47d44d0c 100644 --- a/test/core/security/grpc_tls_certificate_provider_test.cc +++ b/test/core/security/grpc_tls_certificate_provider_test.cc @@ -16,18 +16,16 @@ #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h" -#include -#include - #include +#include +#include #include +#include +#include + #include "absl/log/check.h" #include "absl/status/status.h" - -#include -#include - #include "src/core/lib/slice/slice_internal.h" #include "src/core/util/crash.h" #include "src/core/util/tmpfile.h" diff --git a/test/core/security/grpc_tls_certificate_verifier_test.cc b/test/core/security/grpc_tls_certificate_verifier_test.cc index 162c2e3c367..deafd044262 100644 --- a/test/core/security/grpc_tls_certificate_verifier_test.cc +++ b/test/core/security/grpc_tls_certificate_verifier_test.cc @@ -16,17 +16,15 @@ #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_verifier.h" -#include -#include - #include -#include - -#include "absl/log/log.h" - #include #include +#include + +#include +#include +#include "absl/log/log.h" #include "src/core/lib/security/security_connector/tls/tls_security_connector.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/util/crash.h" diff --git a/test/core/security/grpc_tls_credentials_options_test.cc b/test/core/security/grpc_tls_credentials_options_test.cc index 8e2784c77d6..9064a430e0a 100644 --- a/test/core/security/grpc_tls_credentials_options_test.cc +++ b/test/core/security/grpc_tls_credentials_options_test.cc @@ -19,12 +19,11 @@ #include "src/core/lib/security/credentials/tls/grpc_tls_credentials_options.h" #include -#include - #include #include #include #include +#include #include "src/core/lib/config/config_vars.h" #include "src/core/lib/security/credentials/tls/tls_credentials.h" diff --git a/test/core/security/grpc_tls_crl_provider_test.cc b/test/core/security/grpc_tls_crl_provider_test.cc index d8bb630005d..6331283effb 100644 --- a/test/core/security/grpc_tls_crl_provider_test.cc +++ b/test/core/security/grpc_tls_crl_provider_test.cc @@ -18,23 +18,21 @@ #include "src/core/lib/security/credentials/tls/grpc_tls_crl_provider.h" +#include +#include +#include +#include + #include #include #include #include #include -#include - #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/str_split.h" #include "absl/strings/string_view.h" - -#include -#include -#include - #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/iomgr/timer_manager.h" #include "test/core/event_engine/event_engine_test_utils.h" diff --git a/test/core/security/insecure_security_connector_test.cc b/test/core/security/insecure_security_connector_test.cc index 31b175889e0..598ed8c5a83 100644 --- a/test/core/security/insecure_security_connector_test.cc +++ b/test/core/security/insecure_security_connector_test.cc @@ -19,9 +19,8 @@ #include "src/core/lib/security/security_connector/insecure/insecure_security_connector.h" #include -#include - #include +#include #include "src/core/lib/security/context/security_context.h" #include "src/core/lib/security/security_connector/ssl_utils.h" diff --git a/test/core/security/json_token_test.cc b/test/core/security/json_token_test.cc index 03569c4d1b5..f66bd7cb9e7 100644 --- a/test/core/security/json_token_test.cc +++ b/test/core/security/json_token_test.cc @@ -18,19 +18,16 @@ #include "src/core/lib/security/credentials/jwt/json_token.h" -#include - -#include -#include - -#include "absl/log/log.h" -#include "absl/strings/escaping.h" - #include #include #include #include +#include +#include +#include +#include "absl/log/log.h" +#include "absl/strings/escaping.h" #include "src/core/lib/security/credentials/oauth2/oauth2_credentials.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/util/crash.h" diff --git a/test/core/security/jwt_verifier_test.cc b/test/core/security/jwt_verifier_test.cc index 448dd57e7fc..7510ab738b7 100644 --- a/test/core/security/jwt_verifier_test.cc +++ b/test/core/security/jwt_verifier_test.cc @@ -18,17 +18,14 @@ #include "src/core/lib/security/credentials/jwt/jwt_verifier.h" -#include - -#include - -#include "absl/strings/escaping.h" - #include #include #include #include +#include +#include +#include "absl/strings/escaping.h" #include "src/core/lib/security/credentials/jwt/json_token.h" #include "src/core/util/crash.h" #include "src/core/util/http_client/httpcli.h" diff --git a/test/core/security/local_security_connector_test.cc b/test/core/security/local_security_connector_test.cc index 0470cd3bc1d..3975e148a6c 100644 --- a/test/core/security/local_security_connector_test.cc +++ b/test/core/security/local_security_connector_test.cc @@ -16,9 +16,8 @@ // // -#include - #include +#include #include "src/core/client_channel/client_channel_filter.h" #include "src/core/lib/security/context/security_context.h" diff --git a/test/core/security/oauth2_utils.cc b/test/core/security/oauth2_utils.cc index 6111bb25e61..66bd0968811 100644 --- a/test/core/security/oauth2_utils.cc +++ b/test/core/security/oauth2_utils.cc @@ -18,10 +18,6 @@ #include "test/core/security/oauth2_utils.h" -#include - -#include "absl/log/log.h" - #include #include #include @@ -29,7 +25,9 @@ #include #include #include +#include +#include "absl/log/log.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/promise/exec_ctx_wakeup_scheduler.h" #include "src/core/lib/promise/map.h" diff --git a/test/core/security/print_google_default_creds_token.cc b/test/core/security/print_google_default_creds_token.cc index 1d715fe18cd..dc6e10aa4d8 100644 --- a/test/core/security/print_google_default_creds_token.cc +++ b/test/core/security/print_google_default_creds_token.cc @@ -16,18 +16,16 @@ // // -#include -#include - -#include "absl/log/check.h" - #include #include #include #include #include #include +#include +#include +#include "absl/log/check.h" #include "src/core/lib/security/credentials/composite/composite_credentials.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/slice/slice_string_helpers.h" diff --git a/test/core/security/rbac_translator_test.cc b/test/core/security/rbac_translator_test.cc index 0d7a798da34..156696637af 100644 --- a/test/core/security/rbac_translator_test.cc +++ b/test/core/security/rbac_translator_test.cc @@ -14,16 +14,14 @@ #include "src/core/lib/security/authorization/rbac_translator.h" -#include - #include +#include #include +#include + #include "absl/strings/match.h" #include "absl/strings/string_view.h" - -#include - #include "src/core/lib/security/authorization/audit_logging.h" #include "src/core/util/crash.h" #include "src/core/util/json/json.h" diff --git a/test/core/security/secure_endpoint_test.cc b/test/core/security/secure_endpoint_test.cc index 6f4cd318820..c220ede196d 100644 --- a/test/core/security/secure_endpoint_test.cc +++ b/test/core/security/secure_endpoint_test.cc @@ -19,15 +19,12 @@ #include "src/core/handshaker/security/secure_endpoint.h" #include -#include - -#include - -#include "absl/log/log.h" - #include #include +#include +#include +#include "absl/log/log.h" #include "src/core/lib/iomgr/endpoint_pair.h" #include "src/core/lib/iomgr/iomgr.h" #include "src/core/lib/slice/slice_internal.h" diff --git a/test/core/security/security_connector_test.cc b/test/core/security/security_connector_test.cc index dfccc4b7abe..2716441b900 100644 --- a/test/core/security/security_connector_test.cc +++ b/test/core/security/security_connector_test.cc @@ -18,18 +18,15 @@ #include "src/core/lib/security/security_connector/security_connector.h" -#include -#include - -#include - -#include "absl/log/log.h" - #include #include #include #include +#include +#include +#include +#include "absl/log/log.h" #include "src/core/lib/config/config_vars.h" #include "src/core/lib/security/context/security_context.h" #include "src/core/lib/security/security_connector/ssl_utils.h" diff --git a/test/core/security/ssl_credentials_test.cc b/test/core/security/ssl_credentials_test.cc index 8e63303c8b8..49171f6c4c5 100644 --- a/test/core/security/ssl_credentials_test.cc +++ b/test/core/security/ssl_credentials_test.cc @@ -18,13 +18,11 @@ #include "src/core/lib/security/credentials/ssl/ssl_credentials.h" -#include -#include - -#include - #include #include +#include +#include +#include #include "src/core/lib/security/security_connector/ssl_utils.h" #include "src/core/tsi/ssl_transport_security.h" diff --git a/test/core/security/ssl_server_fuzzer.cc b/test/core/security/ssl_server_fuzzer.cc index 7ca9762c124..09c170fc44a 100644 --- a/test/core/security/ssl_server_fuzzer.cc +++ b/test/core/security/ssl_server_fuzzer.cc @@ -16,14 +16,13 @@ // // -#include "absl/log/check.h" -#include "absl/synchronization/notification.h" - #include #include #include #include +#include "absl/log/check.h" +#include "absl/synchronization/notification.h" #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/security_connector/security_connector.h" diff --git a/test/core/security/system_roots_test.cc b/test/core/security/system_roots_test.cc index 9d94185edfb..c5c840085da 100644 --- a/test/core/security/system_roots_test.cc +++ b/test/core/security/system_roots_test.cc @@ -16,9 +16,8 @@ // // -#include - #include +#include #if defined(GPR_LINUX) || defined(GPR_FREEBSD) || defined(GPR_APPLE) || \ defined(GPR_WINDOWS) @@ -27,12 +26,11 @@ #include #endif // GPR_LINUX || GPR_FREEBSD || GPR_APPLE -#include "gtest/gtest.h" - #include #include #include +#include "gtest/gtest.h" #include "src/core/lib/security/context/security_context.h" #include "src/core/lib/security/security_connector/load_system_roots.h" #include "src/core/lib/security/security_connector/load_system_roots_supported.h" diff --git a/test/core/security/tls_security_connector_test.cc b/test/core/security/tls_security_connector_test.cc index b2e933d6d16..16a498f6097 100644 --- a/test/core/security/tls_security_connector_test.cc +++ b/test/core/security/tls_security_connector_test.cc @@ -18,18 +18,15 @@ #include "src/core/lib/security/security_connector/tls/tls_security_connector.h" -#include -#include - #include -#include - -#include "absl/log/check.h" - #include #include #include +#include +#include +#include +#include "absl/log/check.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/config_vars.h" #include "src/core/lib/security/context/security_context.h" diff --git a/test/core/security/verify_jwt.cc b/test/core/security/verify_jwt.cc index b330c0dbf33..e977f2a8e06 100644 --- a/test/core/security/verify_jwt.cc +++ b/test/core/security/verify_jwt.cc @@ -16,17 +16,15 @@ // // -#include -#include - -#include "absl/log/check.h" - #include #include #include #include #include +#include +#include +#include "absl/log/check.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/pollset.h" #include "src/core/lib/security/credentials/jwt/jwt_verifier.h" diff --git a/test/core/security/xds_credentials_test.cc b/test/core/security/xds_credentials_test.cc index 2d485f8f733..5434720e55d 100644 --- a/test/core/security/xds_credentials_test.cc +++ b/test/core/security/xds_credentials_test.cc @@ -18,9 +18,8 @@ #include "src/core/lib/security/credentials/xds/xds_credentials.h" -#include - #include +#include #include "test/core/test_util/test_config.h" diff --git a/test/core/server/server_config_selector_test.cc b/test/core/server/server_config_selector_test.cc index 3bdf5a7dca0..3a023239285 100644 --- a/test/core/server/server_config_selector_test.cc +++ b/test/core/server/server_config_selector_test.cc @@ -18,11 +18,10 @@ #include "src/core/server/server_config_selector.h" -#include "absl/status/status.h" -#include "gtest/gtest.h" - #include +#include "absl/status/status.h" +#include "gtest/gtest.h" #include "src/core/lib/channel/channel_args.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/server/xds_channel_stack_modifier_test.cc b/test/core/server/xds_channel_stack_modifier_test.cc index 16f0e6e4e81..07569b8b93c 100644 --- a/test/core/server/xds_channel_stack_modifier_test.cc +++ b/test/core/server/xds_channel_stack_modifier_test.cc @@ -18,13 +18,12 @@ #include "src/core/server/xds_channel_stack_modifier.h" +#include + #include #include #include "gtest/gtest.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" diff --git a/test/core/service_config/service_config_test.cc b/test/core/service_config/service_config_test.cc index 24112d7732f..26a381084f9 100644 --- a/test/core/service_config/service_config_test.cc +++ b/test/core/service_config/service_config_test.cc @@ -16,6 +16,7 @@ #include "src/core/service_config/service_config.h" +#include #include #include @@ -27,9 +28,6 @@ #include "absl/types/optional.h" #include "gmock/gmock.h" #include "gtest/gtest.h" - -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/service_config/service_config_impl.h" diff --git a/test/core/slice/c_slice_buffer_test.cc b/test/core/slice/c_slice_buffer_test.cc index 2f2edb50dcf..105d96afd70 100644 --- a/test/core/slice/c_slice_buffer_test.cc +++ b/test/core/slice/c_slice_buffer_test.cc @@ -16,14 +16,12 @@ // // -#include - -#include "gtest/gtest.h" - #include #include #include +#include +#include "gtest/gtest.h" #include "src/core/lib/slice/slice_internal.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/slice/percent_decode_fuzzer.cc b/test/core/slice/percent_decode_fuzzer.cc index 9124c042434..e7f3f4e15de 100644 --- a/test/core/slice/percent_decode_fuzzer.cc +++ b/test/core/slice/percent_decode_fuzzer.cc @@ -16,11 +16,10 @@ // // +#include #include #include -#include - #include "src/core/lib/slice/percent_encoding.h" #include "src/core/lib/slice/slice.h" diff --git a/test/core/slice/percent_encode_fuzzer.cc b/test/core/slice/percent_encode_fuzzer.cc index 6deef7b8786..e6d10da820c 100644 --- a/test/core/slice/percent_encode_fuzzer.cc +++ b/test/core/slice/percent_encode_fuzzer.cc @@ -16,15 +16,13 @@ // // +#include #include #include #include #include "absl/log/check.h" - -#include - #include "src/core/lib/slice/percent_encoding.h" #include "src/core/lib/slice/slice.h" diff --git a/test/core/slice/percent_encoding_test.cc b/test/core/slice/percent_encoding_test.cc index 6d3534e539e..8ed0eac045c 100644 --- a/test/core/slice/percent_encoding_test.cc +++ b/test/core/slice/percent_encoding_test.cc @@ -18,6 +18,7 @@ #include "src/core/lib/slice/percent_encoding.h" +#include #include #include @@ -25,9 +26,6 @@ #include "absl/log/log.h" #include "gtest/gtest.h" - -#include - #include "src/core/lib/slice/slice_string_helpers.h" #include "src/core/util/string.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/slice/slice_buffer_test.cc b/test/core/slice/slice_buffer_test.cc index 08bcf0429b7..f2f3dc42293 100644 --- a/test/core/slice/slice_buffer_test.cc +++ b/test/core/slice/slice_buffer_test.cc @@ -14,6 +14,9 @@ #include "src/core/lib/slice/slice_buffer.h" +#include +#include +#include #include #include @@ -21,11 +24,6 @@ #include "absl/log/check.h" #include "gtest/gtest.h" - -#include -#include -#include - #include "src/core/lib/slice/slice.h" using ::grpc_core::Slice; diff --git a/test/core/slice/slice_string_helpers_test.cc b/test/core/slice/slice_string_helpers_test.cc index a158a382221..ed4dfa62b99 100644 --- a/test/core/slice/slice_string_helpers_test.cc +++ b/test/core/slice/slice_string_helpers_test.cc @@ -18,13 +18,12 @@ #include "src/core/lib/slice/slice_string_helpers.h" +#include + #include #include "absl/log/log.h" #include "gtest/gtest.h" - -#include - #include "src/core/util/string.h" static void expect_slice_dump(grpc_slice slice, uint32_t flags, diff --git a/test/core/slice/slice_test.cc b/test/core/slice/slice_test.cc index 1503e11abc7..734ece4db83 100644 --- a/test/core/slice/slice_test.cc +++ b/test/core/slice/slice_test.cc @@ -18,6 +18,8 @@ #include "src/core/lib/slice/slice.h" +#include +#include #include #include @@ -31,10 +33,6 @@ #include "absl/log/log.h" #include "absl/strings/string_view.h" #include "gtest/gtest.h" - -#include -#include - #include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/slice/slice_refcount.h" #include "src/core/util/memory.h" diff --git a/test/core/surface/byte_buffer_reader_test.cc b/test/core/surface/byte_buffer_reader_test.cc index 0f0ba7cec07..7dd5da279b4 100644 --- a/test/core/surface/byte_buffer_reader_test.cc +++ b/test/core/surface/byte_buffer_reader_test.cc @@ -16,19 +16,17 @@ // // -#include - -#include - -#include "absl/log/log.h" -#include "gtest/gtest.h" - #include #include #include #include #include +#include + +#include +#include "absl/log/log.h" +#include "gtest/gtest.h" #include "test/core/test_util/test_config.h" TEST(GrpcByteBufferReaderTest, TestReadOneSlice) { diff --git a/test/core/surface/channel_init_test.cc b/test/core/surface/channel_init_test.cc index 29eadfed9a4..334a87e83d0 100644 --- a/test/core/surface/channel_init_test.cc +++ b/test/core/surface/channel_init_test.cc @@ -20,7 +20,6 @@ #include "absl/strings/string_view.h" #include "gtest/gtest.h" - #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/channel/channel_stack_builder_impl.h" #include "src/core/lib/channel/promise_based_filter.h" diff --git a/test/core/surface/completion_queue_test.cc b/test/core/surface/completion_queue_test.cc index 9175196fa1a..2ded6ce64bf 100644 --- a/test/core/surface/completion_queue_test.cc +++ b/test/core/surface/completion_queue_test.cc @@ -18,6 +18,9 @@ #include "src/core/lib/surface/completion_queue.h" +#include +#include +#include #include #include @@ -25,11 +28,6 @@ #include "absl/log/log.h" #include "absl/status/status.h" #include "gtest/gtest.h" - -#include -#include -#include - #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/util/useful.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/surface/completion_queue_threading_test.cc b/test/core/surface/completion_queue_threading_test.cc index 3d6dbd1fc97..f9a95f1d56b 100644 --- a/test/core/surface/completion_queue_threading_test.cc +++ b/test/core/surface/completion_queue_threading_test.cc @@ -16,6 +16,10 @@ // // +#include +#include +#include +#include #include #include @@ -24,12 +28,6 @@ #include "absl/log/log.h" #include "absl/status/status.h" #include "gtest/gtest.h" - -#include -#include -#include -#include - #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/surface/completion_queue.h" #include "src/core/util/crash.h" diff --git a/test/core/surface/concurrent_connectivity_test.cc b/test/core/surface/concurrent_connectivity_test.cc index 329dd0ef286..ff6edf5d877 100644 --- a/test/core/surface/concurrent_connectivity_test.cc +++ b/test/core/surface/concurrent_connectivity_test.cc @@ -16,6 +16,12 @@ // // +#include +#include +#include +#include +#include +#include #include #include @@ -26,14 +32,6 @@ #include "absl/log/log.h" #include "absl/strings/str_cat.h" #include "gtest/gtest.h" - -#include -#include -#include -#include -#include -#include - #include "src/core/lib/channel/channel_args_preconditioning.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/event_engine/channel_args_endpoint_config.h" diff --git a/test/core/surface/init_test.cc b/test/core/surface/init_test.cc index 58d0347a2bb..bff6d0564f6 100644 --- a/test/core/surface/init_test.cc +++ b/test/core/surface/init_test.cc @@ -18,16 +18,15 @@ #include "src/core/lib/surface/init.h" +#include +#include + #include #include #include "absl/time/clock.h" #include "absl/time/time.h" #include "gtest/gtest.h" - -#include -#include - #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/util/thd.h" diff --git a/test/core/surface/lame_client_test.cc b/test/core/surface/lame_client_test.cc index c81f2492c2b..f2fb59585a7 100644 --- a/test/core/surface/lame_client_test.cc +++ b/test/core/surface/lame_client_test.cc @@ -16,19 +16,17 @@ // // -#include - -#include - -#include "absl/status/status.h" -#include "gtest/gtest.h" - #include #include #include #include #include +#include + +#include +#include "absl/status/status.h" +#include "gtest/gtest.h" #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/experiments/experiments.h" diff --git a/test/core/surface/num_external_connectivity_watchers_test.cc b/test/core/surface/num_external_connectivity_watchers_test.cc index 8eeb546e35b..f718ccef780 100644 --- a/test/core/surface/num_external_connectivity_watchers_test.cc +++ b/test/core/surface/num_external_connectivity_watchers_test.cc @@ -16,20 +16,18 @@ // // -#include - -#include - -#include "absl/log/log.h" -#include "gtest/gtest.h" - #include #include #include #include #include #include +#include + +#include +#include "absl/log/log.h" +#include "gtest/gtest.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" diff --git a/test/core/surface/secure_channel_create_test.cc b/test/core/surface/secure_channel_create_test.cc index baa1e8d05d1..54f2ece9629 100644 --- a/test/core/surface/secure_channel_create_test.cc +++ b/test/core/surface/secure_channel_create_test.cc @@ -15,12 +15,11 @@ // // +#include + #include #include "gtest/gtest.h" - -#include - #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/config/core_configuration.h" diff --git a/test/core/surface/sequential_connectivity_test.cc b/test/core/surface/sequential_connectivity_test.cc index ab6dfe4b1a6..e6467316c96 100644 --- a/test/core/surface/sequential_connectivity_test.cc +++ b/test/core/surface/sequential_connectivity_test.cc @@ -16,6 +16,12 @@ // // +#include +#include +#include +#include +#include +#include #include #include @@ -24,14 +30,6 @@ #include "absl/log/log.h" #include "gtest/gtest.h" - -#include -#include -#include -#include -#include -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/iomgr/error.h" #include "src/core/util/host_port.h" diff --git a/test/core/surface/server_chttp2_test.cc b/test/core/surface/server_chttp2_test.cc index 359af60ff28..214175f7a0c 100644 --- a/test/core/surface/server_chttp2_test.cc +++ b/test/core/surface/server_chttp2_test.cc @@ -16,16 +16,15 @@ // // -#include - -#include "gtest/gtest.h" - #include #include #include #include #include +#include + +#include "gtest/gtest.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/security/credentials/fake/fake_credentials.h" #include "src/core/util/host_port.h" diff --git a/test/core/surface/server_test.cc b/test/core/surface/server_test.cc index ec58b556a7f..67600a4ddf5 100644 --- a/test/core/surface/server_test.cc +++ b/test/core/surface/server_test.cc @@ -16,6 +16,11 @@ // // +#include +#include +#include +#include +#include #include #include @@ -26,13 +31,6 @@ #include "absl/status/statusor.h" #include "absl/strings/str_cat.h" #include "gtest/gtest.h" - -#include -#include -#include -#include -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/iomgr/resolve_address.h" #include "src/core/lib/iomgr/resolved_address.h" diff --git a/test/core/telemetry/call_tracer_test.cc b/test/core/telemetry/call_tracer_test.cc index 688a5114156..fbc8892485b 100644 --- a/test/core/telemetry/call_tracer_test.cc +++ b/test/core/telemetry/call_tracer_test.cc @@ -18,13 +18,12 @@ #include "src/core/telemetry/call_tracer.h" -#include - -#include "gtest/gtest.h" - #include #include +#include + +#include "gtest/gtest.h" #include "src/core/lib/promise/context.h" #include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/lib/resource_quota/resource_quota.h" diff --git a/test/core/telemetry/metrics_test.cc b/test/core/telemetry/metrics_test.cc index 8c492cb698f..ad139096e14 100644 --- a/test/core/telemetry/metrics_test.cc +++ b/test/core/telemetry/metrics_test.cc @@ -19,7 +19,6 @@ #include "absl/log/log.h" #include "gmock/gmock.h" #include "gtest/gtest.h" - #include "src/core/lib/event_engine/channel_args_endpoint_config.h" #include "test/core/test_util/fake_stats_plugin.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/telemetry/stats_test.cc b/test/core/telemetry/stats_test.cc index 8f6a2f10960..9655d50eec1 100644 --- a/test/core/telemetry/stats_test.cc +++ b/test/core/telemetry/stats_test.cc @@ -18,13 +18,12 @@ #include "src/core/telemetry/stats.h" +#include + #include #include #include "gtest/gtest.h" - -#include - #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/telemetry/stats_data.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/telemetry/trace_flags_test.cc b/test/core/telemetry/trace_flags_test.cc index 06472794ba7..b23ccf3d7fb 100644 --- a/test/core/telemetry/trace_flags_test.cc +++ b/test/core/telemetry/trace_flags_test.cc @@ -12,11 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "absl/strings/match.h" -#include "gtest/gtest.h" - #include +#include "absl/strings/match.h" +#include "gtest/gtest.h" #include "src/core/lib/debug/trace.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/test_util/audit_logging_utils.cc b/test/core/test_util/audit_logging_utils.cc index 492cbb3312d..a4ff7768345 100644 --- a/test/core/test_util/audit_logging_utils.cc +++ b/test/core/test_util/audit_logging_utils.cc @@ -16,6 +16,10 @@ #include "test/core/test_util/audit_logging_utils.h" +#include +#include +#include + #include #include #include @@ -23,11 +27,6 @@ #include "absl/status/statusor.h" #include "absl/strings/string_view.h" - -#include -#include -#include - #include "src/core/util/json/json_writer.h" namespace grpc_core { diff --git a/test/core/test_util/audit_logging_utils.h b/test/core/test_util/audit_logging_utils.h index 6e46119bc36..4c119e11412 100644 --- a/test/core/test_util/audit_logging_utils.h +++ b/test/core/test_util/audit_logging_utils.h @@ -17,6 +17,10 @@ #ifndef GRPC_TEST_CORE_TEST_UTIL_AUDIT_LOGGING_UTILS_H #define GRPC_TEST_CORE_TEST_UTIL_AUDIT_LOGGING_UTILS_H +#include +#include +#include + #include #include #include @@ -24,10 +28,6 @@ #include "absl/status/statusor.h" #include "absl/strings/string_view.h" -#include -#include -#include - namespace grpc_core { namespace testing { diff --git a/test/core/test_util/cmdline.cc b/test/core/test_util/cmdline.cc index b22d0767c09..c4bcb299144 100644 --- a/test/core/test_util/cmdline.cc +++ b/test/core/test_util/cmdline.cc @@ -18,6 +18,7 @@ #include "test/core/test_util/cmdline.h" +#include #include #include #include @@ -30,9 +31,6 @@ #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" #include "absl/strings/str_join.h" - -#include - #include "src/core/util/memory.h" typedef enum { ARGTYPE_INT, ARGTYPE_BOOL, ARGTYPE_STRING } argtype; diff --git a/test/core/test_util/cmdline.h b/test/core/test_util/cmdline.h index d118d6a9412..91915d7551c 100644 --- a/test/core/test_util/cmdline.h +++ b/test/core/test_util/cmdline.h @@ -19,12 +19,12 @@ #ifndef GRPC_TEST_CORE_TEST_UTIL_CMDLINE_H #define GRPC_TEST_CORE_TEST_UTIL_CMDLINE_H +#include + #include #include "absl/log/log.h" -#include - /// Simple command line parser. /// Supports flags that can be specified as -foo, --foo, --no-foo, -no-foo, etc diff --git a/test/core/test_util/cmdline_test.cc b/test/core/test_util/cmdline_test.cc index c292c768fbc..b94ade30dfa 100644 --- a/test/core/test_util/cmdline_test.cc +++ b/test/core/test_util/cmdline_test.cc @@ -22,7 +22,6 @@ #include "absl/log/log.h" #include "gtest/gtest.h" - #include "src/core/util/useful.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/test_util/evaluate_args_test_util.h b/test/core/test_util/evaluate_args_test_util.h index 2d681d3b50f..f53aee93022 100644 --- a/test/core/test_util/evaluate_args_test_util.h +++ b/test/core/test_util/evaluate_args_test_util.h @@ -15,16 +15,14 @@ #ifndef GRPC_TEST_CORE_TEST_UTIL_EVALUATE_ARGS_TEST_UTIL_H #define GRPC_TEST_CORE_TEST_UTIL_EVALUATE_ARGS_TEST_UTIL_H +#include +#include +#include #include #include #include "absl/strings/string_view.h" - -#include -#include -#include - #include "src/core/handshaker/endpoint_info/endpoint_info_handshaker.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/resource_quota/arena.h" diff --git a/test/core/test_util/fake_stats_plugin.cc b/test/core/test_util/fake_stats_plugin.cc index 3ce9431cd66..74d7dcecc1f 100644 --- a/test/core/test_util/fake_stats_plugin.cc +++ b/test/core/test_util/fake_stats_plugin.cc @@ -15,7 +15,6 @@ #include "test/core/test_util/fake_stats_plugin.h" #include "absl/log/check.h" - #include "src/core/lib/config/core_configuration.h" namespace grpc_core { diff --git a/test/core/test_util/fake_stats_plugin.h b/test/core/test_util/fake_stats_plugin.h index 4c60f0735fb..983213e71de 100644 --- a/test/core/test_util/fake_stats_plugin.h +++ b/test/core/test_util/fake_stats_plugin.h @@ -28,7 +28,6 @@ #include "absl/types/optional.h" #include "absl/types/span.h" #include "gmock/gmock.h" - #include "src/core/lib/channel/promise_based_filter.h" #include "src/core/telemetry/call_tracer.h" #include "src/core/telemetry/metrics.h" diff --git a/test/core/test_util/fake_udp_and_tcp_server.cc b/test/core/test_util/fake_udp_and_tcp_server.cc index 68cc354b7a4..92118fa248e 100644 --- a/test/core/test_util/fake_udp_and_tcp_server.cc +++ b/test/core/test_util/fake_udp_and_tcp_server.cc @@ -17,6 +17,8 @@ #include "test/core/test_util/fake_udp_and_tcp_server.h" #include +#include +#include #include #include @@ -27,10 +29,6 @@ #include "absl/log/log.h" #include "absl/status/statusor.h" #include "absl/strings/str_cat.h" - -#include -#include - #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/iomgr/resolved_address.h" #include "src/core/lib/iomgr/sockaddr.h" diff --git a/test/core/test_util/fake_udp_and_tcp_server.h b/test/core/test_util/fake_udp_and_tcp_server.h index 3032f254f26..35a54471723 100644 --- a/test/core/test_util/fake_udp_and_tcp_server.h +++ b/test/core/test_util/fake_udp_and_tcp_server.h @@ -17,14 +17,14 @@ #ifndef GRPC_TEST_CORE_TEST_UTIL_FAKE_UDP_AND_TCP_SERVER_H #define GRPC_TEST_CORE_TEST_UTIL_FAKE_UDP_AND_TCP_SERVER_H +#include +#include + #include #include #include #include -#include -#include - namespace grpc_core { namespace testing { diff --git a/test/core/test_util/fuzz_config_vars_helpers.cc b/test/core/test_util/fuzz_config_vars_helpers.cc index 9029fdfd665..60075e0dee1 100644 --- a/test/core/test_util/fuzz_config_vars_helpers.cc +++ b/test/core/test_util/fuzz_config_vars_helpers.cc @@ -20,7 +20,6 @@ #include #include "absl/strings/str_join.h" - #include "src/core/lib/experiments/config.h" #include "src/core/lib/experiments/experiments.h" diff --git a/test/core/test_util/fuzz_config_vars_helpers.h b/test/core/test_util/fuzz_config_vars_helpers.h index 05edc5dc4b9..1601f49775f 100644 --- a/test/core/test_util/fuzz_config_vars_helpers.h +++ b/test/core/test_util/fuzz_config_vars_helpers.h @@ -15,12 +15,11 @@ #ifndef GRPC_TEST_CORE_TEST_UTIL_FUZZ_CONFIG_VARS_HELPERS_H #define GRPC_TEST_CORE_TEST_UTIL_FUZZ_CONFIG_VARS_HELPERS_H +#include #include #include -#include - namespace grpc_core { std::string ValidateExperimentsStringForFuzzing(uint64_t experiments); diff --git a/test/core/test_util/fuzzer_corpus_test.cc b/test/core/test_util/fuzzer_corpus_test.cc index 3eaef693f10..a80eff40bf4 100644 --- a/test/core/test_util/fuzzer_corpus_test.cc +++ b/test/core/test_util/fuzzer_corpus_test.cc @@ -17,6 +17,8 @@ // #include +#include +#include #include #include #include @@ -31,10 +33,6 @@ #include "absl/log/log.h" #include "absl/types/optional.h" #include "gtest/gtest.h" - -#include -#include - #include "src/core/lib/iomgr/error.h" #include "src/core/util/env.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/test_util/fuzzer_util.cc b/test/core/test_util/fuzzer_util.cc index 5e55638af7e..05301487575 100644 --- a/test/core/test_util/fuzzer_util.cc +++ b/test/core/test_util/fuzzer_util.cc @@ -18,12 +18,11 @@ #include "test/core/test_util/fuzzer_util.h" +#include #include #include -#include - namespace grpc_core { namespace testing { diff --git a/test/core/test_util/fuzzing_channel_args.h b/test/core/test_util/fuzzing_channel_args.h index 83cb5497bd3..cae31e99eb7 100644 --- a/test/core/test_util/fuzzing_channel_args.h +++ b/test/core/test_util/fuzzing_channel_args.h @@ -15,10 +15,10 @@ #ifndef GRPC_TEST_CORE_TEST_UTIL_FUZZING_CHANNEL_ARGS_H #define GRPC_TEST_CORE_TEST_UTIL_FUZZING_CHANNEL_ARGS_H -#include - #include +#include + #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/resource_quota/resource_quota.h" #include "src/core/util/ref_counted_ptr.h" diff --git a/test/core/test_util/histogram.cc b/test/core/test_util/histogram.cc index c1b88b99268..d94e78dc990 100644 --- a/test/core/test_util/histogram.cc +++ b/test/core/test_util/histogram.cc @@ -18,14 +18,12 @@ #include "test/core/test_util/histogram.h" +#include +#include #include #include #include "absl/log/check.h" - -#include -#include - #include "src/core/util/useful.h" // Histograms are stored with exponentially increasing bucket sizes. diff --git a/test/core/test_util/histogram.h b/test/core/test_util/histogram.h index d3e6ba52b40..98523fb61d8 100644 --- a/test/core/test_util/histogram.h +++ b/test/core/test_util/histogram.h @@ -19,11 +19,10 @@ #ifndef GRPC_TEST_CORE_TEST_UTIL_HISTOGRAM_H #define GRPC_TEST_CORE_TEST_UTIL_HISTOGRAM_H +#include #include #include -#include - #ifdef __cplusplus extern "C" { #endif diff --git a/test/core/test_util/mock_endpoint.cc b/test/core/test_util/mock_endpoint.cc index 8d16b2293ee..5706d8cedc3 100644 --- a/test/core/test_util/mock_endpoint.cc +++ b/test/core/test_util/mock_endpoint.cc @@ -18,16 +18,15 @@ #include "test/core/test_util/mock_endpoint.h" +#include +#include +#include + #include #include "absl/log/check.h" #include "absl/status/status.h" #include "absl/strings/string_view.h" - -#include -#include -#include - #include "src/core/lib/event_engine/tcp_socket_utils.h" #include "src/core/lib/iomgr/event_engine_shims/endpoint.h" #include "src/core/util/down_cast.h" diff --git a/test/core/test_util/mock_endpoint.h b/test/core/test_util/mock_endpoint.h index 901b21eedd6..ccc8d74af28 100644 --- a/test/core/test_util/mock_endpoint.h +++ b/test/core/test_util/mock_endpoint.h @@ -19,11 +19,11 @@ #ifndef GRPC_TEST_CORE_TEST_UTIL_MOCK_ENDPOINT_H #define GRPC_TEST_CORE_TEST_UTIL_MOCK_ENDPOINT_H -#include - #include #include +#include + #include "src/core/lib/iomgr/endpoint.h" namespace grpc_event_engine { diff --git a/test/core/test_util/one_corpus_entry_fuzzer.cc b/test/core/test_util/one_corpus_entry_fuzzer.cc index d6cbe2b6827..71325b589fc 100644 --- a/test/core/test_util/one_corpus_entry_fuzzer.cc +++ b/test/core/test_util/one_corpus_entry_fuzzer.cc @@ -16,12 +16,10 @@ // // +#include #include #include "absl/log/check.h" - -#include - #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/util/crash.h" #include "test/core/test_util/tls_utils.h" diff --git a/test/core/test_util/parse_hexstring.cc b/test/core/test_util/parse_hexstring.cc index 0ede85e2c09..4468f9d97ce 100644 --- a/test/core/test_util/parse_hexstring.cc +++ b/test/core/test_util/parse_hexstring.cc @@ -18,13 +18,12 @@ #include "test/core/test_util/parse_hexstring.h" +#include #include #include #include "absl/log/check.h" -#include - namespace grpc_core { Slice ParseHexstring(absl::string_view hexstring) { size_t nibbles = 0; diff --git a/test/core/test_util/parse_hexstring.h b/test/core/test_util/parse_hexstring.h index fe50f9bf959..d43f0148031 100644 --- a/test/core/test_util/parse_hexstring.h +++ b/test/core/test_util/parse_hexstring.h @@ -20,7 +20,6 @@ #define GRPC_TEST_CORE_TEST_UTIL_PARSE_HEXSTRING_H #include "absl/strings/string_view.h" - #include "src/core/lib/slice/slice.h" namespace grpc_core { diff --git a/test/core/test_util/passthrough_endpoint.h b/test/core/test_util/passthrough_endpoint.h index cf8abe834d1..b8fe820f6e4 100644 --- a/test/core/test_util/passthrough_endpoint.h +++ b/test/core/test_util/passthrough_endpoint.h @@ -15,10 +15,10 @@ #ifndef GRPC_TEST_CORE_TEST_UTIL_PASSTHROUGH_ENDPOINT_H #define GRPC_TEST_CORE_TEST_UTIL_PASSTHROUGH_ENDPOINT_H -#include - #include +#include + #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/event_engine/tcp_socket_utils.h" #include "src/core/util/ref_counted.h" diff --git a/test/core/test_util/port.cc b/test/core/test_util/port.cc index 3a5a04bf117..bac509ee232 100644 --- a/test/core/test_util/port.cc +++ b/test/core/test_util/port.cc @@ -18,17 +18,15 @@ #include "src/core/lib/iomgr/port.h" +#include +#include +#include #include #include #include #include "absl/log/check.h" - -#include -#include -#include - #include "src/core/util/sync.h" #include "test/core/test_util/port.h" #include "test/core/test_util/port_server_client.h" diff --git a/test/core/test_util/port_isolated_runtime_environment.cc b/test/core/test_util/port_isolated_runtime_environment.cc index 57fa3865112..8c429df1e66 100644 --- a/test/core/test_util/port_isolated_runtime_environment.cc +++ b/test/core/test_util/port_isolated_runtime_environment.cc @@ -22,13 +22,11 @@ // runs in a separate container) the framework takes a round-robin pick of a // port within certain range. There is no need to recycle ports. // -#include - -#include "absl/log/check.h" - #include #include +#include +#include "absl/log/check.h" #include "src/core/lib/iomgr/port.h" #include "src/core/util/crash.h" #include "test/core/test_util/port.h" diff --git a/test/core/test_util/port_server_client.cc b/test/core/test_util/port_server_client.cc index 5a8b4d4d2ed..65287efbe48 100644 --- a/test/core/test_util/port_server_client.cc +++ b/test/core/test_util/port_server_client.cc @@ -18,6 +18,13 @@ #include "test/core/test_util/port_server_client.h" +#include +#include +#include +#include +#include +#include +#include #include #include #include @@ -31,15 +38,6 @@ #include "absl/log/log.h" #include "absl/status/statusor.h" #include "absl/strings/str_format.h" - -#include -#include -#include -#include -#include -#include -#include - #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" diff --git a/test/core/test_util/proto_bit_gen.h b/test/core/test_util/proto_bit_gen.h index 3732acca2a2..5f307ab7363 100644 --- a/test/core/test_util/proto_bit_gen.h +++ b/test/core/test_util/proto_bit_gen.h @@ -15,6 +15,7 @@ #ifndef GRPC_TEST_CORE_TEST_UTIL_PROTO_BIT_GEN_H #define GRPC_TEST_CORE_TEST_UTIL_PROTO_BIT_GEN_H +#include #include #include @@ -22,8 +23,6 @@ #include #include -#include - namespace grpc_core { // Set of random numbers from a proto file (or other container) forming a bit diff --git a/test/core/test_util/reconnect_server.cc b/test/core/test_util/reconnect_server.cc index 871c1298f8b..478e078cecd 100644 --- a/test/core/test_util/reconnect_server.cc +++ b/test/core/test_util/reconnect_server.cc @@ -18,14 +18,12 @@ #include "test/core/test_util/reconnect_server.h" +#include +#include #include #include "absl/log/log.h" #include "absl/strings/string_view.h" - -#include -#include - #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/iomgr_fwd.h" diff --git a/test/core/test_util/reconnect_server.h b/test/core/test_util/reconnect_server.h index d04661c9c6e..018362985d7 100644 --- a/test/core/test_util/reconnect_server.h +++ b/test/core/test_util/reconnect_server.h @@ -19,10 +19,10 @@ #ifndef GRPC_TEST_CORE_TEST_UTIL_RECONNECT_SERVER_H #define GRPC_TEST_CORE_TEST_UTIL_RECONNECT_SERVER_H -#include - #include +#include + #include "test/core/test_util/test_tcp_server.h" typedef struct timestamp_list { diff --git a/test/core/test_util/resolve_localhost_ip46.cc b/test/core/test_util/resolve_localhost_ip46.cc index ba58738b8e4..c2cb8077407 100644 --- a/test/core/test_util/resolve_localhost_ip46.cc +++ b/test/core/test_util/resolve_localhost_ip46.cc @@ -18,15 +18,14 @@ #include "test/core/test_util/resolve_localhost_ip46.h" +#include + #include #include #include "absl/log/check.h" #include "absl/status/statusor.h" #include "absl/strings/str_cat.h" - -#include - #include "src/core/lib/iomgr/resolve_address.h" #include "src/core/lib/iomgr/resolved_address.h" #include "src/core/lib/iomgr/sockaddr.h" diff --git a/test/core/test_util/slice_splitter.cc b/test/core/test_util/slice_splitter.cc index 0190255bc44..e2211e152ff 100644 --- a/test/core/test_util/slice_splitter.cc +++ b/test/core/test_util/slice_splitter.cc @@ -18,14 +18,13 @@ #include "test/core/test_util/slice_splitter.h" +#include +#include #include #include #include -#include -#include - const char* grpc_slice_split_mode_name(grpc_slice_split_mode mode) { switch (mode) { case GRPC_SLICE_SPLIT_IDENTITY: diff --git a/test/core/test_util/slice_splitter.h b/test/core/test_util/slice_splitter.h index 8af3dc7ac8e..90e8107db53 100644 --- a/test/core/test_util/slice_splitter.h +++ b/test/core/test_util/slice_splitter.h @@ -22,9 +22,8 @@ // utility function to split/merge slices together to help create test // cases -#include - #include +#include typedef enum { // merge all input slices into a single slice diff --git a/test/core/test_util/socket_use_after_close_detector.cc b/test/core/test_util/socket_use_after_close_detector.cc index 8d2c77b2555..546936d4122 100644 --- a/test/core/test_util/socket_use_after_close_detector.cc +++ b/test/core/test_util/socket_use_after_close_detector.cc @@ -20,13 +20,14 @@ #include #include -#include - #include +#include // IWYU pragma: no_include // IWYU pragma: no_include +#include + #include #include #include @@ -35,9 +36,6 @@ #include "absl/log/log.h" #include "gtest/gtest.h" - -#include - #include "src/core/lib/iomgr/sockaddr.h" #include "test/core/test_util/port.h" diff --git a/test/core/test_util/socket_use_after_close_detector.h b/test/core/test_util/socket_use_after_close_detector.h index 67e7b2e73bd..36b333b82ee 100644 --- a/test/core/test_util/socket_use_after_close_detector.h +++ b/test/core/test_util/socket_use_after_close_detector.h @@ -19,12 +19,12 @@ #ifndef GRPC_TEST_CORE_TEST_UTIL_SOCKET_USE_AFTER_CLOSE_DETECTOR_H #define GRPC_TEST_CORE_TEST_UTIL_SOCKET_USE_AFTER_CLOSE_DETECTOR_H -#include -#include - #include #include +#include +#include + namespace grpc_core { namespace testing { diff --git a/test/core/test_util/stack_tracer.cc b/test/core/test_util/stack_tracer.cc index 305a43c8fc4..979e5dad534 100644 --- a/test/core/test_util/stack_tracer.cc +++ b/test/core/test_util/stack_tracer.cc @@ -18,14 +18,13 @@ #include "test/core/test_util/stack_tracer.h" +#include + #include #include #include "absl/debugging/stacktrace.h" #include "absl/debugging/symbolize.h" - -#include - #include "src/core/util/examine_stack.h" namespace { diff --git a/test/core/test_util/stack_tracer.h b/test/core/test_util/stack_tracer.h index 82870cbe770..e1b231862d8 100644 --- a/test/core/test_util/stack_tracer.h +++ b/test/core/test_util/stack_tracer.h @@ -19,10 +19,10 @@ #ifndef GRPC_TEST_CORE_TEST_UTIL_STACK_TRACER_H #define GRPC_TEST_CORE_TEST_UTIL_STACK_TRACER_H -#include - #include +#include + namespace grpc_core { namespace testing { diff --git a/test/core/test_util/stack_tracer_test.cc b/test/core/test_util/stack_tracer_test.cc index 701ffaddbfe..36039e2ac27 100644 --- a/test/core/test_util/stack_tracer_test.cc +++ b/test/core/test_util/stack_tracer_test.cc @@ -23,7 +23,6 @@ #include "absl/log/log.h" #include "absl/strings/match.h" #include "gtest/gtest.h" - #include "test/core/test_util/test_config.h" TEST(StackTracerTest, Basic) { diff --git a/test/core/test_util/test_config.cc b/test/core/test_util/test_config.cc index 0395887fe7a..b8682828119 100644 --- a/test/core/test_util/test_config.cc +++ b/test/core/test_util/test_config.cc @@ -18,6 +18,9 @@ #include "test/core/test_util/test_config.h" +#include +#include +#include #include #include @@ -31,11 +34,6 @@ #include "absl/strings/match.h" #include "absl/strings/str_format.h" #include "absl/strings/string_view.h" - -#include -#include -#include - #include "src/core/lib/surface/init.h" #include "src/core/util/crash.h" #include "test/core/event_engine/test_init.h" diff --git a/test/core/test_util/test_config.h b/test/core/test_util/test_config.h index 5fb385ce31c..8a2020af2ce 100644 --- a/test/core/test_util/test_config.h +++ b/test/core/test_util/test_config.h @@ -19,9 +19,8 @@ #ifndef GRPC_TEST_CORE_TEST_UTIL_TEST_CONFIG_H #define GRPC_TEST_CORE_TEST_UTIL_TEST_CONFIG_H -#include - #include +#include extern int64_t g_fixture_slowdown_factor; extern int64_t g_poller_slowdown_factor; diff --git a/test/core/test_util/test_lb_policies.cc b/test/core/test_util/test_lb_policies.cc index afd701417cb..d02b224793a 100644 --- a/test/core/test_util/test_lb_policies.cc +++ b/test/core/test_util/test_lb_policies.cc @@ -16,6 +16,8 @@ #include "test/core/test_util/test_lb_policies.h" +#include +#include #include #include @@ -26,10 +28,6 @@ #include "absl/status/statusor.h" #include "absl/strings/string_view.h" #include "absl/types/variant.h" - -#include -#include - #include "src/core/client_channel/lb_metadata.h" #include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/channel/channel_args.h" diff --git a/test/core/test_util/test_lb_policies.h b/test/core/test_util/test_lb_policies.h index 235a6990734..18c016fb80f 100644 --- a/test/core/test_util/test_lb_policies.h +++ b/test/core/test_util/test_lb_policies.h @@ -17,6 +17,8 @@ #ifndef GRPC_TEST_CORE_TEST_UTIL_TEST_LB_POLICIES_H #define GRPC_TEST_CORE_TEST_UTIL_TEST_LB_POLICIES_H +#include + #include #include #include @@ -25,9 +27,6 @@ #include "absl/status/status.h" #include "absl/strings/string_view.h" - -#include - #include "src/core/lib/config/core_configuration.h" #include "src/core/load_balancing/backend_metric_data.h" #include "src/core/resolver/endpoint_addresses.h" diff --git a/test/core/test_util/test_tcp_server.cc b/test/core/test_util/test_tcp_server.cc index cc3d2957648..25193394c40 100644 --- a/test/core/test_util/test_tcp_server.cc +++ b/test/core/test_util/test_tcp_server.cc @@ -18,6 +18,10 @@ #include "test/core/test_util/test_tcp_server.h" +#include +#include +#include +#include #include #include @@ -25,12 +29,6 @@ #include "absl/log/check.h" #include "absl/log/log.h" - -#include -#include -#include -#include - #include "src/core/lib/channel/channel_args_preconditioning.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/event_engine/channel_args_endpoint_config.h" diff --git a/test/core/test_util/test_tcp_server.h b/test/core/test_util/test_tcp_server.h index 66818e1b774..634fc728633 100644 --- a/test/core/test_util/test_tcp_server.h +++ b/test/core/test_util/test_tcp_server.h @@ -19,10 +19,10 @@ #ifndef GRPC_TEST_CORE_TEST_UTIL_TEST_TCP_SERVER_H #define GRPC_TEST_CORE_TEST_UTIL_TEST_TCP_SERVER_H -#include - #include +#include + #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/iomgr_fwd.h" #include "src/core/lib/iomgr/tcp_server.h" diff --git a/test/core/test_util/tls_utils.cc b/test/core/test_util/tls_utils.cc index c2dfd13eea9..a891e43c33c 100644 --- a/test/core/test_util/tls_utils.cc +++ b/test/core/test_util/tls_utils.cc @@ -15,16 +15,14 @@ // #include "test/core/test_util/tls_utils.h" -#include - -#include "absl/log/check.h" -#include "absl/strings/str_cat.h" - #include #include #include #include +#include +#include "absl/log/check.h" +#include "absl/strings/str_cat.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/util/load_file.h" diff --git a/test/core/test_util/tls_utils.h b/test/core/test_util/tls_utils.h index 5cd12ac6a10..4c9ccf720da 100644 --- a/test/core/test_util/tls_utils.h +++ b/test/core/test_util/tls_utils.h @@ -17,17 +17,16 @@ #ifndef GRPC_TEST_CORE_TEST_UTIL_TLS_UTILS_H #define GRPC_TEST_CORE_TEST_UTIL_TLS_UTILS_H +#include +#include +#include + #include #include #include #include "absl/base/thread_annotations.h" #include "absl/strings/string_view.h" - -#include -#include -#include - #include "src/core/lib/security/security_connector/ssl_utils.h" #include "src/core/util/sync.h" #include "src/core/util/thd.h" diff --git a/test/core/transport/bdp_estimator_test.cc b/test/core/transport/bdp_estimator_test.cc index b8e0ded91a0..b7174df8e93 100644 --- a/test/core/transport/bdp_estimator_test.cc +++ b/test/core/transport/bdp_estimator_test.cc @@ -18,15 +18,13 @@ #include "src/core/lib/transport/bdp_estimator.h" +#include #include #include #include #include "gtest/gtest.h" - -#include - #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/timer_manager.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/transport/benchmarks/bm_chaotic_good.cc b/test/core/transport/benchmarks/bm_chaotic_good.cc index 362693429d6..6610e66e1aa 100644 --- a/test/core/transport/benchmarks/bm_chaotic_good.cc +++ b/test/core/transport/benchmarks/bm_chaotic_good.cc @@ -13,12 +13,10 @@ // limitations under the License. #include +#include #include "absl/memory/memory.h" #include "absl/strings/string_view.h" - -#include - #include "src/core/ext/transport/chaotic_good/client_transport.h" #include "src/core/ext/transport/chaotic_good/server_transport.h" #include "src/core/lib/address_utils/parse_address.h" diff --git a/test/core/transport/benchmarks/bm_inproc.cc b/test/core/transport/benchmarks/bm_inproc.cc index f7725628f45..cb8d1fe31c3 100644 --- a/test/core/transport/benchmarks/bm_inproc.cc +++ b/test/core/transport/benchmarks/bm_inproc.cc @@ -12,15 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - #include +#include + +#include #include "absl/memory/memory.h" #include "absl/strings/string_view.h" - -#include - #include "src/core/ext/transport/inproc/inproc_transport.h" #include "src/core/lib/address_utils/parse_address.h" #include "test/core/transport/call_spine_benchmarks.h" diff --git a/test/core/transport/binder/binder_transport_test.cc b/test/core/transport/binder/binder_transport_test.cc index 5ad7150e8e2..959a6fd33a0 100644 --- a/test/core/transport/binder/binder_transport_test.cc +++ b/test/core/transport/binder/binder_transport_test.cc @@ -18,19 +18,17 @@ // transform into the correct sequence of binder transactions. #include "src/core/ext/transport/binder/transport/binder_transport.h" +#include +#include +#include + #include #include #include -#include - #include "absl/memory/memory.h" #include "absl/strings/match.h" #include "absl/strings/str_join.h" - -#include -#include - #include "src/core/ext/transport/binder/transport/binder_stream.h" #include "src/core/lib/resource_quota/resource_quota.h" #include "src/core/util/notification.h" diff --git a/test/core/transport/binder/end2end/binder_server_test.cc b/test/core/transport/binder/end2end/binder_server_test.cc index a1d26094e42..da17a099e4b 100644 --- a/test/core/transport/binder/end2end/binder_server_test.cc +++ b/test/core/transport/binder/end2end/binder_server_test.cc @@ -14,18 +14,16 @@ #include "src/core/ext/transport/binder/server/binder_server.h" +#include +#include +#include +#include + #include #include #include -#include - #include "absl/memory/memory.h" - -#include -#include -#include - #include "src/core/ext/transport/binder/client/channel_create_impl.h" #include "test/core/test_util/test_config.h" #include "test/core/transport/binder/end2end/fake_binder.h" diff --git a/test/core/transport/binder/end2end/end2end_binder_transport_test.cc b/test/core/transport/binder/end2end/end2end_binder_transport_test.cc index 7c24090894e..bc8f7be9078 100644 --- a/test/core/transport/binder/end2end/end2end_binder_transport_test.cc +++ b/test/core/transport/binder/end2end/end2end_binder_transport_test.cc @@ -12,18 +12,16 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include +#include +#include + #include #include #include -#include -#include - #include "absl/memory/memory.h" #include "absl/time/time.h" - -#include - #include "src/core/ext/transport/binder/transport/binder_transport.h" #include "src/core/ext/transport/binder/wire_format/wire_reader_impl.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/transport/binder/end2end/fake_binder.cc b/test/core/transport/binder/end2end/fake_binder.cc index 6a5cc9698ac..d3e93f50ada 100644 --- a/test/core/transport/binder/end2end/fake_binder.cc +++ b/test/core/transport/binder/end2end/fake_binder.cc @@ -18,7 +18,6 @@ #include #include "absl/log/log.h" - #include "src/core/util/crash.h" namespace grpc_binder { diff --git a/test/core/transport/binder/end2end/fake_binder.h b/test/core/transport/binder/end2end/fake_binder.h index 6dbb532a230..46877bfb9de 100644 --- a/test/core/transport/binder/end2end/fake_binder.h +++ b/test/core/transport/binder/end2end/fake_binder.h @@ -63,7 +63,6 @@ #include "absl/strings/string_view.h" #include "absl/time/time.h" #include "absl/types/variant.h" - #include "src/core/ext/transport/binder/wire_format/binder.h" #include "src/core/ext/transport/binder/wire_format/wire_reader.h" #include "src/core/util/sync.h" diff --git a/test/core/transport/binder/end2end/fake_binder_test.cc b/test/core/transport/binder/end2end/fake_binder_test.cc index 47bcc3704bc..68875bcd864 100644 --- a/test/core/transport/binder/end2end/fake_binder_test.cc +++ b/test/core/transport/binder/end2end/fake_binder_test.cc @@ -14,17 +14,16 @@ #include "test/core/transport/binder/end2end/fake_binder.h" +#include +#include + #include #include #include #include -#include -#include - #include "absl/strings/str_format.h" #include "absl/time/time.h" - #include "test/core/test_util/test_config.h" namespace grpc_binder { diff --git a/test/core/transport/binder/end2end/fuzzers/client_fuzzer.cc b/test/core/transport/binder/end2end/fuzzers/client_fuzzer.cc index e62c056c8b7..e852b032fcb 100644 --- a/test/core/transport/binder/end2end/fuzzers/client_fuzzer.cc +++ b/test/core/transport/binder/end2end/fuzzers/client_fuzzer.cc @@ -12,15 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include +#include + #include #include #include "absl/log/check.h" #include "absl/memory/memory.h" - -#include -#include - #include "src/core/ext/transport/binder/transport/binder_transport.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/iomgr/executor.h" diff --git a/test/core/transport/binder/end2end/fuzzers/fuzzer_utils.h b/test/core/transport/binder/end2end/fuzzers/fuzzer_utils.h index 8b4affab2cc..ee47780b227 100644 --- a/test/core/transport/binder/end2end/fuzzers/fuzzer_utils.h +++ b/test/core/transport/binder/end2end/fuzzers/fuzzer_utils.h @@ -23,7 +23,6 @@ #include "absl/memory/memory.h" #include "absl/status/status.h" - #include "src/core/ext/transport/binder/wire_format/binder.h" #include "src/core/ext/transport/binder/wire_format/wire_reader.h" #include "src/core/util/crash.h" diff --git a/test/core/transport/binder/end2end/fuzzers/server_fuzzer.cc b/test/core/transport/binder/end2end/fuzzers/server_fuzzer.cc index bc8f0400b00..d0fdaab3400 100644 --- a/test/core/transport/binder/end2end/fuzzers/server_fuzzer.cc +++ b/test/core/transport/binder/end2end/fuzzers/server_fuzzer.cc @@ -12,10 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "absl/log/check.h" - #include +#include "absl/log/check.h" #include "src/core/ext/transport/binder/transport/binder_transport.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/iomgr/executor.h" diff --git a/test/core/transport/binder/end2end/testing_channel_create.cc b/test/core/transport/binder/end2end/testing_channel_create.cc index 50d9470960e..58a9a03006d 100644 --- a/test/core/transport/binder/end2end/testing_channel_create.cc +++ b/test/core/transport/binder/end2end/testing_channel_create.cc @@ -14,12 +14,11 @@ #include "test/core/transport/binder/end2end/testing_channel_create.h" +#include + #include #include "absl/log/check.h" - -#include - #include "src/core/ext/transport/binder/transport/binder_transport.h" #include "src/core/ext/transport/binder/wire_format/wire_reader_impl.h" #include "src/core/lib/channel/channel_args.h" diff --git a/test/core/transport/binder/end2end/testing_channel_create.h b/test/core/transport/binder/end2end/testing_channel_create.h index 8838f7265e7..2efe71365fe 100644 --- a/test/core/transport/binder/end2end/testing_channel_create.h +++ b/test/core/transport/binder/end2end/testing_channel_create.h @@ -15,10 +15,10 @@ #ifndef GRPC_TEST_CORE_TRANSPORT_BINDER_END2END_TESTING_CHANNEL_CREATE_H #define GRPC_TEST_CORE_TRANSPORT_BINDER_END2END_TESTING_CHANNEL_CREATE_H -#include - #include +#include + #include "src/core/ext/transport/binder/transport/binder_transport.h" #include "src/core/server/server.h" #include "test/core/transport/binder/end2end/fake_binder.h" diff --git a/test/core/transport/binder/endpoint_binder_pool_test.cc b/test/core/transport/binder/endpoint_binder_pool_test.cc index bba32557f4c..5086a2ea18c 100644 --- a/test/core/transport/binder/endpoint_binder_pool_test.cc +++ b/test/core/transport/binder/endpoint_binder_pool_test.cc @@ -14,16 +14,15 @@ #include "src/core/ext/transport/binder/client/endpoint_binder_pool.h" +#include +#include + #include #include #include #include -#include -#include - #include "absl/memory/memory.h" - #include "test/core/test_util/test_config.h" #include "test/core/transport/binder/mock_objects.h" diff --git a/test/core/transport/binder/transport_stream_receiver_test.cc b/test/core/transport/binder/transport_stream_receiver_test.cc index 76d2689b8c4..86ead7f5c17 100644 --- a/test/core/transport/binder/transport_stream_receiver_test.cc +++ b/test/core/transport/binder/transport_stream_receiver_test.cc @@ -12,16 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include +#include + #include #include #include #include -#include -#include - #include "absl/memory/memory.h" - #include "src/core/ext/transport/binder/utils/transport_stream_receiver_impl.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/transport/binder/wire_reader_test.cc b/test/core/transport/binder/wire_reader_test.cc index 75a7432628d..bdfeaa98e8b 100644 --- a/test/core/transport/binder/wire_reader_test.cc +++ b/test/core/transport/binder/wire_reader_test.cc @@ -19,18 +19,16 @@ // WireReaderImpl and both the output (readable) parcel and the transport stream // receiver are correct in all possible situations. +#include +#include +#include + #include #include #include #include -#include - #include "absl/memory/memory.h" - -#include -#include - #include "src/core/ext/transport/binder/wire_format/wire_reader_impl.h" #include "test/core/test_util/test_config.h" #include "test/core/transport/binder/mock_objects.h" diff --git a/test/core/transport/binder/wire_writer_test.cc b/test/core/transport/binder/wire_writer_test.cc index 851430bdeff..7dffe26d5ab 100644 --- a/test/core/transport/binder/wire_writer_test.cc +++ b/test/core/transport/binder/wire_writer_test.cc @@ -14,15 +14,13 @@ #include "src/core/ext/transport/binder/wire_format/wire_writer.h" +#include +#include + #include #include -#include - #include "absl/memory/memory.h" - -#include - #include "test/core/test_util/test_config.h" #include "test/core/transport/binder/mock_objects.h" diff --git a/test/core/transport/bm_call_spine.cc b/test/core/transport/bm_call_spine.cc index 7a757a5d733..749c2c9f5ae 100644 --- a/test/core/transport/bm_call_spine.cc +++ b/test/core/transport/bm_call_spine.cc @@ -13,7 +13,6 @@ // limitations under the License. #include - #include #include "src/core/lib/event_engine/default_event_engine.h" diff --git a/test/core/transport/call_arena_allocator_test.cc b/test/core/transport/call_arena_allocator_test.cc index 1c5c222cf86..32235066106 100644 --- a/test/core/transport/call_arena_allocator_test.cc +++ b/test/core/transport/call_arena_allocator_test.cc @@ -18,6 +18,8 @@ #include "src/core/lib/transport/call_arena_allocator.h" +#include +#include #include #include @@ -31,10 +33,6 @@ #include "absl/strings/str_join.h" #include "gmock/gmock.h" #include "gtest/gtest.h" - -#include -#include - #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/resource_quota/resource_quota.h" #include "src/core/util/ref_counted_ptr.h" diff --git a/test/core/transport/call_filters_test.cc b/test/core/transport/call_filters_test.cc index 77973df2c48..7e8a5e3c3ca 100644 --- a/test/core/transport/call_filters_test.cc +++ b/test/core/transport/call_filters_test.cc @@ -18,7 +18,6 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" - #include "test/core/promise/poll_matcher.h" using testing::Mock; diff --git a/test/core/transport/call_spine_benchmarks.h b/test/core/transport/call_spine_benchmarks.h index d89f3678bdb..c62f1e21733 100644 --- a/test/core/transport/call_spine_benchmarks.h +++ b/test/core/transport/call_spine_benchmarks.h @@ -18,7 +18,6 @@ #include #include "benchmark/benchmark.h" - #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/event_engine/event_engine_context.h" #include "src/core/lib/iomgr/exec_ctx.h" diff --git a/test/core/transport/call_spine_test.cc b/test/core/transport/call_spine_test.cc index b5807e28ec7..cd1c8020d5f 100644 --- a/test/core/transport/call_spine_test.cc +++ b/test/core/transport/call_spine_test.cc @@ -14,6 +14,8 @@ #include "src/core/lib/transport/call_spine.h" +#include + #include #include #include @@ -21,9 +23,6 @@ #include "absl/strings/string_view.h" #include "gmock/gmock.h" #include "gtest/gtest.h" - -#include - #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/transport/metadata.h" #include "test/core/call/yodel/yodel_test.h" diff --git a/test/core/transport/call_state_test.cc b/test/core/transport/call_state_test.cc index fcdf91b2818..4ad4a0ebe80 100644 --- a/test/core/transport/call_state_test.cc +++ b/test/core/transport/call_state_test.cc @@ -18,7 +18,6 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" - #include "test/core/promise/poll_matcher.h" using testing::Mock; diff --git a/test/core/transport/chaotic_good/chaotic_good_server_test.cc b/test/core/transport/chaotic_good/chaotic_good_server_test.cc index 1f1335f5f6c..b76b97b4bfc 100644 --- a/test/core/transport/chaotic_good/chaotic_good_server_test.cc +++ b/test/core/transport/chaotic_good/chaotic_good_server_test.cc @@ -14,6 +14,11 @@ #include "src/core/ext/transport/chaotic_good/server/chaotic_good_server.h" +#include +#include +#include +#include + #include #include #include @@ -24,12 +29,6 @@ #include "absl/time/time.h" #include "gmock/gmock.h" #include "gtest/gtest.h" - -#include -#include -#include -#include - #include "src/core/ext/transport/chaotic_good/client/chaotic_good_connector.h" #include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/channel/channel_args.h" diff --git a/test/core/transport/chaotic_good/client_transport_error_test.cc b/test/core/transport/chaotic_good/client_transport_error_test.cc index 8de27018183..99caac0602e 100644 --- a/test/core/transport/chaotic_good/client_transport_error_test.cc +++ b/test/core/transport/chaotic_good/client_transport_error_test.cc @@ -12,6 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include +#include +#include +#include +#include +#include #include #include @@ -28,14 +34,6 @@ #include "absl/types/optional.h" #include "gmock/gmock.h" #include "gtest/gtest.h" - -#include -#include -#include -#include -#include -#include - #include "src/core/ext/transport/chaotic_good/client_transport.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/event_engine/event_engine_context.h" diff --git a/test/core/transport/chaotic_good/client_transport_test.cc b/test/core/transport/chaotic_good/client_transport_test.cc index aad18ee1601..1739d1bbcec 100644 --- a/test/core/transport/chaotic_good/client_transport_test.cc +++ b/test/core/transport/chaotic_good/client_transport_test.cc @@ -14,6 +14,13 @@ #include "src/core/ext/transport/chaotic_good/client_transport.h" +#include +#include +#include +#include +#include +#include + #include #include #include @@ -29,14 +36,6 @@ #include "absl/types/optional.h" #include "gmock/gmock.h" #include "gtest/gtest.h" - -#include -#include -#include -#include -#include -#include - #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/promise/if.h" #include "src/core/lib/promise/loop.h" diff --git a/test/core/transport/chaotic_good/frame_fuzzer.cc b/test/core/transport/chaotic_good/frame_fuzzer.cc index 3082b3645f0..11d2e3f64c5 100644 --- a/test/core/transport/chaotic_good/frame_fuzzer.cc +++ b/test/core/transport/chaotic_good/frame_fuzzer.cc @@ -12,6 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include #include #include @@ -22,9 +23,6 @@ #include "absl/log/log.h" #include "absl/random/bit_gen_ref.h" #include "absl/status/statusor.h" - -#include - #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" diff --git a/test/core/transport/chaotic_good/frame_header_fuzzer.cc b/test/core/transport/chaotic_good/frame_header_fuzzer.cc index eaed3bfc379..765f7c35f0e 100644 --- a/test/core/transport/chaotic_good/frame_header_fuzzer.cc +++ b/test/core/transport/chaotic_good/frame_header_fuzzer.cc @@ -17,7 +17,6 @@ #include #include "absl/status/statusor.h" - #include "src/core/ext/transport/chaotic_good/frame_header.h" bool squelch = false; diff --git a/test/core/transport/chaotic_good/frame_test.cc b/test/core/transport/chaotic_good/frame_test.cc index 8fc0f2b41eb..2ca7a446e74 100644 --- a/test/core/transport/chaotic_good/frame_test.cc +++ b/test/core/transport/chaotic_good/frame_test.cc @@ -21,7 +21,6 @@ #include "absl/status/status.h" #include "absl/status/statusor.h" #include "gtest/gtest.h" - #include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/lib/resource_quota/resource_quota.h" diff --git a/test/core/transport/chaotic_good/mock_promise_endpoint.cc b/test/core/transport/chaotic_good/mock_promise_endpoint.cc index 9ba96e75804..33ab43b817c 100644 --- a/test/core/transport/chaotic_good/mock_promise_endpoint.cc +++ b/test/core/transport/chaotic_good/mock_promise_endpoint.cc @@ -14,11 +14,11 @@ #include "test/core/transport/chaotic_good/mock_promise_endpoint.h" +#include + #include "gmock/gmock.h" #include "gtest/gtest.h" -#include - using EventEngineSlice = grpc_event_engine::experimental::Slice; using grpc_event_engine::experimental::EventEngine; diff --git a/test/core/transport/chaotic_good/mock_promise_endpoint.h b/test/core/transport/chaotic_good/mock_promise_endpoint.h index bf073e4644f..314883a257b 100644 --- a/test/core/transport/chaotic_good/mock_promise_endpoint.h +++ b/test/core/transport/chaotic_good/mock_promise_endpoint.h @@ -15,11 +15,10 @@ #ifndef GRPC_TEST_CORE_TRANSPORT_CHAOTIC_GOOD_MOCK_PROMISE_ENDPOINT_H #define GRPC_TEST_CORE_TRANSPORT_CHAOTIC_GOOD_MOCK_PROMISE_ENDPOINT_H -#include "gmock/gmock.h" -#include "gtest/gtest.h" - #include +#include "gmock/gmock.h" +#include "gtest/gtest.h" #include "src/core/lib/event_engine/tcp_socket_utils.h" #include "src/core/lib/transport/promise_endpoint.h" diff --git a/test/core/transport/chaotic_good/server_transport_test.cc b/test/core/transport/chaotic_good/server_transport_test.cc index f3ab7f3a350..72e62a89682 100644 --- a/test/core/transport/chaotic_good/server_transport_test.cc +++ b/test/core/transport/chaotic_good/server_transport_test.cc @@ -14,6 +14,13 @@ #include "src/core/ext/transport/chaotic_good/server_transport.h" +#include +#include +#include +#include +#include +#include + #include #include #include @@ -26,14 +33,6 @@ #include "absl/types/optional.h" #include "gmock/gmock.h" #include "gtest/gtest.h" - -#include -#include -#include -#include -#include -#include - #include "src/core/lib/iomgr/timer_manager.h" #include "src/core/lib/promise/seq.h" #include "src/core/lib/resource_quota/arena.h" diff --git a/test/core/transport/chaotic_good/transport_test.h b/test/core/transport/chaotic_good/transport_test.h index 5f9dd8845d3..d6269c6e984 100644 --- a/test/core/transport/chaotic_good/transport_test.h +++ b/test/core/transport/chaotic_good/transport_test.h @@ -17,7 +17,6 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" - #include "src/core/ext/transport/chaotic_good/frame.h" #include "src/core/lib/event_engine/event_engine_context.h" #include "src/core/lib/iomgr/timer_manager.h" diff --git a/test/core/transport/chttp2/alpn_test.cc b/test/core/transport/chttp2/alpn_test.cc index 43fbe2e583d..52286d81752 100644 --- a/test/core/transport/chttp2/alpn_test.cc +++ b/test/core/transport/chttp2/alpn_test.cc @@ -21,7 +21,6 @@ #include #include "gtest/gtest.h" - #include "test/core/test_util/test_config.h" TEST(AlpnTest, TestAlpnSuccess) { diff --git a/test/core/transport/chttp2/bin_decoder_test.cc b/test/core/transport/chttp2/bin_decoder_test.cc index 40f67db8583..5eca263f44c 100644 --- a/test/core/transport/chttp2/bin_decoder_test.cc +++ b/test/core/transport/chttp2/bin_decoder_test.cc @@ -18,15 +18,13 @@ #include "src/core/ext/transport/chttp2/transport/bin_decoder.h" +#include #include #include #include "absl/log/log.h" #include "gtest/gtest.h" - -#include - #include "src/core/ext/transport/chttp2/transport/bin_encoder.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/slice/slice_string_helpers.h" diff --git a/test/core/transport/chttp2/bin_encoder_test.cc b/test/core/transport/chttp2/bin_encoder_test.cc index bb52b4bd766..f54407d809a 100644 --- a/test/core/transport/chttp2/bin_encoder_test.cc +++ b/test/core/transport/chttp2/bin_encoder_test.cc @@ -18,17 +18,14 @@ #include "src/core/ext/transport/chttp2/transport/bin_encoder.h" +#include +#include +#include #include #include -#include - #include "absl/log/log.h" - -#include -#include - #include "src/core/lib/slice/slice_string_helpers.h" #include "src/core/util/string.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/transport/chttp2/decode_huff_fuzzer.cc b/test/core/transport/chttp2/decode_huff_fuzzer.cc index 6a9d34d2371..851f023f203 100644 --- a/test/core/transport/chttp2/decode_huff_fuzzer.cc +++ b/test/core/transport/chttp2/decode_huff_fuzzer.cc @@ -23,7 +23,6 @@ #include "absl/strings/str_cat.h" #include "absl/strings/str_join.h" #include "absl/types/optional.h" - #include "src/core/ext/transport/chttp2/transport/decode_huff.h" #include "src/core/ext/transport/chttp2/transport/huffsyms.h" diff --git a/test/core/transport/chttp2/encode_decode_huff_fuzzer.cc b/test/core/transport/chttp2/encode_decode_huff_fuzzer.cc index 5d1f9c46718..dfc2c489d04 100644 --- a/test/core/transport/chttp2/encode_decode_huff_fuzzer.cc +++ b/test/core/transport/chttp2/encode_decode_huff_fuzzer.cc @@ -12,6 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include #include #include #include @@ -24,9 +25,6 @@ #include "absl/strings/str_cat.h" #include "absl/strings/str_join.h" #include "absl/types/optional.h" - -#include - #include "src/core/ext/transport/chttp2/transport/bin_encoder.h" #include "src/core/ext/transport/chttp2/transport/decode_huff.h" diff --git a/test/core/transport/chttp2/flow_control_fuzzer.cc b/test/core/transport/chttp2/flow_control_fuzzer.cc index b72541d4d38..8d0a8406f11 100644 --- a/test/core/transport/chttp2/flow_control_fuzzer.cc +++ b/test/core/transport/chttp2/flow_control_fuzzer.cc @@ -12,6 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include +#include #include #include #include @@ -30,10 +32,6 @@ #include "absl/status/status.h" #include "absl/strings/str_join.h" #include "absl/types/optional.h" - -#include -#include - #include "src/core/ext/transport/chttp2/transport/flow_control.h" #include "src/core/lib/experiments/config.h" #include "src/core/lib/iomgr/exec_ctx.h" diff --git a/test/core/transport/chttp2/flow_control_test.cc b/test/core/transport/chttp2/flow_control_test.cc index 618cdfb0643..8ed9ea03ed9 100644 --- a/test/core/transport/chttp2/flow_control_test.cc +++ b/test/core/transport/chttp2/flow_control_test.cc @@ -14,14 +14,13 @@ #include "src/core/ext/transport/chttp2/transport/flow_control.h" +#include + #include #include #include "absl/log/check.h" #include "gtest/gtest.h" - -#include - #include "src/core/lib/experiments/experiments.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/resource_quota/resource_quota.h" diff --git a/test/core/transport/chttp2/frame_test.cc b/test/core/transport/chttp2/frame_test.cc index a353d0fa1ef..456d8a01af4 100644 --- a/test/core/transport/chttp2/frame_test.cc +++ b/test/core/transport/chttp2/frame_test.cc @@ -21,7 +21,6 @@ #include "absl/status/status.h" #include "gmock/gmock.h" #include "gtest/gtest.h" - #include "src/core/lib/transport/http2_errors.h" namespace grpc_core { diff --git a/test/core/transport/chttp2/graceful_shutdown_test.cc b/test/core/transport/chttp2/graceful_shutdown_test.cc index 7402c2ba28c..47e8524cf81 100644 --- a/test/core/transport/chttp2/graceful_shutdown_test.cc +++ b/test/core/transport/chttp2/graceful_shutdown_test.cc @@ -16,6 +16,12 @@ // // +#include +#include +#include +#include +#include +#include #include #include #include @@ -35,14 +41,6 @@ #include "absl/time/clock.h" #include "absl/time/time.h" #include "gtest/gtest.h" - -#include -#include -#include -#include -#include -#include - #include "src/core/channelz/channelz.h" #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" #include "src/core/ext/transport/chttp2/transport/frame_goaway.h" diff --git a/test/core/transport/chttp2/hpack_encoder_test.cc b/test/core/transport/chttp2/hpack_encoder_test.cc index 141d38f71c4..947161ecf75 100644 --- a/test/core/transport/chttp2/hpack_encoder_test.cc +++ b/test/core/transport/chttp2/hpack_encoder_test.cc @@ -18,6 +18,8 @@ #include "src/core/ext/transport/chttp2/transport/hpack_encoder.h" +#include +#include #include #include @@ -27,10 +29,6 @@ #include "absl/log/log.h" #include "gmock/gmock.h" #include "gtest/gtest.h" - -#include -#include - #include "src/core/ext/transport/chttp2/transport/legacy_frame.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/resource_quota/arena.h" diff --git a/test/core/transport/chttp2/hpack_parser_fuzzer_test.cc b/test/core/transport/chttp2/hpack_parser_fuzzer_test.cc index 7954ccbaeca..a76df38bf00 100644 --- a/test/core/transport/chttp2/hpack_parser_fuzzer_test.cc +++ b/test/core/transport/chttp2/hpack_parser_fuzzer_test.cc @@ -16,6 +16,8 @@ // // +#include +#include #include #include @@ -25,10 +27,6 @@ #include "absl/cleanup/cleanup.h" #include "absl/log/check.h" #include "absl/random/bit_gen_ref.h" - -#include -#include - #include "src/core/ext/transport/chttp2/transport/hpack_parser.h" #include "src/core/lib/experiments/config.h" #include "src/core/lib/iomgr/error.h" diff --git a/test/core/transport/chttp2/hpack_parser_input_size_fuzzer.cc b/test/core/transport/chttp2/hpack_parser_input_size_fuzzer.cc index c01dff488a8..7aeda797263 100644 --- a/test/core/transport/chttp2/hpack_parser_input_size_fuzzer.cc +++ b/test/core/transport/chttp2/hpack_parser_input_size_fuzzer.cc @@ -15,6 +15,10 @@ // For all inputs, ensure parsing one byte at a time produces the same result as // parsing the entire input at once. +#include +#include +#include +#include #include #include #include @@ -28,12 +32,6 @@ #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/str_cat.h" - -#include -#include -#include -#include - #include "src/core/ext/transport/chttp2/transport/hpack_parser.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" diff --git a/test/core/transport/chttp2/hpack_parser_table_test.cc b/test/core/transport/chttp2/hpack_parser_table_test.cc index 8743b079006..48632fe86cd 100644 --- a/test/core/transport/chttp2/hpack_parser_table_test.cc +++ b/test/core/transport/chttp2/hpack_parser_table_test.cc @@ -18,14 +18,13 @@ #include "src/core/ext/transport/chttp2/transport/hpack_parser_table.h" +#include + #include #include #include "absl/strings/str_cat.h" #include "gtest/gtest.h" - -#include - #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/slice/slice.h" #include "src/core/telemetry/stats.h" diff --git a/test/core/transport/chttp2/hpack_parser_test.cc b/test/core/transport/chttp2/hpack_parser_test.cc index 0439490d7c2..1408cf21404 100644 --- a/test/core/transport/chttp2/hpack_parser_test.cc +++ b/test/core/transport/chttp2/hpack_parser_test.cc @@ -18,6 +18,12 @@ #include "src/core/ext/transport/chttp2/transport/hpack_parser.h" +#include +#include +#include +#include +#include + #include #include @@ -29,13 +35,6 @@ #include "absl/types/optional.h" #include "gmock/gmock.h" #include "gtest/gtest.h" - -#include -#include -#include -#include -#include - #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/resource_quota/memory_quota.h" diff --git a/test/core/transport/chttp2/hpack_sync_fuzzer.cc b/test/core/transport/chttp2/hpack_sync_fuzzer.cc index dff3b687999..efd041392be 100644 --- a/test/core/transport/chttp2/hpack_sync_fuzzer.cc +++ b/test/core/transport/chttp2/hpack_sync_fuzzer.cc @@ -26,7 +26,6 @@ #include "absl/status/status.h" #include "absl/strings/escaping.h" #include "absl/strings/match.h" - #include "src/core/ext/transport/chttp2/transport/hpack_encoder.h" #include "src/core/ext/transport/chttp2/transport/hpack_encoder_table.h" #include "src/core/ext/transport/chttp2/transport/hpack_parser.h" diff --git a/test/core/transport/chttp2/hpack_utils_test.cc b/test/core/transport/chttp2/hpack_utils_test.cc index cf40ca2b564..e44987bf535 100644 --- a/test/core/transport/chttp2/hpack_utils_test.cc +++ b/test/core/transport/chttp2/hpack_utils_test.cc @@ -12,16 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include +#include + #include #include -#include - #include "absl/log/check.h" #include "absl/log/log.h" - -#include - #include "src/core/ext/transport/chttp2/transport/hpack_encoder_index.h" namespace grpc_core { diff --git a/test/core/transport/chttp2/ping_abuse_policy_test.cc b/test/core/transport/chttp2/ping_abuse_policy_test.cc index f11e1f268e5..7b0b3c150c6 100644 --- a/test/core/transport/chttp2/ping_abuse_policy_test.cc +++ b/test/core/transport/chttp2/ping_abuse_policy_test.cc @@ -14,13 +14,13 @@ #include "src/core/ext/transport/chttp2/transport/ping_abuse_policy.h" +#include + #include #include #include "gtest/gtest.h" -#include - namespace grpc_core { namespace { diff --git a/test/core/transport/chttp2/ping_callbacks_test.cc b/test/core/transport/chttp2/ping_callbacks_test.cc index 18731f4f761..26962c90ada 100644 --- a/test/core/transport/chttp2/ping_callbacks_test.cc +++ b/test/core/transport/chttp2/ping_callbacks_test.cc @@ -19,7 +19,6 @@ #include "absl/random/random.h" #include "gmock/gmock.h" #include "gtest/gtest.h" - #include "src/core/util/crash.h" #include "test/core/event_engine/mock_event_engine.h" diff --git a/test/core/transport/chttp2/ping_configuration_test.cc b/test/core/transport/chttp2/ping_configuration_test.cc index 30873180124..7b85775466b 100644 --- a/test/core/transport/chttp2/ping_configuration_test.cc +++ b/test/core/transport/chttp2/ping_configuration_test.cc @@ -12,14 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - -#include "gtest/gtest.h" - #include #include #include +#include + +#include "gtest/gtest.h" #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" #include "src/core/ext/transport/chttp2/transport/internal.h" #include "src/core/ext/transport/chttp2/transport/legacy_frame.h" diff --git a/test/core/transport/chttp2/ping_rate_policy_test.cc b/test/core/transport/chttp2/ping_rate_policy_test.cc index 46ddd0501fd..0139212de45 100644 --- a/test/core/transport/chttp2/ping_rate_policy_test.cc +++ b/test/core/transport/chttp2/ping_rate_policy_test.cc @@ -18,7 +18,6 @@ #include #include "gtest/gtest.h" - #include "src/core/lib/experiments/experiments.h" namespace grpc_core { diff --git a/test/core/transport/chttp2/remove_stream_from_stalled_lists_test.cc b/test/core/transport/chttp2/remove_stream_from_stalled_lists_test.cc index 291add0aaef..42167462efa 100644 --- a/test/core/transport/chttp2/remove_stream_from_stalled_lists_test.cc +++ b/test/core/transport/chttp2/remove_stream_from_stalled_lists_test.cc @@ -16,6 +16,17 @@ // // +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -25,23 +36,9 @@ #include #include -#include - #include "absl/log/check.h" #include "absl/log/log.h" #include "absl/types/optional.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - #include "src/core/ext/transport/chttp2/transport/flow_control.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/config_vars.h" diff --git a/test/core/transport/chttp2/settings_timeout_test.cc b/test/core/transport/chttp2/settings_timeout_test.cc index 7e5c5204530..0d6d4037760 100644 --- a/test/core/transport/chttp2/settings_timeout_test.cc +++ b/test/core/transport/chttp2/settings_timeout_test.cc @@ -16,6 +16,16 @@ // // +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -30,18 +40,6 @@ #include "absl/status/statusor.h" #include "absl/strings/str_cat.h" #include "gtest/gtest.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - #include "src/core/lib/channel/channel_args_preconditioning.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/event_engine/channel_args_endpoint_config.h" diff --git a/test/core/transport/chttp2/stream_leak_with_queued_flow_control_update_test.cc b/test/core/transport/chttp2/stream_leak_with_queued_flow_control_update_test.cc index 178e29de625..a38be490af5 100644 --- a/test/core/transport/chttp2/stream_leak_with_queued_flow_control_update_test.cc +++ b/test/core/transport/chttp2/stream_leak_with_queued_flow_control_update_test.cc @@ -12,17 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include -#include - -#include - -#include "absl/base/thread_annotations.h" -#include "absl/log/check.h" -#include "absl/log/log.h" -#include "absl/strings/str_cat.h" -#include "gtest/gtest.h" - #include #include #include @@ -33,7 +22,16 @@ #include #include #include +#include +#include + +#include +#include "absl/base/thread_annotations.h" +#include "absl/log/check.h" +#include "absl/log/log.h" +#include "absl/strings/str_cat.h" +#include "gtest/gtest.h" #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/util/host_port.h" diff --git a/test/core/transport/chttp2/streams_not_seen_test.cc b/test/core/transport/chttp2/streams_not_seen_test.cc index 49a6075cd42..2c435727a54 100644 --- a/test/core/transport/chttp2/streams_not_seen_test.cc +++ b/test/core/transport/chttp2/streams_not_seen_test.cc @@ -16,6 +16,16 @@ // // +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include @@ -37,18 +47,6 @@ #include "absl/time/time.h" #include "absl/types/optional.h" #include "gtest/gtest.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" #include "src/core/ext/transport/chttp2/transport/frame_goaway.h" #include "src/core/lib/channel/channel_args.h" diff --git a/test/core/transport/chttp2/too_many_pings_test.cc b/test/core/transport/chttp2/too_many_pings_test.cc index 942268fc967..d027d5ea76d 100644 --- a/test/core/transport/chttp2/too_many_pings_test.cc +++ b/test/core/transport/chttp2/too_many_pings_test.cc @@ -16,6 +16,16 @@ // // +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -31,18 +41,6 @@ #include "absl/strings/str_cat.h" #include "absl/time/time.h" #include "gtest/gtest.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" #include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/channel/channel_args.h" diff --git a/test/core/transport/chttp2/varint_test.cc b/test/core/transport/chttp2/varint_test.cc index f4848b3167b..d4253270afa 100644 --- a/test/core/transport/chttp2/varint_test.cc +++ b/test/core/transport/chttp2/varint_test.cc @@ -18,14 +18,13 @@ #include "src/core/ext/transport/chttp2/transport/varint.h" +#include + #include #include "absl/log/log.h" #include "absl/strings/str_format.h" #include "gtest/gtest.h" - -#include - #include "test/core/test_util/test_config.h" template diff --git a/test/core/transport/connectivity_state_test.cc b/test/core/transport/connectivity_state_test.cc index 40a2a653800..288c446f370 100644 --- a/test/core/transport/connectivity_state_test.cc +++ b/test/core/transport/connectivity_state_test.cc @@ -18,10 +18,9 @@ #include "src/core/lib/transport/connectivity_state.h" -#include "gtest/gtest.h" - #include +#include "gtest/gtest.h" #include "test/core/test_util/test_config.h" #include "test/core/test_util/tracer_util.h" diff --git a/test/core/transport/error_utils_test.cc b/test/core/transport/error_utils_test.cc index c60b4bf5d79..31e7cd108dc 100644 --- a/test/core/transport/error_utils_test.cc +++ b/test/core/transport/error_utils_test.cc @@ -22,7 +22,6 @@ #include "absl/status/status.h" #include "gtest/gtest.h" - #include "src/core/lib/iomgr/error.h" #include "src/core/util/status_helper.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/transport/interception_chain_test.cc b/test/core/transport/interception_chain_test.cc index c2accf5e85b..8b5442a132b 100644 --- a/test/core/transport/interception_chain_test.cc +++ b/test/core/transport/interception_chain_test.cc @@ -14,15 +14,14 @@ #include "src/core/lib/transport/interception_chain.h" +#include +#include + #include #include "absl/log/log.h" #include "gmock/gmock.h" #include "gtest/gtest.h" - -#include -#include - #include "src/core/lib/channel/promise_based_filter.h" #include "src/core/lib/resource_quota/resource_quota.h" #include "test/core/promise/poll_matcher.h" diff --git a/test/core/transport/metadata_map_test.cc b/test/core/transport/metadata_map_test.cc index 1e985459a74..817c9f5e986 100644 --- a/test/core/transport/metadata_map_test.cc +++ b/test/core/transport/metadata_map_test.cc @@ -14,6 +14,7 @@ // limitations under the License. // +#include #include #include @@ -25,9 +26,6 @@ #include "absl/strings/str_split.h" #include "absl/types/optional.h" #include "gtest/gtest.h" - -#include - #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/lib/resource_quota/resource_quota.h" diff --git a/test/core/transport/parsed_metadata_test.cc b/test/core/transport/parsed_metadata_test.cc index df6bc391f84..391135067cf 100644 --- a/test/core/transport/parsed_metadata_test.cc +++ b/test/core/transport/parsed_metadata_test.cc @@ -22,7 +22,6 @@ #include "absl/strings/numbers.h" #include "gmock/gmock.h" #include "gtest/gtest.h" - #include "src/core/lib/transport/metadata_batch.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/transport/promise_endpoint_test.cc b/test/core/transport/promise_endpoint_test.cc index e6ad3dd2713..a2b7085e5d1 100644 --- a/test/core/transport/promise_endpoint_test.cc +++ b/test/core/transport/promise_endpoint_test.cc @@ -16,6 +16,10 @@ // IWYU pragma: no_include +#include +#include // IWYU pragma: keep +#include + #include #include #include @@ -24,11 +28,6 @@ #include "absl/functional/any_invocable.h" #include "gmock/gmock.h" #include "gtest/gtest.h" - -#include -#include // IWYU pragma: keep -#include - #include "src/core/lib/promise/activity.h" #include "src/core/lib/promise/join.h" #include "src/core/lib/promise/seq.h" diff --git a/test/core/transport/status_conversion_test.cc b/test/core/transport/status_conversion_test.cc index 8af76d6a4b2..85055941884 100644 --- a/test/core/transport/status_conversion_test.cc +++ b/test/core/transport/status_conversion_test.cc @@ -18,12 +18,11 @@ #include "src/core/lib/transport/status_conversion.h" +#include + #include #include "gtest/gtest.h" - -#include - #include "src/core/lib/iomgr/exec_ctx.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/transport/test_suite/call_content.cc b/test/core/transport/test_suite/call_content.cc index 7c9f26da0f0..84a5f9f1a13 100644 --- a/test/core/transport/test_suite/call_content.cc +++ b/test/core/transport/test_suite/call_content.cc @@ -13,7 +13,6 @@ // limitations under the License. #include "gmock/gmock.h" - #include "test/core/transport/test_suite/transport_test.h" using testing::UnorderedElementsAreArray; diff --git a/test/core/transport/test_suite/chaotic_good_fixture.cc b/test/core/transport/test_suite/chaotic_good_fixture.cc index 0e87280c086..d36e4b1a054 100644 --- a/test/core/transport/test_suite/chaotic_good_fixture.cc +++ b/test/core/transport/test_suite/chaotic_good_fixture.cc @@ -16,7 +16,6 @@ #include "absl/log/check.h" #include "gmock/gmock.h" - #include "src/core/ext/transport/chaotic_good/client_transport.h" #include "src/core/ext/transport/chaotic_good/server_transport.h" #include "src/core/lib/event_engine/memory_allocator_factory.h" diff --git a/test/core/transport/test_suite/stress.cc b/test/core/transport/test_suite/stress.cc index 11f0093ab85..98a2997c1b5 100644 --- a/test/core/transport/test_suite/stress.cc +++ b/test/core/transport/test_suite/stress.cc @@ -13,7 +13,6 @@ // limitations under the License. #include "absl/random/random.h" - #include "test/core/transport/test_suite/transport_test.h" namespace grpc_core { diff --git a/test/core/transport/test_suite/transport_test.h b/test/core/transport/test_suite/transport_test.h index 97e099f348a..68691c21403 100644 --- a/test/core/transport/test_suite/transport_test.h +++ b/test/core/transport/test_suite/transport_test.h @@ -21,7 +21,6 @@ #include "absl/random/bit_gen_ref.h" #include "gmock/gmock.h" #include "gtest/gtest.h" - #include "src/core/lib/transport/transport.h" #include "test/core/call/yodel/yodel_test.h" #include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h" diff --git a/test/core/transport/timeout_encoding_test.cc b/test/core/transport/timeout_encoding_test.cc index 6de2dcd0398..c1e00b6f680 100644 --- a/test/core/transport/timeout_encoding_test.cc +++ b/test/core/transport/timeout_encoding_test.cc @@ -23,7 +23,6 @@ #include "absl/strings/str_format.h" #include "absl/strings/string_view.h" #include "gtest/gtest.h" - #include "src/core/util/time.h" #include "src/core/util/useful.h" diff --git a/test/core/tsi/alts/crypt/aes_gcm_test.cc b/test/core/tsi/alts/crypt/aes_gcm_test.cc index 93ac19732c4..2d55d756d93 100644 --- a/test/core/tsi/alts/crypt/aes_gcm_test.cc +++ b/test/core/tsi/alts/crypt/aes_gcm_test.cc @@ -16,14 +16,12 @@ // // -#include - +#include #include -#include "absl/types/span.h" - -#include +#include +#include "absl/types/span.h" #include "src/core/tsi/alts/crypt/gsec.h" #include "test/core/test_util/test_config.h" #include "test/core/tsi/alts/crypt/gsec_test_util.h" diff --git a/test/core/tsi/alts/crypt/gsec_test_util.cc b/test/core/tsi/alts/crypt/gsec_test_util.cc index 9b6898c3ae7..a6f7209d1a1 100644 --- a/test/core/tsi/alts/crypt/gsec_test_util.cc +++ b/test/core/tsi/alts/crypt/gsec_test_util.cc @@ -18,9 +18,8 @@ #include "test/core/tsi/alts/crypt/gsec_test_util.h" -#include - #include +#include void gsec_test_random_bytes(uint8_t* bytes, size_t length) { srand(time(nullptr)); diff --git a/test/core/tsi/alts/crypt/gsec_test_util.h b/test/core/tsi/alts/crypt/gsec_test_util.h index db49b564f4c..4ce88300a18 100644 --- a/test/core/tsi/alts/crypt/gsec_test_util.h +++ b/test/core/tsi/alts/crypt/gsec_test_util.h @@ -19,13 +19,12 @@ #ifndef GRPC_TEST_CORE_TSI_ALTS_CRYPT_GSEC_TEST_UTIL_H #define GRPC_TEST_CORE_TSI_ALTS_CRYPT_GSEC_TEST_UTIL_H +#include #include #include #include #include -#include - /// /// This method returns random bytes of certain length. /// diff --git a/test/core/tsi/alts/fake_handshaker/fake_handshaker_server.cc b/test/core/tsi/alts/fake_handshaker/fake_handshaker_server.cc index 1c2c8892e4c..42f6f67ec54 100644 --- a/test/core/tsi/alts/fake_handshaker/fake_handshaker_server.cc +++ b/test/core/tsi/alts/fake_handshaker/fake_handshaker_server.cc @@ -17,14 +17,6 @@ // #include "test/core/tsi/alts/fake_handshaker/fake_handshaker_server.h" -#include -#include -#include - -#include "absl/log/check.h" -#include "absl/log/log.h" -#include "absl/strings/str_format.h" - #include #include #include @@ -33,6 +25,13 @@ #include #include +#include +#include +#include + +#include "absl/log/check.h" +#include "absl/log/log.h" +#include "absl/strings/str_format.h" #include "src/core/util/crash.h" #include "test/core/tsi/alts/fake_handshaker/handshaker.grpc.pb.h" #include "test/core/tsi/alts/fake_handshaker/handshaker.pb.h" diff --git a/test/core/tsi/alts/fake_handshaker/fake_handshaker_server.h b/test/core/tsi/alts/fake_handshaker/fake_handshaker_server.h index 2793793d068..6b83b3cbf09 100644 --- a/test/core/tsi/alts/fake_handshaker/fake_handshaker_server.h +++ b/test/core/tsi/alts/fake_handshaker/fake_handshaker_server.h @@ -19,11 +19,11 @@ #ifndef GRPC_TEST_CORE_TSI_ALTS_FAKE_HANDSHAKER_FAKE_HANDSHAKER_SERVER_H #define GRPC_TEST_CORE_TSI_ALTS_FAKE_HANDSHAKER_FAKE_HANDSHAKER_SERVER_H +#include + #include #include -#include - namespace grpc { namespace gcp { diff --git a/test/core/tsi/alts/fake_handshaker/fake_handshaker_server_main.cc b/test/core/tsi/alts/fake_handshaker/fake_handshaker_server_main.cc index 4e8df4b23f0..a70f55fdbcc 100644 --- a/test/core/tsi/alts/fake_handshaker/fake_handshaker_server_main.cc +++ b/test/core/tsi/alts/fake_handshaker/fake_handshaker_server_main.cc @@ -15,15 +15,14 @@ // limitations under the License. // // +#include +#include + #include #include "absl/flags/flag.h" #include "absl/log/check.h" #include "absl/log/log.h" - -#include -#include - #include "src/core/util/crash.h" #include "test/core/test_util/test_config.h" #include "test/core/tsi/alts/fake_handshaker/fake_handshaker_server.h" diff --git a/test/core/tsi/alts/frame_protector/alts_counter_test.cc b/test/core/tsi/alts/frame_protector/alts_counter_test.cc index 989530d5e27..2b2961427f3 100644 --- a/test/core/tsi/alts/frame_protector/alts_counter_test.cc +++ b/test/core/tsi/alts/frame_protector/alts_counter_test.cc @@ -18,9 +18,8 @@ #include "src/core/tsi/alts/frame_protector/alts_counter.h" -#include - #include +#include #include "src/core/util/crash.h" #include "test/core/tsi/alts/crypt/gsec_test_util.h" diff --git a/test/core/tsi/alts/frame_protector/alts_crypter_test.cc b/test/core/tsi/alts/frame_protector/alts_crypter_test.cc index 2f834e411b7..cede0ec775d 100644 --- a/test/core/tsi/alts/frame_protector/alts_crypter_test.cc +++ b/test/core/tsi/alts/frame_protector/alts_crypter_test.cc @@ -18,18 +18,15 @@ #include "src/core/tsi/alts/frame_protector/alts_crypter.h" +#include +#include #include #include #include #include -#include - #include "absl/types/span.h" - -#include - #include "test/core/tsi/alts/crypt/gsec_test_util.h" static void alts_crypter_test_random_seal_unseal(alts_crypter* server_seal, diff --git a/test/core/tsi/alts/frame_protector/alts_frame_protector_test.cc b/test/core/tsi/alts/frame_protector/alts_frame_protector_test.cc index 06b18b7f7ae..f1f4186b37a 100644 --- a/test/core/tsi/alts/frame_protector/alts_frame_protector_test.cc +++ b/test/core/tsi/alts/frame_protector/alts_frame_protector_test.cc @@ -18,11 +18,9 @@ #include "src/core/tsi/alts/frame_protector/alts_frame_protector.h" -#include - -#include - #include +#include +#include #include "src/core/tsi/alts/crypt/gsec.h" #include "src/core/tsi/transport_security_interface.h" diff --git a/test/core/tsi/alts/frame_protector/frame_handler_test.cc b/test/core/tsi/alts/frame_protector/frame_handler_test.cc index 2784bc0f74b..d9b66e45b1e 100644 --- a/test/core/tsi/alts/frame_protector/frame_handler_test.cc +++ b/test/core/tsi/alts/frame_protector/frame_handler_test.cc @@ -18,16 +18,14 @@ #include "src/core/tsi/alts/frame_protector/frame_handler.h" +#include +#include #include #include #include #include -#include - -#include - #include "src/core/util/crash.h" #include "src/core/util/useful.h" #include "test/core/tsi/alts/crypt/gsec_test_util.h" diff --git a/test/core/tsi/alts/handshaker/alts_concurrent_connectivity_test.cc b/test/core/tsi/alts/handshaker/alts_concurrent_connectivity_test.cc index 0b079ebc88e..baf3ce478b6 100644 --- a/test/core/tsi/alts/handshaker/alts_concurrent_connectivity_test.cc +++ b/test/core/tsi/alts/handshaker/alts_concurrent_connectivity_test.cc @@ -17,6 +17,17 @@ // #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include @@ -29,24 +40,10 @@ #include #include -#include - #include "absl/log/check.h" #include "absl/log/log.h" #include "absl/memory/memory.h" #include "absl/strings/str_cat.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - #include "src/core/lib/iomgr/error.h" #include "src/core/lib/security/credentials/alts/alts_credentials.h" #include "src/core/lib/security/credentials/credentials.h" diff --git a/test/core/tsi/alts/handshaker/alts_handshaker_client_test.cc b/test/core/tsi/alts/handshaker/alts_handshaker_client_test.cc index 22c42030cb5..8b8a8866a93 100644 --- a/test/core/tsi/alts/handshaker/alts_handshaker_client_test.cc +++ b/test/core/tsi/alts/handshaker/alts_handshaker_client_test.cc @@ -18,13 +18,10 @@ #include "src/core/tsi/alts/handshaker/alts_handshaker_client.h" -#include - -#include "upb/mem/arena.hpp" - #include #include #include +#include #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/tsi/alts/handshaker/alts_shared_resource.h" @@ -35,6 +32,7 @@ #include "src/core/util/env.h" #include "test/core/test_util/test_config.h" #include "test/core/tsi/alts/handshaker/alts_handshaker_service_api_test_lib.h" +#include "upb/mem/arena.hpp" #define ALTS_HANDSHAKER_CLIENT_TEST_OUT_FRAME "Hello Google" #define ALTS_HANDSHAKER_CLIENT_TEST_TARGET_NAME "bigtable.google.api.com" diff --git a/test/core/tsi/alts/handshaker/alts_tsi_handshaker_test.cc b/test/core/tsi/alts/handshaker/alts_tsi_handshaker_test.cc index 3fb9cc715ec..24d949a8b48 100644 --- a/test/core/tsi/alts/handshaker/alts_tsi_handshaker_test.cc +++ b/test/core/tsi/alts/handshaker/alts_tsi_handshaker_test.cc @@ -18,15 +18,11 @@ #include "src/core/tsi/alts/handshaker/alts_tsi_handshaker.h" -#include -#include - -#include - -#include "upb/mem/arena.hpp" - #include #include +#include +#include +#include #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/tsi/alts/handshaker/alts_handshaker_client.h" @@ -37,6 +33,7 @@ #include "src/proto/grpc/gcp/altscontext.upb.h" #include "test/core/test_util/test_config.h" #include "test/core/tsi/alts/handshaker/alts_handshaker_service_api_test_lib.h" +#include "upb/mem/arena.hpp" #define ALTS_TSI_HANDSHAKER_TEST_RECV_BYTES "Hello World" #define ALTS_TSI_HANDSHAKER_TEST_OUT_FRAME "Hello Google" diff --git a/test/core/tsi/alts/handshaker/alts_tsi_utils_test.cc b/test/core/tsi/alts/handshaker/alts_tsi_utils_test.cc index c3286ebcb40..5887d4c856e 100644 --- a/test/core/tsi/alts/handshaker/alts_tsi_utils_test.cc +++ b/test/core/tsi/alts/handshaker/alts_tsi_utils_test.cc @@ -20,10 +20,9 @@ #include -#include "upb/mem/arena.hpp" - #include "test/core/test_util/test_config.h" #include "test/core/tsi/alts/handshaker/alts_handshaker_service_api_test_lib.h" +#include "upb/mem/arena.hpp" #define ALTS_TSI_UTILS_TEST_OUT_FRAME "Hello Google" diff --git a/test/core/tsi/alts/handshaker/transport_security_common_api_test.cc b/test/core/tsi/alts/handshaker/transport_security_common_api_test.cc index 463d90044ba..1294637f95b 100644 --- a/test/core/tsi/alts/handshaker/transport_security_common_api_test.cc +++ b/test/core/tsi/alts/handshaker/transport_security_common_api_test.cc @@ -18,12 +18,11 @@ #include "src/core/tsi/alts/handshaker/transport_security_common_api.h" +#include #include #include #include -#include - const size_t kMaxRpcVersionMajor = 3; const size_t kMaxRpcVersionMinor = 2; const size_t kMinRpcVersionMajor = 2; diff --git a/test/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol_test.cc b/test/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol_test.cc index 51c08b6cce8..ab27058c606 100644 --- a/test/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol_test.cc +++ b/test/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol_test.cc @@ -18,14 +18,12 @@ #include "src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol.h" -#include - +#include #include -#include "absl/types/span.h" - -#include +#include +#include "absl/types/span.h" #include "src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_integrity_only_record_protocol.h" #include "src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_privacy_integrity_record_protocol.h" #include "src/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol.h" diff --git a/test/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol_test.cc b/test/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol_test.cc index 248a496bd27..67d47e0a5cd 100644 --- a/test/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol_test.cc +++ b/test/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol_test.cc @@ -18,14 +18,12 @@ #include "src/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol.h" -#include - +#include #include -#include "absl/types/span.h" - -#include +#include +#include "absl/types/span.h" #include "test/core/tsi/alts/crypt/gsec_test_util.h" constexpr size_t kMaxDataSize = 1024; diff --git a/test/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector_test.cc b/test/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector_test.cc index aaab8c892cf..2bdcabcb1ee 100644 --- a/test/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector_test.cc +++ b/test/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector_test.cc @@ -18,13 +18,11 @@ #include "src/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector.h" -#include - -#include "absl/types/span.h" - #include #include +#include +#include "absl/types/span.h" #include "src/core/tsi/alts/crypt/gsec.h" #include "src/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol.h" #include "src/core/tsi/transport_security_grpc.h" diff --git a/test/core/tsi/crl_ssl_transport_security_test.cc b/test/core/tsi/crl_ssl_transport_security_test.cc index 0b8d4cf0811..261ea784bab 100644 --- a/test/core/tsi/crl_ssl_transport_security_test.cc +++ b/test/core/tsi/crl_ssl_transport_security_test.cc @@ -12,6 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include +#include +#include +#include +#include #include #include #include @@ -19,18 +24,10 @@ #include #include -#include -#include - #include "absl/log/check.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/security/security_connector/security_connector.h" #include "src/core/tsi/ssl_transport_security.h" #include "src/core/tsi/transport_security.h" diff --git a/test/core/tsi/fake_transport_security_test.cc b/test/core/tsi/fake_transport_security_test.cc index c61b9a487a7..9a90d7248e4 100644 --- a/test/core/tsi/fake_transport_security_test.cc +++ b/test/core/tsi/fake_transport_security_test.cc @@ -18,15 +18,13 @@ #include "src/core/tsi/fake_transport_security.h" +#include +#include +#include #include #include #include -#include - -#include -#include - #include "src/core/lib/security/security_connector/security_connector.h" #include "src/core/tsi/transport_security.h" #include "src/core/util/crash.h" diff --git a/test/core/tsi/ssl_session_cache_test.cc b/test/core/tsi/ssl_session_cache_test.cc index 61a5f707e93..63630cbb1ae 100644 --- a/test/core/tsi/ssl_session_cache_test.cc +++ b/test/core/tsi/ssl_session_cache_test.cc @@ -18,15 +18,13 @@ #include "src/core/tsi/ssl/session_cache/ssl_session_cache.h" +#include +#include + #include #include -#include - #include "absl/log/check.h" - -#include - #include "src/core/util/crash.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/tsi/ssl_transport_security_test.cc b/test/core/tsi/ssl_transport_security_test.cc index 228372d86b6..6e2f36c5acf 100644 --- a/test/core/tsi/ssl_transport_security_test.cc +++ b/test/core/tsi/ssl_transport_security_test.cc @@ -18,22 +18,19 @@ #include "src/core/tsi/ssl_transport_security.h" -#include -#include -#include - +#include +#include +#include #include #include #include #include +#include +#include +#include #include "absl/log/log.h" #include "absl/strings/str_cat.h" - -#include -#include -#include - #include "src/core/tsi/transport_security.h" #include "src/core/tsi/transport_security_interface.h" #include "src/core/util/memory.h" diff --git a/test/core/tsi/ssl_transport_security_utils_test.cc b/test/core/tsi/ssl_transport_security_utils_test.cc index ac105c42fa5..a8a11d36f5e 100644 --- a/test/core/tsi/ssl_transport_security_utils_test.cc +++ b/test/core/tsi/ssl_transport_security_utils_test.cc @@ -16,10 +16,6 @@ #include "src/core/tsi/ssl_transport_security_utils.h" -#include -#include -#include - #include #include #include @@ -28,12 +24,15 @@ #include #include +#include +#include +#include + #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/match.h" #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" - #include "src/core/lib/slice/slice.h" #include "src/core/tsi/transport_security.h" #include "src/core/tsi/transport_security_interface.h" diff --git a/test/core/tsi/transport_security_test.cc b/test/core/tsi/transport_security_test.cc index a0ff0488b93..268d430bee1 100644 --- a/test/core/tsi/transport_security_test.cc +++ b/test/core/tsi/transport_security_test.cc @@ -18,19 +18,16 @@ #include "src/core/tsi/transport_security.h" +#include +#include +#include +#include #include #include -#include -#include - #include "absl/log/log.h" #include "absl/strings/str_format.h" - -#include -#include - #include "src/core/tsi/fake_transport_security.h" #include "src/core/tsi/ssl_transport_security.h" #include "src/core/util/crash.h" diff --git a/test/core/tsi/transport_security_test_lib.cc b/test/core/tsi/transport_security_test_lib.cc index 1239270a0e6..e4508701110 100644 --- a/test/core/tsi/transport_security_test_lib.cc +++ b/test/core/tsi/transport_security_test_lib.cc @@ -18,10 +18,8 @@ #include "test/core/tsi/transport_security_test_lib.h" -#include -#include -#include - +#include +#include #include #include #include @@ -30,13 +28,12 @@ #include #include #include +#include +#include +#include #include "absl/log/check.h" #include "absl/strings/str_cat.h" - -#include -#include - #include "src/core/lib/iomgr/error.h" #include "src/core/util/crash.h" #include "src/core/util/memory.h" diff --git a/test/core/tsi/transport_security_test_lib.h b/test/core/tsi/transport_security_test_lib.h index 6e3efec2bff..adce54bda13 100644 --- a/test/core/tsi/transport_security_test_lib.h +++ b/test/core/tsi/transport_security_test_lib.h @@ -19,9 +19,8 @@ #ifndef GRPC_TEST_CORE_TSI_TRANSPORT_SECURITY_TEST_LIB_H #define GRPC_TEST_CORE_TSI_TRANSPORT_SECURITY_TEST_LIB_H -#include - #include +#include #include "src/core/tsi/transport_security_interface.h" diff --git a/test/core/util/alloc_test.cc b/test/core/util/alloc_test.cc index d8dafc9c727..55bf93fca5c 100644 --- a/test/core/util/alloc_test.cc +++ b/test/core/util/alloc_test.cc @@ -16,15 +16,13 @@ // // +#include #include #include #include #include "gtest/gtest.h" - -#include - #include "test/core/test_util/test_config.h" TEST(AllocTest, MallocAligned) { diff --git a/test/core/util/backoff_test.cc b/test/core/util/backoff_test.cc index 3ee1cf7fe21..4cd5e6490e5 100644 --- a/test/core/util/backoff_test.cc +++ b/test/core/util/backoff_test.cc @@ -18,14 +18,13 @@ #include "src/core/util/backoff.h" +#include + #include #include #include "gmock/gmock.h" #include "gtest/gtest.h" - -#include - #include "src/core/util/time.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/util/chunked_vector_fuzzer.cc b/test/core/util/chunked_vector_fuzzer.cc index 37bcc3df4e1..6c2d642886d 100644 --- a/test/core/util/chunked_vector_fuzzer.cc +++ b/test/core/util/chunked_vector_fuzzer.cc @@ -12,6 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include #include #include @@ -21,9 +22,6 @@ #include #include "absl/log/check.h" - -#include - #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/lib/resource_quota/resource_quota.h" diff --git a/test/core/util/chunked_vector_test.cc b/test/core/util/chunked_vector_test.cc index 82f10436edc..8dbb680c1dc 100644 --- a/test/core/util/chunked_vector_test.cc +++ b/test/core/util/chunked_vector_test.cc @@ -14,13 +14,12 @@ #include "src/core/util/chunked_vector.h" +#include + #include #include #include "gtest/gtest.h" - -#include - #include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/lib/resource_quota/resource_quota.h" #include "src/core/util/ref_counted_ptr.h" diff --git a/test/core/util/cpp_impl_of_test.cc b/test/core/util/cpp_impl_of_test.cc index 49653bee36b..ef1e9a60eb7 100644 --- a/test/core/util/cpp_impl_of_test.cc +++ b/test/core/util/cpp_impl_of_test.cc @@ -14,10 +14,10 @@ #include "src/core/util/cpp_impl_of.h" -#include - #include +#include + typedef struct grpc_foo grpc_foo; namespace grpc_core { diff --git a/test/core/util/cpu_test.cc b/test/core/util/cpu_test.cc index 1c480304f47..00bc201cacd 100644 --- a/test/core/util/cpu_test.cc +++ b/test/core/util/cpu_test.cc @@ -21,6 +21,10 @@ // gpr_cpu_current_cpu() // +#include +#include +#include +#include #include #include #include @@ -28,12 +32,6 @@ #include #include "gtest/gtest.h" - -#include -#include -#include -#include - #include "src/core/util/thd.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/util/directory_reader_test.cc b/test/core/util/directory_reader_test.cc index e117bc2b058..57022e69689 100644 --- a/test/core/util/directory_reader_test.cc +++ b/test/core/util/directory_reader_test.cc @@ -22,7 +22,6 @@ #include "absl/strings/string_view.h" #include "gmock/gmock.h" #include "gtest/gtest.h" - #include "test/core/test_util/test_config.h" static constexpr absl::string_view kCrlDirectory = diff --git a/test/core/util/dual_ref_counted_test.cc b/test/core/util/dual_ref_counted_test.cc index 4c9e2de162f..150fd39c03b 100644 --- a/test/core/util/dual_ref_counted_test.cc +++ b/test/core/util/dual_ref_counted_test.cc @@ -20,7 +20,6 @@ #include "absl/log/check.h" #include "gtest/gtest.h" - #include "src/core/util/manual_constructor.h" #include "src/core/util/ref_counted.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/util/env_test.cc b/test/core/util/env_test.cc index df82aa37752..2b497db9106 100644 --- a/test/core/util/env_test.cc +++ b/test/core/util/env_test.cc @@ -20,7 +20,6 @@ #include "absl/log/log.h" #include "gtest/gtest.h" - #include "test/core/test_util/test_config.h" TEST(EnvTest, SetenvGetenv) { diff --git a/test/core/util/fork_test.cc b/test/core/util/fork_test.cc index 543c00da713..cce0af99e0b 100644 --- a/test/core/util/fork_test.cc +++ b/test/core/util/fork_test.cc @@ -18,12 +18,10 @@ #include "src/core/util/fork.h" +#include #include #include "gtest/gtest.h" - -#include - #include "src/core/util/thd.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/util/glob_test.cc b/test/core/util/glob_test.cc index 84df18db721..284464f395a 100644 --- a/test/core/util/glob_test.cc +++ b/test/core/util/glob_test.cc @@ -14,11 +14,10 @@ #include "src/core/util/glob.h" -#include "absl/strings/match.h" -#include "gtest/gtest.h" - #include +#include "absl/strings/match.h" +#include "gtest/gtest.h" #include "test/core/test_util/test_config.h" namespace grpc_core { diff --git a/test/core/util/gpr_time_test.cc b/test/core/util/gpr_time_test.cc index 48ea2ce17a2..9ae5d0ed7fb 100644 --- a/test/core/util/gpr_time_test.cc +++ b/test/core/util/gpr_time_test.cc @@ -18,6 +18,7 @@ // Test of gpr time support. +#include #include #include #include @@ -25,9 +26,6 @@ #include #include "gtest/gtest.h" - -#include - #include "test/core/test_util/test_config.h" static void to_fp(void* arg, const char* buf, size_t len) { diff --git a/test/core/util/host_port_test.cc b/test/core/util/host_port_test.cc index 3f7607c0a56..9845d54b203 100644 --- a/test/core/util/host_port_test.cc +++ b/test/core/util/host_port_test.cc @@ -19,7 +19,6 @@ #include "src/core/util/host_port.h" #include "gtest/gtest.h" - #include "test/core/test_util/test_config.h" static void join_host_port_expect(const char* host, int port, diff --git a/test/core/util/load_file_test.cc b/test/core/util/load_file_test.cc index 4888749fb40..2c83b2a119b 100644 --- a/test/core/util/load_file_test.cc +++ b/test/core/util/load_file_test.cc @@ -14,15 +14,13 @@ #include "src/core/util/load_file.h" +#include #include #include #include #include "gtest/gtest.h" - -#include - #include "src/core/util/tmpfile.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/util/mpscq_test.cc b/test/core/util/mpscq_test.cc index 65dce481d43..a0c304ead05 100644 --- a/test/core/util/mpscq_test.cc +++ b/test/core/util/mpscq_test.cc @@ -18,6 +18,8 @@ #include "src/core/util/mpscq.h" +#include +#include #include #include @@ -25,10 +27,6 @@ #include "absl/log/log.h" #include "gtest/gtest.h" - -#include -#include - #include "src/core/util/thd.h" #include "src/core/util/useful.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/util/orphanable_test.cc b/test/core/util/orphanable_test.cc index 4e38d719d9c..4d21829ad47 100644 --- a/test/core/util/orphanable_test.cc +++ b/test/core/util/orphanable_test.cc @@ -19,7 +19,6 @@ #include "src/core/util/orphanable.h" #include "gtest/gtest.h" - #include "test/core/test_util/test_config.h" namespace grpc_core { diff --git a/test/core/util/ref_counted_ptr_test.cc b/test/core/util/ref_counted_ptr_test.cc index e2d7cd0f4db..3271aa4b107 100644 --- a/test/core/util/ref_counted_ptr_test.cc +++ b/test/core/util/ref_counted_ptr_test.cc @@ -23,7 +23,6 @@ #include "absl/container/flat_hash_set.h" #include "absl/log/check.h" #include "gtest/gtest.h" - #include "src/core/util/dual_ref_counted.h" #include "src/core/util/ref_counted.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/util/ref_counted_test.cc b/test/core/util/ref_counted_test.cc index 5b0171d3b4f..2769aec600d 100644 --- a/test/core/util/ref_counted_test.cc +++ b/test/core/util/ref_counted_test.cc @@ -25,7 +25,6 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" - #include "test/core/test_util/test_config.h" namespace grpc_core { diff --git a/test/core/util/ring_buffer_test.cc b/test/core/util/ring_buffer_test.cc index 808018d0538..7c176eabfe2 100644 --- a/test/core/util/ring_buffer_test.cc +++ b/test/core/util/ring_buffer_test.cc @@ -18,10 +18,10 @@ #include "src/core/util/ring_buffer.h" -#include "gtest/gtest.h" - #include +#include "gtest/gtest.h" + namespace grpc_core { constexpr int kBufferCapacity = 1000; diff --git a/test/core/util/spinlock_test.cc b/test/core/util/spinlock_test.cc index da7c4b4ca57..35eb6a42488 100644 --- a/test/core/util/spinlock_test.cc +++ b/test/core/util/spinlock_test.cc @@ -20,16 +20,14 @@ #include "src/core/util/spinlock.h" +#include +#include #include #include #include #include "gtest/gtest.h" - -#include -#include - #include "src/core/util/thd.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/util/stat_test.cc b/test/core/util/stat_test.cc index 4595a6208bd..3c8ad0e5bd5 100644 --- a/test/core/util/stat_test.cc +++ b/test/core/util/stat_test.cc @@ -16,14 +16,12 @@ #include "src/core/util/stat.h" +#include #include #include #include "gtest/gtest.h" - -#include - #include "src/core/util/tmpfile.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/util/string_test.cc b/test/core/util/string_test.cc index 4ca644d8090..7ba0c920c94 100644 --- a/test/core/util/string_test.cc +++ b/test/core/util/string_test.cc @@ -18,15 +18,13 @@ #include "src/core/util/string.h" +#include +#include #include #include #include #include "gtest/gtest.h" - -#include -#include - #include "test/core/test_util/test_config.h" TEST(StringTest, Strdup) { diff --git a/test/core/util/sync_test.cc b/test/core/util/sync_test.cc index 256664302e2..c29b086d1b0 100644 --- a/test/core/util/sync_test.cc +++ b/test/core/util/sync_test.cc @@ -18,17 +18,15 @@ // Test of gpr synchronization support. +#include +#include +#include #include #include #include #include "gtest/gtest.h" - -#include -#include -#include - #include "src/core/util/thd.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/util/thd_test.cc b/test/core/util/thd_test.cc index fd93eb278d3..993b6d5ab62 100644 --- a/test/core/util/thd_test.cc +++ b/test/core/util/thd_test.cc @@ -20,13 +20,12 @@ #include "src/core/util/thd.h" -#include - -#include "gtest/gtest.h" - #include #include +#include + +#include "gtest/gtest.h" #include "test/core/test_util/test_config.h" #define NUM_THREADS 100 diff --git a/test/core/util/time_averaged_stats_test.cc b/test/core/util/time_averaged_stats_test.cc index f42f27e3353..2806915dbaf 100644 --- a/test/core/util/time_averaged_stats_test.cc +++ b/test/core/util/time_averaged_stats_test.cc @@ -18,9 +18,8 @@ #include "src/core/util/time_averaged_stats.h" -#include - #include +#include namespace grpc_core { namespace { diff --git a/test/core/util/time_util_test.cc b/test/core/util/time_util_test.cc index 749a6f26ec0..85a1558befb 100644 --- a/test/core/util/time_util_test.cc +++ b/test/core/util/time_util_test.cc @@ -16,14 +16,14 @@ #include "src/core/util/time_util.h" +#include + #include #include #include "absl/time/time.h" #include "gtest/gtest.h" -#include - TEST(TimeUtilTest, ToGprTimeSpecFromAbslDurationWithRegularValues) { std::vector times = {-10, -1, 0, 1, 10}; for (int t : times) { diff --git a/test/core/util/unique_ptr_with_bitset_test.cc b/test/core/util/unique_ptr_with_bitset_test.cc index e5b67a36ff9..16cf91d0252 100644 --- a/test/core/util/unique_ptr_with_bitset_test.cc +++ b/test/core/util/unique_ptr_with_bitset_test.cc @@ -18,6 +18,7 @@ #include "src/core/util/unique_ptr_with_bitset.h" +#include #include #include @@ -25,8 +26,6 @@ #include "gtest/gtest.h" -#include - namespace grpc_core { TEST(UniquePtrWithBitsetTest, Basic) { diff --git a/test/core/util/uri_fuzzer_test.cc b/test/core/util/uri_fuzzer_test.cc index dd4b1c0f861..0b0c689d5ab 100644 --- a/test/core/util/uri_fuzzer_test.cc +++ b/test/core/util/uri_fuzzer_test.cc @@ -16,11 +16,10 @@ // // -#include -#include - #include #include +#include +#include #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/util/uri.h" diff --git a/test/core/util/uri_test.cc b/test/core/util/uri_test.cc index 965d208ae7c..0719b1e5ba2 100644 --- a/test/core/util/uri_test.cc +++ b/test/core/util/uri_test.cc @@ -16,14 +16,13 @@ #include "src/core/util/uri.h" +#include + #include #include "absl/status/status.h" #include "gmock/gmock.h" #include "gtest/gtest.h" - -#include - #include "test/core/test_util/test_config.h" using ::testing::ContainerEq; diff --git a/test/core/util/useful_test.cc b/test/core/util/useful_test.cc index 506b2da3040..8efecba0adb 100644 --- a/test/core/util/useful_test.cc +++ b/test/core/util/useful_test.cc @@ -18,6 +18,7 @@ #include "src/core/util/useful.h" +#include #include #include @@ -25,8 +26,6 @@ #include "gtest/gtest.h" -#include - namespace grpc_core { TEST(UsefulTest, ClampWorks) { diff --git a/test/core/util/validation_errors_test.cc b/test/core/util/validation_errors_test.cc index e3222408d2e..8423736f3bd 100644 --- a/test/core/util/validation_errors_test.cc +++ b/test/core/util/validation_errors_test.cc @@ -17,7 +17,6 @@ #include "src/core/util/validation_errors.h" #include "gtest/gtest.h" - #include "test/core/test_util/test_config.h" namespace grpc_core { diff --git a/test/core/util/work_serializer_test.cc b/test/core/util/work_serializer_test.cc index 773255725bb..e32a83bf31d 100644 --- a/test/core/util/work_serializer_test.cc +++ b/test/core/util/work_serializer_test.cc @@ -18,6 +18,9 @@ #include "src/core/util/work_serializer.h" +#include +#include +#include #include #include @@ -30,11 +33,6 @@ #include "absl/time/clock.h" #include "absl/time/time.h" #include "gtest/gtest.h" - -#include -#include -#include - #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/experiments/experiments.h" #include "src/core/lib/iomgr/exec_ctx.h" diff --git a/test/core/xds/certificate_provider_store_test.cc b/test/core/xds/certificate_provider_store_test.cc index a0b76e521fb..e486fd33dc6 100644 --- a/test/core/xds/certificate_provider_store_test.cc +++ b/test/core/xds/certificate_provider_store_test.cc @@ -18,6 +18,8 @@ #include "src/core/xds/grpc/certificate_provider_store.h" +#include + #include #include #include @@ -25,9 +27,6 @@ #include "absl/log/check.h" #include "gtest/gtest.h" - -#include - #include "src/core/lib/config/core_configuration.h" #include "src/core/util/unique_type_name.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/xds/file_watcher_certificate_provider_factory_test.cc b/test/core/xds/file_watcher_certificate_provider_factory_test.cc index f0eda5d3f55..581a10db148 100644 --- a/test/core/xds/file_watcher_certificate_provider_factory_test.cc +++ b/test/core/xds/file_watcher_certificate_provider_factory_test.cc @@ -18,15 +18,14 @@ #include "src/core/xds/grpc/file_watcher_certificate_provider_factory.h" +#include + #include #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/str_format.h" #include "gtest/gtest.h" - -#include - #include "src/core/util/json/json_reader.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/xds/xds_audit_logger_registry_test.cc b/test/core/xds/xds_audit_logger_registry_test.cc index 1d673ff7302..5b10e99abf8 100644 --- a/test/core/xds/xds_audit_logger_registry_test.cc +++ b/test/core/xds/xds_audit_logger_registry_test.cc @@ -18,11 +18,13 @@ #include "src/core/xds/grpc/xds_audit_logger_registry.h" +#include +#include +#include + #include #include -#include - #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/str_format.h" @@ -30,12 +32,6 @@ #include "envoy/config/rbac/v3/rbac.upb.h" #include "google/protobuf/struct.pb.h" #include "gtest/gtest.h" -#include "upb/mem/arena.hpp" -#include "upb/reflection/def.hpp" - -#include -#include - #include "src/core/lib/security/authorization/audit_logging.h" #include "src/core/util/crash.h" #include "src/core/util/json/json.h" @@ -46,6 +42,8 @@ #include "src/proto/grpc/testing/xds/v3/rbac.pb.h" #include "src/proto/grpc/testing/xds/v3/typed_struct.pb.h" #include "test/core/test_util/test_config.h" +#include "upb/mem/arena.hpp" +#include "upb/reflection/def.hpp" namespace grpc_core { namespace testing { diff --git a/test/core/xds/xds_bootstrap_test.cc b/test/core/xds/xds_bootstrap_test.cc index cc77846ae13..45dbfefdf4e 100644 --- a/test/core/xds/xds_bootstrap_test.cc +++ b/test/core/xds/xds_bootstrap_test.cc @@ -16,6 +16,10 @@ #include "src/core/xds/xds_client/xds_bootstrap.h" +#include +#include +#include +#include #include #include @@ -29,12 +33,6 @@ #include "absl/strings/string_view.h" #include "gmock/gmock.h" #include "gtest/gtest.h" - -#include -#include -#include -#include - #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/security/certificate_provider/certificate_provider_factory.h" #include "src/core/lib/security/credentials/channel_creds_registry.h" diff --git a/test/core/xds/xds_certificate_provider_test.cc b/test/core/xds/xds_certificate_provider_test.cc index a81e03421e8..0d5acb72bd0 100644 --- a/test/core/xds/xds_certificate_provider_test.cc +++ b/test/core/xds/xds_certificate_provider_test.cc @@ -18,13 +18,12 @@ #include "src/core/xds/grpc/xds_certificate_provider.h" +#include + #include "absl/status/status.h" #include "absl/types/optional.h" #include "gmock/gmock.h" #include "gtest/gtest.h" - -#include - #include "src/core/lib/iomgr/error.h" #include "src/core/lib/security/security_connector/ssl_utils.h" #include "src/core/util/status_helper.h" diff --git a/test/core/xds/xds_client_fuzzer.cc b/test/core/xds/xds_client_fuzzer.cc index 158563429e8..cc8ebc4f0be 100644 --- a/test/core/xds/xds_client_fuzzer.cc +++ b/test/core/xds/xds_client_fuzzer.cc @@ -14,6 +14,8 @@ // limitations under the License. // +#include + #include #include #include @@ -27,9 +29,6 @@ #include "absl/strings/string_view.h" #include "absl/time/time.h" #include "absl/types/optional.h" - -#include - #include "src/core/lib/iomgr/timer_manager.h" #include "src/core/util/orphanable.h" #include "src/core/util/ref_counted_ptr.h" diff --git a/test/core/xds/xds_client_test.cc b/test/core/xds/xds_client_test.cc index c28966f2c23..36ddd7e47a2 100644 --- a/test/core/xds/xds_client_test.cc +++ b/test/core/xds/xds_client_test.cc @@ -20,6 +20,11 @@ #include "src/core/xds/xds_client/xds_client.h" +#include +#include +#include +#include +#include #include #include @@ -31,21 +36,12 @@ #include #include -#include -#include - #include "absl/strings/str_cat.h" #include "absl/time/time.h" #include "absl/types/optional.h" #include "absl/types/variant.h" #include "gmock/gmock.h" #include "gtest/gtest.h" -#include "upb/reflection/def.h" - -#include -#include -#include - #include "src/core/lib/iomgr/timer_manager.h" #include "src/core/util/debug_location.h" #include "src/core/util/json/json.h" @@ -65,6 +61,7 @@ #include "test/core/test_util/test_config.h" #include "test/core/xds/xds_client_test_peer.h" #include "test/core/xds/xds_transport_fake.h" +#include "upb/reflection/def.h" // IWYU pragma: no_include // IWYU pragma: no_include diff --git a/test/core/xds/xds_client_test_peer.h b/test/core/xds/xds_client_test_peer.h index 9c3bfa61f41..d65b9763748 100644 --- a/test/core/xds/xds_client_test_peer.h +++ b/test/core/xds/xds_client_test_peer.h @@ -17,13 +17,12 @@ #ifndef GRPC_TEST_CORE_XDS_XDS_CLIENT_TEST_PEER_H #define GRPC_TEST_CORE_XDS_XDS_CLIENT_TEST_PEER_H +#include + #include #include "absl/functional/function_ref.h" #include "absl/strings/str_cat.h" - -#include - #include "src/core/xds/xds_client/xds_client.h" namespace grpc_core { diff --git a/test/core/xds/xds_cluster_resource_type_test.cc b/test/core/xds/xds_cluster_resource_type_test.cc index 804241913e8..8be6ab83171 100644 --- a/test/core/xds/xds_cluster_resource_type_test.cc +++ b/test/core/xds/xds_cluster_resource_type_test.cc @@ -14,14 +14,15 @@ // limitations under the License. // -#include -#include -#include - #include #include #include #include +#include + +#include +#include +#include #include "absl/status/status.h" #include "absl/status/statusor.h" @@ -30,11 +31,6 @@ #include "absl/types/variant.h" #include "gmock/gmock.h" #include "gtest/gtest.h" -#include "upb/mem/arena.hpp" -#include "upb/reflection/def.hpp" - -#include - #include "src/core/lib/debug/trace.h" #include "src/core/lib/iomgr/error.h" #include "src/core/load_balancing/outlier_detection/outlier_detection.h" @@ -68,6 +64,8 @@ #include "src/proto/grpc/testing/xds/v3/wrr_locality.pb.h" #include "test/core/test_util/scoped_env_var.h" #include "test/core/test_util/test_config.h" +#include "upb/mem/arena.hpp" +#include "upb/reflection/def.hpp" using envoy::config::cluster::v3::Cluster; using envoy::extensions::clusters::aggregate::v3::ClusterConfig; diff --git a/test/core/xds/xds_common_types_test.cc b/test/core/xds/xds_common_types_test.cc index 45ac7574b75..2877e621f66 100644 --- a/test/core/xds/xds_common_types_test.cc +++ b/test/core/xds/xds_common_types_test.cc @@ -16,14 +16,15 @@ #include "src/core/xds/grpc/xds_common_types.h" +#include +#include +#include + #include #include #include #include -#include -#include - #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/str_format.h" @@ -33,11 +34,6 @@ #include "google/protobuf/duration.upb.h" #include "gtest/gtest.h" #include "re2/re2.h" -#include "upb/mem/arena.hpp" -#include "upb/reflection/def.hpp" - -#include - #include "src/core/lib/debug/trace.h" #include "src/core/util/crash.h" #include "src/core/util/json/json_writer.h" @@ -59,6 +55,8 @@ #include "test/core/test_util/scoped_env_var.h" #include "test/core/test_util/test_config.h" #include "test/cpp/util/config_grpc_cli.h" +#include "upb/mem/arena.hpp" +#include "upb/reflection/def.hpp" using CommonTlsContextProto = envoy::extensions::transport_sockets::tls::v3::CommonTlsContext; diff --git a/test/core/xds/xds_endpoint_resource_type_test.cc b/test/core/xds/xds_endpoint_resource_type_test.cc index 8e9da777bc2..af6f708a558 100644 --- a/test/core/xds/xds_endpoint_resource_type_test.cc +++ b/test/core/xds/xds_endpoint_resource_type_test.cc @@ -14,6 +14,8 @@ // limitations under the License. // +#include +#include #include #include @@ -23,18 +25,11 @@ #include #include -#include - #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/str_format.h" #include "absl/types/optional.h" #include "gtest/gtest.h" -#include "upb/mem/arena.hpp" -#include "upb/reflection/def.hpp" - -#include - #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/debug/trace.h" @@ -58,6 +53,8 @@ #include "src/proto/grpc/testing/xds/v3/percent.pb.h" #include "test/core/test_util/scoped_env_var.h" #include "test/core/test_util/test_config.h" +#include "upb/mem/arena.hpp" +#include "upb/reflection/def.hpp" using envoy::config::endpoint::v3::ClusterLoadAssignment; diff --git a/test/core/xds/xds_http_filters_test.cc b/test/core/xds/xds_http_filters_test.cc index c5a76d01ee2..b32b536bc91 100644 --- a/test/core/xds/xds_http_filters_test.cc +++ b/test/core/xds/xds_http_filters_test.cc @@ -14,13 +14,17 @@ // limitations under the License. // -#include -#include -#include - #include #include #include +#include +#include +#include +#include + +#include +#include +#include #include "absl/log/check.h" #include "absl/status/status.h" @@ -28,14 +32,6 @@ #include "absl/strings/strip.h" #include "absl/types/variant.h" #include "gtest/gtest.h" -#include "upb/mem/arena.hpp" -#include "upb/reflection/def.hpp" - -#include -#include -#include -#include - #include "src/core/ext/filters/fault_injection/fault_injection_filter.h" #include "src/core/ext/filters/fault_injection/fault_injection_service_config_parser.h" #include "src/core/ext/filters/gcp_authentication/gcp_authentication_filter.h" @@ -73,6 +69,8 @@ #include "src/proto/grpc/testing/xds/v3/typed_struct.pb.h" #include "test/core/test_util/scoped_env_var.h" #include "test/core/test_util/test_config.h" +#include "upb/mem/arena.hpp" +#include "upb/reflection/def.hpp" // IWYU pragma: no_include diff --git a/test/core/xds/xds_lb_policy_registry_test.cc b/test/core/xds/xds_lb_policy_registry_test.cc index 34f516e84ef..d50e00c6312 100644 --- a/test/core/xds/xds_lb_policy_registry_test.cc +++ b/test/core/xds/xds_lb_policy_registry_test.cc @@ -18,22 +18,18 @@ #include "src/core/xds/grpc/xds_lb_policy_registry.h" -#include - #include #include #include #include +#include + +#include #include "absl/status/status.h" #include "absl/status/statusor.h" #include "gmock/gmock.h" #include "gtest/gtest.h" -#include "upb/mem/arena.hpp" -#include "upb/reflection/def.hpp" - -#include - #include "src/core/lib/config/core_configuration.h" #include "src/core/load_balancing/lb_policy.h" #include "src/core/load_balancing/lb_policy_factory.h" @@ -52,6 +48,8 @@ #include "src/proto/grpc/testing/xds/v3/typed_struct.pb.h" #include "src/proto/grpc/testing/xds/v3/wrr_locality.pb.h" #include "test/core/test_util/test_config.h" +#include "upb/mem/arena.hpp" +#include "upb/reflection/def.hpp" namespace grpc_core { namespace testing { diff --git a/test/core/xds/xds_listener_resource_type_test.cc b/test/core/xds/xds_listener_resource_type_test.cc index 0f3f815faf9..24cbf01ce11 100644 --- a/test/core/xds/xds_listener_resource_type_test.cc +++ b/test/core/xds/xds_listener_resource_type_test.cc @@ -14,16 +14,17 @@ // limitations under the License. // +#include +#include +#include +#include + #include #include #include #include #include -#include -#include -#include - #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/str_cat.h" @@ -33,11 +34,6 @@ #include "absl/types/variant.h" #include "gmock/gmock.h" #include "gtest/gtest.h" -#include "upb/mem/arena.hpp" -#include "upb/reflection/def.hpp" - -#include - #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/iomgr/error.h" @@ -67,6 +63,8 @@ #include "src/proto/grpc/testing/xds/v3/typed_struct.pb.h" #include "test/core/test_util/scoped_env_var.h" #include "test/core/test_util/test_config.h" +#include "upb/mem/arena.hpp" +#include "upb/reflection/def.hpp" using envoy::config::listener::v3::Listener; using envoy::extensions::filters::http::fault::v3::HTTPFault; diff --git a/test/core/xds/xds_metadata_test.cc b/test/core/xds/xds_metadata_test.cc index 76769ea1b70..4cdfe1fa351 100644 --- a/test/core/xds/xds_metadata_test.cc +++ b/test/core/xds/xds_metadata_test.cc @@ -16,18 +16,17 @@ #include "src/core/xds/grpc/xds_metadata.h" -#include -#include - #include #include +#include +#include + #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/str_format.h" #include "gmock/gmock.h" #include "gtest/gtest.h" - #include "src/core/lib/debug/trace.h" #include "src/core/util/crash.h" #include "src/core/util/json/json.h" diff --git a/test/core/xds/xds_route_config_resource_type_test.cc b/test/core/xds/xds_route_config_resource_type_test.cc index 61311226c52..9493ef58354 100644 --- a/test/core/xds/xds_route_config_resource_type_test.cc +++ b/test/core/xds/xds_route_config_resource_type_test.cc @@ -14,6 +14,11 @@ // limitations under the License. // +#include +#include +#include +#include +#include #include #include @@ -23,10 +28,6 @@ #include #include -#include -#include -#include - #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/str_cat.h" @@ -37,12 +38,6 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" #include "re2/re2.h" -#include "upb/mem/arena.hpp" -#include "upb/reflection/def.hpp" - -#include -#include - #include "src/core/lib/channel/status_util.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/iomgr/error.h" @@ -69,6 +64,8 @@ #include "src/proto/grpc/testing/xds/v3/typed_struct.pb.h" #include "test/core/test_util/scoped_env_var.h" #include "test/core/test_util/test_config.h" +#include "upb/mem/arena.hpp" +#include "upb/reflection/def.hpp" using envoy::config::route::v3::RouteConfiguration; using grpc::lookup::v1::RouteLookupClusterSpecifier; diff --git a/test/core/xds/xds_transport_fake.cc b/test/core/xds/xds_transport_fake.cc index 6369fd60c97..c56124c12ed 100644 --- a/test/core/xds/xds_transport_fake.cc +++ b/test/core/xds/xds_transport_fake.cc @@ -16,6 +16,9 @@ #include "test/core/xds/xds_transport_fake.h" +#include +#include + #include #include #include @@ -25,10 +28,6 @@ #include "absl/log/check.h" #include "absl/log/log.h" - -#include -#include - #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/util/orphanable.h" #include "src/core/util/ref_counted_ptr.h" diff --git a/test/core/xds/xds_transport_fake.h b/test/core/xds/xds_transport_fake.h index ffa4c746551..6a4a3d967b2 100644 --- a/test/core/xds/xds_transport_fake.h +++ b/test/core/xds/xds_transport_fake.h @@ -17,6 +17,7 @@ #ifndef GRPC_TEST_CORE_XDS_XDS_TRANSPORT_FAKE_H #define GRPC_TEST_CORE_XDS_XDS_TRANSPORT_FAKE_H +#include #include #include @@ -31,9 +32,6 @@ #include "absl/strings/string_view.h" #include "absl/time/time.h" #include "absl/types/optional.h" - -#include - #include "src/core/util/orphanable.h" #include "src/core/util/ref_counted.h" #include "src/core/util/ref_counted_ptr.h" diff --git a/test/cpp/client/credentials_test.cc b/test/cpp/client/credentials_test.cc index 866fe098f94..8f81b956775 100644 --- a/test/cpp/client/credentials_test.cc +++ b/test/cpp/client/credentials_test.cc @@ -16,13 +16,7 @@ // // -#include - #include -#include - -#include "absl/log/check.h" - #include #include #include @@ -30,7 +24,11 @@ #include #include #include +#include +#include + +#include "absl/log/check.h" #include "src/core/util/env.h" #include "src/core/util/tmpfile.h" #include "src/cpp/client/secure_credentials.h" diff --git a/test/cpp/client/destroy_grpclb_channel_with_active_connect_stress_test.cc b/test/cpp/client/destroy_grpclb_channel_with_active_connect_stress_test.cc index c2777262475..85407fd9afb 100644 --- a/test/cpp/client/destroy_grpclb_channel_with_active_connect_stress_test.cc +++ b/test/cpp/client/destroy_grpclb_channel_with_active_connect_stress_test.cc @@ -16,15 +16,7 @@ // // -#include -#include -#include -#include -#include -#include - #include - #include #include #include @@ -36,6 +28,13 @@ #include #include +#include +#include +#include +#include +#include +#include + #include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/iomgr/sockaddr.h" diff --git a/test/cpp/codegen/codegen_test_full.cc b/test/cpp/codegen/codegen_test_full.cc index b27e1b5fc5d..7ccdd02d690 100644 --- a/test/cpp/codegen/codegen_test_full.cc +++ b/test/cpp/codegen/codegen_test_full.cc @@ -16,10 +16,9 @@ // // -#include - #include #include +#include #include "test/core/test_util/test_config.h" diff --git a/test/cpp/codegen/golden_file_test.cc b/test/cpp/codegen/golden_file_test.cc index 5c45db77f7e..ec3550a6d3b 100644 --- a/test/cpp/codegen/golden_file_test.cc +++ b/test/cpp/codegen/golden_file_test.cc @@ -16,13 +16,12 @@ // // +#include + #include #include -#include - #include "absl/flags/flag.h" - #include "test/core/test_util/test_config.h" #include "test/cpp/util/test_config.h" diff --git a/test/cpp/codegen/proto_utils_test.cc b/test/cpp/codegen/proto_utils_test.cc index 1a95bee1f8e..fccde1da362 100644 --- a/test/cpp/codegen/proto_utils_test.cc +++ b/test/cpp/codegen/proto_utils_test.cc @@ -16,12 +16,11 @@ // // -#include - #include #include #include #include +#include #include "test/core/test_util/test_config.h" diff --git a/test/cpp/common/alarm_test.cc b/test/cpp/common/alarm_test.cc index 63eb170dfc1..15161fa2b31 100644 --- a/test/cpp/common/alarm_test.cc +++ b/test/cpp/common/alarm_test.cc @@ -16,16 +16,15 @@ // // +#include +#include +#include + #include #include #include #include -#include - -#include -#include - #include "src/core/util/notification.h" #include "test/core/test_util/test_config.h" diff --git a/test/cpp/common/alts_util_test.cc b/test/cpp/common/alts_util_test.cc index 5fe52338ff4..7bb3f3bf9de 100644 --- a/test/cpp/common/alts_util_test.cc +++ b/test/cpp/common/alts_util_test.cc @@ -16,19 +16,17 @@ // // -#include - -#include "upb/mem/arena.hpp" - #include #include #include +#include #include "src/core/tsi/alts/handshaker/alts_tsi_handshaker.h" #include "src/cpp/common/secure_auth_context.h" #include "src/proto/grpc/gcp/altscontext.upb.h" #include "test/core/test_util/test_config.h" #include "test/cpp/util/string_ref_helper.h" +#include "upb/mem/arena.hpp" namespace grpc { namespace { diff --git a/test/cpp/common/auth_property_iterator_test.cc b/test/cpp/common/auth_property_iterator_test.cc index 7d72a344344..f8c08a90ff9 100644 --- a/test/cpp/common/auth_property_iterator_test.cc +++ b/test/cpp/common/auth_property_iterator_test.cc @@ -16,10 +16,9 @@ // // -#include - #include #include +#include #include "src/core/lib/security/context/security_context.h" #include "src/cpp/common/secure_auth_context.h" diff --git a/test/cpp/common/channel_arguments_test.cc b/test/cpp/common/channel_arguments_test.cc index a6c7167d25e..0857154685c 100644 --- a/test/cpp/common/channel_arguments_test.cc +++ b/test/cpp/common/channel_arguments_test.cc @@ -16,11 +16,10 @@ // // -#include - #include #include #include +#include #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/socket_mutator.h" diff --git a/test/cpp/common/secure_auth_context_test.cc b/test/cpp/common/secure_auth_context_test.cc index ca50902377f..719281f9ede 100644 --- a/test/cpp/common/secure_auth_context_test.cc +++ b/test/cpp/common/secure_auth_context_test.cc @@ -18,10 +18,9 @@ #include "src/cpp/common/secure_auth_context.h" -#include - #include #include +#include #include "src/core/lib/security/context/security_context.h" #include "test/cpp/util/string_ref_helper.h" diff --git a/test/cpp/common/time_jump_test.cc b/test/cpp/common/time_jump_test.cc index e1593a59daa..f8a0abef634 100644 --- a/test/cpp/common/time_jump_test.cc +++ b/test/cpp/common/time_jump_test.cc @@ -16,6 +16,8 @@ // // +#include +#include #include #include @@ -23,14 +25,9 @@ #include #include -#include - #include "absl/log/check.h" #include "absl/log/log.h" #include "absl/time/time.h" - -#include - #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" diff --git a/test/cpp/common/timer_test.cc b/test/cpp/common/timer_test.cc index e3f2a31c1dd..a656e509448 100644 --- a/test/cpp/common/timer_test.cc +++ b/test/cpp/common/timer_test.cc @@ -18,13 +18,11 @@ #include "src/core/lib/iomgr/timer.h" +#include #include #include "absl/log/check.h" #include "absl/log/log.h" - -#include - #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" diff --git a/test/cpp/end2end/admin_services_end2end_test.cc b/test/cpp/end2end/admin_services_end2end_test.cc index 95fae195c06..83615c2df22 100644 --- a/test/cpp/end2end/admin_services_end2end_test.cc +++ b/test/cpp/end2end/admin_services_end2end_test.cc @@ -17,14 +17,12 @@ // #include -#include - -#include "absl/strings/str_cat.h" - #include #include #include +#include +#include "absl/strings/str_cat.h" #include "src/proto/grpc/reflection/v1alpha/reflection.grpc.pb.h" #include "test/core/test_util/port.h" #include "test/core/test_util/test_config.h" diff --git a/test/cpp/end2end/async_end2end_test.cc b/test/cpp/end2end/async_end2end_test.cc index 0f59bcab892..22b46c08f14 100644 --- a/test/cpp/end2end/async_end2end_test.cc +++ b/test/cpp/end2end/async_end2end_test.cc @@ -16,16 +16,6 @@ // // -#include -#include -#include - -#include "absl/log/check.h" -#include "absl/log/log.h" -#include "absl/memory/memory.h" -#include "absl/strings/str_cat.h" -#include "absl/strings/str_format.h" - #include #include #include @@ -37,6 +27,15 @@ #include #include +#include +#include +#include + +#include "absl/log/check.h" +#include "absl/log/log.h" +#include "absl/memory/memory.h" +#include "absl/strings/str_cat.h" +#include "absl/strings/str_format.h" #include "src/core/client_channel/backup_poller.h" #include "src/core/lib/config/config_vars.h" #include "src/core/lib/iomgr/port.h" diff --git a/test/cpp/end2end/cfstream_test.cc b/test/cpp/end2end/cfstream_test.cc index c0139db761f..cba2e4f7ddd 100644 --- a/test/cpp/end2end/cfstream_test.cc +++ b/test/cpp/end2end/cfstream_test.cc @@ -16,17 +16,6 @@ // // -#include -#include -#include -#include -#include - -#include - -#include "absl/log/check.h" -#include "absl/log/log.h" - #include #include #include @@ -38,7 +27,16 @@ #include #include #include +#include + +#include +#include +#include +#include +#include +#include "absl/log/check.h" +#include "absl/log/log.h" #include "src/core/lib/iomgr/port.h" #include "src/core/util/backoff.h" #include "src/core/util/crash.h" diff --git a/test/cpp/end2end/channelz_service_test.cc b/test/cpp/end2end/channelz_service_test.cc index 708b4ff53f9..34a89831904 100644 --- a/test/cpp/end2end/channelz_service_test.cc +++ b/test/cpp/end2end/channelz_service_test.cc @@ -17,11 +17,6 @@ // #include -#include - -#include "absl/log/check.h" -#include "absl/memory/memory.h" - #include #include #include @@ -34,7 +29,10 @@ #include #include #include +#include +#include "absl/log/check.h" +#include "absl/memory/memory.h" #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h" #include "src/core/lib/security/security_connector/ssl_utils.h" diff --git a/test/cpp/end2end/client_callback_end2end_test.cc b/test/cpp/end2end/client_callback_end2end_test.cc index fefcc81a976..1df284f3b66 100644 --- a/test/cpp/end2end/client_callback_end2end_test.cc +++ b/test/cpp/end2end/client_callback_end2end_test.cc @@ -16,19 +16,6 @@ // // -#include -#include -#include -#include -#include -#include - -#include - -#include "absl/log/check.h" -#include "absl/log/log.h" -#include "absl/memory/memory.h" - #include #include #include @@ -38,7 +25,18 @@ #include #include #include +#include + +#include +#include +#include +#include +#include +#include +#include "absl/log/check.h" +#include "absl/log/log.h" +#include "absl/memory/memory.h" #include "src/core/lib/iomgr/iomgr.h" #include "src/core/util/env.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" diff --git a/test/cpp/end2end/client_crash_test.cc b/test/cpp/end2end/client_crash_test.cc index 39e857562c8..ba3a2414e35 100644 --- a/test/cpp/end2end/client_crash_test.cc +++ b/test/cpp/end2end/client_crash_test.cc @@ -16,11 +16,6 @@ // // -#include - -#include "absl/log/check.h" -#include "absl/memory/memory.h" - #include #include #include @@ -29,7 +24,10 @@ #include #include #include +#include +#include "absl/log/check.h" +#include "absl/memory/memory.h" #include "src/core/util/crash.h" #include "src/proto/grpc/testing/duplicate/echo_duplicate.grpc.pb.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" diff --git a/test/cpp/end2end/client_crash_test_server.cc b/test/cpp/end2end/client_crash_test_server.cc index 6d166740ee2..517889f4f68 100644 --- a/test/cpp/end2end/client_crash_test_server.cc +++ b/test/cpp/end2end/client_crash_test_server.cc @@ -16,17 +16,16 @@ // // +#include +#include +#include + #include #include #include #include "absl/flags/flag.h" #include "absl/log/log.h" - -#include -#include -#include - #include "src/core/util/crash.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/cpp/util/test_config.h" diff --git a/test/cpp/end2end/client_fork_test.cc b/test/cpp/end2end/client_fork_test.cc index c93ff755e83..c004f0d79be 100644 --- a/test/cpp/end2end/client_fork_test.cc +++ b/test/cpp/end2end/client_fork_test.cc @@ -19,13 +19,6 @@ int main(int /* argc */, char** /* argv */) { return 0; } #else // GRPC_ENABLE_FORK_SUPPORT -#include - -#include - -#include "absl/log/log.h" -#include "absl/strings/str_cat.h" - #include #include #include @@ -35,7 +28,11 @@ int main(int /* argc */, char** /* argv */) { return 0; } #include #include #include +#include +#include +#include "absl/log/log.h" +#include "absl/strings/str_cat.h" #include "src/core/util/fork.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/core/test_util/port.h" diff --git a/test/cpp/end2end/client_interceptors_end2end_test.cc b/test/cpp/end2end/client_interceptors_end2end_test.cc index 812e529dd66..4a17aa0833e 100644 --- a/test/cpp/end2end/client_interceptors_end2end_test.cc +++ b/test/cpp/end2end/client_interceptors_end2end_test.cc @@ -16,14 +16,6 @@ // // -#include -#include - -#include - -#include "absl/log/check.h" -#include "absl/memory/memory.h" - #include #include #include @@ -35,7 +27,13 @@ #include #include #include +#include +#include +#include + +#include "absl/log/check.h" +#include "absl/memory/memory.h" #include "src/core/lib/iomgr/port.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/core/test_util/port.h" diff --git a/test/cpp/end2end/client_lb_end2end_test.cc b/test/cpp/end2end/client_lb_end2end_test.cc index 0b7349ceb26..a72c77b319f 100644 --- a/test/cpp/end2end/client_lb_end2end_test.cc +++ b/test/cpp/end2end/client_lb_end2end_test.cc @@ -12,27 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include -#include -#include -#include -#include -#include -#include -#include -#include - #include -#include - -#include "absl/log/check.h" -#include "absl/log/log.h" -#include "absl/memory/memory.h" -#include "absl/strings/str_cat.h" -#include "absl/strings/str_format.h" -#include "absl/strings/str_join.h" -#include "absl/strings/string_view.h" - #include #include #include @@ -48,7 +28,25 @@ #include #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "absl/log/check.h" +#include "absl/log/log.h" +#include "absl/memory/memory.h" +#include "absl/strings/str_cat.h" +#include "absl/strings/str_format.h" +#include "absl/strings/str_join.h" +#include "absl/strings/string_view.h" #include "src/core/client_channel/backup_poller.h" #include "src/core/client_channel/config_selector.h" #include "src/core/client_channel/global_subchannel_pool.h" diff --git a/test/cpp/end2end/connection_attempt_injector.cc b/test/cpp/end2end/connection_attempt_injector.cc index a7b64bfcea3..c87b73b5666 100644 --- a/test/cpp/end2end/connection_attempt_injector.cc +++ b/test/cpp/end2end/connection_attempt_injector.cc @@ -20,7 +20,6 @@ #include "absl/log/log.h" #include "absl/memory/memory.h" #include "absl/utility/utility.h" - #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/iomgr/exec_ctx.h" diff --git a/test/cpp/end2end/context_allocator_end2end_test.cc b/test/cpp/end2end/context_allocator_end2end_test.cc index 6b9b7a355e7..a70ad1f2f53 100644 --- a/test/cpp/end2end/context_allocator_end2end_test.cc +++ b/test/cpp/end2end/context_allocator_end2end_test.cc @@ -16,6 +16,16 @@ // // +#include +#include +#include +#include +#include +#include +#include +#include +#include + #include #include #include @@ -25,20 +35,8 @@ #include #include -#include - #include "absl/log/check.h" #include "absl/log/log.h" - -#include -#include -#include -#include -#include -#include -#include -#include - #include "src/core/lib/iomgr/iomgr.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/core/test_util/port.h" diff --git a/test/cpp/end2end/crl_provider_test.cc b/test/cpp/end2end/crl_provider_test.cc index c8e332b0a12..3ea440294f3 100644 --- a/test/cpp/end2end/crl_provider_test.cc +++ b/test/cpp/end2end/crl_provider_test.cc @@ -15,19 +15,6 @@ // limitations under the License. // // -#include -#include -#include - -#include - -#include "absl/log/check.h" -#include "absl/log/log.h" -#include "absl/status/statusor.h" -#include "absl/strings/str_cat.h" -#include "absl/strings/string_view.h" -#include "absl/synchronization/notification.h" - #include #include #include @@ -42,7 +29,18 @@ #include #include #include +#include + +#include +#include +#include +#include "absl/log/check.h" +#include "absl/log/log.h" +#include "absl/status/statusor.h" +#include "absl/strings/str_cat.h" +#include "absl/strings/string_view.h" +#include "absl/synchronization/notification.h" #include "src/cpp/client/secure_credentials.h" #include "src/proto/grpc/testing/echo_messages.pb.h" #include "test/core/test_util/port.h" diff --git a/test/cpp/end2end/delegating_channel_test.cc b/test/cpp/end2end/delegating_channel_test.cc index d675b2bdc8e..019e98be05e 100644 --- a/test/cpp/end2end/delegating_channel_test.cc +++ b/test/cpp/end2end/delegating_channel_test.cc @@ -16,11 +16,6 @@ // // -#include -#include - -#include - #include #include #include @@ -31,6 +26,10 @@ #include #include #include +#include + +#include +#include #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/core/test_util/port.h" diff --git a/test/cpp/end2end/end2end_test.cc b/test/cpp/end2end/end2end_test.cc index 1bf43444442..818a643b089 100644 --- a/test/cpp/end2end/end2end_test.cc +++ b/test/cpp/end2end/end2end_test.cc @@ -16,16 +16,6 @@ // // -#include -#include - -#include "absl/log/check.h" -#include "absl/log/log.h" -#include "absl/memory/memory.h" -#include "absl/strings/ascii.h" -#include "absl/strings/match.h" -#include "absl/strings/str_format.h" - #include #include #include @@ -42,6 +32,15 @@ #include #include +#include +#include + +#include "absl/log/check.h" +#include "absl/log/log.h" +#include "absl/memory/memory.h" +#include "absl/strings/ascii.h" +#include "absl/strings/match.h" +#include "absl/strings/str_format.h" #include "src/core/client_channel/backup_poller.h" #include "src/core/lib/config/config_vars.h" #include "src/core/lib/iomgr/iomgr.h" diff --git a/test/cpp/end2end/exception_test.cc b/test/cpp/end2end/exception_test.cc index d5fa8424b27..395b29b506f 100644 --- a/test/cpp/end2end/exception_test.cc +++ b/test/cpp/end2end/exception_test.cc @@ -16,17 +16,16 @@ // // -#include -#include - -#include - #include #include #include #include #include #include +#include + +#include +#include #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/core/test_util/test_config.h" diff --git a/test/cpp/end2end/flaky_network_test.cc b/test/cpp/end2end/flaky_network_test.cc index 3df6f1e080f..58415f620d5 100644 --- a/test/cpp/end2end/flaky_network_test.cc +++ b/test/cpp/end2end/flaky_network_test.cc @@ -16,18 +16,6 @@ // // -#include -#include -#include -#include -#include -#include - -#include - -#include "absl/log/log.h" -#include "absl/memory/memory.h" - #include #include #include @@ -40,7 +28,17 @@ #include #include #include +#include +#include +#include +#include +#include +#include +#include + +#include "absl/log/log.h" +#include "absl/memory/memory.h" #include "src/core/util/backoff.h" #include "src/core/util/crash.h" #include "src/core/util/env.h" diff --git a/test/cpp/end2end/generic_end2end_test.cc b/test/cpp/end2end/generic_end2end_test.cc index c853a0bf257..cf933fd107c 100644 --- a/test/cpp/end2end/generic_end2end_test.cc +++ b/test/cpp/end2end/generic_end2end_test.cc @@ -16,13 +16,6 @@ // // -#include -#include - -#include - -#include "absl/memory/memory.h" - #include #include #include @@ -35,7 +28,12 @@ #include #include #include +#include + +#include +#include +#include "absl/memory/memory.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/core/test_util/port.h" #include "test/core/test_util/test_config.h" diff --git a/test/cpp/end2end/grpc_authz_end2end_test.cc b/test/cpp/end2end/grpc_authz_end2end_test.cc index 0d3473c76fa..868ec7bd80a 100644 --- a/test/cpp/end2end/grpc_authz_end2end_test.cc +++ b/test/cpp/end2end/grpc_authz_end2end_test.cc @@ -12,11 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - #include -#include - #include #include #include @@ -24,6 +20,9 @@ #include #include #include +#include + +#include #include "src/core/lib/security/authorization/audit_logging.h" #include "src/core/lib/security/authorization/grpc_authorization_policy_provider.h" diff --git a/test/cpp/end2end/grpclb_end2end_test.cc b/test/cpp/end2end/grpclb_end2end_test.cc index 34eeb7b5202..f5d4c5da167 100644 --- a/test/cpp/end2end/grpclb_end2end_test.cc +++ b/test/cpp/end2end/grpclb_end2end_test.cc @@ -14,6 +14,18 @@ // limitations under the License. // +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + #include #include #include @@ -22,9 +34,6 @@ #include #include -#include -#include - #include "absl/cleanup/cleanup.h" #include "absl/log/check.h" #include "absl/log/log.h" @@ -33,17 +42,6 @@ #include "absl/strings/str_format.h" #include "absl/synchronization/notification.h" #include "absl/types/span.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include - #include "src/core/client_channel/backup_poller.h" #include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/channel/channel_args.h" diff --git a/test/cpp/end2end/health_service_end2end_test.cc b/test/cpp/end2end/health_service_end2end_test.cc index 167396cad45..b3ebb18c63b 100644 --- a/test/cpp/end2end/health_service_end2end_test.cc +++ b/test/cpp/end2end/health_service_end2end_test.cc @@ -16,13 +16,6 @@ // // -#include -#include -#include -#include - -#include - #include #include #include @@ -32,6 +25,12 @@ #include #include #include +#include + +#include +#include +#include +#include #include "src/core/util/crash.h" #include "src/proto/grpc/health/v1/health.grpc.pb.h" diff --git a/test/cpp/end2end/hybrid_end2end_test.cc b/test/cpp/end2end/hybrid_end2end_test.cc index 139dda2eb5d..eb52a780a5a 100644 --- a/test/cpp/end2end/hybrid_end2end_test.cc +++ b/test/cpp/end2end/hybrid_end2end_test.cc @@ -16,14 +16,6 @@ // // -#include -#include - -#include - -#include "absl/log/check.h" -#include "absl/log/log.h" - #include #include #include @@ -32,7 +24,13 @@ #include #include #include +#include +#include +#include + +#include "absl/log/check.h" +#include "absl/log/log.h" #include "src/core/lib/iomgr/iomgr.h" #include "src/core/util/env.h" #include "src/proto/grpc/testing/duplicate/echo_duplicate.grpc.pb.h" diff --git a/test/cpp/end2end/interceptors_util.cc b/test/cpp/end2end/interceptors_util.cc index f14ef471b6a..37d039a628b 100644 --- a/test/cpp/end2end/interceptors_util.cc +++ b/test/cpp/end2end/interceptors_util.cc @@ -20,7 +20,6 @@ #include "absl/log/check.h" #include "absl/memory/memory.h" - #include "test/core/test_util/test_config.h" namespace grpc { diff --git a/test/cpp/end2end/interceptors_util.h b/test/cpp/end2end/interceptors_util.h index c16c34cd714..7a890adc944 100644 --- a/test/cpp/end2end/interceptors_util.h +++ b/test/cpp/end2end/interceptors_util.h @@ -19,15 +19,13 @@ #ifndef GRPC_TEST_CPP_END2END_INTERCEPTORS_UTIL_H #define GRPC_TEST_CPP_END2END_INTERCEPTORS_UTIL_H -#include - +#include #include +#include + #include "absl/log/check.h" #include "absl/strings/str_format.h" - -#include - #include "src/core/util/crash.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/cpp/util/string_ref_helper.h" diff --git a/test/cpp/end2end/message_allocator_end2end_test.cc b/test/cpp/end2end/message_allocator_end2end_test.cc index 5546f5685f5..ca9a5d1aab5 100644 --- a/test/cpp/end2end/message_allocator_end2end_test.cc +++ b/test/cpp/end2end/message_allocator_end2end_test.cc @@ -16,6 +16,17 @@ // // +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + #include #include #include @@ -25,21 +36,8 @@ #include #include -#include -#include - #include "absl/log/check.h" #include "absl/log/log.h" - -#include -#include -#include -#include -#include -#include -#include -#include - #include "src/core/lib/iomgr/iomgr.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/core/test_util/port.h" diff --git a/test/cpp/end2end/mock_test.cc b/test/cpp/end2end/mock_test.cc index 281267a7f9c..d485c31fda7 100644 --- a/test/cpp/end2end/mock_test.cc +++ b/test/cpp/end2end/mock_test.cc @@ -16,15 +16,7 @@ // // -#include -#include - #include -#include - -#include "absl/log/log.h" -#include "absl/types/optional.h" - #include #include #include @@ -35,7 +27,13 @@ #include #include #include +#include +#include +#include + +#include "absl/log/log.h" +#include "absl/types/optional.h" #include "src/core/util/crash.h" #include "src/proto/grpc/testing/duplicate/echo_duplicate.grpc.pb.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" diff --git a/test/cpp/end2end/nonblocking_test.cc b/test/cpp/end2end/nonblocking_test.cc index 465766afa0a..0d8bcd9ac55 100644 --- a/test/cpp/end2end/nonblocking_test.cc +++ b/test/cpp/end2end/nonblocking_test.cc @@ -16,11 +16,6 @@ // // -#include - -#include "absl/log/check.h" -#include "absl/memory/memory.h" - #include #include #include @@ -28,6 +23,10 @@ #include #include +#include + +#include "absl/log/check.h" +#include "absl/memory/memory.h" #include "src/core/lib/iomgr/port.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/core/test_util/port.h" diff --git a/test/cpp/end2end/orca_service_end2end_test.cc b/test/cpp/end2end/orca_service_end2end_test.cc index ce88cb19110..5bc12964b20 100644 --- a/test/cpp/end2end/orca_service_end2end_test.cc +++ b/test/cpp/end2end/orca_service_end2end_test.cc @@ -15,12 +15,6 @@ // #include -#include - -#include "absl/log/log.h" -#include "absl/strings/str_cat.h" -#include "absl/types/optional.h" - #include #include #include @@ -31,7 +25,11 @@ #include #include #include +#include +#include "absl/log/log.h" +#include "absl/strings/str_cat.h" +#include "absl/types/optional.h" #include "src/core/util/time.h" #include "src/proto/grpc/testing/xds/v3/orca_service.grpc.pb.h" #include "src/proto/grpc/testing/xds/v3/orca_service.pb.h" diff --git a/test/cpp/end2end/port_sharing_end2end_test.cc b/test/cpp/end2end/port_sharing_end2end_test.cc index 93461bd9ff4..0527ffc895b 100644 --- a/test/cpp/end2end/port_sharing_end2end_test.cc +++ b/test/cpp/end2end/port_sharing_end2end_test.cc @@ -16,14 +16,6 @@ // // -#include -#include - -#include - -#include "absl/log/check.h" -#include "absl/log/log.h" - #include #include #include @@ -35,7 +27,13 @@ #include #include #include +#include +#include +#include + +#include "absl/log/check.h" +#include "absl/log/log.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/pollset.h" diff --git a/test/cpp/end2end/proto_server_reflection_test.cc b/test/cpp/end2end/proto_server_reflection_test.cc index 478c3c80193..1b4f8d9bd07 100644 --- a/test/cpp/end2end/proto_server_reflection_test.cc +++ b/test/cpp/end2end/proto_server_reflection_test.cc @@ -16,12 +16,7 @@ // // -#include -#include - #include -#include - #include #include #include @@ -32,6 +27,10 @@ #include #include #include +#include + +#include +#include #include "src/proto/grpc/reflection/v1/reflection.grpc.pb.h" #include "src/proto/grpc/reflection/v1/reflection.pb.h" diff --git a/test/cpp/end2end/raw_end2end_test.cc b/test/cpp/end2end/raw_end2end_test.cc index 8b28df798f6..c1e2df79e76 100644 --- a/test/cpp/end2end/raw_end2end_test.cc +++ b/test/cpp/end2end/raw_end2end_test.cc @@ -16,14 +16,6 @@ // // -#include -#include -#include - -#include - -#include "absl/log/check.h" - #include #include #include @@ -33,7 +25,13 @@ #include #include #include +#include +#include +#include +#include + +#include "absl/log/check.h" #include "src/core/lib/iomgr/port.h" #include "src/core/util/crash.h" #include "src/core/util/env.h" diff --git a/test/cpp/end2end/resource_quota_end2end_stress_test.cc b/test/cpp/end2end/resource_quota_end2end_stress_test.cc index 64987700a62..37955f80d40 100644 --- a/test/cpp/end2end/resource_quota_end2end_stress_test.cc +++ b/test/cpp/end2end/resource_quota_end2end_stress_test.cc @@ -12,24 +12,22 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include +#include +#include +#include +#include +#include + #include #include #include #include #include -#include - #include "absl/status/statusor.h" #include "absl/strings/str_cat.h" #include "absl/time/time.h" - -#include -#include -#include -#include -#include - #include "src/core/lib/event_engine/tcp_socket_utils.h" #include "src/core/lib/experiments/config.h" #include "src/core/lib/security/credentials/fake/fake_credentials.h" diff --git a/test/cpp/end2end/rls_end2end_test.cc b/test/cpp/end2end/rls_end2end_test.cc index 2ed47362d5e..6a6f1f47a1f 100644 --- a/test/cpp/end2end/rls_end2end_test.cc +++ b/test/cpp/end2end/rls_end2end_test.cc @@ -21,19 +21,7 @@ // fires; request is processed at that point // - find some deterministic way to exercise adaptive throttler code -#include -#include -#include - #include -#include - -#include "absl/log/check.h" -#include "absl/log/log.h" -#include "absl/strings/str_format.h" -#include "absl/strings/str_join.h" -#include "absl/types/optional.h" - #include #include #include @@ -41,7 +29,17 @@ #include #include #include +#include + +#include +#include +#include +#include "absl/log/check.h" +#include "absl/log/log.h" +#include "absl/strings/str_format.h" +#include "absl/strings/str_join.h" +#include "absl/types/optional.h" #include "src/core/client_channel/backup_poller.h" #include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/channel/channel_args.h" diff --git a/test/cpp/end2end/rls_server.cc b/test/cpp/end2end/rls_server.cc index f0b520fe9d6..226823d2942 100644 --- a/test/cpp/end2end/rls_server.cc +++ b/test/cpp/end2end/rls_server.cc @@ -19,7 +19,6 @@ #include #include "absl/log/log.h" - #include "src/proto/grpc/lookup/v1/rls.grpc.pb.h" #include "src/proto/grpc/lookup/v1/rls.pb.h" #include "test/core/test_util/test_config.h" diff --git a/test/cpp/end2end/rls_server.h b/test/cpp/end2end/rls_server.h index 149e38c6395..584991da0c4 100644 --- a/test/cpp/end2end/rls_server.h +++ b/test/cpp/end2end/rls_server.h @@ -18,7 +18,6 @@ #define GRPC_TEST_CPP_END2END_RLS_SERVER_H #include "absl/types/optional.h" - #include "src/core/util/time.h" #include "src/proto/grpc/lookup/v1/rls.grpc.pb.h" #include "src/proto/grpc/lookup/v1/rls.pb.h" diff --git a/test/cpp/end2end/server_builder_plugin_test.cc b/test/cpp/end2end/server_builder_plugin_test.cc index 488e4bbaa58..4dabffdc0b1 100644 --- a/test/cpp/end2end/server_builder_plugin_test.cc +++ b/test/cpp/end2end/server_builder_plugin_test.cc @@ -16,12 +16,6 @@ // // -#include - -#include - -#include "absl/memory/memory.h" - #include #include #include @@ -34,7 +28,11 @@ #include #include #include +#include +#include + +#include "absl/memory/memory.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/core/test_util/port.h" #include "test/core/test_util/test_config.h" diff --git a/test/cpp/end2end/server_crash_test.cc b/test/cpp/end2end/server_crash_test.cc index bbdea2c1af2..5b784255c5e 100644 --- a/test/cpp/end2end/server_crash_test.cc +++ b/test/cpp/end2end/server_crash_test.cc @@ -16,12 +16,6 @@ // // -#include - -#include "absl/log/check.h" -#include "absl/log/log.h" -#include "absl/memory/memory.h" - #include #include #include @@ -30,7 +24,11 @@ #include #include #include +#include +#include "absl/log/check.h" +#include "absl/log/log.h" +#include "absl/memory/memory.h" #include "src/core/util/crash.h" #include "src/proto/grpc/testing/duplicate/echo_duplicate.grpc.pb.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" diff --git a/test/cpp/end2end/server_crash_test_client.cc b/test/cpp/end2end/server_crash_test_client.cc index 01b25967be3..ac1918fa6d7 100644 --- a/test/cpp/end2end/server_crash_test_client.cc +++ b/test/cpp/end2end/server_crash_test_client.cc @@ -16,6 +16,10 @@ // // +#include +#include +#include + #include #include #include @@ -24,11 +28,6 @@ #include "absl/flags/flag.h" #include "absl/log/check.h" #include "absl/log/log.h" - -#include -#include -#include - #include "src/core/util/crash.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/cpp/util/test_config.h" diff --git a/test/cpp/end2end/server_early_return_test.cc b/test/cpp/end2end/server_early_return_test.cc index ddcc713cb86..ac3aff3d404 100644 --- a/test/cpp/end2end/server_early_return_test.cc +++ b/test/cpp/end2end/server_early_return_test.cc @@ -16,8 +16,6 @@ // // -#include - #include #include #include @@ -29,6 +27,7 @@ #include #include #include +#include #include "src/core/util/crash.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" diff --git a/test/cpp/end2end/server_interceptors_end2end_test.cc b/test/cpp/end2end/server_interceptors_end2end_test.cc index 5c33115312a..380f7ce3806 100644 --- a/test/cpp/end2end/server_interceptors_end2end_test.cc +++ b/test/cpp/end2end/server_interceptors_end2end_test.cc @@ -16,14 +16,6 @@ // // -#include -#include - -#include - -#include "absl/memory/memory.h" -#include "absl/strings/match.h" - #include #include #include @@ -33,7 +25,13 @@ #include #include #include +#include +#include +#include + +#include "absl/memory/memory.h" +#include "absl/strings/match.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/core/test_util/port.h" #include "test/core/test_util/test_config.h" diff --git a/test/cpp/end2end/server_load_reporting_end2end_test.cc b/test/cpp/end2end/server_load_reporting_end2end_test.cc index 5365264c5bd..076ca75c7dd 100644 --- a/test/cpp/end2end/server_load_reporting_end2end_test.cc +++ b/test/cpp/end2end/server_load_reporting_end2end_test.cc @@ -16,20 +16,18 @@ // // -#include - #include -#include - -#include "absl/log/log.h" - #include #include #include #include #include #include +#include +#include + +#include "absl/log/log.h" #include "src/core/client_channel/backup_poller.h" #include "src/core/lib/config/config_vars.h" #include "src/core/util/crash.h" diff --git a/test/cpp/end2end/service_config_end2end_test.cc b/test/cpp/end2end/service_config_end2end_test.cc index 6ff1835aa2f..381440cc61e 100644 --- a/test/cpp/end2end/service_config_end2end_test.cc +++ b/test/cpp/end2end/service_config_end2end_test.cc @@ -16,22 +16,7 @@ // // -#include -#include -#include -#include -#include -#include -#include - #include -#include - -#include "absl/log/check.h" -#include "absl/log/log.h" -#include "absl/memory/memory.h" -#include "absl/strings/str_cat.h" - #include #include #include @@ -44,7 +29,20 @@ #include #include #include +#include + +#include +#include +#include +#include +#include +#include +#include +#include "absl/log/check.h" +#include "absl/log/log.h" +#include "absl/memory/memory.h" +#include "absl/strings/str_cat.h" #include "src/core/client_channel/backup_poller.h" #include "src/core/client_channel/global_subchannel_pool.h" #include "src/core/lib/address_utils/parse_address.h" diff --git a/test/cpp/end2end/shutdown_test.cc b/test/cpp/end2end/shutdown_test.cc index dcfb52099b6..13dd5b0fa13 100644 --- a/test/cpp/end2end/shutdown_test.cc +++ b/test/cpp/end2end/shutdown_test.cc @@ -16,13 +16,6 @@ // // -#include - -#include - -#include "absl/log/check.h" -#include "absl/log/log.h" - #include #include #include @@ -31,7 +24,12 @@ #include #include #include +#include + +#include +#include "absl/log/check.h" +#include "absl/log/log.h" #include "src/core/util/crash.h" #include "src/core/util/env.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" diff --git a/test/cpp/end2end/ssl_credentials_test.cc b/test/cpp/end2end/ssl_credentials_test.cc index b111e5bfbc2..64ec168f016 100644 --- a/test/cpp/end2end/ssl_credentials_test.cc +++ b/test/cpp/end2end/ssl_credentials_test.cc @@ -15,14 +15,7 @@ // limitations under the License. // // -#include - #include -#include - -#include "absl/log/log.h" -#include "absl/synchronization/notification.h" - #include #include #include @@ -30,7 +23,12 @@ #include #include #include +#include + +#include +#include "absl/log/log.h" +#include "absl/synchronization/notification.h" #include "test/core/test_util/port.h" #include "test/core/test_util/test_config.h" #include "test/core/test_util/tls_utils.h" diff --git a/test/cpp/end2end/streaming_throughput_test.cc b/test/cpp/end2end/streaming_throughput_test.cc index 8fb9f975349..a52fce46a3d 100644 --- a/test/cpp/end2end/streaming_throughput_test.cc +++ b/test/cpp/end2end/streaming_throughput_test.cc @@ -16,15 +16,6 @@ // // -#include - -#include -#include - -#include - -#include "absl/log/log.h" - #include #include #include @@ -36,7 +27,13 @@ #include #include #include +#include +#include +#include +#include + +#include "absl/log/log.h" #include "src/core/util/crash.h" #include "src/proto/grpc/testing/duplicate/echo_duplicate.grpc.pb.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" diff --git a/test/cpp/end2end/test_health_check_service_impl.h b/test/cpp/end2end/test_health_check_service_impl.h index 55d53082480..f699a78451d 100644 --- a/test/cpp/end2end/test_health_check_service_impl.h +++ b/test/cpp/end2end/test_health_check_service_impl.h @@ -18,12 +18,12 @@ #ifndef GRPC_TEST_CPP_END2END_TEST_HEALTH_CHECK_SERVICE_IMPL_H #define GRPC_TEST_CPP_END2END_TEST_HEALTH_CHECK_SERVICE_IMPL_H -#include -#include - #include #include +#include +#include + #include "src/proto/grpc/health/v1/health.grpc.pb.h" namespace grpc { diff --git a/test/cpp/end2end/test_service_impl.cc b/test/cpp/end2end/test_service_impl.cc index 26810842ac3..b2b347f7aab 100644 --- a/test/cpp/end2end/test_service_impl.cc +++ b/test/cpp/end2end/test_service_impl.cc @@ -18,18 +18,16 @@ #include "test/cpp/end2end/test_service_impl.h" +#include +#include +#include +#include + #include #include -#include - #include "absl/log/check.h" #include "absl/log/log.h" - -#include -#include -#include - #include "src/core/util/crash.h" #include "src/core/util/notification.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" diff --git a/test/cpp/end2end/test_service_impl.h b/test/cpp/end2end/test_service_impl.h index c1860573d9e..0ffa3bceac0 100644 --- a/test/cpp/end2end/test_service_impl.h +++ b/test/cpp/end2end/test_service_impl.h @@ -19,22 +19,20 @@ #ifndef GRPC_TEST_CPP_END2END_TEST_SERVICE_IMPL_H #define GRPC_TEST_CPP_END2END_TEST_SERVICE_IMPL_H +#include +#include +#include +#include +#include + #include #include #include #include #include -#include - #include "absl/log/check.h" #include "absl/log/log.h" - -#include -#include -#include -#include - #include "src/core/util/crash.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/core/test_util/test_config.h" diff --git a/test/cpp/end2end/thread_stress_test.cc b/test/cpp/end2end/thread_stress_test.cc index b8171015e6c..b471759ce72 100644 --- a/test/cpp/end2end/thread_stress_test.cc +++ b/test/cpp/end2end/thread_stress_test.cc @@ -16,14 +16,6 @@ // // -#include -#include -#include - -#include - -#include "absl/log/log.h" - #include #include #include @@ -34,7 +26,13 @@ #include #include #include +#include +#include +#include +#include + +#include "absl/log/log.h" #include "src/core/util/env.h" #include "src/proto/grpc/testing/duplicate/echo_duplicate.grpc.pb.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" diff --git a/test/cpp/end2end/time_change_test.cc b/test/cpp/end2end/time_change_test.cc index dd8a9a94441..6c64048903e 100644 --- a/test/cpp/end2end/time_change_test.cc +++ b/test/cpp/end2end/time_change_test.cc @@ -16,15 +16,6 @@ // // -#include - -#include - -#include - -#include "absl/log/check.h" -#include "absl/memory/memory.h" - #include #include #include @@ -33,7 +24,13 @@ #include #include #include +#include +#include +#include + +#include "absl/log/check.h" +#include "absl/memory/memory.h" #include "src/core/lib/iomgr/timer.h" #include "src/core/util/crash.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" diff --git a/test/cpp/end2end/tls_credentials_test.cc b/test/cpp/end2end/tls_credentials_test.cc index 9e9c69b257c..381faad2314 100644 --- a/test/cpp/end2end/tls_credentials_test.cc +++ b/test/cpp/end2end/tls_credentials_test.cc @@ -15,14 +15,7 @@ // limitations under the License. // // -#include - #include -#include - -#include "absl/log/log.h" -#include "absl/synchronization/notification.h" - #include #include #include @@ -31,7 +24,12 @@ #include #include #include +#include + +#include +#include "absl/log/log.h" +#include "absl/synchronization/notification.h" #include "test/core/test_util/port.h" #include "test/core/test_util/test_config.h" #include "test/core/test_util/tls_utils.h" diff --git a/test/cpp/end2end/tls_key_export_test.cc b/test/cpp/end2end/tls_key_export_test.cc index ad08372f20f..e3db9de2f53 100644 --- a/test/cpp/end2end/tls_key_export_test.cc +++ b/test/cpp/end2end/tls_key_export_test.cc @@ -12,6 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include +#include +#include +#include +#include +#include + #include #include #include // NOLINT @@ -23,14 +30,6 @@ #include "absl/strings/string_view.h" #include "gmock/gmock.h" #include "gtest/gtest.h" - -#include -#include -#include -#include -#include -#include - #include "src/core/util/tmpfile.h" #include "src/cpp/client/secure_credentials.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" diff --git a/test/cpp/end2end/xds/xds_cluster_end2end_test.cc b/test/cpp/end2end/xds/xds_cluster_end2end_test.cc index c10f22d4851..282d8fa3d35 100644 --- a/test/cpp/end2end/xds/xds_cluster_end2end_test.cc +++ b/test/cpp/end2end/xds/xds_cluster_end2end_test.cc @@ -13,17 +13,16 @@ // limitations under the License. // +#include +#include + #include #include #include -#include -#include - #include "absl/log/log.h" #include "absl/strings/match.h" #include "absl/strings/str_cat.h" - #include "src/core/client_channel/backup_poller.h" #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/config/config_vars.h" diff --git a/test/cpp/end2end/xds/xds_cluster_type_end2end_test.cc b/test/cpp/end2end/xds/xds_cluster_type_end2end_test.cc index b80b344da03..c03bd0580b1 100644 --- a/test/cpp/end2end/xds/xds_cluster_type_end2end_test.cc +++ b/test/cpp/end2end/xds/xds_cluster_type_end2end_test.cc @@ -13,18 +13,16 @@ // limitations under the License. // -#include - #include +#include #include +#include + #include "absl/log/check.h" #include "absl/log/log.h" #include "absl/status/statusor.h" #include "absl/strings/str_cat.h" - -#include - #include "src/core/client_channel/backup_poller.h" #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/config/config_vars.h" diff --git a/test/cpp/end2end/xds/xds_core_end2end_test.cc b/test/cpp/end2end/xds/xds_core_end2end_test.cc index e8d0ed404eb..194ed6d15b0 100644 --- a/test/cpp/end2end/xds/xds_core_end2end_test.cc +++ b/test/cpp/end2end/xds/xds_core_end2end_test.cc @@ -13,18 +13,17 @@ // limitations under the License. // +#include +#include + #include #include #include #include #include -#include -#include - #include "absl/log/log.h" #include "absl/strings/str_cat.h" - #include "src/core/client_channel/backup_poller.h" #include "src/core/lib/config/config_vars.h" #include "src/proto/grpc/testing/xds/v3/listener.pb.h" diff --git a/test/cpp/end2end/xds/xds_credentials_end2end_test.cc b/test/cpp/end2end/xds/xds_credentials_end2end_test.cc index 10e4f5cf80c..6eea137a8ea 100644 --- a/test/cpp/end2end/xds/xds_credentials_end2end_test.cc +++ b/test/cpp/end2end/xds/xds_credentials_end2end_test.cc @@ -17,10 +17,9 @@ // #include -#include - #include #include +#include #include "test/core/test_util/port.h" #include "test/core/test_util/test_config.h" diff --git a/test/cpp/end2end/xds/xds_csds_end2end_test.cc b/test/cpp/end2end/xds/xds_csds_end2end_test.cc index cf498e060f8..3b697adaf80 100644 --- a/test/cpp/end2end/xds/xds_csds_end2end_test.cc +++ b/test/cpp/end2end/xds/xds_csds_end2end_test.cc @@ -13,21 +13,19 @@ // limitations under the License. // +#include +#include +#include +#include + #include #include #include -#include -#include - #include "absl/log/log.h" #include "absl/memory/memory.h" #include "absl/strings/str_cat.h" #include "absl/strings/strip.h" - -#include -#include - #include "src/core/client_channel/backup_poller.h" #include "src/core/lib/config/config_vars.h" #include "src/proto/grpc/testing/xds/v3/cluster.grpc.pb.h" diff --git a/test/cpp/end2end/xds/xds_end2end_test.cc b/test/cpp/end2end/xds/xds_end2end_test.cc index cf003274740..428a88c5edc 100644 --- a/test/cpp/end2end/xds/xds_end2end_test.cc +++ b/test/cpp/end2end/xds/xds_end2end_test.cc @@ -18,6 +18,21 @@ // - mTLS functionality on both client and server // - RBAC +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + #include #include #include @@ -28,9 +43,6 @@ #include #include -#include -#include - #include "absl/functional/bind_front.h" #include "absl/log/check.h" #include "absl/log/log.h" @@ -42,20 +54,6 @@ #include "absl/strings/str_replace.h" #include "absl/time/time.h" #include "absl/types/optional.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - #include "src/core/client_channel/backup_poller.h" #include "src/core/ext/filters/http/client/http_client_filter.h" #include "src/core/lib/address_utils/parse_address.h" diff --git a/test/cpp/end2end/xds/xds_end2end_test_lib.cc b/test/cpp/end2end/xds/xds_end2end_test_lib.cc index 1ba85995c09..7ddf6c7b607 100644 --- a/test/cpp/end2end/xds/xds_end2end_test_lib.cc +++ b/test/cpp/end2end/xds/xds_end2end_test_lib.cc @@ -15,6 +15,10 @@ #include "test/cpp/end2end/xds/xds_end2end_test_lib.h" +#include +#include +#include + #include #include #include @@ -23,9 +27,6 @@ #include #include -#include -#include - #include "absl/log/check.h" #include "absl/log/log.h" #include "absl/memory/memory.h" @@ -34,9 +35,6 @@ #include "absl/strings/str_join.h" #include "absl/strings/string_view.h" #include "absl/types/optional.h" - -#include - #include "src/core/ext/filters/http/server/http_server_filter.h" #include "src/core/server/server.h" #include "src/core/util/env.h" diff --git a/test/cpp/end2end/xds/xds_end2end_test_lib.h b/test/cpp/end2end/xds/xds_end2end_test_lib.h index 02e3fcbe50d..82164785750 100644 --- a/test/cpp/end2end/xds/xds_end2end_test_lib.h +++ b/test/cpp/end2end/xds/xds_end2end_test_lib.h @@ -16,30 +16,28 @@ #ifndef GRPC_TEST_CPP_END2END_XDS_XDS_END2END_TEST_LIB_H #define GRPC_TEST_CPP_END2END_XDS_XDS_END2END_TEST_LIB_H +#include +#include +#include +#include +#include +#include +#include +#include +#include + #include #include #include #include #include -#include -#include - #include "absl/log/check.h" #include "absl/log/log.h" #include "absl/status/statusor.h" #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" #include "absl/types/optional.h" - -#include -#include -#include -#include -#include -#include -#include - #include "src/core/lib/security/credentials/fake/fake_credentials.h" #include "src/core/lib/security/security_connector/ssl_utils.h" #include "src/cpp/server/secure_server_credentials.h" diff --git a/test/cpp/end2end/xds/xds_fallback_end2end_test.cc b/test/cpp/end2end/xds/xds_fallback_end2end_test.cc index 49e22de0e0b..a1b5c163cc1 100644 --- a/test/cpp/end2end/xds/xds_fallback_end2end_test.cc +++ b/test/cpp/end2end/xds/xds_fallback_end2end_test.cc @@ -12,22 +12,20 @@ // See the License for the specific language governing permissions and // limitations under the License. // +#include +#include +#include +#include +#include + #include #include #include #include -#include -#include - #include "absl/cleanup/cleanup.h" #include "absl/strings/str_format.h" #include "absl/strings/strip.h" - -#include -#include -#include - #include "src/core/lib/config/config_vars.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "src/proto/grpc/testing/echo_messages.pb.h" diff --git a/test/cpp/end2end/xds/xds_fault_injection_end2end_test.cc b/test/cpp/end2end/xds/xds_fault_injection_end2end_test.cc index 3c560fc5c5e..40b8ac3c24e 100644 --- a/test/cpp/end2end/xds/xds_fault_injection_end2end_test.cc +++ b/test/cpp/end2end/xds/xds_fault_injection_end2end_test.cc @@ -13,12 +13,12 @@ // limitations under the License. // -#include -#include - #include #include +#include +#include + #include "src/core/client_channel/backup_poller.h" #include "src/core/lib/config/config_vars.h" #include "src/proto/grpc/testing/xds/v3/cluster.grpc.pb.h" diff --git a/test/cpp/end2end/xds/xds_gcp_authn_end2end_test.cc b/test/cpp/end2end/xds/xds_gcp_authn_end2end_test.cc index 775eb60e6fc..19a0bae4a9d 100644 --- a/test/cpp/end2end/xds/xds_gcp_authn_end2end_test.cc +++ b/test/cpp/end2end/xds/xds_gcp_authn_end2end_test.cc @@ -14,14 +14,13 @@ // limitations under the License. // +#include + #include #include #include "gmock/gmock.h" #include "gtest/gtest.h" - -#include - #include "src/core/client_channel/backup_poller.h" #include "src/core/lib/config/config_vars.h" #include "src/core/util/http_client/httpcli.h" diff --git a/test/cpp/end2end/xds/xds_outlier_detection_end2end_test.cc b/test/cpp/end2end/xds/xds_outlier_detection_end2end_test.cc index 17df1d08cac..1c99747b18d 100644 --- a/test/cpp/end2end/xds/xds_outlier_detection_end2end_test.cc +++ b/test/cpp/end2end/xds/xds_outlier_detection_end2end_test.cc @@ -12,16 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include +#include + #include #include #include #include -#include -#include - #include "absl/log/check.h" - #include "src/core/client_channel/backup_poller.h" #include "src/core/lib/config/config_vars.h" #include "src/proto/grpc/testing/xds/v3/cluster.grpc.pb.h" diff --git a/test/cpp/end2end/xds/xds_override_host_end2end_test.cc b/test/cpp/end2end/xds/xds_override_host_end2end_test.cc index 69eb72cbddd..c166b5225a5 100644 --- a/test/cpp/end2end/xds/xds_override_host_end2end_test.cc +++ b/test/cpp/end2end/xds/xds_override_host_end2end_test.cc @@ -12,17 +12,16 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include -#include - #include #include +#include +#include + #include "absl/log/log.h" #include "absl/strings/str_format.h" #include "absl/strings/str_join.h" #include "absl/strings/str_split.h" - #include "src/core/lib/config/config_vars.h" #include "src/core/util/time.h" #include "src/proto/grpc/testing/xds/v3/stateful_session.pb.h" diff --git a/test/cpp/end2end/xds/xds_pick_first_end2end_test.cc b/test/cpp/end2end/xds/xds_pick_first_end2end_test.cc index f0d6796691d..9feba2fd859 100644 --- a/test/cpp/end2end/xds/xds_pick_first_end2end_test.cc +++ b/test/cpp/end2end/xds/xds_pick_first_end2end_test.cc @@ -13,6 +13,10 @@ // limitations under the License. // +#include +#include +#include +#include #include #include @@ -21,14 +25,7 @@ #include #include -#include -#include - #include "absl/strings/str_cat.h" - -#include -#include - #include "src/core/client_channel/backup_poller.h" #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/config/config_vars.h" diff --git a/test/cpp/end2end/xds/xds_ring_hash_end2end_test.cc b/test/cpp/end2end/xds/xds_ring_hash_end2end_test.cc index 86aba3e8121..8fee5c9c99d 100644 --- a/test/cpp/end2end/xds/xds_ring_hash_end2end_test.cc +++ b/test/cpp/end2end/xds/xds_ring_hash_end2end_test.cc @@ -13,19 +13,17 @@ // limitations under the License. // -#include -#include - #include +#include #include +#include +#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 "src/core/client_channel/backup_poller.h" #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/config/config_vars.h" diff --git a/test/cpp/end2end/xds/xds_rls_end2end_test.cc b/test/cpp/end2end/xds/xds_rls_end2end_test.cc index 2297d159ca9..2f3c9d0f79c 100644 --- a/test/cpp/end2end/xds/xds_rls_end2end_test.cc +++ b/test/cpp/end2end/xds/xds_rls_end2end_test.cc @@ -13,14 +13,13 @@ // limitations under the License. // -#include - #include #include +#include + #include "absl/memory/memory.h" #include "absl/strings/str_cat.h" - #include "src/core/client_channel/backup_poller.h" #include "src/core/lib/config/config_vars.h" #include "src/core/util/env.h" diff --git a/test/cpp/end2end/xds/xds_routing_end2end_test.cc b/test/cpp/end2end/xds/xds_routing_end2end_test.cc index 7b7a2be9a52..022b92660ed 100644 --- a/test/cpp/end2end/xds/xds_routing_end2end_test.cc +++ b/test/cpp/end2end/xds/xds_routing_end2end_test.cc @@ -12,16 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include +#include + #include #include #include #include -#include -#include - #include "absl/log/log.h" - #include "src/core/client_channel/backup_poller.h" #include "src/core/lib/config/config_vars.h" #include "src/proto/grpc/testing/xds/v3/fault.grpc.pb.h" diff --git a/test/cpp/end2end/xds/xds_server.cc b/test/cpp/end2end/xds/xds_server.cc index bbae462c994..4b7450eb171 100644 --- a/test/cpp/end2end/xds/xds_server.cc +++ b/test/cpp/end2end/xds/xds_server.cc @@ -25,7 +25,6 @@ #include "absl/log/check.h" #include "absl/log/log.h" #include "absl/types/optional.h" - #include "src/core/lib/address_utils/parse_address.h" #include "src/core/util/crash.h" #include "src/core/util/sync.h" diff --git a/test/cpp/end2end/xds/xds_server.h b/test/cpp/end2end/xds/xds_server.h index 2b6c508faf7..5ba992abc59 100644 --- a/test/cpp/end2end/xds/xds_server.h +++ b/test/cpp/end2end/xds/xds_server.h @@ -17,6 +17,8 @@ #ifndef GRPC_TEST_CPP_END2END_XDS_XDS_SERVER_H #define GRPC_TEST_CPP_END2END_XDS_XDS_SERVER_H +#include + #include #include #include @@ -26,9 +28,6 @@ #include "absl/log/check.h" #include "absl/log/log.h" #include "absl/types/optional.h" - -#include - #include "src/core/lib/address_utils/parse_address.h" #include "src/core/util/crash.h" #include "src/core/util/sync.h" diff --git a/test/cpp/end2end/xds/xds_utils.cc b/test/cpp/end2end/xds/xds_utils.cc index c52e819172e..28314835ffa 100644 --- a/test/cpp/end2end/xds/xds_utils.cc +++ b/test/cpp/end2end/xds/xds_utils.cc @@ -15,6 +15,8 @@ #include "test/cpp/end2end/xds/xds_utils.h" +#include + #include #include #include @@ -30,9 +32,6 @@ #include "absl/strings/str_replace.h" #include "absl/strings/string_view.h" #include "absl/types/optional.h" - -#include - #include "src/core/ext/filters/http/server/http_server_filter.h" #include "src/core/server/server.h" #include "src/core/util/env.h" diff --git a/test/cpp/end2end/xds/xds_utils.h b/test/cpp/end2end/xds/xds_utils.h index 039dd19c53e..7d9a95ffe49 100644 --- a/test/cpp/end2end/xds/xds_utils.h +++ b/test/cpp/end2end/xds/xds_utils.h @@ -20,7 +20,6 @@ #include #include "absl/strings/string_view.h" - #include "src/proto/grpc/testing/xds/v3/cluster.pb.h" #include "src/proto/grpc/testing/xds/v3/endpoint.pb.h" #include "src/proto/grpc/testing/xds/v3/http_connection_manager.pb.h" diff --git a/test/cpp/end2end/xds/xds_wrr_end2end_test.cc b/test/cpp/end2end/xds/xds_wrr_end2end_test.cc index da8cea70f54..bdd42fcedd4 100644 --- a/test/cpp/end2end/xds/xds_wrr_end2end_test.cc +++ b/test/cpp/end2end/xds/xds_wrr_end2end_test.cc @@ -13,19 +13,17 @@ // limitations under the License. // -#include -#include - #include +#include +#include #include +#include +#include + #include "absl/log/log.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" - -#include -#include - #include "src/core/client_channel/backup_poller.h" #include "src/core/lib/config/config_vars.h" #include "src/proto/grpc/testing/xds/v3/client_side_weighted_round_robin.grpc.pb.h" diff --git a/test/cpp/ext/chaotic_good_test.cc b/test/cpp/ext/chaotic_good_test.cc index d77a3b98d55..c7d7927354d 100644 --- a/test/cpp/ext/chaotic_good_test.cc +++ b/test/cpp/ext/chaotic_good_test.cc @@ -14,10 +14,9 @@ #include "src/cpp/ext/chaotic_good.h" -#include "gtest/gtest.h" - #include +#include "gtest/gtest.h" #include "test/core/test_util/test_config.h" namespace grpc { diff --git a/test/cpp/ext/csm/csm_observability_test.cc b/test/cpp/ext/csm/csm_observability_test.cc index 380c8940b7a..c36b37efee1 100644 --- a/test/cpp/ext/csm/csm_observability_test.cc +++ b/test/cpp/ext/csm/csm_observability_test.cc @@ -18,13 +18,12 @@ #include "src/cpp/ext/csm/csm_observability.h" -#include "google/cloud/opentelemetry/resource_detector.h" -#include "gtest/gtest.h" -#include "opentelemetry/sdk/metrics/meter_provider.h" - #include #include +#include "google/cloud/opentelemetry/resource_detector.h" +#include "gtest/gtest.h" +#include "opentelemetry/sdk/metrics/meter_provider.h" #include "src/core/xds/grpc/xds_enabled_server.h" #include "test/core/test_util/test_config.h" diff --git a/test/cpp/ext/csm/mesh_id_test.cc b/test/cpp/ext/csm/mesh_id_test.cc index e1a7f86fc80..c18526dbf84 100644 --- a/test/cpp/ext/csm/mesh_id_test.cc +++ b/test/cpp/ext/csm/mesh_id_test.cc @@ -16,10 +16,9 @@ // // -#include "gtest/gtest.h" - #include +#include "gtest/gtest.h" #include "src/core/util/env.h" #include "src/core/util/tmpfile.h" #include "src/cpp/ext/csm/metadata_exchange.h" diff --git a/test/cpp/ext/csm/metadata_exchange_test.cc b/test/cpp/ext/csm/metadata_exchange_test.cc index 1b85eaf185a..08fb8bd9823 100644 --- a/test/cpp/ext/csm/metadata_exchange_test.cc +++ b/test/cpp/ext/csm/metadata_exchange_test.cc @@ -18,6 +18,9 @@ #include "src/cpp/ext/csm/metadata_exchange.h" +#include +#include + #include "absl/functional/any_invocable.h" #include "gmock/gmock.h" #include "google/cloud/opentelemetry/resource_detector.h" @@ -25,10 +28,6 @@ #include "opentelemetry/metrics/provider.h" #include "opentelemetry/sdk/metrics/meter_provider.h" #include "opentelemetry/sdk/metrics/metric_reader.h" - -#include -#include - #include "src/core/lib/config/core_configuration.h" #include "src/core/telemetry/call_tracer.h" #include "src/core/util/env.h" diff --git a/test/cpp/ext/filters/census/constant_labels_test.cc b/test/cpp/ext/filters/census/constant_labels_test.cc index 0f7c6128814..0688e5c07b6 100644 --- a/test/cpp/ext/filters/census/constant_labels_test.cc +++ b/test/cpp/ext/filters/census/constant_labels_test.cc @@ -16,6 +16,9 @@ // // +#include +#include + #include #include // NOLINT #include @@ -26,10 +29,6 @@ #include "opencensus/stats/stats.h" #include "opencensus/stats/testing/test_utils.h" #include "opencensus/tags/tag_map.h" - -#include -#include - #include "src/cpp/ext/filters/census/context.h" #include "src/cpp/ext/filters/census/grpc_plugin.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" diff --git a/test/cpp/ext/filters/census/library.h b/test/cpp/ext/filters/census/library.h index 243dd968f64..c1fa9f58f71 100644 --- a/test/cpp/ext/filters/census/library.h +++ b/test/cpp/ext/filters/census/library.h @@ -19,6 +19,9 @@ #ifndef GRPC_TEST_CPP_EXT_FILTERS_CENSUS_LIBRARY_H #define GRPC_TEST_CPP_EXT_FILTERS_CENSUS_LIBRARY_H +#include +#include + #include #include // NOLINT #include @@ -27,10 +30,6 @@ #include "gtest/gtest.h" #include "opencensus/stats/stats.h" #include "opencensus/trace/exporter/span_exporter.h" - -#include -#include - #include "src/core/lib/config/core_configuration.h" #include "src/cpp/client/client_stats_interceptor.h" #include "src/cpp/ext/filters/census/client_filter.h" diff --git a/test/cpp/ext/filters/census/stats_plugin_end2end_test.cc b/test/cpp/ext/filters/census/stats_plugin_end2end_test.cc index d569b1a41c9..3bad979cd29 100644 --- a/test/cpp/ext/filters/census/stats_plugin_end2end_test.cc +++ b/test/cpp/ext/filters/census/stats_plugin_end2end_test.cc @@ -16,6 +16,9 @@ // // +#include +#include + #include #include // NOLINT #include @@ -29,10 +32,6 @@ #include "opencensus/stats/testing/test_utils.h" #include "opencensus/tags/tag_map.h" #include "opencensus/tags/with_tag_map.h" - -#include -#include - #include "src/core/lib/experiments/experiments.h" #include "src/cpp/ext/filters/census/context.h" #include "src/cpp/ext/filters/census/grpc_plugin.h" diff --git a/test/cpp/ext/filters/logging/library.h b/test/cpp/ext/filters/logging/library.h index f1ca3fc9576..bffa8a18fe7 100644 --- a/test/cpp/ext/filters/logging/library.h +++ b/test/cpp/ext/filters/logging/library.h @@ -19,6 +19,10 @@ #ifndef GRPC_TEST_CPP_EXT_FILTERS_LOGGING_LIBRARY_H #define GRPC_TEST_CPP_EXT_FILTERS_LOGGING_LIBRARY_H +#include +#include +#include + #include #include // NOLINT @@ -29,11 +33,6 @@ #include "gmock/gmock.h" #include "google/protobuf/text_format.h" #include "gtest/gtest.h" - -#include -#include -#include - #include "src/core/ext/filters/logging/logging_filter.h" #include "src/core/util/sync.h" #include "src/cpp/ext/gcp/observability_logging_sink.h" diff --git a/test/cpp/ext/filters/logging/logging_census_integration_test.cc b/test/cpp/ext/filters/logging/logging_census_integration_test.cc index 622c93ffbb4..e6142d4f8fa 100644 --- a/test/cpp/ext/filters/logging/logging_census_integration_test.cc +++ b/test/cpp/ext/filters/logging/logging_census_integration_test.cc @@ -16,6 +16,10 @@ // // +#include +#include +#include + #include #include // NOLINT @@ -25,11 +29,6 @@ #include "google/protobuf/text_format.h" #include "gtest/gtest.h" #include "opencensus/stats/testing/test_utils.h" - -#include -#include -#include - #include "src/core/ext/filters/logging/logging_filter.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/util/sync.h" diff --git a/test/cpp/ext/filters/logging/logging_test.cc b/test/cpp/ext/filters/logging/logging_test.cc index 6441e1cefcf..e94c5c5889e 100644 --- a/test/cpp/ext/filters/logging/logging_test.cc +++ b/test/cpp/ext/filters/logging/logging_test.cc @@ -16,6 +16,9 @@ // // +#include +#include + #include #include // NOLINT @@ -24,10 +27,6 @@ #include "gmock/gmock.h" #include "google/protobuf/text_format.h" #include "gtest/gtest.h" - -#include -#include - #include "src/core/ext/filters/logging/logging_filter.h" #include "src/core/util/dump_args.h" #include "src/core/util/sync.h" diff --git a/test/cpp/ext/gcp/environment_autodetect_test.cc b/test/cpp/ext/gcp/environment_autodetect_test.cc index d466a48ba93..fa707266829 100644 --- a/test/cpp/ext/gcp/environment_autodetect_test.cc +++ b/test/cpp/ext/gcp/environment_autodetect_test.cc @@ -18,6 +18,8 @@ #include "src/cpp/ext/gcp/environment_autodetect.h" +#include + #include #include // NOLINT #include @@ -26,9 +28,6 @@ #include "absl/synchronization/notification.h" #include "gmock/gmock.h" #include "gtest/gtest.h" - -#include - #include "src/core/util/env.h" #include "src/core/util/notification.h" #include "test/core/test_util/test_config.h" diff --git a/test/cpp/ext/gcp/observability_config_test.cc b/test/cpp/ext/gcp/observability_config_test.cc index 391832b13d5..31ba998455f 100644 --- a/test/cpp/ext/gcp/observability_config_test.cc +++ b/test/cpp/ext/gcp/observability_config_test.cc @@ -16,11 +16,10 @@ #include "src/cpp/ext/gcp/observability_config.h" -#include "gmock/gmock.h" -#include "gtest/gtest.h" - #include +#include "gmock/gmock.h" +#include "gtest/gtest.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/util/env.h" #include "src/core/util/json/json_reader.h" diff --git a/test/cpp/ext/gcp/observability_logging_sink_test.cc b/test/cpp/ext/gcp/observability_logging_sink_test.cc index 2349fe6b60c..f425fb7ac64 100644 --- a/test/cpp/ext/gcp/observability_logging_sink_test.cc +++ b/test/cpp/ext/gcp/observability_logging_sink_test.cc @@ -21,7 +21,6 @@ #include "gmock/gmock.h" #include "google/protobuf/text_format.h" #include "gtest/gtest.h" - #include "src/core/util/json/json_reader.h" #include "test/core/test_util/test_config.h" diff --git a/test/cpp/ext/gcp/observability_test.cc b/test/cpp/ext/gcp/observability_test.cc index 93779f9da40..ca26f6a9e93 100644 --- a/test/cpp/ext/gcp/observability_test.cc +++ b/test/cpp/ext/gcp/observability_test.cc @@ -14,12 +14,11 @@ // limitations under the License. // -#include "gmock/gmock.h" -#include "gtest/gtest.h" - #include #include +#include "gmock/gmock.h" +#include "gtest/gtest.h" #include "src/core/lib/config/core_configuration.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "src/proto/grpc/testing/echo_messages.pb.h" diff --git a/test/cpp/ext/otel/otel_plugin_test.cc b/test/cpp/ext/otel/otel_plugin_test.cc index d5f95377d00..4c96d0eef26 100644 --- a/test/cpp/ext/otel/otel_plugin_test.cc +++ b/test/cpp/ext/otel/otel_plugin_test.cc @@ -18,6 +18,9 @@ #include "src/cpp/ext/otel/otel_plugin.h" +#include +#include + #include #include #include @@ -34,10 +37,6 @@ #include "opentelemetry/sdk/metrics/data/point_data.h" #include "opentelemetry/sdk/metrics/meter_provider.h" #include "opentelemetry/sdk/metrics/metric_reader.h" - -#include -#include - #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/event_engine/channel_args_endpoint_config.h" #include "src/core/telemetry/call_tracer.h" diff --git a/test/cpp/ext/otel/otel_test_library.cc b/test/cpp/ext/otel/otel_test_library.cc index 131aeef222f..15bc96c63c1 100644 --- a/test/cpp/ext/otel/otel_test_library.cc +++ b/test/cpp/ext/otel/otel_test_library.cc @@ -18,6 +18,8 @@ #include "test/cpp/ext/otel/otel_test_library.h" +#include + #include #include @@ -28,9 +30,6 @@ #include "opentelemetry/sdk/metrics/export/metric_producer.h" #include "opentelemetry/sdk/metrics/meter_provider.h" #include "opentelemetry/sdk/metrics/metric_reader.h" - -#include - #include "src/core/lib/channel/promise_based_filter.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/telemetry/call_tracer.h" diff --git a/test/cpp/ext/otel/otel_test_library.h b/test/cpp/ext/otel/otel_test_library.h index 38859f68710..78195fe3541 100644 --- a/test/cpp/ext/otel/otel_test_library.h +++ b/test/cpp/ext/otel/otel_test_library.h @@ -19,6 +19,10 @@ #ifndef GRPC_TEST_CPP_EXT_OTEL_OTEL_TEST_LIBRARY_H #define GRPC_TEST_CPP_EXT_OTEL_OTEL_TEST_LIBRARY_H +#include +#include +#include + #include #include @@ -28,11 +32,6 @@ #include "opentelemetry/metrics/provider.h" #include "opentelemetry/sdk/metrics/meter_provider.h" #include "opentelemetry/sdk/metrics/metric_reader.h" - -#include -#include -#include - #include "src/core/lib/config/core_configuration.h" #include "src/core/telemetry/call_tracer.h" #include "src/cpp/ext/otel/otel_plugin.h" diff --git a/test/cpp/grpclb/grpclb_api_test.cc b/test/cpp/grpclb/grpclb_api_test.cc index 31298a2c9c2..b7ee1423d77 100644 --- a/test/cpp/grpclb/grpclb_api_test.cc +++ b/test/cpp/grpclb/grpclb_api_test.cc @@ -16,20 +16,18 @@ // // +#include +#include #include #include "absl/log/check.h" #include "google/protobuf/duration.upb.h" -#include "upb/mem/arena.hpp" - -#include -#include - #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/iomgr/sockaddr.h" #include "src/core/load_balancing/grpclb/load_balancer_api.h" #include "src/proto/grpc/lb/v1/load_balancer.pb.h" // C++ version #include "test/core/test_util/test_config.h" +#include "upb/mem/arena.hpp" namespace grpc { namespace { diff --git a/test/cpp/interop/backend_metrics_lb_policy.cc b/test/cpp/interop/backend_metrics_lb_policy.cc index 55487bc221b..58be2709fe0 100644 --- a/test/cpp/interop/backend_metrics_lb_policy.cc +++ b/test/cpp/interop/backend_metrics_lb_policy.cc @@ -18,12 +18,11 @@ #include "test/cpp/interop/backend_metrics_lb_policy.h" +#include + #include "absl/log/check.h" #include "absl/log/log.h" #include "absl/strings/str_format.h" - -#include - #include "src/core/lib/iomgr/pollset_set.h" #include "src/core/load_balancing/delegating_helper.h" #include "src/core/load_balancing/oob_backend_metric.h" diff --git a/test/cpp/interop/backend_metrics_lb_policy_test.cc b/test/cpp/interop/backend_metrics_lb_policy_test.cc index 0a5fb277bab..1d2dc8372d2 100644 --- a/test/cpp/interop/backend_metrics_lb_policy_test.cc +++ b/test/cpp/interop/backend_metrics_lb_policy_test.cc @@ -18,17 +18,16 @@ #include "test/cpp/interop/backend_metrics_lb_policy.h" -#include -#include - #include -#include - #include #include #include #include #include +#include + +#include +#include #include "src/core/lib/config/config_vars.h" #include "src/core/util/sync.h" diff --git a/test/cpp/interop/client.cc b/test/cpp/interop/client.cc index fe211e71ddb..4802be5786e 100644 --- a/test/cpp/interop/client.cc +++ b/test/cpp/interop/client.cc @@ -16,18 +16,17 @@ // // -#include -#include - -#include "absl/flags/flag.h" -#include "absl/log/log.h" - #include #include #include #include #include +#include +#include + +#include "absl/flags/flag.h" +#include "absl/log/log.h" #include "src/core/util/crash.h" #include "src/core/util/string.h" #include "test/core/test_util/test_config.h" diff --git a/test/cpp/interop/client_helper.cc b/test/cpp/interop/client_helper.cc index 8963aecc4ff..b5c78dd303a 100644 --- a/test/cpp/interop/client_helper.cc +++ b/test/cpp/interop/client_helper.cc @@ -18,6 +18,13 @@ #include "test/cpp/interop/client_helper.h" +#include +#include +#include +#include +#include +#include + #include #include #include @@ -28,14 +35,6 @@ #include "absl/log/log.h" #include "absl/strings/escaping.h" #include "absl/strings/match.h" - -#include -#include -#include -#include -#include -#include - #include "test/core/security/oauth2_utils.h" #include "test/cpp/util/create_test_channel.h" #include "test/cpp/util/test_credentials_provider.h" diff --git a/test/cpp/interop/client_helper.h b/test/cpp/interop/client_helper.h index 35bd62f5a58..1c1ed0d4223 100644 --- a/test/cpp/interop/client_helper.h +++ b/test/cpp/interop/client_helper.h @@ -19,14 +19,14 @@ #ifndef GRPC_TEST_CPP_INTEROP_CLIENT_HELPER_H #define GRPC_TEST_CPP_INTEROP_CLIENT_HELPER_H -#include -#include -#include - #include #include #include +#include +#include +#include + #include "src/core/lib/surface/call_test_only.h" #include "src/core/lib/transport/transport.h" diff --git a/test/cpp/interop/grpclb_fallback_test.cc b/test/cpp/interop/grpclb_fallback_test.cc index 7d3c637fee2..2a8a02c6fc3 100644 --- a/test/cpp/interop/grpclb_fallback_test.cc +++ b/test/cpp/interop/grpclb_fallback_test.cc @@ -18,6 +18,12 @@ #include #include +#include +#include +#include +#include +#include +#include #include #include #include @@ -35,14 +41,6 @@ #include "absl/log/log.h" #include "absl/strings/str_format.h" #include "absl/time/time.h" - -#include -#include -#include -#include -#include -#include - #include "src/core/lib/iomgr/port.h" #include "src/core/lib/iomgr/socket_mutator.h" #include "src/core/util/crash.h" diff --git a/test/cpp/interop/http2_client.cc b/test/cpp/interop/http2_client.cc index d19b0b6616a..76e7794b427 100644 --- a/test/cpp/interop/http2_client.cc +++ b/test/cpp/interop/http2_client.cc @@ -18,17 +18,16 @@ #include "test/cpp/interop/http2_client.h" +#include +#include +#include + #include #include "absl/flags/flag.h" #include "absl/log/check.h" #include "absl/log/log.h" #include "absl/strings/str_format.h" - -#include -#include -#include - #include "src/core/util/crash.h" #include "src/core/util/string.h" #include "src/core/util/useful.h" diff --git a/test/cpp/interop/http2_client.h b/test/cpp/interop/http2_client.h index 4eeaaf4125b..d6aeaa2a35a 100644 --- a/test/cpp/interop/http2_client.h +++ b/test/cpp/interop/http2_client.h @@ -19,11 +19,11 @@ #ifndef GRPC_TEST_CPP_INTEROP_HTTP2_CLIENT_H #define GRPC_TEST_CPP_INTEROP_HTTP2_CLIENT_H -#include - #include #include +#include + #include "src/proto/grpc/testing/messages.pb.h" #include "src/proto/grpc/testing/test.grpc.pb.h" diff --git a/test/cpp/interop/interop_client.cc b/test/cpp/interop/interop_client.cc index 1190ecd7476..d259cdcfd26 100644 --- a/test/cpp/interop/interop_client.cc +++ b/test/cpp/interop/interop_client.cc @@ -18,6 +18,14 @@ #include "test/cpp/interop/interop_client.h" +#include +#include +#include +#include +#include +#include +#include + #include #include #include @@ -32,15 +40,6 @@ #include "absl/strings/str_format.h" #include "absl/strings/str_join.h" #include "absl/types/optional.h" - -#include -#include -#include -#include -#include -#include -#include - #include "src/core/lib/config/config_vars.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/util/crash.h" diff --git a/test/cpp/interop/interop_client.h b/test/cpp/interop/interop_client.h index cfebf466678..2cf3fa81b10 100644 --- a/test/cpp/interop/interop_client.h +++ b/test/cpp/interop/interop_client.h @@ -19,12 +19,12 @@ #ifndef GRPC_TEST_CPP_INTEROP_INTEROP_CLIENT_H #define GRPC_TEST_CPP_INTEROP_INTEROP_CLIENT_H -#include -#include - #include #include +#include +#include + #include "src/proto/grpc/testing/messages.pb.h" #include "src/proto/grpc/testing/test.grpc.pb.h" #include "test/cpp/interop/backend_metrics_lb_policy.h" diff --git a/test/cpp/interop/interop_server.cc b/test/cpp/interop/interop_server.cc index 25f5f633bfc..f22d4bf035c 100644 --- a/test/cpp/interop/interop_server.cc +++ b/test/cpp/interop/interop_server.cc @@ -16,15 +16,6 @@ // // -#include -#include -#include -#include - -#include "absl/flags/flag.h" -#include "absl/log/check.h" -#include "absl/log/log.h" - #include #include #include @@ -35,6 +26,14 @@ #include #include +#include +#include +#include +#include + +#include "absl/flags/flag.h" +#include "absl/log/check.h" +#include "absl/log/log.h" #include "src/core/util/crash.h" #include "src/core/util/string.h" #include "src/core/util/sync.h" diff --git a/test/cpp/interop/interop_test.cc b/test/cpp/interop/interop_test.cc index 1134971371d..74c30d778fd 100644 --- a/test/cpp/interop/interop_test.cc +++ b/test/cpp/interop/interop_test.cc @@ -17,6 +17,7 @@ // #include +#include #include #include #include @@ -31,9 +32,6 @@ #include "absl/flags/flag.h" #include "absl/log/log.h" #include "absl/strings/str_cat.h" - -#include - #include "src/core/lib/iomgr/socket_utils_posix.h" #include "src/core/util/crash.h" #include "src/core/util/string.h" diff --git a/test/cpp/interop/istio_echo_server.cc b/test/cpp/interop/istio_echo_server.cc index bb24edcae46..f661911f3e3 100644 --- a/test/cpp/interop/istio_echo_server.cc +++ b/test/cpp/interop/istio_echo_server.cc @@ -14,6 +14,15 @@ // limitations under the License. // +#include +#include +#include +#include +#include +#include +#include +#include + #include #include #include @@ -34,16 +43,6 @@ #include "absl/strings/str_format.h" #include "absl/strings/str_join.h" #include "absl/strings/str_split.h" - -#include -#include -#include -#include -#include -#include -#include -#include - #include "src/core/lib/channel/status_util.h" #include "src/core/util/env.h" #include "src/core/util/gethostname.h" diff --git a/test/cpp/interop/istio_echo_server_lib.cc b/test/cpp/interop/istio_echo_server_lib.cc index f0ddd49c80a..8d8949a820b 100644 --- a/test/cpp/interop/istio_echo_server_lib.cc +++ b/test/cpp/interop/istio_echo_server_lib.cc @@ -16,6 +16,9 @@ #include "test/cpp/interop/istio_echo_server_lib.h" +#include +#include + #include #include "absl/log/log.h" @@ -23,10 +26,6 @@ #include "absl/strings/str_format.h" #include "absl/strings/str_split.h" #include "absl/synchronization/blocking_counter.h" - -#include -#include - #include "src/core/util/host_port.h" #include "src/proto/grpc/testing/istio_echo.pb.h" diff --git a/test/cpp/interop/istio_echo_server_test.cc b/test/cpp/interop/istio_echo_server_test.cc index faa9a47ac57..927103e405e 100644 --- a/test/cpp/interop/istio_echo_server_test.cc +++ b/test/cpp/interop/istio_echo_server_test.cc @@ -14,19 +14,17 @@ // limitations under the License. // -#include - #include -#include - -#include "absl/strings/str_cat.h" -#include "absl/strings/str_format.h" - #include #include #include #include +#include + +#include +#include "absl/strings/str_cat.h" +#include "absl/strings/str_format.h" #include "src/core/util/crash.h" #include "src/core/util/host_port.h" #include "test/core/test_util/port.h" diff --git a/test/cpp/interop/metrics_client.cc b/test/cpp/interop/metrics_client.cc index 9eb4f488b14..06352eaed6b 100644 --- a/test/cpp/interop/metrics_client.cc +++ b/test/cpp/interop/metrics_client.cc @@ -16,13 +16,12 @@ // is % allowed in string // +#include + #include #include #include "absl/flags/flag.h" - -#include - #include "src/core/util/crash.h" #include "src/proto/grpc/testing/metrics.grpc.pb.h" #include "src/proto/grpc/testing/metrics.pb.h" diff --git a/test/cpp/interop/observability_client.cc b/test/cpp/interop/observability_client.cc index c264aa504ec..8e2132dcd98 100644 --- a/test/cpp/interop/observability_client.cc +++ b/test/cpp/interop/observability_client.cc @@ -16,6 +16,13 @@ // // +#include +#include +#include +#include +#include +#include + #include #include @@ -24,14 +31,6 @@ #include "opentelemetry/exporters/prometheus/exporter_factory.h" #include "opentelemetry/exporters/prometheus/exporter_options.h" #include "opentelemetry/sdk/metrics/meter_provider.h" - -#include -#include -#include -#include -#include -#include - #include "src/core/util/crash.h" #include "src/core/util/string.h" #include "test/core/test_util/test_config.h" diff --git a/test/cpp/interop/observability_interop_server_bootstrap.cc b/test/cpp/interop/observability_interop_server_bootstrap.cc index f14755b5cd9..097ff933d03 100644 --- a/test/cpp/interop/observability_interop_server_bootstrap.cc +++ b/test/cpp/interop/observability_interop_server_bootstrap.cc @@ -16,13 +16,11 @@ // // +#include #include #include "absl/flags/flag.h" #include "absl/log/log.h" - -#include - #include "test/core/test_util/test_config.h" #include "test/cpp/interop/server_helper.h" #include "test/cpp/util/test_config.h" diff --git a/test/cpp/interop/pre_stop_hook_server.cc b/test/cpp/interop/pre_stop_hook_server.cc index a00ab791a9d..ea8b7d8b807 100644 --- a/test/cpp/interop/pre_stop_hook_server.cc +++ b/test/cpp/interop/pre_stop_hook_server.cc @@ -18,12 +18,11 @@ #include "test/cpp/interop/pre_stop_hook_server.h" +#include + #include #include "absl/strings/str_format.h" - -#include - #include "src/core/util/sync.h" #include "src/proto/grpc/testing/messages.pb.h" diff --git a/test/cpp/interop/pre_stop_hook_server_test.cc b/test/cpp/interop/pre_stop_hook_server_test.cc index 32aa91b1bc2..0097a9e3fbc 100644 --- a/test/cpp/interop/pre_stop_hook_server_test.cc +++ b/test/cpp/interop/pre_stop_hook_server_test.cc @@ -16,17 +16,15 @@ #include "test/cpp/interop/pre_stop_hook_server.h" -#include - #include -#include - -#include "absl/strings/str_format.h" - #include #include #include +#include +#include + +#include "absl/strings/str_format.h" #include "src/core/util/sync.h" #include "src/proto/grpc/testing/empty.pb.h" #include "src/proto/grpc/testing/messages.pb.h" diff --git a/test/cpp/interop/reconnect_interop_client.cc b/test/cpp/interop/reconnect_interop_client.cc index 1c2e4837ec0..bb46bfedd10 100644 --- a/test/cpp/interop/reconnect_interop_client.cc +++ b/test/cpp/interop/reconnect_interop_client.cc @@ -16,18 +16,17 @@ // // +#include +#include +#include +#include + #include #include #include "absl/flags/flag.h" #include "absl/log/check.h" #include "absl/log/log.h" - -#include -#include -#include -#include - #include "src/core/util/crash.h" #include "src/proto/grpc/testing/empty.pb.h" #include "src/proto/grpc/testing/messages.pb.h" diff --git a/test/cpp/interop/reconnect_interop_server.cc b/test/cpp/interop/reconnect_interop_server.cc index a5ac668bb29..a118802661c 100644 --- a/test/cpp/interop/reconnect_interop_server.cc +++ b/test/cpp/interop/reconnect_interop_server.cc @@ -18,6 +18,10 @@ // Test description at doc/connection-backoff-interop-test-description.md +#include +#include +#include +#include #include #include @@ -28,12 +32,6 @@ #include "absl/flags/flag.h" #include "absl/log/check.h" #include "absl/log/log.h" - -#include -#include -#include -#include - #include "src/core/util/crash.h" #include "src/proto/grpc/testing/empty.pb.h" #include "src/proto/grpc/testing/messages.pb.h" diff --git a/test/cpp/interop/rpc_behavior_lb_policy.cc b/test/cpp/interop/rpc_behavior_lb_policy.cc index 8d8826a03d1..4b8cfc10956 100644 --- a/test/cpp/interop/rpc_behavior_lb_policy.cc +++ b/test/cpp/interop/rpc_behavior_lb_policy.cc @@ -18,11 +18,10 @@ #include "test/cpp/interop/rpc_behavior_lb_policy.h" -#include "absl/log/check.h" -#include "absl/strings/str_format.h" - #include +#include "absl/log/check.h" +#include "absl/strings/str_format.h" #include "src/core/lib/iomgr/pollset_set.h" #include "src/core/load_balancing/delegating_helper.h" #include "src/core/util/json/json_args.h" diff --git a/test/cpp/interop/server_helper.cc b/test/cpp/interop/server_helper.cc index 8dfc5576d7a..e79912f3bde 100644 --- a/test/cpp/interop/server_helper.cc +++ b/test/cpp/interop/server_helper.cc @@ -18,13 +18,12 @@ #include "test/cpp/interop/server_helper.h" +#include + #include #include "absl/flags/declare.h" #include "absl/flags/flag.h" - -#include - #include "src/core/lib/surface/call_test_only.h" #include "src/core/lib/transport/transport.h" #include "test/cpp/util/test_credentials_provider.h" diff --git a/test/cpp/interop/server_helper.h b/test/cpp/interop/server_helper.h index 9acb77f624e..bdec6cf4b1e 100644 --- a/test/cpp/interop/server_helper.h +++ b/test/cpp/interop/server_helper.h @@ -19,9 +19,6 @@ #ifndef GRPC_TEST_CPP_INTEROP_SERVER_HELPER_H #define GRPC_TEST_CPP_INTEROP_SERVER_HELPER_H -#include -#include - #include #include #include @@ -29,6 +26,9 @@ #include #include +#include +#include + namespace grpc { namespace testing { diff --git a/test/cpp/interop/stress_interop_client.cc b/test/cpp/interop/stress_interop_client.cc index 0ccacfaefb1..cf92bd1ba8b 100644 --- a/test/cpp/interop/stress_interop_client.cc +++ b/test/cpp/interop/stress_interop_client.cc @@ -18,6 +18,8 @@ #include "test/cpp/interop/stress_interop_client.h" +#include + #include #include #include @@ -25,9 +27,6 @@ #include "absl/log/check.h" #include "absl/log/log.h" #include "absl/strings/str_format.h" - -#include - #include "src/core/util/crash.h" #include "test/cpp/interop/interop_client.h" #include "test/cpp/util/metrics_server.h" diff --git a/test/cpp/interop/stress_interop_client.h b/test/cpp/interop/stress_interop_client.h index cdc8bf91727..4744bed86c4 100644 --- a/test/cpp/interop/stress_interop_client.h +++ b/test/cpp/interop/stress_interop_client.h @@ -19,12 +19,12 @@ #ifndef GRPC_TEST_CPP_INTEROP_STRESS_INTEROP_CLIENT_H #define GRPC_TEST_CPP_INTEROP_STRESS_INTEROP_CLIENT_H +#include + #include #include #include -#include - #include "test/cpp/interop/interop_client.h" #include "test/cpp/util/metrics_server.h" diff --git a/test/cpp/interop/stress_test.cc b/test/cpp/interop/stress_test.cc index 3f27484111c..addf9bfb14f 100644 --- a/test/cpp/interop/stress_test.cc +++ b/test/cpp/interop/stress_test.cc @@ -16,6 +16,9 @@ // is % allowed in string // +#include +#include +#include #include #include @@ -28,11 +31,6 @@ #include "absl/log/check.h" #include "absl/log/globals.h" #include "absl/log/log.h" - -#include -#include -#include - #include "src/core/util/crash.h" #include "src/proto/grpc/testing/metrics.grpc.pb.h" #include "src/proto/grpc/testing/metrics.pb.h" diff --git a/test/cpp/interop/xds_federation_client.cc b/test/cpp/interop/xds_federation_client.cc index 8c8c4ffc6b7..2edbf491815 100644 --- a/test/cpp/interop/xds_federation_client.cc +++ b/test/cpp/interop/xds_federation_client.cc @@ -16,6 +16,9 @@ // // +#include +#include + #include #include @@ -23,10 +26,6 @@ #include "absl/log/check.h" #include "absl/log/log.h" #include "absl/strings/str_split.h" - -#include -#include - #include "src/core/util/string.h" #include "test/core/test_util/test_config.h" #include "test/cpp/interop/client_helper.h" diff --git a/test/cpp/interop/xds_interop_client.cc b/test/cpp/interop/xds_interop_client.cc index f3af46b19f2..d2296032267 100644 --- a/test/cpp/interop/xds_interop_client.cc +++ b/test/cpp/interop/xds_interop_client.cc @@ -16,6 +16,14 @@ // // +#include +#include +#include +#include +#include +#include +#include + #include #include #include @@ -38,15 +46,6 @@ #include "opentelemetry/exporters/prometheus/exporter_factory.h" #include "opentelemetry/exporters/prometheus/exporter_options.h" #include "opentelemetry/sdk/metrics/meter_provider.h" - -#include -#include -#include -#include -#include -#include -#include - #include "src/core/lib/channel/status_util.h" #include "src/core/util/env.h" #include "src/proto/grpc/testing/empty.pb.h" diff --git a/test/cpp/interop/xds_interop_server.cc b/test/cpp/interop/xds_interop_server.cc index eb2fa7ad08f..8d70944b4e7 100644 --- a/test/cpp/interop/xds_interop_server.cc +++ b/test/cpp/interop/xds_interop_server.cc @@ -16,6 +16,10 @@ // // +#include +#include +#include + #include #include "absl/flags/flag.h" @@ -23,11 +27,6 @@ #include "opentelemetry/exporters/prometheus/exporter_factory.h" #include "opentelemetry/exporters/prometheus/exporter_options.h" #include "opentelemetry/sdk/metrics/meter_provider.h" - -#include -#include -#include - #include "src/core/util/gethostname.h" #include "test/core/test_util/test_config.h" #include "test/cpp/interop/xds_interop_server_lib.h" diff --git a/test/cpp/interop/xds_interop_server_lib.cc b/test/cpp/interop/xds_interop_server_lib.cc index 6a4202ff9fa..5a7d4ce3f2c 100644 --- a/test/cpp/interop/xds_interop_server_lib.cc +++ b/test/cpp/interop/xds_interop_server_lib.cc @@ -18,12 +18,6 @@ #include "test/cpp/interop/xds_interop_server_lib.h" -#include - -#include "absl/log/log.h" -#include "absl/strings/str_cat.h" -#include "absl/strings/str_split.h" - #include #include #include @@ -33,6 +27,11 @@ #include #include +#include + +#include "absl/log/log.h" +#include "absl/strings/str_cat.h" +#include "absl/strings/str_split.h" #include "src/proto/grpc/testing/empty.pb.h" #include "src/proto/grpc/testing/messages.pb.h" #include "src/proto/grpc/testing/test.grpc.pb.h" diff --git a/test/cpp/interop/xds_interop_server_lib.h b/test/cpp/interop/xds_interop_server_lib.h index 01e0b6185b9..5d99413ba55 100644 --- a/test/cpp/interop/xds_interop_server_lib.h +++ b/test/cpp/interop/xds_interop_server_lib.h @@ -18,11 +18,11 @@ #ifndef GRPC_TEST_CPP_INTEROP_XDS_INTEROP_SERVER_LIB_H #define GRPC_TEST_CPP_INTEROP_XDS_INTEROP_SERVER_LIB_H +#include + #include "absl/strings/string_view.h" #include "absl/types/optional.h" -#include - namespace grpc { namespace testing { diff --git a/test/cpp/interop/xds_interop_server_test.cc b/test/cpp/interop/xds_interop_server_test.cc index 808924ed0b3..8aeb6e948a4 100644 --- a/test/cpp/interop/xds_interop_server_test.cc +++ b/test/cpp/interop/xds_interop_server_test.cc @@ -14,16 +14,14 @@ // limitations under the License. // -#include - #include -#include - -#include "absl/strings/str_format.h" - #include #include +#include +#include + +#include "absl/strings/str_format.h" #include "src/core/util/sync.h" #include "src/proto/grpc/testing/empty.pb.h" #include "src/proto/grpc/testing/test.grpc.pb.h" diff --git a/test/cpp/interop/xds_stats_watcher.h b/test/cpp/interop/xds_stats_watcher.h index 530358dadab..5d92f8517f2 100644 --- a/test/cpp/interop/xds_stats_watcher.h +++ b/test/cpp/interop/xds_stats_watcher.h @@ -19,6 +19,8 @@ #ifndef GRPC_TEST_CPP_INTEROP_XDS_STATS_WATCHER_H #define GRPC_TEST_CPP_INTEROP_XDS_STATS_WATCHER_H +#include + #include #include #include @@ -34,9 +36,6 @@ #include "absl/status/status.h" #include "absl/types/span.h" - -#include - #include "src/proto/grpc/testing/empty.pb.h" #include "src/proto/grpc/testing/messages.pb.h" diff --git a/test/cpp/interop/xds_stats_watcher_test.cc b/test/cpp/interop/xds_stats_watcher_test.cc index 6f29c96002c..65ef8568984 100644 --- a/test/cpp/interop/xds_stats_watcher_test.cc +++ b/test/cpp/interop/xds_stats_watcher_test.cc @@ -16,13 +16,12 @@ #include "test/cpp/interop/xds_stats_watcher.h" -#include -#include - #include +#include #include -#include +#include +#include #include "test/core/test_util/test_config.h" diff --git a/test/cpp/microbenchmarks/bm_alarm.cc b/test/cpp/microbenchmarks/bm_alarm.cc index f72220e9aa6..b64d670129b 100644 --- a/test/cpp/microbenchmarks/bm_alarm.cc +++ b/test/cpp/microbenchmarks/bm_alarm.cc @@ -19,7 +19,6 @@ // This benchmark exists to ensure that immediately-firing alarms are fast #include - #include #include #include diff --git a/test/cpp/microbenchmarks/bm_basic_work_queue.cc b/test/cpp/microbenchmarks/bm_basic_work_queue.cc index c84cd3d1829..c0188e6cb98 100644 --- a/test/cpp/microbenchmarks/bm_basic_work_queue.cc +++ b/test/cpp/microbenchmarks/bm_basic_work_queue.cc @@ -11,15 +11,13 @@ // 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 "absl/log/check.h" - #include #include +#include + +#include "absl/log/check.h" #include "src/core/lib/event_engine/common_closures.h" #include "src/core/lib/event_engine/work_queue/basic_work_queue.h" #include "src/core/util/sync.h" diff --git a/test/cpp/microbenchmarks/bm_byte_buffer.cc b/test/cpp/microbenchmarks/bm_byte_buffer.cc index 0de947fbec3..8b0c9a302a8 100644 --- a/test/cpp/microbenchmarks/bm_byte_buffer.cc +++ b/test/cpp/microbenchmarks/bm_byte_buffer.cc @@ -18,18 +18,16 @@ // This benchmark exists to show that byte-buffer copy is size-independent -#include - #include - -#include "absl/log/check.h" - #include #include #include #include #include +#include + +#include "absl/log/check.h" #include "test/core/test_util/test_config.h" #include "test/cpp/microbenchmarks/helpers.h" #include "test/cpp/util/test_config.h" diff --git a/test/cpp/microbenchmarks/bm_channel.cc b/test/cpp/microbenchmarks/bm_channel.cc index 45fc8b64852..7e11dfa14dc 100644 --- a/test/cpp/microbenchmarks/bm_channel.cc +++ b/test/cpp/microbenchmarks/bm_channel.cc @@ -19,7 +19,6 @@ // Benchmark channel #include - #include #include #include diff --git a/test/cpp/microbenchmarks/bm_channel_args.cc b/test/cpp/microbenchmarks/bm_channel_args.cc index f68c2a05428..3ccdcd2039b 100644 --- a/test/cpp/microbenchmarks/bm_channel_args.cc +++ b/test/cpp/microbenchmarks/bm_channel_args.cc @@ -15,14 +15,12 @@ // Benchmark ChannelArgs comparison performance between grpc_channel_args and // grpc_core::ChannelArgs -#include - #include - -#include "absl/container/btree_map.h" - #include +#include + +#include "absl/container/btree_map.h" #include "src/core/lib/channel/channel_args.h" const char kKey[] = "a very long key"; diff --git a/test/cpp/microbenchmarks/bm_chttp2_hpack.cc b/test/cpp/microbenchmarks/bm_chttp2_hpack.cc index 90d4ccee01f..37006f4eede 100644 --- a/test/cpp/microbenchmarks/bm_chttp2_hpack.cc +++ b/test/cpp/microbenchmarks/bm_chttp2_hpack.cc @@ -18,20 +18,17 @@ // Microbenchmarks around CHTTP2 HPACK operations +#include +#include +#include #include #include #include -#include - #include "absl/log/check.h" #include "absl/log/log.h" #include "absl/random/random.h" - -#include -#include - #include "src/core/ext/transport/chttp2/transport/hpack_encoder.h" #include "src/core/ext/transport/chttp2/transport/hpack_parser.h" #include "src/core/lib/resource_quota/resource_quota.h" diff --git a/test/cpp/microbenchmarks/bm_closure.cc b/test/cpp/microbenchmarks/bm_closure.cc index 1622cc2fc93..41ae38416d0 100644 --- a/test/cpp/microbenchmarks/bm_closure.cc +++ b/test/cpp/microbenchmarks/bm_closure.cc @@ -18,12 +18,11 @@ // Test various closure related operations -#include - #include - #include +#include + #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/combiner.h" #include "src/core/lib/iomgr/exec_ctx.h" diff --git a/test/cpp/microbenchmarks/bm_cq.cc b/test/cpp/microbenchmarks/bm_cq.cc index 6b490df906b..c84a974babe 100644 --- a/test/cpp/microbenchmarks/bm_cq.cc +++ b/test/cpp/microbenchmarks/bm_cq.cc @@ -20,13 +20,11 @@ // working #include - -#include "absl/log/check.h" - #include #include #include +#include "absl/log/check.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/surface/completion_queue.h" #include "src/core/util/crash.h" diff --git a/test/cpp/microbenchmarks/bm_cq_multiple_threads.cc b/test/cpp/microbenchmarks/bm_cq_multiple_threads.cc index f504af9f5fe..8acdb307950 100644 --- a/test/cpp/microbenchmarks/bm_cq_multiple_threads.cc +++ b/test/cpp/microbenchmarks/bm_cq_multiple_threads.cc @@ -16,18 +16,15 @@ // // +#include +#include +#include #include #include -#include - #include "absl/log/check.h" #include "absl/log/log.h" - -#include -#include - #include "src/core/lib/iomgr/ev_posix.h" #include "src/core/lib/iomgr/port.h" #include "src/core/lib/surface/completion_queue.h" diff --git a/test/cpp/microbenchmarks/bm_event_engine_run.cc b/test/cpp/microbenchmarks/bm_event_engine_run.cc index 5f70aea856f..752d9d440e9 100644 --- a/test/cpp/microbenchmarks/bm_event_engine_run.cc +++ b/test/cpp/microbenchmarks/bm_event_engine_run.cc @@ -12,21 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include +#include +#include + #include #include #include #include -#include - #include "absl/debugging/leak_check.h" #include "absl/functional/any_invocable.h" #include "absl/log/check.h" #include "absl/strings/str_format.h" - -#include -#include - #include "src/core/lib/event_engine/common_closures.h" #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/util/crash.h" diff --git a/test/cpp/microbenchmarks/bm_exec_ctx.cc b/test/cpp/microbenchmarks/bm_exec_ctx.cc index 4a464856764..f90c558976a 100644 --- a/test/cpp/microbenchmarks/bm_exec_ctx.cc +++ b/test/cpp/microbenchmarks/bm_exec_ctx.cc @@ -12,13 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include -#include - #include - #include +#include +#include + #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/util/notification.h" #include "test/core/test_util/test_config.h" diff --git a/test/cpp/microbenchmarks/bm_huffman_decode.cc b/test/cpp/microbenchmarks/bm_huffman_decode.cc index 59a684f1298..770082666a5 100644 --- a/test/cpp/microbenchmarks/bm_huffman_decode.cc +++ b/test/cpp/microbenchmarks/bm_huffman_decode.cc @@ -12,13 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include + #include #include -#include - #include "absl/strings/escaping.h" - #include "src/core/ext/transport/chttp2/transport/bin_encoder.h" #include "src/core/ext/transport/chttp2/transport/decode_huff.h" #include "src/core/lib/slice/slice.h" diff --git a/test/cpp/microbenchmarks/bm_opencensus_plugin.cc b/test/cpp/microbenchmarks/bm_opencensus_plugin.cc index e2d2adebbe6..8e85213182b 100644 --- a/test/cpp/microbenchmarks/bm_opencensus_plugin.cc +++ b/test/cpp/microbenchmarks/bm_opencensus_plugin.cc @@ -16,19 +16,17 @@ // // +#include +#include +#include +#include + #include #include // NOLINT -#include - #include "absl/base/call_once.h" #include "absl/strings/str_cat.h" #include "opencensus/stats/stats.h" - -#include -#include -#include - #include "src/core/lib/config/core_configuration.h" #include "src/cpp/ext/filters/census/grpc_plugin.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" diff --git a/test/cpp/microbenchmarks/bm_rng.cc b/test/cpp/microbenchmarks/bm_rng.cc index bf84e39910e..fe34430b8e0 100644 --- a/test/cpp/microbenchmarks/bm_rng.cc +++ b/test/cpp/microbenchmarks/bm_rng.cc @@ -21,7 +21,6 @@ #include #include "absl/random/random.h" - #include "src/core/util/sync.h" static void BM_OneRngFromFreshBitSet(benchmark::State& state) { diff --git a/test/cpp/microbenchmarks/bm_stats_plugin.cc b/test/cpp/microbenchmarks/bm_stats_plugin.cc index abc55bf80c2..39dfae190d4 100644 --- a/test/cpp/microbenchmarks/bm_stats_plugin.cc +++ b/test/cpp/microbenchmarks/bm_stats_plugin.cc @@ -12,16 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - #include +#include + +#include #include "absl/log/absl_check.h" #include "absl/strings/string_view.h" #include "opentelemetry/sdk/metrics/meter_provider.h" - -#include - #include "src/core/lib/event_engine/channel_args_endpoint_config.h" #include "src/core/telemetry/metrics.h" #include "test/core/test_util/fake_stats_plugin.h" diff --git a/test/cpp/microbenchmarks/bm_thread_pool.cc b/test/cpp/microbenchmarks/bm_thread_pool.cc index 620a7ce7d1c..a185c361451 100644 --- a/test/cpp/microbenchmarks/bm_thread_pool.cc +++ b/test/cpp/microbenchmarks/bm_thread_pool.cc @@ -12,19 +12,17 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include +#include +#include + #include #include #include #include -#include - #include "absl/log/check.h" #include "absl/strings/str_format.h" - -#include -#include - #include "src/core/lib/event_engine/common_closures.h" #include "src/core/lib/event_engine/thread_pool/thread_pool.h" #include "src/core/util/crash.h" diff --git a/test/cpp/microbenchmarks/callback_streaming_ping_pong.h b/test/cpp/microbenchmarks/callback_streaming_ping_pong.h index 7987200a245..54deee57868 100644 --- a/test/cpp/microbenchmarks/callback_streaming_ping_pong.h +++ b/test/cpp/microbenchmarks/callback_streaming_ping_pong.h @@ -19,13 +19,12 @@ #ifndef GRPC_TEST_CPP_MICROBENCHMARKS_CALLBACK_STREAMING_PING_PONG_H #define GRPC_TEST_CPP_MICROBENCHMARKS_CALLBACK_STREAMING_PING_PONG_H -#include - #include +#include + #include "absl/log/check.h" #include "absl/log/log.h" - #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/cpp/microbenchmarks/callback_test_service.h" #include "test/cpp/microbenchmarks/fullstack_context_mutators.h" diff --git a/test/cpp/microbenchmarks/callback_test_service.h b/test/cpp/microbenchmarks/callback_test_service.h index bf907d22c49..09ea69ed8f6 100644 --- a/test/cpp/microbenchmarks/callback_test_service.h +++ b/test/cpp/microbenchmarks/callback_test_service.h @@ -19,13 +19,13 @@ #ifndef GRPC_TEST_CPP_MICROBENCHMARKS_CALLBACK_TEST_SERVICE_H #define GRPC_TEST_CPP_MICROBENCHMARKS_CALLBACK_TEST_SERVICE_H +#include + #include #include #include #include -#include - #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/cpp/util/string_ref_helper.h" diff --git a/test/cpp/microbenchmarks/callback_unary_ping_pong.h b/test/cpp/microbenchmarks/callback_unary_ping_pong.h index a7188fc1f0d..7f139342da8 100644 --- a/test/cpp/microbenchmarks/callback_unary_ping_pong.h +++ b/test/cpp/microbenchmarks/callback_unary_ping_pong.h @@ -21,12 +21,11 @@ #ifndef GRPC_TEST_CPP_MICROBENCHMARKS_CALLBACK_UNARY_PING_PONG_H #define GRPC_TEST_CPP_MICROBENCHMARKS_CALLBACK_UNARY_PING_PONG_H -#include - #include -#include "absl/log/check.h" +#include +#include "absl/log/check.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/cpp/microbenchmarks/callback_test_service.h" #include "test/cpp/microbenchmarks/fullstack_context_mutators.h" diff --git a/test/cpp/microbenchmarks/fullstack_fixtures.h b/test/cpp/microbenchmarks/fullstack_fixtures.h index 79e48ae646b..56c205466b4 100644 --- a/test/cpp/microbenchmarks/fullstack_fixtures.h +++ b/test/cpp/microbenchmarks/fullstack_fixtures.h @@ -19,8 +19,6 @@ #ifndef GRPC_TEST_CPP_MICROBENCHMARKS_FULLSTACK_FIXTURES_H #define GRPC_TEST_CPP_MICROBENCHMARKS_FULLSTACK_FIXTURES_H -#include "absl/log/check.h" - #include #include #include @@ -30,6 +28,7 @@ #include #include +#include "absl/log/check.h" #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" diff --git a/test/cpp/microbenchmarks/fullstack_streaming_ping_pong.h b/test/cpp/microbenchmarks/fullstack_streaming_ping_pong.h index 6fd8ba807fe..fd2e0a001c6 100644 --- a/test/cpp/microbenchmarks/fullstack_streaming_ping_pong.h +++ b/test/cpp/microbenchmarks/fullstack_streaming_ping_pong.h @@ -21,12 +21,11 @@ #ifndef GRPC_TEST_CPP_MICROBENCHMARKS_FULLSTACK_STREAMING_PING_PONG_H #define GRPC_TEST_CPP_MICROBENCHMARKS_FULLSTACK_STREAMING_PING_PONG_H -#include - #include -#include "absl/log/check.h" +#include +#include "absl/log/check.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/cpp/microbenchmarks/fullstack_context_mutators.h" #include "test/cpp/microbenchmarks/fullstack_fixtures.h" diff --git a/test/cpp/microbenchmarks/fullstack_streaming_pump.h b/test/cpp/microbenchmarks/fullstack_streaming_pump.h index df0953fd9b0..70187affb2f 100644 --- a/test/cpp/microbenchmarks/fullstack_streaming_pump.h +++ b/test/cpp/microbenchmarks/fullstack_streaming_pump.h @@ -21,12 +21,11 @@ #ifndef GRPC_TEST_CPP_MICROBENCHMARKS_FULLSTACK_STREAMING_PUMP_H #define GRPC_TEST_CPP_MICROBENCHMARKS_FULLSTACK_STREAMING_PUMP_H -#include - #include -#include "absl/log/check.h" +#include +#include "absl/log/check.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/cpp/microbenchmarks/fullstack_context_mutators.h" #include "test/cpp/microbenchmarks/fullstack_fixtures.h" diff --git a/test/cpp/microbenchmarks/fullstack_unary_ping_pong.h b/test/cpp/microbenchmarks/fullstack_unary_ping_pong.h index f6a7c8b88aa..5ef7a3f22f1 100644 --- a/test/cpp/microbenchmarks/fullstack_unary_ping_pong.h +++ b/test/cpp/microbenchmarks/fullstack_unary_ping_pong.h @@ -21,12 +21,11 @@ #ifndef GRPC_TEST_CPP_MICROBENCHMARKS_FULLSTACK_UNARY_PING_PONG_H #define GRPC_TEST_CPP_MICROBENCHMARKS_FULLSTACK_UNARY_PING_PONG_H -#include - #include -#include "absl/log/check.h" +#include +#include "absl/log/check.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/cpp/microbenchmarks/fullstack_context_mutators.h" #include "test/cpp/microbenchmarks/fullstack_fixtures.h" diff --git a/test/cpp/microbenchmarks/helpers.h b/test/cpp/microbenchmarks/helpers.h index 34105a98d63..99400c05034 100644 --- a/test/cpp/microbenchmarks/helpers.h +++ b/test/cpp/microbenchmarks/helpers.h @@ -19,14 +19,13 @@ #ifndef GRPC_TEST_CPP_MICROBENCHMARKS_HELPERS_H #define GRPC_TEST_CPP_MICROBENCHMARKS_HELPERS_H -#include -#include - #include - #include #include +#include +#include + #include "src/core/telemetry/stats.h" #include "src/core/telemetry/stats_data.h" diff --git a/test/cpp/naming/address_sorting_test.cc b/test/cpp/naming/address_sorting_test.cc index e1fa4111ed6..00a55c37d7c 100644 --- a/test/cpp/naming/address_sorting_test.cc +++ b/test/cpp/naming/address_sorting_test.cc @@ -16,23 +16,20 @@ // // -#include -#include - -#include - #include #include - -#include "absl/log/check.h" -#include "absl/log/log.h" - #include #include #include #include #include +#include +#include +#include + +#include "absl/log/check.h" +#include "absl/log/log.h" #include "src/core/client_channel/client_channel_filter.h" #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/channel/channel_args.h" diff --git a/test/cpp/naming/cancel_ares_query_test.cc b/test/cpp/naming/cancel_ares_query_test.cc index b77330ee595..cb05f8d9030 100644 --- a/test/cpp/naming/cancel_ares_query_test.cc +++ b/test/cpp/naming/cancel_ares_query_test.cc @@ -16,24 +16,21 @@ // // -#include -#include - -#include - #include - -#include "absl/log/check.h" -#include "absl/strings/str_cat.h" -#include "absl/strings/str_format.h" - #include #include #include #include #include #include +#include +#include + +#include +#include "absl/log/check.h" +#include "absl/strings/str_cat.h" +#include "absl/strings/str_format.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/config_vars.h" #include "src/core/lib/config/core_configuration.h" diff --git a/test/cpp/naming/resolver_component_test.cc b/test/cpp/naming/resolver_component_test.cc index f5a4984e98c..050e42dd00e 100644 --- a/test/cpp/naming/resolver_component_test.cc +++ b/test/cpp/naming/resolver_component_test.cc @@ -18,28 +18,25 @@ #include #include +#include +#include +#include +#include +#include +#include +#include #include #include #include #include -#include - #include "absl/flags/flag.h" #include "absl/log/check.h" #include "absl/log/log.h" #include "absl/memory/memory.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" - -#include -#include -#include -#include -#include -#include - #include "src/core/client_channel/client_channel_filter.h" #include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/address_utils/sockaddr_utils.h" diff --git a/test/cpp/naming/resolver_component_tests_runner_invoker.cc b/test/cpp/naming/resolver_component_tests_runner_invoker.cc index 26fe87fb600..4c095a7d4bf 100644 --- a/test/cpp/naming/resolver_component_tests_runner_invoker.cc +++ b/test/cpp/naming/resolver_component_tests_runner_invoker.cc @@ -12,15 +12,18 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include #include #include -#include - #ifndef GPR_WINDOWS #include #endif // GPR_WINDOWS +#include +#include +#include + #include #include #include @@ -30,11 +33,6 @@ #include "absl/log/check.h" #include "absl/log/log.h" #include "absl/strings/str_format.h" - -#include -#include -#include - #include "src/core/util/crash.h" #ifdef __FreeBSD__ diff --git a/test/cpp/performance/writes_per_rpc_test.cc b/test/cpp/performance/writes_per_rpc_test.cc index d540c21a225..c171daeebd6 100644 --- a/test/cpp/performance/writes_per_rpc_test.cc +++ b/test/cpp/performance/writes_per_rpc_test.cc @@ -16,14 +16,6 @@ // // -#include -#include - -#include - -#include "absl/log/check.h" -#include "absl/log/log.h" - #include #include #include @@ -31,7 +23,13 @@ #include #include #include +#include +#include +#include + +#include "absl/log/check.h" +#include "absl/log/log.h" #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" diff --git a/test/cpp/qps/benchmark_config.cc b/test/cpp/qps/benchmark_config.cc index 58b4f57be42..007480fe994 100644 --- a/test/cpp/qps/benchmark_config.cc +++ b/test/cpp/qps/benchmark_config.cc @@ -18,12 +18,11 @@ #include "test/cpp/qps/benchmark_config.h" -#include "absl/flags/flag.h" -#include "absl/log/check.h" - #include #include +#include "absl/flags/flag.h" +#include "absl/log/check.h" #include "src/core/util/crash.h" #include "test/cpp/util/test_credentials_provider.h" diff --git a/test/cpp/qps/client.h b/test/cpp/qps/client.h index fe66465bbce..fdc2e8bbff7 100644 --- a/test/cpp/qps/client.h +++ b/test/cpp/qps/client.h @@ -19,6 +19,11 @@ #ifndef GRPC_TEST_CPP_QPS_CLIENT_H #define GRPC_TEST_CPP_QPS_CLIENT_H +#include +#include +#include +#include +#include #include #include #include @@ -33,13 +38,6 @@ #include "absl/memory/memory.h" #include "absl/strings/match.h" #include "absl/strings/str_format.h" - -#include -#include -#include -#include -#include - #include "src/core/util/crash.h" #include "src/core/util/env.h" #include "src/proto/grpc/testing/benchmark_service.grpc.pb.h" diff --git a/test/cpp/qps/client_async.cc b/test/cpp/qps/client_async.cc index 889d935f989..855859159cf 100644 --- a/test/cpp/qps/client_async.cc +++ b/test/cpp/qps/client_async.cc @@ -16,6 +16,13 @@ // // +#include +#include +#include +#include +#include +#include + #include #include #include @@ -30,14 +37,6 @@ #include "absl/log/check.h" #include "absl/log/log.h" #include "absl/memory/memory.h" - -#include -#include -#include -#include -#include -#include - #include "src/core/lib/surface/completion_queue.h" #include "src/core/util/crash.h" #include "src/proto/grpc/testing/benchmark_service.grpc.pb.h" diff --git a/test/cpp/qps/client_callback.cc b/test/cpp/qps/client_callback.cc index 29a35676aa4..d34373def15 100644 --- a/test/cpp/qps/client_callback.cc +++ b/test/cpp/qps/client_callback.cc @@ -16,6 +16,12 @@ // // +#include +#include +#include +#include +#include + #include #include #include @@ -27,13 +33,6 @@ #include "absl/log/log.h" #include "absl/memory/memory.h" - -#include -#include -#include -#include -#include - #include "src/core/util/crash.h" #include "src/proto/grpc/testing/benchmark_service.grpc.pb.h" #include "test/cpp/qps/client.h" diff --git a/test/cpp/qps/client_sync.cc b/test/cpp/qps/client_sync.cc index 23778475ac7..fd2c6d17589 100644 --- a/test/cpp/qps/client_sync.cc +++ b/test/cpp/qps/client_sync.cc @@ -16,6 +16,14 @@ // // +#include +#include +#include +#include +#include +#include +#include + #include #include #include @@ -26,15 +34,6 @@ #include "absl/log/check.h" #include "absl/log/log.h" - -#include -#include -#include -#include -#include -#include -#include - #include "src/core/util/crash.h" #include "src/proto/grpc/testing/benchmark_service.grpc.pb.h" #include "test/cpp/qps/client.h" diff --git a/test/cpp/qps/driver.cc b/test/cpp/qps/driver.cc index 3f015de1236..a2dee89e905 100644 --- a/test/cpp/qps/driver.cc +++ b/test/cpp/qps/driver.cc @@ -18,6 +18,12 @@ #include "test/cpp/qps/driver.h" +#include +#include +#include +#include +#include + #include #include #include @@ -28,13 +34,6 @@ #include "absl/log/check.h" #include "absl/log/log.h" #include "google/protobuf/timestamp.pb.h" - -#include -#include -#include -#include -#include - #include "src/core/util/crash.h" #include "src/core/util/env.h" #include "src/core/util/host_port.h" diff --git a/test/cpp/qps/inproc_sync_unary_ping_pong_test.cc b/test/cpp/qps/inproc_sync_unary_ping_pong_test.cc index 57e826a5dff..766e555c7aa 100644 --- a/test/cpp/qps/inproc_sync_unary_ping_pong_test.cc +++ b/test/cpp/qps/inproc_sync_unary_ping_pong_test.cc @@ -19,7 +19,6 @@ #include #include "absl/log/log.h" - #include "src/core/util/crash.h" #include "test/core/test_util/test_config.h" #include "test/cpp/qps/benchmark_config.h" diff --git a/test/cpp/qps/interarrival.h b/test/cpp/qps/interarrival.h index 3d11b208cba..59af99f2ca1 100644 --- a/test/cpp/qps/interarrival.h +++ b/test/cpp/qps/interarrival.h @@ -19,13 +19,13 @@ #ifndef GRPC_TEST_CPP_QPS_INTERARRIVAL_H #define GRPC_TEST_CPP_QPS_INTERARRIVAL_H +#include + #include #include #include #include -#include - namespace grpc { namespace testing { diff --git a/test/cpp/qps/json_run_localhost.cc b/test/cpp/qps/json_run_localhost.cc index 59d46414bca..c577328637b 100644 --- a/test/cpp/qps/json_run_localhost.cc +++ b/test/cpp/qps/json_run_localhost.cc @@ -30,7 +30,6 @@ #include "absl/log/check.h" #include "absl/log/log.h" - #include "src/core/util/crash.h" #include "src/core/util/env.h" #include "test/core/test_util/port.h" diff --git a/test/cpp/qps/parse_json.cc b/test/cpp/qps/parse_json.cc index 0b6af9f962d..2a28339d384 100644 --- a/test/cpp/qps/parse_json.cc +++ b/test/cpp/qps/parse_json.cc @@ -23,7 +23,6 @@ #include "absl/log/check.h" #include "absl/log/log.h" #include "absl/strings/str_format.h" - #include "src/core/util/crash.h" namespace grpc { diff --git a/test/cpp/qps/qps_json_driver.cc b/test/cpp/qps/qps_json_driver.cc index c11e9f2bd81..4614eacf663 100644 --- a/test/cpp/qps/qps_json_driver.cc +++ b/test/cpp/qps/qps_json_driver.cc @@ -16,6 +16,8 @@ // // +#include + #include #include #include @@ -24,9 +26,6 @@ #include "absl/flags/flag.h" #include "absl/log/check.h" #include "absl/log/log.h" - -#include - #include "src/core/util/crash.h" #include "test/core/test_util/test_config.h" #include "test/cpp/qps/benchmark_config.h" diff --git a/test/cpp/qps/qps_openloop_test.cc b/test/cpp/qps/qps_openloop_test.cc index 92db5ef53c4..5335aab7689 100644 --- a/test/cpp/qps/qps_openloop_test.cc +++ b/test/cpp/qps/qps_openloop_test.cc @@ -19,7 +19,6 @@ #include #include "absl/log/log.h" - #include "src/core/util/crash.h" #include "test/core/test_util/test_config.h" #include "test/cpp/qps/benchmark_config.h" diff --git a/test/cpp/qps/qps_server_builder.h b/test/cpp/qps/qps_server_builder.h index bf604c00d27..f5f5a6f6180 100644 --- a/test/cpp/qps/qps_server_builder.h +++ b/test/cpp/qps/qps_server_builder.h @@ -19,11 +19,11 @@ #ifndef GRPC_TEST_CPP_QPS_QPS_SERVER_BUILDER_H #define GRPC_TEST_CPP_QPS_QPS_SERVER_BUILDER_H +#include + #include #include -#include - namespace grpc { namespace testing { diff --git a/test/cpp/qps/qps_worker.cc b/test/cpp/qps/qps_worker.cc index 4f396456c51..7dff6a20c0a 100644 --- a/test/cpp/qps/qps_worker.cc +++ b/test/cpp/qps/qps_worker.cc @@ -18,6 +18,14 @@ #include "test/cpp/qps/qps_worker.h" +#include +#include +#include +#include +#include +#include +#include + #include #include #include @@ -28,15 +36,6 @@ #include "absl/log/check.h" #include "absl/log/log.h" #include "absl/memory/memory.h" - -#include -#include -#include -#include -#include -#include -#include - #include "src/core/util/crash.h" #include "src/core/util/host_port.h" #include "src/proto/grpc/testing/worker_service.grpc.pb.h" diff --git a/test/cpp/qps/qps_worker.h b/test/cpp/qps/qps_worker.h index b0c5af09566..ad8956bf5b3 100644 --- a/test/cpp/qps/qps_worker.h +++ b/test/cpp/qps/qps_worker.h @@ -19,13 +19,13 @@ #ifndef GRPC_TEST_CPP_QPS_QPS_WORKER_H #define GRPC_TEST_CPP_QPS_QPS_WORKER_H -#include - #include #include #include #include +#include + #include "test/cpp/qps/server.h" namespace grpc { diff --git a/test/cpp/qps/report.cc b/test/cpp/qps/report.cc index e0b0cd646b2..0b3784e4885 100644 --- a/test/cpp/qps/report.cc +++ b/test/cpp/qps/report.cc @@ -18,12 +18,11 @@ #include "test/cpp/qps/report.h" +#include + #include #include "absl/log/log.h" - -#include - #include "src/core/util/crash.h" #include "src/proto/grpc/testing/report_qps_scenario_service.grpc.pb.h" #include "test/cpp/qps/driver.h" diff --git a/test/cpp/qps/report.h b/test/cpp/qps/report.h index 30539e73f1b..0478a171126 100644 --- a/test/cpp/qps/report.h +++ b/test/cpp/qps/report.h @@ -19,13 +19,13 @@ #ifndef GRPC_TEST_CPP_QPS_REPORT_H #define GRPC_TEST_CPP_QPS_REPORT_H +#include +#include + #include #include #include -#include -#include - #include "src/proto/grpc/testing/report_qps_scenario_service.grpc.pb.h" #include "test/cpp/qps/driver.h" diff --git a/test/cpp/qps/scenario_runner.cc b/test/cpp/qps/scenario_runner.cc index 7ca32f983ca..220a65697fd 100644 --- a/test/cpp/qps/scenario_runner.cc +++ b/test/cpp/qps/scenario_runner.cc @@ -14,7 +14,6 @@ #include "absl/flags/flag.h" #include "absl/log/log.h" - #include "src/core/lib/slice/slice_internal.h" #include "src/core/telemetry/stats.h" #include "src/core/telemetry/stats_data.h" diff --git a/test/cpp/qps/secure_sync_unary_ping_pong_test.cc b/test/cpp/qps/secure_sync_unary_ping_pong_test.cc index d64d40c8e8a..091502f96e3 100644 --- a/test/cpp/qps/secure_sync_unary_ping_pong_test.cc +++ b/test/cpp/qps/secure_sync_unary_ping_pong_test.cc @@ -19,7 +19,6 @@ #include #include "absl/log/log.h" - #include "src/core/util/crash.h" #include "test/core/test_util/test_config.h" #include "test/cpp/qps/benchmark_config.h" diff --git a/test/cpp/qps/server.h b/test/cpp/qps/server.h index 98d0ee1dd6d..4edf5b7531b 100644 --- a/test/cpp/qps/server.h +++ b/test/cpp/qps/server.h @@ -19,16 +19,15 @@ #ifndef GRPC_TEST_CPP_QPS_SERVER_H #define GRPC_TEST_CPP_QPS_SERVER_H -#include - -#include "absl/log/log.h" - #include #include #include #include #include +#include + +#include "absl/log/log.h" #include "src/core/util/crash.h" #include "src/proto/grpc/testing/control.pb.h" #include "src/proto/grpc/testing/messages.pb.h" diff --git a/test/cpp/qps/server_async.cc b/test/cpp/qps/server_async.cc index f091c11d69b..2e290ca7e3e 100644 --- a/test/cpp/qps/server_async.cc +++ b/test/cpp/qps/server_async.cc @@ -16,15 +16,6 @@ // // -#include -#include -#include -#include -#include -#include - -#include "absl/log/log.h" - #include #include #include @@ -35,6 +26,14 @@ #include #include +#include +#include +#include +#include +#include +#include + +#include "absl/log/log.h" #include "src/core/lib/surface/completion_queue.h" #include "src/core/util/crash.h" #include "src/core/util/host_port.h" diff --git a/test/cpp/qps/server_callback.cc b/test/cpp/qps/server_callback.cc index 07c65226872..a3f56541d93 100644 --- a/test/cpp/qps/server_callback.cc +++ b/test/cpp/qps/server_callback.cc @@ -16,14 +16,13 @@ // // -#include "absl/log/log.h" - #include #include #include #include #include +#include "absl/log/log.h" #include "src/core/util/host_port.h" #include "src/proto/grpc/testing/benchmark_service.grpc.pb.h" #include "test/cpp/qps/qps_server_builder.h" diff --git a/test/cpp/qps/server_sync.cc b/test/cpp/qps/server_sync.cc index fe9f8274f52..54aaee5d245 100644 --- a/test/cpp/qps/server_sync.cc +++ b/test/cpp/qps/server_sync.cc @@ -16,17 +16,16 @@ // // -#include -#include - -#include "absl/log/log.h" - #include #include #include #include #include +#include +#include + +#include "absl/log/log.h" #include "src/core/util/host_port.h" #include "src/proto/grpc/testing/benchmark_service.grpc.pb.h" #include "test/cpp/qps/qps_server_builder.h" diff --git a/test/cpp/qps/usage_timer.cc b/test/cpp/qps/usage_timer.cc index 9bea4846a4f..a44527700a6 100644 --- a/test/cpp/qps/usage_timer.cc +++ b/test/cpp/qps/usage_timer.cc @@ -18,14 +18,13 @@ #include "test/cpp/qps/usage_timer.h" +#include + #include #include #include #include "absl/log/log.h" - -#include - #include "src/core/util/crash.h" #ifdef __linux__ #include diff --git a/test/cpp/qps/worker.cc b/test/cpp/qps/worker.cc index e7aaaf70389..54f08f9a98a 100644 --- a/test/cpp/qps/worker.cc +++ b/test/cpp/qps/worker.cc @@ -16,6 +16,8 @@ // // +#include +#include #include #include @@ -23,10 +25,6 @@ #include #include "absl/flags/flag.h" - -#include -#include - #include "test/core/test_util/test_config.h" #include "test/cpp/qps/qps_worker.h" #include "test/cpp/util/test_config.h" diff --git a/test/cpp/security/tls_certificate_verifier_test.cc b/test/cpp/security/tls_certificate_verifier_test.cc index 2b370c03667..c0cfa10adfb 100644 --- a/test/cpp/security/tls_certificate_verifier_test.cc +++ b/test/cpp/security/tls_certificate_verifier_test.cc @@ -14,15 +14,14 @@ // limitations under the License. // -#include - #include -#include - #include #include #include #include +#include + +#include #include "src/cpp/client/secure_credentials.h" #include "test/core/test_util/port.h" diff --git a/test/cpp/server/authorization_policy_provider_test.cc b/test/cpp/server/authorization_policy_provider_test.cc index 25784cbb6b5..573f7dec763 100644 --- a/test/cpp/server/authorization_policy_provider_test.cc +++ b/test/cpp/server/authorization_policy_provider_test.cc @@ -12,9 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - #include +#include #include "test/core/test_util/test_config.h" #include "test/core/test_util/tls_utils.h" diff --git a/test/cpp/server/credentials_test.cc b/test/cpp/server/credentials_test.cc index 32f14c38752..c7d395bf252 100644 --- a/test/cpp/server/credentials_test.cc +++ b/test/cpp/server/credentials_test.cc @@ -14,19 +14,17 @@ // limitations under the License. // -#include - -#include - -#include "absl/log/check.h" - #include #include #include #include #include #include +#include +#include + +#include "absl/log/check.h" #include "test/core/test_util/test_config.h" #include "test/core/test_util/tls_utils.h" #include "test/cpp/util/tls_test_utils.h" diff --git a/test/cpp/server/load_reporter/get_cpu_stats_test.cc b/test/cpp/server/load_reporter/get_cpu_stats_test.cc index 3f35adba2de..744c4e0968e 100644 --- a/test/cpp/server/load_reporter/get_cpu_stats_test.cc +++ b/test/cpp/server/load_reporter/get_cpu_stats_test.cc @@ -18,10 +18,9 @@ #include "src/cpp/server/load_reporter/get_cpu_stats.h" -#include - #include #include +#include #include "test/core/test_util/port.h" #include "test/core/test_util/test_config.h" diff --git a/test/cpp/server/load_reporter/load_data_store_test.cc b/test/cpp/server/load_reporter/load_data_store_test.cc index a850de29d75..454a9b6a161 100644 --- a/test/cpp/server/load_reporter/load_data_store_test.cc +++ b/test/cpp/server/load_reporter/load_data_store_test.cc @@ -18,13 +18,12 @@ #include "src/cpp/server/load_reporter/load_data_store.h" -#include -#include - -#include - #include #include +#include + +#include +#include #include "src/cpp/server/load_reporter/constants.h" #include "test/core/test_util/port.h" diff --git a/test/cpp/server/load_reporter/load_reporter_test.cc b/test/cpp/server/load_reporter/load_reporter_test.cc index fd1d4aeef67..c04e1dbb78f 100644 --- a/test/cpp/server/load_reporter/load_reporter_test.cc +++ b/test/cpp/server/load_reporter/load_reporter_test.cc @@ -18,20 +18,18 @@ #include "src/cpp/server/load_reporter/load_reporter.h" -#include -#include - #include +#include +#include #include +#include +#include + #include "absl/log/check.h" #include "absl/log/log.h" #include "absl/memory/memory.h" #include "opencensus/stats/testing/test_utils.h" - -#include -#include - #include "src/core/ext/filters/load_reporting/registered_opencensus_objects.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/cpp/server/load_reporter/constants.h" diff --git a/test/cpp/server/server_builder_test.cc b/test/cpp/server/server_builder_test.cc index 73e02cedbde..c32f55082a4 100644 --- a/test/cpp/server/server_builder_test.cc +++ b/test/cpp/server/server_builder_test.cc @@ -16,15 +16,13 @@ // // -#include - -#include - #include #include #include #include #include +#include +#include #include "src/core/util/notification.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" diff --git a/test/cpp/server/server_builder_with_socket_mutator_test.cc b/test/cpp/server/server_builder_with_socket_mutator_test.cc index e9e148c7793..065f8a8f163 100644 --- a/test/cpp/server/server_builder_with_socket_mutator_test.cc +++ b/test/cpp/server/server_builder_with_socket_mutator_test.cc @@ -16,14 +16,13 @@ // // -#include - -#include - #include #include #include #include +#include + +#include #include "src/core/lib/iomgr/socket_mutator.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" diff --git a/test/cpp/server/server_request_call_test.cc b/test/cpp/server/server_request_call_test.cc index bf781e3e2bf..d32765308ac 100644 --- a/test/cpp/server/server_request_call_test.cc +++ b/test/cpp/server/server_request_call_test.cc @@ -16,19 +16,17 @@ // // -#include - -#include - -#include "absl/log/log.h" -#include "absl/strings/str_format.h" - #include #include #include #include #include +#include + +#include +#include "absl/log/log.h" +#include "absl/strings/str_format.h" #include "src/core/util/crash.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/core/test_util/port.h" diff --git a/test/cpp/test/client_context_test_peer_test.cc b/test/cpp/test/client_context_test_peer_test.cc index ee1347cdb21..93295f53918 100644 --- a/test/cpp/test/client_context_test_peer_test.cc +++ b/test/cpp/test/client_context_test_peer_test.cc @@ -16,13 +16,12 @@ // // -#include -#include - -#include - #include #include +#include + +#include +#include namespace grpc { namespace testing { diff --git a/test/cpp/test/mock_stream_test.cc b/test/cpp/test/mock_stream_test.cc index f88be58c360..4b972f31b57 100644 --- a/test/cpp/test/mock_stream_test.cc +++ b/test/cpp/test/mock_stream_test.cc @@ -16,12 +16,10 @@ // // +#include #include #include "absl/memory/memory.h" - -#include - #include "src/proto/grpc/testing/echo.grpc.pb.h" using grpc::testing::EchoRequest; diff --git a/test/cpp/test/server_context_test_spouse_test.cc b/test/cpp/test/server_context_test_spouse_test.cc index e778484d88a..0091f101a03 100644 --- a/test/cpp/test/server_context_test_spouse_test.cc +++ b/test/cpp/test/server_context_test_spouse_test.cc @@ -16,13 +16,12 @@ // // -#include -#include - -#include - #include #include +#include + +#include +#include namespace grpc { namespace testing { diff --git a/test/cpp/thread_manager/thread_manager_test.cc b/test/cpp/thread_manager/thread_manager_test.cc index 751ab3977c6..95a392436b6 100644 --- a/test/cpp/thread_manager/thread_manager_test.cc +++ b/test/cpp/thread_manager/thread_manager_test.cc @@ -18,19 +18,17 @@ #include "src/cpp/thread_manager/thread_manager.h" +#include +#include +#include + #include #include #include #include #include -#include - #include "absl/log/log.h" - -#include -#include - #include "src/core/util/crash.h" #include "test/core/test_util/test_config.h" diff --git a/test/cpp/util/byte_buffer_proto_helper.h b/test/cpp/util/byte_buffer_proto_helper.h index ecc0085039a..d70167083c9 100644 --- a/test/cpp/util/byte_buffer_proto_helper.h +++ b/test/cpp/util/byte_buffer_proto_helper.h @@ -19,11 +19,11 @@ #ifndef GRPC_TEST_CPP_UTIL_BYTE_BUFFER_PROTO_HELPER_H #define GRPC_TEST_CPP_UTIL_BYTE_BUFFER_PROTO_HELPER_H -#include - #include #include +#include + namespace grpc { namespace testing { diff --git a/test/cpp/util/byte_buffer_test.cc b/test/cpp/util/byte_buffer_test.cc index be9a4a75fc3..1dfc17169d7 100644 --- a/test/cpp/util/byte_buffer_test.cc +++ b/test/cpp/util/byte_buffer_test.cc @@ -16,16 +16,15 @@ // // -#include -#include - -#include - #include #include #include #include #include +#include + +#include +#include #include "test/core/test_util/test_config.h" diff --git a/test/cpp/util/channel_trace_proto_helper.cc b/test/cpp/util/channel_trace_proto_helper.cc index 0c11284c81a..0566a6cf566 100644 --- a/test/cpp/util/channel_trace_proto_helper.cc +++ b/test/cpp/util/channel_trace_proto_helper.cc @@ -18,12 +18,11 @@ #include "test/cpp/util/channel_trace_proto_helper.h" -#include - #include #include #include #include +#include #include "src/core/lib/iomgr/error.h" #include "src/core/util/crash.h" diff --git a/test/cpp/util/channelz_sampler.cc b/test/cpp/util/channelz_sampler.cc index 043625afa4d..6344dbd272c 100644 --- a/test/cpp/util/channelz_sampler.cc +++ b/test/cpp/util/channelz_sampler.cc @@ -15,6 +15,18 @@ // limitations under the License. // // +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -32,20 +44,6 @@ #include "absl/strings/str_format.h" #include "absl/strings/str_join.h" #include "google/protobuf/text_format.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - #include "src/core/util/json/json.h" #include "src/core/util/json/json_writer.h" #include "src/cpp/server/channelz/channelz_service.h" diff --git a/test/cpp/util/channelz_sampler_test.cc b/test/cpp/util/channelz_sampler_test.cc index 5c5f1118d60..eb480e5e143 100644 --- a/test/cpp/util/channelz_sampler_test.cc +++ b/test/cpp/util/channelz_sampler_test.cc @@ -15,20 +15,6 @@ // limitations under the License. // // -#include -#include - -#include -#include -#include -#include -#include - -#include "absl/log/check.h" -#include "absl/log/log.h" -#include "absl/strings/str_cat.h" -#include "gtest/gtest.h" - #include #include #include @@ -42,7 +28,19 @@ #include #include #include +#include +#include +#include +#include +#include +#include +#include + +#include "absl/log/check.h" +#include "absl/log/log.h" +#include "absl/strings/str_cat.h" +#include "gtest/gtest.h" #include "src/core/util/env.h" #include "src/cpp/server/channelz/channelz_service.h" #include "src/proto/grpc/testing/test.grpc.pb.h" diff --git a/test/cpp/util/cli_call.cc b/test/cpp/util/cli_call.cc index 9f7df96bf8e..367669fecf1 100644 --- a/test/cpp/util/cli_call.cc +++ b/test/cpp/util/cli_call.cc @@ -18,18 +18,17 @@ #include "test/cpp/util/cli_call.h" -#include -#include -#include - -#include "absl/log/check.h" - #include #include #include #include #include +#include +#include +#include + +#include "absl/log/check.h" #include "src/core/util/crash.h" namespace grpc { diff --git a/test/cpp/util/cli_call.h b/test/cpp/util/cli_call.h index f2a43f9d789..bb13e5e809c 100644 --- a/test/cpp/util/cli_call.h +++ b/test/cpp/util/cli_call.h @@ -19,14 +19,14 @@ #ifndef GRPC_TEST_CPP_UTIL_CLI_CALL_H #define GRPC_TEST_CPP_UTIL_CLI_CALL_H -#include - #include #include #include #include #include +#include + namespace grpc { class ClientContext; diff --git a/test/cpp/util/cli_call_test.cc b/test/cpp/util/cli_call_test.cc index 8e313aacd28..9a827d78ce7 100644 --- a/test/cpp/util/cli_call_test.cc +++ b/test/cpp/util/cli_call_test.cc @@ -18,8 +18,6 @@ #include "test/cpp/util/cli_call.h" -#include - #include #include #include @@ -27,6 +25,7 @@ #include #include #include +#include #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/core/test_util/port.h" diff --git a/test/cpp/util/cli_credentials.cc b/test/cpp/util/cli_credentials.cc index 61e90282ae0..f3df7eb4da1 100644 --- a/test/cpp/util/cli_credentials.cc +++ b/test/cpp/util/cli_credentials.cc @@ -18,12 +18,11 @@ #include "test/cpp/util/cli_credentials.h" -#include "absl/flags/flag.h" -#include "absl/log/log.h" - #include #include +#include "absl/flags/flag.h" +#include "absl/log/log.h" #include "src/core/util/crash.h" #include "src/core/util/load_file.h" diff --git a/test/cpp/util/create_test_channel.cc b/test/cpp/util/create_test_channel.cc index 73d92b20ae4..38828ec698a 100644 --- a/test/cpp/util/create_test_channel.cc +++ b/test/cpp/util/create_test_channel.cc @@ -18,12 +18,11 @@ #include "test/cpp/util/create_test_channel.h" -#include "absl/flags/flag.h" -#include "absl/log/check.h" - #include #include +#include "absl/flags/flag.h" +#include "absl/log/check.h" #include "src/core/util/crash.h" #include "test/cpp/util/test_credentials_provider.h" diff --git a/test/cpp/util/create_test_channel.h b/test/cpp/util/create_test_channel.h index 1ed9c44e491..04ea33e4607 100644 --- a/test/cpp/util/create_test_channel.h +++ b/test/cpp/util/create_test_channel.h @@ -19,13 +19,13 @@ #ifndef GRPC_TEST_CPP_UTIL_CREATE_TEST_CHANNEL_H #define GRPC_TEST_CPP_UTIL_CREATE_TEST_CHANNEL_H -#include - #include #include #include #include +#include + namespace grpc { class Channel; diff --git a/test/cpp/util/error_details_test.cc b/test/cpp/util/error_details_test.cc index 271360d66c4..0fa2ac122ce 100644 --- a/test/cpp/util/error_details_test.cc +++ b/test/cpp/util/error_details_test.cc @@ -16,9 +16,8 @@ // // -#include - #include +#include #include "src/proto/grpc/status/status.pb.h" #include "src/proto/grpc/testing/echo_messages.pb.h" diff --git a/test/cpp/util/grpc_cli.cc b/test/cpp/util/grpc_cli.cc index 48d07b37c79..9790d5ec003 100644 --- a/test/cpp/util/grpc_cli.cc +++ b/test/cpp/util/grpc_cli.cc @@ -61,14 +61,13 @@ // address of the connection that each RPC is made on to stderr. // +#include + #include #include #include #include "absl/flags/flag.h" - -#include - #include "test/cpp/util/cli_credentials.h" #include "test/cpp/util/grpc_tool.h" #include "test/cpp/util/test_config.h" diff --git a/test/cpp/util/grpc_tool.cc b/test/cpp/util/grpc_tool.cc index 8f171274bb4..9040de69a9b 100644 --- a/test/cpp/util/grpc_tool.cc +++ b/test/cpp/util/grpc_tool.cc @@ -18,6 +18,14 @@ #include "test/cpp/util/grpc_tool.h" +#include +#include +#include +#include +#include +#include +#include + #include #include #include @@ -31,15 +39,6 @@ #include "absl/strings/numbers.h" #include "absl/strings/str_split.h" #include "absl/strings/string_view.h" - -#include -#include -#include -#include -#include -#include -#include - #include "test/cpp/util/cli_call.h" #include "test/cpp/util/proto_file_parser.h" #include "test/cpp/util/proto_reflection_descriptor_database.h" diff --git a/test/cpp/util/grpc_tool.h b/test/cpp/util/grpc_tool.h index 471830f2fcb..defd8d04516 100644 --- a/test/cpp/util/grpc_tool.h +++ b/test/cpp/util/grpc_tool.h @@ -19,10 +19,10 @@ #ifndef GRPC_TEST_CPP_UTIL_GRPC_TOOL_H #define GRPC_TEST_CPP_UTIL_GRPC_TOOL_H -#include - #include +#include + #include "test/cpp/util/cli_credentials.h" namespace grpc { diff --git a/test/cpp/util/grpc_tool_test.cc b/test/cpp/util/grpc_tool_test.cc index 6d3b6d528da..294df983daf 100644 --- a/test/cpp/util/grpc_tool_test.cc +++ b/test/cpp/util/grpc_tool_test.cc @@ -18,16 +18,7 @@ #include "test/cpp/util/grpc_tool.h" -#include -#include - #include -#include - -#include "absl/flags/declare.h" -#include "absl/flags/flag.h" -#include "absl/strings/str_split.h" - #include #include #include @@ -37,7 +28,14 @@ #include #include #include +#include + +#include +#include +#include "absl/flags/declare.h" +#include "absl/flags/flag.h" +#include "absl/strings/str_split.h" #include "src/core/util/env.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "src/proto/grpc/testing/echo.pb.h" diff --git a/test/cpp/util/metrics_server.cc b/test/cpp/util/metrics_server.cc index 28dc7e670be..fd149fa76b6 100644 --- a/test/cpp/util/metrics_server.cc +++ b/test/cpp/util/metrics_server.cc @@ -18,11 +18,10 @@ #include "test/cpp/util/metrics_server.h" -#include "absl/log/log.h" - #include #include +#include "absl/log/log.h" #include "src/core/util/crash.h" #include "src/proto/grpc/testing/metrics.grpc.pb.h" #include "src/proto/grpc/testing/metrics.pb.h" diff --git a/test/cpp/util/metrics_server.h b/test/cpp/util/metrics_server.h index 846b542db32..fae7bdf06b5 100644 --- a/test/cpp/util/metrics_server.h +++ b/test/cpp/util/metrics_server.h @@ -18,11 +18,11 @@ #ifndef GRPC_TEST_CPP_UTIL_METRICS_SERVER_H #define GRPC_TEST_CPP_UTIL_METRICS_SERVER_H +#include + #include #include -#include - #include "src/proto/grpc/testing/metrics.grpc.pb.h" #include "src/proto/grpc/testing/metrics.pb.h" diff --git a/test/cpp/util/proto_buffer_reader_test.cc b/test/cpp/util/proto_buffer_reader_test.cc index 46137658f97..b4ffbff3e5a 100644 --- a/test/cpp/util/proto_buffer_reader_test.cc +++ b/test/cpp/util/proto_buffer_reader_test.cc @@ -14,10 +14,9 @@ // limitations under the License. // -#include - #include #include +#include #include "test/core/test_util/test_config.h" diff --git a/test/cpp/util/proto_buffer_writer_test.cc b/test/cpp/util/proto_buffer_writer_test.cc index 77057b5fc33..3de8f6fde0e 100644 --- a/test/cpp/util/proto_buffer_writer_test.cc +++ b/test/cpp/util/proto_buffer_writer_test.cc @@ -14,10 +14,9 @@ // limitations under the License. // -#include - #include #include +#include #include "test/core/test_util/test_config.h" diff --git a/test/cpp/util/proto_file_parser.cc b/test/cpp/util/proto_file_parser.cc index 5e570c57372..0613fd53751 100644 --- a/test/cpp/util/proto_file_parser.cc +++ b/test/cpp/util/proto_file_parser.cc @@ -18,6 +18,8 @@ #include "test/cpp/util/proto_file_parser.h" +#include + #include #include #include @@ -26,8 +28,6 @@ #include "absl/memory/memory.h" #include "absl/strings/str_split.h" -#include - namespace grpc { namespace testing { namespace { diff --git a/test/cpp/util/proto_file_parser.h b/test/cpp/util/proto_file_parser.h index a397aa43eeb..84b43717ac8 100644 --- a/test/cpp/util/proto_file_parser.h +++ b/test/cpp/util/proto_file_parser.h @@ -19,10 +19,10 @@ #ifndef GRPC_TEST_CPP_UTIL_PROTO_FILE_PARSER_H #define GRPC_TEST_CPP_UTIL_PROTO_FILE_PARSER_H -#include - #include +#include + #include "test/cpp/util/config_grpc_cli.h" #include "test/cpp/util/proto_reflection_descriptor_database.h" diff --git a/test/cpp/util/proto_reflection_descriptor_database.cc b/test/cpp/util/proto_reflection_descriptor_database.cc index ac0113fd509..6025a502c42 100644 --- a/test/cpp/util/proto_reflection_descriptor_database.cc +++ b/test/cpp/util/proto_reflection_descriptor_database.cc @@ -21,7 +21,6 @@ #include #include "absl/log/log.h" - #include "src/core/util/crash.h" using grpc::reflection::v1alpha::ErrorResponse; diff --git a/test/cpp/util/proto_reflection_descriptor_database.h b/test/cpp/util/proto_reflection_descriptor_database.h index 2489860be66..a8a9b497246 100644 --- a/test/cpp/util/proto_reflection_descriptor_database.h +++ b/test/cpp/util/proto_reflection_descriptor_database.h @@ -18,14 +18,14 @@ #ifndef GRPC_TEST_CPP_UTIL_PROTO_REFLECTION_DESCRIPTOR_DATABASE_H #define GRPC_TEST_CPP_UTIL_PROTO_REFLECTION_DESCRIPTOR_DATABASE_H +#include +#include + #include #include #include #include -#include -#include - #include "src/proto/grpc/reflection/v1alpha/reflection.grpc.pb.h" namespace grpc { diff --git a/test/cpp/util/slice_test.cc b/test/cpp/util/slice_test.cc index e8d2f3b04e2..1689f2f1cd7 100644 --- a/test/cpp/util/slice_test.cc +++ b/test/cpp/util/slice_test.cc @@ -16,12 +16,11 @@ // // -#include - #include #include #include #include +#include #include "test/core/test_util/test_config.h" diff --git a/test/cpp/util/string_ref_test.cc b/test/cpp/util/string_ref_test.cc index 6af0e73c632..eddaef5abad 100644 --- a/test/cpp/util/string_ref_test.cc +++ b/test/cpp/util/string_ref_test.cc @@ -16,11 +16,9 @@ // // -#include - -#include - #include +#include +#include #include "test/core/test_util/test_config.h" diff --git a/test/cpp/util/test_config_cc.cc b/test/cpp/util/test_config_cc.cc index cf32dbc0eae..c1eea1502ef 100644 --- a/test/cpp/util/test_config_cc.cc +++ b/test/cpp/util/test_config_cc.cc @@ -19,7 +19,6 @@ #include #include "absl/flags/parse.h" - #include "test/cpp/util/test_config.h" namespace grpc { diff --git a/test/cpp/util/test_credentials_provider.cc b/test/cpp/util/test_credentials_provider.cc index b4d3e116cd3..748d1398a96 100644 --- a/test/cpp/util/test_credentials_provider.cc +++ b/test/cpp/util/test_credentials_provider.cc @@ -19,6 +19,9 @@ #include "test/cpp/util/test_credentials_provider.h" +#include +#include + #include #include #include @@ -28,10 +31,6 @@ #include "absl/flags/flag.h" #include "absl/log/check.h" #include "absl/log/log.h" - -#include -#include - #include "src/core/util/crash.h" #include "test/core/end2end/data/ssl_test_data.h" diff --git a/test/cpp/util/test_credentials_provider.h b/test/cpp/util/test_credentials_provider.h index 40f90703237..91fbad33918 100644 --- a/test/cpp/util/test_credentials_provider.h +++ b/test/cpp/util/test_credentials_provider.h @@ -19,12 +19,12 @@ #ifndef GRPC_TEST_CPP_UTIL_TEST_CREDENTIALS_PROVIDER_H #define GRPC_TEST_CPP_UTIL_TEST_CREDENTIALS_PROVIDER_H -#include - #include #include #include +#include + namespace grpc { namespace testing { diff --git a/test/cpp/util/time_test.cc b/test/cpp/util/time_test.cc index 11b141cc70f..01038486f53 100644 --- a/test/cpp/util/time_test.cc +++ b/test/cpp/util/time_test.cc @@ -16,10 +16,9 @@ // // -#include - #include #include +#include #include "test/core/test_util/test_config.h" diff --git a/test/cpp/util/tls_test_utils.h b/test/cpp/util/tls_test_utils.h index 9b4e69bcd80..52b9cf1e25c 100644 --- a/test/cpp/util/tls_test_utils.h +++ b/test/cpp/util/tls_test_utils.h @@ -17,12 +17,12 @@ #ifndef GRPC_TEST_CPP_UTIL_TLS_TEST_UTILS_H #define GRPC_TEST_CPP_UTIL_TLS_TEST_UTILS_H -#include - #include #include #include +#include + #include "src/core/util/thd.h" namespace grpc { diff --git a/test/cpp/util/windows/manifest_file.cc b/test/cpp/util/windows/manifest_file.cc index 85ac3d7eb37..d983f74bcc3 100644 --- a/test/cpp/util/windows/manifest_file.cc +++ b/test/cpp/util/windows/manifest_file.cc @@ -28,7 +28,6 @@ #include "absl/strings/str_format.h" #include "absl/strings/str_replace.h" #include "absl/strings/str_split.h" - #include "src/core/util/crash.h" namespace grpc { diff --git a/tools/distrib/python/grpcio_tools/grpc_tools/main.cc b/tools/distrib/python/grpcio_tools/grpc_tools/main.cc index 866b1e2866b..6ccdafaae29 100644 --- a/tools/distrib/python/grpcio_tools/grpc_tools/main.cc +++ b/tools/distrib/python/grpcio_tools/grpc_tools/main.cc @@ -14,13 +14,6 @@ #include "grpc_tools/main.h" -#include -#include -#include -#include -#include -#include - #include #include #include @@ -29,8 +22,14 @@ #include #include -#include "absl/strings/string_view.h" +#include +#include +#include +#include +#include +#include +#include "absl/strings/string_view.h" #include "src/compiler/python_generator.h" using ::google::protobuf::FileDescriptor; From 64b7fce68c4e450f07b3b78c8774f1d724984e55 Mon Sep 17 00:00:00 2001 From: Alisha Nanda Date: Mon, 7 Oct 2024 10:16:48 -0700 Subject: [PATCH 67/75] Add new function to EventEngineSupportsFdExtension query extension that takes in a configured and bound but unconnected fd, connects to the given remote peer, and returns a resulting EventEngine::Endpoint. PiperOrigin-RevId: 683229732 --- .../lib/event_engine/extensions/supports_fd.h | 17 +++++++ .../event_engine/posix_engine/posix_engine.cc | 51 ++++++++++++------- .../event_engine/posix_engine/posix_engine.h | 15 +++--- 3 files changed, 60 insertions(+), 23 deletions(-) diff --git a/src/core/lib/event_engine/extensions/supports_fd.h b/src/core/lib/event_engine/extensions/supports_fd.h index c7a1bfdcd4f..070bce175de 100644 --- a/src/core/lib/event_engine/extensions/supports_fd.h +++ b/src/core/lib/event_engine/extensions/supports_fd.h @@ -119,6 +119,23 @@ class EventEngineSupportsFdExtension { virtual std::unique_ptr CreateEndpointFromFd( int fd, const EndpointConfig& config) = 0; + /// Creates an EventEngine::Endpoint from a file descriptor that is configured + /// and bound locally but not yet connected to a remote peer. Returns a + /// connection handle to cancel the connection attempt if needed. Created + /// endpoint will be returned through `on_connect` callback. + /// \a fd - The socket file descriptor. + /// \a on_connect - The callback to invoke once fd is connected to peer. + /// \a addr - The remote peer to connect to. This should be the mapped peer + /// address returned when creating a new socket. + /// \a config - Additional configuration to be applied to the endpoint. + /// \a memory_allocator - The endpoint may use the provided memory allocator + /// to track memory allocations. + /// \a timeout - The timeout to use for the connection attempt. + virtual EventEngine::ConnectionHandle CreateEndpointFromUnconnectedFd( + int fd, EventEngine::OnConnectCallback on_connect, + const EventEngine::ResolvedAddress& addr, const EndpointConfig& config, + MemoryAllocator memory_allocator, EventEngine::Duration timeout) = 0; + /// Called when the posix listener has accepted a new client connection. /// \a listener_fd - The listening socket fd that accepted the new client /// connection. diff --git a/src/core/lib/event_engine/posix_engine/posix_engine.cc b/src/core/lib/event_engine/posix_engine/posix_engine.cc index f2275975b0d..1c7f6df10b1 100644 --- a/src/core/lib/event_engine/posix_engine/posix_engine.cc +++ b/src/core/lib/event_engine/posix_engine/posix_engine.cc @@ -238,14 +238,16 @@ void AsyncConnect::OnWritable(absl::Status status) } } -EventEngine::ConnectionHandle PosixEventEngine::ConnectInternal( - PosixSocketWrapper sock, OnConnectCallback on_connect, ResolvedAddress addr, - MemoryAllocator&& allocator, const PosixTcpOptions& options, - Duration timeout) { +EventEngine::ConnectionHandle +PosixEventEngine::CreateEndpointFromUnconnectedFdInternal( + int fd, EventEngine::OnConnectCallback on_connect, + const EventEngine::ResolvedAddress& addr, + const PosixTcpOptions& tcp_options, MemoryAllocator memory_allocator, + EventEngine::Duration timeout) { int err; int connect_errno; do { - err = connect(sock.Fd(), addr.address(), addr.size()); + err = connect(fd, addr.address(), addr.size()); } while (err < 0 && errno == EINTR); connect_errno = (err < 0) ? errno : 0; @@ -261,16 +263,15 @@ EventEngine::ConnectionHandle PosixEventEngine::ConnectInternal( std::string name = absl::StrCat("tcp-client:", addr_uri.value()); PosixEventPoller* poller = poller_manager_->Poller(); EventHandle* handle = - poller->CreateHandle(sock.Fd(), name, poller->CanTrackErrors()); + poller->CreateHandle(fd, name, poller->CanTrackErrors()); if (connect_errno == 0) { - // Connection already succeded. Return 0 to discourage any cancellation + // Connection already succeeded. Return 0 to discourage any cancellation // attempts. Run([on_connect = std::move(on_connect), - ep = CreatePosixEndpoint(handle, nullptr, shared_from_this(), - std::move(allocator), options)]() mutable { - on_connect(std::move(ep)); - }); + ep = CreatePosixEndpoint( + handle, nullptr, shared_from_this(), std::move(memory_allocator), + tcp_options)]() mutable { on_connect(std::move(ep)); }); return EventEngine::ConnectionHandle::kInvalid; } if (connect_errno != EWOULDBLOCK && connect_errno != EINPROGRESS) { @@ -288,9 +289,10 @@ EventEngine::ConnectionHandle PosixEventEngine::ConnectInternal( // Connection is still in progress. int64_t connection_id = last_connection_id_.fetch_add(1, std::memory_order_acq_rel); - AsyncConnect* ac = new AsyncConnect( - std::move(on_connect), shared_from_this(), executor_.get(), handle, - std::move(allocator), options, addr_uri.value(), connection_id); + AsyncConnect* ac = + new AsyncConnect(std::move(on_connect), shared_from_this(), + executor_.get(), handle, std::move(memory_allocator), + tcp_options, addr_uri.value(), connection_id); int shard_number = connection_id % connection_shards_.size(); struct ConnectionShard* shard = &connection_shards_[shard_number]; { @@ -635,14 +637,29 @@ EventEngine::ConnectionHandle PosixEventEngine::Connect( status = socket.status()]() mutable { on_connect(status); }); return EventEngine::ConnectionHandle::kInvalid; } - return ConnectInternal((*socket).sock, std::move(on_connect), - (*socket).mapped_target_addr, - std::move(memory_allocator), options, timeout); + return CreateEndpointFromUnconnectedFdInternal( + (*socket).sock.Fd(), std::move(on_connect), (*socket).mapped_target_addr, + options, std::move(memory_allocator), timeout); #else // GRPC_PLATFORM_SUPPORTS_POSIX_POLLING grpc_core::Crash("EventEngine::Connect is not supported on this platform"); #endif // GRPC_PLATFORM_SUPPORTS_POSIX_POLLING } +EventEngine::ConnectionHandle PosixEventEngine::CreateEndpointFromUnconnectedFd( + int fd, EventEngine::OnConnectCallback on_connect, + const EventEngine::ResolvedAddress& addr, const EndpointConfig& config, + MemoryAllocator memory_allocator, EventEngine::Duration timeout) { +#if GRPC_PLATFORM_SUPPORTS_POSIX_POLLING + return CreateEndpointFromUnconnectedFdInternal( + fd, std::move(on_connect), addr, TcpOptionsFromEndpointConfig(config), + std::move(memory_allocator), timeout); +#else // GRPC_PLATFORM_SUPPORTS_POSIX_POLLING + grpc_core::Crash( + "EventEngine::CreateEndpointFromUnconnectedFd is not supported on this " + "platform"); +#endif // GRPC_PLATFORM_SUPPORTS_POSIX_POLLING +} + std::unique_ptr PosixEventEngine::CreatePosixEndpointFromFd(int fd, const EndpointConfig& config, diff --git a/src/core/lib/event_engine/posix_engine/posix_engine.h b/src/core/lib/event_engine/posix_engine/posix_engine.h index 82be0bdd0e5..63a142a11f2 100644 --- a/src/core/lib/event_engine/posix_engine/posix_engine.h +++ b/src/core/lib/event_engine/posix_engine/posix_engine.h @@ -174,6 +174,11 @@ class PosixEventEngine final : public PosixEventEngineWithFdSupport, std::unique_ptr CreateEndpointFromFd( int fd, const EndpointConfig& config) override; + ConnectionHandle CreateEndpointFromUnconnectedFd( + int fd, EventEngine::OnConnectCallback on_connect, + const EventEngine::ResolvedAddress& addr, const EndpointConfig& config, + MemoryAllocator memory_allocator, EventEngine::Duration timeout) override; + absl::StatusOr> CreateListener( Listener::AcceptCallback on_accept, absl::AnyInvocable on_shutdown, @@ -235,12 +240,10 @@ class PosixEventEngine final : public PosixEventEngineWithFdSupport, static void PollerWorkInternal( std::shared_ptr poller_manager); - ConnectionHandle ConnectInternal( - grpc_event_engine::experimental::PosixSocketWrapper sock, - OnConnectCallback on_connect, ResolvedAddress addr, - MemoryAllocator&& allocator, - const grpc_event_engine::experimental::PosixTcpOptions& options, - Duration timeout); + ConnectionHandle CreateEndpointFromUnconnectedFdInternal( + int fd, EventEngine::OnConnectCallback on_connect, + const EventEngine::ResolvedAddress& addr, const PosixTcpOptions& options, + MemoryAllocator memory_allocator, EventEngine::Duration timeout); void OnConnectFinishInternal(int connection_handle); From e6ad69e1dd7de6336e9521fad0259bc5be2ee8f2 Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Mon, 7 Oct 2024 11:18:58 -0700 Subject: [PATCH 68/75] Remove `work_serializer_clears_time_cache` experiment (#37851) This was put in as a temporary kludge to carry us until `work_serializer_dispatch` was ready, however since #37637 this is a no-op for all known use cases (and I think it's time for `work_serializer_dispatch` to stick). Closes #37851 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37851 from ctiller:tc 8ae59415bda496143240b76be1a126436ecec397 PiperOrigin-RevId: 683255110 --- bazel/experiments.bzl | 1 - src/core/lib/experiments/experiments.cc | 24 ----------------------- src/core/lib/experiments/experiments.h | 11 ----------- src/core/lib/experiments/experiments.yaml | 6 ------ src/core/util/work_serializer.cc | 3 --- 5 files changed, 45 deletions(-) diff --git a/bazel/experiments.bzl b/bazel/experiments.bzl index 830d4a076d2..5ea1cd99f37 100644 --- a/bazel/experiments.bzl +++ b/bazel/experiments.bzl @@ -38,7 +38,6 @@ EXPERIMENT_ENABLES = { "time_caching_in_party": "time_caching_in_party", "trace_record_callops": "trace_record_callops", "unconstrained_max_quota_buffer_size": "unconstrained_max_quota_buffer_size", - "work_serializer_clears_time_cache": "work_serializer_clears_time_cache", "work_serializer_dispatch": "work_serializer_dispatch", } diff --git a/src/core/lib/experiments/experiments.cc b/src/core/lib/experiments/experiments.cc index 8464f0756a0..8c9675e0dd2 100644 --- a/src/core/lib/experiments/experiments.cc +++ b/src/core/lib/experiments/experiments.cc @@ -94,10 +94,6 @@ const char* const description_unconstrained_max_quota_buffer_size = "Discard the cap on the max free pool size for one memory allocator"; const char* const additional_constraints_unconstrained_max_quota_buffer_size = "{}"; -const char* const description_work_serializer_clears_time_cache = - "Have the work serializer clear the time cache when it dispatches work."; -const char* const additional_constraints_work_serializer_clears_time_cache = - "{}"; const char* const description_work_serializer_dispatch = "Have the work serializer dispatch work to event engine for every " "callback, instead of running things inline in the first thread that " @@ -159,10 +155,6 @@ const ExperimentMetadata g_experiment_metadata[] = { description_unconstrained_max_quota_buffer_size, additional_constraints_unconstrained_max_quota_buffer_size, nullptr, 0, false, true}, - {"work_serializer_clears_time_cache", - description_work_serializer_clears_time_cache, - additional_constraints_work_serializer_clears_time_cache, nullptr, 0, true, - true}, {"work_serializer_dispatch", description_work_serializer_dispatch, additional_constraints_work_serializer_dispatch, nullptr, 0, false, true}, }; @@ -243,10 +235,6 @@ const char* const description_unconstrained_max_quota_buffer_size = "Discard the cap on the max free pool size for one memory allocator"; const char* const additional_constraints_unconstrained_max_quota_buffer_size = "{}"; -const char* const description_work_serializer_clears_time_cache = - "Have the work serializer clear the time cache when it dispatches work."; -const char* const additional_constraints_work_serializer_clears_time_cache = - "{}"; const char* const description_work_serializer_dispatch = "Have the work serializer dispatch work to event engine for every " "callback, instead of running things inline in the first thread that " @@ -308,10 +296,6 @@ const ExperimentMetadata g_experiment_metadata[] = { description_unconstrained_max_quota_buffer_size, additional_constraints_unconstrained_max_quota_buffer_size, nullptr, 0, false, true}, - {"work_serializer_clears_time_cache", - description_work_serializer_clears_time_cache, - additional_constraints_work_serializer_clears_time_cache, nullptr, 0, true, - true}, {"work_serializer_dispatch", description_work_serializer_dispatch, additional_constraints_work_serializer_dispatch, nullptr, 0, false, true}, }; @@ -392,10 +376,6 @@ const char* const description_unconstrained_max_quota_buffer_size = "Discard the cap on the max free pool size for one memory allocator"; const char* const additional_constraints_unconstrained_max_quota_buffer_size = "{}"; -const char* const description_work_serializer_clears_time_cache = - "Have the work serializer clear the time cache when it dispatches work."; -const char* const additional_constraints_work_serializer_clears_time_cache = - "{}"; const char* const description_work_serializer_dispatch = "Have the work serializer dispatch work to event engine for every " "callback, instead of running things inline in the first thread that " @@ -457,10 +437,6 @@ const ExperimentMetadata g_experiment_metadata[] = { description_unconstrained_max_quota_buffer_size, additional_constraints_unconstrained_max_quota_buffer_size, nullptr, 0, false, true}, - {"work_serializer_clears_time_cache", - description_work_serializer_clears_time_cache, - additional_constraints_work_serializer_clears_time_cache, nullptr, 0, true, - true}, {"work_serializer_dispatch", description_work_serializer_dispatch, additional_constraints_work_serializer_dispatch, nullptr, 0, true, true}, }; diff --git a/src/core/lib/experiments/experiments.h b/src/core/lib/experiments/experiments.h index 8aa59e12f9b..afc86b9ce51 100644 --- a/src/core/lib/experiments/experiments.h +++ b/src/core/lib/experiments/experiments.h @@ -84,8 +84,6 @@ inline bool IsTimeCachingInPartyEnabled() { return true; } #define GRPC_EXPERIMENT_IS_INCLUDED_TRACE_RECORD_CALLOPS inline bool IsTraceRecordCallopsEnabled() { return true; } inline bool IsUnconstrainedMaxQuotaBufferSizeEnabled() { return false; } -#define GRPC_EXPERIMENT_IS_INCLUDED_WORK_SERIALIZER_CLEARS_TIME_CACHE -inline bool IsWorkSerializerClearsTimeCacheEnabled() { return true; } inline bool IsWorkSerializerDispatchEnabled() { return false; } #elif defined(GPR_WINDOWS) @@ -119,8 +117,6 @@ inline bool IsTimeCachingInPartyEnabled() { return true; } #define GRPC_EXPERIMENT_IS_INCLUDED_TRACE_RECORD_CALLOPS inline bool IsTraceRecordCallopsEnabled() { return true; } inline bool IsUnconstrainedMaxQuotaBufferSizeEnabled() { return false; } -#define GRPC_EXPERIMENT_IS_INCLUDED_WORK_SERIALIZER_CLEARS_TIME_CACHE -inline bool IsWorkSerializerClearsTimeCacheEnabled() { return true; } inline bool IsWorkSerializerDispatchEnabled() { return false; } #else @@ -153,8 +149,6 @@ inline bool IsTimeCachingInPartyEnabled() { return true; } #define GRPC_EXPERIMENT_IS_INCLUDED_TRACE_RECORD_CALLOPS inline bool IsTraceRecordCallopsEnabled() { return true; } inline bool IsUnconstrainedMaxQuotaBufferSizeEnabled() { return false; } -#define GRPC_EXPERIMENT_IS_INCLUDED_WORK_SERIALIZER_CLEARS_TIME_CACHE -inline bool IsWorkSerializerClearsTimeCacheEnabled() { return true; } #define GRPC_EXPERIMENT_IS_INCLUDED_WORK_SERIALIZER_DISPATCH inline bool IsWorkSerializerDispatchEnabled() { return true; } #endif @@ -182,7 +176,6 @@ enum ExperimentIds { kExperimentIdTimeCachingInParty, kExperimentIdTraceRecordCallops, kExperimentIdUnconstrainedMaxQuotaBufferSize, - kExperimentIdWorkSerializerClearsTimeCache, kExperimentIdWorkSerializerDispatch, kNumExperiments }; @@ -270,10 +263,6 @@ inline bool IsTraceRecordCallopsEnabled() { inline bool IsUnconstrainedMaxQuotaBufferSizeEnabled() { return IsExperimentEnabled(); } -#define GRPC_EXPERIMENT_IS_INCLUDED_WORK_SERIALIZER_CLEARS_TIME_CACHE -inline bool IsWorkSerializerClearsTimeCacheEnabled() { - return IsExperimentEnabled(); -} #define GRPC_EXPERIMENT_IS_INCLUDED_WORK_SERIALIZER_DISPATCH inline bool IsWorkSerializerDispatchEnabled() { return IsExperimentEnabled(); diff --git a/src/core/lib/experiments/experiments.yaml b/src/core/lib/experiments/experiments.yaml index ff4bf3869d4..a8f2105f7a5 100644 --- a/src/core/lib/experiments/experiments.yaml +++ b/src/core/lib/experiments/experiments.yaml @@ -165,12 +165,6 @@ 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/10/01 - owner: ctiller@google.com - test_tags: [] - name: work_serializer_dispatch description: Have the work serializer dispatch work to event engine for every callback, diff --git a/src/core/util/work_serializer.cc b/src/core/util/work_serializer.cc index c9e0b1d9f45..38ee82303a2 100644 --- a/src/core/util/work_serializer.cc +++ b/src/core/util/work_serializer.cc @@ -243,9 +243,6 @@ void WorkSerializer::LegacyWorkSerializer::DrainQueueOwned() { } // There is at least one callback on the queue. Pop the callback from the // queue and execute it. - if (IsWorkSerializerClearsTimeCacheEnabled() && ExecCtx::Get() != nullptr) { - ExecCtx::Get()->InvalidateNow(); - } CallbackWrapper* cb_wrapper = nullptr; bool empty_unused; while ((cb_wrapper = reinterpret_cast( From 204dc57345bb25325c11a5539d1448a0a08cb91f Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Mon, 7 Oct 2024 15:35:29 -0700 Subject: [PATCH 69/75] [experiments] Push out the expiry of some WIP experiments (#37850) Closes #37850 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37850 from ctiller:fmt aa31cf9d7d8156ab61fbec2e0ca2272af1415e81 PiperOrigin-RevId: 683349868 --- src/core/lib/experiments/experiments.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/core/lib/experiments/experiments.yaml b/src/core/lib/experiments/experiments.yaml index a8f2105f7a5..7362efde841 100644 --- a/src/core/lib/experiments/experiments.yaml +++ b/src/core/lib/experiments/experiments.yaml @@ -109,7 +109,7 @@ - name: multiping description: Allow more than one ping to be in flight at a time by default. - expiry: 2024/09/15 + expiry: 2025/03/03 owner: ctiller@google.com test_tags: [flow_control_test] - name: pick_first_new @@ -120,7 +120,7 @@ - name: promise_based_inproc_transport description: Use promises for the in-process transport. - expiry: 2024/09/15 + expiry: 2025/03/03 owner: ctiller@google.com test_tags: [] allow_in_fuzzing_config: false # experiment currently crashes if enabled @@ -162,7 +162,7 @@ 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/09 + expiry: 2025/03/03 owner: ctiller@google.com test_tags: [resource_quota_test] - name: work_serializer_dispatch From 2e0eea1e643900f5e79bbbdb6044ee411a5924f2 Mon Sep 17 00:00:00 2001 From: "Mark D. Roth" Date: Tue, 8 Oct 2024 08:21:31 -0700 Subject: [PATCH 70/75] [tests] restrict visibility of our internal test-only copy of the xDS protos We really should not have our own copy of these protos in the first place, but there's some tech debt here that hasn't been cleaned up yet. Until we do that, we should at least ensure that this tech debt doesn't spread by having more code depend on them. PiperOrigin-RevId: 683631165 --- bazel/grpc_build_system.bzl | 2 +- src/proto/grpc/testing/xds/v3/BUILD | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/bazel/grpc_build_system.bzl b/bazel/grpc_build_system.bzl index 50bd830ef21..a90113e2f29 100644 --- a/bazel/grpc_build_system.bzl +++ b/bazel/grpc_build_system.bzl @@ -725,7 +725,7 @@ def grpc_package(name, visibility = "private", features = []): features: The features to enable. """ if visibility == "tests": - visibility = ["//test:__subpackages__"] + visibility = ["//test:__subpackages__", "//src/proto/grpc/testing:__subpackages__"] elif visibility == "public": visibility = ["//visibility:public"] elif visibility == "private": diff --git a/src/proto/grpc/testing/xds/v3/BUILD b/src/proto/grpc/testing/xds/v3/BUILD index 15b8e0796c0..cc04d3d20fa 100644 --- a/src/proto/grpc/testing/xds/v3/BUILD +++ b/src/proto/grpc/testing/xds/v3/BUILD @@ -23,7 +23,7 @@ exports_files([ grpc_package( name = "xds_v3", - visibility = "public", + visibility = "tests", ) grpc_proto_library( @@ -331,6 +331,8 @@ grpc_proto_library( srcs = [ "csds.proto", ], + # Needs to be visible to //:grpcpp_csds + visibility = ["//:__subpackages__"], well_known_protos = True, deps = [ "base_proto", From d56d89f6911e2e85c04d119dbeae44a52831321e Mon Sep 17 00:00:00 2001 From: AJ Heller Date: Tue, 8 Oct 2024 09:09:59 -0700 Subject: [PATCH 71/75] [EventEngine] Remove invalid IOCP closed socket test (#37864) The [CreateIoCompletionPort ](https://learn.microsoft.com/en-us/windows/win32/fileio/createiocompletionport) API specifies that the handle must either be open, or explicitly the `INVALID_HANDLE_VALUE` value. Testing the API with a closed socket is apparently UB. Closes #37864 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37864 from drfloob:rm-iocp-ub-test 514e89989988456b94ddee1a3f2582c1f9885bf0 PiperOrigin-RevId: 683647143 --- test/core/event_engine/windows/iocp_test.cc | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/test/core/event_engine/windows/iocp_test.cc b/test/core/event_engine/windows/iocp_test.cc index 9e798ff7e21..2eaaccdc494 100644 --- a/test/core/event_engine/windows/iocp_test.cc +++ b/test/core/event_engine/windows/iocp_test.cc @@ -250,16 +250,6 @@ TEST_F(IOCPTest, KickThenShutdownCasusesNextWorkerToBeKicked) { thread_pool->Quiesce(); } -TEST_F(IOCPTest, CrashOnWatchingAClosedSocket) { - auto thread_pool = grpc_event_engine::experimental::MakeThreadPool(8); - IOCP iocp(thread_pool.get()); - SOCKET sockpair[2]; - CreateSockpair(sockpair, iocp.GetDefaultSocketFlags()); - closesocket(sockpair[0]); - ASSERT_DEATH({ auto wrapped_client_socket = iocp.Watch(sockpair[0]); }, ""); - thread_pool->Quiesce(); -} - TEST_F(IOCPTest, StressTestThousandsOfSockets) { // Start 10 threads, each with their own IOCP // On each thread, create 50 socket pairs (100 sockets) and have them exchange From 49d63f686aa983c33e04723bbd0095ce8aec1b94 Mon Sep 17 00:00:00 2001 From: AJ Heller Date: Tue, 8 Oct 2024 11:07:55 -0700 Subject: [PATCH 72/75] Delete Binder test artifacts and examples (#37862) With the CL-first approach, the docker test configs for Binder need to be deleted before the Binder code and tests themselves can be deleted in the next step. Sanity checks fail otherwise. Closes #37862 PiperOrigin-RevId: 683691175 --- .../binder/java/io/grpc/binder/cpp/README.md | 24 ----- .../cpp/exampleclient/AndroidManifest.xml | 25 ------ .../io/grpc/binder/cpp/exampleclient/BUILD | 51 ----------- .../cpp/exampleclient/ButtonPressHandler.java | 15 ---- .../cpp/exampleclient/MainActivity.java | 26 ------ .../grpc/binder/cpp/exampleclient/native.cc | 72 --------------- .../res/layout/activity_main.xml | 24 ----- .../cpp/exampleclient/res/values/strings.xml | 5 -- .../cpp/exampleserver/AndroidManifest.xml | 21 ----- .../AndroidManifest_endpoint.xml | 10 --- .../io/grpc/binder/cpp/exampleserver/BUILD | 61 ------------- .../cpp/exampleserver/ButtonPressHandler.java | 13 --- .../ExportedEndpointService.java | 26 ------ .../cpp/exampleserver/MainActivity.java | 27 ------ .../grpc/binder/cpp/exampleserver/native.cc | 82 ----------------- .../res/layout/activity_main.xml | 24 ----- .../cpp/exampleserver/res/values/strings.xml | 5 -- .../binder_transport_apk/Dockerfile.template | 49 ----------- .../bazel/test_single_bazel_version.sh | 3 - .../dockerimage_current_versions.bzl | 1 - tools/bazelify_tests/test/strict_tests.bzl | 2 +- .../clang_format_all_the_things.sh | 2 +- .../test/binder_transport_apk.current_version | 1 - .../test/binder_transport_apk/Dockerfile | 87 ------------------- .../linux/grpc_bazel_build_in_docker.sh | 2 - .../linux/grpc_binder_transport_apk.cfg | 30 ------- .../linux/grpc_binder_transport_apk.sh | 27 ------ 27 files changed, 2 insertions(+), 713 deletions(-) delete mode 100644 examples/android/binder/java/io/grpc/binder/cpp/README.md delete mode 100644 examples/android/binder/java/io/grpc/binder/cpp/exampleclient/AndroidManifest.xml delete mode 100644 examples/android/binder/java/io/grpc/binder/cpp/exampleclient/BUILD delete mode 100644 examples/android/binder/java/io/grpc/binder/cpp/exampleclient/ButtonPressHandler.java delete mode 100644 examples/android/binder/java/io/grpc/binder/cpp/exampleclient/MainActivity.java delete mode 100644 examples/android/binder/java/io/grpc/binder/cpp/exampleclient/native.cc delete mode 100644 examples/android/binder/java/io/grpc/binder/cpp/exampleclient/res/layout/activity_main.xml delete mode 100644 examples/android/binder/java/io/grpc/binder/cpp/exampleclient/res/values/strings.xml delete mode 100644 examples/android/binder/java/io/grpc/binder/cpp/exampleserver/AndroidManifest.xml delete mode 100644 examples/android/binder/java/io/grpc/binder/cpp/exampleserver/AndroidManifest_endpoint.xml delete mode 100644 examples/android/binder/java/io/grpc/binder/cpp/exampleserver/BUILD delete mode 100644 examples/android/binder/java/io/grpc/binder/cpp/exampleserver/ButtonPressHandler.java delete mode 100644 examples/android/binder/java/io/grpc/binder/cpp/exampleserver/ExportedEndpointService.java delete mode 100644 examples/android/binder/java/io/grpc/binder/cpp/exampleserver/MainActivity.java delete mode 100644 examples/android/binder/java/io/grpc/binder/cpp/exampleserver/native.cc delete mode 100644 examples/android/binder/java/io/grpc/binder/cpp/exampleserver/res/layout/activity_main.xml delete mode 100644 examples/android/binder/java/io/grpc/binder/cpp/exampleserver/res/values/strings.xml delete mode 100644 templates/tools/dockerfile/test/binder_transport_apk/Dockerfile.template delete mode 100644 tools/dockerfile/test/binder_transport_apk.current_version delete mode 100644 tools/dockerfile/test/binder_transport_apk/Dockerfile delete mode 100644 tools/internal_ci/linux/grpc_binder_transport_apk.cfg delete mode 100755 tools/internal_ci/linux/grpc_binder_transport_apk.sh diff --git a/examples/android/binder/java/io/grpc/binder/cpp/README.md b/examples/android/binder/java/io/grpc/binder/cpp/README.md deleted file mode 100644 index 8a9ba6ec26f..00000000000 --- a/examples/android/binder/java/io/grpc/binder/cpp/README.md +++ /dev/null @@ -1,24 +0,0 @@ -# gRPC-core BinderTransport example apps - -## Build Instruction - -1. Install Android SDK and NDK. Only NDK version >= 25 is supported. We tested against SDK Platform `33` and NDK `26.2.11394342`. -2. Make sure Bazel is at least `7.0`. Use `export OVERRIDE_BAZEL_VERSION=7.3.1` to selected a supported version listed in `bazel/supported_versions.txt` if necessary. -3. Point environment variables to install locations of SDK and NDK - ``` - export ANDROID_HOME=$HOME/android-sdk - export ANDROID_NDK_HOME=$HOME/android-sdk/ndk/26.2.11394342 - ``` -4. To build a fat APK that supports `x86_64`, `armv7`, and `arm64`: - ``` - bazel build \ - --extra_toolchains=@androidndk//:all \ - --android_platforms=//bazel/platforms/android:x86_64,//bazel/platforms/android:armeabi-v7a,//bazel/platforms/android:arm64-v8a \ - --copt=-Wno-unknown-warning-option \ - //examples/android/binder/java/io/grpc/binder/cpp/exampleserver:app \ - //examples/android/binder/java/io/grpc/binder/cpp/exampleclient:app - ``` -5. `adb install - bazel-bin/examples/android/binder/java/io/grpc/binder/cpp/exampleclient/app.apk` -6. `adb install - bazel-bin/examples/android/binder/java/io/grpc/binder/cpp/exampleserver/app.apk` diff --git a/examples/android/binder/java/io/grpc/binder/cpp/exampleclient/AndroidManifest.xml b/examples/android/binder/java/io/grpc/binder/cpp/exampleclient/AndroidManifest.xml deleted file mode 100644 index 8dea1553faf..00000000000 --- a/examples/android/binder/java/io/grpc/binder/cpp/exampleclient/AndroidManifest.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/examples/android/binder/java/io/grpc/binder/cpp/exampleclient/BUILD b/examples/android/binder/java/io/grpc/binder/cpp/exampleclient/BUILD deleted file mode 100644 index 8b11ebb383a..00000000000 --- a/examples/android/binder/java/io/grpc/binder/cpp/exampleclient/BUILD +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 2021 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. - -cc_library( - name = "jni_lib", - srcs = ["native.cc"], - linkopts = [ - "-ldl", - "-llog", - "-lm", - "-Wl,--no-undefined", - ], - deps = [ - "//:grpc++", - "//examples/protos:helloworld_cc_grpc", - ], - alwayslink = True, -) - -android_library( - name = "activity", - srcs = [ - "ButtonPressHandler.java", - "MainActivity.java", - ], - manifest = "AndroidManifest.xml", - resource_files = glob(["res/**"]), - deps = [ - ":jni_lib", - "@binder_transport_android_helper//io/grpc/binder/cpp:connection_helper", - ], -) - -android_binary( - name = "app", - manifest = "AndroidManifest.xml", - deps = [ - ":activity", - ], -) diff --git a/examples/android/binder/java/io/grpc/binder/cpp/exampleclient/ButtonPressHandler.java b/examples/android/binder/java/io/grpc/binder/cpp/exampleclient/ButtonPressHandler.java deleted file mode 100644 index ed9d11a404b..00000000000 --- a/examples/android/binder/java/io/grpc/binder/cpp/exampleclient/ButtonPressHandler.java +++ /dev/null @@ -1,15 +0,0 @@ -package io.grpc.binder.cpp.exampleclient; - -import android.app.Application; - -public class ButtonPressHandler { - static { - System.loadLibrary("app"); - } - - public native String native_entry(Application application); - - public String onPressed(Application application) { - return native_entry(application); - } -} diff --git a/examples/android/binder/java/io/grpc/binder/cpp/exampleclient/MainActivity.java b/examples/android/binder/java/io/grpc/binder/cpp/exampleclient/MainActivity.java deleted file mode 100644 index 3cbf70d1e65..00000000000 --- a/examples/android/binder/java/io/grpc/binder/cpp/exampleclient/MainActivity.java +++ /dev/null @@ -1,26 +0,0 @@ -package io.grpc.binder.cpp.exampleclient; - -import android.app.Activity; -import android.os.Bundle; -import android.util.Log; -import android.widget.Button; -import android.widget.TextView; - -/** Main class for the example app. */ -public class MainActivity extends Activity { - @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - Log.v("Example", "hello, world"); - - setContentView(R.layout.activity_main); - - Button clickMeButton = findViewById(R.id.clickMeButton); - TextView exampleTextView = findViewById(R.id.exampleTextView); - - ButtonPressHandler h = new ButtonPressHandler(); - - clickMeButton.setOnClickListener( - v -> exampleTextView.setText(h.onPressed(getApplication()))); - } -} diff --git a/examples/android/binder/java/io/grpc/binder/cpp/exampleclient/native.cc b/examples/android/binder/java/io/grpc/binder/cpp/exampleclient/native.cc deleted file mode 100644 index 3cb8637eb69..00000000000 --- a/examples/android/binder/java/io/grpc/binder/cpp/exampleclient/native.cc +++ /dev/null @@ -1,72 +0,0 @@ -// Copyright 2021 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 -#include - -#include "examples/protos/helloworld.grpc.pb.h" -#include "examples/protos/helloworld.pb.h" - -extern "C" JNIEXPORT jstring JNICALL -Java_io_grpc_binder_cpp_exampleclient_ButtonPressHandler_native_1entry( - JNIEnv* env, jobject /*this*/, jobject application) { - // Lower the gRPC logging level, here it is just for demo and debugging - // purpose. - setenv("GRPC_VERBOSITY", "INFO", true); - if (grpc::experimental::InitializeBinderChannelJavaClass(env)) { - __android_log_print(ANDROID_LOG_INFO, "DemoClient", - "InitializeBinderChannelJavaClass succeed"); - } else { - __android_log_print(ANDROID_LOG_INFO, "DemoClient", - "InitializeBinderChannelJavaClass failed"); - } - static bool first = true; - static std::shared_ptr channel; - if (first) { - first = false; - JavaVM* jvm; - { - jint result = env->GetJavaVM(&jvm); - assert(result == 0); - } - grpc::ChannelArguments ch_args; - // This is not required since "grpc.io.action.BIND" is already the default. - ch_args.SetString("grpc.binder.custom_android_intent_action_name", - "grpc.io.action.BIND"); - channel = grpc::experimental::CreateCustomBinderChannel( - env, application, "io.grpc.binder.cpp.exampleserver", - "io.grpc.binder.cpp.exampleserver.ExportedEndpointService", - std::make_shared< - grpc::experimental::binder::SameSignatureSecurityPolicy>( - jvm, application), - ch_args); - return env->NewStringUTF("Clicked 1 time, channel created"); - } else { - auto stub = helloworld::Greeter::NewStub(channel); - grpc::ClientContext context; - helloworld::HelloRequest request; - helloworld::HelloReply response; - request.set_name("BinderTransportClient"); - grpc::Status status = stub->SayHello(&context, request, &response); - if (status.ok()) { - return env->NewStringUTF(response.message().c_str()); - } - return env->NewStringUTF( - std::string("Clicked more than 1 time. Status not ok " + - std::to_string(status.error_code())) - .c_str()); - } -} diff --git a/examples/android/binder/java/io/grpc/binder/cpp/exampleclient/res/layout/activity_main.xml b/examples/android/binder/java/io/grpc/binder/cpp/exampleclient/res/layout/activity_main.xml deleted file mode 100644 index e866d8df894..00000000000 --- a/examples/android/binder/java/io/grpc/binder/cpp/exampleclient/res/layout/activity_main.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - -