grpc 1.52.0 → 1.53.0

data/src/core/lib/iomgr/buffer_list.h

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_CORE_LIB_IOMGR_BUFFER_LIST_H
-#define GRPC_CORE_LIB_IOMGR_BUFFER_LIST_H
+#ifndef GRPC_SRC_CORE_LIB_IOMGR_BUFFER_LIST_H
+#define GRPC_SRC_CORE_LIB_IOMGR_BUFFER_LIST_H
 
 #include <grpc/support/port_platform.h>
 
@@ -182,4 +182,4 @@ void grpc_tcp_set_write_timestamps_callback(
 
 }  // namespace grpc_core
 
-#endif  // GRPC_CORE_LIB_IOMGR_BUFFER_LIST_H
+#endif  // GRPC_SRC_CORE_LIB_IOMGR_BUFFER_LIST_H

data/src/core/lib/iomgr/call_combiner.cc

@@ -116,9 +116,9 @@ void CallCombiner::Start(grpc_closure* closure, grpc_error_handle error,
                          DEBUG_ARGS const char* reason) {
   if (GRPC_TRACE_FLAG_ENABLED(grpc_call_combiner_trace)) {
     gpr_log(GPR_INFO,
-            "==> CallCombiner::Start() [%p] closure=%p [" DEBUG_FMT_STR
+            "==> CallCombiner::Start() [%p] closure=%s [" DEBUG_FMT_STR
             "%s] error=%s",
-            this, closure DEBUG_FMT_ARGS, reason,
+            this, closure->DebugString().c_str() DEBUG_FMT_ARGS, reason,
             StatusToString(error).c_str());
   }
   size_t prev_size =
@@ -176,8 +176,8 @@ void CallCombiner::Stop(DEBUG_ARGS const char* reason) {
           internal::StatusMoveFromHeapPtr(closure->error_data.error);
       closure->error_data.error = 0;
       if (GRPC_TRACE_FLAG_ENABLED(grpc_call_combiner_trace)) {
-        gpr_log(GPR_INFO, "  EXECUTING FROM QUEUE: closure=%p error=%s",
-                closure, StatusToString(error).c_str());
+        gpr_log(GPR_INFO, "  EXECUTING FROM QUEUE: closure=%s error=%s",
+                closure->DebugString().c_str(), StatusToString(error).c_str());
       }
       ScheduleClosure(closure, error);
       break;

data/src/core/lib/iomgr/call_combiner.h

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_CORE_LIB_IOMGR_CALL_COMBINER_H
-#define GRPC_CORE_LIB_IOMGR_CALL_COMBINER_H
+#ifndef GRPC_SRC_CORE_LIB_IOMGR_CALL_COMBINER_H
+#define GRPC_SRC_CORE_LIB_IOMGR_CALL_COMBINER_H
 
 #include <grpc/support/port_platform.h>
 
@@ -211,4 +211,4 @@ class CallCombinerClosureList {
 
 }  // namespace grpc_core
 
-#endif  // GRPC_CORE_LIB_IOMGR_CALL_COMBINER_H
+#endif  // GRPC_SRC_CORE_LIB_IOMGR_CALL_COMBINER_H

data/src/core/lib/iomgr/cfstream_handle.h

@@ -19,8 +19,8 @@
 // The CFStream handle acts as an event synchronization entity for
 // read/write/open/error/eos events happening on CFStream streams.
 
-#ifndef GRPC_CORE_LIB_IOMGR_CFSTREAM_HANDLE_H
-#define GRPC_CORE_LIB_IOMGR_CFSTREAM_HANDLE_H
+#ifndef GRPC_SRC_CORE_LIB_IOMGR_CFSTREAM_HANDLE_H
+#define GRPC_SRC_CORE_LIB_IOMGR_CFSTREAM_HANDLE_H
 
 #include <grpc/support/port_platform.h>
 
@@ -87,4 +87,4 @@ class CFStreamHandle : public GrpcLibraryInitHolder {
 
 #endif
 
-#endif  // GRPC_CORE_LIB_IOMGR_CFSTREAM_HANDLE_H
+#endif  // GRPC_SRC_CORE_LIB_IOMGR_CFSTREAM_HANDLE_H

data/src/core/lib/iomgr/closure.cc

@@ -0,0 +1,27 @@
+// 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/iomgr/closure.h"
+
+#include "absl/strings/str_format.h"
+
+std::string grpc_closure::DebugString() const {
+#ifdef NDEBUG
+  return absl::StrFormat("%p", this);
+#else
+  return absl::StrFormat("%p|created=%s:%d", this, file_created, line_created);
+#endif
+}

data/src/core/lib/iomgr/closure.h

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_CORE_LIB_IOMGR_CLOSURE_H
-#define GRPC_CORE_LIB_IOMGR_CLOSURE_H
+#ifndef GRPC_SRC_CORE_LIB_IOMGR_CLOSURE_H
+#define GRPC_SRC_CORE_LIB_IOMGR_CLOSURE_H
 
 #include <grpc/support/port_platform.h>
 
@@ -86,6 +86,8 @@ struct grpc_closure {
   const char* file_initiated;
   int line_initiated;
 #endif
+
+  std::string DebugString() const;
 };
 
 #ifndef NDEBUG
@@ -308,4 +310,4 @@ class Closure {
 };
 }  // namespace grpc_core
 
-#endif  // GRPC_CORE_LIB_IOMGR_CLOSURE_H
+#endif  // GRPC_SRC_CORE_LIB_IOMGR_CLOSURE_H

data/src/core/lib/iomgr/combiner.h

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_CORE_LIB_IOMGR_COMBINER_H
-#define GRPC_CORE_LIB_IOMGR_COMBINER_H
+#ifndef GRPC_SRC_CORE_LIB_IOMGR_COMBINER_H
+#define GRPC_SRC_CORE_LIB_IOMGR_COMBINER_H
 
 #include <grpc/support/port_platform.h>
 
@@ -86,4 +86,4 @@ bool grpc_combiner_continue_exec_ctx();
 
 extern grpc_core::DebugOnlyTraceFlag grpc_combiner_trace;
 
-#endif  // GRPC_CORE_LIB_IOMGR_COMBINER_H
+#endif  // GRPC_SRC_CORE_LIB_IOMGR_COMBINER_H

data/src/core/lib/iomgr/dynamic_annotations.h

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_CORE_LIB_IOMGR_DYNAMIC_ANNOTATIONS_H
-#define GRPC_CORE_LIB_IOMGR_DYNAMIC_ANNOTATIONS_H
+#ifndef GRPC_SRC_CORE_LIB_IOMGR_DYNAMIC_ANNOTATIONS_H
+#define GRPC_SRC_CORE_LIB_IOMGR_DYNAMIC_ANNOTATIONS_H
 
 #include <grpc/support/port_platform.h>
 
@@ -64,4 +64,4 @@ void AnnotateRWLockReleased(const char* file, int line,
 
 #endif  // GRPC_TSAN_ENABLED
 
-#endif  // GRPC_CORE_LIB_IOMGR_DYNAMIC_ANNOTATIONS_H
+#endif  // GRPC_SRC_CORE_LIB_IOMGR_DYNAMIC_ANNOTATIONS_H

data/src/core/lib/iomgr/endpoint.h

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_CORE_LIB_IOMGR_ENDPOINT_H
-#define GRPC_CORE_LIB_IOMGR_ENDPOINT_H
+#ifndef GRPC_SRC_CORE_LIB_IOMGR_ENDPOINT_H
+#define GRPC_SRC_CORE_LIB_IOMGR_ENDPOINT_H
 
 #include <grpc/support/port_platform.h>
 
@@ -106,4 +106,4 @@ struct grpc_endpoint {
   const grpc_endpoint_vtable* vtable;
 };
 
-#endif  // GRPC_CORE_LIB_IOMGR_ENDPOINT_H
+#endif  // GRPC_SRC_CORE_LIB_IOMGR_ENDPOINT_H

data/src/core/lib/iomgr/endpoint_cfstream.h

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_CORE_LIB_IOMGR_ENDPOINT_CFSTREAM_H
-#define GRPC_CORE_LIB_IOMGR_ENDPOINT_CFSTREAM_H
+#ifndef GRPC_SRC_CORE_LIB_IOMGR_ENDPOINT_CFSTREAM_H
+#define GRPC_SRC_CORE_LIB_IOMGR_ENDPOINT_CFSTREAM_H
 //
 // Low level TCP "bottom half" implementation, for use by transports built on
 // top of a TCP connection.
@@ -46,4 +46,4 @@ grpc_endpoint* grpc_cfstream_endpoint_create(CFReadStreamRef read_stream,
 
 #endif  // GRPC_CFSTREAM
 
-#endif  // GRPC_CORE_LIB_IOMGR_ENDPOINT_CFSTREAM_H
+#endif  // GRPC_SRC_CORE_LIB_IOMGR_ENDPOINT_CFSTREAM_H

data/src/core/lib/iomgr/endpoint_pair.h

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_CORE_LIB_IOMGR_ENDPOINT_PAIR_H
-#define GRPC_CORE_LIB_IOMGR_ENDPOINT_PAIR_H
+#ifndef GRPC_SRC_CORE_LIB_IOMGR_ENDPOINT_PAIR_H
+#define GRPC_SRC_CORE_LIB_IOMGR_ENDPOINT_PAIR_H
 
 #include <grpc/support/port_platform.h>
 
@@ -31,4 +31,4 @@ struct grpc_endpoint_pair {
 grpc_endpoint_pair grpc_iomgr_create_endpoint_pair(const char* name,
                                                    grpc_channel_args* args);
 
-#endif  // GRPC_CORE_LIB_IOMGR_ENDPOINT_PAIR_H
+#endif  // GRPC_SRC_CORE_LIB_IOMGR_ENDPOINT_PAIR_H

data/src/core/lib/iomgr/endpoint_pair_windows.cc

@@ -64,8 +64,16 @@ static void create_sockets(SOCKET sv[2]) {
   GPR_ASSERT(svr_sock != INVALID_SOCKET);
 
   closesocket(lst_sock);
-  grpc_tcp_prepare_socket(cli_sock);
-  grpc_tcp_prepare_socket(svr_sock);
+  grpc_error_handle error = grpc_tcp_prepare_socket(cli_sock);
+  if (!error.ok()) {
+    gpr_log(GPR_INFO, "Prepare cli_sock failed with error: %s",
+            grpc_core::StatusToString(error).c_str());
+  }
+  error = grpc_tcp_prepare_socket(svr_sock);
+  if (!error.ok()) {
+    gpr_log(GPR_INFO, "Prepare svr_sock failed with error: %s",
+            grpc_core::StatusToString(error).c_str());
+  }
 
   sv[1] = cli_sock;
   sv[0] = svr_sock;

data/src/core/lib/iomgr/error.h

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_CORE_LIB_IOMGR_ERROR_H
-#define GRPC_CORE_LIB_IOMGR_ERROR_H
+#ifndef GRPC_SRC_CORE_LIB_IOMGR_ERROR_H
+#define GRPC_SRC_CORE_LIB_IOMGR_ERROR_H
 
 #include <grpc/support/port_platform.h>
 
@@ -165,4 +165,4 @@ class AtomicError {
   gpr_spinlock lock_ = GPR_SPINLOCK_STATIC_INITIALIZER;
 };
 
-#endif  // GRPC_CORE_LIB_IOMGR_ERROR_H
+#endif  // GRPC_SRC_CORE_LIB_IOMGR_ERROR_H

data/src/core/lib/iomgr/error_cfstream.h

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_CORE_LIB_IOMGR_ERROR_CFSTREAM_H
-#define GRPC_CORE_LIB_IOMGR_ERROR_CFSTREAM_H
+#ifndef GRPC_SRC_CORE_LIB_IOMGR_ERROR_CFSTREAM_H
+#define GRPC_SRC_CORE_LIB_IOMGR_ERROR_CFSTREAM_H
 
 #ifdef GRPC_CFSTREAM
 // Create an error from Apple Core Foundation CFError object
@@ -28,4 +28,4 @@ grpc_error_handle grpc_error_create_from_cferror(const char* file, int line,
                                                  void* arg, const char* desc);
 #endif  // GRPC_CFSTREAM
 
-#endif  // GRPC_CORE_LIB_IOMGR_ERROR_CFSTREAM_H
+#endif  // GRPC_SRC_CORE_LIB_IOMGR_ERROR_CFSTREAM_H

data/src/core/lib/iomgr/ev_apple.h

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_CORE_LIB_IOMGR_EV_APPLE_H
-#define GRPC_CORE_LIB_IOMGR_EV_APPLE_H
+#ifndef GRPC_SRC_CORE_LIB_IOMGR_EV_APPLE_H
+#define GRPC_SRC_CORE_LIB_IOMGR_EV_APPLE_H
 
 #include <grpc/support/port_platform.h>
 
@@ -40,4 +40,4 @@ extern grpc_pollset_set_vtable grpc_apple_pollset_set_vtable;
 
 #endif
 
-#endif  // GRPC_CORE_LIB_IOMGR_EV_APPLE_H
+#endif  // GRPC_SRC_CORE_LIB_IOMGR_EV_APPLE_H

data/src/core/lib/iomgr/ev_epoll1_linux.h

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_CORE_LIB_IOMGR_EV_EPOLL1_LINUX_H
-#define GRPC_CORE_LIB_IOMGR_EV_EPOLL1_LINUX_H
+#ifndef GRPC_SRC_CORE_LIB_IOMGR_EV_EPOLL1_LINUX_H
+#define GRPC_SRC_CORE_LIB_IOMGR_EV_EPOLL1_LINUX_H
 
 #include <grpc/support/port_platform.h>
 
@@ -28,4 +28,4 @@
 
 extern const grpc_event_engine_vtable grpc_ev_epoll1_posix;
 
-#endif  // GRPC_CORE_LIB_IOMGR_EV_EPOLL1_LINUX_H
+#endif  // GRPC_SRC_CORE_LIB_IOMGR_EV_EPOLL1_LINUX_H

data/src/core/lib/iomgr/ev_poll_posix.h

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_CORE_LIB_IOMGR_EV_POLL_POSIX_H
-#define GRPC_CORE_LIB_IOMGR_EV_POLL_POSIX_H
+#ifndef GRPC_SRC_CORE_LIB_IOMGR_EV_POLL_POSIX_H
+#define GRPC_SRC_CORE_LIB_IOMGR_EV_POLL_POSIX_H
 
 #include <grpc/support/port_platform.h>
 
@@ -26,4 +26,4 @@
 extern const grpc_event_engine_vtable grpc_ev_poll_posix;
 extern const grpc_event_engine_vtable grpc_ev_none_posix;
 
-#endif  // GRPC_CORE_LIB_IOMGR_EV_POLL_POSIX_H
+#endif  // GRPC_SRC_CORE_LIB_IOMGR_EV_POLL_POSIX_H

data/src/core/lib/iomgr/ev_posix.h

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_CORE_LIB_IOMGR_EV_POSIX_H
-#define GRPC_CORE_LIB_IOMGR_EV_POSIX_H
+#ifndef GRPC_SRC_CORE_LIB_IOMGR_EV_POSIX_H
+#define GRPC_SRC_CORE_LIB_IOMGR_EV_POSIX_H
 
 #include <grpc/support/port_platform.h>
 
@@ -210,4 +210,4 @@ void grpc_shutdown_background_closure();
 typedef int (*grpc_poll_function_type)(struct pollfd*, nfds_t, int);
 extern grpc_poll_function_type grpc_poll_function;
 
-#endif  // GRPC_CORE_LIB_IOMGR_EV_POSIX_H
+#endif  // GRPC_SRC_CORE_LIB_IOMGR_EV_POSIX_H

data/src/core/lib/iomgr/event_engine_shims/closure.cc

@@ -0,0 +1,62 @@
+// Copyright 2021 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/iomgr/event_engine_shims/closure.h"
+
+#include "absl/functional/any_invocable.h"
+#include "absl/status/status.h"
+
+#include <grpc/event_engine/event_engine.h>
+
+#include "src/core/lib/iomgr/closure.h"
+#include "src/core/lib/iomgr/exec_ctx.h"
+#include "src/core/lib/transport/error_utils.h"
+
+namespace grpc_event_engine {
+namespace experimental {
+
+void RunEventEngineClosure(grpc_closure* closure, grpc_error_handle error) {
+  if (closure == nullptr) {
+    return;
+  }
+  grpc_core::ApplicationCallbackExecCtx app_ctx;
+  grpc_core::ExecCtx exec_ctx;
+#ifndef NDEBUG
+  closure->scheduled = false;
+  if (grpc_trace_closure.enabled()) {
+    gpr_log(GPR_DEBUG,
+            "EventEngine: running closure %p: created [%s:%d]: %s [%s:%d]",
+            closure, closure->file_created, closure->line_created,
+            closure->run ? "run" : "scheduled", closure->file_initiated,
+            closure->line_initiated);
+  }
+#endif
+  closure->cb(closure->cb_arg, error);
+#ifndef NDEBUG
+  if (grpc_trace_closure.enabled()) {
+    gpr_log(GPR_DEBUG, "EventEngine: closure %p finished", closure);
+  }
+#endif
+}
+
+absl::AnyInvocable<void(absl::Status)> GrpcClosureToStatusCallback(
+    grpc_closure* closure) {
+  return [closure](absl::Status status) {
+    RunEventEngineClosure(closure, absl_status_to_grpc_error(status));
+  };
+}
+
+}  // namespace experimental
+}  // namespace grpc_event_engine

data/src/core/lib/iomgr/event_engine_shims/closure.h

@@ -0,0 +1,39 @@
+// 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.
+#ifndef GRPC_SRC_CORE_LIB_IOMGR_EVENT_ENGINE_SHIMS_CLOSURE_H
+#define GRPC_SRC_CORE_LIB_IOMGR_EVENT_ENGINE_SHIMS_CLOSURE_H
+
+#include <grpc/support/port_platform.h>
+
+#include "absl/functional/any_invocable.h"
+
+#include <grpc/event_engine/event_engine.h>
+
+#include "src/core/lib/iomgr/closure.h"
+#include "src/core/lib/iomgr/error.h"
+
+namespace grpc_event_engine {
+namespace experimental {
+
+/// Runs a grpc_closure inline with the specified error handle.
+void RunEventEngineClosure(grpc_closure* closure, grpc_error_handle error);
+
+/// Creates a callback that takes an error status argument.
+absl::AnyInvocable<void(absl::Status)> GrpcClosureToStatusCallback(
+    grpc_closure* closure);
+
+}  // namespace experimental
+}  // namespace grpc_event_engine
+
+#endif  // GRPC_SRC_CORE_LIB_IOMGR_EVENT_ENGINE_SHIMS_CLOSURE_H