grpc 1.62.0 → 1.68.1

data/src/core/lib/channel/channel_stack_builder_impl.cc

@@ -16,58 +16,46 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_stack_builder_impl.h"
 
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
 #include <string.h>
 
 #include <algorithm>
+#include <functional>
+#include <memory>
+#include <string>
+#include <utility>
 #include <vector>
 
+#include "absl/base/thread_annotations.h"
+#include "absl/container/flat_hash_map.h"
 #include "absl/status/status.h"
-
-#include <grpc/support/alloc.h>
-
+#include "absl/strings/str_cat.h"
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/channel/channel_stack.h"
 #include "src/core/lib/debug/trace.h"
+#include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/error.h"
-#include "src/core/lib/surface/call_trace.h"
+#include "src/core/lib/promise/activity.h"
+#include "src/core/lib/promise/arena_promise.h"
+#include "src/core/lib/promise/poll.h"
 #include "src/core/lib/surface/channel_stack_type.h"
 #include "src/core/lib/transport/error_utils.h"
+#include "src/core/lib/transport/metadata_batch.h"
+#include "src/core/lib/transport/transport.h"
+#include "src/core/util/no_destruct.h"
+#include "src/core/util/sync.h"
 
 namespace grpc_core {
 
-bool ChannelStackBuilderImpl::IsPromising() const {
-  for (const auto* filter : stack()) {
-    if (filter->make_call_promise == nullptr) return false;
-  }
-  return true;
-}
-
 absl::StatusOr<RefCountedPtr<grpc_channel_stack>>
 ChannelStackBuilderImpl::Build() {
   std::vector<const grpc_channel_filter*> stack;
-  const bool is_promising = IsPromising();
-  const bool is_client =
-      grpc_channel_stack_type_is_client(channel_stack_type());
-  const bool client_promise_tracing =
-      is_client && is_promising && grpc_call_trace.enabled();
-  const bool server_promise_tracing =
-      !is_client && is_promising && grpc_call_trace.enabled();
 
   for (const auto* filter : this->stack()) {
-    if (client_promise_tracing) {
-      stack.push_back(PromiseTracingFilterFor(filter));
-    }
     stack.push_back(filter);
-    if (server_promise_tracing) {
-      stack.push_back(PromiseTracingFilterFor(filter));
-    }
-  }
-  if (server_promise_tracing) {
-    stack.pop_back();  // connected_channel must be last => can't be traced
   }
 
   // calculate the size of the channel stack
@@ -87,7 +75,7 @@ ChannelStackBuilderImpl::Build() {
         gpr_free(stk);
       },
       channel_stack, stack.data(), stack.size(), channel_args(), name(),
-      channel_stack);
+      channel_stack, old_blackboard_, new_blackboard_);
 
   if (!error.ok()) {
     grpc_channel_stack_destroy(channel_stack);

data/src/core/lib/channel/channel_stack_builder_impl.h

@@ -18,13 +18,14 @@
 #include <grpc/support/port_platform.h>
 
 #include "absl/status/statusor.h"
-
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/channel/channel_stack_builder.h"
-#include "src/core/lib/gprpp/ref_counted_ptr.h"
+#include "src/core/util/ref_counted_ptr.h"
 
 namespace grpc_core {
 
+class Blackboard;
+
 // Build a channel stack.
 // Allows interested parties to add filters to the stack, and to query an
 // in-progress build.
@@ -34,7 +35,11 @@ class ChannelStackBuilderImpl final : public ChannelStackBuilder {
  public:
   using ChannelStackBuilder::ChannelStackBuilder;
 
-  bool IsPromising() const override;
+  void SetBlackboards(const Blackboard* old_blackboard,
+                      Blackboard* new_blackboard) {
+    old_blackboard_ = old_blackboard;
+    new_blackboard_ = new_blackboard;
+  }
 
   // Build the channel stack.
   // After success, *result holds the new channel stack,
@@ -42,7 +47,12 @@ class ChannelStackBuilderImpl final : public ChannelStackBuilder {
   // initial_refs, destroy, destroy_arg are as per grpc_channel_stack_init
   // On failure, *result is nullptr.
   absl::StatusOr<RefCountedPtr<grpc_channel_stack>> Build() override;
+
+ private:
+  const Blackboard* old_blackboard_ = nullptr;
+  Blackboard* new_blackboard_ = nullptr;
 };
+
 }  // namespace grpc_core
 
 #endif  // GRPC_SRC_CORE_LIB_CHANNEL_CHANNEL_STACK_BUILDER_IMPL_H