grpc 1.66.0 → 1.67.0.pre1

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

@@ -172,16 +172,13 @@ class ForEach {
   }
 
   GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Poll<Result> PollReaderNext() {
-    if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) {
-      LOG(INFO) << DebugTag() << " PollReaderNext";
-    }
+    GRPC_TRACE_LOG(promise_primitives, INFO) << DebugTag() << " PollReaderNext";
     auto r = reader_next_();
     if (auto* p = r.value_if_ready()) {
       switch (NextValueTraits<ReaderResult>::Type(*p)) {
         case NextValueType::kValue: {
-          if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) {
-            LOG(INFO) << DebugTag() << " PollReaderNext: got value";
-          }
+          GRPC_TRACE_LOG(promise_primitives, INFO)
+              << DebugTag() << " PollReaderNext: got value";
           Destruct(&reader_next_);
           auto action = action_factory_.Make(
               std::move(NextValueTraits<ReaderResult>::MutableValue(*p)));
@@ -190,15 +187,13 @@ class ForEach {
           return PollAction();
         }
         case NextValueType::kEndOfStream: {
-          if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) {
-            LOG(INFO) << DebugTag() << " PollReaderNext: got end of stream";
-          }
+          GRPC_TRACE_LOG(promise_primitives, INFO)
+              << DebugTag() << " PollReaderNext: got end of stream";
           return Done<Result>::Make(false);
         }
         case NextValueType::kError: {
-          if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) {
-            LOG(INFO) << DebugTag() << " PollReaderNext: got error";
-          }
+          GRPC_TRACE_LOG(promise_primitives, INFO)
+              << DebugTag() << " PollReaderNext: got error";
           return Done<Result>::Make(true);
         }
       }
@@ -207,9 +202,7 @@ class ForEach {
   }
 
   Poll<Result> PollAction() {
-    if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) {
-      LOG(INFO) << DebugTag() << " PollAction";
-    }
+    GRPC_TRACE_LOG(promise_primitives, INFO) << DebugTag() << " PollAction";
     auto r = in_action_.promise();
     if (auto* p = r.value_if_ready()) {
       if (IsStatusOk(*p)) {

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

@@ -87,10 +87,8 @@ class InterceptorList {
    public:
     RunPromise(size_t memory_required, Map** factory, absl::optional<T> value) {
       if (!value.has_value() || *factory == nullptr) {
-        if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) {
-          VLOG(2) << "InterceptorList::RunPromise[" << this
-                  << "]: create immediate";
-        }
+        GRPC_TRACE_VLOG(promise_primitives, 2)
+            << "InterceptorList::RunPromise[" << this << "]: create immediate";
         is_immediately_resolved_ = true;
         Construct(&result_, std::move(value));
       } else {
@@ -100,17 +98,15 @@ class InterceptorList {
                                 async_resolution_.space.get());
         async_resolution_.current_factory = *factory;
         async_resolution_.first_factory = factory;
-        if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) {
-          VLOG(2) << "InterceptorList::RunPromise[" << this
-                  << "]: create async; mem=" << async_resolution_.space.get();
-        }
+        GRPC_TRACE_VLOG(promise_primitives, 2)
+            << "InterceptorList::RunPromise[" << this
+            << "]: create async; mem=" << async_resolution_.space.get();
       }
     }
 
     ~RunPromise() {
-      if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) {
-        VLOG(2) << "InterceptorList::RunPromise[" << this << "]: destroy";
-      }
+      GRPC_TRACE_VLOG(promise_primitives, 2)
+          << "InterceptorList::RunPromise[" << this << "]: destroy";
       if (is_immediately_resolved_) {
         Destruct(&result_);
       } else {
@@ -127,10 +123,9 @@ class InterceptorList {
 
     RunPromise(RunPromise&& other) noexcept
         : is_immediately_resolved_(other.is_immediately_resolved_) {
-      if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) {
-        VLOG(2) << "InterceptorList::RunPromise[" << this << "]: move from "
-                << &other;
-      }
+      GRPC_TRACE_VLOG(promise_primitives, 2)
+          << "InterceptorList::RunPromise[" << this << "]: move from "
+          << &other;
       if (is_immediately_resolved_) {
         Construct(&result_, std::move(other.result_));
       } else {
@@ -141,10 +136,8 @@ class InterceptorList {
     RunPromise& operator=(RunPromise&& other) noexcept = delete;
 
     Poll<absl::optional<T>> operator()() {
-      if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) {
-        VLOG(2) << "InterceptorList::RunPromise[" << this
-                << "]: " << DebugString();
-      }
+      GRPC_TRACE_VLOG(promise_primitives, 2)
+          << "InterceptorList::RunPromise[" << this << "]: " << DebugString();
       if (is_immediately_resolved_) return std::move(result_);
       while (true) {
         if (*async_resolution_.first_factory == nullptr) {
@@ -159,10 +152,9 @@ class InterceptorList {
           async_resolution_.current_factory =
               async_resolution_.current_factory->next();
           if (!p->has_value()) async_resolution_.current_factory = nullptr;
-          if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) {
-            VLOG(2) << "InterceptorList::RunPromise[" << this
-                    << "]: " << DebugString();
-          }
+          GRPC_TRACE_VLOG(promise_primitives, 2)
+              << "InterceptorList::RunPromise[" << this
+              << "]: " << DebugString();
           if (async_resolution_.current_factory == nullptr) {
             return std::move(*p);
           }
@@ -225,15 +217,13 @@ class InterceptorList {
   // Append a new map to the end of the chain.
   template <typename Fn>
   void AppendMap(Fn fn, DebugLocation from) {
-    Append(MakeMapToAdd(
-        std::move(fn), [] {}, from));
+    Append(MakeMapToAdd(std::move(fn), [] {}, from));
   }
 
   // Prepend a new map to the beginning of the chain.
   template <typename Fn>
   void PrependMap(Fn fn, DebugLocation from) {
-    Prepend(MakeMapToAdd(
-        std::move(fn), [] {}, from));
+    Prepend(MakeMapToAdd(std::move(fn), [] {}, from));
   }
 
   // Append a new map to the end of the chain, with a cleanup function to be

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

@@ -67,9 +67,8 @@ class Latch {
     has_had_waiters_ = true;
 #endif
     return [this]() -> Poll<T> {
-      if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) {
-        LOG(INFO) << DebugTag() << "Wait " << StateString();
-      }
+      GRPC_TRACE_LOG(promise_primitives, INFO)
+          << DebugTag() << "Wait " << StateString();
       if (has_value_) {
         return std::move(value_);
       } else {
@@ -85,9 +84,8 @@ class Latch {
     has_had_waiters_ = true;
 #endif
     return [this]() -> Poll<T> {
-      if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) {
-        LOG(INFO) << DebugTag() << "WaitAndCopy " << StateString();
-      }
+      GRPC_TRACE_LOG(promise_primitives, INFO)
+          << DebugTag() << "WaitAndCopy " << StateString();
       if (has_value_) {
         return value_;
       } else {
@@ -98,9 +96,8 @@ class Latch {
 
   // Set the value of the latch. Can only be called once.
   void Set(T value) {
-    if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) {
-      LOG(INFO) << DebugTag() << "Set " << StateString();
-    }
+    GRPC_TRACE_LOG(promise_primitives, INFO)
+        << DebugTag() << "Set " << StateString();
     DCHECK(!has_value_);
     value_ = std::move(value);
     has_value_ = true;
@@ -161,9 +158,8 @@ class Latch<void> {
     has_had_waiters_ = true;
 #endif
     return [this]() -> Poll<Empty> {
-      if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) {
-        LOG(INFO) << DebugTag() << "PollWait " << StateString();
-      }
+      GRPC_TRACE_LOG(promise_primitives, INFO)
+          << DebugTag() << "PollWait " << StateString();
       if (is_set_) {
         return Empty{};
       } else {
@@ -174,9 +170,8 @@ class Latch<void> {
 
   // Set the latch. Can only be called once.
   void Set() {
-    if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) {
-      LOG(INFO) << DebugTag() << "Set " << StateString();
-    }
+    GRPC_TRACE_LOG(promise_primitives, INFO)
+        << DebugTag() << "Set " << StateString();
     DCHECK(!is_set_);
     is_set_ = true;
     waiter_.Wake();
@@ -223,9 +218,8 @@ class ExternallyObservableLatch<void> {
   // Produce a promise to wait for this latch.
   auto Wait() {
     return [this]() -> Poll<Empty> {
-      if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) {
-        LOG(INFO) << DebugTag() << "PollWait " << StateString();
-      }
+      GRPC_TRACE_LOG(promise_primitives, INFO)
+          << DebugTag() << "PollWait " << StateString();
       if (IsSet()) {
         return Empty{};
       } else {
@@ -236,9 +230,8 @@ class ExternallyObservableLatch<void> {
 
   // Set the latch.
   void Set() {
-    if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) {
-      LOG(INFO) << DebugTag() << "Set " << StateString();
-    }
+    GRPC_TRACE_LOG(promise_primitives, INFO)
+        << DebugTag() << "Set " << StateString();
     is_set_.store(true, std::memory_order_relaxed);
     waiter_.Wake();
   }
@@ -246,9 +239,8 @@ class ExternallyObservableLatch<void> {
   bool IsSet() const { return is_set_.load(std::memory_order_relaxed); }
 
   void Reset() {
-    if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) {
-      LOG(INFO) << DebugTag() << "Reset " << StateString();
-    }
+    GRPC_TRACE_LOG(promise_primitives, INFO)
+        << DebugTag() << "Reset " << StateString();
     is_set_.store(false, std::memory_order_relaxed);
   }
 

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

@@ -86,7 +86,7 @@ GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION auto CheckDelayed(Promise promise) {
       delayed = true;
       return Pending{};
     }
-    return std::make_tuple(r.value(), delayed);
+    return std::make_tuple(std::move(r.value()), delayed);
   };
 }