Chiebot-Mirror
/
grpc
mirror of https://github.com/grpc/grpc.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into MetadataExchangeInTrailers

Browse Source
pull/36413/head
Yash Tibrewal 10 months ago
parent 4fc350e622 6e981d7460
commit e7d202685e
809 changed files with 5785 additions and 5527 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 36
      BUILD
  2. 1900
      CMakeLists.txt
  3. 21
      Makefile
  4. 44
      Package.swift
  5. 4
      bazel/grpc_build_system.bzl
  6. 4096
      build_autogenerated.yaml
  7. 8
      build_handwritten.yaml
  8. 27
      config.m4
  9. 27
      config.w32
  10. 2
      examples/python/observability/requirements.txt
  11. 48
      gRPC-C++.podspec
  12. 69
      gRPC-Core.podspec
  13. 48
      grpc.gemspec
  14. 48
      package.xml
  15. 8
      src/android/test/interop/app/CMakeLists.txt
  16. 68
      src/core/BUILD
  17. 5
      src/core/channelz/channelz.cc
  18. 6
      src/core/channelz/channelz_registry.cc
  19. 59
      src/core/client_channel/client_channel_filter.cc
  20. 3
      src/core/client_channel/client_channel_internal.h
  21. 5
      src/core/client_channel/config_selector.h
  22. 5
      src/core/client_channel/dynamic_filters.cc
  23. 8
      src/core/client_channel/local_subchannel_pool.cc
  24. 5
      src/core/client_channel/retry_filter.h
  25. 9
      src/core/client_channel/retry_filter_legacy_call_data.cc
  26. 21
      src/core/client_channel/subchannel.cc
  27. 8
      src/core/client_channel/subchannel_stream_client.cc
  28. 2
      src/core/ext/transport/chaotic_good/client/chaotic_good_connector.cc
  29. 2
      src/core/ext/transport/chaotic_good/client/chaotic_good_connector.h
  30. 2
      src/core/ext/transport/chaotic_good/server/chaotic_good_server.cc
  31. 2
      src/core/ext/transport/chaotic_good/server/chaotic_good_server.h
  32. 6
      src/core/ext/transport/chttp2/client/chttp2_connector.cc
  33. 2
      src/core/ext/transport/chttp2/client/chttp2_connector.h
  34. 4
      src/core/ext/transport/chttp2/server/chttp2_server.cc
  35. 5
      src/core/ext/xds/xds_certificate_provider.cc
  36. 21
      src/core/ext/xds/xds_client.cc
  37. 3
      src/core/ext/xds/xds_cluster.cc
  38. 3
      src/core/ext/xds/xds_cluster_specifier_plugin.cc
  39. 3
      src/core/ext/xds/xds_endpoint.cc
  40. 6
      src/core/ext/xds/xds_http_filters.cc
  41. 5
      src/core/ext/xds/xds_listener.cc
  42. 15
      src/core/ext/xds/xds_route_config.cc
  43. 5
      src/core/ext/xds/xds_routing.cc
  44. 13
      src/core/ext/xds/xds_server_config_fetcher.cc
  45. 19
      src/core/ext/xds/xds_transport_grpc.cc
  46. 8
      src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc
  47. 6
      src/core/handshaker/endpoint_info/endpoint_info_handshaker.h
  48. 2
      src/core/handshaker/handshaker.cc
  49. 6
      src/core/handshaker/handshaker.h
  50. 6
      src/core/handshaker/handshaker_factory.h
  51. 2
      src/core/handshaker/handshaker_registry.cc
  52. 8
      src/core/handshaker/handshaker_registry.h
  53. 8
      src/core/handshaker/http_connect/http_connect_handshaker.cc
  54. 6
      src/core/handshaker/http_connect/http_connect_handshaker.h
  55. 12
      src/core/handshaker/http_connect/http_proxy_mapper.cc
  56. 12
      src/core/handshaker/http_connect/http_proxy_mapper.h
  57. 6
      src/core/handshaker/proxy_mapper.h
  58. 2
      src/core/handshaker/proxy_mapper_registry.cc
  59. 8
      src/core/handshaker/proxy_mapper_registry.h
  60. 4
      src/core/handshaker/security/secure_endpoint.cc
  61. 6
      src/core/handshaker/security/secure_endpoint.h
  62. 12
      src/core/handshaker/security/security_handshaker.cc
  63. 8
      src/core/handshaker/security/security_handshaker.h
  64. 2
      src/core/handshaker/security/tsi_error.cc
  65. 6
      src/core/handshaker/security/tsi_error.h
  66. 8
      src/core/handshaker/tcp_connect/tcp_connect_handshaker.cc
  67. 6
      src/core/handshaker/tcp_connect/tcp_connect_handshaker.h
  68. 4
      src/core/lib/config/core_configuration.h
  69. 33
      src/core/lib/event_engine/ares_resolver.cc
  70. 4
      src/core/lib/event_engine/cf_engine/cf_engine.cc
  71. 3
      src/core/lib/event_engine/cf_engine/dns_service_resolver.cc
  72. 3
      src/core/lib/event_engine/cf_engine/dns_service_resolver.h
  73. 10
      src/core/lib/event_engine/forkable.cc
  74. 13
      src/core/lib/event_engine/posix_engine/ev_epoll1_linux.cc
  75. 19
      src/core/lib/event_engine/posix_engine/ev_poll_posix.cc
  76. 3
      src/core/lib/event_engine/posix_engine/lockfree_event.cc
  77. 46
      src/core/lib/event_engine/posix_engine/posix_endpoint.cc
  78. 22
      src/core/lib/event_engine/posix_engine/posix_endpoint.h
  79. 17
      src/core/lib/event_engine/posix_engine/posix_engine.cc
  80. 5
      src/core/lib/event_engine/posix_engine/posix_engine_listener.cc
  81. 9
      src/core/lib/event_engine/posix_engine/posix_engine_listener_utils.cc
  82. 3
      src/core/lib/event_engine/posix_engine/tcp_socket_utils.cc
  83. 3
      src/core/lib/event_engine/posix_engine/tcp_socket_utils.h
  84. 7
      src/core/lib/event_engine/posix_engine/timer_manager.cc
  85. 6
      src/core/lib/event_engine/resolved_address.cc
  86. 4
      src/core/lib/event_engine/slice.cc
  87. 17
      src/core/lib/event_engine/tcp_socket_utils.cc
  88. 13
      src/core/lib/event_engine/thread_pool/work_stealing_thread_pool.cc
  89. 61
      src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc
  90. 18
      src/core/lib/event_engine/windows/iocp.cc
  91. 12
      src/core/lib/event_engine/windows/win_socket.cc
  92. 17
      src/core/lib/event_engine/windows/windows_endpoint.cc
  93. 13
      src/core/lib/event_engine/windows/windows_engine.cc
  94. 13
      src/core/lib/event_engine/windows/windows_listener.cc
  95. 4
      src/core/lib/http/httpcli.cc
  96. 2
      src/core/lib/http/httpcli.h
  97. 4
      src/core/lib/http/httpcli_security_connector.cc
  98. 6
      src/core/lib/iomgr/call_combiner.cc
  99. 4
      src/core/lib/iomgr/closure.h
  100. 10
      src/core/lib/iomgr/combiner.cc
  101. Some files were not shown because too many files have changed in this diff Show More

36
BUILD
Unescape View File

@ -927,6 +927,7 @@ grpc_cc_library(
"src/cpp/server/secure_server_credentials.h",
],
external_deps = [
"absl/log:check",
"absl/strings:cord",
],
language = "c++",
@ -1231,6 +1232,7 @@ grpc_cc_library(
"src/cpp/server/insecure_server_credentials.cc",
],
external_deps = [
"absl/log:check",
"absl/strings",
"absl/synchronization",
],
@ -1362,6 +1364,7 @@ grpc_cc_library(
],
external_deps = [
"absl/base:core_headers",
"absl/log:check",
"absl/status:statusor",
"absl/strings",
"absl/types:optional",
@ -1420,6 +1423,7 @@ grpc_cc_library(
],
external_deps = [
"absl/container:inlined_vector",
"absl/log:check",
],
language = "c++",
deps = [
@ -1621,6 +1625,7 @@ grpc_cc_library(
"absl/container:flat_hash_map",
"absl/container:flat_hash_set",
"absl/functional:any_invocable",
"absl/log:check",
"absl/status",
"absl/status:statusor",
"absl/strings",
@ -2226,6 +2231,9 @@ grpc_cc_library(
grpc_cc_library(
name = "grpc_security_base",
srcs = [
"//src/core:handshaker/security/secure_endpoint.cc",
"//src/core:handshaker/security/security_handshaker.cc",
"//src/core:handshaker/security/tsi_error.cc",
"//src/core:lib/security/context/security_context.cc",
"//src/core:lib/security/credentials/call_creds_util.cc",
"//src/core:lib/security/credentials/composite/composite_credentials.cc",
@ -2233,12 +2241,12 @@ grpc_cc_library(
"//src/core:lib/security/credentials/plugin/plugin_credentials.cc",
"//src/core:lib/security/security_connector/security_connector.cc",
"//src/core:lib/security/transport/client_auth_filter.cc",
"//src/core:lib/security/transport/secure_endpoint.cc",
"//src/core:lib/security/transport/security_handshaker.cc",
"//src/core:lib/security/transport/server_auth_filter.cc",
"//src/core:lib/security/transport/tsi_error.cc",
],
hdrs = [
"//src/core:handshaker/security/secure_endpoint.h",
"//src/core:handshaker/security/security_handshaker.h",
"//src/core:handshaker/security/tsi_error.h",
"//src/core:lib/security/context/security_context.h",
"//src/core:lib/security/credentials/call_creds_util.h",
"//src/core:lib/security/credentials/composite/composite_credentials.h",
@ -2246,9 +2254,6 @@ grpc_cc_library(
"//src/core:lib/security/credentials/plugin/plugin_credentials.h",
"//src/core:lib/security/security_connector/security_connector.h",
"//src/core:lib/security/transport/auth_filters.h",
"//src/core:lib/security/transport/secure_endpoint.h",
"//src/core:lib/security/transport/security_handshaker.h",
"//src/core:lib/security/transport/tsi_error.h",
],
external_deps = [
"absl/base:core_headers",
@ -2417,6 +2422,7 @@ grpc_cc_library(
external_deps = [
"absl/base:core_headers",
"absl/functional:any_invocable",
"absl/log:check",
"absl/status",
"absl/status:statusor",
"absl/strings",
@ -2499,6 +2505,7 @@ grpc_cc_library(
external_deps = [
"absl/base:core_headers",
"absl/functional:any_invocable",
"absl/log:check",
"absl/status",
"absl/status:statusor",
"absl/strings",
@ -3082,7 +3089,7 @@ grpc_cc_library(
grpc_cc_library(
name = "handshaker",
srcs = [
"//src/core:lib/transport/handshaker.cc",
"//src/core:handshaker/handshaker.cc",
],
external_deps = [
"absl/base:core_headers",
@ -3092,7 +3099,7 @@ grpc_cc_library(
],
language = "c++",
public_hdrs = [
"//src/core:lib/transport/handshaker.h",
"//src/core:handshaker/handshaker.h",
],
visibility = ["@grpc:alt_grpc_base_legacy"],
deps = [
@ -3119,7 +3126,7 @@ grpc_cc_library(
grpc_cc_library(
name = "http_connect_handshaker",
srcs = [
"//src/core:lib/transport/http_connect_handshaker.cc",
"//src/core:handshaker/http_connect/http_connect_handshaker.cc",
],
external_deps = [
"absl/base:core_headers",
@ -3129,7 +3136,7 @@ grpc_cc_library(
],
language = "c++",
public_hdrs = [
"//src/core:lib/transport/http_connect_handshaker.h",
"//src/core:handshaker/http_connect/http_connect_handshaker.h",
],
visibility = ["@grpc:alt_grpc_base_legacy"],
deps = [
@ -3167,7 +3174,10 @@ grpc_cc_library(
"//src/core:lib/iomgr/executor.h",
"//src/core:lib/iomgr/iomgr_internal.h",
],
external_deps = ["absl/strings:str_format"],
external_deps = [
"absl/log:check",
"absl/strings:str_format",
],
visibility = [
"@grpc:alt_grpc_base_legacy",
"@grpc:exec_ctx",
@ -3229,6 +3239,7 @@ grpc_cc_library(
"//src/core:lib/iomgr/iomgr.h",
],
external_deps = [
"absl/log:check",
"absl/strings",
"absl/strings:str_format",
],
@ -3298,6 +3309,7 @@ grpc_cc_library(
"//src/core:lib/uri/uri_parser.h",
],
external_deps = [
"absl/log:check",
"absl/status",
"absl/status:statusor",
"absl/strings",
@ -3611,6 +3623,7 @@ grpc_cc_library(
"absl/container:flat_hash_set",
"absl/container:inlined_vector",
"absl/functional:any_invocable",
"absl/log:check",
"absl/status",
"absl/status:statusor",
"absl/strings",
@ -4269,6 +4282,7 @@ grpc_cc_library(
external_deps = [
"absl/base:core_headers",
"absl/cleanup",
"absl/log:check",
"absl/memory",
"absl/status",
"absl/status:statusor",

1900
CMakeLists.txt generated
View File

File diff suppressed because it is too large Load Diff

21
Makefile generated
Unescape View File

@ -677,7 +677,6 @@ LIBGRPC_SRC = \
src/core/client_channel/config_selector.cc \
src/core/client_channel/dynamic_filters.cc \
src/core/client_channel/global_subchannel_pool.cc \
src/core/client_channel/http_proxy_mapper.cc \
src/core/client_channel/local_subchannel_pool.cc \
src/core/client_channel/retry_filter.cc \
src/core/client_channel/retry_filter_legacy_call_data.cc \
@ -1083,6 +1082,16 @@ LIBGRPC_SRC = \
src/core/ext/xds/xds_routing.cc \
src/core/ext/xds/xds_server_config_fetcher.cc \
src/core/ext/xds/xds_transport_grpc.cc \
src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc \
src/core/handshaker/handshaker.cc \
src/core/handshaker/handshaker_registry.cc \
src/core/handshaker/http_connect/http_connect_handshaker.cc \
src/core/handshaker/http_connect/http_proxy_mapper.cc \
src/core/handshaker/proxy_mapper_registry.cc \
src/core/handshaker/security/secure_endpoint.cc \
src/core/handshaker/security/security_handshaker.cc \
src/core/handshaker/security/tsi_error.cc \
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 \
@ -1213,7 +1222,6 @@ LIBGRPC_SRC = \
src/core/lib/gprpp/windows/stat.cc \
src/core/lib/gprpp/windows/thd.cc \
src/core/lib/gprpp/work_serializer.cc \
src/core/lib/handshaker/proxy_mapper_registry.cc \
src/core/lib/http/format_request.cc \
src/core/lib/http/httpcli.cc \
src/core/lib/http/httpcli_security_connector.cc \
@ -1372,10 +1380,7 @@ LIBGRPC_SRC = \
src/core/lib/security/security_connector/ssl_utils.cc \
src/core/lib/security/security_connector/tls/tls_security_connector.cc \
src/core/lib/security/transport/client_auth_filter.cc \
src/core/lib/security/transport/secure_endpoint.cc \
src/core/lib/security/transport/security_handshaker.cc \
src/core/lib/security/transport/server_auth_filter.cc \
src/core/lib/security/transport/tsi_error.cc \
src/core/lib/security/util/json_util.cc \
src/core/lib/slice/percent_encoding.cc \
src/core/lib/slice/slice.cc \
@ -1411,18 +1416,13 @@ LIBGRPC_SRC = \
src/core/lib/transport/call_final_info.cc \
src/core/lib/transport/call_spine.cc \
src/core/lib/transport/connectivity_state.cc \
src/core/lib/transport/endpoint_info_handshaker.cc \
src/core/lib/transport/error_utils.cc \
src/core/lib/transport/handshaker.cc \
src/core/lib/transport/handshaker_registry.cc \
src/core/lib/transport/http_connect_handshaker.cc \
src/core/lib/transport/message.cc \
src/core/lib/transport/metadata.cc \
src/core/lib/transport/metadata_batch.cc \
src/core/lib/transport/metadata_info.cc \
src/core/lib/transport/parsed_metadata.cc \
src/core/lib/transport/status_conversion.cc \
src/core/lib/transport/tcp_connect_handshaker.cc \
src/core/lib/transport/timeout_encoding.cc \
src/core/lib/transport/transport.cc \
src/core/lib/transport/transport_op_string.cc \
@ -1550,6 +1550,7 @@ LIBGRPC_SRC = \
third_party/abseil-cpp/absl/hash/internal/hash.cc \
third_party/abseil-cpp/absl/hash/internal/low_level_hash.cc \
third_party/abseil-cpp/absl/log/globals.cc \
third_party/abseil-cpp/absl/log/internal/check_op.cc \
third_party/abseil-cpp/absl/log/internal/conditions.cc \
third_party/abseil-cpp/absl/log/internal/fnmatch.cc \
third_party/abseil-cpp/absl/log/internal/globals.cc \

44
Package.swift generated
Unescape View File

@ -140,8 +140,6 @@ let package = Package(
"src/core/client_channel/dynamic_filters.h",
"src/core/client_channel/global_subchannel_pool.cc",
"src/core/client_channel/global_subchannel_pool.h",
"src/core/client_channel/http_proxy_mapper.cc",
"src/core/client_channel/http_proxy_mapper.h",
"src/core/client_channel/local_subchannel_pool.cc",
"src/core/client_channel/local_subchannel_pool.h",
"src/core/client_channel/retry_filter.cc",
@ -1123,6 +1121,28 @@ let package = Package(
"src/core/ext/xds/xds_transport.h",
"src/core/ext/xds/xds_transport_grpc.cc",
"src/core/ext/xds/xds_transport_grpc.h",
"src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc",
"src/core/handshaker/endpoint_info/endpoint_info_handshaker.h",
"src/core/handshaker/handshaker.cc",
"src/core/handshaker/handshaker.h",
"src/core/handshaker/handshaker_factory.h",
"src/core/handshaker/handshaker_registry.cc",
"src/core/handshaker/handshaker_registry.h",
"src/core/handshaker/http_connect/http_connect_handshaker.cc",
"src/core/handshaker/http_connect/http_connect_handshaker.h",
"src/core/handshaker/http_connect/http_proxy_mapper.cc",
"src/core/handshaker/http_connect/http_proxy_mapper.h",
"src/core/handshaker/proxy_mapper.h",
"src/core/handshaker/proxy_mapper_registry.cc",
"src/core/handshaker/proxy_mapper_registry.h",
"src/core/handshaker/security/secure_endpoint.cc",
"src/core/handshaker/security/secure_endpoint.h",
"src/core/handshaker/security/security_handshaker.cc",
"src/core/handshaker/security/security_handshaker.h",
"src/core/handshaker/security/tsi_error.cc",
"src/core/handshaker/security/tsi_error.h",
"src/core/handshaker/tcp_connect/tcp_connect_handshaker.cc",
"src/core/handshaker/tcp_connect/tcp_connect_handshaker.h",
"src/core/lib/address_utils/parse_address.cc",
"src/core/lib/address_utils/parse_address.h",
"src/core/lib/address_utils/sockaddr_utils.cc",
@ -1404,9 +1424,6 @@ let package = Package(
"src/core/lib/gprpp/work_serializer.cc",
"src/core/lib/gprpp/work_serializer.h",
"src/core/lib/gprpp/xxhash_inline.h",
"src/core/lib/handshaker/proxy_mapper.h",
"src/core/lib/handshaker/proxy_mapper_registry.cc",
"src/core/lib/handshaker/proxy_mapper_registry.h",
"src/core/lib/http/format_request.cc",
"src/core/lib/http/format_request.h",
"src/core/lib/http/httpcli.cc",
@ -1738,13 +1755,7 @@ let package = Package(
"src/core/lib/security/security_connector/tls/tls_security_connector.h",
"src/core/lib/security/transport/auth_filters.h",
"src/core/lib/security/transport/client_auth_filter.cc",
"src/core/lib/security/transport/secure_endpoint.cc",
"src/core/lib/security/transport/secure_endpoint.h",
"src/core/lib/security/transport/security_handshaker.cc",
"src/core/lib/security/transport/security_handshaker.h",
"src/core/lib/security/transport/server_auth_filter.cc",
"src/core/lib/security/transport/tsi_error.cc",
"src/core/lib/security/transport/tsi_error.h",
"src/core/lib/security/util/json_util.cc",
"src/core/lib/security/util/json_util.h",
"src/core/lib/slice/percent_encoding.cc",
@ -1814,18 +1825,9 @@ let package = Package(
"src/core/lib/transport/connectivity_state.cc",
"src/core/lib/transport/connectivity_state.h",
"src/core/lib/transport/custom_metadata.h",
"src/core/lib/transport/endpoint_info_handshaker.cc",
"src/core/lib/transport/endpoint_info_handshaker.h",
"src/core/lib/transport/error_utils.cc",
"src/core/lib/transport/error_utils.h",
"src/core/lib/transport/handshaker.cc",
"src/core/lib/transport/handshaker.h",
"src/core/lib/transport/handshaker_factory.h",
"src/core/lib/transport/handshaker_registry.cc",
"src/core/lib/transport/handshaker_registry.h",
"src/core/lib/transport/http2_errors.h",
"src/core/lib/transport/http_connect_handshaker.cc",
"src/core/lib/transport/http_connect_handshaker.h",
"src/core/lib/transport/message.cc",
"src/core/lib/transport/message.h",
"src/core/lib/transport/metadata.cc",
@ -1840,8 +1842,6 @@ let package = Package(
"src/core/lib/transport/simple_slice_based_metadata.h",
"src/core/lib/transport/status_conversion.cc",
"src/core/lib/transport/status_conversion.h",
"src/core/lib/transport/tcp_connect_handshaker.cc",
"src/core/lib/transport/tcp_connect_handshaker.h",
"src/core/lib/transport/timeout_encoding.cc",
"src/core/lib/transport/timeout_encoding.h",
"src/core/lib/transport/transport.cc",

4
bazel/grpc_build_system.bzl
Unescape View File

@ -539,7 +539,7 @@ def grpc_cc_test(name, srcs = [], deps = [], external_deps = [], args = [], data
if language.upper() == "C":
copts = copts + if_not_windows(["-std=c11"])
core_deps = deps + _get_external_deps(external_deps) + ["//test/core/util:grpc_suppressions"]
core_deps = deps + _get_external_deps(external_deps) + ["//test/core/test_util:grpc_suppressions"]
# Test args for all tests
test_args = {
@ -617,7 +617,7 @@ def grpc_cc_binary(name, srcs = [], deps = [], external_deps = [], args = [], da
data = data,
testonly = testonly,
linkshared = linkshared,
deps = deps + _get_external_deps(external_deps) + ["//test/core/util:grpc_suppressions"],
deps = deps + _get_external_deps(external_deps) + ["//test/core/test_util:grpc_suppressions"],
copts = GRPC_DEFAULT_COPTS + copts,
linkopts = if_not_windows(["-pthread"]) + linkopts,
tags = tags,

4096
build_autogenerated.yaml generated
View File

File diff suppressed because it is too large Load Diff

8
build_handwritten.yaml
Unescape View File

@ -29,7 +29,7 @@ configs:
compile_the_world: true
test_environ:
ASAN_OPTIONS: detect_leaks=1:color=always
LSAN_OPTIONS: suppressions=test/core/util/lsan_suppressions.txt:report_objects=1
LSAN_OPTIONS: suppressions=test/core/test_util/lsan_suppressions.txt:report_objects=1
asan-noleaks:
CC: clang
CPPFLAGS: -O0 -fsanitize-coverage=edge,trace-pc-guard -fsanitize=address -fno-omit-frame-pointer
@ -53,7 +53,7 @@ configs:
compile_the_world: true
test_environ:
ASAN_OPTIONS: detect_leaks=1:color=always
LSAN_OPTIONS: suppressions=test/core/util/lsan_suppressions.txt:report_objects=1
LSAN_OPTIONS: suppressions=test/core/test_util/lsan_suppressions.txt:report_objects=1
c++-compat:
CFLAGS: -Wc++-compat
CPPFLAGS: -O0
@ -115,7 +115,7 @@ configs:
LDXX: clang++
compile_the_world: true
test_environ:
TSAN_OPTIONS: suppressions=test/core/util/tsan_suppressions.txt:halt_on_error=1:second_deadlock_stack=1
TSAN_OPTIONS: suppressions=test/core/test_util/tsan_suppressions.txt:halt_on_error=1:second_deadlock_stack=1
ubsan:
CC: clang
CPPFLAGS: -O0 -stdlib=libc++ -fsanitize-coverage=edge,trace-pc-guard -fsanitize=undefined
@ -127,7 +127,7 @@ configs:
LDXX: clang++
compile_the_world: true
test_environ:
UBSAN_OPTIONS: halt_on_error=1:print_stacktrace=1:suppressions=test/core/util/ubsan_suppressions.txt
UBSAN_OPTIONS: halt_on_error=1:print_stacktrace=1:suppressions=test/core/test_util/ubsan_suppressions.txt
defaults:
boringssl:
CFLAGS: -g

27
config.m4 generated
Unescape View File

@ -52,7 +52,6 @@ if test "$PHP_GRPC" != "no"; then
src/core/client_channel/config_selector.cc \
src/core/client_channel/dynamic_filters.cc \
src/core/client_channel/global_subchannel_pool.cc \
src/core/client_channel/http_proxy_mapper.cc \
src/core/client_channel/local_subchannel_pool.cc \
src/core/client_channel/retry_filter.cc \
src/core/client_channel/retry_filter_legacy_call_data.cc \
@ -458,6 +457,16 @@ if test "$PHP_GRPC" != "no"; then
src/core/ext/xds/xds_routing.cc \
src/core/ext/xds/xds_server_config_fetcher.cc \
src/core/ext/xds/xds_transport_grpc.cc \
src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc \
src/core/handshaker/handshaker.cc \
src/core/handshaker/handshaker_registry.cc \
src/core/handshaker/http_connect/http_connect_handshaker.cc \
src/core/handshaker/http_connect/http_proxy_mapper.cc \
src/core/handshaker/proxy_mapper_registry.cc \
src/core/handshaker/security/secure_endpoint.cc \
src/core/handshaker/security/security_handshaker.cc \
src/core/handshaker/security/tsi_error.cc \
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 \
@ -588,7 +597,6 @@ if test "$PHP_GRPC" != "no"; then
src/core/lib/gprpp/windows/stat.cc \
src/core/lib/gprpp/windows/thd.cc \
src/core/lib/gprpp/work_serializer.cc \
src/core/lib/handshaker/proxy_mapper_registry.cc \
src/core/lib/http/format_request.cc \
src/core/lib/http/httpcli.cc \
src/core/lib/http/httpcli_security_connector.cc \
@ -747,10 +755,7 @@ if test "$PHP_GRPC" != "no"; then
src/core/lib/security/security_connector/ssl_utils.cc \
src/core/lib/security/security_connector/tls/tls_security_connector.cc \
src/core/lib/security/transport/client_auth_filter.cc \
src/core/lib/security/transport/secure_endpoint.cc \
src/core/lib/security/transport/security_handshaker.cc \
src/core/lib/security/transport/server_auth_filter.cc \
src/core/lib/security/transport/tsi_error.cc \
src/core/lib/security/util/json_util.cc \
src/core/lib/slice/percent_encoding.cc \
src/core/lib/slice/slice.cc \
@ -786,18 +791,13 @@ if test "$PHP_GRPC" != "no"; then
src/core/lib/transport/call_final_info.cc \
src/core/lib/transport/call_spine.cc \
src/core/lib/transport/connectivity_state.cc \
src/core/lib/transport/endpoint_info_handshaker.cc \
src/core/lib/transport/error_utils.cc \
src/core/lib/transport/handshaker.cc \
src/core/lib/transport/handshaker_registry.cc \
src/core/lib/transport/http_connect_handshaker.cc \
src/core/lib/transport/message.cc \
src/core/lib/transport/metadata.cc \
src/core/lib/transport/metadata_batch.cc \
src/core/lib/transport/metadata_info.cc \
src/core/lib/transport/parsed_metadata.cc \
src/core/lib/transport/status_conversion.cc \
src/core/lib/transport/tcp_connect_handshaker.cc \
src/core/lib/transport/timeout_encoding.cc \
src/core/lib/transport/transport.cc \
src/core/lib/transport/transport_op_string.cc \
@ -935,6 +935,7 @@ if test "$PHP_GRPC" != "no"; then
third_party/abseil-cpp/absl/hash/internal/hash.cc \
third_party/abseil-cpp/absl/hash/internal/low_level_hash.cc \
third_party/abseil-cpp/absl/log/globals.cc \
third_party/abseil-cpp/absl/log/internal/check_op.cc \
third_party/abseil-cpp/absl/log/internal/conditions.cc \
third_party/abseil-cpp/absl/log/internal/fnmatch.cc \
third_party/abseil-cpp/absl/log/internal/globals.cc \
@ -1506,6 +1507,11 @@ if test "$PHP_GRPC" != "no"; then
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/ext/xds)
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)
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)
@ -1531,7 +1537,6 @@ if test "$PHP_GRPC" != "no"; then
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/handshaker)
PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/http)
PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/iomgr)
PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/iomgr/event_engine_shims)

27
config.w32 generated
Unescape View File

@ -17,7 +17,6 @@ if (PHP_GRPC != "no") {
"src\\core\\client_channel\\config_selector.cc " +
"src\\core\\client_channel\\dynamic_filters.cc " +
"src\\core\\client_channel\\global_subchannel_pool.cc " +
"src\\core\\client_channel\\http_proxy_mapper.cc " +
"src\\core\\client_channel\\local_subchannel_pool.cc " +
"src\\core\\client_channel\\retry_filter.cc " +
"src\\core\\client_channel\\retry_filter_legacy_call_data.cc " +
@ -423,6 +422,16 @@ if (PHP_GRPC != "no") {
"src\\core\\ext\\xds\\xds_routing.cc " +
"src\\core\\ext\\xds\\xds_server_config_fetcher.cc " +
"src\\core\\ext\\xds\\xds_transport_grpc.cc " +
"src\\core\\handshaker\\endpoint_info\\endpoint_info_handshaker.cc " +
"src\\core\\handshaker\\handshaker.cc " +
"src\\core\\handshaker\\handshaker_registry.cc " +
"src\\core\\handshaker\\http_connect\\http_connect_handshaker.cc " +
"src\\core\\handshaker\\http_connect\\http_proxy_mapper.cc " +
"src\\core\\handshaker\\proxy_mapper_registry.cc " +
"src\\core\\handshaker\\security\\secure_endpoint.cc " +
"src\\core\\handshaker\\security\\security_handshaker.cc " +
"src\\core\\handshaker\\security\\tsi_error.cc " +
"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 " +
@ -553,7 +562,6 @@ if (PHP_GRPC != "no") {
"src\\core\\lib\\gprpp\\windows\\stat.cc " +
"src\\core\\lib\\gprpp\\windows\\thd.cc " +
"src\\core\\lib\\gprpp\\work_serializer.cc " +
"src\\core\\lib\\handshaker\\proxy_mapper_registry.cc " +
"src\\core\\lib\\http\\format_request.cc " +
"src\\core\\lib\\http\\httpcli.cc " +
"src\\core\\lib\\http\\httpcli_security_connector.cc " +
@ -712,10 +720,7 @@ if (PHP_GRPC != "no") {
"src\\core\\lib\\security\\security_connector\\ssl_utils.cc " +
"src\\core\\lib\\security\\security_connector\\tls\\tls_security_connector.cc " +
"src\\core\\lib\\security\\transport\\client_auth_filter.cc " +
"src\\core\\lib\\security\\transport\\secure_endpoint.cc " +
"src\\core\\lib\\security\\transport\\security_handshaker.cc " +
"src\\core\\lib\\security\\transport\\server_auth_filter.cc " +
"src\\core\\lib\\security\\transport\\tsi_error.cc " +
"src\\core\\lib\\security\\util\\json_util.cc " +
"src\\core\\lib\\slice\\percent_encoding.cc " +
"src\\core\\lib\\slice\\slice.cc " +
@ -751,18 +756,13 @@ if (PHP_GRPC != "no") {
"src\\core\\lib\\transport\\call_final_info.cc " +
"src\\core\\lib\\transport\\call_spine.cc " +
"src\\core\\lib\\transport\\connectivity_state.cc " +
"src\\core\\lib\\transport\\endpoint_info_handshaker.cc " +
"src\\core\\lib\\transport\\error_utils.cc " +
"src\\core\\lib\\transport\\handshaker.cc " +
"src\\core\\lib\\transport\\handshaker_registry.cc " +
"src\\core\\lib\\transport\\http_connect_handshaker.cc " +
"src\\core\\lib\\transport\\message.cc " +
"src\\core\\lib\\transport\\metadata.cc " +
"src\\core\\lib\\transport\\metadata_batch.cc " +
"src\\core\\lib\\transport\\metadata_info.cc " +
"src\\core\\lib\\transport\\parsed_metadata.cc " +
"src\\core\\lib\\transport\\status_conversion.cc " +
"src\\core\\lib\\transport\\tcp_connect_handshaker.cc " +
"src\\core\\lib\\transport\\timeout_encoding.cc " +
"src\\core\\lib\\transport\\transport.cc " +
"src\\core\\lib\\transport\\transport_op_string.cc " +
@ -900,6 +900,7 @@ if (PHP_GRPC != "no") {
"third_party\\abseil-cpp\\absl\\hash\\internal\\hash.cc " +
"third_party\\abseil-cpp\\absl\\hash\\internal\\low_level_hash.cc " +
"third_party\\abseil-cpp\\absl\\log\\globals.cc " +
"third_party\\abseil-cpp\\absl\\log\\internal\\check_op.cc " +
"third_party\\abseil-cpp\\absl\\log\\internal\\conditions.cc " +
"third_party\\abseil-cpp\\absl\\log\\internal\\fnmatch.cc " +
"third_party\\abseil-cpp\\absl\\log\\internal\\globals.cc " +
@ -1642,6 +1643,11 @@ if (PHP_GRPC != "no") {
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\\ext\\xds");
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");
FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\handshaker\\security");
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");
@ -1668,7 +1674,6 @@ if (PHP_GRPC != "no") {
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\\handshaker");
FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\http");
FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\iomgr");
FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\iomgr\\event_engine_shims");

2
examples/python/observability/requirements.txt
Unescape View File

@ -1,3 +1,3 @@
grpcio>=1.62.0
grpcio-observability>=1.62.0
opentelemetry-sdk==1.21.0
opentelemetry-sdk>=1.21.0

48
gRPC-C++.podspec generated
Unescape View File

@ -273,7 +273,6 @@ Pod::Spec.new do |s|
'src/core/client_channel/connector.h',
'src/core/client_channel/dynamic_filters.h',
'src/core/client_channel/global_subchannel_pool.h',
'src/core/client_channel/http_proxy_mapper.h',
'src/core/client_channel/local_subchannel_pool.h',
'src/core/client_channel/retry_filter.h',
'src/core/client_channel/retry_filter_legacy_call_data.h',
@ -889,6 +888,18 @@ Pod::Spec.new do |s|
'src/core/ext/xds/xds_routing.h',
'src/core/ext/xds/xds_transport.h',
'src/core/ext/xds/xds_transport_grpc.h',
'src/core/handshaker/endpoint_info/endpoint_info_handshaker.h',
'src/core/handshaker/handshaker.h',
'src/core/handshaker/handshaker_factory.h',
'src/core/handshaker/handshaker_registry.h',
'src/core/handshaker/http_connect/http_connect_handshaker.h',
'src/core/handshaker/http_connect/http_proxy_mapper.h',
'src/core/handshaker/proxy_mapper.h',
'src/core/handshaker/proxy_mapper_registry.h',
'src/core/handshaker/security/secure_endpoint.h',
'src/core/handshaker/security/security_handshaker.h',
'src/core/handshaker/security/tsi_error.h',
'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',
@ -1040,8 +1051,6 @@ Pod::Spec.new do |s|
'src/core/lib/gprpp/validation_errors.h',
'src/core/lib/gprpp/work_serializer.h',
'src/core/lib/gprpp/xxhash_inline.h',
'src/core/lib/handshaker/proxy_mapper.h',
'src/core/lib/handshaker/proxy_mapper_registry.h',
'src/core/lib/http/format_request.h',
'src/core/lib/http/httpcli.h',
'src/core/lib/http/httpcli_ssl_credentials.h',
@ -1211,9 +1220,6 @@ Pod::Spec.new do |s|
'src/core/lib/security/security_connector/ssl_utils.h',
'src/core/lib/security/security_connector/tls/tls_security_connector.h',
'src/core/lib/security/transport/auth_filters.h',
'src/core/lib/security/transport/secure_endpoint.h',
'src/core/lib/security/transport/security_handshaker.h',
'src/core/lib/security/transport/tsi_error.h',
'src/core/lib/security/util/json_util.h',
'src/core/lib/slice/percent_encoding.h',
'src/core/lib/slice/slice.h',
@ -1248,13 +1254,8 @@ Pod::Spec.new do |s|
'src/core/lib/transport/call_spine.h',
'src/core/lib/transport/connectivity_state.h',
'src/core/lib/transport/custom_metadata.h',
'src/core/lib/transport/endpoint_info_handshaker.h',
'src/core/lib/transport/error_utils.h',
'src/core/lib/transport/handshaker.h',
'src/core/lib/transport/handshaker_factory.h',
'src/core/lib/transport/handshaker_registry.h',
'src/core/lib/transport/http2_errors.h',
'src/core/lib/transport/http_connect_handshaker.h',
'src/core/lib/transport/message.h',
'src/core/lib/transport/metadata.h',
'src/core/lib/transport/metadata_batch.h',
@ -1263,7 +1264,6 @@ Pod::Spec.new do |s|
'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/tcp_connect_handshaker.h',
'src/core/lib/transport/timeout_encoding.h',
'src/core/lib/transport/transport.h',
'src/core/lib/transport/transport_fwd.h',
@ -1562,7 +1562,6 @@ Pod::Spec.new do |s|
'src/core/client_channel/connector.h',
'src/core/client_channel/dynamic_filters.h',
'src/core/client_channel/global_subchannel_pool.h',
'src/core/client_channel/http_proxy_mapper.h',
'src/core/client_channel/local_subchannel_pool.h',
'src/core/client_channel/retry_filter.h',
'src/core/client_channel/retry_filter_legacy_call_data.h',
@ -2160,6 +2159,18 @@ Pod::Spec.new do |s|
'src/core/ext/xds/xds_routing.h',
'src/core/ext/xds/xds_transport.h',
'src/core/ext/xds/xds_transport_grpc.h',
'src/core/handshaker/endpoint_info/endpoint_info_handshaker.h',
'src/core/handshaker/handshaker.h',
'src/core/handshaker/handshaker_factory.h',
'src/core/handshaker/handshaker_registry.h',
'src/core/handshaker/http_connect/http_connect_handshaker.h',
'src/core/handshaker/http_connect/http_proxy_mapper.h',
'src/core/handshaker/proxy_mapper.h',
'src/core/handshaker/proxy_mapper_registry.h',
'src/core/handshaker/security/secure_endpoint.h',
'src/core/handshaker/security/security_handshaker.h',
'src/core/handshaker/security/tsi_error.h',
'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',
@ -2311,8 +2322,6 @@ Pod::Spec.new do |s|
'src/core/lib/gprpp/validation_errors.h',
'src/core/lib/gprpp/work_serializer.h',
'src/core/lib/gprpp/xxhash_inline.h',
'src/core/lib/handshaker/proxy_mapper.h',
'src/core/lib/handshaker/proxy_mapper_registry.h',
'src/core/lib/http/format_request.h',
'src/core/lib/http/httpcli.h',
'src/core/lib/http/httpcli_ssl_credentials.h',
@ -2482,9 +2491,6 @@ Pod::Spec.new do |s|
'src/core/lib/security/security_connector/ssl_utils.h',
'src/core/lib/security/security_connector/tls/tls_security_connector.h',
'src/core/lib/security/transport/auth_filters.h',
'src/core/lib/security/transport/secure_endpoint.h',
'src/core/lib/security/transport/security_handshaker.h',
'src/core/lib/security/transport/tsi_error.h',
'src/core/lib/security/util/json_util.h',
'src/core/lib/slice/percent_encoding.h',
'src/core/lib/slice/slice.h',
@ -2519,13 +2525,8 @@ Pod::Spec.new do |s|
'src/core/lib/transport/call_spine.h',
'src/core/lib/transport/connectivity_state.h',
'src/core/lib/transport/custom_metadata.h',
'src/core/lib/transport/endpoint_info_handshaker.h',
'src/core/lib/transport/error_utils.h',
'src/core/lib/transport/handshaker.h',
'src/core/lib/transport/handshaker_factory.h',
'src/core/lib/transport/handshaker_registry.h',
'src/core/lib/transport/http2_errors.h',
'src/core/lib/transport/http_connect_handshaker.h',
'src/core/lib/transport/message.h',
'src/core/lib/transport/metadata.h',
'src/core/lib/transport/metadata_batch.h',
@ -2534,7 +2535,6 @@ Pod::Spec.new do |s|
'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/tcp_connect_handshaker.h',
'src/core/lib/transport/timeout_encoding.h',
'src/core/lib/transport/transport.h',
'src/core/lib/transport/transport_fwd.h',

69
gRPC-Core.podspec generated
Unescape View File

@ -214,6 +214,7 @@ Pod::Spec.new do |s|
ss.dependency 'abseil/functional/bind_front', abseil_version
ss.dependency 'abseil/functional/function_ref', abseil_version
ss.dependency 'abseil/hash/hash', abseil_version
ss.dependency 'abseil/log/check', abseil_version
ss.dependency 'abseil/log/log', abseil_version
ss.dependency 'abseil/memory/memory', abseil_version
ss.dependency 'abseil/meta/type_traits', abseil_version
@ -256,8 +257,6 @@ Pod::Spec.new do |s|
'src/core/client_channel/dynamic_filters.h',
'src/core/client_channel/global_subchannel_pool.cc',
'src/core/client_channel/global_subchannel_pool.h',
'src/core/client_channel/http_proxy_mapper.cc',
'src/core/client_channel/http_proxy_mapper.h',
'src/core/client_channel/local_subchannel_pool.cc',
'src/core/client_channel/local_subchannel_pool.h',
'src/core/client_channel/retry_filter.cc',
@ -1239,6 +1238,28 @@ Pod::Spec.new do |s|
'src/core/ext/xds/xds_transport.h',
'src/core/ext/xds/xds_transport_grpc.cc',
'src/core/ext/xds/xds_transport_grpc.h',
'src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc',
'src/core/handshaker/endpoint_info/endpoint_info_handshaker.h',
'src/core/handshaker/handshaker.cc',
'src/core/handshaker/handshaker.h',
'src/core/handshaker/handshaker_factory.h',
'src/core/handshaker/handshaker_registry.cc',
'src/core/handshaker/handshaker_registry.h',
'src/core/handshaker/http_connect/http_connect_handshaker.cc',
'src/core/handshaker/http_connect/http_connect_handshaker.h',
'src/core/handshaker/http_connect/http_proxy_mapper.cc',
'src/core/handshaker/http_connect/http_proxy_mapper.h',
'src/core/handshaker/proxy_mapper.h',
'src/core/handshaker/proxy_mapper_registry.cc',
'src/core/handshaker/proxy_mapper_registry.h',
'src/core/handshaker/security/secure_endpoint.cc',
'src/core/handshaker/security/secure_endpoint.h',
'src/core/handshaker/security/security_handshaker.cc',
'src/core/handshaker/security/security_handshaker.h',
'src/core/handshaker/security/tsi_error.cc',
'src/core/handshaker/security/tsi_error.h',
'src/core/handshaker/tcp_connect/tcp_connect_handshaker.cc',
'src/core/handshaker/tcp_connect/tcp_connect_handshaker.h',
'src/core/lib/address_utils/parse_address.cc',
'src/core/lib/address_utils/parse_address.h',
'src/core/lib/address_utils/sockaddr_utils.cc',
@ -1520,9 +1541,6 @@ Pod::Spec.new do |s|
'src/core/lib/gprpp/work_serializer.cc',
'src/core/lib/gprpp/work_serializer.h',
'src/core/lib/gprpp/xxhash_inline.h',
'src/core/lib/handshaker/proxy_mapper.h',
'src/core/lib/handshaker/proxy_mapper_registry.cc',
'src/core/lib/handshaker/proxy_mapper_registry.h',
'src/core/lib/http/format_request.cc',
'src/core/lib/http/format_request.h',
'src/core/lib/http/httpcli.cc',
@ -1850,13 +1868,7 @@ Pod::Spec.new do |s|
'src/core/lib/security/security_connector/tls/tls_security_connector.h',
'src/core/lib/security/transport/auth_filters.h',
'src/core/lib/security/transport/client_auth_filter.cc',
'src/core/lib/security/transport/secure_endpoint.cc',
'src/core/lib/security/transport/secure_endpoint.h',
'src/core/lib/security/transport/security_handshaker.cc',
'src/core/lib/security/transport/security_handshaker.h',
'src/core/lib/security/transport/server_auth_filter.cc',
'src/core/lib/security/transport/tsi_error.cc',
'src/core/lib/security/transport/tsi_error.h',
'src/core/lib/security/util/json_util.cc',
'src/core/lib/security/util/json_util.h',
'src/core/lib/slice/percent_encoding.cc',
@ -1926,18 +1938,9 @@ Pod::Spec.new do |s|
'src/core/lib/transport/connectivity_state.cc',
'src/core/lib/transport/connectivity_state.h',
'src/core/lib/transport/custom_metadata.h',
'src/core/lib/transport/endpoint_info_handshaker.cc',
'src/core/lib/transport/endpoint_info_handshaker.h',
'src/core/lib/transport/error_utils.cc',
'src/core/lib/transport/error_utils.h',
'src/core/lib/transport/handshaker.cc',
'src/core/lib/transport/handshaker.h',
'src/core/lib/transport/handshaker_factory.h',
'src/core/lib/transport/handshaker_registry.cc',
'src/core/lib/transport/handshaker_registry.h',
'src/core/lib/transport/http2_errors.h',
'src/core/lib/transport/http_connect_handshaker.cc',
'src/core/lib/transport/http_connect_handshaker.h',
'src/core/lib/transport/message.cc',
'src/core/lib/transport/message.h',
'src/core/lib/transport/metadata.cc',
@ -1952,8 +1955,6 @@ Pod::Spec.new do |s|
'src/core/lib/transport/simple_slice_based_metadata.h',
'src/core/lib/transport/status_conversion.cc',
'src/core/lib/transport/status_conversion.h',
'src/core/lib/transport/tcp_connect_handshaker.cc',
'src/core/lib/transport/tcp_connect_handshaker.h',
'src/core/lib/transport/timeout_encoding.cc',
'src/core/lib/transport/timeout_encoding.h',
'src/core/lib/transport/transport.cc',
@ -2361,7 +2362,6 @@ Pod::Spec.new do |s|
'src/core/client_channel/connector.h',
'src/core/client_channel/dynamic_filters.h',
'src/core/client_channel/global_subchannel_pool.h',
'src/core/client_channel/http_proxy_mapper.h',
'src/core/client_channel/local_subchannel_pool.h',
'src/core/client_channel/retry_filter.h',
'src/core/client_channel/retry_filter_legacy_call_data.h',
@ -2938,6 +2938,18 @@ Pod::Spec.new do |s|
'src/core/ext/xds/xds_routing.h',
'src/core/ext/xds/xds_transport.h',
'src/core/ext/xds/xds_transport_grpc.h',
'src/core/handshaker/endpoint_info/endpoint_info_handshaker.h',
'src/core/handshaker/handshaker.h',
'src/core/handshaker/handshaker_factory.h',
'src/core/handshaker/handshaker_registry.h',
'src/core/handshaker/http_connect/http_connect_handshaker.h',
'src/core/handshaker/http_connect/http_proxy_mapper.h',
'src/core/handshaker/proxy_mapper.h',
'src/core/handshaker/proxy_mapper_registry.h',
'src/core/handshaker/security/secure_endpoint.h',
'src/core/handshaker/security/security_handshaker.h',
'src/core/handshaker/security/tsi_error.h',
'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',
@ -3089,8 +3101,6 @@ Pod::Spec.new do |s|
'src/core/lib/gprpp/validation_errors.h',
'src/core/lib/gprpp/work_serializer.h',
'src/core/lib/gprpp/xxhash_inline.h',
'src/core/lib/handshaker/proxy_mapper.h',
'src/core/lib/handshaker/proxy_mapper_registry.h',
'src/core/lib/http/format_request.h',
'src/core/lib/http/httpcli.h',
'src/core/lib/http/httpcli_ssl_credentials.h',
@ -3260,9 +3270,6 @@ Pod::Spec.new do |s|
'src/core/lib/security/security_connector/ssl_utils.h',
'src/core/lib/security/security_connector/tls/tls_security_connector.h',
'src/core/lib/security/transport/auth_filters.h',
'src/core/lib/security/transport/secure_endpoint.h',
'src/core/lib/security/transport/security_handshaker.h',
'src/core/lib/security/transport/tsi_error.h',
'src/core/lib/security/util/json_util.h',
'src/core/lib/slice/percent_encoding.h',
'src/core/lib/slice/slice.h',
@ -3297,13 +3304,8 @@ Pod::Spec.new do |s|
'src/core/lib/transport/call_spine.h',
'src/core/lib/transport/connectivity_state.h',
'src/core/lib/transport/custom_metadata.h',
'src/core/lib/transport/endpoint_info_handshaker.h',
'src/core/lib/transport/error_utils.h',
'src/core/lib/transport/handshaker.h',
'src/core/lib/transport/handshaker_factory.h',
'src/core/lib/transport/handshaker_registry.h',
'src/core/lib/transport/http2_errors.h',
'src/core/lib/transport/http_connect_handshaker.h',
'src/core/lib/transport/message.h',
'src/core/lib/transport/metadata.h',
'src/core/lib/transport/metadata_batch.h',
@ -3312,7 +3314,6 @@ Pod::Spec.new do |s|
'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/tcp_connect_handshaker.h',
'src/core/lib/transport/timeout_encoding.h',
'src/core/lib/transport/transport.h',
'src/core/lib/transport/transport_fwd.h',

48
grpc.gemspec generated
Unescape View File

@ -146,8 +146,6 @@ Gem::Specification.new do |s|
s.files += %w( src/core/client_channel/dynamic_filters.h )
s.files += %w( src/core/client_channel/global_subchannel_pool.cc )
s.files += %w( src/core/client_channel/global_subchannel_pool.h )
s.files += %w( src/core/client_channel/http_proxy_mapper.cc )
s.files += %w( src/core/client_channel/http_proxy_mapper.h )
s.files += %w( src/core/client_channel/local_subchannel_pool.cc )
s.files += %w( src/core/client_channel/local_subchannel_pool.h )
s.files += %w( src/core/client_channel/retry_filter.cc )
@ -1129,6 +1127,28 @@ Gem::Specification.new do |s|
s.files += %w( src/core/ext/xds/xds_transport.h )
s.files += %w( src/core/ext/xds/xds_transport_grpc.cc )
s.files += %w( src/core/ext/xds/xds_transport_grpc.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 )
s.files += %w( src/core/handshaker/handshaker.h )
s.files += %w( src/core/handshaker/handshaker_factory.h )
s.files += %w( src/core/handshaker/handshaker_registry.cc )
s.files += %w( src/core/handshaker/handshaker_registry.h )
s.files += %w( src/core/handshaker/http_connect/http_connect_handshaker.cc )
s.files += %w( src/core/handshaker/http_connect/http_connect_handshaker.h )
s.files += %w( src/core/handshaker/http_connect/http_proxy_mapper.cc )
s.files += %w( src/core/handshaker/http_connect/http_proxy_mapper.h )
s.files += %w( src/core/handshaker/proxy_mapper.h )
s.files += %w( src/core/handshaker/proxy_mapper_registry.cc )
s.files += %w( src/core/handshaker/proxy_mapper_registry.h )
s.files += %w( src/core/handshaker/security/secure_endpoint.cc )
s.files += %w( src/core/handshaker/security/secure_endpoint.h )
s.files += %w( src/core/handshaker/security/security_handshaker.cc )
s.files += %w( src/core/handshaker/security/security_handshaker.h )
s.files += %w( src/core/handshaker/security/tsi_error.cc )
s.files += %w( src/core/handshaker/security/tsi_error.h )
s.files += %w( src/core/handshaker/tcp_connect/tcp_connect_handshaker.cc )
s.files += %w( src/core/handshaker/tcp_connect/tcp_connect_handshaker.h )
s.files += %w( src/core/lib/address_utils/parse_address.cc )
s.files += %w( src/core/lib/address_utils/parse_address.h )
s.files += %w( src/core/lib/address_utils/sockaddr_utils.cc )
@ -1410,9 +1430,6 @@ Gem::Specification.new do |s|
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/handshaker/proxy_mapper.h )
s.files += %w( src/core/lib/handshaker/proxy_mapper_registry.cc )
s.files += %w( src/core/lib/handshaker/proxy_mapper_registry.h )
s.files += %w( src/core/lib/http/format_request.cc )
s.files += %w( src/core/lib/http/format_request.h )
s.files += %w( src/core/lib/http/httpcli.cc )
@ -1740,13 +1757,7 @@ Gem::Specification.new do |s|
s.files += %w( src/core/lib/security/security_connector/tls/tls_security_connector.h )
s.files += %w( src/core/lib/security/transport/auth_filters.h )
s.files += %w( src/core/lib/security/transport/client_auth_filter.cc )
s.files += %w( src/core/lib/security/transport/secure_endpoint.cc )
s.files += %w( src/core/lib/security/transport/secure_endpoint.h )
s.files += %w( src/core/lib/security/transport/security_handshaker.cc )
s.files += %w( src/core/lib/security/transport/security_handshaker.h )
s.files += %w( src/core/lib/security/transport/server_auth_filter.cc )
s.files += %w( src/core/lib/security/transport/tsi_error.cc )
s.files += %w( src/core/lib/security/transport/tsi_error.h )
s.files += %w( src/core/lib/security/util/json_util.cc )
s.files += %w( src/core/lib/security/util/json_util.h )
s.files += %w( src/core/lib/slice/percent_encoding.cc )
@ -1816,18 +1827,9 @@ Gem::Specification.new do |s|
s.files += %w( src/core/lib/transport/connectivity_state.cc )
s.files += %w( src/core/lib/transport/connectivity_state.h )
s.files += %w( src/core/lib/transport/custom_metadata.h )
s.files += %w( src/core/lib/transport/endpoint_info_handshaker.cc )
s.files += %w( src/core/lib/transport/endpoint_info_handshaker.h )
s.files += %w( src/core/lib/transport/error_utils.cc )
s.files += %w( src/core/lib/transport/error_utils.h )
s.files += %w( src/core/lib/transport/handshaker.cc )
s.files += %w( src/core/lib/transport/handshaker.h )
s.files += %w( src/core/lib/transport/handshaker_factory.h )
s.files += %w( src/core/lib/transport/handshaker_registry.cc )
s.files += %w( src/core/lib/transport/handshaker_registry.h )
s.files += %w( src/core/lib/transport/http2_errors.h )
s.files += %w( src/core/lib/transport/http_connect_handshaker.cc )
s.files += %w( src/core/lib/transport/http_connect_handshaker.h )
s.files += %w( src/core/lib/transport/message.cc )
s.files += %w( src/core/lib/transport/message.h )
s.files += %w( src/core/lib/transport/metadata.cc )
@ -1842,8 +1844,6 @@ Gem::Specification.new do |s|
s.files += %w( src/core/lib/transport/simple_slice_based_metadata.h )
s.files += %w( src/core/lib/transport/status_conversion.cc )
s.files += %w( src/core/lib/transport/status_conversion.h )
s.files += %w( src/core/lib/transport/tcp_connect_handshaker.cc )
s.files += %w( src/core/lib/transport/tcp_connect_handshaker.h )
s.files += %w( src/core/lib/transport/timeout_encoding.cc )
s.files += %w( src/core/lib/transport/timeout_encoding.h )
s.files += %w( src/core/lib/transport/transport.cc )
@ -2178,9 +2178,13 @@ Gem::Specification.new do |s|
s.files += %w( third_party/abseil-cpp/absl/hash/internal/low_level_hash.cc )
s.files += %w( third_party/abseil-cpp/absl/hash/internal/low_level_hash.h )
s.files += %w( third_party/abseil-cpp/absl/log/absl_vlog_is_on.h )
s.files += %w( third_party/abseil-cpp/absl/log/check.h )
s.files += %w( third_party/abseil-cpp/absl/log/globals.cc )
s.files += %w( third_party/abseil-cpp/absl/log/globals.h )
s.files += %w( third_party/abseil-cpp/absl/log/internal/append_truncated.h )
s.files += %w( third_party/abseil-cpp/absl/log/internal/check_impl.h )
s.files += %w( third_party/abseil-cpp/absl/log/internal/check_op.cc )
s.files += %w( third_party/abseil-cpp/absl/log/internal/check_op.h )
s.files += %w( third_party/abseil-cpp/absl/log/internal/conditions.cc )
s.files += %w( third_party/abseil-cpp/absl/log/internal/conditions.h )
s.files += %w( third_party/abseil-cpp/absl/log/internal/config.h )

48
package.xml generated
Unescape View File

@ -128,8 +128,6 @@
<file baseinstalldir="/" name="src/core/client_channel/dynamic_filters.h" role="src" />
<file baseinstalldir="/" name="src/core/client_channel/global_subchannel_pool.cc" role="src" />
<file baseinstalldir="/" name="src/core/client_channel/global_subchannel_pool.h" role="src" />
<file baseinstalldir="/" name="src/core/client_channel/http_proxy_mapper.cc" role="src" />
<file baseinstalldir="/" name="src/core/client_channel/http_proxy_mapper.h" role="src" />
<file baseinstalldir="/" name="src/core/client_channel/local_subchannel_pool.cc" role="src" />
<file baseinstalldir="/" name="src/core/client_channel/local_subchannel_pool.h" role="src" />
<file baseinstalldir="/" name="src/core/client_channel/retry_filter.cc" role="src" />
@ -1111,6 +1109,28 @@
<file baseinstalldir="/" name="src/core/ext/xds/xds_transport.h" role="src" />
<file baseinstalldir="/" name="src/core/ext/xds/xds_transport_grpc.cc" role="src" />
<file baseinstalldir="/" name="src/core/ext/xds/xds_transport_grpc.h" role="src" />
<file baseinstalldir="/" name="src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc" role="src" />
<file baseinstalldir="/" name="src/core/handshaker/endpoint_info/endpoint_info_handshaker.h" role="src" />
<file baseinstalldir="/" name="src/core/handshaker/handshaker.cc" role="src" />
<file baseinstalldir="/" name="src/core/handshaker/handshaker.h" role="src" />
<file baseinstalldir="/" name="src/core/handshaker/handshaker_factory.h" role="src" />
<file baseinstalldir="/" name="src/core/handshaker/handshaker_registry.cc" role="src" />
<file baseinstalldir="/" name="src/core/handshaker/handshaker_registry.h" role="src" />
<file baseinstalldir="/" name="src/core/handshaker/http_connect/http_connect_handshaker.cc" role="src" />
<file baseinstalldir="/" name="src/core/handshaker/http_connect/http_connect_handshaker.h" role="src" />
<file baseinstalldir="/" name="src/core/handshaker/http_connect/http_proxy_mapper.cc" role="src" />
<file baseinstalldir="/" name="src/core/handshaker/http_connect/http_proxy_mapper.h" role="src" />
<file baseinstalldir="/" name="src/core/handshaker/proxy_mapper.h" role="src" />
<file baseinstalldir="/" name="src/core/handshaker/proxy_mapper_registry.cc" role="src" />
<file baseinstalldir="/" name="src/core/handshaker/proxy_mapper_registry.h" role="src" />
<file baseinstalldir="/" name="src/core/handshaker/security/secure_endpoint.cc" role="src" />
<file baseinstalldir="/" name="src/core/handshaker/security/secure_endpoint.h" role="src" />
<file baseinstalldir="/" name="src/core/handshaker/security/security_handshaker.cc" role="src" />
<file baseinstalldir="/" name="src/core/handshaker/security/security_handshaker.h" role="src" />
<file baseinstalldir="/" name="src/core/handshaker/security/tsi_error.cc" role="src" />
<file baseinstalldir="/" name="src/core/handshaker/security/tsi_error.h" role="src" />
<file baseinstalldir="/" name="src/core/handshaker/tcp_connect/tcp_connect_handshaker.cc" role="src" />
<file baseinstalldir="/" name="src/core/handshaker/tcp_connect/tcp_connect_handshaker.h" role="src" />
<file baseinstalldir="/" name="src/core/lib/address_utils/parse_address.cc" role="src" />
<file baseinstalldir="/" name="src/core/lib/address_utils/parse_address.h" role="src" />
<file baseinstalldir="/" name="src/core/lib/address_utils/sockaddr_utils.cc" role="src" />
@ -1392,9 +1412,6 @@
<file baseinstalldir="/" name="src/core/lib/gprpp/work_serializer.cc" role="src" />
<file baseinstalldir="/" name="src/core/lib/gprpp/work_serializer.h" role="src" />
<file baseinstalldir="/" name="src/core/lib/gprpp/xxhash_inline.h" role="src" />
<file baseinstalldir="/" name="src/core/lib/handshaker/proxy_mapper.h" role="src" />
<file baseinstalldir="/" name="src/core/lib/handshaker/proxy_mapper_registry.cc" role="src" />
<file baseinstalldir="/" name="src/core/lib/handshaker/proxy_mapper_registry.h" role="src" />
<file baseinstalldir="/" name="src/core/lib/http/format_request.cc" role="src" />
<file baseinstalldir="/" name="src/core/lib/http/format_request.h" role="src" />
<file baseinstalldir="/" name="src/core/lib/http/httpcli.cc" role="src" />
@ -1722,13 +1739,7 @@
<file baseinstalldir="/" name="src/core/lib/security/security_connector/tls/tls_security_connector.h" role="src" />
<file baseinstalldir="/" name="src/core/lib/security/transport/auth_filters.h" role="src" />
<file baseinstalldir="/" name="src/core/lib/security/transport/client_auth_filter.cc" role="src" />
<file baseinstalldir="/" name="src/core/lib/security/transport/secure_endpoint.cc" role="src" />
<file baseinstalldir="/" name="src/core/lib/security/transport/secure_endpoint.h" role="src" />
<file baseinstalldir="/" name="src/core/lib/security/transport/security_handshaker.cc" role="src" />
<file baseinstalldir="/" name="src/core/lib/security/transport/security_handshaker.h" role="src" />
<file baseinstalldir="/" name="src/core/lib/security/transport/server_auth_filter.cc" role="src" />
<file baseinstalldir="/" name="src/core/lib/security/transport/tsi_error.cc" role="src" />
<file baseinstalldir="/" name="src/core/lib/security/transport/tsi_error.h" role="src" />
<file baseinstalldir="/" name="src/core/lib/security/util/json_util.cc" role="src" />
<file baseinstalldir="/" name="src/core/lib/security/util/json_util.h" role="src" />
<file baseinstalldir="/" name="src/core/lib/slice/percent_encoding.cc" role="src" />
@ -1798,18 +1809,9 @@
<file baseinstalldir="/" name="src/core/lib/transport/connectivity_state.cc" role="src" />
<file baseinstalldir="/" name="src/core/lib/transport/connectivity_state.h" role="src" />
<file baseinstalldir="/" name="src/core/lib/transport/custom_metadata.h" role="src" />
<file baseinstalldir="/" name="src/core/lib/transport/endpoint_info_handshaker.cc" role="src" />
<file baseinstalldir="/" name="src/core/lib/transport/endpoint_info_handshaker.h" role="src" />
<file baseinstalldir="/" name="src/core/lib/transport/error_utils.cc" role="src" />
<file baseinstalldir="/" name="src/core/lib/transport/error_utils.h" role="src" />
<file baseinstalldir="/" name="src/core/lib/transport/handshaker.cc" role="src" />
<file baseinstalldir="/" name="src/core/lib/transport/handshaker.h" role="src" />
<file baseinstalldir="/" name="src/core/lib/transport/handshaker_factory.h" role="src" />
<file baseinstalldir="/" name="src/core/lib/transport/handshaker_registry.cc" role="src" />
<file baseinstalldir="/" name="src/core/lib/transport/handshaker_registry.h" role="src" />
<file baseinstalldir="/" name="src/core/lib/transport/http2_errors.h" role="src" />
<file baseinstalldir="/" name="src/core/lib/transport/http_connect_handshaker.cc" role="src" />
<file baseinstalldir="/" name="src/core/lib/transport/http_connect_handshaker.h" role="src" />
<file baseinstalldir="/" name="src/core/lib/transport/message.cc" role="src" />
<file baseinstalldir="/" name="src/core/lib/transport/message.h" role="src" />
<file baseinstalldir="/" name="src/core/lib/transport/metadata.cc" role="src" />
@ -1824,8 +1826,6 @@
<file baseinstalldir="/" name="src/core/lib/transport/simple_slice_based_metadata.h" role="src" />
<file baseinstalldir="/" name="src/core/lib/transport/status_conversion.cc" role="src" />
<file baseinstalldir="/" name="src/core/lib/transport/status_conversion.h" role="src" />
<file baseinstalldir="/" name="src/core/lib/transport/tcp_connect_handshaker.cc" role="src" />
<file baseinstalldir="/" name="src/core/lib/transport/tcp_connect_handshaker.h" role="src" />
<file baseinstalldir="/" name="src/core/lib/transport/timeout_encoding.cc" role="src" />
<file baseinstalldir="/" name="src/core/lib/transport/timeout_encoding.h" role="src" />
<file baseinstalldir="/" name="src/core/lib/transport/transport.cc" role="src" />
@ -2182,9 +2182,13 @@
<file baseinstalldir="/" name="third_party/abseil-cpp/absl/hash/internal/low_level_hash.cc" role="src" />
<file baseinstalldir="/" name="third_party/abseil-cpp/absl/hash/internal/low_level_hash.h" role="src" />
<file baseinstalldir="/" name="third_party/abseil-cpp/absl/log/absl_vlog_is_on.h" role="src" />
<file baseinstalldir="/" name="third_party/abseil-cpp/absl/log/check.h" role="src" />
<file baseinstalldir="/" name="third_party/abseil-cpp/absl/log/globals.cc" role="src" />
<file baseinstalldir="/" name="third_party/abseil-cpp/absl/log/globals.h" role="src" />
<file baseinstalldir="/" name="third_party/abseil-cpp/absl/log/internal/append_truncated.h" role="src" />
<file baseinstalldir="/" name="third_party/abseil-cpp/absl/log/internal/check_impl.h" role="src" />
<file baseinstalldir="/" name="third_party/abseil-cpp/absl/log/internal/check_op.cc" role="src" />
<file baseinstalldir="/" name="third_party/abseil-cpp/absl/log/internal/check_op.h" role="src" />
<file baseinstalldir="/" name="third_party/abseil-cpp/absl/log/internal/conditions.cc" role="src" />
<file baseinstalldir="/" name="third_party/abseil-cpp/absl/log/internal/conditions.h" role="src" />
<file baseinstalldir="/" name="third_party/abseil-cpp/absl/log/internal/config.h" role="src" />

8
src/android/test/interop/app/CMakeLists.txt generated
Unescape View File

@ -114,10 +114,10 @@ add_library(grpc-interop
${GRPC_SRC_DIR}/test/cpp/interop/backend_metrics_lb_policy.cc
${GRPC_SRC_DIR}/test/cpp/interop/interop_client.h
${GRPC_SRC_DIR}/test/cpp/interop/interop_client.cc
${GRPC_SRC_DIR}/test/core/util/histogram.h
${GRPC_SRC_DIR}/test/core/util/histogram.cc
${GRPC_SRC_DIR}/test/core/util/test_lb_policies.h
${GRPC_SRC_DIR}/test/core/util/test_lb_policies.cc)
${GRPC_SRC_DIR}/test/core/test_util/histogram.h
${GRPC_SRC_DIR}/test/core/test_util/histogram.cc
${GRPC_SRC_DIR}/test/core/test_util/test_lb_policies.h
${GRPC_SRC_DIR}/test/core/test_util/test_lb_policies.cc)
target_link_libraries(grpc-interop
messages_proto_lib

68
src/core/BUILD
Unescape View File

@ -92,6 +92,7 @@ grpc_cc_library(
external_deps = [
"absl/container:flat_hash_set",
"absl/hash",
"absl/log:check",
"absl/strings",
"absl/utility",
],
@ -1207,7 +1208,7 @@ grpc_cc_library(
name = "handshaker_factory",
language = "c++",
public_hdrs = [
"lib/transport/handshaker_factory.h",
"handshaker/handshaker_factory.h",
],
visibility = ["@grpc:alt_grpc_base_legacy"],
deps = [
@ -1220,11 +1221,11 @@ grpc_cc_library(
grpc_cc_library(
name = "handshaker_registry",
srcs = [
"lib/transport/handshaker_registry.cc",
"handshaker/handshaker_registry.cc",
],
language = "c++",
public_hdrs = [
"lib/transport/handshaker_registry.h",
"handshaker/handshaker_registry.h",
],
visibility = ["@grpc:alt_grpc_base_legacy"],
deps = [
@ -1238,7 +1239,7 @@ grpc_cc_library(
grpc_cc_library(
name = "tcp_connect_handshaker",
srcs = [
"lib/transport/tcp_connect_handshaker.cc",
"handshaker/tcp_connect/tcp_connect_handshaker.cc",
],
external_deps = [
"absl/base:core_headers",
@ -1248,7 +1249,7 @@ grpc_cc_library(
],
language = "c++",
public_hdrs = [
"lib/transport/tcp_connect_handshaker.h",
"handshaker/tcp_connect/tcp_connect_handshaker.h",
],
deps = [
"channel_args",
@ -1277,10 +1278,10 @@ grpc_cc_library(
grpc_cc_library(
name = "endpoint_info_handshaker",
srcs = [
"lib/transport/endpoint_info_handshaker.cc",
"handshaker/endpoint_info/endpoint_info_handshaker.cc",
],
hdrs = [
"lib/transport/endpoint_info_handshaker.h",
"handshaker/endpoint_info/endpoint_info_handshaker.h",
],
external_deps = [
"absl/status",
@ -1563,6 +1564,7 @@ grpc_cc_library(
"lib/iomgr/error.h",
],
external_deps = [
"absl/log:check",
"absl/status",
"absl/strings:str_format",
],
@ -1588,7 +1590,10 @@ grpc_cc_library(
hdrs = [
"lib/iomgr/closure.h",
],
external_deps = ["absl/strings:str_format"],
external_deps = [
"absl/log:check",
"absl/strings:str_format",
],
visibility = ["@grpc:alt_grpc_base_legacy"],
deps = [
"error",
@ -1647,6 +1652,9 @@ grpc_cc_library(
"lib/iomgr/sockaddr_windows.h",
"lib/iomgr/socket_utils.h",
],
external_deps = [
"absl/log:check",
],
deps = [
"iomgr_port",
"//:gpr",
@ -1683,6 +1691,9 @@ grpc_cc_library(
hdrs = [
"lib/event_engine/forkable.h",
],
external_deps = [
"absl/log:check",
],
deps = [
"//:config_vars",
"//:gpr",
@ -1830,6 +1841,7 @@ grpc_cc_library(
"absl/base:core_headers",
"absl/container:flat_hash_set",
"absl/functional:any_invocable",
"absl/log:check",
"absl/time",
"absl/types:optional",
],
@ -1879,6 +1891,7 @@ grpc_cc_library(
],
external_deps = [
"absl/base:core_headers",
"absl/log:check",
"absl/time",
"absl/types:optional",
],
@ -1938,7 +1951,10 @@ grpc_cc_library(
hdrs = [
"lib/event_engine/posix_engine/lockfree_event.h",
],
external_deps = ["absl/status"],
external_deps = [
"absl/log:check",
"absl/status",
],
deps = [
"gpr_atm",
"posix_event_engine_closure",
@ -2032,6 +2048,7 @@ grpc_cc_library(
"absl/base:core_headers",
"absl/container:inlined_vector",
"absl/functional:function_ref",
"absl/log:check",
"absl/status",
"absl/status:statusor",
"absl/strings",
@ -2068,6 +2085,7 @@ grpc_cc_library(
"absl/container:inlined_vector",
"absl/functional:any_invocable",
"absl/functional:function_ref",
"absl/log:check",
"absl/status",
"absl/status:statusor",
"absl/strings",
@ -2160,6 +2178,7 @@ grpc_cc_library(
"absl/container:flat_hash_map",
"absl/functional:any_invocable",
"absl/hash",
"absl/log:check",
"absl/status",
"absl/status:statusor",
"absl/strings",
@ -2199,7 +2218,10 @@ grpc_cc_library(
name = "event_engine_utils",
srcs = ["lib/event_engine/utils.cc"],
hdrs = ["lib/event_engine/utils.h"],
external_deps = ["absl/strings"],
external_deps = [
"absl/log:check",
"absl/strings",
],
deps = [
"time",
"//:event_engine_base_hdrs",
@ -2217,6 +2239,7 @@ grpc_cc_library(
],
external_deps = [
"absl/cleanup",
"absl/log:check",
"absl/status",
"absl/status:statusor",
"absl/strings",
@ -2248,6 +2271,7 @@ grpc_cc_library(
],
external_deps = [
"absl/cleanup",
"absl/log:check",
"absl/status",
"absl/status:statusor",
"absl/strings",
@ -2274,6 +2298,7 @@ grpc_cc_library(
external_deps = [
"absl/base:core_headers",
"absl/functional:any_invocable",
"absl/log:check",
"absl/status",
"absl/status:statusor",
"absl/strings",
@ -2309,6 +2334,7 @@ grpc_cc_library(
"absl/container:flat_hash_map",
"absl/functional:any_invocable",
"absl/hash",
"absl/log:check",
"absl/status",
"absl/status:statusor",
"absl/strings",
@ -2350,6 +2376,7 @@ grpc_cc_library(
srcs = ["lib/event_engine/windows/windows_engine.cc"],
hdrs = ["lib/event_engine/windows/windows_engine.h"],
external_deps = [
"absl/log:check",
"absl/status",
"absl/status:statusor",
"absl/strings",
@ -2403,6 +2430,7 @@ grpc_cc_library(
external_deps = [
"absl/base:core_headers",
"absl/functional:any_invocable",
"absl/log:check",
"absl/status",
"absl/strings:str_format",
],
@ -2431,6 +2459,7 @@ grpc_cc_library(
external_deps = [
"absl/cleanup",
"absl/functional:any_invocable",
"absl/log:check",
"absl/status",
"absl/strings:str_format",
],
@ -2458,6 +2487,7 @@ grpc_cc_library(
],
external_deps = [
"absl/base:core_headers",
"absl/log:check",
"absl/status",
"absl/status:statusor",
"absl/strings:str_format",
@ -2491,6 +2521,7 @@ grpc_cc_library(
],
external_deps = [
"absl/container:flat_hash_map",
"absl/log:check",
"absl/strings",
"absl/strings:str_format",
],
@ -2524,6 +2555,7 @@ grpc_cc_library(
"lib/event_engine/tcp_socket_utils.h",
],
external_deps = [
"absl/log:check",
"absl/status",
"absl/status:statusor",
"absl/strings",
@ -2738,6 +2770,7 @@ grpc_cc_library(
"absl/container:flat_hash_map",
"absl/functional:any_invocable",
"absl/hash",
"absl/log:check",
"absl/status",
"absl/status:statusor",
"absl/strings",
@ -3111,6 +3144,7 @@ grpc_cc_library(
],
external_deps = [
"absl/functional:any_invocable",
"absl/log:check",
],
language = "c++",
deps = [
@ -3182,6 +3216,7 @@ grpc_cc_library(
"client_channel/config_selector.h",
],
external_deps = [
"absl/log:check",
"absl/status",
"absl/strings",
],
@ -3472,7 +3507,7 @@ grpc_cc_library(
grpc_cc_library(
name = "proxy_mapper",
hdrs = ["lib/handshaker/proxy_mapper.h"],
hdrs = ["handshaker/proxy_mapper.h"],
external_deps = [
"absl/strings",
"absl/types:optional",
@ -3486,8 +3521,8 @@ grpc_cc_library(
grpc_cc_library(
name = "proxy_mapper_registry",
srcs = ["lib/handshaker/proxy_mapper_registry.cc"],
hdrs = ["lib/handshaker/proxy_mapper_registry.h"],
srcs = ["handshaker/proxy_mapper_registry.cc"],
hdrs = ["handshaker/proxy_mapper_registry.h"],
external_deps = [
"absl/strings",
"absl/types:optional",
@ -3503,12 +3538,13 @@ grpc_cc_library(
grpc_cc_library(
name = "http_proxy_mapper",
srcs = [
"client_channel/http_proxy_mapper.cc",
"handshaker/http_connect/http_proxy_mapper.cc",
],
hdrs = [
"client_channel/http_proxy_mapper.h",
"handshaker/http_connect/http_proxy_mapper.h",
],
external_deps = [
"absl/log:check",
"absl/status",
"absl/status:statusor",
"absl/strings",
@ -4998,6 +5034,7 @@ grpc_cc_library(
"absl/base:core_headers",
"absl/cleanup",
"absl/functional:bind_front",
"absl/log:check",
"absl/memory",
"absl/random",
"absl/status",
@ -5181,6 +5218,7 @@ grpc_cc_library(
],
external_deps = [
"absl/base:core_headers",
"absl/log:check",
"absl/status",
"absl/status:statusor",
"absl/strings",

5
src/core/channelz/channelz.cc
Unescape View File

@ -22,6 +22,7 @@
#include <atomic>
#include <cstdint>
#include "absl/log/check.h"
#include "absl/status/statusor.h"
#include "absl/strings/escaping.h"
#include "absl/strings/str_cat.h"
@ -355,8 +356,8 @@ void ServerNode::RemoveChildListenSocket(intptr_t child_uuid) {
std::string ServerNode::RenderServerSockets(intptr_t start_socket_id,
intptr_t max_results) {
GPR_ASSERT(start_socket_id >= 0);
GPR_ASSERT(max_results >= 0);
CHECK_GE(start_socket_id, 0);
CHECK_GE(max_results, 0);
// If user does not set max_results, we choose 500.
size_t pagination_limit = max_results == 0 ? 500 : max_results;
Json::Object object;

6
src/core/channelz/channelz_registry.cc
Unescape View File

@ -24,6 +24,8 @@
#include <utility>
#include <vector>
#include "absl/log/check.h"
#include <grpc/grpc.h>
#include <grpc/support/json.h>
#include <grpc/support/log.h>
@ -56,9 +58,9 @@ void ChannelzRegistry::InternalRegister(BaseNode* node) {
}
void ChannelzRegistry::InternalUnregister(intptr_t uuid) {
GPR_ASSERT(uuid >= 1);
CHECK_GE(uuid, 1);
MutexLock lock(&mu_);
GPR_ASSERT(uuid <= uuid_generator_);
CHECK(uuid <= uuid_generator_);
node_map_.erase(uuid);
}

59
src/core/client_channel/client_channel_filter.cc
Unescape View File

@ -30,6 +30,7 @@
#include <vector>
#include "absl/cleanup/cleanup.h"
#include "absl/log/check.h"
#include "absl/status/status.h"
#include "absl/status/statusor.h"
#include "absl/strings/cord.h"
@ -61,6 +62,7 @@
#include "src/core/client_channel/subchannel.h"
#include "src/core/client_channel/subchannel_interface_internal.h"
#include "src/core/ext/filters/deadline/deadline_filter.h"
#include "src/core/handshaker/proxy_mapper_registry.h"
#include "src/core/lib/channel/channel_args.h"
#include "src/core/lib/channel/channel_stack.h"
#include "src/core/lib/channel/status_util.h"
@ -75,7 +77,6 @@
#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/handshaker/proxy_mapper_registry.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"
@ -458,8 +459,8 @@ class DynamicTerminationFilter final {
static grpc_error_handle Init(grpc_channel_element* elem,
grpc_channel_element_args* args) {
GPR_ASSERT(args->is_last);
GPR_ASSERT(elem->filter == &kFilterVtable);
CHECK(args->is_last);
CHECK(elem->filter == &kFilterVtable);
new (elem->channel_data) DynamicTerminationFilter(args->channel_args);
return absl::OkStatus();
}
@ -644,7 +645,7 @@ class ClientChannelFilter::SubchannelWrapper final
}
GRPC_CHANNEL_STACK_REF(chand_->owning_stack_, "SubchannelWrapper");
#ifndef NDEBUG
GPR_DEBUG_ASSERT(chand_->work_serializer_->RunningInWorkSerializer());
DCHECK(chand_->work_serializer_->RunningInWorkSerializer());
#endif
if (chand_->channelz_node_ != nullptr) {
auto* subchannel_node = subchannel_->channelz_node();
@ -673,7 +674,7 @@ class ClientChannelFilter::SubchannelWrapper final
auto* subchannel_node = subchannel_->channelz_node();
if (subchannel_node != nullptr) {
auto it = chand_->subchannel_refcount_map_.find(subchannel_.get());
GPR_ASSERT(it != chand_->subchannel_refcount_map_.end());
CHECK(it != chand_->subchannel_refcount_map_.end());
--it->second;
if (it->second == 0) {
chand_->channelz_node_->RemoveChildSubchannel(
@ -700,7 +701,7 @@ class ClientChannelFilter::SubchannelWrapper final
if (subchannel_node != nullptr) {
auto it =
chand_->subchannel_refcount_map_.find(subchannel_.get());
GPR_ASSERT(it != chand_->subchannel_refcount_map_.end());
CHECK(it != chand_->subchannel_refcount_map_.end());
--it->second;
if (it->second == 0) {
chand_->channelz_node_->RemoveChildSubchannel(
@ -718,7 +719,7 @@ class ClientChannelFilter::SubchannelWrapper final
std::unique_ptr<ConnectivityStateWatcherInterface> watcher) override
ABSL_EXCLUSIVE_LOCKS_REQUIRED(*chand_->work_serializer_) {
auto& watcher_wrapper = watcher_map_[watcher.get()];
GPR_ASSERT(watcher_wrapper == nullptr);
CHECK_EQ(watcher_wrapper, nullptr);
watcher_wrapper = new WatcherWrapper(
std::move(watcher),
RefAsSubclass<SubchannelWrapper>(DEBUG_LOCATION, "WatcherWrapper"));
@ -730,7 +731,7 @@ class ClientChannelFilter::SubchannelWrapper final
void CancelConnectivityStateWatch(ConnectivityStateWatcherInterface* watcher)
override ABSL_EXCLUSIVE_LOCKS_REQUIRED(*chand_->work_serializer_) {
auto it = watcher_map_.find(watcher);
GPR_ASSERT(it != watcher_map_.end());
CHECK(it != watcher_map_.end());
subchannel_->CancelConnectivityStateWatch(it->second);
watcher_map_.erase(it);
}
@ -747,7 +748,7 @@ class ClientChannelFilter::SubchannelWrapper final
ABSL_EXCLUSIVE_LOCKS_REQUIRED(*chand_->work_serializer_) {
static_cast<InternalSubchannelDataWatcherInterface*>(watcher.get())
->SetSubchannel(subchannel_.get());
GPR_ASSERT(data_watchers_.insert(std::move(watcher)).second);
CHECK(data_watchers_.insert(std::move(watcher)).second);
}
void CancelDataWatcher(DataWatcherInterface* watcher) override
@ -923,7 +924,7 @@ ClientChannelFilter::ExternalConnectivityWatcher::ExternalConnectivityWatcher(
{
MutexLock lock(&chand_->external_watchers_mu_);
// Will be deleted when the watch is complete.
GPR_ASSERT(chand->external_watchers_[on_complete] == nullptr);
CHECK(chand->external_watchers_[on_complete] == nullptr);
// Store a ref to the watcher in the external_watchers_ map.
chand->external_watchers_[on_complete] =
RefAsSubclass<ExternalConnectivityWatcher>(
@ -1201,9 +1202,9 @@ class ClientChannelFilter::ClientChannelControlHelper final
grpc_error_handle ClientChannelFilter::Init(grpc_channel_element* elem,
grpc_channel_element_args* args) {
GPR_ASSERT(args->is_last);
GPR_ASSERT(elem->filter == &kFilterVtableWithPromises ||
elem->filter == &kFilterVtableWithoutPromises);
CHECK(args->is_last);
CHECK(elem->filter == &kFilterVtableWithPromises ||
elem->filter == &kFilterVtableWithoutPromises);
grpc_error_handle error;
new (elem->channel_data) ClientChannelFilter(args, &error);
return error;
@ -1449,7 +1450,7 @@ RefCountedPtr<LoadBalancingPolicy::Config> ChooseLbPolicy(
// - A channel arg, in which case we check that the specified policy exists
// and accepts an empty config. If not, we revert to using pick_first
// lb_policy
GPR_ASSERT(lb_policy_config.ok());
CHECK(lb_policy_config.ok());
return std::move(*lb_policy_config);
}
@ -1729,7 +1730,7 @@ void ClientChannelFilter::UpdateServiceConfigInDataPlaneLocked() {
}
RefCountedPtr<DynamicFilters> dynamic_filters =
DynamicFilters::Create(new_args, std::move(filters));
GPR_ASSERT(dynamic_filters != nullptr);
CHECK(dynamic_filters != nullptr);
// Grab data plane lock to update service config.
//
// We defer unreffing the old values (and deallocating memory) until
@ -1760,7 +1761,7 @@ void ClientChannelFilter::CreateResolverLocked() {
std::make_unique<ResolverResultHandler>(this));
// Since the validity of the args was checked when the channel was created,
// CreateResolver() must return a non-null result.
GPR_ASSERT(resolver_ != nullptr);
CHECK(resolver_ != nullptr);
UpdateStateLocked(GRPC_CHANNEL_CONNECTING, absl::Status(),
"started resolving");
resolver_->StartLocked();
@ -1869,7 +1870,7 @@ T HandlePickResult(
}
auto* drop_pick =
absl::get_if<LoadBalancingPolicy::PickResult::Drop>(&result->result);
GPR_ASSERT(drop_pick != nullptr);
CHECK_NE(drop_pick, nullptr);
return drop_func(drop_pick);
}
@ -1963,7 +1964,7 @@ void ClientChannelFilter::StartTransportOpLocked(grpc_transport_op* op) {
}
} else {
// Disconnect.
GPR_ASSERT(disconnect_error_.ok());
CHECK(disconnect_error_.ok());
disconnect_error_ = op->disconnect_with_error;
UpdateStateAndPickerLocked(
GRPC_CHANNEL_SHUTDOWN, absl::Status(), "shutdown from API",
@ -1981,7 +1982,7 @@ void ClientChannelFilter::StartTransportOpLocked(grpc_transport_op* op) {
void ClientChannelFilter::StartTransportOp(grpc_channel_element* elem,
grpc_transport_op* op) {
auto* chand = static_cast<ClientChannelFilter*>(elem->channel_data);
GPR_ASSERT(op->set_accept_stream == false);
CHECK(op->set_accept_stream == false);
// Handle bind_pollset.
if (op->bind_pollset != nullptr) {
grpc_pollset_set_add_pollset(chand->interested_parties_, op->bind_pollset);
@ -2227,7 +2228,7 @@ ClientChannelFilter::FilterBasedCallData::~FilterBasedCallData() {
CSliceUnref(path_);
// Make sure there are no remaining pending batches.
for (size_t i = 0; i < GPR_ARRAY_SIZE(pending_batches_); ++i) {
GPR_ASSERT(pending_batches_[i] == nullptr);
CHECK_EQ(pending_batches_[i], nullptr);
}
}
@ -2389,7 +2390,7 @@ void ClientChannelFilter::FilterBasedCallData::PendingBatchesAdd(
chand(), this, idx);
}
grpc_transport_stream_op_batch*& pending = pending_batches_[idx];
GPR_ASSERT(pending == nullptr);
CHECK_EQ(pending, nullptr);
pending = batch;
}
@ -2409,7 +2410,7 @@ void ClientChannelFilter::FilterBasedCallData::FailPendingBatchInCallCombiner(
void ClientChannelFilter::FilterBasedCallData::PendingBatchesFail(
grpc_error_handle error,
YieldCallCombinerPredicate yield_call_combiner_predicate) {
GPR_ASSERT(!error.ok());
CHECK(!error.ok());
if (GRPC_TRACE_FLAG_ENABLED(grpc_client_channel_call_trace)) {
size_t num_batches = 0;
for (size_t i = 0; i < GPR_ARRAY_SIZE(pending_batches_); ++i) {
@ -2958,11 +2959,11 @@ ClientChannelFilter::LoadBalancedCall::PickSubchannel(bool was_queued) {
bool ClientChannelFilter::LoadBalancedCall::PickSubchannelImpl(
LoadBalancingPolicy::SubchannelPicker* picker, grpc_error_handle* error) {
GPR_ASSERT(connected_subchannel_ == nullptr);
CHECK(connected_subchannel_ == nullptr);
// Perform LB pick.
LoadBalancingPolicy::PickArgs pick_args;
Slice* path = send_initial_metadata()->get_pointer(HttpPathMetadata());
GPR_ASSERT(path != nullptr);
CHECK_NE(path, nullptr);
pick_args.path = path->as_string_view();
LbCallState lb_call_state(this);
pick_args.call_state = &lb_call_state;
@ -2978,7 +2979,7 @@ bool ClientChannelFilter::LoadBalancedCall::PickSubchannelImpl(
"chand=%p lb_call=%p: LB pick succeeded: subchannel=%p",
chand_, this, complete_pick->subchannel.get());
}
GPR_ASSERT(complete_pick->subchannel != nullptr);
CHECK(complete_pick->subchannel != nullptr);
// Grab a ref to the connected subchannel while we're still
// holding the data plane mutex.
SubchannelWrapper* subchannel =
@ -3066,7 +3067,7 @@ ClientChannelFilter::FilterBasedLoadBalancedCall::
~FilterBasedLoadBalancedCall() {
// Make sure there are no remaining pending batches.
for (size_t i = 0; i < GPR_ARRAY_SIZE(pending_batches_); ++i) {
GPR_ASSERT(pending_batches_[i] == nullptr);
CHECK_EQ(pending_batches_[i], nullptr);
}
if (on_call_destruction_complete_ != nullptr) {
ExecCtx::Run(DEBUG_LOCATION, on_call_destruction_complete_,
@ -3109,7 +3110,7 @@ void ClientChannelFilter::FilterBasedLoadBalancedCall::PendingBatchesAdd(
"chand=%p lb_call=%p: adding pending batch at index %" PRIuPTR,
chand(), this, idx);
}
GPR_ASSERT(pending_batches_[idx] == nullptr);
CHECK_EQ(pending_batches_[idx], nullptr);
pending_batches_[idx] = batch;
}
@ -3129,7 +3130,7 @@ void ClientChannelFilter::FilterBasedLoadBalancedCall::
void ClientChannelFilter::FilterBasedLoadBalancedCall::PendingBatchesFail(
grpc_error_handle error,
YieldCallCombinerPredicate yield_call_combiner_predicate) {
GPR_ASSERT(!error.ok());
CHECK(!error.ok());
failure_error_ = error;
if (GRPC_TRACE_FLAG_ENABLED(grpc_client_channel_lb_call_trace)) {
size_t num_batches = 0;
@ -3491,7 +3492,7 @@ void ClientChannelFilter::FilterBasedLoadBalancedCall::RetryPickLocked() {
void ClientChannelFilter::FilterBasedLoadBalancedCall::CreateSubchannelCall() {
Slice* path = send_initial_metadata()->get_pointer(HttpPathMetadata());
GPR_ASSERT(path != nullptr);
CHECK_NE(path, nullptr);
SubchannelCall::Args call_args = {
connected_subchannel()->Ref(), pollent_, path->Ref(), /*start_time=*/0,
deadline_, arena_,

3
src/core/client_channel/client_channel_internal.h
Unescape View File

@ -22,6 +22,7 @@
#include <utility>
#include "absl/functional/any_invocable.h"
#include "absl/log/check.h"
#include <grpc/support/log.h>
@ -61,7 +62,7 @@ class ClientChannelServiceConfigCallData final : public ServiceConfigCallData {
: ServiceConfigCallData(arena, call_context) {}
void SetOnCommit(absl::AnyInvocable<void()> on_commit) {
GPR_ASSERT(on_commit_ == nullptr);
CHECK(on_commit_ == nullptr);
on_commit_ = std::move(on_commit);
}

5
src/core/client_channel/config_selector.h
Unescape View File

@ -24,6 +24,7 @@
#include <utility>
#include <vector>
#include "absl/log/check.h"
#include "absl/status/status.h"
#include "absl/strings/string_view.h"
@ -97,14 +98,14 @@ class DefaultConfigSelector final : public ConfigSelector {
// The client channel code ensures that this will never be null.
// If neither the resolver nor the client application provide a
// config, a default empty config will be used.
GPR_DEBUG_ASSERT(service_config_ != nullptr);
DCHECK(service_config_ != nullptr);
}
const char* name() const override { return "default"; }
absl::Status GetCallConfig(GetCallConfigArgs args) override {
Slice* path = args.initial_metadata->get_pointer(HttpPathMetadata());
GPR_ASSERT(path != nullptr);
CHECK_NE(path, nullptr);
auto* parsed_method_configs =
service_config_->GetMethodParsedConfigVector(path->c_slice());
args.service_config_call_data->SetServiceConfig(service_config_,

5
src/core/client_channel/dynamic_filters.cc
Unescape View File

@ -23,6 +23,7 @@
#include <new>
#include <utility>
#include "absl/log/check.h"
#include "absl/status/statusor.h"
#include <grpc/support/log.h>
@ -82,8 +83,8 @@ void DynamicFilters::Call::StartTransportStreamOpBatch(
}
void DynamicFilters::Call::SetAfterCallStackDestroy(grpc_closure* closure) {
GPR_ASSERT(after_call_stack_destroy_ == nullptr);
GPR_ASSERT(closure != nullptr);
CHECK_EQ(after_call_stack_destroy_, nullptr);
CHECK_NE(closure, nullptr);
after_call_stack_destroy_ = closure;
}

8
src/core/client_channel/local_subchannel_pool.cc
Unescape View File

@ -22,6 +22,8 @@
#include <utility>
#include "absl/log/check.h"
#include <grpc/support/log.h>
#include "src/core/client_channel/subchannel.h"
@ -34,7 +36,7 @@ RefCountedPtr<Subchannel> LocalSubchannelPool::RegisterSubchannel(
// Because this pool is only accessed under the client channel's work
// serializer, and because FindSubchannel is checked before invoking
// RegisterSubchannel, no such subchannel should exist in the map.
GPR_ASSERT(it == subchannel_map_.end());
CHECK(it == subchannel_map_.end());
subchannel_map_[key] = constructed.get();
return constructed;
}
@ -45,8 +47,8 @@ void LocalSubchannelPool::UnregisterSubchannel(const SubchannelKey& key,
// Because this subchannel pool is accessed only under the client
// channel's work serializer, any subchannel created by RegisterSubchannel
// will be deleted from the map in UnregisterSubchannel.
GPR_ASSERT(it != subchannel_map_.end());
GPR_ASSERT(it->second == subchannel);
CHECK(it != subchannel_map_.end());
CHECK(it->second == subchannel);
subchannel_map_.erase(it);
}

5
src/core/client_channel/retry_filter.h
Unescape View File

@ -24,6 +24,7 @@
#include <new>
#include "absl/log/check.h"
#include "absl/types/optional.h"
#include <grpc/event_engine/event_engine.h>
@ -92,8 +93,8 @@ class RetryFilter final {
static grpc_error_handle Init(grpc_channel_element* elem,
grpc_channel_element_args* args) {
GPR_ASSERT(args->is_last);
GPR_ASSERT(elem->filter == &kVtable);
CHECK(args->is_last);
CHECK(elem->filter == &kVtable);
grpc_error_handle error;
new (elem->channel_data) RetryFilter(args->channel_args, &error);
return error;

9
src/core/client_channel/retry_filter_legacy_call_data.cc
Unescape View File

@ -21,6 +21,7 @@
#include <memory>
#include <new>
#include "absl/log/check.h"
#include "absl/status/status.h"
#include "absl/strings/str_cat.h"
@ -1577,7 +1578,7 @@ RetryFilter::LegacyCallData::~LegacyCallData() {
CSliceUnref(path_);
// Make sure there are no remaining pending batches.
for (size_t i = 0; i < GPR_ARRAY_SIZE(pending_batches_); ++i) {
GPR_ASSERT(pending_batches_[i].batch == nullptr);
CHECK_EQ(pending_batches_[i].batch, nullptr);
}
}
@ -1826,7 +1827,7 @@ RetryFilter::LegacyCallData::PendingBatchesAdd(
chand_, this, idx);
}
PendingBatch* pending = &pending_batches_[idx];
GPR_ASSERT(pending->batch == nullptr);
CHECK_EQ(pending->batch, nullptr);
pending->batch = batch;
pending->send_ops_cached = false;
// Update state in calld about pending batches.
@ -1910,7 +1911,7 @@ void RetryFilter::LegacyCallData::FailPendingBatchInCallCombiner(
// This is called via the call combiner, so access to calld is synchronized.
void RetryFilter::LegacyCallData::PendingBatchesFail(grpc_error_handle error) {
GPR_ASSERT(!error.ok());
CHECK(!error.ok());
if (GRPC_TRACE_FLAG_ENABLED(grpc_retry_trace)) {
size_t num_batches = 0;
for (size_t i = 0; i < GPR_ARRAY_SIZE(pending_batches_); ++i) {
@ -1991,7 +1992,7 @@ void RetryFilter::LegacyCallData::StartRetryTimer(
// Compute backoff delay.
Duration next_attempt_timeout;
if (server_pushback.has_value()) {
GPR_ASSERT(*server_pushback >= Duration::Zero());
CHECK(*server_pushback >= Duration::Zero());
next_attempt_timeout = *server_pushback;
retry_backoff_.Reset();
} else {

21
src/core/client_channel/subchannel.cc
Unescape View File

@ -26,6 +26,7 @@
#include <new>
#include <utility>
#include "absl/log/check.h"
#include "absl/status/statusor.h"
#include "absl/strings/cord.h"
#include "absl/strings/str_cat.h"
@ -40,6 +41,7 @@
#include "src/core/channelz/channel_trace.h"
#include "src/core/channelz/channelz.h"
#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"
@ -55,7 +57,6 @@
#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/handshaker/proxy_mapper_registry.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"
@ -148,7 +149,7 @@ ArenaPromise<ServerMetadataHandle> ConnectedSubchannel::MakeCallPromise(
[self = Ref()](ServerMetadataHandle metadata) {
channelz::SubchannelNode* channelz_subchannel =
self->channelz_subchannel();
GPR_ASSERT(channelz_subchannel != nullptr);
CHECK_NE(channelz_subchannel, nullptr);
if (metadata->get(GrpcStatusMetadata())
.value_or(GRPC_STATUS_UNKNOWN) != GRPC_STATUS_OK) {
channelz_subchannel->RecordCallFailed();
@ -160,7 +161,7 @@ ArenaPromise<ServerMetadataHandle> ConnectedSubchannel::MakeCallPromise(
[self = Ref()]() {
channelz::SubchannelNode* channelz_subchannel =
self->channelz_subchannel();
GPR_ASSERT(channelz_subchannel != nullptr);
CHECK_NE(channelz_subchannel, nullptr);
channelz_subchannel->RecordCallFailed();
});
}
@ -219,8 +220,8 @@ grpc_call_stack* SubchannelCall::GetCallStack() {
}
void SubchannelCall::SetAfterCallStackDestroy(grpc_closure* closure) {
GPR_ASSERT(after_call_stack_destroy_ == nullptr);
GPR_ASSERT(closure != nullptr);
CHECK_EQ(after_call_stack_destroy_, nullptr);
CHECK_NE(closure, nullptr);
after_call_stack_destroy_ = closure;
}
@ -275,7 +276,7 @@ void SubchannelCall::MaybeInterceptRecvTrailingMetadata(
GRPC_CLOSURE_INIT(&recv_trailing_metadata_ready_, RecvTrailingMetadataReady,
this, grpc_schedule_on_exec_ctx);
// save some state needed for the interception callback.
GPR_ASSERT(recv_trailing_metadata_ == nullptr);
CHECK_EQ(recv_trailing_metadata_, nullptr);
recv_trailing_metadata_ =
batch->payload->recv_trailing_metadata.recv_trailing_metadata;
original_recv_trailing_metadata_ =
@ -301,12 +302,12 @@ void GetCallStatus(grpc_status_code* status, Timestamp deadline,
void SubchannelCall::RecvTrailingMetadataReady(void* arg,
grpc_error_handle error) {
SubchannelCall* call = static_cast<SubchannelCall*>(arg);
GPR_ASSERT(call->recv_trailing_metadata_ != nullptr);
CHECK_NE(call->recv_trailing_metadata_, nullptr);
grpc_status_code status = GRPC_STATUS_OK;
GetCallStatus(&status, call->deadline_, call->recv_trailing_metadata_, error);
channelz::SubchannelNode* channelz_subchannel =
call->connected_subchannel_->channelz_subchannel();
GPR_ASSERT(channelz_subchannel != nullptr);
CHECK_NE(channelz_subchannel, nullptr);
if (status == GRPC_STATUS_OK) {
channelz_subchannel->RecordCallSucceeded();
} else {
@ -520,7 +521,7 @@ RefCountedPtr<Subchannel> Subchannel::Create(
const grpc_resolved_address& address, const ChannelArgs& args) {
SubchannelKey key(address, args);
auto* subchannel_pool = args.GetObject<SubchannelPoolInterface>();
GPR_ASSERT(subchannel_pool != nullptr);
CHECK_NE(subchannel_pool, nullptr);
RefCountedPtr<Subchannel> c = subchannel_pool->FindSubchannel(key);
if (c != nullptr) {
return c;
@ -628,7 +629,7 @@ void Subchannel::Orphaned() {
}
{
MutexLock lock(&mu_);
GPR_ASSERT(!shutdown_);
CHECK(!shutdown_);
shutdown_ = true;
connector_.reset();
connected_subchannel_.reset();

8
src/core/client_channel/subchannel_stream_client.cc
Unescape View File

@ -23,6 +23,8 @@
#include <utility>
#include "absl/log/check.h"
#include <grpc/status.h>
#include <grpc/support/log.h>
@ -110,7 +112,7 @@ void SubchannelStreamClient::StartCall() {
void SubchannelStreamClient::StartCallLocked() {
if (event_handler_ == nullptr) return;
GPR_ASSERT(call_state_ == nullptr);
CHECK(call_state_ == nullptr);
if (event_handler_ != nullptr) {
event_handler_->OnCallStartLocked(this);
}
@ -235,7 +237,7 @@ void SubchannelStreamClient::CallState::StartCallLocked() {
send_initial_metadata_.Set(
HttpPathMetadata(),
subchannel_stream_client_->event_handler_->GetPathLocked());
GPR_ASSERT(error.ok());
CHECK(error.ok());
payload_.send_initial_metadata.send_initial_metadata =
&send_initial_metadata_;
batch_.send_initial_metadata = true;
@ -444,7 +446,7 @@ void SubchannelStreamClient::CallState::CallEndedLocked(bool retry) {
if (this == subchannel_stream_client_->call_state_.get()) {
subchannel_stream_client_->call_state_.reset();
if (retry) {
GPR_ASSERT(subchannel_stream_client_->event_handler_ != nullptr);
CHECK(subchannel_stream_client_->event_handler_ != nullptr);
if (seen_response_.load(std::memory_order_acquire)) {
// If the call fails after we've gotten a successful response, reset
// the backoff and restart the call immediately.

2
src/core/ext/transport/chaotic_good/client/chaotic_good_connector.cc
Unescape View File

@ -31,6 +31,7 @@
#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/settings_metadata.h"
#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/event_engine/channel_args_endpoint_config.h"
@ -61,7 +62,6 @@
#include "src/core/lib/surface/channel.h"
#include "src/core/lib/surface/channel_create.h"
#include "src/core/lib/transport/error_utils.h"
#include "src/core/lib/transport/handshaker.h"
#include "src/core/lib/transport/promise_endpoint.h"
namespace grpc_core {

2
src/core/ext/transport/chaotic_good/client/chaotic_good_connector.h
Unescape View File

@ -28,6 +28,7 @@
#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"
#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"
@ -43,7 +44,6 @@
#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/handshaker.h"
#include "src/core/lib/transport/promise_endpoint.h"
namespace grpc_core {

2
src/core/ext/transport/chaotic_good/server/chaotic_good_server.cc
Unescape View File

@ -35,6 +35,7 @@
#include "src/core/ext/transport/chaotic_good/frame_header.h"
#include "src/core/ext/transport/chaotic_good/server_transport.h"
#include "src/core/ext/transport/chaotic_good/settings_metadata.h"
#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/event_engine/event_engine_context.h"
@ -63,7 +64,6 @@
#include "src/core/lib/slice/slice_buffer.h"
#include "src/core/lib/surface/server.h"
#include "src/core/lib/transport/error_utils.h"
#include "src/core/lib/transport/handshaker.h"
#include "src/core/lib/transport/metadata.h"
#include "src/core/lib/transport/metadata_batch.h"
#include "src/core/lib/transport/promise_endpoint.h"

2
src/core/ext/transport/chaotic_good/server/chaotic_good_server.h
Unescape View File

@ -32,6 +32,7 @@
#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"
#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"
@ -44,7 +45,6 @@
#include "src/core/lib/resource_quota/resource_quota.h"
#include "src/core/lib/slice/slice.h"
#include "src/core/lib/surface/server.h"
#include "src/core/lib/transport/handshaker.h"
#include "src/core/lib/transport/promise_endpoint.h"
namespace grpc_core {

6
src/core/ext/transport/chttp2/client/chttp2_connector.cc
Unescape View File

@ -44,6 +44,9 @@
#include "src/core/client_channel/connector.h"
#include "src/core/client_channel/subchannel.h"
#include "src/core/ext/transport/chttp2/transport/chttp2_transport.h"
#include "src/core/handshaker/handshaker.h"
#include "src/core/handshaker/handshaker_registry.h"
#include "src/core/handshaker/tcp_connect/tcp_connect_handshaker.h"
#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"
@ -66,9 +69,6 @@
#include "src/core/lib/surface/channel_create.h"
#include "src/core/lib/surface/channel_stack_type.h"
#include "src/core/lib/transport/error_utils.h"
#include "src/core/lib/transport/handshaker.h"
#include "src/core/lib/transport/handshaker_registry.h"
#include "src/core/lib/transport/tcp_connect_handshaker.h"
#include "src/core/lib/transport/transport.h"
#include "src/core/resolver/resolver_registry.h"

2
src/core/ext/transport/chttp2/client/chttp2_connector.h
Unescape View File

@ -26,12 +26,12 @@
#include <grpc/support/port_platform.h>
#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/lib/transport/handshaker.h"
namespace grpc_core {

4
src/core/ext/transport/chttp2/server/chttp2_server.cc
Unescape View File

@ -50,6 +50,8 @@
#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"
#include "src/core/handshaker/handshaker.h"
#include "src/core/handshaker/handshaker_registry.h"
#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"
@ -80,8 +82,6 @@
#include "src/core/lib/surface/api_trace.h"
#include "src/core/lib/surface/server.h"
#include "src/core/lib/transport/error_utils.h"
#include "src/core/lib/transport/handshaker.h"
#include "src/core/lib/transport/handshaker_registry.h"
#include "src/core/lib/transport/transport.h"
#include "src/core/lib/uri/uri_parser.h"

5
src/core/ext/xds/xds_certificate_provider.cc
Unescape View File

@ -21,6 +21,7 @@
#include <utility>
#include "absl/functional/bind_front.h"
#include "absl/log/check.h"
#include "absl/types/optional.h"
#include <grpc/support/log.h>
@ -186,7 +187,7 @@ void XdsCertificateProvider::WatchStatusCallback(std::string cert_name,
}
} else if (!root_being_watched && root_cert_watcher_ != nullptr) {
// Cancel root cert watch.
GPR_ASSERT(root_cert_provider_ != nullptr);
CHECK(root_cert_provider_ != nullptr);
root_cert_provider_->distributor()->CancelTlsCertificatesWatch(
root_cert_watcher_);
root_cert_watcher_ = nullptr;
@ -206,7 +207,7 @@ void XdsCertificateProvider::WatchStatusCallback(std::string cert_name,
std::move(watcher), absl::nullopt, identity_cert_name_);
}
} else if (!identity_being_watched && identity_cert_watcher_ != nullptr) {
GPR_ASSERT(identity_cert_provider_ != nullptr);
CHECK(identity_cert_provider_ != nullptr);
identity_cert_provider_->distributor()->CancelTlsCertificatesWatch(
identity_cert_watcher_);
identity_cert_watcher_ = nullptr;

21
src/core/ext/xds/xds_client.cc
Unescape View File

@ -27,6 +27,7 @@
#include <vector>
#include "absl/cleanup/cleanup.h"
#include "absl/log/check.h"
#include "absl/strings/match.h"
#include "absl/strings/str_cat.h"
#include "absl/strings/str_join.h"
@ -472,7 +473,7 @@ XdsClient::XdsChannel::XdsChannel(WeakRefCountedPtr<XdsClient> xds_client,
self->OnConnectivityFailure(std::move(status));
},
&status);
GPR_ASSERT(transport_ != nullptr);
CHECK(transport_ != nullptr);
if (!status.ok()) SetChannelStatusLocked(std::move(status));
}
@ -717,8 +718,8 @@ void XdsClient::XdsChannel::RetryableCall<T>::OnCallFinishedLocked() {
template <typename T>
void XdsClient::XdsChannel::RetryableCall<T>::StartNewCallLocked() {
if (shutting_down_) return;
GPR_ASSERT(xds_channel_->transport_ != nullptr);
GPR_ASSERT(call_ == nullptr);
CHECK(xds_channel_->transport_ != nullptr);
CHECK(call_ == nullptr);
if (GRPC_TRACE_FLAG_ENABLED(grpc_xds_client_trace)) {
gpr_log(GPR_INFO,
"[xds_client %p] xds server %s: start new call from retryable "
@ -1005,7 +1006,7 @@ XdsClient::XdsChannel::AdsCall::AdsCall(
GRPC_TRACE_FLAG_ENABLED(grpc_xds_client_refcount_trace) ? "AdsCall"
: nullptr),
retryable_call_(std::move(retryable_call)) {
GPR_ASSERT(xds_client() != nullptr);
CHECK_NE(xds_client(), nullptr);
// Init the ADS call.
const char* method =
"/envoy.service.discovery.v3.AggregatedDiscoveryService/"
@ -1015,7 +1016,7 @@ XdsClient::XdsChannel::AdsCall::AdsCall(
// Passing the initial ref here. This ref will go away when
// the StreamEventHandler is destroyed.
RefCountedPtr<AdsCall>(this)));
GPR_ASSERT(streaming_call_ != nullptr);
CHECK(streaming_call_ != nullptr);
// Start the call.
if (GRPC_TRACE_FLAG_ENABLED(grpc_xds_client_trace)) {
gpr_log(GPR_INFO,
@ -1369,7 +1370,7 @@ XdsClient::XdsChannel::LrsCall::LrsCall(
// 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.
GPR_ASSERT(xds_client() != nullptr);
CHECK_NE(xds_client(), nullptr);
const char* method =
"/envoy.service.load_stats.v3.LoadReportingService/StreamLoadStats";
streaming_call_ = xds_channel()->transport_->CreateStreamingCall(
@ -1377,7 +1378,7 @@ XdsClient::XdsChannel::LrsCall::LrsCall(
// Passing the initial ref here. This ref will go away when
// the StreamEventHandler is destroyed.
RefCountedPtr<LrsCall>(this)));
GPR_ASSERT(streaming_call_ != nullptr);
CHECK(streaming_call_ != nullptr);
// Start the call.
if (GRPC_TRACE_FLAG_ENABLED(grpc_xds_client_trace)) {
gpr_log(GPR_INFO,
@ -1598,7 +1599,7 @@ XdsClient::XdsClient(
if (GRPC_TRACE_FLAG_ENABLED(grpc_xds_client_trace)) {
gpr_log(GPR_INFO, "[xds_client %p] creating xds client", this);
}
GPR_ASSERT(bootstrap_ != nullptr);
CHECK(bootstrap_ != nullptr);
if (bootstrap_->node() != nullptr) {
gpr_log(GPR_INFO, "[xds_client %p] xDS node ID: %s", this,
bootstrap_->node()->id().c_str());
@ -1853,7 +1854,7 @@ void XdsClient::MaybeRegisterResourceTypeLocked(
const XdsResourceType* resource_type) {
auto it = resource_types_.find(resource_type->type_url());
if (it != resource_types_.end()) {
GPR_ASSERT(it->second == resource_type);
CHECK(it->second == resource_type);
return;
}
resource_types_.emplace(resource_type->type_url(), resource_type);
@ -1904,7 +1905,7 @@ std::string XdsClient::ConstructFullXdsResourceName(
auto uri = URI::Create("xdstp", std::string(authority),
absl::StrCat("/", resource_type, "/", key.id),
key.query_params, /*fragment=*/"");
GPR_ASSERT(uri.ok());
CHECK(uri.ok());
return uri->ToString();
}
// Old-style name.

3
src/core/ext/xds/xds_cluster.cc
Unescape View File

@ -22,6 +22,7 @@
#include <memory>
#include <utility>
#include "absl/log/check.h"
#include "absl/status/status.h"
#include "absl/status/statusor.h"
#include "absl/strings/match.h"
@ -476,7 +477,7 @@ absl::StatusOr<std::shared_ptr<const XdsClusterResource>> CdsResourceParse(
ValidationErrors::ScopedField field(&errors, ".cluster_type");
const auto* custom_cluster_type =
envoy_config_cluster_v3_Cluster_cluster_type(cluster);
GPR_ASSERT(custom_cluster_type != nullptr);
CHECK_NE(custom_cluster_type, nullptr);
ValidationErrors::ScopedField field2(&errors, ".typed_config");
const auto* typed_config =
envoy_config_cluster_v3_Cluster_CustomClusterType_typed_config(

3
src/core/ext/xds/xds_cluster_specifier_plugin.cc
Unescape View File

@ -21,6 +21,7 @@
#include <map>
#include <utility>
#include "absl/log/check.h"
#include "absl/status/statusor.h"
#include "absl/strings/str_cat.h"
#include "absl/types/variant.h"
@ -91,7 +92,7 @@ Json XdsRouteLookupClusterSpecifierPlugin::GenerateLoadBalancingPolicyConfig(
upb_JsonEncode(plugin_config, msg_type, symtab, 0,
reinterpret_cast<char*>(buf), json_size + 1, status.ptr());
auto json = JsonParse(reinterpret_cast<char*>(buf));
GPR_ASSERT(json.ok());
CHECK(json.ok());
return Json::FromArray({Json::FromObject(
{{"rls_experimental",
Json::FromObject({

3
src/core/ext/xds/xds_endpoint.cc
Unescape View File

@ -25,6 +25,7 @@
#include <set>
#include <vector>
#include "absl/log/check.h"
#include "absl/status/status.h"
#include "absl/status/statusor.h"
#include "absl/strings/str_cat.h"
@ -407,7 +408,7 @@ absl::StatusOr<std::shared_ptr<const XdsEndpointResource>> EdsResourceParse(
ValidationErrors::ScopedField field(&errors, absl::StrCat("[", i, "]"));
auto parsed_locality = LocalityParse(endpoints[i], &address_set, &errors);
if (parsed_locality.has_value()) {
GPR_ASSERT(parsed_locality->locality.lb_weight != 0);
CHECK_NE(parsed_locality->locality.lb_weight, 0u);
// Make sure prorities is big enough. Note that they might not
// arrive in priority order.
if (eds_resource->priorities.size() < parsed_locality->priority + 1) {

6
src/core/ext/xds/xds_http_filters.cc
Unescape View File

@ -20,6 +20,7 @@
#include <utility>
#include <vector>
#include "absl/log/check.h"
#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"
@ -91,11 +92,10 @@ XdsHttpFilterRegistry::XdsHttpFilterRegistry(bool register_builtins) {
void XdsHttpFilterRegistry::RegisterFilter(
std::unique_ptr<XdsHttpFilterImpl> filter) {
GPR_ASSERT(
registry_map_.emplace(filter->ConfigProtoName(), filter.get()).second);
CHECK(registry_map_.emplace(filter->ConfigProtoName(), filter.get()).second);
auto override_proto_name = filter->OverrideConfigProtoName();
if (!override_proto_name.empty()) {
GPR_ASSERT(registry_map_.emplace(override_proto_name, filter.get()).second);
CHECK(registry_map_.emplace(override_proto_name, filter.get()).second);
}
owning_list_.push_back(std::move(filter));
}

5
src/core/ext/xds/xds_listener.cc
Unescape View File

@ -21,6 +21,7 @@
#include <set>
#include <utility>
#include "absl/log/check.h"
#include "absl/status/status.h"
#include "absl/status/statusor.h"
#include "absl/strings/str_cat.h"
@ -873,8 +874,8 @@ void AddFilterChainDataForSourceType(
const FilterChain& filter_chain,
InternalFilterChainMap::DestinationIp* destination_ip,
ValidationErrors* errors) {
GPR_ASSERT(static_cast<unsigned int>(
filter_chain.filter_chain_match.source_type) < 3);
CHECK(static_cast<unsigned int>(filter_chain.filter_chain_match.source_type) <
3u);
AddFilterChainDataForSourceIpRange(
filter_chain,
&destination_ip->source_types_array[static_cast<int>(

15
src/core/ext/xds/xds_route_config.cc
Unescape View File

@ -27,6 +27,7 @@
#include <utility>
#include <vector>
#include "absl/log/check.h"
#include "absl/status/status.h"
#include "absl/status/statusor.h"
#include "absl/strings/str_cat.h"
@ -464,7 +465,7 @@ absl::optional<StringMatcher> RoutePathMatchParse(
} else if (envoy_config_route_v3_RouteMatch_has_safe_regex(match)) {
const envoy_type_matcher_v3_RegexMatcher* regex_matcher =
envoy_config_route_v3_RouteMatch_safe_regex(match);
GPR_ASSERT(regex_matcher != nullptr);
CHECK_NE(regex_matcher, nullptr);
type = StringMatcher::Type::kSafeRegex;
match_string = UpbStringToStdString(
envoy_type_matcher_v3_RegexMatcher_regex(regex_matcher));
@ -492,7 +493,7 @@ void RouteHeaderMatchersParse(const envoy_config_route_v3_RouteMatch* match,
ValidationErrors::ScopedField field(errors,
absl::StrCat(".headers[", i, "]"));
const envoy_config_route_v3_HeaderMatcher* header = headers[i];
GPR_ASSERT(header != nullptr);
CHECK_NE(header, nullptr);
const std::string name =
UpbStringToStdString(envoy_config_route_v3_HeaderMatcher_name(header));
HeaderMatcher::Type type;
@ -521,7 +522,7 @@ void RouteHeaderMatchersParse(const envoy_config_route_v3_RouteMatch* match,
header)) {
const envoy_type_matcher_v3_RegexMatcher* regex_matcher =
envoy_config_route_v3_HeaderMatcher_safe_regex_match(header);
GPR_ASSERT(regex_matcher != nullptr);
CHECK_NE(regex_matcher, nullptr);
type = HeaderMatcher::Type::kSafeRegex;
match_string = UpbStringToStdString(
envoy_type_matcher_v3_RegexMatcher_regex(regex_matcher));
@ -529,7 +530,7 @@ void RouteHeaderMatchersParse(const envoy_config_route_v3_RouteMatch* match,
type = HeaderMatcher::Type::kRange;
const envoy_type_v3_Int64Range* range_matcher =
envoy_config_route_v3_HeaderMatcher_range_match(header);
GPR_ASSERT(range_matcher != nullptr);
CHECK_NE(range_matcher, nullptr);
range_start = envoy_type_v3_Int64Range_start(range_matcher);
range_end = envoy_type_v3_Int64Range_end(range_matcher);
} else if (envoy_config_route_v3_HeaderMatcher_has_present_match(header)) {
@ -539,7 +540,7 @@ void RouteHeaderMatchersParse(const envoy_config_route_v3_RouteMatch* match,
ValidationErrors::ScopedField field(errors, ".string_match");
const auto* matcher =
envoy_config_route_v3_HeaderMatcher_string_match(header);
GPR_ASSERT(matcher != nullptr);
CHECK_NE(matcher, nullptr);
if (envoy_type_matcher_v3_StringMatcher_has_exact(matcher)) {
type = HeaderMatcher::Type::kExact;
match_string = UpbStringToStdString(
@ -560,7 +561,7 @@ void RouteHeaderMatchersParse(const envoy_config_route_v3_RouteMatch* match,
type = HeaderMatcher::Type::kSafeRegex;
const auto* regex_matcher =
envoy_type_matcher_v3_StringMatcher_safe_regex(matcher);
GPR_ASSERT(regex_matcher != nullptr);
CHECK_NE(regex_matcher, nullptr);
match_string = UpbStringToStdString(
envoy_type_matcher_v3_RegexMatcher_regex(regex_matcher));
} else {
@ -886,7 +887,7 @@ absl::optional<XdsRouteConfigResource::Route::RouteAction> RouteActionParse(
ValidationErrors::ScopedField field(errors, ".weighted_clusters");
const envoy_config_route_v3_WeightedCluster* weighted_clusters_proto =
envoy_config_route_v3_RouteAction_weighted_clusters(route_action_proto);
GPR_ASSERT(weighted_clusters_proto != nullptr);
CHECK_NE(weighted_clusters_proto, nullptr);
std::vector<XdsRouteConfigResource::Route::RouteAction::ClusterWeight>
action_weighted_clusters;
uint64_t total_weight = 0;

5
src/core/ext/xds/xds_routing.cc
Unescape View File

@ -25,6 +25,7 @@
#include <cctype>
#include <utility>
#include "absl/log/check.h"
#include "absl/status/status.h"
#include "absl/status/statusor.h"
#include "absl/strings/match.h"
@ -117,7 +118,7 @@ absl::optional<size_t> XdsRouting::FindVirtualHostForDomain(
// than current match.
const MatchType match_type = DomainPatternMatchType(domain_pattern);
// This should be caught by RouteConfigParse().
GPR_ASSERT(match_type != INVALID_MATCH);
CHECK(match_type != INVALID_MATCH);
if (match_type > best_match_type) continue;
if (match_type == best_match_type &&
domain_pattern.size() <= longest_match) {
@ -235,7 +236,7 @@ XdsRouting::GeneratePerHTTPFilterConfigs(
const XdsHttpFilterImpl* filter_impl =
http_filter_registry.GetFilterForType(
http_filter.config.config_proto_type_name);
GPR_ASSERT(filter_impl != nullptr);
CHECK_NE(filter_impl, nullptr);
// If there is not actually any C-core filter associated with this
// xDS filter, then it won't need any config, so skip it.
if (filter_impl->channel_filter() == nullptr) continue;

13
src/core/ext/xds/xds_server_config_fetcher.cc
Unescape View File

@ -27,6 +27,7 @@
#include <vector>
#include "absl/base/thread_annotations.h"
#include "absl/log/check.h"
#include "absl/status/status.h"
#include "absl/status/statusor.h"
#include "absl/strings/match.h"
@ -405,7 +406,7 @@ class XdsServerConfigFetcher::ListenerWatcher::FilterChainMatchManager::
absl::StatusOr<RefCountedPtr<ServerConfigSelector>> Watch(
std::unique_ptr<ServerConfigSelectorProvider::ServerConfigSelectorWatcher>
watcher) override {
GPR_ASSERT(watcher_ == nullptr);
CHECK(watcher_ == nullptr);
watcher_ = std::move(watcher);
if (!static_resource_.ok()) {
return static_resource_.status();
@ -518,7 +519,7 @@ XdsServerConfigFetcher::XdsServerConfigFetcher(
RefCountedPtr<GrpcXdsClient> xds_client,
grpc_server_xds_status_notifier notifier)
: xds_client_(std::move(xds_client)), serving_status_notifier_(notifier) {
GPR_ASSERT(xds_client_ != nullptr);
CHECK(xds_client_ != nullptr);
}
std::string ListenerResourceName(absl::string_view resource_name_template,
@ -1102,7 +1103,7 @@ absl::StatusOr<ChannelArgs> XdsServerConfigFetcher::ListenerWatcher::
const XdsHttpFilterImpl* filter_impl =
http_filter_registry.GetFilterForType(
http_filter.config.config_proto_type_name);
GPR_ASSERT(filter_impl != nullptr);
CHECK_NE(filter_impl, nullptr);
// Some filters like the router filter are no-op filters and do not have
// an implementation.
if (filter_impl->channel_filter() != nullptr) {
@ -1151,7 +1152,7 @@ absl::StatusOr<ChannelArgs> XdsServerConfigFetcher::ListenerWatcher::
return result.status();
}
xds_certificate_provider = std::move(*result);
GPR_ASSERT(xds_certificate_provider != nullptr);
CHECK(xds_certificate_provider != nullptr);
args = args.SetObject(xds_certificate_provider);
}
return args;
@ -1269,7 +1270,7 @@ XdsServerConfigFetcher::ListenerWatcher::FilterChainMatchManager::
resource_name_(std::move(resource_name)),
http_filters_(std::move(http_filters)),
resource_(std::move(initial_resource)) {
GPR_ASSERT(!resource_name_.empty());
CHECK(!resource_name_.empty());
// RouteConfigWatcher is being created here instead of in Watch() to avoid
// deadlocks from invoking XdsRouteConfigResourceType::StartWatch whilst in a
// critical region.
@ -1296,7 +1297,7 @@ XdsServerConfigFetcher::ListenerWatcher::FilterChainMatchManager::
absl::StatusOr<std::shared_ptr<const XdsRouteConfigResource>> resource;
{
MutexLock lock(&mu_);
GPR_ASSERT(watcher_ == nullptr);
CHECK(watcher_ == nullptr);
watcher_ = std::move(watcher);
resource = resource_;
}

19
src/core/ext/xds/xds_transport_grpc.cc
Unescape View File

@ -23,6 +23,7 @@
#include <string_view>
#include <utility>
#include "absl/log/check.h"
#include "absl/strings/str_cat.h"
#include <grpc/byte_buffer.h>
@ -78,7 +79,7 @@ GrpcXdsTransportFactory::GrpcXdsTransport::GrpcStreamingCall::GrpcStreamingCall(
factory_->interested_parties(), Slice::FromStaticString(method),
/*authority=*/absl::nullopt, Timestamp::InfFuture(),
/*registered_method=*/true);
GPR_ASSERT(call_ != nullptr);
CHECK_NE(call_, nullptr);
// Init data associated with the call.
grpc_metadata_array_init(&initial_metadata_recv_);
grpc_metadata_array_init(&trailing_metadata_recv_);
@ -108,7 +109,7 @@ GrpcXdsTransportFactory::GrpcXdsTransport::GrpcStreamingCall::GrpcStreamingCall(
this->Ref(DEBUG_LOCATION, "OnRecvInitialMetadata").release(), nullptr);
call_error = grpc_call_start_batch_and_execute(
call_, ops, static_cast<size_t>(op - ops), &on_recv_initial_metadata_);
GPR_ASSERT(GRPC_CALL_OK == call_error);
CHECK_EQ(call_error, GRPC_CALL_OK);
// Start a batch for recv_trailing_metadata.
memset(ops, 0, sizeof(ops));
op = ops;
@ -125,7 +126,7 @@ GrpcXdsTransportFactory::GrpcXdsTransport::GrpcStreamingCall::GrpcStreamingCall(
GRPC_CLOSURE_INIT(&on_status_received_, OnStatusReceived, this, nullptr);
call_error = grpc_call_start_batch_and_execute(
call_, ops, static_cast<size_t>(op - ops), &on_status_received_);
GPR_ASSERT(GRPC_CALL_OK == call_error);
CHECK_EQ(call_error, GRPC_CALL_OK);
GRPC_CLOSURE_INIT(&on_response_received_, OnResponseReceived, this, nullptr);
}
@ -135,12 +136,12 @@ GrpcXdsTransportFactory::GrpcXdsTransport::GrpcStreamingCall::
grpc_byte_buffer_destroy(send_message_payload_);
grpc_byte_buffer_destroy(recv_message_payload_);
CSliceUnref(status_details_);
GPR_ASSERT(call_ != nullptr);
CHECK_NE(call_, nullptr);
grpc_call_unref(call_);
}
void GrpcXdsTransportFactory::GrpcXdsTransport::GrpcStreamingCall::Orphan() {
GPR_ASSERT(call_ != nullptr);
CHECK_NE(call_, nullptr);
// If we are here because xds_client wants to cancel the call,
// OnStatusReceived() will complete the cancellation and clean up.
// Otherwise, we are here because xds_client has to orphan a failed call,
@ -164,7 +165,7 @@ void GrpcXdsTransportFactory::GrpcXdsTransport::GrpcStreamingCall::SendMessage(
Ref(DEBUG_LOCATION, "OnRequestSent").release();
grpc_call_error call_error =
grpc_call_start_batch_and_execute(call_, &op, 1, &on_request_sent_);
GPR_ASSERT(GRPC_CALL_OK == call_error);
CHECK_EQ(call_error, GRPC_CALL_OK);
}
void GrpcXdsTransportFactory::GrpcXdsTransport::GrpcStreamingCall::
@ -174,10 +175,10 @@ void GrpcXdsTransportFactory::GrpcXdsTransport::GrpcStreamingCall::
memset(&op, 0, sizeof(op));
op.op = GRPC_OP_RECV_MESSAGE;
op.data.recv_message.recv_message = &recv_message_payload_;
GPR_ASSERT(call_ != nullptr);
CHECK_NE(call_, nullptr);
const grpc_call_error call_error =
grpc_call_start_batch_and_execute(call_, &op, 1, &on_response_received_);
GPR_ASSERT(GRPC_CALL_OK == call_error);
CHECK_EQ(call_error, GRPC_CALL_OK);
}
void GrpcXdsTransportFactory::GrpcXdsTransport::GrpcStreamingCall::
@ -271,7 +272,7 @@ GrpcXdsTransportFactory::GrpcXdsTransport::GrpcXdsTransport(
channel_ = CreateXdsChannel(
factory->args_,
static_cast<const GrpcXdsBootstrap::GrpcXdsServer&>(server));
GPR_ASSERT(channel_ != nullptr);
CHECK(channel_ != nullptr);
if (channel_->IsLame()) {
*status = absl::UnavailableError("xds client has a lame channel");
} else {

8
src/core/lib/transport/endpoint_info_handshaker.cc → src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc
Unescape View File

@ -14,7 +14,7 @@
// limitations under the License.
//
#include "src/core/lib/transport/endpoint_info_handshaker.h"
#include "src/core/handshaker/endpoint_info/endpoint_info_handshaker.h"
#include <memory>
@ -22,15 +22,15 @@
#include <grpc/support/port_platform.h>
#include "src/core/handshaker/handshaker.h"
#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/lib/transport/handshaker.h"
#include "src/core/lib/transport/handshaker_factory.h"
#include "src/core/lib/transport/handshaker_registry.h"
namespace grpc_core {

6
src/core/lib/transport/endpoint_info_handshaker.h → src/core/handshaker/endpoint_info/endpoint_info_handshaker.h
Unescape View File

@ -14,8 +14,8 @@
// limitations under the License.
//
#ifndef GRPC_SRC_CORE_LIB_TRANSPORT_ENDPOINT_INFO_HANDSHAKER_H
#define GRPC_SRC_CORE_LIB_TRANSPORT_ENDPOINT_INFO_HANDSHAKER_H
#ifndef GRPC_SRC_CORE_HANDSHAKER_ENDPOINT_INFO_ENDPOINT_INFO_HANDSHAKER_H
#define GRPC_SRC_CORE_HANDSHAKER_ENDPOINT_INFO_ENDPOINT_INFO_HANDSHAKER_H
#include <grpc/support/port_platform.h>
@ -34,4 +34,4 @@ void RegisterEndpointInfoHandshaker(CoreConfiguration::Builder* builder);
} // namespace grpc_core
#endif // GRPC_SRC_CORE_LIB_TRANSPORT_ENDPOINT_INFO_HANDSHAKER_H
#endif // GRPC_SRC_CORE_HANDSHAKER_ENDPOINT_INFO_ENDPOINT_INFO_HANDSHAKER_H

2
src/core/lib/transport/handshaker.cc → src/core/handshaker/handshaker.cc
Unescape View File

@ -16,7 +16,7 @@
//
//
#include "src/core/lib/transport/handshaker.h"
#include "src/core/handshaker/handshaker.h"
#include <inttypes.h>

6
src/core/lib/transport/handshaker.h → src/core/handshaker/handshaker.h
Unescape View File

@ -16,8 +16,8 @@
//
//
#ifndef GRPC_SRC_CORE_LIB_TRANSPORT_HANDSHAKER_H
#define GRPC_SRC_CORE_LIB_TRANSPORT_HANDSHAKER_H
#ifndef GRPC_SRC_CORE_HANDSHAKER_HANDSHAKER_H
#define GRPC_SRC_CORE_HANDSHAKER_HANDSHAKER_H
#include <stddef.h>
@ -161,4 +161,4 @@ class HandshakeManager : public RefCounted<HandshakeManager> {
} // namespace grpc_core
#endif // GRPC_SRC_CORE_LIB_TRANSPORT_HANDSHAKER_H
#endif // GRPC_SRC_CORE_HANDSHAKER_HANDSHAKER_H

6
src/core/lib/transport/handshaker_factory.h → src/core/handshaker/handshaker_factory.h
Unescape View File

@ -16,8 +16,8 @@
//
//
#ifndef GRPC_SRC_CORE_LIB_TRANSPORT_HANDSHAKER_FACTORY_H
#define GRPC_SRC_CORE_LIB_TRANSPORT_HANDSHAKER_FACTORY_H
#ifndef GRPC_SRC_CORE_HANDSHAKER_HANDSHAKER_FACTORY_H
#define GRPC_SRC_CORE_HANDSHAKER_HANDSHAKER_FACTORY_H
#include <grpc/support/port_platform.h>
@ -86,4 +86,4 @@ class HandshakerFactory {
} // namespace grpc_core
#endif // GRPC_SRC_CORE_LIB_TRANSPORT_HANDSHAKER_FACTORY_H
#endif // GRPC_SRC_CORE_HANDSHAKER_HANDSHAKER_FACTORY_H

2
src/core/lib/transport/handshaker_registry.cc → src/core/handshaker/handshaker_registry.cc
Unescape View File

@ -16,7 +16,7 @@
//
//
#include "src/core/lib/transport/handshaker_registry.h"
#include "src/core/handshaker/handshaker_registry.h"
#include <stddef.h>

8
src/core/lib/transport/handshaker_registry.h → src/core/handshaker/handshaker_registry.h
Unescape View File

@ -16,17 +16,17 @@
//
//
#ifndef GRPC_SRC_CORE_LIB_TRANSPORT_HANDSHAKER_REGISTRY_H
#define GRPC_SRC_CORE_LIB_TRANSPORT_HANDSHAKER_REGISTRY_H
#ifndef GRPC_SRC_CORE_HANDSHAKER_HANDSHAKER_REGISTRY_H
#define GRPC_SRC_CORE_HANDSHAKER_HANDSHAKER_REGISTRY_H
#include <memory>
#include <vector>
#include <grpc/support/port_platform.h>
#include "src/core/handshaker/handshaker_factory.h"
#include "src/core/lib/channel/channel_args.h"
#include "src/core/lib/iomgr/iomgr_fwd.h"
#include "src/core/lib/transport/handshaker_factory.h"
namespace grpc_core {
@ -66,4 +66,4 @@ class HandshakerRegistry {
} // namespace grpc_core
#endif // GRPC_SRC_CORE_LIB_TRANSPORT_HANDSHAKER_REGISTRY_H
#endif // GRPC_SRC_CORE_HANDSHAKER_HANDSHAKER_REGISTRY_H

8
src/core/lib/transport/http_connect_handshaker.cc → src/core/handshaker/http_connect/http_connect_handshaker.cc
Unescape View File

@ -16,7 +16,7 @@
//
//
#include "src/core/lib/transport/http_connect_handshaker.h"
#include "src/core/handshaker/http_connect/http_connect_handshaker.h"
#include <limits.h>
#include <string.h>
@ -36,6 +36,9 @@
#include <grpc/support/log.h>
#include <grpc/support/port_platform.h>
#include "src/core/handshaker/handshaker.h"
#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/config/core_configuration.h"
#include "src/core/lib/gpr/string.h"
@ -50,9 +53,6 @@
#include "src/core/lib/iomgr/exec_ctx.h"
#include "src/core/lib/iomgr/iomgr_fwd.h"
#include "src/core/lib/iomgr/tcp_server.h"
#include "src/core/lib/transport/handshaker.h"
#include "src/core/lib/transport/handshaker_factory.h"
#include "src/core/lib/transport/handshaker_registry.h"
namespace grpc_core {

6
src/core/lib/transport/http_connect_handshaker.h → src/core/handshaker/http_connect/http_connect_handshaker.h
Unescape View File

@ -16,8 +16,8 @@
//
//
#ifndef GRPC_SRC_CORE_LIB_TRANSPORT_HTTP_CONNECT_HANDSHAKER_H
#define GRPC_SRC_CORE_LIB_TRANSPORT_HTTP_CONNECT_HANDSHAKER_H
#ifndef GRPC_SRC_CORE_HANDSHAKER_HTTP_CONNECT_HTTP_CONNECT_HANDSHAKER_H
#define GRPC_SRC_CORE_HANDSHAKER_HTTP_CONNECT_HTTP_CONNECT_HANDSHAKER_H
#include <grpc/support/port_platform.h>
@ -39,4 +39,4 @@ void RegisterHttpConnectHandshaker(CoreConfiguration::Builder* builder);
} // namespace grpc_core
#endif // GRPC_SRC_CORE_LIB_TRANSPORT_HTTP_CONNECT_HANDSHAKER_H
#endif // GRPC_SRC_CORE_HANDSHAKER_HTTP_CONNECT_HTTP_CONNECT_HANDSHAKER_H

12
src/core/client_channel/http_proxy_mapper.cc → src/core/handshaker/http_connect/http_proxy_mapper.cc
Unescape View File

@ -16,9 +16,7 @@
//
//
#include <grpc/support/port_platform.h>
#include "src/core/client_channel/http_proxy_mapper.h"
#include "src/core/handshaker/http_connect/http_proxy_mapper.h"
#include <stdint.h>
#include <string.h>
@ -27,6 +25,7 @@
#include <string>
#include <utility>
#include "absl/log/check.h"
#include "absl/status/status.h"
#include "absl/status/statusor.h"
#include "absl/strings/ascii.h"
@ -42,7 +41,9 @@
#include <grpc/impl/channel_arg_names.h>
#include <grpc/support/alloc.h>
#include <grpc/support/log.h>
#include <grpc/support/port_platform.h>
#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"
#include "src/core/lib/channel/channel_args.h"
@ -51,7 +52,6 @@
#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/transport/http_connect_handshaker.h"
#include "src/core/lib/uri/uri_parser.h"
namespace grpc_core {
@ -107,7 +107,7 @@ bool AddressIncluded(
///
absl::optional<std::string> GetHttpProxyServer(
const ChannelArgs& args, absl::optional<std::string>* user_cred) {
GPR_ASSERT(user_cred != nullptr);
CHECK_NE(user_cred, nullptr);
absl::StatusOr<URI> uri;
// We check the following places to determine the HTTP proxy to use, stopping
// at the first one that is set:
@ -141,7 +141,7 @@ absl::optional<std::string> GetHttpProxyServer(
size_t authority_nstrs;
gpr_string_split(uri->authority().c_str(), "@", &authority_strs,
&authority_nstrs);
GPR_ASSERT(authority_nstrs != 0); // should have at least 1 string
CHECK_NE(authority_nstrs, 0u); // should have at least 1 string
absl::optional<std::string> proxy_name;
if (authority_nstrs == 1) {
// User cred not present in authority

12
src/core/client_channel/http_proxy_mapper.h → src/core/handshaker/http_connect/http_proxy_mapper.h
Unescape View File

@ -16,19 +16,19 @@
//
//
#ifndef GRPC_SRC_CORE_CLIENT_CHANNEL_HTTP_PROXY_MAPPER_H
#define GRPC_SRC_CORE_CLIENT_CHANNEL_HTTP_PROXY_MAPPER_H
#include <grpc/support/port_platform.h>
#ifndef GRPC_SRC_CORE_HANDSHAKER_HTTP_CONNECT_HTTP_PROXY_MAPPER_H
#define GRPC_SRC_CORE_HANDSHAKER_HTTP_CONNECT_HTTP_PROXY_MAPPER_H
#include <string>
#include "absl/strings/string_view.h"
#include "absl/types/optional.h"
#include <grpc/support/port_platform.h>
#include "src/core/handshaker/proxy_mapper.h"
#include "src/core/lib/channel/channel_args.h"
#include "src/core/lib/config/core_configuration.h"
#include "src/core/lib/handshaker/proxy_mapper.h"
#include "src/core/lib/iomgr/resolved_address.h"
namespace grpc_core {
@ -50,4 +50,4 @@ void RegisterHttpProxyMapper(CoreConfiguration::Builder* builder);
} // namespace grpc_core
#endif // GRPC_SRC_CORE_CLIENT_CHANNEL_HTTP_PROXY_MAPPER_H
#endif // GRPC_SRC_CORE_HANDSHAKER_HTTP_CONNECT_HTTP_PROXY_MAPPER_H

6
src/core/lib/handshaker/proxy_mapper.h → src/core/handshaker/proxy_mapper.h
Unescape View File

@ -16,8 +16,8 @@
//
//
#ifndef GRPC_SRC_CORE_LIB_HANDSHAKER_PROXY_MAPPER_H
#define GRPC_SRC_CORE_LIB_HANDSHAKER_PROXY_MAPPER_H
#ifndef GRPC_SRC_CORE_HANDSHAKER_PROXY_MAPPER_H
#define GRPC_SRC_CORE_HANDSHAKER_PROXY_MAPPER_H
#include <string>
@ -50,4 +50,4 @@ class ProxyMapperInterface {
} // namespace grpc_core
#endif // GRPC_SRC_CORE_LIB_HANDSHAKER_PROXY_MAPPER_H
#endif // GRPC_SRC_CORE_HANDSHAKER_PROXY_MAPPER_H

2
src/core/lib/handshaker/proxy_mapper_registry.cc → src/core/handshaker/proxy_mapper_registry.cc
Unescape View File

@ -16,7 +16,7 @@
//
//
#include "src/core/lib/handshaker/proxy_mapper_registry.h"
#include "src/core/handshaker/proxy_mapper_registry.h"
#include <algorithm>
#include <memory>

8
src/core/lib/handshaker/proxy_mapper_registry.h → src/core/handshaker/proxy_mapper_registry.h
Unescape View File

@ -16,8 +16,8 @@
//
//
#ifndef GRPC_SRC_CORE_LIB_HANDSHAKER_PROXY_MAPPER_REGISTRY_H
#define GRPC_SRC_CORE_LIB_HANDSHAKER_PROXY_MAPPER_REGISTRY_H
#ifndef GRPC_SRC_CORE_HANDSHAKER_PROXY_MAPPER_REGISTRY_H
#define GRPC_SRC_CORE_HANDSHAKER_PROXY_MAPPER_REGISTRY_H
#include <algorithm>
#include <memory>
@ -29,8 +29,8 @@
#include <grpc/support/port_platform.h>
#include "src/core/handshaker/proxy_mapper.h"
#include "src/core/lib/channel/channel_args.h"
#include "src/core/lib/handshaker/proxy_mapper.h"
#include "src/core/lib/iomgr/resolved_address.h"
namespace grpc_core {
@ -72,4 +72,4 @@ class ProxyMapperRegistry {
} // namespace grpc_core
#endif // GRPC_SRC_CORE_LIB_HANDSHAKER_PROXY_MAPPER_REGISTRY_H
#endif // GRPC_SRC_CORE_HANDSHAKER_PROXY_MAPPER_REGISTRY_H

4
src/core/lib/security/transport/secure_endpoint.cc → src/core/handshaker/security/secure_endpoint.cc
Unescape View File

@ -16,7 +16,7 @@
//
//
#include "src/core/lib/security/transport/secure_endpoint.h"
#include "src/core/handshaker/security/secure_endpoint.h"
#include <inttypes.h>
@ -39,6 +39,7 @@
#include <grpc/support/port_platform.h>
#include <grpc/support/sync.h>
#include "src/core/handshaker/security/tsi_error.h"
#include "src/core/lib/debug/trace.h"
#include "src/core/lib/gpr/string.h"
#include "src/core/lib/gprpp/debug_location.h"
@ -52,7 +53,6 @@
#include "src/core/lib/resource_quota/memory_quota.h"
#include "src/core/lib/resource_quota/resource_quota.h"
#include "src/core/lib/resource_quota/trace.h"
#include "src/core/lib/security/transport/tsi_error.h"
#include "src/core/lib/slice/slice.h"
#include "src/core/lib/slice/slice_string_helpers.h"
#include "src/core/tsi/transport_security_grpc.h"

6
src/core/lib/security/transport/secure_endpoint.h → src/core/handshaker/security/secure_endpoint.h
Unescape View File

@ -16,8 +16,8 @@
//
//
#ifndef GRPC_SRC_CORE_LIB_SECURITY_TRANSPORT_SECURE_ENDPOINT_H
#define GRPC_SRC_CORE_LIB_SECURITY_TRANSPORT_SECURE_ENDPOINT_H
#ifndef GRPC_SRC_CORE_HANDSHAKER_SECURITY_SECURE_ENDPOINT_H
#define GRPC_SRC_CORE_HANDSHAKER_SECURITY_SECURE_ENDPOINT_H
#include <stddef.h>
@ -39,4 +39,4 @@ grpc_endpoint* grpc_secure_endpoint_create(
grpc_endpoint* to_wrap, grpc_slice* leftover_slices,
const grpc_channel_args* channel_args, size_t leftover_nslices);
#endif // GRPC_SRC_CORE_LIB_SECURITY_TRANSPORT_SECURE_ENDPOINT_H
#endif // GRPC_SRC_CORE_HANDSHAKER_SECURITY_SECURE_ENDPOINT_H

12
src/core/lib/security/transport/security_handshaker.cc → src/core/handshaker/security/security_handshaker.cc
Unescape View File

@ -16,7 +16,7 @@
//
//
#include "src/core/lib/security/transport/security_handshaker.h"
#include "src/core/handshaker/security/security_handshaker.h"
#include <limits.h>
#include <stdint.h>
@ -43,6 +43,11 @@
#include <grpc/support/port_platform.h>
#include "src/core/channelz/channelz.h"
#include "src/core/handshaker/handshaker.h"
#include "src/core/handshaker/handshaker_factory.h"
#include "src/core/handshaker/handshaker_registry.h"
#include "src/core/handshaker/security/secure_endpoint.h"
#include "src/core/handshaker/security/tsi_error.h"
#include "src/core/lib/channel/channel_args.h"
#include "src/core/lib/config/core_configuration.h"
#include "src/core/lib/debug/stats.h"
@ -58,13 +63,8 @@
#include "src/core/lib/iomgr/iomgr_fwd.h"
#include "src/core/lib/iomgr/tcp_server.h"
#include "src/core/lib/security/context/security_context.h"
#include "src/core/lib/security/transport/secure_endpoint.h"
#include "src/core/lib/security/transport/tsi_error.h"
#include "src/core/lib/slice/slice.h"
#include "src/core/lib/slice/slice_internal.h"
#include "src/core/lib/transport/handshaker.h"
#include "src/core/lib/transport/handshaker_factory.h"
#include "src/core/lib/transport/handshaker_registry.h"
#include "src/core/tsi/transport_security_grpc.h"
#define GRPC_INITIAL_HANDSHAKE_BUFFER_SIZE 256

8
src/core/lib/security/transport/security_handshaker.h → src/core/handshaker/security/security_handshaker.h
Unescape View File

@ -16,19 +16,19 @@
//
//
#ifndef GRPC_SRC_CORE_LIB_SECURITY_TRANSPORT_SECURITY_HANDSHAKER_H
#define GRPC_SRC_CORE_LIB_SECURITY_TRANSPORT_SECURITY_HANDSHAKER_H
#ifndef GRPC_SRC_CORE_HANDSHAKER_SECURITY_SECURITY_HANDSHAKER_H
#define GRPC_SRC_CORE_HANDSHAKER_SECURITY_SECURITY_HANDSHAKER_H
#include "absl/status/statusor.h"
#include <grpc/grpc.h>
#include <grpc/support/port_platform.h>
#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/lib/transport/handshaker.h"
#include "src/core/tsi/transport_security_interface.h"
namespace grpc_core {
@ -43,4 +43,4 @@ void SecurityRegisterHandshakerFactories(CoreConfiguration::Builder*);
} // namespace grpc_core
#endif // GRPC_SRC_CORE_LIB_SECURITY_TRANSPORT_SECURITY_HANDSHAKER_H
#endif // GRPC_SRC_CORE_HANDSHAKER_SECURITY_SECURITY_HANDSHAKER_H

2
src/core/lib/security/transport/tsi_error.cc → src/core/handshaker/security/tsi_error.cc
Unescape View File

@ -16,7 +16,7 @@
//
//
#include "src/core/lib/security/transport/tsi_error.h"
#include "src/core/handshaker/security/tsi_error.h"
#include <grpc/support/port_platform.h>

6
src/core/lib/security/transport/tsi_error.h → src/core/handshaker/security/tsi_error.h
Unescape View File

@ -16,8 +16,8 @@
//
//
#ifndef GRPC_SRC_CORE_LIB_SECURITY_TRANSPORT_TSI_ERROR_H
#define GRPC_SRC_CORE_LIB_SECURITY_TRANSPORT_TSI_ERROR_H
#ifndef GRPC_SRC_CORE_HANDSHAKER_SECURITY_TSI_ERROR_H
#define GRPC_SRC_CORE_HANDSHAKER_SECURITY_TSI_ERROR_H
#include <grpc/support/port_platform.h>
@ -27,4 +27,4 @@
grpc_error_handle grpc_set_tsi_error_result(grpc_error_handle error,
tsi_result result);
#endif // GRPC_SRC_CORE_LIB_SECURITY_TRANSPORT_TSI_ERROR_H
#endif // GRPC_SRC_CORE_HANDSHAKER_SECURITY_TSI_ERROR_H

8
src/core/lib/transport/tcp_connect_handshaker.cc → src/core/handshaker/tcp_connect/tcp_connect_handshaker.cc
Unescape View File

@ -16,7 +16,7 @@
//
//
#include "src/core/lib/transport/tcp_connect_handshaker.h"
#include "src/core/handshaker/tcp_connect/tcp_connect_handshaker.h"
#include <memory>
@ -31,6 +31,9 @@
#include <grpc/support/log.h>
#include <grpc/support/port_platform.h>
#include "src/core/handshaker/handshaker.h"
#include "src/core/handshaker/handshaker_factory.h"
#include "src/core/handshaker/handshaker_registry.h"
#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"
@ -48,9 +51,6 @@
#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/transport/handshaker.h"
#include "src/core/lib/transport/handshaker_factory.h"
#include "src/core/lib/transport/handshaker_registry.h"
#include "src/core/lib/uri/uri_parser.h"
namespace grpc_core {

6
src/core/lib/transport/tcp_connect_handshaker.h → src/core/handshaker/tcp_connect/tcp_connect_handshaker.h
Unescape View File

@ -14,8 +14,8 @@
// limitations under the License.
//
#ifndef GRPC_SRC_CORE_LIB_TRANSPORT_TCP_CONNECT_HANDSHAKER_H
#define GRPC_SRC_CORE_LIB_TRANSPORT_TCP_CONNECT_HANDSHAKER_H
#ifndef GRPC_SRC_CORE_HANDSHAKER_TCP_CONNECT_TCP_CONNECT_HANDSHAKER_H
#define GRPC_SRC_CORE_HANDSHAKER_TCP_CONNECT_TCP_CONNECT_HANDSHAKER_H
#include <grpc/support/port_platform.h>
@ -36,4 +36,4 @@ void RegisterTCPConnectHandshaker(CoreConfiguration::Builder* builder);
} // namespace grpc_core
#endif // GRPC_SRC_CORE_LIB_TRANSPORT_TCP_CONNECT_HANDSHAKER_H
#endif // GRPC_SRC_CORE_HANDSHAKER_TCP_CONNECT_TCP_CONNECT_HANDSHAKER_H

4
src/core/lib/config/core_configuration.h
Unescape View File

@ -22,12 +22,12 @@
#include <grpc/support/log.h>
#include <grpc/support/port_platform.h>
#include "src/core/handshaker/handshaker_registry.h"
#include "src/core/handshaker/proxy_mapper_registry.h"
#include "src/core/lib/channel/channel_args_preconditioning.h"
#include "src/core/lib/handshaker/proxy_mapper_registry.h"
#include "src/core/lib/security/certificate_provider/certificate_provider_registry.h"
#include "src/core/lib/security/credentials/channel_creds_registry.h"
#include "src/core/lib/surface/channel_init.h"
#include "src/core/lib/transport/handshaker_registry.h"
#include "src/core/load_balancing/lb_policy_registry.h"
#include "src/core/resolver/resolver_registry.h"
#include "src/core/service_config/service_config_parser.h"

33
src/core/lib/event_engine/ares_resolver.cc
Unescape View File

@ -52,6 +52,7 @@
#include "absl/functional/any_invocable.h"
#include "absl/hash/hash.h"
#include "absl/log/check.h"
#include "absl/strings/match.h"
#include "absl/strings/numbers.h"
#include "absl/strings/str_cat.h"
@ -229,8 +230,8 @@ AresResolver::AresResolver(
}
AresResolver::~AresResolver() {
GPR_ASSERT(fd_node_list_.empty());
GPR_ASSERT(callback_map_.empty());
CHECK(fd_node_list_.empty());
CHECK(callback_map_.empty());
ares_destroy(channel_);
}
@ -246,7 +247,7 @@ void AresResolver::Orphan() {
if (!fd_node->already_shutdown) {
GRPC_ARES_RESOLVER_TRACE_LOG("resolver: %p shutdown fd: %s", this,
fd_node->polled_fd->GetName());
GPR_ASSERT(fd_node->polled_fd->ShutdownLocked(
CHECK(fd_node->polled_fd->ShutdownLocked(
absl::CancelledError("AresResolver::Orphan")));
fd_node->already_shutdown = true;
}
@ -513,7 +514,7 @@ void AresResolver::MaybeStartTimerLocked() {
void AresResolver::OnReadable(FdNode* fd_node, absl::Status status) {
grpc_core::MutexLock lock(&mutex_);
GPR_ASSERT(fd_node->readable_registered);
CHECK(fd_node->readable_registered);
fd_node->readable_registered = false;
GRPC_ARES_RESOLVER_TRACE_LOG("OnReadable: fd: %d; request: %p; status: %s",
fd_node->as, this, status.ToString().c_str());
@ -532,7 +533,7 @@ void AresResolver::OnReadable(FdNode* fd_node, absl::Status status) {
void AresResolver::OnWritable(FdNode* fd_node, absl::Status status) {
grpc_core::MutexLock lock(&mutex_);
GPR_ASSERT(fd_node->writable_registered);
CHECK(fd_node->writable_registered);
fd_node->writable_registered = false;
GRPC_ARES_RESOLVER_TRACE_LOG("OnWritable: fd: %d; request:%p; status: %s",
fd_node->as, this, status.ToString().c_str());
@ -582,7 +583,7 @@ void AresResolver::OnHostbynameDoneLocked(void* arg, int status,
int /*timeouts*/,
struct hostent* hostent) {
auto* hostname_qa = static_cast<HostnameQueryArg*>(arg);
GPR_ASSERT(hostname_qa->pending_requests-- > 0);
CHECK_GT(hostname_qa->pending_requests--, 0);
auto* ares_resolver = hostname_qa->ares_resolver;
if (status != ARES_SUCCESS) {
std::string error_msg =
@ -643,9 +644,9 @@ void AresResolver::OnHostbynameDoneLocked(void* arg, int status,
if (hostname_qa->pending_requests == 0) {
auto nh =
ares_resolver->callback_map_.extract(hostname_qa->callback_map_id);
GPR_ASSERT(!nh.empty());
GPR_ASSERT(absl::holds_alternative<
EventEngine::DNSResolver::LookupHostnameCallback>(nh.mapped()));
CHECK(!nh.empty());
CHECK(absl::holds_alternative<
EventEngine::DNSResolver::LookupHostnameCallback>(nh.mapped()));
auto callback = absl::get<EventEngine::DNSResolver::LookupHostnameCallback>(
std::move(nh.mapped()));
if (!hostname_qa->result.empty() || hostname_qa->error_status.ok()) {
@ -670,10 +671,9 @@ void AresResolver::OnSRVQueryDoneLocked(void* arg, int status, int /*timeouts*/,
std::unique_ptr<QueryArg> qa(static_cast<QueryArg*>(arg));
auto* ares_resolver = qa->ares_resolver;
auto nh = ares_resolver->callback_map_.extract(qa->callback_map_id);
GPR_ASSERT(!nh.empty());
GPR_ASSERT(
absl::holds_alternative<EventEngine::DNSResolver::LookupSRVCallback>(
nh.mapped()));
CHECK(!nh.empty());
CHECK(absl::holds_alternative<EventEngine::DNSResolver::LookupSRVCallback>(
nh.mapped()));
auto callback = absl::get<EventEngine::DNSResolver::LookupSRVCallback>(
std::move(nh.mapped()));
auto fail = [&](absl::string_view prefix) {
@ -726,10 +726,9 @@ void AresResolver::OnTXTDoneLocked(void* arg, int status, int /*timeouts*/,
std::unique_ptr<QueryArg> qa(static_cast<QueryArg*>(arg));
auto* ares_resolver = qa->ares_resolver;
auto nh = ares_resolver->callback_map_.extract(qa->callback_map_id);
GPR_ASSERT(!nh.empty());
GPR_ASSERT(
absl::holds_alternative<EventEngine::DNSResolver::LookupTXTCallback>(
nh.mapped()));
CHECK(!nh.empty());
CHECK(absl::holds_alternative<EventEngine::DNSResolver::LookupTXTCallback>(
nh.mapped()));
auto callback = absl::get<EventEngine::DNSResolver::LookupTXTCallback>(
std::move(nh.mapped()));
auto fail = [&](absl::string_view prefix) {

4
src/core/lib/event_engine/cf_engine/cf_engine.cc
Unescape View File

@ -20,6 +20,8 @@
#include <CoreFoundation/CoreFoundation.h>
#include "absl/log/check.h"
#include <grpc/support/cpu.h>
#include "src/core/lib/event_engine/cf_engine/cf_engine.h"
@ -68,7 +70,7 @@ CFEventEngine::~CFEventEngine() {
HandleToString(handle).c_str());
}
}
GPR_ASSERT(GPR_LIKELY(known_handles_.empty()));
CHECK(GPR_LIKELY(known_handles_.empty()));
timer_manager_.Shutdown();
}
thread_pool_->Quiesce();

3
src/core/lib/event_engine/cf_engine/dns_service_resolver.cc
Unescape View File

@ -18,6 +18,7 @@
#include <AvailabilityMacros.h>
#ifdef AVAILABLE_MAC_OS_X_VERSION_10_12_AND_LATER
#include "absl/log/check.h"
#include "absl/strings/str_cat.h"
#include "absl/strings/str_format.h"
@ -153,7 +154,7 @@ void DNSServiceResolverImpl::ResolveCallback(
grpc_core::ReleasableMutexLock lock(&that->request_mu_);
auto request_it = that->requests_.find(sdRef);
GPR_ASSERT(request_it != that->requests_.end());
CHECK(request_it != that->requests_.end());
if (errorCode != kDNSServiceErr_NoError &&
errorCode != kDNSServiceErr_NoSuchRecord) {

3
src/core/lib/event_engine/cf_engine/dns_service_resolver.h
Unescape View File

@ -23,6 +23,7 @@
#include <dns_sd.h>
#include "absl/container/flat_hash_map.h"
#include "absl/log/check.h"
#include <grpc/event_engine/event_engine.h>
@ -47,7 +48,7 @@ class DNSServiceResolverImpl
explicit DNSServiceResolverImpl(std::shared_ptr<CFEventEngine> engine)
: engine_(std::move((engine))) {}
~DNSServiceResolverImpl() override {
GPR_ASSERT(requests_.empty());
CHECK(requests_.empty());
dispatch_release(queue_);
}

10
src/core/lib/event_engine/forkable.cc
Unescape View File

@ -14,6 +14,8 @@
#include "src/core/lib/event_engine/forkable.h"
#include "absl/log/check.h"
#include <grpc/support/log.h>
#include <grpc/support/port_platform.h>
@ -43,7 +45,7 @@ void ObjectGroupForkHandler::RegisterForkable(
std::shared_ptr<Forkable> forkable, GRPC_UNUSED void (*prepare)(void),
GRPC_UNUSED void (*parent)(void), GRPC_UNUSED void (*child)(void)) {
if (IsForkEnabled()) {
GPR_ASSERT(!is_forking_);
CHECK(!is_forking_);
forkables_.emplace_back(forkable);
#ifdef GRPC_POSIX_FORK_ALLOW_PTHREAD_ATFORK
if (!std::exchange(registered_, true)) {
@ -55,7 +57,7 @@ void ObjectGroupForkHandler::RegisterForkable(
void ObjectGroupForkHandler::Prefork() {
if (IsForkEnabled()) {
GPR_ASSERT(!std::exchange(is_forking_, true));
CHECK(!std::exchange(is_forking_, true));
GRPC_FORK_TRACE_LOG_STRING("PrepareFork");
for (auto it = forkables_.begin(); it != forkables_.end();) {
auto shared = it->lock();
@ -71,7 +73,7 @@ void ObjectGroupForkHandler::Prefork() {
void ObjectGroupForkHandler::PostforkParent() {
if (IsForkEnabled()) {
GPR_ASSERT(is_forking_);
CHECK(is_forking_);
GRPC_FORK_TRACE_LOG_STRING("PostforkParent");
for (auto it = forkables_.begin(); it != forkables_.end();) {
auto shared = it->lock();
@ -88,7 +90,7 @@ void ObjectGroupForkHandler::PostforkParent() {
void ObjectGroupForkHandler::PostforkChild() {
if (IsForkEnabled()) {
GPR_ASSERT(is_forking_);
CHECK(is_forking_);
GRPC_FORK_TRACE_LOG_STRING("PostforkChild");
for (auto it = forkables_.begin(); it != forkables_.end();) {
auto shared = it->lock();

13
src/core/lib/event_engine/posix_engine/ev_epoll1_linux.cc
Unescape View File

@ -18,6 +18,7 @@
#include <atomic>
#include <memory>
#include "absl/log/check.h"
#include "absl/status/status.h"
#include "absl/status/statusor.h"
#include "absl/strings/str_format.h"
@ -353,14 +354,14 @@ Epoll1Poller::Epoll1Poller(Scheduler* scheduler)
: scheduler_(scheduler), was_kicked_(false), closed_(false) {
g_epoll_set_.epfd = EpollCreateAndCloexec();
wakeup_fd_ = *CreateWakeupFd();
GPR_ASSERT(wakeup_fd_ != nullptr);
GPR_ASSERT(g_epoll_set_.epfd >= 0);
CHECK(wakeup_fd_ != nullptr);
CHECK_GE(g_epoll_set_.epfd, 0);
gpr_log(GPR_INFO, "grpc epoll fd: %d", g_epoll_set_.epfd);
struct epoll_event ev;
ev.events = static_cast<uint32_t>(EPOLLIN | EPOLLET);
ev.data.ptr = wakeup_fd_.get();
GPR_ASSERT(epoll_ctl(g_epoll_set_.epfd, EPOLL_CTL_ADD, wakeup_fd_->ReadFd(),
&ev) == 0);
CHECK(epoll_ctl(g_epoll_set_.epfd, EPOLL_CTL_ADD, wakeup_fd_->ReadFd(),
&ev) == 0);
g_epoll_set_.num_events = 0;
g_epoll_set_.cursor = 0;
ForkPollerListAddPoller(this);
@ -438,7 +439,7 @@ bool Epoll1Poller::ProcessEpollEvents(int max_epoll_events_to_handle,
struct epoll_event* ev = &g_epoll_set_.events[c];
void* data_ptr = ev->data.ptr;
if (data_ptr == wakeup_fd_.get()) {
GPR_ASSERT(wakeup_fd_->ConsumeWakeup().ok());
CHECK(wakeup_fd_->ConsumeWakeup().ok());
was_kicked = true;
} else {
Epoll1EventHandle* handle = reinterpret_cast<Epoll1EventHandle*>(
@ -557,7 +558,7 @@ void Epoll1Poller::Kick() {
return;
}
was_kicked_ = true;
GPR_ASSERT(wakeup_fd_->Wakeup().ok());
CHECK(wakeup_fd_->Wakeup().ok());
}
std::shared_ptr<Epoll1Poller> MakeEpoll1Poller(Scheduler* scheduler) {

19
src/core/lib/event_engine/posix_engine/ev_poll_posix.cc
Unescape View File

@ -23,6 +23,7 @@
#include "absl/container/inlined_vector.h"
#include "absl/functional/any_invocable.h"
#include "absl/log/check.h"
#include "absl/status/status.h"
#include "absl/status/statusor.h"
#include "absl/strings/str_format.h"
@ -339,7 +340,7 @@ EventHandle* PollPoller::CreateHandle(int fd, absl::string_view /*name*/,
bool track_err) {
// Avoid unused-parameter warning for debug-only parameter
(void)track_err;
GPR_DEBUG_ASSERT(track_err == false);
DCHECK(track_err == false);
PollEventHandle* handle = new PollEventHandle(fd, shared_from_this());
ForkFdListAddHandle(handle);
// We need to send a kick to the thread executing Work(..) so that it can
@ -359,7 +360,7 @@ void PollEventHandle::OrphanHandle(PosixEngineClosure* on_done, int* release_fd,
if (release_fd != nullptr) {
*release_fd = fd_;
}
GPR_ASSERT(!is_orphaned_);
CHECK(!is_orphaned_);
is_orphaned_ = true;
// Perform shutdown operations if not already done so.
if (!is_shutdown_) {
@ -573,7 +574,7 @@ void PollPoller::KickExternal(bool ext) {
}
was_kicked_ = true;
was_kicked_ext_ = ext;
GPR_ASSERT(wakeup_fd_->Wakeup().ok());
CHECK(wakeup_fd_->Wakeup().ok());
}
void PollPoller::Kick() { KickExternal(true); }
@ -612,7 +613,7 @@ PollPoller::PollPoller(Scheduler* scheduler)
poll_handles_list_head_(nullptr),
closed_(false) {
wakeup_fd_ = *CreateWakeupFd();
GPR_ASSERT(wakeup_fd_ != nullptr);
CHECK(wakeup_fd_ != nullptr);
ForkPollerListAddPoller(this);
}
@ -625,15 +626,15 @@ PollPoller::PollPoller(Scheduler* scheduler, bool use_phony_poll)
poll_handles_list_head_(nullptr),
closed_(false) {
wakeup_fd_ = *CreateWakeupFd();
GPR_ASSERT(wakeup_fd_ != nullptr);
CHECK(wakeup_fd_ != nullptr);
ForkPollerListAddPoller(this);
}
PollPoller::~PollPoller() {
// Assert that no active handles are present at the time of destruction.
// They should have been orphaned before reaching this state.
GPR_ASSERT(num_poll_handles_ == 0);
GPR_ASSERT(poll_handles_list_head_ == nullptr);
CHECK_EQ(num_poll_handles_, 0);
CHECK_EQ(poll_handles_list_head_, nullptr);
}
Poller::WorkResult PollPoller::Work(
@ -685,7 +686,7 @@ Poller::WorkResult PollPoller::Work(
// There shouldn't be any orphaned fds at this point. This is because
// prior to marking a handle as orphaned it is first removed from
// poll handle list for the poller under the poller lock.
GPR_ASSERT(!head->IsOrphaned());
CHECK(!head->IsOrphaned());
if (!head->IsPollhup()) {
pfds[pfd_count].fd = head->WrappedFd();
watchers[pfd_count] = head;
@ -761,7 +762,7 @@ Poller::WorkResult PollPoller::Work(
}
} else {
if (pfds[0].revents & kPollinCheck) {
GPR_ASSERT(wakeup_fd_->ConsumeWakeup().ok());
CHECK(wakeup_fd_->ConsumeWakeup().ok());
}
for (i = 1; i < pfd_count; i++) {
PollEventHandle* head = watchers[i];

3
src/core/lib/event_engine/posix_engine/lockfree_event.cc
Unescape View File

@ -16,6 +16,7 @@
#include <atomic>
#include <cstdint>
#include "absl/log/check.h"
#include "absl/status/status.h"
#include <grpc/support/atm.h>
@ -78,7 +79,7 @@ void LockfreeEvent::DestroyEvent() {
if (curr & kShutdownBit) {
grpc_core::internal::StatusFreeHeapPtr(curr & ~kShutdownBit);
} else {
GPR_ASSERT(curr == kClosureNotReady || curr == kClosureReady);
CHECK(curr == kClosureNotReady || curr == kClosureReady);
}
// we CAS in a shutdown, no error value here. If this event is interacted
// with post-deletion (see the note in the constructor) we want the bit

46
src/core/lib/event_engine/posix_engine/posix_endpoint.cc
Unescape View File

@ -26,6 +26,7 @@
#include <type_traits>
#include "absl/functional/any_invocable.h"
#include "absl/log/check.h"
#include "absl/status/status.h"
#include "absl/status/statusor.h"
#include "absl/strings/str_cat.h"
@ -245,7 +246,7 @@ msg_iovlen_type TcpZerocopySendRecord::PopulateIovs(size_t* unwind_slice_idx,
++(out_offset_.slice_idx);
out_offset_.byte_idx = 0;
}
GPR_DEBUG_ASSERT(iov_size > 0);
DCHECK_GT(iov_size, 0u);
return iov_size;
}
@ -314,8 +315,8 @@ bool PosixEndpointImpl::TcpDoRead(absl::Status& status) {
iov[i].iov_len = slice.length();
}
GPR_ASSERT(incoming_buffer_->Length() != 0);
GPR_DEBUG_ASSERT(min_progress_size_ > 0);
CHECK_NE(incoming_buffer_->Length(), 0u);
DCHECK_GT(min_progress_size_, 0);
do {
// Assume there is something on the queue. If we receive TCP_INQ from
@ -371,12 +372,11 @@ bool PosixEndpointImpl::TcpDoRead(absl::Status& status) {
}
AddToEstimate(static_cast<size_t>(read_bytes));
GPR_DEBUG_ASSERT((size_t)read_bytes <=
incoming_buffer_->Length() - total_read_bytes);
DCHECK((size_t)read_bytes <= incoming_buffer_->Length() - total_read_bytes);
#ifdef GRPC_HAVE_TCP_INQ
if (inq_capable_) {
GPR_DEBUG_ASSERT(!(msg.msg_flags & MSG_CTRUNC));
DCHECK(!(msg.msg_flags & MSG_CTRUNC));
struct cmsghdr* cmsg = CMSG_FIRSTHDR(&msg);
for (; cmsg != nullptr; cmsg = CMSG_NXTHDR(&msg, cmsg)) {
if (cmsg->cmsg_level == SOL_TCP && cmsg->cmsg_type == TCP_CM_INQ &&
@ -419,7 +419,7 @@ bool PosixEndpointImpl::TcpDoRead(absl::Status& status) {
FinishEstimate();
}
GPR_DEBUG_ASSERT(total_read_bytes > 0);
DCHECK_GT(total_read_bytes, 0u);
status = absl::OkStatus();
if (grpc_core::IsTcpFrameSizeTuningEnabled()) {
// Update min progress size based on the total number of bytes read in
@ -595,7 +595,7 @@ bool PosixEndpointImpl::Read(absl::AnyInvocable<void(absl::Status)> on_read,
const EventEngine::Endpoint::ReadArgs* args) {
grpc_core::ReleasableMutexLock lock(&read_mu_);
GRPC_EVENT_ENGINE_ENDPOINT_TRACE("Endpoint[%p]: Read", this);
GPR_ASSERT(read_cb_ == nullptr);
CHECK(read_cb_ == nullptr);
incoming_buffer_ = buffer;
incoming_buffer_->Clear();
incoming_buffer_->Swap(last_read_buffer_);
@ -670,8 +670,8 @@ TcpZerocopySendRecord* PosixEndpointImpl::TcpGetSendZerocopyRecord(
}
if (zerocopy_send_record != nullptr) {
zerocopy_send_record->PrepareForSends(buf);
GPR_DEBUG_ASSERT(buf.Count() == 0);
GPR_DEBUG_ASSERT(buf.Length() == 0);
DCHECK_EQ(buf.Count(), 0u);
DCHECK_EQ(buf.Length(), 0u);
outgoing_byte_idx_ = 0;
outgoing_buffer_ = nullptr;
}
@ -758,10 +758,10 @@ void PosixEndpointImpl::ZerocopyDisableAndWaitForRemaining() {
// Reads \a cmsg to process zerocopy control messages.
void PosixEndpointImpl::ProcessZerocopy(struct cmsghdr* cmsg) {
GPR_DEBUG_ASSERT(cmsg);
DCHECK(cmsg);
auto serr = reinterpret_cast<struct sock_extended_err*>(CMSG_DATA(cmsg));
GPR_DEBUG_ASSERT(serr->ee_errno == 0);
GPR_DEBUG_ASSERT(serr->ee_origin == SO_EE_ORIGIN_ZEROCOPY);
DCHECK_EQ(serr->ee_errno, 0u);
DCHECK(serr->ee_origin == SO_EE_ORIGIN_ZEROCOPY);
const uint32_t lo = serr->ee_info;
const uint32_t hi = serr->ee_data;
for (uint32_t seq = lo; seq <= hi; ++seq) {
@ -771,7 +771,7 @@ void PosixEndpointImpl::ProcessZerocopy(struct cmsghdr* cmsg) {
// both; if so, batch the unref/put.
TcpZerocopySendRecord* record =
tcp_zerocopy_send_ctx_->ReleaseSendRecord(seq);
GPR_DEBUG_ASSERT(record);
DCHECK(record);
UnrefMaybePutZerocopySendRecord(record);
}
if (tcp_zerocopy_send_ctx_->UpdateZeroCopyOptMemStateAfterFree()) {
@ -1057,7 +1057,7 @@ bool PosixEndpointImpl::TcpFlush(absl::Status& status) {
outgoing_slice_idx++;
outgoing_byte_idx_ = 0;
}
GPR_ASSERT(iov_size > 0);
CHECK_GT(iov_size, 0u);
msg.msg_name = nullptr;
msg.msg_namelen = 0;
@ -1100,7 +1100,7 @@ bool PosixEndpointImpl::TcpFlush(absl::Status& status) {
}
}
GPR_ASSERT(outgoing_byte_idx_ == 0);
CHECK_EQ(outgoing_byte_idx_, 0u);
bytes_counter_ += sent_length;
trailing = sending_length - static_cast<size_t>(sent_length);
while (trailing > 0) {
@ -1139,7 +1139,7 @@ void PosixEndpointImpl::HandleWrite(absl::Status status) {
? TcpFlushZerocopy(current_zerocopy_send_, status)
: TcpFlush(status);
if (!flush_result) {
GPR_DEBUG_ASSERT(status.ok());
DCHECK(status.ok());
handle_->NotifyOnWrite(on_write_);
} else {
GRPC_EVENT_ENGINE_ENDPOINT_TRACE("Endpoint[%p]: Write complete: %s", this,
@ -1158,9 +1158,9 @@ bool PosixEndpointImpl::Write(
absl::Status status = absl::OkStatus();
TcpZerocopySendRecord* zerocopy_send_record = nullptr;
GPR_ASSERT(write_cb_ == nullptr);
GPR_DEBUG_ASSERT(current_zerocopy_send_ == nullptr);
GPR_DEBUG_ASSERT(data != nullptr);
CHECK(write_cb_ == nullptr);
DCHECK_EQ(current_zerocopy_send_, nullptr);
DCHECK_NE(data, nullptr);
GRPC_EVENT_ENGINE_ENDPOINT_TRACE("Endpoint[%p]: Write %" PRIdPTR " bytes",
this, data->Length());
@ -1191,7 +1191,7 @@ bool PosixEndpointImpl::Write(
outgoing_buffer_arg_ = args->google_specific;
}
if (outgoing_buffer_arg_) {
GPR_ASSERT(poller_->CanTrackErrors());
CHECK(poller_->CanTrackErrors());
}
bool flush_result = zerocopy_send_record != nullptr
@ -1266,7 +1266,7 @@ PosixEndpointImpl::PosixEndpointImpl(EventHandle* handle,
engine_(engine) {
PosixSocketWrapper sock(handle->WrappedFd());
fd_ = handle_->WrappedFd();
GPR_ASSERT(options.resource_quota != nullptr);
CHECK(options.resource_quota != nullptr);
auto peer_addr_string = sock.PeerAddressString();
mem_quota_ = options.resource_quota->memory_quota();
memory_owner_ = mem_quota_->CreateMemoryOwner();
@ -1348,7 +1348,7 @@ std::unique_ptr<PosixEndpoint> CreatePosixEndpoint(
EventHandle* handle, PosixEngineClosure* on_shutdown,
std::shared_ptr<EventEngine> engine, MemoryAllocator&& allocator,
const PosixTcpOptions& options) {
GPR_DEBUG_ASSERT(handle != nullptr);
DCHECK_NE(handle, nullptr);
return std::make_unique<PosixEndpoint>(handle, on_shutdown, std::move(engine),
std::move(allocator), options);
}

22
src/core/lib/event_engine/posix_engine/posix_endpoint.h
Unescape View File

@ -29,6 +29,7 @@
#include "absl/container/flat_hash_map.h"
#include "absl/functional/any_invocable.h"
#include "absl/hash/hash.h"
#include "absl/log/check.h"
#include "absl/status/status.h"
#include "absl/status/statusor.h"
@ -130,7 +131,7 @@ class TcpZerocopySendRecord {
// sendmsg() failed or when tcp_write() is done.
bool Unref() {
const intptr_t prior = ref_.fetch_sub(1, std::memory_order_acq_rel);
GPR_DEBUG_ASSERT(prior > 0);
DCHECK_GT(prior, 0);
if (prior == 1) {
AllSendsComplete();
return true;
@ -145,9 +146,9 @@ class TcpZerocopySendRecord {
};
void DebugAssertEmpty() {
GPR_DEBUG_ASSERT(buf_.Count() == 0);
GPR_DEBUG_ASSERT(buf_.Length() == 0);
GPR_DEBUG_ASSERT(ref_.load(std::memory_order_relaxed) == 0);
DCHECK_EQ(buf_.Count(), 0u);
DCHECK_EQ(buf_.Length(), 0u);
DCHECK_EQ(ref_.load(std::memory_order_relaxed), 0);
}
// When all sendmsg() calls associated with this tcp_write() have been
@ -155,7 +156,7 @@ class TcpZerocopySendRecord {
// for each sendmsg()) and all reference counts have been dropped, drop our
// reference to the underlying data since we no longer need it.
void AllSendsComplete() {
GPR_DEBUG_ASSERT(ref_.load(std::memory_order_relaxed) == 0);
DCHECK_EQ(ref_.load(std::memory_order_relaxed), 0);
buf_.Clear();
}
@ -236,7 +237,7 @@ class TcpZerocopySendCtx {
--last_send_;
if (ReleaseSendRecord(last_send_)->Unref()) {
// We should still be holding the ref taken by tcp_write().
GPR_DEBUG_ASSERT(0);
DCHECK(0);
}
}
@ -274,8 +275,7 @@ class TcpZerocopySendCtx {
// same time.
void PutSendRecord(TcpZerocopySendRecord* record) {
grpc_core::MutexLock lock(&mu_);
GPR_DEBUG_ASSERT(record >= send_records_ &&
record < send_records_ + max_sends_);
DCHECK(record >= send_records_ && record < send_records_ + max_sends_);
PutSendRecordLocked(record);
}
@ -332,7 +332,7 @@ class TcpZerocopySendCtx {
zcopy_enobuf_state_ = OptMemState::kCheck;
return false;
}
GPR_DEBUG_ASSERT(zcopy_enobuf_state_ != OptMemState::kCheck);
DCHECK(zcopy_enobuf_state_ != OptMemState::kCheck);
if (zcopy_enobuf_state_ == OptMemState::kFull) {
// A previous sendmsg attempt was blocked by ENOBUFS. Return true to
// mark the fd as writable so the next write attempt could be made.
@ -423,7 +423,7 @@ class TcpZerocopySendCtx {
TcpZerocopySendRecord* ReleaseSendRecordLocked(uint32_t seq)
ABSL_EXCLUSIVE_LOCKS_REQUIRED(mu_) {
auto iter = ctx_lookup_.find(seq);
GPR_DEBUG_ASSERT(iter != ctx_lookup_.end());
DCHECK(iter != ctx_lookup_.end());
TcpZerocopySendRecord* record = iter->second;
ctx_lookup_.erase(iter);
return record;
@ -443,7 +443,7 @@ class TcpZerocopySendCtx {
void PutSendRecordLocked(TcpZerocopySendRecord* record)
ABSL_EXCLUSIVE_LOCKS_REQUIRED(mu_) {
GPR_DEBUG_ASSERT(free_send_records_size_ < max_sends_);
DCHECK(free_send_records_size_ < max_sends_);
free_send_records_[free_send_records_size_] = record;
free_send_records_size_++;
}

17
src/core/lib/event_engine/posix_engine/posix_engine.cc
Unescape View File

@ -25,6 +25,7 @@
#include "absl/cleanup/cleanup.h"
#include "absl/functional/any_invocable.h"
#include "absl/log/check.h"
#include "absl/status/status.h"
#include "absl/strings/match.h"
#include "absl/strings/str_cat.h"
@ -142,7 +143,7 @@ void AsyncConnect::OnWritable(absl::Status status)
absl::StatusOr<std::unique_ptr<EventEngine::Endpoint>> ep;
mu_.Lock();
GPR_ASSERT(fd_ != nullptr);
CHECK_NE(fd_, nullptr);
fd = std::exchange(fd_, nullptr);
bool connect_cancelled = connect_cancelled_;
if (fd->IsHandleShutdown() && status.ok()) {
@ -334,7 +335,7 @@ PosixEnginePollerManager::PosixEnginePollerManager(
poller_state_(PollerState::kExternal),
executor_(nullptr),
trigger_shutdown_called_(false) {
GPR_DEBUG_ASSERT(poller_ != nullptr);
DCHECK_NE(poller_, nullptr);
}
void PosixEnginePollerManager::Run(
@ -351,7 +352,7 @@ void PosixEnginePollerManager::Run(absl::AnyInvocable<void()> cb) {
}
void PosixEnginePollerManager::TriggerShutdown() {
GPR_DEBUG_ASSERT(trigger_shutdown_called_ == false);
DCHECK(trigger_shutdown_called_ == false);
trigger_shutdown_called_ = true;
// If the poller is external, dont try to shut it down. Otherwise
// set poller state to PollerState::kShuttingDown.
@ -467,7 +468,7 @@ PosixEventEngine::~PosixEventEngine() {
this, HandleToString(handle).c_str());
}
}
GPR_ASSERT(GPR_LIKELY(known_handles_.empty()));
CHECK(GPR_LIKELY(known_handles_.empty()));
}
timer_manager_->Shutdown();
#if GRPC_PLATFORM_SUPPORTS_POSIX_POLLING
@ -592,7 +593,7 @@ bool PosixEventEngine::CancelConnect(EventEngine::ConnectionHandle handle) {
auto it = shard->pending_connections.find(connection_handle);
if (it != shard->pending_connections.end()) {
ac = it->second;
GPR_ASSERT(ac != nullptr);
CHECK_NE(ac, nullptr);
// Trying to acquire ac->mu here would could cause a deadlock because
// the OnWritable method tries to acquire the two mutexes used
// here in the reverse order. But we dont need to acquire ac->mu before
@ -639,7 +640,7 @@ EventEngine::ConnectionHandle PosixEventEngine::Connect(
const EndpointConfig& args, MemoryAllocator memory_allocator,
Duration timeout) {
#if GRPC_PLATFORM_SUPPORTS_POSIX_POLLING
GPR_ASSERT(poller_manager_ != nullptr);
CHECK_NE(poller_manager_, nullptr);
PosixTcpOptions options = TcpOptionsFromEndpointConfig(args);
absl::StatusOr<PosixSocketWrapper::PosixSocketCreateResult> socket =
PosixSocketWrapper::CreateAndPrepareTcpClientSocket(options, addr);
@ -661,9 +662,9 @@ PosixEventEngine::CreatePosixEndpointFromFd(int fd,
const EndpointConfig& config,
MemoryAllocator memory_allocator) {
#if GRPC_PLATFORM_SUPPORTS_POSIX_POLLING
GPR_DEBUG_ASSERT(fd > 0);
DCHECK_GT(fd, 0);
PosixEventPoller* poller = poller_manager_->Poller();
GPR_DEBUG_ASSERT(poller != nullptr);
DCHECK_NE(poller, nullptr);
EventHandle* handle =
poller->CreateHandle(fd, "tcp-client", poller->CanTrackErrors());
return CreatePosixEndpoint(handle, nullptr, shared_from_this(),

5
src/core/lib/event_engine/posix_engine/posix_engine_listener.cc
Unescape View File

@ -31,6 +31,7 @@
#include <utility>
#include "absl/functional/any_invocable.h"
#include "absl/log/check.h"
#include "absl/status/status.h"
#include "absl/strings/str_cat.h"
#include "absl/types/optional.h"
@ -79,7 +80,7 @@ absl::StatusOr<int> PosixEngineListenerImpl::Bind(
EventEngine::ResolvedAddress res_addr = addr;
EventEngine::ResolvedAddress addr6_v4mapped;
int requested_port = ResolvedAddressGetPort(res_addr);
GPR_ASSERT(addr.size() <= EventEngine::ResolvedAddress::MAX_SIZE_BYTES);
CHECK(addr.size() <= EventEngine::ResolvedAddress::MAX_SIZE_BYTES);
UnlinkIfUnixDomainSocket(addr);
/// Check if this is a wildcard port, and if so, try to keep the port the same
@ -303,7 +304,7 @@ void PosixEngineListenerImpl::AsyncConnectionAcceptor::Shutdown() {
absl::Status PosixEngineListenerImpl::Start() {
grpc_core::MutexLock lock(&this->mu_);
// Start each asynchronous acceptor.
GPR_ASSERT(!this->started_);
CHECK(!this->started_);
this->started_ = true;
for (auto it = acceptors_.begin(); it != acceptors_.end(); it++) {
(*it)->Start();

9
src/core/lib/event_engine/posix_engine/posix_engine_listener_utils.cc
Unescape View File

@ -22,6 +22,7 @@
#include <string>
#include "absl/cleanup/cleanup.h"
#include "absl/log/check.h"
#include "absl/status/status.h"
#include "absl/strings/str_cat.h"
#include "absl/strings/str_replace.h"
@ -137,7 +138,7 @@ absl::Status PrepareSocket(const PosixTcpOptions& options,
ListenerSocket& socket) {
ResolvedAddress sockname_temp;
int fd = socket.sock.Fd();
GPR_ASSERT(fd >= 0);
CHECK_GE(fd, 0);
bool close_fd = true;
socket.zero_copy_enabled = false;
socket.port = 0;
@ -226,7 +227,7 @@ absl::StatusOr<ListenerSocket> CreateAndPrepareListenerSocket(
socket.addr = addr;
}
GRPC_RETURN_IF_ERROR(PrepareSocket(options, socket));
GPR_ASSERT(socket.port > 0);
CHECK_GT(socket.port, 0);
return socket;
}
@ -359,8 +360,8 @@ absl::StatusOr<int> ListenerContainerAddWildcardAddresses(
}
return assigned_port;
} else {
GPR_ASSERT(!v6_sock.ok());
GPR_ASSERT(!v4_sock.ok());
CHECK(!v6_sock.ok());
CHECK(!v4_sock.ok());
return absl::FailedPreconditionError(absl::StrCat(
"Failed to add any wildcard listeners: ", v6_sock.status().message(),
v4_sock.status().message()));

3
src/core/lib/event_engine/posix_engine/tcp_socket_utils.cc
Unescape View File

@ -48,6 +48,7 @@
#include <atomic>
#include <cstring>
#include "absl/log/check.h"
#include "absl/status/status.h"
#include <grpc/support/log.h>
@ -662,7 +663,7 @@ void PosixSocketWrapper::TrySetSocketTcpUserTimeout(
// Set a socket using a grpc_socket_mutator
absl::Status PosixSocketWrapper::SetSocketMutator(
grpc_fd_usage usage, grpc_socket_mutator* mutator) {
GPR_ASSERT(mutator);
CHECK(mutator);
if (!grpc_socket_mutator_mutate_fd(mutator, fd_, usage)) {
return absl::Status(absl::StatusCode::kInternal,
"grpc_socket_mutator failed.");

3
src/core/lib/event_engine/posix_engine/tcp_socket_utils.h
Unescape View File

@ -19,6 +19,7 @@
#include <string>
#include <utility>
#include "absl/log/check.h"
#include "absl/status/status.h"
#include "absl/status/statusor.h"
@ -161,7 +162,7 @@ void UnlinkIfUnixDomainSocket(
class PosixSocketWrapper {
public:
explicit PosixSocketWrapper(int fd) : fd_(fd) { GPR_ASSERT(fd_ > 0); }
explicit PosixSocketWrapper(int fd) : fd_(fd) { CHECK_GT(fd_, 0); }
PosixSocketWrapper() : fd_(-1){};

7
src/core/lib/event_engine/posix_engine/timer_manager.cc
Unescape View File

@ -21,6 +21,7 @@
#include <memory>
#include <utility>
#include "absl/log/check.h"
#include "absl/time/time.h"
#include "absl/types/optional.h"
@ -68,8 +69,8 @@ void TimerManager::MainLoop() {
grpc_core::Timestamp next = grpc_core::Timestamp::InfFuture();
absl::optional<std::vector<experimental::EventEngine::Closure*>>
check_result = timer_list_->TimerCheck(&next);
GPR_ASSERT(check_result.has_value() &&
"ERROR: More than one MainLoop is running.");
CHECK(check_result.has_value())
<< "ERROR: More than one MainLoop is running.";
bool timers_found = !check_result->empty();
if (timers_found) {
RunSomeTimers(std::move(*check_result));
@ -145,7 +146,7 @@ void TimerManager::Kick() {
void TimerManager::RestartPostFork() {
grpc_core::MutexLock lock(&mu_);
GPR_ASSERT(GPR_LIKELY(shutdown_));
CHECK(GPR_LIKELY(shutdown_));
if (grpc_event_engine_timer_trace.enabled()) {
gpr_log(GPR_DEBUG, "TimerManager::%p restarting after shutdown", this);
}

6
src/core/lib/event_engine/resolved_address.cc
Unescape View File

@ -16,6 +16,8 @@
#include <string.h>
#include "absl/log/check.h"
#include <grpc/event_engine/event_engine.h>
#include <grpc/support/log.h>
#include <grpc/support/port_platform.h>
@ -30,8 +32,8 @@ namespace experimental {
EventEngine::ResolvedAddress::ResolvedAddress(const sockaddr* address,
socklen_t size)
: size_(size) {
GPR_DEBUG_ASSERT(size >= 0);
GPR_ASSERT(static_cast<size_t>(size) <= sizeof(address_));
DCHECK_GE(size, 0u);
CHECK(static_cast<size_t>(size) <= sizeof(address_));
memcpy(&address_, address, size);
}

4
src/core/lib/event_engine/slice.cc
Unescape View File

@ -19,6 +19,8 @@
#include <string>
#include <utility>
#include "absl/log/check.h"
#include <grpc/event_engine/slice.h>
#include <grpc/slice.h>
#include <grpc/support/log.h>
@ -48,7 +50,7 @@ Slice CopyConstructors<Slice>::FromCopiedString(std::string s) {
MutableSlice::MutableSlice(const grpc_slice& slice)
: slice_detail::BaseSlice(slice) {
GPR_DEBUG_ASSERT(slice.refcount == nullptr || slice.refcount->IsUnique());
DCHECK(slice.refcount == nullptr || slice.refcount->IsUnique());
}
MutableSlice::~MutableSlice() { grpc_core::CSliceUnref(c_slice()); }

17
src/core/lib/event_engine/tcp_socket_utils.cc
Unescape View File

@ -53,6 +53,7 @@
#include <utility>
#include "absl/log/check.h"
#include "absl/status/status.h"
#include "absl/strings/str_cat.h"
#include "absl/strings/str_format.h"
@ -223,7 +224,7 @@ bool ResolvedAddressIsV4Mapped(
bool ResolvedAddressToV4Mapped(
const EventEngine::ResolvedAddress& resolved_addr,
EventEngine::ResolvedAddress* resolved_addr6_out) {
GPR_ASSERT(&resolved_addr != resolved_addr6_out);
CHECK(&resolved_addr != resolved_addr6_out);
const sockaddr* addr = resolved_addr.address();
sockaddr_in6* addr6_out = const_cast<sockaddr_in6*>(
reinterpret_cast<const sockaddr_in6*>(resolved_addr6_out->address()));
@ -245,7 +246,8 @@ EventEngine::ResolvedAddress ResolvedAddressMakeWild6(int port) {
EventEngine::ResolvedAddress resolved_wild_out;
sockaddr_in6* wild_out = reinterpret_cast<sockaddr_in6*>(
const_cast<sockaddr*>(resolved_wild_out.address()));
GPR_ASSERT(port >= 0 && port < 65536);
CHECK_GE(port, 0);
CHECK_LT(port, 65536);
memset(wild_out, 0, sizeof(sockaddr_in6));
wild_out->sin6_family = AF_INET6;
wild_out->sin6_port = htons(static_cast<uint16_t>(port));
@ -258,7 +260,8 @@ EventEngine::ResolvedAddress ResolvedAddressMakeWild4(int port) {
EventEngine::ResolvedAddress resolved_wild_out;
sockaddr_in* wild_out = reinterpret_cast<sockaddr_in*>(
const_cast<sockaddr*>(resolved_wild_out.address()));
GPR_ASSERT(port >= 0 && port < 65536);
CHECK_GE(port, 0);
CHECK_LT(port, 65536);
memset(wild_out, 0, sizeof(sockaddr_in));
wild_out->sin_family = AF_INET;
wild_out->sin_port = htons(static_cast<uint16_t>(port));
@ -294,12 +297,14 @@ void ResolvedAddressSetPort(EventEngine::ResolvedAddress& resolved_addr,
sockaddr* addr = const_cast<sockaddr*>(resolved_addr.address());
switch (addr->sa_family) {
case AF_INET:
GPR_ASSERT(port >= 0 && port < 65536);
CHECK_GE(port, 0);
CHECK_LT(port, 65536);
(reinterpret_cast<sockaddr_in*>(addr))->sin_port =
htons(static_cast<uint16_t>(port));
return;
case AF_INET6:
GPR_ASSERT(port >= 0 && port < 65536);
CHECK_GE(port, 0);
CHECK_LT(port, 65536);
(reinterpret_cast<sockaddr_in6*>(addr))->sin6_port =
htons(static_cast<uint16_t>(port));
return;
@ -445,7 +450,7 @@ absl::StatusOr<EventEngine::ResolvedAddress> URIToResolvedAddress(
uri.status().ToString().c_str());
}
GRPC_RETURN_IF_ERROR(uri.status());
GPR_ASSERT(grpc_parse_uri(*uri, &addr));
CHECK(grpc_parse_uri(*uri, &addr));
return EventEngine::ResolvedAddress(
reinterpret_cast<const sockaddr*>(addr.addr), addr.len);
}

13
src/core/lib/event_engine/thread_pool/work_stealing_thread_pool.cc
Unescape View File

@ -26,6 +26,7 @@
#include <utility>
#include "absl/functional/any_invocable.h"
#include "absl/log/check.h"
#include "absl/time/clock.h"
#include "absl/time/time.h"
#include "absl/types/optional.h"
@ -183,7 +184,7 @@ WorkStealingThreadPool::WorkStealingThreadPool(size_t reserve_threads)
void WorkStealingThreadPool::Quiesce() { pool_->Quiesce(); }
WorkStealingThreadPool::~WorkStealingThreadPool() {
GPR_ASSERT(pool_->IsQuiesced());
CHECK(pool_->IsQuiesced());
}
void WorkStealingThreadPool::Run(absl::AnyInvocable<void()> callback) {
@ -237,7 +238,7 @@ void WorkStealingThreadPool::WorkStealingThreadPoolImpl::Start() {
void WorkStealingThreadPool::WorkStealingThreadPoolImpl::Run(
EventEngine::Closure* closure) {
GPR_DEBUG_ASSERT(quiesced_.load(std::memory_order_relaxed) == false);
DCHECK(quiesced_.load(std::memory_order_relaxed) == false);
if (g_local_queue != nullptr && g_local_queue->owner() == this) {
g_local_queue->Add(closure);
} else {
@ -280,7 +281,7 @@ void WorkStealingThreadPool::WorkStealingThreadPoolImpl::Quiesce() {
if (!threads_were_shut_down.ok() && g_log_verbose_failures) {
DumpStacksAndCrash();
}
GPR_ASSERT(queue_.Empty());
CHECK(queue_.Empty());
quiesced_.store(true, std::memory_order_relaxed);
lifeguard_.BlockUntilShutdownAndReset();
}
@ -293,14 +294,14 @@ bool WorkStealingThreadPool::WorkStealingThreadPoolImpl::SetThrottled(
void WorkStealingThreadPool::WorkStealingThreadPoolImpl::SetShutdown(
bool is_shutdown) {
auto was_shutdown = shutdown_.exchange(is_shutdown);
GPR_ASSERT(is_shutdown != was_shutdown);
CHECK(is_shutdown != was_shutdown);
work_signal_.SignalAll();
}
void WorkStealingThreadPool::WorkStealingThreadPoolImpl::SetForking(
bool is_forking) {
auto was_forking = forking_.exchange(is_forking);
GPR_ASSERT(is_forking != was_forking);
CHECK(is_forking != was_forking);
}
bool WorkStealingThreadPool::WorkStealingThreadPoolImpl::IsForking() {
@ -507,7 +508,7 @@ void WorkStealingThreadPool::ThreadState::ThreadBody() {
} else if (pool_->IsShutdown()) {
FinishDraining();
}
GPR_ASSERT(g_local_queue->Empty());
CHECK(g_local_queue->Empty());
pool_->theft_registry()->Unenroll(g_local_queue);
delete g_local_queue;
if (g_log_verbose_failures) {

61
src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc
Unescape View File

@ -23,6 +23,7 @@
#include <ares.h>
#include "absl/functional/any_invocable.h"
#include "absl/log/check.h"
#include "absl/status/status.h"
#include "absl/strings/str_format.h"
@ -132,8 +133,8 @@ class GrpcPolledFdWindows : public GrpcPolledFd {
shutdown_called_);
grpc_core::CSliceUnref(read_buf_);
grpc_core::CSliceUnref(write_buf_);
GPR_ASSERT(read_closure_ == nullptr);
GPR_ASSERT(write_closure_ == nullptr);
CHECK(read_closure_ == nullptr);
CHECK(write_closure_ == nullptr);
if (!shutdown_called_) {
winsocket_->Shutdown(DEBUG_LOCATION, "~GrpcPolledFdWindows");
}
@ -141,15 +142,15 @@ class GrpcPolledFdWindows : public GrpcPolledFd {
void RegisterForOnReadableLocked(
absl::AnyInvocable<void(absl::Status)> read_closure) override {
GPR_ASSERT(read_closure_ == nullptr);
CHECK(read_closure_ == nullptr);
read_closure_ = std::move(read_closure);
grpc_core::CSliceUnref(read_buf_);
GPR_ASSERT(!read_buf_has_data_);
CHECK(!read_buf_has_data_);
read_buf_ = GRPC_SLICE_MALLOC(kReadBufferSize);
if (connect_done_) {
ContinueRegisterForOnReadableLocked();
} else {
GPR_ASSERT(pending_continue_register_for_on_readable_locked_ == false);
CHECK(pending_continue_register_for_on_readable_locked_ == false);
pending_continue_register_for_on_readable_locked_ = true;
}
}
@ -160,16 +161,16 @@ class GrpcPolledFdWindows : public GrpcPolledFd {
GRPC_ARES_RESOLVER_TRACE_LOG(
"fd:|%s| RegisterForOnWriteableLocked called", GetName());
} else {
GPR_ASSERT(socket_type_ == SOCK_STREAM);
CHECK(socket_type_ == SOCK_STREAM);
GRPC_ARES_RESOLVER_TRACE_LOG(
"fd:|%s| RegisterForOnWriteableLocked called tcp_write_state_: %d "
"connect_done_: %d",
GetName(), tcp_write_state_, connect_done_);
}
GPR_ASSERT(write_closure_ == nullptr);
CHECK(write_closure_ == nullptr);
write_closure_ = std::move(write_closure);
if (!connect_done_) {
GPR_ASSERT(!pending_continue_register_for_on_writeable_locked_);
CHECK(!pending_continue_register_for_on_writeable_locked_);
pending_continue_register_for_on_writeable_locked_ = true;
} else {
ContinueRegisterForOnWriteableLocked();
@ -179,7 +180,7 @@ class GrpcPolledFdWindows : public GrpcPolledFd {
bool IsFdStillReadableLocked() override { return read_buf_has_data_; }
bool ShutdownLocked(absl::Status error) override {
GPR_ASSERT(!shutdown_called_);
CHECK(!shutdown_called_);
if (!absl::IsCancelled(error)) {
return false;
}
@ -223,7 +224,7 @@ class GrpcPolledFdWindows : public GrpcPolledFd {
// c-ares overloads this recv_from virtual socket function to receive
// data on both UDP and TCP sockets, and from is nullptr for TCP.
if (from != nullptr) {
GPR_ASSERT(*from_len <= recv_from_source_addr_len_);
CHECK(*from_len <= recv_from_source_addr_len_);
memcpy(from, &recv_from_source_addr_, recv_from_source_addr_len_);
*from_len = recv_from_source_addr_len_;
}
@ -291,7 +292,7 @@ class GrpcPolledFdWindows : public GrpcPolledFd {
"fd:|%s| ContinueRegisterForOnReadableLocked "
"wsa_connect_error_:%d",
GetName(), wsa_connect_error_);
GPR_ASSERT(connect_done_);
CHECK(connect_done_);
if (wsa_connect_error_ != 0) {
ScheduleAndNullReadClosure(GRPC_WSA_ERROR(wsa_connect_error_, "connect"));
return;
@ -328,7 +329,7 @@ class GrpcPolledFdWindows : public GrpcPolledFd {
"fd:|%s| ContinueRegisterForOnWriteableLocked "
"wsa_connect_error_:%d",
GetName(), wsa_connect_error_);
GPR_ASSERT(connect_done_);
CHECK(connect_done_);
if (wsa_connect_error_ != 0) {
ScheduleAndNullWriteClosure(
GRPC_WSA_ERROR(wsa_connect_error_, "connect"));
@ -338,7 +339,7 @@ class GrpcPolledFdWindows : public GrpcPolledFd {
ScheduleAndNullWriteClosure(absl::OkStatus());
return;
}
GPR_ASSERT(socket_type_ == SOCK_STREAM);
CHECK(socket_type_ == SOCK_STREAM);
int wsa_error_code = 0;
switch (tcp_write_state_) {
case WRITE_IDLE:
@ -386,7 +387,7 @@ class GrpcPolledFdWindows : public GrpcPolledFd {
// Therefore, the sendv handler for UDP sockets must only attempt
// to write everything inline.
GRPC_ARES_RESOLVER_TRACE_LOG("fd:|%s| SendVUDP called", GetName());
GPR_ASSERT(GRPC_SLICE_LENGTH(write_buf_) == 0);
CHECK_EQ(GRPC_SLICE_LENGTH(write_buf_), 0);
grpc_core::CSliceUnref(write_buf_);
write_buf_ = FlattenIovec(iov, iov_count);
DWORD bytes_sent = 0;
@ -434,12 +435,12 @@ class GrpcPolledFdWindows : public GrpcPolledFd {
// send again. If c-ares still needs to send even more data, we'll get
// to it eventually.
grpc_slice currently_attempted = FlattenIovec(iov, iov_count);
GPR_ASSERT(GRPC_SLICE_LENGTH(currently_attempted) >=
GRPC_SLICE_LENGTH(write_buf_));
CHECK(GRPC_SLICE_LENGTH(currently_attempted) >=
GRPC_SLICE_LENGTH(write_buf_));
ares_ssize_t total_sent = 0;
for (size_t i = 0; i < GRPC_SLICE_LENGTH(write_buf_); i++) {
GPR_ASSERT(GRPC_SLICE_START_PTR(currently_attempted)[i] ==
GRPC_SLICE_START_PTR(write_buf_)[i]);
CHECK(GRPC_SLICE_START_PTR(currently_attempted)[i] ==
GRPC_SLICE_START_PTR(write_buf_)[i]);
total_sent++;
}
grpc_core::CSliceUnref(currently_attempted);
@ -458,9 +459,9 @@ class GrpcPolledFdWindows : public GrpcPolledFd {
" pending_register_for_writeable:%d",
GetName(), pending_continue_register_for_on_readable_locked_,
pending_continue_register_for_on_writeable_locked_);
GPR_ASSERT(!connect_done_);
CHECK(!connect_done_);
connect_done_ = true;
GPR_ASSERT(wsa_connect_error_ == 0);
CHECK_EQ(wsa_connect_error_, 0);
if (shutdown_called_) {
wsa_connect_error_ = WSA_OPERATION_ABORTED;
} else {
@ -469,7 +470,7 @@ class GrpcPolledFdWindows : public GrpcPolledFd {
BOOL wsa_success = WSAGetOverlappedResult(
winsocket_->raw_socket(), winsocket_->write_info()->overlapped(),
&transferred_bytes, FALSE, &flags);
GPR_ASSERT(transferred_bytes == 0);
CHECK_EQ(transferred_bytes, 0);
if (!wsa_success) {
wsa_connect_error_ = WSAGetLastError();
char* msg = gpr_format_message(wsa_connect_error_);
@ -491,8 +492,8 @@ class GrpcPolledFdWindows : public GrpcPolledFd {
int ConnectUDP(WSAErrorContext* wsa_error_ctx, const struct sockaddr* target,
ares_socklen_t target_len) {
GRPC_ARES_RESOLVER_TRACE_LOG("fd:%s ConnectUDP", GetName());
GPR_ASSERT(!connect_done_);
GPR_ASSERT(wsa_connect_error_ == 0);
CHECK(!connect_done_);
CHECK_EQ(wsa_connect_error_, 0);
SOCKET s = winsocket_->raw_socket();
int out =
WSAConnect(s, target, target_len, nullptr, nullptr, nullptr, nullptr);
@ -620,7 +621,7 @@ class GrpcPolledFdWindows : public GrpcPolledFd {
void OnIocpWriteable() {
grpc_core::MutexLock lock(mu_);
GRPC_ARES_RESOLVER_TRACE_LOG("OnIocpWriteableInner. fd:|%s|", GetName());
GPR_ASSERT(socket_type_ == SOCK_STREAM);
CHECK(socket_type_ == SOCK_STREAM);
absl::Status error;
if (winsocket_->write_info()->result().wsa_error != 0) {
error = GRPC_WSA_ERROR(winsocket_->write_info()->result().wsa_error,
@ -631,7 +632,7 @@ class GrpcPolledFdWindows : public GrpcPolledFd {
GetName(), winsocket_->write_info()->result().wsa_error,
grpc_core::StatusToString(error).c_str());
}
GPR_ASSERT(tcp_write_state_ == WRITE_PENDING);
CHECK(tcp_write_state_ == WRITE_PENDING);
if (error.ok()) {
tcp_write_state_ = WRITE_WAITING_FOR_VERIFICATION_UPON_RETRY;
write_buf_ = grpc_slice_sub_no_ref(
@ -712,7 +713,7 @@ class CustomSockFuncs {
GRPC_ARES_RESOLVER_TRACE_LOG(
"fd:|%s| created with params af:%d type:%d protocol:%d",
polled_fd->GetName(), af, type, protocol);
GPR_ASSERT(self->sockets_.insert({s, std::move(polled_fd)}).second);
CHECK(self->sockets_.insert({s, std::move(polled_fd)}).second);
return s;
}
@ -722,7 +723,7 @@ class CustomSockFuncs {
GrpcPolledFdFactoryWindows* self =
static_cast<GrpcPolledFdFactoryWindows*>(user_data);
auto it = self->sockets_.find(as);
GPR_ASSERT(it != self->sockets_.end());
CHECK(it != self->sockets_.end());
return it->second->Connect(&wsa_error_ctx, target, target_len);
}
@ -732,7 +733,7 @@ class CustomSockFuncs {
GrpcPolledFdFactoryWindows* self =
static_cast<GrpcPolledFdFactoryWindows*>(user_data);
auto it = self->sockets_.find(as);
GPR_ASSERT(it != self->sockets_.end());
CHECK(it != self->sockets_.end());
return it->second->SendV(&wsa_error_ctx, iov, iovec_count);
}
@ -743,7 +744,7 @@ class CustomSockFuncs {
GrpcPolledFdFactoryWindows* self =
static_cast<GrpcPolledFdFactoryWindows*>(user_data);
auto it = self->sockets_.find(as);
GPR_ASSERT(it != self->sockets_.end());
CHECK(it != self->sockets_.end());
return it->second->RecvFrom(&wsa_error_ctx, data, data_len, flags, from,
from_len);
}
@ -802,7 +803,7 @@ void GrpcPolledFdFactoryWindows::Initialize(grpc_core::Mutex* mutex,
std::unique_ptr<GrpcPolledFd> GrpcPolledFdFactoryWindows::NewGrpcPolledFdLocked(
ares_socket_t as) {
auto it = sockets_.find(as);
GPR_ASSERT(it != sockets_.end());
CHECK(it != sockets_.end());
return std::make_unique<GrpcPolledFdWrapper>(it->second.get());
}

18
src/core/lib/event_engine/windows/iocp.cc
Unescape View File

@ -17,6 +17,7 @@
#include <chrono>
#include "absl/log/check.h"
#include "absl/strings/str_format.h"
#include <grpc/support/alloc.h>
@ -37,7 +38,7 @@ IOCP::IOCP(ThreadPool* thread_pool) noexcept
: thread_pool_(thread_pool),
iocp_handle_(CreateIoCompletionPort(INVALID_HANDLE_VALUE, nullptr,
(ULONG_PTR) nullptr, 0)) {
GPR_ASSERT(iocp_handle_);
CHECK(iocp_handle_);
WSASocketFlagsInit();
}
@ -54,7 +55,7 @@ std::unique_ptr<WinSocket> IOCP::Watch(SOCKET socket) {
GRPC_WSA_ERROR(WSAGetLastError(), "Unable to add socket to iocp")
.ToString());
}
GPR_ASSERT(ret == iocp_handle_);
CHECK(ret == iocp_handle_);
return wrapped_socket;
}
@ -65,7 +66,7 @@ void IOCP::Shutdown() {
while (outstanding_kicks_.load() > 0) {
Work(std::chrono::hours(42), []() {});
}
GPR_ASSERT(CloseHandle(iocp_handle_));
CHECK(CloseHandle(iocp_handle_));
}
Poller::WorkResult IOCP::Work(EventEngine::Duration timeout,
@ -81,7 +82,8 @@ Poller::WorkResult IOCP::Work(EventEngine::Duration timeout,
GRPC_EVENT_ENGINE_POLLER_TRACE("IOCP::%p deadline exceeded", this);
return Poller::WorkResult::kDeadlineExceeded;
}
GPR_ASSERT(completion_key && overlapped);
CHECK(completion_key);
CHECK(overlapped);
if (overlapped == &kick_overlap_) {
GRPC_EVENT_ENGINE_POLLER_TRACE("IOCP::%p kicked", this);
outstanding_kicks_.fetch_sub(1);
@ -100,7 +102,7 @@ Poller::WorkResult IOCP::Work(EventEngine::Duration timeout,
// about to register for notification of an overlapped event.
auto* socket = reinterpret_cast<WinSocket*>(completion_key);
WinSocket::OpState* info = socket->GetOpInfoForOverlapped(overlapped);
GPR_ASSERT(info != nullptr);
CHECK_NE(info, nullptr);
info->GetOverlappedResult();
info->SetReady();
schedule_poll_again();
@ -109,9 +111,9 @@ Poller::WorkResult IOCP::Work(EventEngine::Duration timeout,
void IOCP::Kick() {
outstanding_kicks_.fetch_add(1);
GPR_ASSERT(PostQueuedCompletionStatus(
iocp_handle_, 0, reinterpret_cast<ULONG_PTR>(&kick_token_),
&kick_overlap_));
CHECK(PostQueuedCompletionStatus(iocp_handle_, 0,
reinterpret_cast<ULONG_PTR>(&kick_token_),
&kick_overlap_));
}
DWORD IOCP::GetDefaultSocketFlags() {

12
src/core/lib/event_engine/windows/win_socket.cc
Unescape View File

@ -14,6 +14,8 @@
#include <grpc/support/port_platform.h>
#ifdef GPR_WINDOWS
#include "absl/log/check.h"
#include <grpc/support/alloc.h>
#include <grpc/support/log_windows.h>
@ -45,7 +47,7 @@ WinSocket::WinSocket(SOCKET socket, ThreadPool* thread_pool) noexcept
write_info_(this) {}
WinSocket::~WinSocket() {
GPR_ASSERT(is_shutdown_.load());
CHECK(is_shutdown_.load());
GRPC_EVENT_ENGINE_ENDPOINT_TRACE("WinSocket::%p destroyed", this);
}
@ -94,7 +96,7 @@ void WinSocket::NotifyOnReady(OpState& info, EventEngine::Closure* closure) {
return;
};
// It is an error if any notification is already registered for this socket.
GPR_ASSERT(std::exchange(info.closure_, closure) == nullptr);
CHECK_EQ(std::exchange(info.closure_, closure), nullptr);
}
void WinSocket::NotifyOnRead(EventEngine::Closure* on_read) {
@ -106,11 +108,11 @@ void WinSocket::NotifyOnWrite(EventEngine::Closure* on_write) {
}
void WinSocket::UnregisterReadCallback() {
GPR_ASSERT(std::exchange(read_info_.closure_, nullptr) != nullptr);
CHECK_NE(std::exchange(read_info_.closure_, nullptr), nullptr);
}
void WinSocket::UnregisterWriteCallback() {
GPR_ASSERT(std::exchange(write_info_.closure_, nullptr) != nullptr);
CHECK_NE(std::exchange(write_info_.closure_, nullptr), nullptr);
}
// ---- WinSocket::OpState ----
@ -124,7 +126,7 @@ void WinSocket::OpState::SetReady() {
auto* closure = std::exchange(closure_, nullptr);
// If an IOCP event is returned for a socket, and no callback has been
// registered for notification, this is invalid usage.
GPR_ASSERT(closure != nullptr);
CHECK_NE(closure, nullptr);
win_socket_->thread_pool_->Run(closure);
}

17
src/core/lib/event_engine/windows/windows_endpoint.cc
Unescape View File

@ -17,6 +17,7 @@
#include "absl/cleanup/cleanup.h"
#include "absl/functional/any_invocable.h"
#include "absl/log/check.h"
#include "absl/status/status.h"
#include "absl/strings/str_format.h"
@ -85,7 +86,7 @@ void WindowsEndpoint::AsyncIOState::DoTcpRead(SliceBuffer* buffer) {
return;
}
// Prepare the WSABUF struct
GPR_ASSERT(buffer->Count() <= kMaxWSABUFCount);
CHECK(buffer->Count() <= kMaxWSABUFCount);
WSABUF wsa_buffers[kMaxWSABUFCount];
for (size_t i = 0; i < buffer->Count(); i++) {
auto& slice = buffer->MutableSliceAt(i);
@ -164,11 +165,11 @@ bool WindowsEndpoint::Write(absl::AnyInvocable<void(absl::Status)> on_writable,
peer_address_string_.c_str(), str.length(), str.data());
}
}
GPR_ASSERT(data->Count() <= UINT_MAX);
CHECK(data->Count() <= UINT_MAX);
absl::InlinedVector<WSABUF, kMaxWSABUFCount> buffers(data->Count());
for (size_t i = 0; i < data->Count(); i++) {
auto& slice = data->MutableSliceAt(i);
GPR_ASSERT(slice.size() <= ULONG_MAX);
CHECK(slice.size() <= ULONG_MAX);
buffers[i].len = slice.size();
buffers[i].buf = (char*)slice.begin();
}
@ -305,8 +306,8 @@ void WindowsEndpoint::HandleReadClosure::Run() {
buffer_->Swap(last_read_buffer_);
return ResetAndReturnCallback()(status);
}
GPR_DEBUG_ASSERT(result.bytes_transferred > 0);
GPR_DEBUG_ASSERT(result.bytes_transferred <= buffer_->Length());
DCHECK_GT(result.bytes_transferred, 0);
DCHECK(result.bytes_transferred <= buffer_->Length());
buffer_->MoveFirstNBytesIntoSliceBuffer(result.bytes_transferred,
last_read_buffer_);
if (buffer_->Length() == 0) {
@ -332,9 +333,9 @@ bool WindowsEndpoint::HandleReadClosure::MaybeFinishIfDataHasAlreadyBeenRead() {
void WindowsEndpoint::HandleReadClosure::DonateSpareSlices(
SliceBuffer* buffer) {
// Donee buffer must be empty.
GPR_ASSERT(buffer->Length() == 0);
CHECK_EQ(buffer->Length(), 0);
// HandleReadClosure must be in the reset state.
GPR_ASSERT(buffer_ == nullptr);
CHECK_EQ(buffer_, nullptr);
buffer->Swap(last_read_buffer_);
}
@ -352,7 +353,7 @@ void WindowsEndpoint::HandleWriteClosure::Run() {
if (result.wsa_error != 0) {
status = GRPC_WSA_ERROR(result.wsa_error, "WSASend");
} else {
GPR_ASSERT(result.bytes_transferred == buffer_->Length());
CHECK(result.bytes_transferred == buffer_->Length());
}
return ResetAndReturnCallback()(status);
}

13
src/core/lib/event_engine/windows/windows_engine.cc
Unescape View File

@ -17,6 +17,7 @@
#include <memory>
#include "absl/log/check.h"
#include "absl/status/status.h"
#include "absl/status/statusor.h"
#include "absl/strings/string_view.h"
@ -114,7 +115,7 @@ WindowsEventEngine::WindowsEventEngine()
iocp_worker_(thread_pool_.get(), &iocp_) {
WSADATA wsaData;
int status = WSAStartup(MAKEWORD(2, 0), &wsaData);
GPR_ASSERT(status == 0);
CHECK_EQ(status, 0);
}
WindowsEventEngine::~WindowsEventEngine() {
@ -143,13 +144,13 @@ WindowsEventEngine::~WindowsEventEngine() {
task_mu_.Lock();
}
}
GPR_ASSERT(GPR_LIKELY(known_handles_.empty()));
CHECK(GPR_LIKELY(known_handles_.empty()));
task_mu_.Unlock();
}
iocp_.Kick();
iocp_worker_.WaitForShutdown();
iocp_.Shutdown();
GPR_ASSERT(WSACleanup() == 0);
CHECK_EQ(WSACleanup(), 0);
timer_manager_.Shutdown();
thread_pool_->Quiesce();
}
@ -369,7 +370,7 @@ EventEngine::ConnectionHandle WindowsEventEngine::Connect(
auto connection_state = std::make_shared<ConnectionState>();
grpc_core::MutexLock lock(&connection_state->mu);
connection_state->socket = iocp_.Watch(sock);
GPR_ASSERT(connection_state->socket != nullptr);
CHECK(connection_state->socket != nullptr);
auto* info = connection_state->socket->write_info();
connection_state->address = address;
connection_state->allocator = std::move(memory_allocator);
@ -455,8 +456,8 @@ bool WindowsEventEngine::CancelConnectFromDeadlineTimer(
// Erase the connection handle, which is guaranteed to exist.
{
grpc_core::MutexLock lock(&connection_mu_);
GPR_ASSERT(known_connection_handles_.erase(
connection_state->connection_handle) == 1);
CHECK(known_connection_handles_.erase(
connection_state->connection_handle) == 1);
}
return CancelConnectInternalStateLocked(connection_state);
}

13
src/core/lib/event_engine/windows/windows_listener.cc
Unescape View File

@ -15,6 +15,7 @@
#ifdef GPR_WINDOWS
#include "absl/log/check.h"
#include "absl/status/status.h"
#include "absl/strings/str_format.h"
@ -47,7 +48,7 @@ WindowsEventEngineListener::SinglePortSocketListener::AsyncIOState::
void WindowsEventEngineListener::SinglePortSocketListener::
OnAcceptCallbackWrapper::Run() {
GPR_ASSERT(io_state_ != nullptr);
CHECK_NE(io_state_, nullptr);
grpc_core::ReleasableMutexLock lock(&io_state_->mu);
if (io_state_->listener_socket->IsShutdown()) {
GRPC_EVENT_ENGINE_TRACE(
@ -124,7 +125,7 @@ WindowsEventEngineListener::SinglePortSocketListener::Create(
}
auto result = SinglePortSocketListener::PrepareListenerSocket(sock, addr);
GRPC_RETURN_IF_ERROR(result.status());
GPR_ASSERT(result->port >= 0);
CHECK_GE(result->port, 0);
// Using `new` to access non-public constructor
return absl::WrapUnique(new SinglePortSocketListener(
listener, AcceptEx, /*win_socket=*/listener->iocp_->Watch(sock),
@ -190,8 +191,8 @@ void WindowsEventEngineListener::SinglePortSocketListener::
ABSL_EXCLUSIVE_LOCKS_REQUIRED(io_state_->mu) {
if (do_close_socket) closesocket(io_state_->accept_socket);
io_state_->accept_socket = INVALID_SOCKET;
GPR_ASSERT(GRPC_LOG_IF_ERROR("SinglePortSocketListener::Start",
StartLocked()));
CHECK(GRPC_LOG_IF_ERROR("SinglePortSocketListener::Start",
StartLocked()));
};
const auto& overlapped_result =
io_state_->listener_socket->read_info()->result();
@ -265,7 +266,7 @@ absl::StatusOr<WindowsEventEngineListener::SinglePortSocketListener::
WindowsEventEngineListener::SinglePortSocketListener::PrepareListenerSocket(
SOCKET sock, const EventEngine::ResolvedAddress& addr) {
auto fail = [&](absl::Status error) -> absl::Status {
GPR_ASSERT(!error.ok());
CHECK(!error.ok());
auto addr_uri = ResolvedAddressToURI(addr);
error = grpc_error_set_int(
grpc_error_set_str(
@ -374,7 +375,7 @@ absl::StatusOr<int> WindowsEventEngineListener::Bind(
}
absl::Status WindowsEventEngineListener::Start() {
GPR_ASSERT(!started_.exchange(true));
CHECK(!started_.exchange(true));
grpc_core::MutexLock lock(&port_listeners_mu_);
for (auto& port_listener : port_listeners_) {
GRPC_RETURN_IF_ERROR(port_listener->Start());

4
src/core/lib/http/httpcli.cc
Unescape View File

@ -33,6 +33,8 @@
#include <grpc/support/log.h>
#include <grpc/support/port_platform.h>
#include "src/core/handshaker/handshaker_registry.h"
#include "src/core/handshaker/tcp_connect/tcp_connect_handshaker.h"
#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"
@ -49,8 +51,6 @@
#include "src/core/lib/security/security_connector/security_connector.h"
#include "src/core/lib/slice/slice.h"
#include "src/core/lib/transport/error_utils.h"
#include "src/core/lib/transport/handshaker_registry.h"
#include "src/core/lib/transport/tcp_connect_handshaker.h"
namespace grpc_core {

2
src/core/lib/http/httpcli.h
Unescape View File

@ -34,6 +34,7 @@
#include <grpc/slice.h>
#include <grpc/support/port_platform.h>
#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"
@ -50,7 +51,6 @@
#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/transport/handshaker.h"
#include "src/core/lib/uri/uri_parser.h"
// User agent this library reports

4
src/core/lib/http/httpcli_security_connector.cc
Unescape View File

@ -34,6 +34,8 @@
#include <grpc/support/port_platform.h>
#include <grpc/support/string_util.h>
#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"
@ -48,8 +50,6 @@
#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_utils.h"
#include "src/core/lib/security/transport/security_handshaker.h"
#include "src/core/lib/transport/handshaker.h"
#include "src/core/tsi/ssl_transport_security.h"
#include "src/core/tsi/transport_security_interface.h"

6
src/core/lib/iomgr/call_combiner.cc
Unescape View File

@ -20,6 +20,8 @@
#include <inttypes.h>
#include "absl/log/check.h"
#include <grpc/support/log.h>
#include <grpc/support/port_platform.h>
@ -86,7 +88,7 @@ void CallCombiner::TsanClosure(void* arg, grpc_error_handle error) {
if (lock != nullptr) {
TSAN_ANNOTATE_RWLOCK_RELEASED(&lock->taken, true);
bool prev = true;
GPR_ASSERT(lock->taken.compare_exchange_strong(prev, false));
CHECK(lock->taken.compare_exchange_strong(prev, false));
}
}
#endif
@ -154,7 +156,7 @@ void CallCombiner::Stop(DEBUG_ARGS const char* reason) {
gpr_log(GPR_INFO, " size: %" PRIdPTR " -> %" PRIdPTR, prev_size,
prev_size - 1);
}
GPR_ASSERT(prev_size >= 1);
CHECK_GE(prev_size, 1u);
if (prev_size > 1) {
while (true) {
if (GRPC_TRACE_FLAG_ENABLED(grpc_call_combiner_trace)) {

4
src/core/lib/iomgr/closure.h
Unescape View File

@ -22,6 +22,8 @@
#include <assert.h>
#include <stdbool.h>
#include "absl/log/check.h"
#include <grpc/support/alloc.h>
#include <grpc/support/log.h>
#include <grpc/support/port_platform.h>
@ -297,7 +299,7 @@ class Closure {
closure, closure->file_created, closure->line_created,
location.file(), location.line());
}
GPR_ASSERT(closure->cb != nullptr);
CHECK_NE(closure->cb, nullptr);
#endif
closure->cb(closure->cb_arg, error);
#ifndef NDEBUG

10
src/core/lib/iomgr/combiner.cc
Unescape View File

@ -22,6 +22,8 @@
#include <inttypes.h>
#include <string.h>
#include "absl/log/check.h"
#include <grpc/support/alloc.h>
#include <grpc/support/log.h>
#include <grpc/support/port_platform.h>
@ -64,7 +66,7 @@ grpc_core::Combiner* grpc_combiner_create(
static void really_destroy(grpc_core::Combiner* lock) {
GRPC_COMBINER_TRACE(gpr_log(GPR_INFO, "C:%p really_destroy", lock));
GPR_ASSERT(gpr_atm_no_barrier_load(&lock->state) == 0);
CHECK_EQ(gpr_atm_no_barrier_load(&lock->state), 0);
delete lock;
}
@ -148,7 +150,7 @@ static void combiner_exec(grpc_core::Combiner* lock, grpc_closure* cl,
gpr_atm_no_barrier_store(&lock->initiating_exec_ctx_or_null, 0);
}
}
GPR_ASSERT(last & STATE_UNORPHANED); // ensure lock has not been destroyed
CHECK(last & STATE_UNORPHANED); // ensure lock has not been destroyed
assert(cl->cb);
cl->error_data.error = grpc_core::internal::StatusAllocHeapPtr(error);
lock->queue.Push(cl->next_data.mpscq_node.get());
@ -230,7 +232,7 @@ bool grpc_combiner_continue_exec_ctx() {
cl->cb(cl->cb_arg, std::move(cl_err));
} else {
grpc_closure* c = lock->final_list.head;
GPR_ASSERT(c != nullptr);
CHECK_NE(c, nullptr);
grpc_closure_list_init(&lock->final_list);
int loops = 0;
while (c != nullptr) {
@ -293,7 +295,7 @@ static void enqueue_finally(void* closure, grpc_error_handle error);
static void combiner_finally_exec(grpc_core::Combiner* lock,
grpc_closure* closure,
grpc_error_handle error) {
GPR_ASSERT(lock != nullptr);
CHECK_NE(lock, nullptr);
GRPC_COMBINER_TRACE(gpr_log(
GPR_INFO, "C:%p grpc_combiner_execute_finally c=%p; ac=%p", lock, closure,
grpc_core::ExecCtx::Get()->combiner_data()->active_combiner));

Some files were not shown because too many files have changed in this diff Show More

Write Preview
Loading…
Cancel
Save