grpc 1.40.0 → 1.41.0

data/src/core/lib/gprpp/ref_counted.h

@@ -21,15 +21,15 @@
 
 #include <grpc/support/port_platform.h>
 
-#include <grpc/support/atm.h>
-#include <grpc/support/log.h>
-#include <grpc/support/sync.h>
-
 #include <atomic>
 #include <cassert>
 #include <cinttypes>
 
-#include "src/core/lib/gprpp/atomic.h"
+#include <grpc/support/atm.h>
+#include <grpc/support/log.h>
+#include <grpc/support/sync.h>
+
+#include "src/core/lib/gprpp/atomic_utils.h"
 #include "src/core/lib/gprpp/debug_location.h"
 #include "src/core/lib/gprpp/memory.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
@@ -70,18 +70,18 @@ class RefCount {
   // Increases the ref-count by `n`.
   void Ref(Value n = 1) {
 #ifndef NDEBUG
-    const Value prior = value_.FetchAdd(n, MemoryOrder::RELAXED);
+    const Value prior = value_.fetch_add(n, std::memory_order_relaxed);
     if (trace_ != nullptr) {
       gpr_log(GPR_INFO, "%s:%p ref %" PRIdPTR " -> %" PRIdPTR, trace_, this,
               prior, prior + n);
     }
 #else
-    value_.FetchAdd(n, MemoryOrder::RELAXED);
+    value_.fetch_add(n, std::memory_order_relaxed);
 #endif
   }
   void Ref(const DebugLocation& location, const char* reason, Value n = 1) {
 #ifndef NDEBUG
-    const Value prior = value_.FetchAdd(n, MemoryOrder::RELAXED);
+    const Value prior = value_.fetch_add(n, std::memory_order_relaxed);
     if (trace_ != nullptr) {
       gpr_log(GPR_INFO, "%s:%p %s:%d ref %" PRIdPTR " -> %" PRIdPTR " %s",
               trace_, this, location.file(), location.line(), prior, prior + n,
@@ -91,26 +91,26 @@ class RefCount {
     // Use conditionally-important parameters
     (void)location;
     (void)reason;
-    value_.FetchAdd(n, MemoryOrder::RELAXED);
+    value_.fetch_add(n, std::memory_order_relaxed);
 #endif
   }
 
   // Similar to Ref() with an assert on the ref-count being non-zero.
   void RefNonZero() {
 #ifndef NDEBUG
-    const Value prior = value_.FetchAdd(1, MemoryOrder::RELAXED);
+    const Value prior = value_.fetch_add(1, std::memory_order_relaxed);
     if (trace_ != nullptr) {
       gpr_log(GPR_INFO, "%s:%p ref %" PRIdPTR " -> %" PRIdPTR, trace_, this,
               prior, prior + 1);
     }
     assert(prior > 0);
 #else
-    value_.FetchAdd(1, MemoryOrder::RELAXED);
+    value_.fetch_add(1, std::memory_order_relaxed);
 #endif
   }
   void RefNonZero(const DebugLocation& location, const char* reason) {
 #ifndef NDEBUG
-    const Value prior = value_.FetchAdd(1, MemoryOrder::RELAXED);
+    const Value prior = value_.fetch_add(1, std::memory_order_relaxed);
     if (trace_ != nullptr) {
       gpr_log(GPR_INFO, "%s:%p %s:%d ref %" PRIdPTR " -> %" PRIdPTR " %s",
               trace_, this, location.file(), location.line(), prior, prior + 1,
@@ -133,7 +133,7 @@ class RefCount {
               trace_, this, prior, prior + 1);
     }
 #endif
-    return value_.IncrementIfNonzero();
+    return IncrementIfNonzero(&value_);
   }
   bool RefIfNonZero(const DebugLocation& location, const char* reason) {
 #ifndef NDEBUG
@@ -148,7 +148,7 @@ class RefCount {
     // Avoid unused-parameter warnings for debug-only parameters
     (void)location;
     (void)reason;
-    return value_.IncrementIfNonzero();
+    return IncrementIfNonzero(&value_);
   }
 
   // Decrements the ref-count and returns true if the ref-count reaches 0.
@@ -159,7 +159,7 @@ class RefCount {
     // safely access it, since another thread might free us in the interim.
     auto* trace = trace_;
 #endif
-    const Value prior = value_.FetchSub(1, MemoryOrder::ACQ_REL);
+    const Value prior = value_.fetch_sub(1, std::memory_order_acq_rel);
 #ifndef NDEBUG
     if (trace != nullptr) {
       gpr_log(GPR_INFO, "%s:%p unref %" PRIdPTR " -> %" PRIdPTR, trace, this,
@@ -176,7 +176,7 @@ class RefCount {
     // safely access it, since another thread might free us in the interim.
     auto* trace = trace_;
 #endif
-    const Value prior = value_.FetchSub(1, MemoryOrder::ACQ_REL);
+    const Value prior = value_.fetch_sub(1, std::memory_order_acq_rel);
 #ifndef NDEBUG
     if (trace != nullptr) {
       gpr_log(GPR_INFO, "%s:%p %s:%d unref %" PRIdPTR " -> %" PRIdPTR " %s",
@@ -193,12 +193,12 @@ class RefCount {
   }
 
  private:
-  Value get() const { return value_.Load(MemoryOrder::RELAXED); }
+  Value get() const { return value_.load(std::memory_order_relaxed); }
 
 #ifndef NDEBUG
   const char* trace_;
 #endif
-  Atomic<Value> value_;
+  std::atomic<Value> value_{0};
 };
 
 // PolymorphicRefCount enforces polymorphic destruction of RefCounted.

data/src/core/lib/gprpp/status_helper.cc

@@ -19,9 +19,6 @@
 #include <grpc/support/port_platform.h>
 
 #include "src/core/lib/gprpp/status_helper.h"
-#include "src/core/lib/gprpp/time_util.h"
-
-#include <grpc/support/log.h>
 
 #include "absl/strings/cord.h"
 #include "absl/strings/escaping.h"
@@ -29,11 +26,14 @@
 #include "absl/strings/str_format.h"
 #include "absl/strings/str_join.h"
 #include "absl/time/clock.h"
-
 #include "google/protobuf/any.upb.h"
 #include "google/rpc/status.upb.h"
 #include "upb/upb.hpp"
 
+#include <grpc/support/log.h>
+
+#include "src/core/lib/gprpp/time_util.h"
+
 namespace grpc_core {
 
 namespace {

data/src/core/lib/gprpp/sync.h

@@ -21,11 +21,12 @@
 
 #include <grpc/support/port_platform.h>
 
+#include "absl/synchronization/mutex.h"
+
 #include <grpc/support/log.h>
 #include <grpc/support/sync.h>
 #include <grpc/support/time.h>
 
-#include "absl/synchronization/mutex.h"
 #include "src/core/lib/gprpp/time_util.h"
 
 // The core library is not accessible in C++ codegen headers, and vice versa.
@@ -68,6 +69,7 @@ class ABSL_LOCKABLE Mutex {
   bool TryLock() ABSL_EXCLUSIVE_TRYLOCK_FUNCTION(true) {
     return gpr_mu_trylock(&mu_) != 0;
   }
+  void AssertHeld() ABSL_ASSERT_EXCLUSIVE_LOCK() {}
 
  private:
   gpr_mu mu_;

data/src/core/lib/gprpp/thd_posix.cc

@@ -22,20 +22,20 @@
 
 #ifdef GPR_POSIX_SYNC
 
-#include "src/core/lib/gprpp/thd.h"
+#include <pthread.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
 
 #include <grpc/support/alloc.h>
 #include <grpc/support/log.h>
 #include <grpc/support/sync.h>
 #include <grpc/support/thd_id.h>
-#include <pthread.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
 
 #include "src/core/lib/gpr/useful.h"
 #include "src/core/lib/gprpp/fork.h"
 #include "src/core/lib/gprpp/memory.h"
+#include "src/core/lib/gprpp/thd.h"
 
 namespace grpc_core {
 namespace {

data/src/core/lib/gprpp/thd_windows.cc

@@ -22,22 +22,15 @@
 
 #ifdef GPR_WINDOWS
 
-#include "src/core/lib/gprpp/thd.h"
+#include <string.h>
 
 #include <grpc/support/alloc.h>
 #include <grpc/support/log.h>
 #include <grpc/support/thd_id.h>
-#include <string.h>
 
+#include "src/core/lib/gpr/tls.h"
 #include "src/core/lib/gprpp/memory.h"
-
-#if defined(_MSC_VER)
-#define thread_local __declspec(thread)
-#elif defined(__GNUC__)
-#define thread_local __thread
-#else
-#error "Unknown compiler - please file a bug report"
-#endif
+#include "src/core/lib/gprpp/thd.h"
 
 namespace {
 class ThreadInternalsWindows;
@@ -49,7 +42,7 @@ struct thd_info {
   bool joinable;           /* whether it is joinable */
 };
 
-thread_local struct thd_info* g_thd_info;
+GPR_THREAD_LOCAL(struct thd_info*) g_thd_info;
 
 class ThreadInternalsWindows
     : public grpc_core::internal::ThreadInternalsInterface {

data/src/core/lib/gprpp/time_util.cc

@@ -16,10 +16,10 @@
 
 #include <grpc/support/port_platform.h>
 
-#include <grpc/support/log.h>
-
 #include "src/core/lib/gprpp/time_util.h"
 
+#include <grpc/support/log.h>
+
 namespace grpc_core {
 
 gpr_timespec ToGprTimeSpec(absl::Duration duration) {

data/src/core/lib/gprpp/time_util.h

@@ -19,10 +19,10 @@
 
 #include <grpc/support/port_platform.h>
 
-#include <grpc/support/time.h>
-
 #include "absl/time/time.h"
 
+#include <grpc/support/time.h>
+
 namespace grpc_core {
 
 // Converts absl::Duration to gpr_timespec(GPR_TIMESPAN)

data/src/core/lib/http/format_request.cc

@@ -32,6 +32,7 @@
 #include <grpc/slice.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/string_util.h>
+
 #include "src/core/lib/gpr/string.h"
 
 static void fill_common_header(const grpc_httpcli_request* request,

data/src/core/lib/http/format_request.h

@@ -22,6 +22,7 @@
 #include <grpc/support/port_platform.h>
 
 #include <grpc/slice.h>
+
 #include "src/core/lib/http/httpcli.h"
 
 grpc_slice grpc_httpcli_format_get_request(const grpc_httpcli_request* request);

data/src/core/lib/http/httpcli.cc

@@ -31,7 +31,6 @@
 #include <grpc/support/string_util.h>
 
 #include "src/core/lib/address_utils/sockaddr_utils.h"
-#include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/gpr/string.h"
 #include "src/core/lib/gprpp/memory.h"
 #include "src/core/lib/http/format_request.h"
@@ -48,6 +47,7 @@ struct internal_request {
   grpc_resolved_addresses* addresses;
   size_t next_address;
   grpc_endpoint* ep;
+  grpc_resource_quota* resource_quota;
   char* host;
   char* ssl_host_override;
   grpc_millis deadline;
@@ -63,7 +63,6 @@ struct internal_request {
   grpc_closure done_write;
   grpc_closure connected;
   grpc_error_handle overall_error;
-  grpc_resource_quota* resource_quota;
 };
 static grpc_httpcli_get_override g_get_override = nullptr;
 static grpc_httpcli_post_override g_post_override = nullptr;
@@ -208,12 +207,11 @@ static void next_address(internal_request* req, grpc_error_handle error) {
   addr = &req->addresses->addrs[req->next_address++];
   GRPC_CLOSURE_INIT(&req->connected, on_connected, req,
                     grpc_schedule_on_exec_ctx);
-  grpc_arg arg = grpc_channel_arg_pointer_create(
-      const_cast<char*>(GRPC_ARG_RESOURCE_QUOTA), req->resource_quota,
-      grpc_resource_quota_arg_vtable());
-  grpc_channel_args args = {1, &arg};
-  grpc_tcp_client_connect(&req->connected, &req->ep, req->context->pollset_set,
-                          &args, addr, req->deadline);
+  grpc_tcp_client_connect(&req->connected, &req->ep,
+                          grpc_slice_allocator_create(
+                              req->resource_quota, grpc_sockaddr_to_uri(addr)),
+                          req->context->pollset_set, nullptr, addr,
+                          req->deadline);
 }
 
 static void on_resolved(void* arg, grpc_error_handle error) {
@@ -246,7 +244,7 @@ static void internal_request_begin(grpc_httpcli_context* context,
   req->context = context;
   req->pollent = pollent;
   req->overall_error = GRPC_ERROR_NONE;
-  req->resource_quota = grpc_resource_quota_ref_internal(resource_quota);
+  req->resource_quota = resource_quota;
   GRPC_CLOSURE_INIT(&req->on_read, on_read, req, grpc_schedule_on_exec_ctx);
   GRPC_CLOSURE_INIT(&req->done_write, done_write, req,
                     grpc_schedule_on_exec_ctx);
@@ -271,6 +269,7 @@ void grpc_httpcli_get(grpc_httpcli_context* context,
                       const grpc_httpcli_request* request, grpc_millis deadline,
                       grpc_closure* on_done, grpc_httpcli_response* response) {
   if (g_get_override && g_get_override(request, deadline, on_done, response)) {
+    grpc_resource_quota_unref_internal(resource_quota);
     return;
   }
   std::string name =
@@ -289,6 +288,7 @@ void grpc_httpcli_post(grpc_httpcli_context* context,
                        grpc_httpcli_response* response) {
   if (g_post_override && g_post_override(request, body_bytes, body_size,
                                          deadline, on_done, response)) {
+    grpc_resource_quota_unref_internal(resource_quota);
     return;
   }
   std::string name =

data/src/core/lib/http/httpcli.h

@@ -30,6 +30,7 @@
 #include "src/core/lib/iomgr/iomgr_internal.h"
 #include "src/core/lib/iomgr/polling_entity.h"
 #include "src/core/lib/iomgr/pollset_set.h"
+#include "src/core/lib/iomgr/resource_quota.h"
 
 /* User agent this library reports */
 #define GRPC_HTTPCLI_USER_AGENT "grpc-httpcli/0.0"
@@ -75,6 +76,7 @@ void grpc_httpcli_context_destroy(grpc_httpcli_context* context);
    'pollset' indicates a grpc_pollset that is interested in the result
      of the get - work on this pollset may be used to progress the get
      operation
+   'resource_quota: this function takes ownership of a ref from the caller
    'request' contains request parameters - these are caller owned and can be
      destroyed once the call returns
    'deadline' contains a deadline for the request (or gpr_inf_future)
@@ -90,6 +92,7 @@ void grpc_httpcli_get(grpc_httpcli_context* context,
    'pollset' indicates a grpc_pollset that is interested in the result
      of the post - work on this pollset may be used to progress the post
      operation
+   'resource_quota' - this function takes ownership of a ref from the caller.
    'request' contains request parameters - these are caller owned and can be
      destroyed once the call returns
    'body_bytes' and 'body_size' specify the payload for the post.

data/src/core/lib/http/httpcli_security_connector.cc

@@ -18,8 +18,6 @@
 
 #include <grpc/support/port_platform.h>
 
-#include "src/core/lib/http/httpcli.h"
-
 #include <string.h>
 
 #include "absl/strings/str_cat.h"
@@ -30,9 +28,10 @@
 #include <grpc/support/string_util.h>
 
 #include "src/core/lib/channel/channel_args.h"
-#include "src/core/lib/channel/handshaker_registry.h"
+#include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/gpr/string.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
+#include "src/core/lib/http/httpcli.h"
 #include "src/core/lib/iomgr/pollset.h"
 #include "src/core/lib/security/credentials/credentials.h"
 #include "src/core/lib/security/security_connector/ssl_utils.h"
@@ -96,10 +95,8 @@ class grpc_httpcli_ssl_channel_security_connector final
     /* Check the peer name. */
     if (secure_peer_name_ != nullptr &&
         !tsi_ssl_peer_matches_name(&peer, secure_peer_name_)) {
-      error = GRPC_ERROR_CREATE_FROM_COPIED_STRING(
-          absl::StrCat("Peer name ", secure_peer_name_,
-                       " is not in peer certificate")
-              .c_str());
+      error = GRPC_ERROR_CREATE_FROM_CPP_STRING(absl::StrCat(
+          "Peer name ", secure_peer_name_, " is not in peer certificate"));
     }
     grpc_core::ExecCtx::Run(DEBUG_LOCATION, on_peer_checked, error);
     tsi_peer_destruct(&peer);
@@ -206,7 +203,7 @@ static void ssl_handshake(void* arg, grpc_endpoint* tcp, const char* host,
   grpc_arg channel_arg = grpc_security_connector_to_arg(sc.get());
   grpc_channel_args args = {1, &channel_arg};
   c->handshake_mgr = grpc_core::MakeRefCounted<grpc_core::HandshakeManager>();
-  grpc_core::HandshakerRegistry::AddHandshakers(
+  grpc_core::CoreConfiguration::Get().handshaker_registry().AddHandshakers(
       grpc_core::HANDSHAKER_CLIENT, &args,
       /*interested_parties=*/nullptr, c->handshake_mgr.get());
   c->handshake_mgr->DoHandshake(tcp, /*channel_args=*/nullptr, deadline,

data/src/core/lib/http/parser.h

@@ -22,6 +22,7 @@
 #include <grpc/support/port_platform.h>
 
 #include <grpc/slice.h>
+
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/iomgr/error.h"
 

data/src/core/lib/iomgr/buffer_list.cc

@@ -19,10 +19,11 @@
 #include <grpc/support/port_platform.h>
 
 #include "src/core/lib/iomgr/buffer_list.h"
-#include "src/core/lib/iomgr/port.h"
 
 #include <grpc/support/log.h>
 
+#include "src/core/lib/iomgr/port.h"
+
 #ifdef GRPC_LINUX_ERRQUEUE
 #include <netinet/in.h>
 #include <string.h>

data/src/core/lib/iomgr/buffer_list.h

@@ -23,13 +23,12 @@
 
 #include "absl/types/optional.h"
 
-#include "src/core/lib/iomgr/port.h"
-
 #include <grpc/support/time.h>
 
 #include "src/core/lib/gprpp/memory.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/iomgr/internal_errqueue.h"
+#include "src/core/lib/iomgr/port.h"
 
 namespace grpc_core {
 

data/src/core/lib/iomgr/call_combiner.cc

@@ -23,6 +23,7 @@
 #include <inttypes.h>
 
 #include <grpc/support/log.h>
+
 #include "src/core/lib/debug/stats.h"
 #include "src/core/lib/profiling/timers.h"
 

data/src/core/lib/iomgr/cfstream_handle.cc

@@ -23,13 +23,13 @@
 
 #ifdef GRPC_CFSTREAM
 #import <CoreFoundation/CoreFoundation.h>
-#import "src/core/lib/iomgr/cfstream_handle.h"
 
 #include <grpc/grpc.h>
 #include <grpc/support/atm.h>
 #include <grpc/support/sync.h>
 
 #include "src/core/lib/debug/trace.h"
+#import "src/core/lib/iomgr/cfstream_handle.h"
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/error_cfstream.h"
 #include "src/core/lib/iomgr/ev_apple.h"

data/src/core/lib/iomgr/combiner.cc

@@ -137,8 +137,9 @@ static void combiner_exec(grpc_core::Combiner* lock, grpc_closure* cl,
   if (last == 1) {
     GRPC_STATS_INC_COMBINER_LOCKS_INITIATED();
     GPR_TIMER_MARK("combiner.initiated", 0);
-    gpr_atm_no_barrier_store(&lock->initiating_exec_ctx_or_null,
-                             (gpr_atm)grpc_core::ExecCtx::Get());
+    gpr_atm_no_barrier_store(
+        &lock->initiating_exec_ctx_or_null,
+        reinterpret_cast<gpr_atm>(grpc_core::ExecCtx::Get()));
     // first element on this list: add it to the list of combiner locks
     // executing within this exec_ctx
     push_last_on_exec_ctx(lock);

data/src/core/lib/iomgr/combiner.h

@@ -24,6 +24,7 @@
 #include <stddef.h>
 
 #include <grpc/support/atm.h>
+
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 

data/src/core/lib/iomgr/dualstack_socket_posix.cc

@@ -23,6 +23,7 @@
 #ifdef GRPC_POSIX_SOCKET_UTILS_COMMON
 
 #include <netinet/in.h>
+
 #include "src/core/lib/iomgr/socket_utils_posix.h"
 
 #ifndef GRPC_SET_SOCKET_DUALSTACK_CUSTOM

data/src/core/lib/iomgr/endpoint.cc

@@ -62,10 +62,6 @@ absl::string_view grpc_endpoint_get_local_address(grpc_endpoint* ep) {
 
 int grpc_endpoint_get_fd(grpc_endpoint* ep) { return ep->vtable->get_fd(ep); }
 
-grpc_resource_user* grpc_endpoint_get_resource_user(grpc_endpoint* ep) {
-  return ep->vtable->get_resource_user(ep);
-}
-
 bool grpc_endpoint_can_track_err(grpc_endpoint* ep) {
   return ep->vtable->can_track_err(ep);
 }

data/src/core/lib/iomgr/endpoint.h

@@ -26,6 +26,7 @@
 #include <grpc/slice.h>
 #include <grpc/slice_buffer.h>
 #include <grpc/support/time.h>
+
 #include "src/core/lib/iomgr/pollset.h"
 #include "src/core/lib/iomgr/pollset_set.h"
 #include "src/core/lib/iomgr/resource_quota.h"
@@ -46,7 +47,6 @@ struct grpc_endpoint_vtable {
   void (*delete_from_pollset_set)(grpc_endpoint* ep, grpc_pollset_set* pollset);
   void (*shutdown)(grpc_endpoint* ep, grpc_error_handle why);
   void (*destroy)(grpc_endpoint* ep);
-  grpc_resource_user* (*get_resource_user)(grpc_endpoint* ep);
   absl::string_view (*get_peer)(grpc_endpoint* ep);
   absl::string_view (*get_local_address)(grpc_endpoint* ep);
   int (*get_fd)(grpc_endpoint* ep);
@@ -99,8 +99,6 @@ void grpc_endpoint_add_to_pollset_set(grpc_endpoint* ep,
 void grpc_endpoint_delete_from_pollset_set(grpc_endpoint* ep,
                                            grpc_pollset_set* pollset_set);
 
-grpc_resource_user* grpc_endpoint_get_resource_user(grpc_endpoint* ep);
-
 bool grpc_endpoint_can_track_err(grpc_endpoint* ep);
 
 struct grpc_endpoint {

data/src/core/lib/iomgr/endpoint_cfstream.cc

@@ -23,7 +23,6 @@
 #ifdef GRPC_CFSTREAM_ENDPOINT
 
 #import <CoreFoundation/CoreFoundation.h>
-#import "src/core/lib/iomgr/endpoint_cfstream.h"
 
 #include <grpc/slice_buffer.h>
 #include <grpc/support/alloc.h>
@@ -34,6 +33,7 @@
 #include "src/core/lib/iomgr/cfstream_handle.h"
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/endpoint.h"
+#import "src/core/lib/iomgr/endpoint_cfstream.h"
 #include "src/core/lib/iomgr/error_cfstream.h"
 #include "src/core/lib/iomgr/sockaddr.h"
 #include "src/core/lib/slice/slice_internal.h"
@@ -59,11 +59,10 @@ struct CFStreamEndpoint {
 
   std::string peer_string;
   std::string local_address;
-  grpc_resource_user* resource_user;
-  grpc_resource_user_slice_allocator slice_allocator;
+  grpc_slice_allocator* slice_allocator;
 };
 static void CFStreamFree(CFStreamEndpoint* ep) {
-  grpc_resource_user_unref(ep->resource_user);
+  grpc_slice_allocator_destroy(ep->slice_allocator);
   CFRelease(ep->read_stream);
   CFRelease(ep->write_stream);
   CFSTREAM_HANDLE_UNREF(ep->stream_sync, "free");
@@ -263,9 +262,10 @@ static void CFStreamRead(grpc_endpoint* ep, grpc_slice_buffer* slices,
   ep_impl->read_slices = slices;
   grpc_slice_buffer_reset_and_unref_internal(slices);
   EP_REF(ep_impl, "read");
-  if (grpc_resource_user_alloc_slices(&ep_impl->slice_allocator,
-                                      GRPC_TCP_DEFAULT_READ_SLICE_SIZE, 1,
-                                      ep_impl->read_slices)) {
+  if (grpc_slice_allocator_allocate(
+          ep_impl->slice_allocator, GRPC_TCP_DEFAULT_READ_SLICE_SIZE, 1,
+          grpc_slice_allocator_intent::kReadBuffer, ep_impl->read_slices,
+          CFStreamReadAllocationDone, ep_impl)) {
     ep_impl->stream_sync->NotifyOnRead(&ep_impl->read_action);
   }
 }
@@ -292,7 +292,6 @@ void CFStreamShutdown(grpc_endpoint* ep, grpc_error_handle why) {
   CFReadStreamClose(ep_impl->read_stream);
   CFWriteStreamClose(ep_impl->write_stream);
   ep_impl->stream_sync->Shutdown(why);
-  grpc_resource_user_shutdown(ep_impl->resource_user);
   if (grpc_tcp_trace.enabled()) {
     gpr_log(GPR_DEBUG, "CFStream endpoint:%p shutdown DONE (%p)", ep_impl, why);
   }
@@ -306,11 +305,6 @@ void CFStreamDestroy(grpc_endpoint* ep) {
   EP_UNREF(ep_impl, "destroy");
 }
 
-grpc_resource_user* CFStreamGetResourceUser(grpc_endpoint* ep) {
-  CFStreamEndpoint* ep_impl = reinterpret_cast<CFStreamEndpoint*>(ep);
-  return ep_impl->resource_user;
-}
-
 absl::string_view CFStreamGetPeer(grpc_endpoint* ep) {
   CFStreamEndpoint* ep_impl = reinterpret_cast<CFStreamEndpoint*>(ep);
   return ep_impl->peer_string;
@@ -337,7 +331,6 @@ static const grpc_endpoint_vtable vtable = {CFStreamRead,
                                             CFStreamDeleteFromPollsetSet,
                                             CFStreamShutdown,
                                             CFStreamDestroy,
-                                            CFStreamGetResourceUser,
                                             CFStreamGetPeer,
                                             CFStreamGetLocalAddress,
                                             CFStreamGetFD,
@@ -345,7 +338,7 @@ static const grpc_endpoint_vtable vtable = {CFStreamRead,
 
 grpc_endpoint* grpc_cfstream_endpoint_create(
     CFReadStreamRef read_stream, CFWriteStreamRef write_stream,
-    const char* peer_string, grpc_resource_quota* resource_quota,
+    const char* peer_string, grpc_slice_allocator* slice_allocator,
     CFStreamHandle* stream_sync) {
   CFStreamEndpoint* ep_impl = new CFStreamEndpoint;
   if (grpc_tcp_trace.enabled()) {
@@ -387,11 +380,7 @@ grpc_endpoint* grpc_cfstream_endpoint_create(
                     static_cast<void*>(ep_impl), grpc_schedule_on_exec_ctx);
   GRPC_CLOSURE_INIT(&ep_impl->write_action, WriteAction,
                     static_cast<void*>(ep_impl), grpc_schedule_on_exec_ctx);
-  ep_impl->resource_user =
-      grpc_resource_user_create(resource_quota, peer_string);
-  grpc_resource_user_slice_allocator_init(&ep_impl->slice_allocator,
-                                          ep_impl->resource_user,
-                                          CFStreamReadAllocationDone, ep_impl);
+  ep_impl->slice_allocator = slice_allocator;
 
   return &ep_impl->base;
 }

data/src/core/lib/iomgr/endpoint_cfstream.h

@@ -41,7 +41,7 @@
 
 grpc_endpoint* grpc_cfstream_endpoint_create(
     CFReadStreamRef read_stream, CFWriteStreamRef write_stream,
-    const char* peer_string, grpc_resource_quota* resource_quota,
+    const char* peer_string, grpc_slice_allocator* slice_allocator,
     CFStreamHandle* stream_sync);
 
 #endif /* GRPC_CFSTREAM */

data/src/core/lib/iomgr/endpoint_pair.h

@@ -27,6 +27,7 @@ struct grpc_endpoint_pair {
   grpc_endpoint* client;
   grpc_endpoint* server;
 };
+
 grpc_endpoint_pair grpc_iomgr_create_endpoint_pair(const char* name,
                                                    grpc_channel_args* args);