grpc 1.52.0 → 1.53.0.pre2

data/src/core/lib/surface/call.h

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_CORE_LIB_SURFACE_CALL_H
-#define GRPC_CORE_LIB_SURFACE_CALL_H
+#ifndef GRPC_SRC_CORE_LIB_SURFACE_CALL_H
+#define GRPC_SRC_CORE_LIB_SURFACE_CALL_H
 
 #include <grpc/support/port_platform.h>
 
@@ -25,6 +25,7 @@
 #include <stdint.h>
 
 #include "absl/functional/any_invocable.h"
+#include "absl/functional/function_ref.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
 
@@ -43,12 +44,14 @@
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/iomgr/iomgr_fwd.h"
 #include "src/core/lib/iomgr/polling_entity.h"
+#include "src/core/lib/promise/arena_promise.h"
 #include "src/core/lib/promise/context.h"
 #include "src/core/lib/resource_quota/arena.h"
 #include "src/core/lib/slice/slice.h"
 #include "src/core/lib/surface/api_trace.h"
 #include "src/core/lib/surface/channel.h"
 #include "src/core/lib/surface/server.h"
+#include "src/core/lib/transport/transport.h"
 
 typedef void (*grpc_ioreq_completion_func)(grpc_call* call, int success,
                                            void* user_data);
@@ -74,6 +77,28 @@ typedef struct grpc_call_create_args {
 
 namespace grpc_core {
 class PromiseBasedCall;
+class ServerPromiseBasedCall;
+
+class ServerCallContext {
+ public:
+  ServerCallContext(ServerPromiseBasedCall* call,
+                    const void* server_stream_data)
+      : call_(call), server_stream_data_(server_stream_data) {}
+  ArenaPromise<ServerMetadataHandle> MakeTopOfServerCallPromise(
+      CallArgs call_args, grpc_completion_queue* cq,
+      grpc_metadata_array* publish_initial_metadata,
+      absl::FunctionRef<void(grpc_call* call)> publish);
+
+  // Server stream data as supplied by the transport (so we can link the
+  // transport stream up with the call again).
+  // TODO(ctiller): legacy API - once we move transports to promises we'll
+  // create the promise directly and not need to pass around this token.
+  const void* server_stream_data() { return server_stream_data_; }
+
+ private:
+  ServerPromiseBasedCall* const call_;
+  const void* const server_stream_data_;
+};
 
 // TODO(ctiller): move more call things into this type
 class CallContext {
@@ -98,6 +123,8 @@ class CallContext {
   gpr_atm* peer_string_atm_ptr();
   grpc_polling_entity* polling_entity() { return &pollent_; }
 
+  ServerCallContext* server_call_context();
+
  private:
   friend class PromiseBasedCall;
   // Call final info.
@@ -112,6 +139,7 @@ class CallContext {
 
 template <>
 struct ContextType<CallContext> {};
+
 }  // namespace grpc_core
 
 // Create a new call based on \a args.
@@ -179,4 +207,4 @@ absl::string_view grpc_call_server_authority(const grpc_call* call);
 extern grpc_core::TraceFlag grpc_call_error_trace;
 extern grpc_core::TraceFlag grpc_compression_trace;
 
-#endif  // GRPC_CORE_LIB_SURFACE_CALL_H
+#endif  // GRPC_SRC_CORE_LIB_SURFACE_CALL_H

data/src/core/lib/surface/call_log_batch.cc

@@ -22,6 +22,7 @@
 #include <stddef.h>
 
 #include <algorithm>
+#include <initializer_list>
 #include <string>
 #include <vector>
 

data/src/core/lib/surface/call_test_only.h

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_CORE_LIB_SURFACE_CALL_TEST_ONLY_H
-#define GRPC_CORE_LIB_SURFACE_CALL_TEST_ONLY_H
+#ifndef GRPC_SRC_CORE_LIB_SURFACE_CALL_TEST_ONLY_H
+#define GRPC_SRC_CORE_LIB_SURFACE_CALL_TEST_ONLY_H
 
 #include <grpc/support/port_platform.h>
 
@@ -43,4 +43,4 @@ uint32_t grpc_call_test_only_get_message_flags(grpc_call* call);
 /// To be indexed by grpc_compression_algorithm enum values.
 uint32_t grpc_call_test_only_get_encodings_accepted_by_peer(grpc_call* call);
 
-#endif  // GRPC_CORE_LIB_SURFACE_CALL_TEST_ONLY_H
+#endif  // GRPC_SRC_CORE_LIB_SURFACE_CALL_TEST_ONLY_H

data/src/core/lib/surface/call_trace.cc

@@ -25,7 +25,7 @@
 #include "absl/container/flat_hash_map.h"
 #include "absl/meta/type_traits.h"
 #include "absl/status/status.h"
-#include "absl/types/variant.h"
+#include "absl/strings/str_cat.h"
 
 #include <grpc/support/log.h>
 
@@ -35,6 +35,7 @@
 #include "src/core/lib/iomgr/closure.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/transport/metadata_batch.h"
 #include "src/core/lib/transport/transport.h"
 
@@ -45,7 +46,8 @@ const grpc_channel_filter* PromiseTracingFilterFor(
   struct DerivedFilter : public grpc_channel_filter {
     explicit DerivedFilter(const grpc_channel_filter* filter)
         : grpc_channel_filter{
-              /* start_transport_stream_op_batch: */ grpc_call_next_op,
+              // start_transport_stream_op_batch:
+              grpc_call_next_op,
               // make_call_promise:
               [](grpc_channel_element* elem, CallArgs call_args,
                  NextPromiseFactory next_promise_factory)
@@ -54,22 +56,22 @@ const grpc_channel_filter* PromiseTracingFilterFor(
                     static_cast<const DerivedFilter*>(elem->filter)->filter;
                 gpr_log(
                     GPR_DEBUG,
-                    "%sCreateCallPromise[%s]: client_initial_metadata=%s",
+                    "%s[%s] CreateCallPromise: client_initial_metadata=%s",
                     Activity::current()->DebugTag().c_str(),
                     source_filter->name,
                     call_args.client_initial_metadata->DebugString().c_str());
                 return [source_filter, child = next_promise_factory(
                                            std::move(call_args))]() mutable {
-                  gpr_log(GPR_DEBUG, "%sPollCallPromise[%s]: begin",
+                  gpr_log(GPR_DEBUG, "%s[%s] PollCallPromise: begin",
                           Activity::current()->DebugTag().c_str(),
                           source_filter->name);
                   auto r = child();
-                  if (auto* p = absl::get_if<ServerMetadataHandle>(&r)) {
-                    gpr_log(GPR_DEBUG, "%sPollCallPromise[%s]: done: %s",
+                  if (auto* p = r.value_if_ready()) {
+                    gpr_log(GPR_DEBUG, "%s[%s] PollCallPromise: done: %s",
                             Activity::current()->DebugTag().c_str(),
                             source_filter->name, (*p)->DebugString().c_str());
                   } else {
-                    gpr_log(GPR_DEBUG, "%sPollCallPromise[%s]: <<pending>",
+                    gpr_log(GPR_DEBUG, "%s[%s] PollCallPromise: <<pending>>",
                             Activity::current()->DebugTag().c_str(),
                             source_filter->name);
                   }
@@ -85,16 +87,24 @@ const grpc_channel_filter* PromiseTracingFilterFor(
               // destroy_call_elem:
               [](grpc_call_element*, const grpc_call_final_info*,
                  grpc_closure*) {},
-              /* sizeof_channel_data: */ 0,  // init_channel_elem:
+              // sizeof_channel_data:
+              0,
+              // init_channel_elem:
               [](grpc_channel_element*, grpc_channel_element_args*) {
                 return absl::OkStatus();
               },
               // post_init_channel_elem:
               [](grpc_channel_stack*, grpc_channel_element*) {},
-              /* destroy_channel_elem: */ [](grpc_channel_element*) {},
-              grpc_channel_next_get_info, filter->name},
-          filter(filter) {}
+              // destroy_channel_elem:
+              [](grpc_channel_element*) {}, grpc_channel_next_get_info,
+              // name:
+              nullptr},
+          filter(filter),
+          name_str(absl::StrCat(filter->name, ".trace")) {
+      this->name = name_str.c_str();
+    }
     const grpc_channel_filter* const filter;
+    const std::string name_str;
   };
   struct Globals {
     Mutex mu;

data/src/core/lib/surface/call_trace.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef GRPC_CORE_LIB_SURFACE_CALL_TRACE_H
-#define GRPC_CORE_LIB_SURFACE_CALL_TRACE_H
+#ifndef GRPC_SRC_CORE_LIB_SURFACE_CALL_TRACE_H
+#define GRPC_SRC_CORE_LIB_SURFACE_CALL_TRACE_H
 
 #include <grpc/support/port_platform.h>
 
@@ -27,4 +27,4 @@ const grpc_channel_filter* PromiseTracingFilterFor(
     const grpc_channel_filter* filter);
 }
 
-#endif  // GRPC_CORE_LIB_SURFACE_CALL_TRACE_H
+#endif  // GRPC_SRC_CORE_LIB_SURFACE_CALL_TRACE_H

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

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_CORE_LIB_SURFACE_CHANNEL_H
-#define GRPC_CORE_LIB_SURFACE_CHANNEL_H
+#ifndef GRPC_SRC_CORE_LIB_SURFACE_CHANNEL_H
+#define GRPC_SRC_CORE_LIB_SURFACE_CHANNEL_H
 
 #include <grpc/support/port_platform.h>
 
@@ -211,4 +211,4 @@ grpc_compression_options grpc_channel_compression_options(
 void grpc_channel_ping(grpc_channel* channel, grpc_completion_queue* cq,
                        void* tag, void* reserved);
 
-#endif  // GRPC_CORE_LIB_SURFACE_CHANNEL_H
+#endif  // GRPC_SRC_CORE_LIB_SURFACE_CHANNEL_H

data/src/core/lib/surface/channel_init.h

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_CORE_LIB_SURFACE_CHANNEL_INIT_H
-#define GRPC_CORE_LIB_SURFACE_CHANNEL_INIT_H
+#ifndef GRPC_SRC_CORE_LIB_SURFACE_CHANNEL_INIT_H
+#define GRPC_SRC_CORE_LIB_SURFACE_CHANNEL_INIT_H
 
 #include <grpc/support/port_platform.h>
 
@@ -81,4 +81,4 @@ class ChannelInit {
 
 }  // namespace grpc_core
 
-#endif  // GRPC_CORE_LIB_SURFACE_CHANNEL_INIT_H
+#endif  // GRPC_SRC_CORE_LIB_SURFACE_CHANNEL_INIT_H

data/src/core/lib/surface/channel_stack_type.h

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_CORE_LIB_SURFACE_CHANNEL_STACK_TYPE_H
-#define GRPC_CORE_LIB_SURFACE_CHANNEL_STACK_TYPE_H
+#ifndef GRPC_SRC_CORE_LIB_SURFACE_CHANNEL_STACK_TYPE_H
+#define GRPC_SRC_CORE_LIB_SURFACE_CHANNEL_STACK_TYPE_H
 
 #include <grpc/support/port_platform.h>
 
@@ -44,4 +44,4 @@ bool grpc_channel_stack_type_is_client(grpc_channel_stack_type type);
 
 const char* grpc_channel_stack_type_string(grpc_channel_stack_type type);
 
-#endif  // GRPC_CORE_LIB_SURFACE_CHANNEL_STACK_TYPE_H
+#endif  // GRPC_SRC_CORE_LIB_SURFACE_CHANNEL_STACK_TYPE_H

data/src/core/lib/surface/completion_queue.cc

@@ -24,6 +24,7 @@
 
 #include <algorithm>
 #include <atomic>
+#include <initializer_list>
 #include <new>
 #include <string>
 #include <utility>

data/src/core/lib/surface/completion_queue.h

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_CORE_LIB_SURFACE_COMPLETION_QUEUE_H
-#define GRPC_CORE_LIB_SURFACE_COMPLETION_QUEUE_H
+#ifndef GRPC_SRC_CORE_LIB_SURFACE_COMPLETION_QUEUE_H
+#define GRPC_SRC_CORE_LIB_SURFACE_COMPLETION_QUEUE_H
 
 // Internal API for completion queues
 
@@ -97,4 +97,4 @@ grpc_completion_queue* grpc_completion_queue_create_internal(
     grpc_cq_completion_type completion_type, grpc_cq_polling_type polling_type,
     grpc_completion_queue_functor* shutdown_callback);
 
-#endif  // GRPC_CORE_LIB_SURFACE_COMPLETION_QUEUE_H
+#endif  // GRPC_SRC_CORE_LIB_SURFACE_COMPLETION_QUEUE_H

data/src/core/lib/surface/completion_queue_factory.h

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_CORE_LIB_SURFACE_COMPLETION_QUEUE_FACTORY_H
-#define GRPC_CORE_LIB_SURFACE_COMPLETION_QUEUE_FACTORY_H
+#ifndef GRPC_SRC_CORE_LIB_SURFACE_COMPLETION_QUEUE_FACTORY_H
+#define GRPC_SRC_CORE_LIB_SURFACE_COMPLETION_QUEUE_FACTORY_H
 
 #include <grpc/support/port_platform.h>
 
@@ -34,4 +34,4 @@ struct grpc_completion_queue_factory {
   grpc_completion_queue_factory_vtable* vtable;
 };
 
-#endif  // GRPC_CORE_LIB_SURFACE_COMPLETION_QUEUE_FACTORY_H
+#endif  // GRPC_SRC_CORE_LIB_SURFACE_COMPLETION_QUEUE_FACTORY_H

data/src/core/lib/surface/event_string.cc

@@ -21,6 +21,7 @@
 #include "src/core/lib/surface/event_string.h"
 
 #include <algorithm>
+#include <initializer_list>
 #include <vector>
 
 #include "absl/strings/str_format.h"

data/src/core/lib/surface/event_string.h

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_CORE_LIB_SURFACE_EVENT_STRING_H
-#define GRPC_CORE_LIB_SURFACE_EVENT_STRING_H
+#ifndef GRPC_SRC_CORE_LIB_SURFACE_EVENT_STRING_H
+#define GRPC_SRC_CORE_LIB_SURFACE_EVENT_STRING_H
 
 #include <grpc/support/port_platform.h>
 
@@ -28,4 +28,4 @@
 // Returns a string describing an event. Must be later freed with gpr_free()
 std::string grpc_event_string(grpc_event* ev);
 
-#endif  // GRPC_CORE_LIB_SURFACE_EVENT_STRING_H
+#endif  // GRPC_SRC_CORE_LIB_SURFACE_EVENT_STRING_H

data/src/core/lib/surface/init.cc

@@ -80,7 +80,7 @@ static bool maybe_prepend_client_auth_filter(
 static bool maybe_prepend_server_auth_filter(
     grpc_core::ChannelStackBuilder* builder) {
   if (builder->channel_args().Contains(GRPC_SERVER_CREDENTIALS_ARG)) {
-    builder->PrependFilter(&grpc_server_auth_filter);
+    builder->PrependFilter(&grpc_core::ServerAuthFilter::kFilter);
   }
   return true;
 }

data/src/core/lib/surface/init.h

@@ -15,11 +15,11 @@
 // limitations under the License.
 //
 //
-#ifndef GRPC_CORE_LIB_SURFACE_INIT_H
-#define GRPC_CORE_LIB_SURFACE_INIT_H
+#ifndef GRPC_SRC_CORE_LIB_SURFACE_INIT_H
+#define GRPC_SRC_CORE_LIB_SURFACE_INIT_H
 
 #include <grpc/support/port_platform.h>
 
 void grpc_maybe_wait_for_async_shutdown(void);
 
-#endif  // GRPC_CORE_LIB_SURFACE_INIT_H
+#endif  // GRPC_SRC_CORE_LIB_SURFACE_INIT_H

data/src/core/lib/surface/init_internally.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef GRPC_CORE_LIB_SURFACE_INIT_INTERNALLY_H
-#define GRPC_CORE_LIB_SURFACE_INIT_INTERNALLY_H
+#ifndef GRPC_SRC_CORE_LIB_SURFACE_INIT_INTERNALLY_H
+#define GRPC_SRC_CORE_LIB_SURFACE_INIT_INTERNALLY_H
 
 namespace grpc_core {
 
@@ -34,4 +34,4 @@ class KeepsGrpcInitialized {
 
 }  // namespace grpc_core
 
-#endif  // GRPC_CORE_LIB_SURFACE_INIT_INTERNALLY_H
+#endif  // GRPC_SRC_CORE_LIB_SURFACE_INIT_INTERNALLY_H

data/src/core/lib/surface/lame_client.cc

@@ -76,7 +76,9 @@ ArenaPromise<ServerMetadataHandle> LameClientFilter::MakeCallPromise(
     CallArgs args, NextPromiseFactory) {
   // TODO(ctiller): remove if check once promise_based_filter is removed (Close
   // is still needed)
-  if (args.incoming_messages != nullptr) args.incoming_messages->Close();
+  if (args.server_to_client_messages != nullptr) {
+    args.server_to_client_messages->Close();
+  }
   return Immediate(ServerMetadataFromStatus(error_));
 }
 

data/src/core/lib/surface/lame_client.h

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_CORE_LIB_SURFACE_LAME_CLIENT_H
-#define GRPC_CORE_LIB_SURFACE_LAME_CLIENT_H
+#ifndef GRPC_SRC_CORE_LIB_SURFACE_LAME_CLIENT_H
+#define GRPC_SRC_CORE_LIB_SURFACE_LAME_CLIENT_H
 
 #include <grpc/support/port_platform.h>
 
@@ -68,4 +68,4 @@ class LameClientFilter : public ChannelFilter {
 };
 }  // namespace grpc_core
 
-#endif  // GRPC_CORE_LIB_SURFACE_LAME_CLIENT_H
+#endif  // GRPC_SRC_CORE_LIB_SURFACE_LAME_CLIENT_H