diff --git a/BUILD b/BUILD index e244032d2bb..5761bede5ac 100644 --- a/BUILD +++ b/BUILD @@ -891,7 +891,6 @@ grpc_cc_library( "src/core/lib/gprpp/mpscq.cc", "src/core/lib/gprpp/stat_posix.cc", "src/core/lib/gprpp/stat_windows.cc", - "src/core/lib/gprpp/status_helper.cc", "src/core/lib/gprpp/thd_posix.cc", "src/core/lib/gprpp/thd_windows.cc", "src/core/lib/gprpp/time_util.cc", @@ -917,7 +916,6 @@ grpc_cc_library( "src/core/lib/gprpp/memory.h", "src/core/lib/gprpp/mpscq.h", "src/core/lib/gprpp/stat.h", - "src/core/lib/gprpp/status_helper.h", "src/core/lib/gprpp/sync.h", "src/core/lib/gprpp/thd.h", "src/core/lib/gprpp/time_util.h", @@ -935,7 +933,6 @@ grpc_cc_library( "absl/synchronization", "absl/time:time", "absl/types:optional", - "upb_lib", ], language = "c++", public_hdrs = GPR_PUBLIC_HDRS, @@ -944,11 +941,9 @@ grpc_cc_library( "construct_destruct", "debug_location", "examine_stack", - "google_rpc_status_upb", "gpr_codegen", "gpr_tls", "grpc_codegen", - "protobuf_any_upb", "useful", ], ) @@ -986,6 +981,35 @@ grpc_cc_library( tags = ["grpc-autodeps"], ) +grpc_cc_library( + name = "status_helper", + srcs = [ + "src/core/lib/gprpp/status_helper.cc", + ], + hdrs = [ + "src/core/lib/gprpp/status_helper.h", + ], + external_deps = [ + "absl/status", + "absl/strings", + "absl/strings:cord", + "absl/time", + "absl/types:optional", + "upb_lib", + ], + language = "c++", + tags = ["grpc-autodeps"], + deps = [ + "debug_location", + "google_rpc_status_upb", + "gpr_base", + "gpr_platform", + "percent_encoding", + "protobuf_any_upb", + "slice", + ], +) + grpc_cc_library( name = "unique_type_name", hdrs = ["src/core/lib/gprpp/unique_type_name.h"], @@ -2013,6 +2037,7 @@ grpc_cc_library( "grpc_trace", "slice", "slice_refcount", + "status_helper", "useful", ], ) @@ -3749,6 +3774,7 @@ grpc_cc_library( "slice", "slice_refcount", "sockaddr_utils", + "status_helper", "time", "tsi_ssl_credentials", "uri_parser", diff --git a/CMakeLists.txt b/CMakeLists.txt index 7f9c1083c70..33db3df1441 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1466,8 +1466,6 @@ endforeach() endif() add_library(gpr - src/core/ext/upb-generated/google/protobuf/any.upb.c - src/core/ext/upb-generated/google/rpc/status.upb.c src/core/lib/gpr/alloc.cc src/core/lib/gpr/atm.cc src/core/lib/gpr/cpu_iphone.cc @@ -1506,7 +1504,6 @@ add_library(gpr src/core/lib/gprpp/mpscq.cc src/core/lib/gprpp/stat_posix.cc src/core/lib/gprpp/stat_windows.cc - src/core/lib/gprpp/status_helper.cc src/core/lib/gprpp/thd_posix.cc src/core/lib/gprpp/thd_windows.cc src/core/lib/gprpp/time_util.cc @@ -1556,7 +1553,6 @@ target_link_libraries(gpr absl::synchronization absl::time absl::optional - upb ) if(_gRPC_PLATFORM_ANDROID) target_link_libraries(gpr @@ -2058,6 +2054,7 @@ add_library(grpc src/core/lib/event_engine/slice.cc src/core/lib/event_engine/slice_buffer.cc src/core/lib/event_engine/trace.cc + src/core/lib/gprpp/status_helper.cc src/core/lib/gprpp/time.cc src/core/lib/http/format_request.cc src/core/lib/http/httpcli.cc @@ -2344,6 +2341,7 @@ target_link_libraries(grpc gpr ${_gRPC_SSL_LIBRARIES} address_sorting + upb ) if(_gRPC_PLATFORM_IOS OR _gRPC_PLATFORM_MAC) target_link_libraries(grpc "-framework CoreFoundation") @@ -2684,6 +2682,7 @@ add_library(grpc_unsecure src/core/lib/event_engine/slice.cc src/core/lib/event_engine/slice_buffer.cc src/core/lib/event_engine/trace.cc + src/core/lib/gprpp/status_helper.cc src/core/lib/gprpp/time.cc src/core/lib/http/format_request.cc src/core/lib/http/httpcli.cc @@ -2905,6 +2904,7 @@ target_link_libraries(grpc_unsecure absl::utility gpr address_sorting + upb ) if(_gRPC_PLATFORM_IOS OR _gRPC_PLATFORM_MAC) target_link_libraries(grpc_unsecure "-framework CoreFoundation") @@ -6038,8 +6038,11 @@ if(gRPC_BUILD_TESTS) if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_POSIX) add_executable(memory_quota_stress_test + src/core/ext/upb-generated/google/protobuf/any.upb.c + src/core/ext/upb-generated/google/rpc/status.upb.c src/core/lib/debug/trace.cc src/core/lib/event_engine/memory_allocator.cc + src/core/lib/gprpp/status_helper.cc src/core/lib/gprpp/time.cc src/core/lib/iomgr/combiner.cc src/core/lib/iomgr/error.cc @@ -6049,6 +6052,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_POSIX) src/core/lib/promise/activity.cc src/core/lib/resource_quota/memory_quota.cc src/core/lib/resource_quota/trace.cc + src/core/lib/slice/percent_encoding.cc src/core/lib/slice/slice.cc src/core/lib/slice/slice_refcount.cc src/core/lib/slice/slice_string_helpers.cc @@ -6076,6 +6080,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_POSIX) absl::variant absl::utility gpr + upb ) @@ -7307,8 +7312,6 @@ endif() if(gRPC_BUILD_TESTS) add_executable(activity_test - src/core/ext/upb-generated/google/protobuf/any.upb.c - src/core/ext/upb-generated/google/rpc/status.upb.c src/core/lib/gpr/alloc.cc src/core/lib/gpr/atm.cc src/core/lib/gpr/cpu_iphone.cc @@ -7347,7 +7350,6 @@ add_executable(activity_test src/core/lib/gprpp/mpscq.cc src/core/lib/gprpp/stat_posix.cc src/core/lib/gprpp/stat_windows.cc - src/core/lib/gprpp/status_helper.cc src/core/lib/gprpp/thd_posix.cc src/core/lib/gprpp/thd_windows.cc src/core/lib/gprpp/time_util.cc @@ -7398,7 +7400,6 @@ target_link_libraries(activity_test absl::optional absl::variant absl::utility - upb ) @@ -7664,8 +7665,11 @@ endif() if(gRPC_BUILD_TESTS) add_executable(arena_promise_test + src/core/ext/upb-generated/google/protobuf/any.upb.c + src/core/ext/upb-generated/google/rpc/status.upb.c src/core/lib/debug/trace.cc src/core/lib/event_engine/memory_allocator.cc + src/core/lib/gprpp/status_helper.cc src/core/lib/gprpp/time.cc src/core/lib/iomgr/combiner.cc src/core/lib/iomgr/error.cc @@ -7678,6 +7682,7 @@ add_executable(arena_promise_test src/core/lib/resource_quota/resource_quota.cc src/core/lib/resource_quota/thread_quota.cc src/core/lib/resource_quota/trace.cc + src/core/lib/slice/percent_encoding.cc src/core/lib/slice/slice.cc src/core/lib/slice/slice_refcount.cc src/core/lib/slice/slice_string_helpers.cc @@ -7713,6 +7718,7 @@ target_link_libraries(arena_promise_test absl::variant absl::utility gpr + upb ) @@ -9005,8 +9011,11 @@ endif() if(gRPC_BUILD_TESTS) add_executable(chunked_vector_test + src/core/ext/upb-generated/google/protobuf/any.upb.c + src/core/ext/upb-generated/google/rpc/status.upb.c src/core/lib/debug/trace.cc src/core/lib/event_engine/memory_allocator.cc + src/core/lib/gprpp/status_helper.cc src/core/lib/gprpp/time.cc src/core/lib/iomgr/combiner.cc src/core/lib/iomgr/error.cc @@ -9019,6 +9028,7 @@ add_executable(chunked_vector_test src/core/lib/resource_quota/resource_quota.cc src/core/lib/resource_quota/thread_quota.cc src/core/lib/resource_quota/trace.cc + src/core/lib/slice/percent_encoding.cc src/core/lib/slice/slice.cc src/core/lib/slice/slice_refcount.cc src/core/lib/slice/slice_string_helpers.cc @@ -9054,6 +9064,7 @@ target_link_libraries(chunked_vector_test absl::variant absl::utility gpr + upb ) @@ -10435,7 +10446,10 @@ endif() if(gRPC_BUILD_TESTS) add_executable(exec_ctx_wakeup_scheduler_test + src/core/ext/upb-generated/google/protobuf/any.upb.c + src/core/ext/upb-generated/google/rpc/status.upb.c src/core/lib/debug/trace.cc + src/core/lib/gprpp/status_helper.cc src/core/lib/gprpp/time.cc src/core/lib/iomgr/combiner.cc src/core/lib/iomgr/error.cc @@ -10443,6 +10457,7 @@ add_executable(exec_ctx_wakeup_scheduler_test src/core/lib/iomgr/executor.cc src/core/lib/iomgr/iomgr_internal.cc src/core/lib/promise/activity.cc + src/core/lib/slice/percent_encoding.cc src/core/lib/slice/slice.cc src/core/lib/slice/slice_refcount.cc src/core/lib/slice/slice_string_helpers.cc @@ -10478,6 +10493,7 @@ target_link_libraries(exec_ctx_wakeup_scheduler_test absl::variant absl::utility gpr + upb ) @@ -10755,8 +10771,11 @@ endif() if(gRPC_BUILD_TESTS) add_executable(for_each_test + src/core/ext/upb-generated/google/protobuf/any.upb.c + src/core/ext/upb-generated/google/rpc/status.upb.c src/core/lib/debug/trace.cc src/core/lib/event_engine/memory_allocator.cc + src/core/lib/gprpp/status_helper.cc src/core/lib/gprpp/time.cc src/core/lib/iomgr/combiner.cc src/core/lib/iomgr/error.cc @@ -10769,6 +10788,7 @@ add_executable(for_each_test src/core/lib/resource_quota/resource_quota.cc src/core/lib/resource_quota/thread_quota.cc src/core/lib/resource_quota/trace.cc + src/core/lib/slice/percent_encoding.cc src/core/lib/slice/slice.cc src/core/lib/slice/slice_refcount.cc src/core/lib/slice/slice_string_helpers.cc @@ -10806,6 +10826,7 @@ target_link_libraries(for_each_test absl::variant absl::utility gpr + upb ) @@ -12723,8 +12744,6 @@ endif() if(gRPC_BUILD_TESTS) add_executable(latch_test - src/core/ext/upb-generated/google/protobuf/any.upb.c - src/core/ext/upb-generated/google/rpc/status.upb.c src/core/lib/gpr/alloc.cc src/core/lib/gpr/atm.cc src/core/lib/gpr/cpu_iphone.cc @@ -12763,7 +12782,6 @@ add_executable(latch_test src/core/lib/gprpp/mpscq.cc src/core/lib/gprpp/stat_posix.cc src/core/lib/gprpp/stat_windows.cc - src/core/lib/gprpp/status_helper.cc src/core/lib/gprpp/thd_posix.cc src/core/lib/gprpp/thd_windows.cc src/core/lib/gprpp/time_util.cc @@ -12812,7 +12830,6 @@ target_link_libraries(latch_test absl::optional absl::variant absl::utility - upb ) @@ -13076,8 +13093,11 @@ endif() if(gRPC_BUILD_TESTS) add_executable(memory_quota_test + src/core/ext/upb-generated/google/protobuf/any.upb.c + src/core/ext/upb-generated/google/rpc/status.upb.c src/core/lib/debug/trace.cc src/core/lib/event_engine/memory_allocator.cc + src/core/lib/gprpp/status_helper.cc src/core/lib/gprpp/time.cc src/core/lib/iomgr/combiner.cc src/core/lib/iomgr/error.cc @@ -13087,6 +13107,7 @@ add_executable(memory_quota_test src/core/lib/promise/activity.cc src/core/lib/resource_quota/memory_quota.cc src/core/lib/resource_quota/trace.cc + src/core/lib/slice/percent_encoding.cc src/core/lib/slice/slice.cc src/core/lib/slice/slice_refcount.cc src/core/lib/slice/slice_string_helpers.cc @@ -13122,6 +13143,7 @@ target_link_libraries(memory_quota_test absl::variant absl::utility gpr + upb ) @@ -13409,8 +13431,6 @@ endif() if(gRPC_BUILD_TESTS) add_executable(observable_test - src/core/ext/upb-generated/google/protobuf/any.upb.c - src/core/ext/upb-generated/google/rpc/status.upb.c src/core/lib/gpr/alloc.cc src/core/lib/gpr/atm.cc src/core/lib/gpr/cpu_iphone.cc @@ -13449,7 +13469,6 @@ add_executable(observable_test src/core/lib/gprpp/mpscq.cc src/core/lib/gprpp/stat_posix.cc src/core/lib/gprpp/stat_windows.cc - src/core/lib/gprpp/status_helper.cc src/core/lib/gprpp/thd_posix.cc src/core/lib/gprpp/thd_windows.cc src/core/lib/gprpp/time_util.cc @@ -13500,7 +13519,6 @@ target_link_libraries(observable_test absl::optional absl::variant absl::utility - upb ) @@ -13728,8 +13746,11 @@ endif() if(gRPC_BUILD_TESTS) add_executable(pipe_test + src/core/ext/upb-generated/google/protobuf/any.upb.c + src/core/ext/upb-generated/google/rpc/status.upb.c src/core/lib/debug/trace.cc src/core/lib/event_engine/memory_allocator.cc + src/core/lib/gprpp/status_helper.cc src/core/lib/gprpp/time.cc src/core/lib/iomgr/combiner.cc src/core/lib/iomgr/error.cc @@ -13742,6 +13763,7 @@ add_executable(pipe_test src/core/lib/resource_quota/resource_quota.cc src/core/lib/resource_quota/thread_quota.cc src/core/lib/resource_quota/trace.cc + src/core/lib/slice/percent_encoding.cc src/core/lib/slice/slice.cc src/core/lib/slice/slice_refcount.cc src/core/lib/slice/slice_string_helpers.cc @@ -13777,6 +13799,7 @@ target_link_libraries(pipe_test absl::variant absl::utility gpr + upb ) @@ -14580,8 +14603,11 @@ endif() if(gRPC_BUILD_TESTS) add_executable(resource_quota_test + src/core/ext/upb-generated/google/protobuf/any.upb.c + src/core/ext/upb-generated/google/rpc/status.upb.c src/core/lib/debug/trace.cc src/core/lib/event_engine/memory_allocator.cc + src/core/lib/gprpp/status_helper.cc src/core/lib/gprpp/time.cc src/core/lib/iomgr/combiner.cc src/core/lib/iomgr/error.cc @@ -14593,6 +14619,7 @@ add_executable(resource_quota_test src/core/lib/resource_quota/resource_quota.cc src/core/lib/resource_quota/thread_quota.cc src/core/lib/resource_quota/trace.cc + src/core/lib/slice/percent_encoding.cc src/core/lib/slice/slice.cc src/core/lib/slice/slice_refcount.cc src/core/lib/slice/slice_string_helpers.cc @@ -14628,6 +14655,7 @@ target_link_libraries(resource_quota_test absl::variant absl::utility gpr + upb ) @@ -15523,8 +15551,6 @@ endif() if(gRPC_BUILD_TESTS) add_executable(single_set_ptr_test - src/core/ext/upb-generated/google/protobuf/any.upb.c - src/core/ext/upb-generated/google/rpc/status.upb.c src/core/lib/gpr/alloc.cc src/core/lib/gpr/atm.cc src/core/lib/gpr/cpu_iphone.cc @@ -15563,7 +15589,6 @@ add_executable(single_set_ptr_test src/core/lib/gprpp/mpscq.cc src/core/lib/gprpp/stat_posix.cc src/core/lib/gprpp/stat_windows.cc - src/core/lib/gprpp/status_helper.cc src/core/lib/gprpp/thd_posix.cc src/core/lib/gprpp/thd_windows.cc src/core/lib/gprpp/time_util.cc @@ -15607,7 +15632,6 @@ target_link_libraries(single_set_ptr_test absl::synchronization absl::time absl::optional - upb ) @@ -16136,8 +16160,6 @@ endif() if(gRPC_BUILD_TESTS) add_executable(test_core_gprpp_time_test - src/core/ext/upb-generated/google/protobuf/any.upb.c - src/core/ext/upb-generated/google/rpc/status.upb.c src/core/lib/gpr/alloc.cc src/core/lib/gpr/atm.cc src/core/lib/gpr/cpu_iphone.cc @@ -16176,7 +16198,6 @@ add_executable(test_core_gprpp_time_test src/core/lib/gprpp/mpscq.cc src/core/lib/gprpp/stat_posix.cc src/core/lib/gprpp/stat_windows.cc - src/core/lib/gprpp/status_helper.cc src/core/lib/gprpp/thd_posix.cc src/core/lib/gprpp/thd_windows.cc src/core/lib/gprpp/time.cc @@ -16221,7 +16242,6 @@ target_link_libraries(test_core_gprpp_time_test absl::synchronization absl::time absl::optional - upb ) @@ -16515,8 +16535,6 @@ endif() if(gRPC_BUILD_TESTS) add_executable(thread_quota_test - src/core/ext/upb-generated/google/protobuf/any.upb.c - src/core/ext/upb-generated/google/rpc/status.upb.c src/core/lib/gpr/alloc.cc src/core/lib/gpr/atm.cc src/core/lib/gpr/cpu_iphone.cc @@ -16555,7 +16573,6 @@ add_executable(thread_quota_test src/core/lib/gprpp/mpscq.cc src/core/lib/gprpp/stat_posix.cc src/core/lib/gprpp/stat_windows.cc - src/core/lib/gprpp/status_helper.cc src/core/lib/gprpp/thd_posix.cc src/core/lib/gprpp/thd_windows.cc src/core/lib/gprpp/time_util.cc @@ -16600,7 +16617,6 @@ target_link_libraries(thread_quota_test absl::synchronization absl::time absl::optional - upb ) diff --git a/Makefile b/Makefile index 92a7a3714b5..6f622094c8d 100644 --- a/Makefile +++ b/Makefile @@ -888,8 +888,6 @@ endif # start of build recipe for library "gpr" (generated by makelib(lib) template function) LIBGPR_SRC = \ - src/core/ext/upb-generated/google/protobuf/any.upb.c \ - src/core/ext/upb-generated/google/rpc/status.upb.c \ src/core/lib/gpr/alloc.cc \ src/core/lib/gpr/atm.cc \ src/core/lib/gpr/cpu_iphone.cc \ @@ -928,7 +926,6 @@ LIBGPR_SRC = \ src/core/lib/gprpp/mpscq.cc \ src/core/lib/gprpp/stat_posix.cc \ src/core/lib/gprpp/stat_windows.cc \ - src/core/lib/gprpp/status_helper.cc \ src/core/lib/gprpp/thd_posix.cc \ src/core/lib/gprpp/thd_windows.cc \ src/core/lib/gprpp/time_util.cc \ @@ -993,18 +990,18 @@ endif ifeq ($(SYSTEM),MINGW32) -$(LIBDIR)/$(CONFIG)/gpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBGPR_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(RE2_DEP) $(UPB_DEP) $(GRPC_ABSEIL_DEP) $(LIBDIR)/$(CONFIG)/libupb.a +$(LIBDIR)/$(CONFIG)/gpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBGPR_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(RE2_DEP) $(UPB_DEP) $(GRPC_ABSEIL_DEP) $(E) "[LD] Linking $@" $(Q) mkdir -p `dirname $@` - $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,--output-def=$(LIBDIR)/$(CONFIG)/gpr$(SHARED_VERSION_CORE).def -Wl,--out-implib=$(LIBDIR)/$(CONFIG)/libgpr$(SHARED_VERSION_CORE)-dll.a -o $(LIBDIR)/$(CONFIG)/gpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGPR_OBJS) $(LIBDIR)/$(CONFIG)/libupb.a $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(RE2_MERGE_LIBS) $(UPB_MERGE_LIBS) $(GRPC_ABSEIL_MERGE_LIBS) $(LDLIBS) + $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,--output-def=$(LIBDIR)/$(CONFIG)/gpr$(SHARED_VERSION_CORE).def -Wl,--out-implib=$(LIBDIR)/$(CONFIG)/libgpr$(SHARED_VERSION_CORE)-dll.a -o $(LIBDIR)/$(CONFIG)/gpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGPR_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(RE2_MERGE_LIBS) $(UPB_MERGE_LIBS) $(GRPC_ABSEIL_MERGE_LIBS) $(LDLIBS) else -$(LIBDIR)/$(CONFIG)/libgpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBGPR_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(RE2_DEP) $(UPB_DEP) $(GRPC_ABSEIL_DEP) $(LIBDIR)/$(CONFIG)/libupb.a +$(LIBDIR)/$(CONFIG)/libgpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBGPR_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(RE2_DEP) $(UPB_DEP) $(GRPC_ABSEIL_DEP) $(E) "[LD] Linking $@" $(Q) mkdir -p `dirname $@` ifeq ($(SYSTEM),Darwin) - $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)gpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libgpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGPR_OBJS) $(LIBDIR)/$(CONFIG)/libupb.a $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(RE2_MERGE_LIBS) $(UPB_MERGE_LIBS) $(GRPC_ABSEIL_MERGE_LIBS) $(LDLIBS) + $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)gpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libgpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGPR_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(RE2_MERGE_LIBS) $(UPB_MERGE_LIBS) $(GRPC_ABSEIL_MERGE_LIBS) $(LDLIBS) else - $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgpr.so.25 -o $(LIBDIR)/$(CONFIG)/libgpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGPR_OBJS) $(LIBDIR)/$(CONFIG)/libupb.a $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(RE2_MERGE_LIBS) $(UPB_MERGE_LIBS) $(GRPC_ABSEIL_MERGE_LIBS) $(LDLIBS) + $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgpr.so.25 -o $(LIBDIR)/$(CONFIG)/libgpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGPR_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(RE2_MERGE_LIBS) $(UPB_MERGE_LIBS) $(GRPC_ABSEIL_MERGE_LIBS) $(LDLIBS) $(Q) ln -sf $(SHARED_PREFIX)gpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgpr$(SHARED_VERSION_CORE).so.25 $(Q) ln -sf $(SHARED_PREFIX)gpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgpr$(SHARED_VERSION_CORE).so endif @@ -1449,6 +1446,7 @@ LIBGRPC_SRC = \ src/core/lib/event_engine/slice.cc \ src/core/lib/event_engine/slice_buffer.cc \ src/core/lib/event_engine/trace.cc \ + src/core/lib/gprpp/status_helper.cc \ src/core/lib/gprpp/time.cc \ src/core/lib/http/format_request.cc \ src/core/lib/http/httpcli.cc \ @@ -1750,18 +1748,18 @@ endif ifeq ($(SYSTEM),MINGW32) -$(LIBDIR)/$(CONFIG)/grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBGRPC_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(RE2_DEP) $(UPB_DEP) $(GRPC_ABSEIL_DEP) $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(OPENSSL_DEP) +$(LIBDIR)/$(CONFIG)/grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBGRPC_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(RE2_DEP) $(UPB_DEP) $(GRPC_ABSEIL_DEP) $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libupb.a $(OPENSSL_DEP) $(E) "[LD] Linking $@" $(Q) mkdir -p `dirname $@` - $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,--output-def=$(LIBDIR)/$(CONFIG)/grpc$(SHARED_VERSION_CORE).def -Wl,--out-implib=$(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE)-dll.a -o $(LIBDIR)/$(CONFIG)/grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_OBJS) $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(OPENSSL_MERGE_LIBS) $(LDLIBS_SECURE) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(RE2_MERGE_LIBS) $(UPB_MERGE_LIBS) $(GRPC_ABSEIL_MERGE_LIBS) $(LDLIBS) + $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,--output-def=$(LIBDIR)/$(CONFIG)/grpc$(SHARED_VERSION_CORE).def -Wl,--out-implib=$(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE)-dll.a -o $(LIBDIR)/$(CONFIG)/grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_OBJS) $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libupb.a $(OPENSSL_MERGE_LIBS) $(LDLIBS_SECURE) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(RE2_MERGE_LIBS) $(UPB_MERGE_LIBS) $(GRPC_ABSEIL_MERGE_LIBS) $(LDLIBS) else -$(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBGRPC_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(RE2_DEP) $(UPB_DEP) $(GRPC_ABSEIL_DEP) $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(OPENSSL_DEP) +$(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBGRPC_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(RE2_DEP) $(UPB_DEP) $(GRPC_ABSEIL_DEP) $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libupb.a $(OPENSSL_DEP) $(E) "[LD] Linking $@" $(Q) mkdir -p `dirname $@` ifeq ($(SYSTEM),Darwin) - $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_OBJS) $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(OPENSSL_MERGE_LIBS) $(LDLIBS_SECURE) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(RE2_MERGE_LIBS) $(UPB_MERGE_LIBS) $(GRPC_ABSEIL_MERGE_LIBS) $(LDLIBS) + $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_OBJS) $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libupb.a $(OPENSSL_MERGE_LIBS) $(LDLIBS_SECURE) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(RE2_MERGE_LIBS) $(UPB_MERGE_LIBS) $(GRPC_ABSEIL_MERGE_LIBS) $(LDLIBS) else - $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgrpc.so.25 -o $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_OBJS) $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(OPENSSL_MERGE_LIBS) $(LDLIBS_SECURE) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(RE2_MERGE_LIBS) $(UPB_MERGE_LIBS) $(GRPC_ABSEIL_MERGE_LIBS) $(LDLIBS) + $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgrpc.so.25 -o $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_OBJS) $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libupb.a $(OPENSSL_MERGE_LIBS) $(LDLIBS_SECURE) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(RE2_MERGE_LIBS) $(UPB_MERGE_LIBS) $(GRPC_ABSEIL_MERGE_LIBS) $(LDLIBS) $(Q) ln -sf $(SHARED_PREFIX)grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).so.25 $(Q) ln -sf $(SHARED_PREFIX)grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).so endif @@ -1916,6 +1914,7 @@ LIBGRPC_UNSECURE_SRC = \ src/core/lib/event_engine/slice.cc \ src/core/lib/event_engine/slice_buffer.cc \ src/core/lib/event_engine/trace.cc \ + src/core/lib/gprpp/status_helper.cc \ src/core/lib/gprpp/time.cc \ src/core/lib/http/format_request.cc \ src/core/lib/http/httpcli.cc \ @@ -2143,18 +2142,18 @@ endif ifeq ($(SYSTEM),MINGW32) -$(LIBDIR)/$(CONFIG)/grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBGRPC_UNSECURE_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(RE2_DEP) $(UPB_DEP) $(GRPC_ABSEIL_DEP) $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libaddress_sorting.a +$(LIBDIR)/$(CONFIG)/grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBGRPC_UNSECURE_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(RE2_DEP) $(UPB_DEP) $(GRPC_ABSEIL_DEP) $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libupb.a $(E) "[LD] Linking $@" $(Q) mkdir -p `dirname $@` - $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,--output-def=$(LIBDIR)/$(CONFIG)/grpc_unsecure$(SHARED_VERSION_CORE).def -Wl,--out-implib=$(LIBDIR)/$(CONFIG)/libgrpc_unsecure$(SHARED_VERSION_CORE)-dll.a -o $(LIBDIR)/$(CONFIG)/grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_UNSECURE_OBJS) $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(RE2_MERGE_LIBS) $(UPB_MERGE_LIBS) $(GRPC_ABSEIL_MERGE_LIBS) $(LDLIBS) + $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,--output-def=$(LIBDIR)/$(CONFIG)/grpc_unsecure$(SHARED_VERSION_CORE).def -Wl,--out-implib=$(LIBDIR)/$(CONFIG)/libgrpc_unsecure$(SHARED_VERSION_CORE)-dll.a -o $(LIBDIR)/$(CONFIG)/grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_UNSECURE_OBJS) $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libupb.a $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(RE2_MERGE_LIBS) $(UPB_MERGE_LIBS) $(GRPC_ABSEIL_MERGE_LIBS) $(LDLIBS) else -$(LIBDIR)/$(CONFIG)/libgrpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBGRPC_UNSECURE_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(RE2_DEP) $(UPB_DEP) $(GRPC_ABSEIL_DEP) $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libaddress_sorting.a +$(LIBDIR)/$(CONFIG)/libgrpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBGRPC_UNSECURE_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(RE2_DEP) $(UPB_DEP) $(GRPC_ABSEIL_DEP) $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libupb.a $(E) "[LD] Linking $@" $(Q) mkdir -p `dirname $@` ifeq ($(SYSTEM),Darwin) - $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libgrpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_UNSECURE_OBJS) $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(RE2_MERGE_LIBS) $(UPB_MERGE_LIBS) $(GRPC_ABSEIL_MERGE_LIBS) $(LDLIBS) + $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libgrpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_UNSECURE_OBJS) $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libupb.a $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(RE2_MERGE_LIBS) $(UPB_MERGE_LIBS) $(GRPC_ABSEIL_MERGE_LIBS) $(LDLIBS) else - $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgrpc_unsecure.so.25 -o $(LIBDIR)/$(CONFIG)/libgrpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_UNSECURE_OBJS) $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(RE2_MERGE_LIBS) $(UPB_MERGE_LIBS) $(GRPC_ABSEIL_MERGE_LIBS) $(LDLIBS) + $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgrpc_unsecure.so.25 -o $(LIBDIR)/$(CONFIG)/libgrpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_UNSECURE_OBJS) $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libupb.a $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(RE2_MERGE_LIBS) $(UPB_MERGE_LIBS) $(GRPC_ABSEIL_MERGE_LIBS) $(LDLIBS) $(Q) ln -sf $(SHARED_PREFIX)grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc_unsecure$(SHARED_VERSION_CORE).so.25 $(Q) ln -sf $(SHARED_PREFIX)grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc_unsecure$(SHARED_VERSION_CORE).so endif diff --git a/build_autogenerated.yaml b/build_autogenerated.yaml index 062433b09af..6c977af0e2d 100644 --- a/build_autogenerated.yaml +++ b/build_autogenerated.yaml @@ -198,8 +198,6 @@ libs: - include/grpc/support/thd_id.h - include/grpc/support/time.h headers: - - src/core/ext/upb-generated/google/protobuf/any.upb.h - - src/core/ext/upb-generated/google/rpc/status.upb.h - src/core/lib/gpr/alloc.h - src/core/lib/gpr/env.h - src/core/lib/gpr/murmur_hash.h @@ -223,14 +221,11 @@ libs: - src/core/lib/gprpp/memory.h - src/core/lib/gprpp/mpscq.h - src/core/lib/gprpp/stat.h - - src/core/lib/gprpp/status_helper.h - src/core/lib/gprpp/sync.h - src/core/lib/gprpp/thd.h - src/core/lib/gprpp/time_util.h - src/core/lib/profiling/timers.h src: - - src/core/ext/upb-generated/google/protobuf/any.upb.c - - src/core/ext/upb-generated/google/rpc/status.upb.c - src/core/lib/gpr/alloc.cc - src/core/lib/gpr/atm.cc - src/core/lib/gpr/cpu_iphone.cc @@ -269,7 +264,6 @@ libs: - src/core/lib/gprpp/mpscq.cc - src/core/lib/gprpp/stat_posix.cc - src/core/lib/gprpp/stat_windows.cc - - src/core/lib/gprpp/status_helper.cc - src/core/lib/gprpp/thd_posix.cc - src/core/lib/gprpp/thd_windows.cc - src/core/lib/gprpp/time_util.cc @@ -287,7 +281,6 @@ libs: - absl/synchronization:synchronization - absl/time:time - absl/types:optional - - upb - name: grpc build: all language: c @@ -764,6 +757,7 @@ libs: - src/core/lib/gprpp/ref_counted.h - src/core/lib/gprpp/ref_counted_ptr.h - src/core/lib/gprpp/single_set_ptr.h + - src/core/lib/gprpp/status_helper.h - src/core/lib/gprpp/table.h - src/core/lib/gprpp/time.h - src/core/lib/gprpp/unique_type_name.h @@ -1431,6 +1425,7 @@ libs: - src/core/lib/event_engine/slice.cc - src/core/lib/event_engine/slice_buffer.cc - src/core/lib/event_engine/trace.cc + - src/core/lib/gprpp/status_helper.cc - src/core/lib/gprpp/time.cc - src/core/lib/http/format_request.cc - src/core/lib/http/httpcli.cc @@ -1679,6 +1674,7 @@ libs: - gpr - libssl - address_sorting + - upb baselib: true generate_plugin_registry: true - name: grpc_test_util @@ -1971,6 +1967,7 @@ libs: - src/core/lib/gprpp/ref_counted.h - src/core/lib/gprpp/ref_counted_ptr.h - src/core/lib/gprpp/single_set_ptr.h + - src/core/lib/gprpp/status_helper.h - src/core/lib/gprpp/table.h - src/core/lib/gprpp/time.h - src/core/lib/gprpp/unique_type_name.h @@ -2288,6 +2285,7 @@ libs: - src/core/lib/event_engine/slice.cc - src/core/lib/event_engine/slice_buffer.cc - src/core/lib/event_engine/trace.cc + - src/core/lib/gprpp/status_helper.cc - src/core/lib/gprpp/time.cc - src/core/lib/http/format_request.cc - src/core/lib/http/httpcli.cc @@ -2471,6 +2469,7 @@ libs: - absl/utility:utility - gpr - address_sorting + - upb baselib: true generate_plugin_registry: true - name: benchmark_helpers @@ -3825,11 +3824,15 @@ targets: build: test language: c headers: + - src/core/ext/upb-generated/google/protobuf/any.upb.h + - src/core/ext/upb-generated/google/rpc/status.upb.h - src/core/lib/debug/trace.h - src/core/lib/gprpp/atomic_utils.h + - src/core/lib/gprpp/bitset.h - src/core/lib/gprpp/orphanable.h - src/core/lib/gprpp/ref_counted.h - src/core/lib/gprpp/ref_counted_ptr.h + - src/core/lib/gprpp/status_helper.h - src/core/lib/gprpp/time.h - src/core/lib/iomgr/closure.h - src/core/lib/iomgr/combiner.h @@ -3853,14 +3856,18 @@ targets: - src/core/lib/promise/seq.h - src/core/lib/resource_quota/memory_quota.h - src/core/lib/resource_quota/trace.h + - src/core/lib/slice/percent_encoding.h - src/core/lib/slice/slice.h - src/core/lib/slice/slice_internal.h - src/core/lib/slice/slice_refcount.h - src/core/lib/slice/slice_refcount_base.h - src/core/lib/slice/slice_string_helpers.h src: + - src/core/ext/upb-generated/google/protobuf/any.upb.c + - src/core/ext/upb-generated/google/rpc/status.upb.c - src/core/lib/debug/trace.cc - src/core/lib/event_engine/memory_allocator.cc + - src/core/lib/gprpp/status_helper.cc - src/core/lib/gprpp/time.cc - src/core/lib/iomgr/combiner.cc - src/core/lib/iomgr/error.cc @@ -3870,6 +3877,7 @@ targets: - src/core/lib/promise/activity.cc - src/core/lib/resource_quota/memory_quota.cc - src/core/lib/resource_quota/trace.cc + - src/core/lib/slice/percent_encoding.cc - src/core/lib/slice/slice.cc - src/core/lib/slice/slice_refcount.cc - src/core/lib/slice/slice_string_helpers.cc @@ -3880,6 +3888,7 @@ targets: - absl/types:variant - absl/utility:utility - gpr + - upb platforms: - linux - posix @@ -4335,8 +4344,6 @@ targets: build: test language: c++ headers: - - src/core/ext/upb-generated/google/protobuf/any.upb.h - - src/core/ext/upb-generated/google/rpc/status.upb.h - src/core/lib/gpr/alloc.h - src/core/lib/gpr/env.h - src/core/lib/gpr/murmur_hash.h @@ -4365,7 +4372,6 @@ targets: - src/core/lib/gprpp/ref_counted.h - src/core/lib/gprpp/ref_counted_ptr.h - src/core/lib/gprpp/stat.h - - src/core/lib/gprpp/status_helper.h - src/core/lib/gprpp/sync.h - src/core/lib/gprpp/thd.h - src/core/lib/gprpp/time_util.h @@ -4385,8 +4391,6 @@ targets: - src/core/lib/promise/wait_set.h - test/core/promise/test_wakeup_schedulers.h src: - - src/core/ext/upb-generated/google/protobuf/any.upb.c - - src/core/ext/upb-generated/google/rpc/status.upb.c - src/core/lib/gpr/alloc.cc - src/core/lib/gpr/atm.cc - src/core/lib/gpr/cpu_iphone.cc @@ -4425,7 +4429,6 @@ targets: - src/core/lib/gprpp/mpscq.cc - src/core/lib/gprpp/stat_posix.cc - src/core/lib/gprpp/stat_windows.cc - - src/core/lib/gprpp/status_helper.cc - src/core/lib/gprpp/thd_posix.cc - src/core/lib/gprpp/thd_windows.cc - src/core/lib/gprpp/time_util.cc @@ -4451,7 +4454,6 @@ targets: - absl/types:optional - absl/types:variant - absl/utility:utility - - upb uses_polling: false - name: address_sorting_test gtest: true @@ -4556,12 +4558,16 @@ targets: build: test language: c++ headers: + - src/core/ext/upb-generated/google/protobuf/any.upb.h + - src/core/ext/upb-generated/google/rpc/status.upb.h - src/core/lib/debug/trace.h - src/core/lib/gprpp/atomic_utils.h + - src/core/lib/gprpp/bitset.h - src/core/lib/gprpp/cpp_impl_of.h - src/core/lib/gprpp/orphanable.h - src/core/lib/gprpp/ref_counted.h - src/core/lib/gprpp/ref_counted_ptr.h + - src/core/lib/gprpp/status_helper.h - src/core/lib/gprpp/time.h - src/core/lib/iomgr/closure.h - src/core/lib/iomgr/combiner.h @@ -4589,6 +4595,7 @@ targets: - src/core/lib/resource_quota/resource_quota.h - src/core/lib/resource_quota/thread_quota.h - src/core/lib/resource_quota/trace.h + - src/core/lib/slice/percent_encoding.h - src/core/lib/slice/slice.h - src/core/lib/slice/slice_internal.h - src/core/lib/slice/slice_refcount.h @@ -4596,8 +4603,11 @@ targets: - src/core/lib/slice/slice_string_helpers.h - test/core/promise/test_context.h src: + - src/core/ext/upb-generated/google/protobuf/any.upb.c + - src/core/ext/upb-generated/google/rpc/status.upb.c - src/core/lib/debug/trace.cc - src/core/lib/event_engine/memory_allocator.cc + - src/core/lib/gprpp/status_helper.cc - src/core/lib/gprpp/time.cc - src/core/lib/iomgr/combiner.cc - src/core/lib/iomgr/error.cc @@ -4610,6 +4620,7 @@ targets: - src/core/lib/resource_quota/resource_quota.cc - src/core/lib/resource_quota/thread_quota.cc - src/core/lib/resource_quota/trace.cc + - src/core/lib/slice/percent_encoding.cc - src/core/lib/slice/slice.cc - src/core/lib/slice/slice_refcount.cc - src/core/lib/slice/slice_string_helpers.cc @@ -4620,6 +4631,7 @@ targets: - absl/types:variant - absl/utility:utility - gpr + - upb uses_polling: false - name: async_end2end_test gtest: true @@ -5095,13 +5107,17 @@ targets: build: test language: c++ headers: + - src/core/ext/upb-generated/google/protobuf/any.upb.h + - src/core/ext/upb-generated/google/rpc/status.upb.h - src/core/lib/debug/trace.h - src/core/lib/gprpp/atomic_utils.h + - src/core/lib/gprpp/bitset.h - src/core/lib/gprpp/chunked_vector.h - src/core/lib/gprpp/cpp_impl_of.h - src/core/lib/gprpp/orphanable.h - src/core/lib/gprpp/ref_counted.h - src/core/lib/gprpp/ref_counted_ptr.h + - src/core/lib/gprpp/status_helper.h - src/core/lib/gprpp/time.h - src/core/lib/iomgr/closure.h - src/core/lib/iomgr/combiner.h @@ -5128,14 +5144,18 @@ targets: - src/core/lib/resource_quota/resource_quota.h - src/core/lib/resource_quota/thread_quota.h - src/core/lib/resource_quota/trace.h + - src/core/lib/slice/percent_encoding.h - src/core/lib/slice/slice.h - src/core/lib/slice/slice_internal.h - src/core/lib/slice/slice_refcount.h - src/core/lib/slice/slice_refcount_base.h - src/core/lib/slice/slice_string_helpers.h src: + - src/core/ext/upb-generated/google/protobuf/any.upb.c + - src/core/ext/upb-generated/google/rpc/status.upb.c - src/core/lib/debug/trace.cc - src/core/lib/event_engine/memory_allocator.cc + - src/core/lib/gprpp/status_helper.cc - src/core/lib/gprpp/time.cc - src/core/lib/iomgr/combiner.cc - src/core/lib/iomgr/error.cc @@ -5148,6 +5168,7 @@ targets: - src/core/lib/resource_quota/resource_quota.cc - src/core/lib/resource_quota/thread_quota.cc - src/core/lib/resource_quota/trace.cc + - src/core/lib/slice/percent_encoding.cc - src/core/lib/slice/slice.cc - src/core/lib/slice/slice_refcount.cc - src/core/lib/slice/slice_string_helpers.cc @@ -5158,6 +5179,7 @@ targets: - absl/types:variant - absl/utility:utility - gpr + - upb uses_polling: false - name: cli_call_test gtest: true @@ -5671,11 +5693,15 @@ targets: build: test language: c++ headers: + - src/core/ext/upb-generated/google/protobuf/any.upb.h + - src/core/ext/upb-generated/google/rpc/status.upb.h - src/core/lib/debug/trace.h - src/core/lib/gprpp/atomic_utils.h + - src/core/lib/gprpp/bitset.h - src/core/lib/gprpp/orphanable.h - src/core/lib/gprpp/ref_counted.h - src/core/lib/gprpp/ref_counted_ptr.h + - src/core/lib/gprpp/status_helper.h - src/core/lib/gprpp/time.h - src/core/lib/iomgr/closure.h - src/core/lib/iomgr/combiner.h @@ -5691,13 +5717,17 @@ targets: - src/core/lib/promise/detail/status.h - src/core/lib/promise/exec_ctx_wakeup_scheduler.h - src/core/lib/promise/poll.h + - src/core/lib/slice/percent_encoding.h - src/core/lib/slice/slice.h - src/core/lib/slice/slice_internal.h - src/core/lib/slice/slice_refcount.h - src/core/lib/slice/slice_refcount_base.h - src/core/lib/slice/slice_string_helpers.h src: + - src/core/ext/upb-generated/google/protobuf/any.upb.c + - src/core/ext/upb-generated/google/rpc/status.upb.c - src/core/lib/debug/trace.cc + - src/core/lib/gprpp/status_helper.cc - src/core/lib/gprpp/time.cc - src/core/lib/iomgr/combiner.cc - src/core/lib/iomgr/error.cc @@ -5705,6 +5735,7 @@ targets: - src/core/lib/iomgr/executor.cc - src/core/lib/iomgr/iomgr_internal.cc - src/core/lib/promise/activity.cc + - src/core/lib/slice/percent_encoding.cc - src/core/lib/slice/slice.cc - src/core/lib/slice/slice_refcount.cc - src/core/lib/slice/slice_string_helpers.cc @@ -5715,6 +5746,7 @@ targets: - absl/types:variant - absl/utility:utility - gpr + - upb uses_polling: false - name: fake_binder_test gtest: true @@ -5866,6 +5898,8 @@ targets: build: test language: c++ headers: + - src/core/ext/upb-generated/google/protobuf/any.upb.h + - src/core/ext/upb-generated/google/rpc/status.upb.h - src/core/lib/debug/trace.h - src/core/lib/gprpp/atomic_utils.h - src/core/lib/gprpp/bitset.h @@ -5873,6 +5907,7 @@ targets: - src/core/lib/gprpp/orphanable.h - src/core/lib/gprpp/ref_counted.h - src/core/lib/gprpp/ref_counted_ptr.h + - src/core/lib/gprpp/status_helper.h - src/core/lib/gprpp/time.h - src/core/lib/iomgr/closure.h - src/core/lib/iomgr/combiner.h @@ -5906,6 +5941,7 @@ targets: - src/core/lib/resource_quota/resource_quota.h - src/core/lib/resource_quota/thread_quota.h - src/core/lib/resource_quota/trace.h + - src/core/lib/slice/percent_encoding.h - src/core/lib/slice/slice.h - src/core/lib/slice/slice_internal.h - src/core/lib/slice/slice_refcount.h @@ -5913,8 +5949,11 @@ targets: - src/core/lib/slice/slice_string_helpers.h - test/core/promise/test_wakeup_schedulers.h src: + - src/core/ext/upb-generated/google/protobuf/any.upb.c + - src/core/ext/upb-generated/google/rpc/status.upb.c - src/core/lib/debug/trace.cc - src/core/lib/event_engine/memory_allocator.cc + - src/core/lib/gprpp/status_helper.cc - src/core/lib/gprpp/time.cc - src/core/lib/iomgr/combiner.cc - src/core/lib/iomgr/error.cc @@ -5927,6 +5966,7 @@ targets: - src/core/lib/resource_quota/resource_quota.cc - src/core/lib/resource_quota/thread_quota.cc - src/core/lib/resource_quota/trace.cc + - src/core/lib/slice/percent_encoding.cc - src/core/lib/slice/slice.cc - src/core/lib/slice/slice_refcount.cc - src/core/lib/slice/slice_string_helpers.cc @@ -5939,6 +5979,7 @@ targets: - absl/types:variant - absl/utility:utility - gpr + - upb uses_polling: false - name: generic_end2end_test gtest: true @@ -6545,8 +6586,6 @@ targets: build: test language: c++ headers: - - src/core/ext/upb-generated/google/protobuf/any.upb.h - - src/core/ext/upb-generated/google/rpc/status.upb.h - src/core/lib/gpr/alloc.h - src/core/lib/gpr/env.h - src/core/lib/gpr/murmur_hash.h @@ -6575,7 +6614,6 @@ targets: - src/core/lib/gprpp/ref_counted.h - src/core/lib/gprpp/ref_counted_ptr.h - src/core/lib/gprpp/stat.h - - src/core/lib/gprpp/status_helper.h - src/core/lib/gprpp/sync.h - src/core/lib/gprpp/thd.h - src/core/lib/gprpp/time_util.h @@ -6595,8 +6633,6 @@ targets: - src/core/lib/promise/seq.h - test/core/promise/test_wakeup_schedulers.h src: - - src/core/ext/upb-generated/google/protobuf/any.upb.c - - src/core/ext/upb-generated/google/rpc/status.upb.c - src/core/lib/gpr/alloc.cc - src/core/lib/gpr/atm.cc - src/core/lib/gpr/cpu_iphone.cc @@ -6635,7 +6671,6 @@ targets: - src/core/lib/gprpp/mpscq.cc - src/core/lib/gprpp/stat_posix.cc - src/core/lib/gprpp/stat_windows.cc - - src/core/lib/gprpp/status_helper.cc - src/core/lib/gprpp/thd_posix.cc - src/core/lib/gprpp/thd_windows.cc - src/core/lib/gprpp/time_util.cc @@ -6659,7 +6694,6 @@ targets: - absl/types:optional - absl/types:variant - absl/utility:utility - - upb uses_polling: false - name: lb_get_cpu_stats_test gtest: true @@ -6756,11 +6790,15 @@ targets: build: test language: c++ headers: + - src/core/ext/upb-generated/google/protobuf/any.upb.h + - src/core/ext/upb-generated/google/rpc/status.upb.h - src/core/lib/debug/trace.h - src/core/lib/gprpp/atomic_utils.h + - src/core/lib/gprpp/bitset.h - src/core/lib/gprpp/orphanable.h - src/core/lib/gprpp/ref_counted.h - src/core/lib/gprpp/ref_counted_ptr.h + - src/core/lib/gprpp/status_helper.h - src/core/lib/gprpp/time.h - src/core/lib/iomgr/closure.h - src/core/lib/iomgr/combiner.h @@ -6784,6 +6822,7 @@ targets: - src/core/lib/promise/seq.h - src/core/lib/resource_quota/memory_quota.h - src/core/lib/resource_quota/trace.h + - src/core/lib/slice/percent_encoding.h - src/core/lib/slice/slice.h - src/core/lib/slice/slice_internal.h - src/core/lib/slice/slice_refcount.h @@ -6791,8 +6830,11 @@ targets: - src/core/lib/slice/slice_string_helpers.h - test/core/resource_quota/call_checker.h src: + - src/core/ext/upb-generated/google/protobuf/any.upb.c + - src/core/ext/upb-generated/google/rpc/status.upb.c - src/core/lib/debug/trace.cc - src/core/lib/event_engine/memory_allocator.cc + - src/core/lib/gprpp/status_helper.cc - src/core/lib/gprpp/time.cc - src/core/lib/iomgr/combiner.cc - src/core/lib/iomgr/error.cc @@ -6802,6 +6844,7 @@ targets: - src/core/lib/promise/activity.cc - src/core/lib/resource_quota/memory_quota.cc - src/core/lib/resource_quota/trace.cc + - src/core/lib/slice/percent_encoding.cc - src/core/lib/slice/slice.cc - src/core/lib/slice/slice_refcount.cc - src/core/lib/slice/slice_string_helpers.cc @@ -6812,6 +6855,7 @@ targets: - absl/types:variant - absl/utility:utility - gpr + - upb uses_polling: false - name: message_allocator_end2end_test gtest: true @@ -6893,8 +6937,6 @@ targets: build: test language: c++ headers: - - src/core/ext/upb-generated/google/protobuf/any.upb.h - - src/core/ext/upb-generated/google/rpc/status.upb.h - src/core/lib/gpr/alloc.h - src/core/lib/gpr/env.h - src/core/lib/gpr/murmur_hash.h @@ -6922,7 +6964,6 @@ targets: - src/core/lib/gprpp/ref_counted.h - src/core/lib/gprpp/ref_counted_ptr.h - src/core/lib/gprpp/stat.h - - src/core/lib/gprpp/status_helper.h - src/core/lib/gprpp/sync.h - src/core/lib/gprpp/thd.h - src/core/lib/gprpp/time_util.h @@ -6941,8 +6982,6 @@ targets: - src/core/lib/promise/wait_set.h - test/core/promise/test_wakeup_schedulers.h src: - - src/core/ext/upb-generated/google/protobuf/any.upb.c - - src/core/ext/upb-generated/google/rpc/status.upb.c - src/core/lib/gpr/alloc.cc - src/core/lib/gpr/atm.cc - src/core/lib/gpr/cpu_iphone.cc @@ -6981,7 +7020,6 @@ targets: - src/core/lib/gprpp/mpscq.cc - src/core/lib/gprpp/stat_posix.cc - src/core/lib/gprpp/stat_windows.cc - - src/core/lib/gprpp/status_helper.cc - src/core/lib/gprpp/thd_posix.cc - src/core/lib/gprpp/thd_windows.cc - src/core/lib/gprpp/time_util.cc @@ -7007,7 +7045,6 @@ targets: - absl/types:optional - absl/types:variant - absl/utility:utility - - upb uses_polling: false - name: orca_service_end2end_test gtest: true @@ -7076,6 +7113,8 @@ targets: build: test language: c++ headers: + - src/core/ext/upb-generated/google/protobuf/any.upb.h + - src/core/ext/upb-generated/google/rpc/status.upb.h - src/core/lib/debug/trace.h - src/core/lib/gprpp/atomic_utils.h - src/core/lib/gprpp/bitset.h @@ -7083,6 +7122,7 @@ targets: - src/core/lib/gprpp/orphanable.h - src/core/lib/gprpp/ref_counted.h - src/core/lib/gprpp/ref_counted_ptr.h + - src/core/lib/gprpp/status_helper.h - src/core/lib/gprpp/time.h - src/core/lib/iomgr/closure.h - src/core/lib/iomgr/combiner.h @@ -7114,6 +7154,7 @@ targets: - src/core/lib/resource_quota/resource_quota.h - src/core/lib/resource_quota/thread_quota.h - src/core/lib/resource_quota/trace.h + - src/core/lib/slice/percent_encoding.h - src/core/lib/slice/slice.h - src/core/lib/slice/slice_internal.h - src/core/lib/slice/slice_refcount.h @@ -7121,8 +7162,11 @@ targets: - src/core/lib/slice/slice_string_helpers.h - test/core/promise/test_wakeup_schedulers.h src: + - src/core/ext/upb-generated/google/protobuf/any.upb.c + - src/core/ext/upb-generated/google/rpc/status.upb.c - src/core/lib/debug/trace.cc - src/core/lib/event_engine/memory_allocator.cc + - src/core/lib/gprpp/status_helper.cc - src/core/lib/gprpp/time.cc - src/core/lib/iomgr/combiner.cc - src/core/lib/iomgr/error.cc @@ -7135,6 +7179,7 @@ targets: - src/core/lib/resource_quota/resource_quota.cc - src/core/lib/resource_quota/thread_quota.cc - src/core/lib/resource_quota/trace.cc + - src/core/lib/slice/percent_encoding.cc - src/core/lib/slice/slice.cc - src/core/lib/slice/slice_refcount.cc - src/core/lib/slice/slice_string_helpers.cc @@ -7145,6 +7190,7 @@ targets: - absl/types:variant - absl/utility:utility - gpr + - upb uses_polling: false - name: poll_test gtest: true @@ -7445,12 +7491,16 @@ targets: build: test language: c++ headers: + - src/core/ext/upb-generated/google/protobuf/any.upb.h + - src/core/ext/upb-generated/google/rpc/status.upb.h - src/core/lib/debug/trace.h - src/core/lib/gprpp/atomic_utils.h + - src/core/lib/gprpp/bitset.h - src/core/lib/gprpp/cpp_impl_of.h - src/core/lib/gprpp/orphanable.h - src/core/lib/gprpp/ref_counted.h - src/core/lib/gprpp/ref_counted_ptr.h + - src/core/lib/gprpp/status_helper.h - src/core/lib/gprpp/time.h - src/core/lib/iomgr/closure.h - src/core/lib/iomgr/combiner.h @@ -7476,14 +7526,18 @@ targets: - src/core/lib/resource_quota/resource_quota.h - src/core/lib/resource_quota/thread_quota.h - src/core/lib/resource_quota/trace.h + - src/core/lib/slice/percent_encoding.h - src/core/lib/slice/slice.h - src/core/lib/slice/slice_internal.h - src/core/lib/slice/slice_refcount.h - src/core/lib/slice/slice_refcount_base.h - src/core/lib/slice/slice_string_helpers.h src: + - src/core/ext/upb-generated/google/protobuf/any.upb.c + - src/core/ext/upb-generated/google/rpc/status.upb.c - src/core/lib/debug/trace.cc - src/core/lib/event_engine/memory_allocator.cc + - src/core/lib/gprpp/status_helper.cc - src/core/lib/gprpp/time.cc - src/core/lib/iomgr/combiner.cc - src/core/lib/iomgr/error.cc @@ -7495,6 +7549,7 @@ targets: - src/core/lib/resource_quota/resource_quota.cc - src/core/lib/resource_quota/thread_quota.cc - src/core/lib/resource_quota/trace.cc + - src/core/lib/slice/percent_encoding.cc - src/core/lib/slice/slice.cc - src/core/lib/slice/slice_refcount.cc - src/core/lib/slice/slice_string_helpers.cc @@ -7505,6 +7560,7 @@ targets: - absl/types:variant - absl/utility:utility - gpr + - upb uses_polling: false - name: retry_throttle_test gtest: true @@ -7785,8 +7841,6 @@ targets: build: test language: c++ headers: - - src/core/ext/upb-generated/google/protobuf/any.upb.h - - src/core/ext/upb-generated/google/rpc/status.upb.h - src/core/lib/gpr/alloc.h - src/core/lib/gpr/env.h - src/core/lib/gpr/murmur_hash.h @@ -7811,14 +7865,11 @@ targets: - src/core/lib/gprpp/mpscq.h - src/core/lib/gprpp/single_set_ptr.h - src/core/lib/gprpp/stat.h - - src/core/lib/gprpp/status_helper.h - src/core/lib/gprpp/sync.h - src/core/lib/gprpp/thd.h - src/core/lib/gprpp/time_util.h - src/core/lib/profiling/timers.h src: - - src/core/ext/upb-generated/google/protobuf/any.upb.c - - src/core/ext/upb-generated/google/rpc/status.upb.c - src/core/lib/gpr/alloc.cc - src/core/lib/gpr/atm.cc - src/core/lib/gpr/cpu_iphone.cc @@ -7857,7 +7908,6 @@ targets: - src/core/lib/gprpp/mpscq.cc - src/core/lib/gprpp/stat_posix.cc - src/core/lib/gprpp/stat_windows.cc - - src/core/lib/gprpp/status_helper.cc - src/core/lib/gprpp/thd_posix.cc - src/core/lib/gprpp/thd_windows.cc - src/core/lib/gprpp/time_util.cc @@ -7876,7 +7926,6 @@ targets: - absl/synchronization:synchronization - absl/time:time - absl/types:optional - - upb uses_polling: false - name: sleep_test gtest: true @@ -8045,8 +8094,6 @@ targets: build: test language: c++ headers: - - src/core/ext/upb-generated/google/protobuf/any.upb.h - - src/core/ext/upb-generated/google/rpc/status.upb.h - src/core/lib/gpr/alloc.h - src/core/lib/gpr/env.h - src/core/lib/gpr/murmur_hash.h @@ -8070,15 +8117,12 @@ targets: - src/core/lib/gprpp/memory.h - src/core/lib/gprpp/mpscq.h - src/core/lib/gprpp/stat.h - - src/core/lib/gprpp/status_helper.h - src/core/lib/gprpp/sync.h - src/core/lib/gprpp/thd.h - src/core/lib/gprpp/time.h - src/core/lib/gprpp/time_util.h - src/core/lib/profiling/timers.h src: - - src/core/ext/upb-generated/google/protobuf/any.upb.c - - src/core/ext/upb-generated/google/rpc/status.upb.c - src/core/lib/gpr/alloc.cc - src/core/lib/gpr/atm.cc - src/core/lib/gpr/cpu_iphone.cc @@ -8117,7 +8161,6 @@ targets: - src/core/lib/gprpp/mpscq.cc - src/core/lib/gprpp/stat_posix.cc - src/core/lib/gprpp/stat_windows.cc - - src/core/lib/gprpp/status_helper.cc - src/core/lib/gprpp/thd_posix.cc - src/core/lib/gprpp/thd_windows.cc - src/core/lib/gprpp/time.cc @@ -8137,7 +8180,6 @@ targets: - absl/synchronization:synchronization - absl/time:time - absl/types:optional - - upb uses_polling: false - name: test_core_security_credentials_test gtest: true @@ -8229,8 +8271,6 @@ targets: build: test language: c++ headers: - - src/core/ext/upb-generated/google/protobuf/any.upb.h - - src/core/ext/upb-generated/google/rpc/status.upb.h - src/core/lib/gpr/alloc.h - src/core/lib/gpr/env.h - src/core/lib/gpr/murmur_hash.h @@ -8257,15 +8297,12 @@ targets: - src/core/lib/gprpp/ref_counted.h - src/core/lib/gprpp/ref_counted_ptr.h - src/core/lib/gprpp/stat.h - - src/core/lib/gprpp/status_helper.h - src/core/lib/gprpp/sync.h - src/core/lib/gprpp/thd.h - src/core/lib/gprpp/time_util.h - src/core/lib/profiling/timers.h - src/core/lib/resource_quota/thread_quota.h src: - - src/core/ext/upb-generated/google/protobuf/any.upb.c - - src/core/ext/upb-generated/google/rpc/status.upb.c - src/core/lib/gpr/alloc.cc - src/core/lib/gpr/atm.cc - src/core/lib/gpr/cpu_iphone.cc @@ -8304,7 +8341,6 @@ targets: - src/core/lib/gprpp/mpscq.cc - src/core/lib/gprpp/stat_posix.cc - src/core/lib/gprpp/stat_windows.cc - - src/core/lib/gprpp/status_helper.cc - src/core/lib/gprpp/thd_posix.cc - src/core/lib/gprpp/thd_windows.cc - src/core/lib/gprpp/time_util.cc @@ -8324,7 +8360,6 @@ targets: - absl/synchronization:synchronization - absl/time:time - absl/types:optional - - upb uses_polling: false - name: thread_stress_test gtest: true diff --git a/grpc.gyp b/grpc.gyp index 8733b3611c7..dd5c35a9914 100644 --- a/grpc.gyp +++ b/grpc.gyp @@ -305,11 +305,8 @@ 'absl/synchronization:synchronization', 'absl/time:time', 'absl/types:optional', - 'upb', ], 'sources': [ - 'src/core/ext/upb-generated/google/protobuf/any.upb.c', - 'src/core/ext/upb-generated/google/rpc/status.upb.c', 'src/core/lib/gpr/alloc.cc', 'src/core/lib/gpr/atm.cc', 'src/core/lib/gpr/cpu_iphone.cc', @@ -348,7 +345,6 @@ 'src/core/lib/gprpp/mpscq.cc', 'src/core/lib/gprpp/stat_posix.cc', 'src/core/lib/gprpp/stat_windows.cc', - 'src/core/lib/gprpp/status_helper.cc', 'src/core/lib/gprpp/thd_posix.cc', 'src/core/lib/gprpp/thd_windows.cc', 'src/core/lib/gprpp/time_util.cc', @@ -373,6 +369,7 @@ 'absl/utility:utility', 'gpr', 'address_sorting', + 'upb', ], 'sources': [ 'src/core/ext/filters/census/grpc_context.cc', @@ -806,6 +803,7 @@ 'src/core/lib/event_engine/slice.cc', 'src/core/lib/event_engine/slice_buffer.cc', 'src/core/lib/event_engine/trace.cc', + 'src/core/lib/gprpp/status_helper.cc', 'src/core/lib/gprpp/time.cc', 'src/core/lib/http/format_request.cc', 'src/core/lib/http/httpcli.cc', @@ -1125,6 +1123,7 @@ 'absl/utility:utility', 'gpr', 'address_sorting', + 'upb', ], 'sources': [ 'src/core/ext/filters/census/grpc_context.cc', @@ -1264,6 +1263,7 @@ 'src/core/lib/event_engine/slice.cc', 'src/core/lib/event_engine/slice_buffer.cc', 'src/core/lib/event_engine/trace.cc', + 'src/core/lib/gprpp/status_helper.cc', 'src/core/lib/gprpp/time.cc', 'src/core/lib/http/format_request.cc', 'src/core/lib/http/httpcli.cc', diff --git a/src/core/ext/transport/chttp2/transport/parsing.cc b/src/core/ext/transport/chttp2/transport/parsing.cc index 867803a3b86..2c6f06f3197 100644 --- a/src/core/ext/transport/chttp2/transport/parsing.cc +++ b/src/core/ext/transport/chttp2/transport/parsing.cc @@ -74,6 +74,10 @@ static grpc_error_handle parse_frame_slice(grpc_chttp2_transport* t, const grpc_slice& slice, int is_last); +static char get_utf8_safe_char(char c) { + return static_cast(c) < 128 ? c : 32; +} + grpc_error_handle grpc_chttp2_perform_read(grpc_chttp2_transport* t, const grpc_slice& slice) { const uint8_t* beg = GRPC_SLICE_START_PTR(slice); @@ -113,10 +117,12 @@ grpc_error_handle grpc_chttp2_perform_read(grpc_chttp2_transport* t, return GRPC_ERROR_CREATE_FROM_CPP_STRING(absl::StrFormat( "Connect string mismatch: expected '%c' (%d) got '%c' (%d) " "at byte %d", - GRPC_CHTTP2_CLIENT_CONNECT_STRING[t->deframe_state], + get_utf8_safe_char( + GRPC_CHTTP2_CLIENT_CONNECT_STRING[t->deframe_state]), static_cast(static_cast( GRPC_CHTTP2_CLIENT_CONNECT_STRING[t->deframe_state])), - *cur, static_cast(*cur), t->deframe_state)); + get_utf8_safe_char(*cur), static_cast(*cur), + t->deframe_state)); } ++cur; // NOLINTNEXTLINE(bugprone-misplaced-widening-cast) diff --git a/src/core/lib/gprpp/status_helper.cc b/src/core/lib/gprpp/status_helper.cc index f981df86017..60eabeec44d 100644 --- a/src/core/lib/gprpp/status_helper.cc +++ b/src/core/lib/gprpp/status_helper.cc @@ -40,6 +40,9 @@ #include +#include "src/core/lib/slice/percent_encoding.h" +#include "src/core/lib/slice/slice.h" + namespace grpc_core { namespace { @@ -357,9 +360,21 @@ namespace internal { google_rpc_Status* StatusToProto(const absl::Status& status, upb_Arena* arena) { google_rpc_Status* msg = google_rpc_Status_new(arena); google_rpc_Status_set_code(msg, int32_t(status.code())); + // Protobuf string field requires to be utf-8 encoding but C++ string doesn't + // this requirement so it can be a non utf-8 string. So it should be converted + // to a percent-encoded string to keep it as a utf-8 string. + Slice message_percent_slice = + PercentEncodeSlice(Slice::FromExternalString(status.message()), + PercentEncodingType::Compatible); + char* message_percent = reinterpret_cast( + upb_Arena_Malloc(arena, message_percent_slice.length())); + if (message_percent_slice.length() > 0) { + memcpy(message_percent, message_percent_slice.data(), + message_percent_slice.length()); + } google_rpc_Status_set_message( - msg, upb_StringView_FromDataAndSize(status.message().data(), - status.message().size())); + msg, upb_StringView_FromDataAndSize(message_percent, + message_percent_slice.length())); status.ForEachPayload([&](absl::string_view type_url, const absl::Cord& payload) { google_protobuf_Any* any = google_rpc_Status_add_details(msg, arena); @@ -389,9 +404,15 @@ google_rpc_Status* StatusToProto(const absl::Status& status, upb_Arena* arena) { absl::Status StatusFromProto(google_rpc_Status* msg) { int32_t code = google_rpc_Status_code(msg); - upb_StringView message = google_rpc_Status_message(msg); - absl::Status status(static_cast(code), - absl::string_view(message.data, message.size)); + upb_StringView message_percent_upb = google_rpc_Status_message(msg); + Slice message_percent_slice = Slice::FromExternalString( + absl::string_view(message_percent_upb.data, message_percent_upb.size)); + Slice message_slice = + PermissivePercentDecodeSlice(std::move(message_percent_slice)); + absl::Status status( + static_cast(code), + absl::string_view(reinterpret_cast(message_slice.data()), + message_slice.size())); size_t detail_len; const google_protobuf_Any* const* details = google_rpc_Status_details(msg, &detail_len); diff --git a/test/core/gprpp/status_helper_test.cc b/test/core/gprpp/status_helper_test.cc index 18ed3fffb4f..0b9a2292589 100644 --- a/test/core/gprpp/status_helper_test.cc +++ b/test/core/gprpp/status_helper_test.cc @@ -84,9 +84,12 @@ TEST(StatusUtilTest, AddAndGetChildren) { absl::Status s = absl::CancelledError(); absl::Status child1 = absl::AbortedError("Message1"); absl::Status child2 = absl::DeadlineExceededError("Message2"); + absl::Status child3 = absl::UnimplementedError(""); StatusAddChild(&s, child1); StatusAddChild(&s, child2); - EXPECT_THAT(StatusGetChildren(s), ::testing::ElementsAre(child1, child2)); + StatusAddChild(&s, child3); + EXPECT_THAT(StatusGetChildren(s), + ::testing::ElementsAre(child1, child2, child3)); } TEST(StatusUtilTest, ToAndFromProto) { @@ -95,7 +98,23 @@ TEST(StatusUtilTest, ToAndFromProto) { StatusSetStr(&s, StatusStrProperty::kOsError, "value"); upb::Arena arena; google_rpc_Status* msg = internal::StatusToProto(s, arena.ptr()); - absl::Status s2 = internal::StatusFromProto(msg); + size_t len; + const char* buf = google_rpc_Status_serialize(msg, arena.ptr(), &len); + google_rpc_Status* msg2 = google_rpc_Status_parse(buf, len, arena.ptr()); + absl::Status s2 = internal::StatusFromProto(msg2); + EXPECT_EQ(s, s2); +} + +TEST(StatusUtilTest, ToAndFromProtoWithNonUTF8Characters) { + absl::Status s = absl::CancelledError("_\xAB\xCD\xEF_"); + StatusSetInt(&s, StatusIntProperty::kErrorNo, 2021); + StatusSetStr(&s, StatusStrProperty::kOsError, "!\xFF\xCC\xAA!"); + upb::Arena arena; + google_rpc_Status* msg = internal::StatusToProto(s, arena.ptr()); + size_t len; + const char* buf = google_rpc_Status_serialize(msg, arena.ptr(), &len); + google_rpc_Status* msg2 = google_rpc_Status_parse(buf, len, arena.ptr()); + absl::Status s2 = internal::StatusFromProto(msg2); EXPECT_EQ(s, s2); }