grpc 1.47.0-x86_64-linux → 1.49.0.pre1-x86_64-linux

data/src/core/lib/promise/sleep.h

@@ -17,58 +17,61 @@
 
 #include <grpc/support/port_platform.h>
 
-#include <utility>
-
-#include "absl/base/thread_annotations.h"
 #include "absl/status/status.h"
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/support/log.h>
+
 #include "src/core/lib/gprpp/ref_counted.h"
-#include "src/core/lib/gprpp/sync.h"
 #include "src/core/lib/gprpp/time.h"
-#include "src/core/lib/iomgr/closure.h"
-#include "src/core/lib/iomgr/error.h"
-#include "src/core/lib/iomgr/timer.h"
 #include "src/core/lib/promise/activity.h"
 #include "src/core/lib/promise/poll.h"
 
 namespace grpc_core {
 
 // Promise that sleeps until a deadline and then finishes.
-class Sleep {
+class Sleep final {
  public:
   explicit Sleep(Timestamp deadline);
   ~Sleep();
 
   Sleep(const Sleep&) = delete;
   Sleep& operator=(const Sleep&) = delete;
-  Sleep(Sleep&& other) noexcept : state_(other.state_) {
-    other.state_ = nullptr;
-  }
+  Sleep(Sleep&& other) noexcept : deadline_(other.deadline_) {
+    // Promises can be moved only until they're polled, and since we only create
+    // the closure when first polled we can assume it's nullptr here.
+    GPR_DEBUG_ASSERT(other.closure_ == nullptr);
+  };
   Sleep& operator=(Sleep&& other) noexcept {
-    std::swap(state_, other.state_);
+    // Promises can be moved only until they're polled, and since we only create
+    // the closure when first polled we can assume it's nullptr here.
+    GPR_DEBUG_ASSERT(closure_ == nullptr);
+    GPR_DEBUG_ASSERT(other.closure_ == nullptr);
+    deadline_ = other.deadline_;
     return *this;
-  }
+  };
 
   Poll<absl::Status> operator()();
 
  private:
-  static void OnTimer(void* arg, grpc_error_handle error);
+  class ActiveClosure final
+      : public grpc_event_engine::experimental::EventEngine::Closure {
+   public:
+    explicit ActiveClosure(Timestamp deadline);
+
+    void Run() override;
+    void Cancel();
 
-  enum class Stage { kInitial, kStarted, kDone };
-  struct State {
-    explicit State(Timestamp deadline) : deadline(deadline) {}
-    RefCount refs{2};
-    const Timestamp deadline;
-    grpc_timer timer;
-    grpc_closure on_timer;
-    Mutex mu;
-    Stage stage ABSL_GUARDED_BY(mu) = Stage::kInitial;
-    Waker waker ABSL_GUARDED_BY(mu);
-    void Unref() {
-      if (refs.Unref()) delete this;
-    }
+   private:
+    Waker waker_;
+    // One ref dropped by Run(), the other by Cancel().
+    RefCount refs_{2};
+    const grpc_event_engine::experimental::EventEngine::TaskHandle
+        timer_handle_;
   };
-  State* state_;
+
+  Timestamp deadline_;
+  ActiveClosure* closure_{nullptr};
 };
 
 }  // namespace grpc_core

data/src/core/lib/promise/try_seq.h

@@ -17,7 +17,6 @@
 
 #include <grpc/support/port_platform.h>
 
-#include <type_traits>
 #include <utility>
 
 #include "absl/meta/type_traits.h"
@@ -25,6 +24,7 @@
 #include "absl/status/statusor.h"
 
 #include "src/core/lib/promise/detail/basic_seq.h"
+#include "src/core/lib/promise/detail/promise_like.h"
 #include "src/core/lib/promise/detail/status.h"
 #include "src/core/lib/promise/poll.h"
 
@@ -116,6 +116,26 @@ using TrySeqTraits = TrySeqTraitsWithSfinae<T>;
 template <typename... Fs>
 using TrySeq = BasicSeq<TrySeqTraits, Fs...>;
 
+template <typename I, typename F, typename Arg>
+struct TrySeqIterTraits {
+  using Iter = I;
+  using Factory = F;
+  using Argument = Arg;
+  using IterValue = decltype(*std::declval<Iter>());
+  using StateCreated = decltype(std::declval<F>()(std::declval<IterValue>(),
+                                                  std::declval<Arg>()));
+  using State = PromiseLike<StateCreated>;
+  using Wrapped = typename State::Result;
+
+  using Traits = TrySeqTraits<Wrapped>;
+};
+
+template <typename Iter, typename Factory, typename Argument>
+struct TrySeqIterResultTraits {
+  using IterTraits = TrySeqIterTraits<Iter, Factory, Argument>;
+  using Result = BasicSeqIter<IterTraits>;
+};
+
 }  // namespace promise_detail
 
 // Try a sequence of operations.
@@ -144,12 +164,12 @@ promise_detail::TrySeq<Functors...> TrySeq(Functors... functors) {
 //   }
 //   return argument;
 template <typename Iter, typename Factory, typename Argument>
-promise_detail::BasicSeqIter<promise_detail::TrySeqTraits, Factory, Argument,
-                             Iter>
+typename promise_detail::TrySeqIterResultTraits<Iter, Factory, Argument>::Result
 TrySeqIter(Iter begin, Iter end, Argument argument, Factory factory) {
-  return promise_detail::BasicSeqIter<promise_detail::TrySeqTraits, Factory,
-                                      Argument, Iter>(
-      begin, end, std::move(factory), std::move(argument));
+  using Result =
+      typename promise_detail::TrySeqIterResultTraits<Iter, Factory,
+                                                      Argument>::Result;
+  return Result(begin, end, std::move(factory), std::move(argument));
 }
 
 }  // namespace grpc_core

data/src/core/lib/resolver/resolver.cc

@@ -34,46 +34,4 @@ Resolver::Resolver()
                                ? "Resolver"
                                : nullptr) {}
 
-//
-// Resolver::Result
-//
-
-Resolver::Result::~Result() { grpc_channel_args_destroy(args); }
-
-Resolver::Result::Result(const Result& other)
-    : addresses(other.addresses),
-      service_config(other.service_config),
-      resolution_note(other.resolution_note),
-      args(grpc_channel_args_copy(other.args)) {}
-
-Resolver::Result::Result(Result&& other) noexcept
-    : addresses(std::move(other.addresses)),
-      service_config(std::move(other.service_config)),
-      resolution_note(std::move(other.resolution_note)),
-      // TODO(roth): Use std::move() once channel args is converted to C++.
-      args(other.args) {
-  other.args = nullptr;
-}
-
-Resolver::Result& Resolver::Result::operator=(const Result& other) {
-  if (&other == this) return *this;
-  addresses = other.addresses;
-  service_config = other.service_config;
-  resolution_note = other.resolution_note;
-  grpc_channel_args_destroy(args);
-  args = grpc_channel_args_copy(other.args);
-  return *this;
-}
-
-Resolver::Result& Resolver::Result::operator=(Result&& other) noexcept {
-  addresses = std::move(other.addresses);
-  service_config = std::move(other.service_config);
-  resolution_note = std::move(other.resolution_note);
-  // TODO(roth): Use std::move() once channel args is converted to C++.
-  grpc_channel_args_destroy(args);
-  args = other.args;
-  other.args = nullptr;
-  return *this;
-}
-
 }  // namespace grpc_core

data/src/core/lib/resolver/resolver.h

@@ -19,10 +19,12 @@
 
 #include <grpc/support/port_platform.h>
 
-#include "absl/status/statusor.h"
+#include <string>
 
-#include <grpc/impl/codegen/grpc_types.h>
+#include "absl/status/statusor.h"
 
+#include "src/core/lib/channel/channel_args.h"
+#include "src/core/lib/debug/trace.h"
 #include "src/core/lib/gprpp/orphanable.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
 #include "src/core/lib/resolver/server_address.h"
@@ -64,16 +66,7 @@ class Resolver : public InternallyRefCounted<Resolver> {
     std::string resolution_note;
     // TODO(roth): Before making this a public API, figure out a way to
     // avoid exposing channel args this way.
-    const grpc_channel_args* args = nullptr;
-
-    // TODO(roth): Remove everything below once grpc_channel_args is
-    // converted to a copyable and movable C++ object.
-    Result() = default;
-    ~Result();
-    Result(const Result& other);
-    Result(Result&& other) noexcept;
-    Result& operator=(const Result& other);
-    Result& operator=(Result&& other) noexcept;
+    ChannelArgs args;
   };
 
   /// A proxy object used by the resolver to return results to the

data/src/core/lib/resolver/resolver_factory.h

@@ -19,11 +19,13 @@
 
 #include <grpc/support/port_platform.h>
 
-#include "absl/strings/strip.h"
+#include <memory>
+#include <string>
 
-#include <grpc/support/string_util.h>
+#include "absl/strings/string_view.h"
+#include "absl/strings/strip.h"
 
-#include "src/core/lib/gprpp/memory.h"
+#include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/gprpp/orphanable.h"
 #include "src/core/lib/iomgr/iomgr_fwd.h"
 #include "src/core/lib/resolver/resolver.h"
@@ -39,7 +41,7 @@ struct ResolverArgs {
   /// The parsed URI to resolve.
   URI uri;
   /// Channel args to be included in resolver results.
-  const grpc_channel_args* args = nullptr;
+  ChannelArgs args;
   /// Used to drive I/O in the name resolution process.
   grpc_pollset_set* pollset_set = nullptr;
   /// The work_serializer under which all resolver calls will be run.

data/src/core/lib/resolver/resolver_registry.cc

@@ -18,19 +18,12 @@
 
 #include "src/core/lib/resolver/resolver_registry.h"
 
-#include <string.h>
-
-#include <vector>
-
-#include "absl/memory/memory.h"
+#include "absl/status/status.h"
+#include "absl/status/statusor.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
 
-#include <grpc/support/alloc.h>
 #include <grpc/support/log.h>
-#include <grpc/support/string_util.h>
-
-#include "src/core/lib/resolver/resolver_registry.h"
 
 namespace grpc_core {
 
@@ -78,7 +71,7 @@ bool ResolverRegistry::IsValidTarget(absl::string_view target) const {
 }
 
 OrphanablePtr<Resolver> ResolverRegistry::CreateResolver(
-    absl::string_view target, const grpc_channel_args* args,
+    absl::string_view target, const ChannelArgs& args,
     grpc_pollset_set* pollset_set,
     std::shared_ptr<WorkSerializer> work_serializer,
     std::unique_ptr<Resolver::ResultHandler> result_handler) const {

data/src/core/lib/resolver/resolver_registry.h

@@ -19,9 +19,19 @@
 
 #include <grpc/support/port_platform.h>
 
-#include "src/core/lib/gprpp/memory.h"
+#include <map>
+#include <memory>
+#include <string>
+#include <utility>
+
+#include "absl/strings/string_view.h"
+
+#include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/gprpp/orphanable.h"
+#include "src/core/lib/iomgr/iomgr_fwd.h"
+#include "src/core/lib/resolver/resolver.h"
 #include "src/core/lib/resolver/resolver_factory.h"
+#include "src/core/lib/uri/uri_parser.h"
 
 namespace grpc_core {
 
@@ -82,7 +92,7 @@ class ResolverRegistry {
   /// which all resolver calls will be run. \a result_handler is used to return
   /// results from the resolver.
   OrphanablePtr<Resolver> CreateResolver(
-      absl::string_view target, const grpc_channel_args* args,
+      absl::string_view target, const ChannelArgs& args,
       grpc_pollset_set* pollset_set,
       std::shared_ptr<WorkSerializer> work_serializer,
       std::unique_ptr<Resolver::ResultHandler> result_handler) const;

data/src/core/lib/resolver/server_address.cc

@@ -20,15 +20,24 @@
 
 #include "src/core/lib/resolver/server_address.h"
 
+#include <string.h>
+
+#include <algorithm>
 #include <memory>
 #include <string>
+#include <utility>
 #include <vector>
 
+#include "absl/status/status.h"
+#include "absl/status/statusor.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
 #include "absl/strings/str_join.h"
 
 #include "src/core/lib/address_utils/sockaddr_utils.h"
+#include "src/core/lib/channel/channel_args.h"
+
+// IWYU pragma: no_include <sys/socket.h>
 
 namespace grpc_core {
 
@@ -43,12 +52,12 @@ const char* ServerAddressWeightAttribute::kServerAddressWeightAttributeKey =
 //
 
 ServerAddress::ServerAddress(
-    const grpc_resolved_address& address, grpc_channel_args* args,
+    const grpc_resolved_address& address, const ChannelArgs& args,
     std::map<const char*, std::unique_ptr<AttributeInterface>> attributes)
     : address_(address), args_(args), attributes_(std::move(attributes)) {}
 
 ServerAddress::ServerAddress(
-    const void* address, size_t address_len, grpc_channel_args* args,
+    const void* address, size_t address_len, const ChannelArgs& args,
     std::map<const char*, std::unique_ptr<AttributeInterface>> attributes)
     : args_(args), attributes_(std::move(attributes)) {
   memcpy(address_.addr, address, address_len);
@@ -56,7 +65,7 @@ ServerAddress::ServerAddress(
 }
 
 ServerAddress::ServerAddress(const ServerAddress& other)
-    : address_(other.address_), args_(grpc_channel_args_copy(other.args_)) {
+    : address_(other.address_), args_(other.args_) {
   for (const auto& p : other.attributes_) {
     attributes_[p.first] = p.second->Copy();
   }
@@ -66,8 +75,7 @@ ServerAddress& ServerAddress::operator=(const ServerAddress& other) {
     return *this;
   }
   address_ = other.address_;
-  grpc_channel_args_destroy(args_);
-  args_ = grpc_channel_args_copy(other.args_);
+  args_ = other.args_;
   attributes_.clear();
   for (const auto& p : other.attributes_) {
     attributes_[p.first] = p.second->Copy();
@@ -77,16 +85,12 @@ ServerAddress& ServerAddress::operator=(const ServerAddress& other) {
 
 ServerAddress::ServerAddress(ServerAddress&& other) noexcept
     : address_(other.address_),
-      args_(other.args_),
-      attributes_(std::move(other.attributes_)) {
-  other.args_ = nullptr;
-}
+      args_(std::move(other.args_)),
+      attributes_(std::move(other.attributes_)) {}
 
 ServerAddress& ServerAddress::operator=(ServerAddress&& other) noexcept {
   address_ = other.address_;
-  grpc_channel_args_destroy(args_);
-  args_ = other.args_;
-  other.args_ = nullptr;
+  args_ = std::move(other.args_);
   attributes_ = std::move(other.attributes_);
   return *this;
 }
@@ -125,7 +129,7 @@ int ServerAddress::Cmp(const ServerAddress& other) const {
   if (address_.len < other.address_.len) return -1;
   int retval = memcmp(address_.addr, other.address_.addr, address_.len);
   if (retval != 0) return retval;
-  retval = grpc_channel_args_compare(args_, other.args_);
+  retval = QsortCompare(args_, other.args_);
   if (retval != 0) return retval;
   return CompareAttributes(attributes_, other.attributes_);
 }
@@ -155,8 +159,8 @@ std::string ServerAddress::ToString() const {
   std::vector<std::string> parts = {
       addr_str.ok() ? addr_str.value() : addr_str.status().ToString(),
   };
-  if (args_ != nullptr) {
-    parts.emplace_back(absl::StrCat("args=", grpc_channel_args_string(args_)));
+  if (args_ != ChannelArgs()) {
+    parts.emplace_back(absl::StrCat("args=", args_.ToString()));
   }
   if (!attributes_.empty()) {
     std::vector<std::string> attrs;

data/src/core/lib/resolver/server_address.h

@@ -21,10 +21,15 @@
 
 #include <grpc/support/port_platform.h>
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <map>
 #include <memory>
+#include <string>
+#include <vector>
 
-#include "absl/container/inlined_vector.h"
+#include "absl/memory/memory.h"
 
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/gpr/useful.h"
@@ -63,16 +68,14 @@ class ServerAddress {
   };
 
   // Takes ownership of args.
-  ServerAddress(const grpc_resolved_address& address, grpc_channel_args* args,
+  ServerAddress(const grpc_resolved_address& address, const ChannelArgs& args,
                 std::map<const char*, std::unique_ptr<AttributeInterface>>
                     attributes = {});
   ServerAddress(const void* address, size_t address_len,
-                grpc_channel_args* args,
+                const ChannelArgs& args,
                 std::map<const char*, std::unique_ptr<AttributeInterface>>
                     attributes = {});
 
-  ~ServerAddress() { grpc_channel_args_destroy(args_); }
-
   // Copyable.
   ServerAddress(const ServerAddress& other);
   ServerAddress& operator=(const ServerAddress& other);
@@ -86,7 +89,7 @@ class ServerAddress {
   int Cmp(const ServerAddress& other) const;
 
   const grpc_resolved_address& address() const { return address_; }
-  const grpc_channel_args* args() const { return args_; }
+  const ChannelArgs& args() const { return args_; }
 
   const AttributeInterface* GetAttribute(const char* key) const;
 
@@ -102,7 +105,7 @@ class ServerAddress {
 
  private:
   grpc_resolved_address address_;
-  grpc_channel_args* args_;
+  ChannelArgs args_;
   std::map<const char*, std::unique_ptr<AttributeInterface>> attributes_;
 };
 
@@ -110,7 +113,7 @@ class ServerAddress {
 // ServerAddressList
 //
 
-typedef absl::InlinedVector<ServerAddress, 1> ServerAddressList;
+using ServerAddressList = std::vector<ServerAddress>;
 
 //
 // ServerAddressWeightAttribute

data/src/core/lib/resource_quota/api.cc

@@ -44,7 +44,7 @@ ResourceQuotaRefPtr ResourceQuotaFromChannelArgs(
       ->Ref();
 }
 
-ChannelArgs EnsureResourceQuotaInChannelArgs(ChannelArgs args) {
+ChannelArgs EnsureResourceQuotaInChannelArgs(const ChannelArgs& args) {
   if (args.GetObject<ResourceQuota>() != nullptr) return args;
   // If there's no existing quota, add it to the default one - shared between
   // all channel args declared thusly. This prevents us from accidentally not

data/src/core/lib/resource_quota/arena.cc

@@ -20,8 +20,11 @@
 
 #include "src/core/lib/resource_quota/arena.h"
 
+#include <atomic>
 #include <new>
 
+#include "absl/utility/utility.h"
+
 #include <grpc/support/alloc.h>
 
 #include "src/core/lib/gpr/alloc.h"
@@ -49,7 +52,7 @@ Arena::~Arena() {
   Zone* z = last_zone_;
   while (z) {
     Zone* prev_z = z->prev;
-    z->~Zone();
+    Destruct(z);
     gpr_free_aligned(z);
     z = prev_z;
   }
@@ -71,6 +74,16 @@ std::pair<Arena*, void*> Arena::CreateWithAlloc(
 }
 
 size_t Arena::Destroy() {
+  ManagedNewObject* p;
+  // Outer loop: clear the managed new object list.
+  // We do this repeatedly in case a destructor ends up allocating something.
+  while ((p = managed_new_head_.exchange(nullptr, std::memory_order_relaxed)) !=
+         nullptr) {
+    // Inner loop: destruct a batch of objects.
+    while (p != nullptr) {
+      Destruct(absl::exchange(p, p->next));
+    }
+  }
   size_t size = total_used_.load(std::memory_order_relaxed);
   memory_allocator_->Release(total_allocated_.load(std::memory_order_relaxed));
   this->~Arena();
@@ -98,4 +111,11 @@ void* Arena::AllocZone(size_t size) {
   return reinterpret_cast<char*>(z) + zone_base_size;
 }
 
+void Arena::ManagedNewObject::Link(std::atomic<ManagedNewObject*>* head) {
+  next = head->load(std::memory_order_relaxed);
+  while (!head->compare_exchange_weak(next, this, std::memory_order_acq_rel,
+                                      std::memory_order_relaxed)) {
+  }
+}
+
 }  // namespace grpc_core

data/src/core/lib/resource_quota/arena.h

@@ -31,12 +31,12 @@
 
 #include <atomic>
 #include <memory>
-#include <new>
 #include <utility>
 
 #include <grpc/event_engine/memory_allocator.h>
 
 #include "src/core/lib/gpr/alloc.h"
+#include "src/core/lib/gprpp/construct_destruct.h"
 #include "src/core/lib/promise/context.h"
 #include "src/core/lib/resource_quota/memory_quota.h"
 
@@ -76,15 +76,36 @@ class Arena {
   template <typename T, typename... Args>
   T* New(Args&&... args) {
     T* t = static_cast<T*>(Alloc(sizeof(T)));
-    new (t) T(std::forward<Args>(args)...);
+    Construct(t, std::forward<Args>(args)...);
     return t;
   }
 
+  // Like New, but has the arena call p->~T() at arena destruction time.
+  template <typename T, typename... Args>
+  T* ManagedNew(Args&&... args) {
+    auto* p = New<ManagedNewImpl<T>>(std::forward<Args>(args)...);
+    p->Link(&managed_new_head_);
+    return &p->t;
+  }
+
  private:
   struct Zone {
     Zone* prev;
   };
 
+  struct ManagedNewObject {
+    ManagedNewObject* next = nullptr;
+    void Link(std::atomic<ManagedNewObject*>* head);
+    virtual ~ManagedNewObject() = default;
+  };
+
+  template <typename T>
+  struct ManagedNewImpl : public ManagedNewObject {
+    T t;
+    template <typename... Args>
+    explicit ManagedNewImpl(Args&&... args) : t(std::forward<Args>(args)...) {}
+  };
+
   // Initialize an arena.
   // Parameters:
   //   initial_size: The initial size of the whole arena in bytes. These bytes
@@ -118,6 +139,7 @@ class Arena {
   // and (2) the allocated memory. The arena itself maintains a pointer to the
   // last zone; the zone list is reverse-walked during arena destruction only.
   std::atomic<Zone*> last_zone_{nullptr};
+  std::atomic<ManagedNewObject*> managed_new_head_{nullptr};
   // The backing memory quota
   MemoryAllocator* const memory_allocator_;
 };