grpc 1.46.2 → 1.48.0.pre1

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

@@ -17,8 +17,14 @@
 
 #include <grpc/support/port_platform.h>
 
-#include <grpc/support/log.h>
+#include <stdlib.h>
 
+#include <type_traits>
+#include <utility>
+
+#include "absl/meta/type_traits.h"
+
+#include "src/core/lib/promise/context.h"
 #include "src/core/lib/promise/poll.h"
 #include "src/core/lib/resource_quota/arena.h"
 
@@ -177,6 +183,10 @@ class ArenaPromise {
   // Expose the promise interface: a call operator that returns Poll<T>.
   Poll<T> operator()() { return impl_->PollOnce(); }
 
+  bool has_value() const {
+    return impl_ != arena_promise_detail::NullImpl<T>::Get();
+  }
+
  private:
   // Underlying impl object.
   arena_promise_detail::ImplInterface<T>* impl_ =

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

@@ -19,6 +19,10 @@
 
 #include <assert.h>
 
+#include <type_traits>
+
+#include "absl/types/variant.h"
+
 #include "src/core/lib/gprpp/bitset.h"
 #include "src/core/lib/gprpp/construct_destruct.h"
 #include "src/core/lib/promise/detail/promise_like.h"

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

@@ -29,7 +29,7 @@ namespace grpc_core {
 // not contain any members, only exist.
 // The reason for avoiding this is that context types each use a thread local.
 template <typename T>
-struct ContextType;
+struct ContextType;  // IWYU pragma: keep
 
 namespace promise_detail {
 

data/src/core/lib/promise/detail/basic_seq.h

@@ -21,6 +21,7 @@
 #include <cassert>
 #include <new>
 #include <tuple>
+#include <type_traits>
 #include <utility>
 
 #include "absl/meta/type_traits.h"
@@ -29,13 +30,12 @@
 
 #include "src/core/lib/gprpp/construct_destruct.h"
 #include "src/core/lib/promise/detail/promise_factory.h"
+#include "src/core/lib/promise/detail/promise_like.h"
 #include "src/core/lib/promise/detail/switch.h"
 #include "src/core/lib/promise/poll.h"
 
 namespace grpc_core {
 namespace promise_detail {
-template <typename F>
-class PromiseLike;
 
 // Helper for SeqState to evaluate some common types to all partial
 // specializations.

data/src/core/lib/promise/detail/promise_factory.h

@@ -23,7 +23,6 @@
 #include "absl/meta/type_traits.h"
 
 #include "src/core/lib/promise/detail/promise_like.h"
-#include "src/core/lib/promise/poll.h"
 
 // PromiseFactory is an adaptor class.
 //

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

@@ -19,7 +19,6 @@
 
 #include <grpc/support/log.h>
 
-#include "src/core/lib/promise/activity.h"
 #include "src/core/lib/promise/intra_activity_waiter.h"
 #include "src/core/lib/promise/poll.h"
 

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

@@ -19,7 +19,9 @@
 
 #include <new>
 #include <type_traits>
+#include <utility>
 
+#include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/types/variant.h"
 

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

@@ -19,6 +19,7 @@
 
 #include <functional>
 #include <type_traits>
+#include <utility>
 
 #include "absl/status/status.h"
 #include "absl/types/optional.h"

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

@@ -17,7 +17,6 @@
 
 #include <grpc/support/port_platform.h>
 
-#include <tuple>
 #include <type_traits>
 
 #include "absl/types/variant.h"

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

@@ -19,8 +19,6 @@
 
 #include <utility>
 
-#include "absl/types/variant.h"
-
 #include "src/core/lib/promise/detail/basic_seq.h"
 #include "src/core/lib/promise/poll.h"
 

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

@@ -16,58 +16,65 @@
 
 #include "src/core/lib/promise/sleep.h"
 
+#include <grpc/event_engine/event_engine.h>
+
+#include "src/core/lib/event_engine/event_engine_factory.h"
+#include "src/core/lib/iomgr/exec_ctx.h"
+
 namespace grpc_core {
 
-Sleep::Sleep(Timestamp deadline) : state_(new State(deadline)) {
-  GRPC_CLOSURE_INIT(&state_->on_timer, &OnTimer, state_, nullptr);
-}
+using ::grpc_event_engine::experimental::GetDefaultEventEngine;
+
+Sleep::Sleep(Timestamp deadline) : deadline_(deadline) {}
 
 Sleep::~Sleep() {
-  if (state_ == nullptr) return;
-  {
-    MutexLock lock(&state_->mu);
-    switch (state_->stage) {
-      case Stage::kInitial:
-        state_->Unref();
-        break;
-      case Stage::kStarted:
-        grpc_timer_cancel(&state_->timer);
-        break;
-      case Stage::kDone:
-        break;
-    }
+  if (deadline_ == Timestamp::InfPast()) return;
+  ReleasableMutexLock lock(&mu_);
+  switch (stage_) {
+    case Stage::kInitial:
+      break;
+    case Stage::kStarted:
+      if (GetDefaultEventEngine()->Cancel(timer_handle_)) {
+        lock.Release();
+        OnTimer();
+      }
+      break;
+    case Stage::kDone:
+      break;
   }
-  state_->Unref();
 }
 
-void Sleep::OnTimer(void* arg, grpc_error_handle) {
-  auto* state = static_cast<State*>(arg);
-  Waker waker;
+void Sleep::OnTimer() {
+  Waker tmp_waker;
   {
-    MutexLock lock(&state->mu);
-    state->stage = Stage::kDone;
-    waker = std::move(state->waker);
+    MutexLock lock(&mu_);
+    stage_ = Stage::kDone;
+    tmp_waker = std::move(waker_);
   }
-  waker.Wakeup();
-  state->Unref();
+  tmp_waker.Wakeup();
 }
 
 Poll<absl::Status> Sleep::operator()() {
-  MutexLock lock(&state_->mu);
-  switch (state_->stage) {
+  MutexLock lock(&mu_);
+  switch (stage_) {
     case Stage::kInitial:
-      if (state_->deadline <= ExecCtx::Get()->Now()) {
+      if (deadline_ <= ExecCtx::Get()->Now()) {
         return absl::OkStatus();
       }
-      state_->stage = Stage::kStarted;
-      grpc_timer_init(&state_->timer, state_->deadline, &state_->on_timer);
+      stage_ = Stage::kStarted;
+      timer_handle_ = GetDefaultEventEngine()->RunAfter(
+          deadline_ - ExecCtx::Get()->Now(), [this] {
+            ApplicationCallbackExecCtx callback_exec_ctx;
+            ExecCtx exec_ctx;
+            OnTimer();
+          });
       break;
     case Stage::kStarted:
       break;
     case Stage::kDone:
       return absl::OkStatus();
   }
-  state_->waker = Activity::current()->MakeNonOwningWaker();
+  waker_ = Activity::current()->MakeNonOwningWaker();
   return Pending{};
 }
 

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

@@ -17,7 +17,15 @@
 
 #include <grpc/support/port_platform.h>
 
-#include "src/core/lib/iomgr/timer.h"
+#include <utility>
+
+#include "absl/base/thread_annotations.h"
+#include "absl/status/status.h"
+
+#include <grpc/event_engine/event_engine.h>
+
+#include "src/core/lib/gprpp/sync.h"
+#include "src/core/lib/gprpp/time.h"
 #include "src/core/lib/promise/activity.h"
 #include "src/core/lib/promise/poll.h"
 
@@ -31,34 +39,36 @@ class 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_), timer_handle_(other.timer_handle_) {
+    MutexLock lock2(&other.mu_);
+    stage_ = other.stage_;
+    waker_ = std::move(other.waker_);
+    other.deadline_ = Timestamp::InfPast();
+  };
   Sleep& operator=(Sleep&& other) noexcept {
-    std::swap(state_, other.state_);
+    if (&other == this) return *this;
+    MutexLock lock1(&mu_);
+    MutexLock lock2(&other.mu_);
+    deadline_ = other.deadline_;
+    timer_handle_ = other.timer_handle_;
+    stage_ = other.stage_;
+    waker_ = std::move(other.waker_);
+    other.deadline_ = Timestamp::InfPast();
     return *this;
-  }
+  };
 
   Poll<absl::Status> operator()();
 
  private:
-  static void OnTimer(void* arg, grpc_error_handle error);
-
   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;
-    }
-  };
-  State* state_;
+  void OnTimer();
+
+  Timestamp deadline_;
+  grpc_event_engine::experimental::EventEngine::TaskHandle timer_handle_;
+  Mutex mu_;
+  Stage stage_ ABSL_GUARDED_BY(mu_) = Stage::kInitial;
+  Waker waker_ ABSL_GUARDED_BY(mu_);
 };
 
 }  // namespace grpc_core

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

@@ -17,12 +17,12 @@
 
 #include <grpc/support/port_platform.h>
 
-#include <tuple>
+#include <type_traits>
 #include <utility>
 
+#include "absl/meta/type_traits.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
-#include "absl/types/variant.h"
 
 #include "src/core/lib/promise/detail/basic_seq.h"
 #include "src/core/lib/promise/detail/status.h"

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

@@ -20,6 +20,11 @@
 
 #include "src/core/lib/resolver/resolver.h"
 
+#include <algorithm>
+#include <utility>
+
+#include "src/core/lib/channel/channel_args.h"
+
 grpc_core::DebugOnlyTraceFlag grpc_trace_resolver_refcount(false,
                                                            "resolver_refcount");
 

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

@@ -19,10 +19,13 @@
 
 #include <grpc/support/port_platform.h>
 
+#include <string>
+
 #include "absl/status/statusor.h"
 
 #include <grpc/impl/codegen/grpc_types.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"

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

@@ -19,17 +19,19 @@
 
 #include <grpc/support/port_platform.h>
 
+#include <memory>
+#include <string>
+
+#include "absl/strings/string_view.h"
 #include "absl/strings/strip.h"
 
-#include <grpc/support/string_util.h>
+#include <grpc/impl/codegen/grpc_types.h>
 
-#include "src/core/lib/gprpp/memory.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/uri/uri_parser.h"
 
-typedef struct grpc_pollset_set grpc_pollset_set;
-
 namespace grpc_core {
 
 // TODO(yashkt): Move WorkSerializer to its own Bazel target, depend on that

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 {
 

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

@@ -19,9 +19,20 @@
 
 #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 <grpc/impl/codegen/grpc_types.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 {
 

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"
 
+// IWYU pragma: no_include <sys/socket.h>
+
 namespace grpc_core {
 
 //
@@ -80,6 +89,7 @@ ServerAddress::ServerAddress(ServerAddress&& other) noexcept
       attributes_(std::move(other.attributes_)) {
   other.args_ = nullptr;
 }
+
 ServerAddress& ServerAddress::operator=(ServerAddress&& other) noexcept {
   address_ = other.address_;
   grpc_channel_args_destroy(args_);
@@ -149,12 +159,12 @@ ServerAddress ServerAddress::WithAttribute(
 }
 
 std::string ServerAddress::ToString() const {
+  auto addr_str = grpc_sockaddr_to_string(&address_, false);
   std::vector<std::string> parts = {
-      grpc_sockaddr_to_string(&address_, false),
+      addr_str.ok() ? addr_str.value() : addr_str.status().ToString(),
   };
   if (args_ != nullptr) {
-    parts.emplace_back(
-        absl::StrCat("args={", grpc_channel_args_string(args_), "}"));
+    parts.emplace_back(absl::StrCat("args=", grpc_channel_args_string(args_)));
   }
   if (!attributes_.empty()) {
     std::vector<std::string> attrs;
@@ -167,4 +177,8 @@ std::string ServerAddress::ToString() const {
   return absl::StrJoin(parts, " ");
 }
 
+std::string ServerAddressWeightAttribute::ToString() const {
+  return absl::StrFormat("%d", weight_);
+}
+
 }  // namespace grpc_core

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

@@ -21,11 +21,17 @@
 
 #include <grpc/support/port_platform.h>
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <map>
 #include <memory>
+#include <string>
+#include <vector>
+
+#include "absl/memory/memory.h"
 
-#include "absl/container/inlined_vector.h"
-#include "absl/strings/str_format.h"
+#include <grpc/impl/codegen/grpc_types.h>
 
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/gpr/useful.h"
@@ -96,6 +102,9 @@ class ServerAddress {
   ServerAddress WithAttribute(const char* key,
                               std::unique_ptr<AttributeInterface> value) const;
 
+  // TODO(ctiller): Prior to making this a public API we should ensure that the
+  // channel args are not part of the generated string, lest we make that debug
+  // format load-bearing via Hyrum's law.
   std::string ToString() const;
 
  private:
@@ -108,7 +117,7 @@ class ServerAddress {
 // ServerAddressList
 //
 
-typedef absl::InlinedVector<ServerAddress, 1> ServerAddressList;
+using ServerAddressList = std::vector<ServerAddress>;
 
 //
 // ServerAddressWeightAttribute
@@ -131,9 +140,7 @@ class ServerAddressWeightAttribute : public ServerAddress::AttributeInterface {
     return QsortCompare(weight_, other_locality_attr->weight_);
   }
 
-  std::string ToString() const override {
-    return absl::StrFormat("%d", weight_);
-  }
+  std::string ToString() const override;
 
  private:
   uint32_t weight_;

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

@@ -16,11 +16,24 @@
 
 #include "src/core/lib/resource_quota/api.h"
 
+#include <stdint.h>
+
+#include <atomic>
+#include <memory>
+#include <string>
+#include <utility>
+
+#include "absl/strings/str_cat.h"
+
 #include <grpc/grpc.h>
 
-#include "src/core/lib/gpr/useful.h"
+#include "src/core/lib/channel/channel_args.h"
+#include "src/core/lib/channel/channel_args_preconditioning.h"
+#include "src/core/lib/gprpp/ref_counted_ptr.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
+#include "src/core/lib/resource_quota/memory_quota.h"
 #include "src/core/lib/resource_quota/resource_quota.h"
+#include "src/core/lib/resource_quota/thread_quota.h"
 
 namespace grpc_core {
 

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

@@ -17,7 +17,10 @@
 
 #include <grpc/support/port_platform.h>
 
-#include "src/core/lib/channel/channel_args.h"
+#include <stddef.h>
+
+#include <grpc/impl/codegen/grpc_types.h>
+
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/resource_quota/resource_quota.h"
 

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

@@ -20,17 +20,11 @@
 
 #include "src/core/lib/resource_quota/arena.h"
 
-#include <string.h>
-
 #include <new>
 
 #include <grpc/support/alloc.h>
-#include <grpc/support/atm.h>
-#include <grpc/support/log.h>
-#include <grpc/support/sync.h>
 
 #include "src/core/lib/gpr/alloc.h"
-#include "src/core/lib/gprpp/memory.h"
 
 namespace {
 

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

@@ -34,8 +34,7 @@
 #include <new>
 #include <utility>
 
-#include <grpc/support/alloc.h>
-#include <grpc/support/sync.h>
+#include <grpc/event_engine/memory_allocator.h>
 
 #include "src/core/lib/gpr/alloc.h"
 #include "src/core/lib/promise/context.h"