grpc 1.50.0.pre1 → 1.52.0.pre2

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

@@ -1,20 +1,20 @@
-/*
- *
- * Copyright 2015 gRPC authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
+//
+//
+// Copyright 2015 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+//
 
 #ifndef GRPC_CORE_LIB_SURFACE_CALL_H
 #define GRPC_CORE_LIB_SURFACE_CALL_H
@@ -24,14 +24,17 @@
 #include <stddef.h>
 #include <stdint.h>
 
+#include "absl/functional/any_invocable.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
 
-#include <grpc/impl/codegen/compression_types.h>
-#include <grpc/impl/codegen/grpc_types.h>
+#include <grpc/grpc.h>
+#include <grpc/impl/compression_types.h>
+#include <grpc/support/atm.h>
 #include <grpc/support/log.h>
 
 #include "src/core/lib/channel/channel_fwd.h"
+#include "src/core/lib/channel/channel_stack.h"
 #include "src/core/lib/channel/context.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
@@ -39,6 +42,8 @@
 #include "src/core/lib/iomgr/closure.h"
 #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/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"
@@ -56,7 +61,7 @@ typedef struct grpc_call_create_args {
   uint32_t propagation_mask;
 
   grpc_completion_queue* cq;
-  /* if not NULL, it'll be used in lieu of cq */
+  // if not NULL, it'll be used in lieu of cq
   grpc_pollset_set* pollset_set_alternative;
 
   const void* server_transport_data;
@@ -67,9 +72,51 @@ typedef struct grpc_call_create_args {
   grpc_core::Timestamp send_deadline;
 } grpc_call_create_args;
 
-/* Create a new call based on \a args.
-   Regardless of success or failure, always returns a valid new call into *call
-   */
+namespace grpc_core {
+class PromiseBasedCall;
+
+// TODO(ctiller): move more call things into this type
+class CallContext {
+ public:
+  explicit CallContext(PromiseBasedCall* call) : call_(call) {}
+
+  // Update the deadline (if deadline < the current deadline).
+  void UpdateDeadline(Timestamp deadline);
+
+  // Run some action in the call activity context. This is needed to adapt some
+  // legacy systems to promises, and will likely disappear once that conversion
+  // is complete.
+  void RunInContext(absl::AnyInvocable<void()> fn);
+
+  // TODO(ctiller): remove this once transport APIs are promise based
+  void IncrementRefCount(const char* reason = "call_context");
+
+  // TODO(ctiller): remove this once transport APIs are promise based
+  void Unref(const char* reason = "call_context");
+
+  grpc_call_stats* call_stats() { return &call_stats_; }
+  gpr_atm* peer_string_atm_ptr();
+  grpc_polling_entity* polling_entity() { return &pollent_; }
+
+ private:
+  friend class PromiseBasedCall;
+  // Call final info.
+  grpc_call_stats call_stats_;
+  // Pollset stuff, can't wait to remove.
+  // TODO(ctiller): bring forth EventEngine.
+  grpc_polling_entity pollent_;
+  // TODO(ctiller): remove this once transport APIs are promise based and we
+  // don't need refcounting here.
+  PromiseBasedCall* const call_;
+};
+
+template <>
+struct ContextType<CallContext> {};
+}  // namespace grpc_core
+
+// Create a new call based on \a args.
+// Regardless of success or failure, always returns a valid new call into *call
+//
 grpc_error_handle grpc_call_create(grpc_call_create_args* args,
                                    grpc_call** call);
 
@@ -84,22 +131,22 @@ grpc_call_error grpc_call_start_batch_and_execute(grpc_call* call,
                                                   size_t nops,
                                                   grpc_closure* closure);
 
-/* gRPC core internal version of grpc_call_cancel that does not create
- * exec_ctx. */
+// gRPC core internal version of grpc_call_cancel that does not create
+// exec_ctx.
 void grpc_call_cancel_internal(grpc_call* call);
 
-/* Given the top call_element, get the call object. */
+// Given the top call_element, get the call object.
 grpc_call* grpc_call_from_top_element(grpc_call_element* surface_element);
 
 void grpc_call_log_batch(const char* file, int line, gpr_log_severity severity,
                          const grpc_op* ops, size_t nops);
 
-/* Set a context pointer.
-   No thread safety guarantees are made wrt this value. */
-/* TODO(#9731): add exec_ctx to destroy */
+// Set a context pointer.
+// No thread safety guarantees are made wrt this value.
+// TODO(#9731): add exec_ctx to destroy
 void grpc_call_context_set(grpc_call* call, grpc_context_index elem,
                            void* value, void (*destroy)(void* value));
-/* Get a context pointer. */
+// Get a context pointer.
 void* grpc_call_context_get(grpc_call* call, grpc_context_index elem);
 
 #define GRPC_CALL_LOG_BATCH(sev, ops, nops)        \
@@ -111,19 +158,19 @@ void* grpc_call_context_get(grpc_call* call, grpc_context_index elem);
 
 uint8_t grpc_call_is_client(grpc_call* call);
 
-/* Get the estimated memory size for a call BESIDES the call stack. Combined
- * with the size of the call stack, it helps estimate the arena size for the
- * initial call. */
+// Get the estimated memory size for a call BESIDES the call stack. Combined
+// with the size of the call stack, it helps estimate the arena size for the
+// initial call.
 size_t grpc_call_get_initial_size_estimate();
 
-/* Return an appropriate compression algorithm for the requested compression \a
- * level in the context of \a call. */
+// Return an appropriate compression algorithm for the requested compression \a
+// level in the context of \a call.
 grpc_compression_algorithm grpc_call_compression_for_level(
     grpc_call* call, grpc_compression_level level);
 
-/* Did this client call receive a trailers-only response */
-/* TODO(markdroth): This is currently available only to the C++ API.
-                    Move to surface API if requested by other languages. */
+// Did this client call receive a trailers-only response
+// TODO(markdroth): This is currently available only to the C++ API.
+//                  Move to surface API if requested by other languages.
 bool grpc_call_is_trailers_only(const grpc_call* call);
 
 // Returns the authority for the call, as seen on the server side.
@@ -132,4 +179,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_CORE_LIB_SURFACE_CALL_H

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

@@ -1,30 +1,29 @@
-/*
- *
- * Copyright 2015 gRPC authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
+//
+//
+// Copyright 2015 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+//
 
 #include <grpc/support/port_platform.h>
 
 #include <grpc/grpc.h>
-#include <grpc/impl/codegen/grpc_types.h>
 #include <grpc/slice.h>
 
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
-#include "src/core/lib/slice/slice_refcount.h"
+#include "src/core/lib/slice/slice.h"
 #include "src/core/lib/surface/api_trace.h"
 
 void grpc_call_details_init(grpc_call_details* details) {
@@ -36,6 +35,6 @@ void grpc_call_details_init(grpc_call_details* details) {
 void grpc_call_details_destroy(grpc_call_details* details) {
   GRPC_API_TRACE("grpc_call_details_destroy(details=%p)", 1, (details));
   grpc_core::ExecCtx exec_ctx;
-  grpc_slice_unref_internal(details->method);
-  grpc_slice_unref_internal(details->host);
+  grpc_core::CSliceUnref(details->method);
+  grpc_core::CSliceUnref(details->host);
 }

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

@@ -1,20 +1,20 @@
-/*
- *
- * Copyright 2015 gRPC authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
+//
+//
+// Copyright 2015 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+//
 
 #include <grpc/support/port_platform.h>
 
@@ -29,7 +29,7 @@
 #include "absl/strings/str_join.h"
 #include "absl/strings/string_view.h"
 
-#include <grpc/impl/codegen/grpc_types.h>
+#include <grpc/grpc.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/log.h>
 

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

@@ -1,20 +1,20 @@
-/*
- *
- * Copyright 2015 gRPC authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
+//
+//
+// Copyright 2015 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+//
 
 #ifndef GRPC_CORE_LIB_SURFACE_CALL_TEST_ONLY_H
 #define GRPC_CORE_LIB_SURFACE_CALL_TEST_ONLY_H
@@ -23,24 +23,24 @@
 
 #include <stdint.h>
 
-#include <grpc/impl/codegen/compression_types.h>
-#include <grpc/impl/codegen/grpc_types.h>
+#include <grpc/grpc.h>
+#include <grpc/impl/compression_types.h>
 
-/** Return the message compression algorithm from \a call.
- *
- * \warning This function should \b only be used in test code. */
+/// Return the message compression algorithm from \a call.
+///
+///\warning This function should \b only be used in test code.
 grpc_compression_algorithm grpc_call_test_only_get_compression_algorithm(
     grpc_call* call);
 
-/** Return the message flags from \a call.
- *
- * \warning This function should \b only be used in test code. */
+/// Return the message flags from \a call.
+///
+///\warning This function should \b only be used in test code.
 uint32_t grpc_call_test_only_get_message_flags(grpc_call* call);
 
-/** Returns a bitset for the encodings (compression algorithms) supported by \a
- * call's peer.
- *
- * To be indexed by grpc_compression_algorithm enum values. */
+/// Returns a bitset for the encodings (compression algorithms) supported by \a
+/// call's peer.
+///
+/// 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_CORE_LIB_SURFACE_CALL_TEST_ONLY_H

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

@@ -0,0 +1,113 @@
+// Copyright 2022 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#include <grpc/support/port_platform.h>
+
+#include "src/core/lib/surface/call_trace.h"
+
+#include <functional>
+#include <memory>
+#include <string>
+#include <utility>
+
+#include "absl/base/thread_annotations.h"
+#include "absl/container/flat_hash_map.h"
+#include "absl/meta/type_traits.h"
+#include "absl/status/status.h"
+#include "absl/types/variant.h"
+
+#include <grpc/support/log.h>
+
+#include "src/core/lib/channel/channel_stack.h"
+#include "src/core/lib/gprpp/no_destruct.h"
+#include "src/core/lib/gprpp/sync.h"
+#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/transport/metadata_batch.h"
+#include "src/core/lib/transport/transport.h"
+
+namespace grpc_core {
+
+const grpc_channel_filter* PromiseTracingFilterFor(
+    const grpc_channel_filter* filter) {
+  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,
+              // make_call_promise:
+              [](grpc_channel_element* elem, CallArgs call_args,
+                 NextPromiseFactory next_promise_factory)
+                  -> ArenaPromise<ServerMetadataHandle> {
+                auto* source_filter =
+                    static_cast<const DerivedFilter*>(elem->filter)->filter;
+                gpr_log(
+                    GPR_DEBUG,
+                    "%sCreateCallPromise[%s]: 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",
+                          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",
+                            Activity::current()->DebugTag().c_str(),
+                            source_filter->name, (*p)->DebugString().c_str());
+                  } else {
+                    gpr_log(GPR_DEBUG, "%sPollCallPromise[%s]: <<pending>",
+                            Activity::current()->DebugTag().c_str(),
+                            source_filter->name);
+                  }
+                  return r;
+                };
+              },
+              grpc_channel_next_op, /* sizeof_call_data: */ 0,
+              // init_call_elem:
+              [](grpc_call_element*, const grpc_call_element_args*) {
+                return absl::OkStatus();
+              },
+              grpc_call_stack_ignore_set_pollset_or_pollset_set,
+              // destroy_call_elem:
+              [](grpc_call_element*, const grpc_call_final_info*,
+                 grpc_closure*) {},
+              /* 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) {}
+    const grpc_channel_filter* const filter;
+  };
+  struct Globals {
+    Mutex mu;
+    absl::flat_hash_map<const grpc_channel_filter*,
+                        std::unique_ptr<DerivedFilter>>
+        map ABSL_GUARDED_BY(mu);
+  };
+  auto* globals = NoDestructSingleton<Globals>::Get();
+  MutexLock lock(&globals->mu);
+  auto it = globals->map.find(filter);
+  if (it != globals->map.end()) return it->second.get();
+  return globals->map.emplace(filter, std::make_unique<DerivedFilter>(filter))
+      .first->second.get();
+}
+
+}  // namespace grpc_core

data/src/core/{ext/filters/http/message_compress/message_decompress_filter.h → lib/surface/call_trace.h}

@@ -1,6 +1,4 @@
-//
-//
-// Copyright 2020 gRPC authors.
+// Copyright 2022 gRPC authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -13,20 +11,20 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-//
-//
 
-#ifndef GRPC_CORE_EXT_FILTERS_HTTP_MESSAGE_COMPRESS_MESSAGE_DECOMPRESS_FILTER_H
-#define GRPC_CORE_EXT_FILTERS_HTTP_MESSAGE_COMPRESS_MESSAGE_DECOMPRESS_FILTER_H
+#ifndef GRPC_CORE_LIB_SURFACE_CALL_TRACE_H
+#define GRPC_CORE_LIB_SURFACE_CALL_TRACE_H
 
 #include <grpc/support/port_platform.h>
 
 #include "src/core/lib/channel/channel_fwd.h"
-#include "src/core/lib/channel/channel_stack.h"
+#include "src/core/lib/debug/trace.h"
+
+extern grpc_core::TraceFlag grpc_call_trace;
 
 namespace grpc_core {
-extern const grpc_channel_filter MessageDecompressFilter;
-}  // namespace grpc_core
+const grpc_channel_filter* PromiseTracingFilterFor(
+    const grpc_channel_filter* filter);
+}
 
-#endif /* GRPC_CORE_EXT_FILTERS_HTTP_MESSAGE_COMPRESS_MESSAGE_DECOMPRESS_FILTER_H \
-        */
+#endif  // GRPC_CORE_LIB_SURFACE_CALL_TRACE_H