grpc 1.50.0.pre1 → 1.52.0.pre2

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

@@ -1,20 +1,20 @@
-/*
- *
- * Copyright 2015-2016 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-2016 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_IOMGR_EV_POLL_POSIX_H
 #define GRPC_CORE_LIB_IOMGR_EV_POLL_POSIX_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_CORE_LIB_IOMGR_EV_POLL_POSIX_H

data/src/core/lib/iomgr/ev_posix.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>
 
@@ -26,12 +26,15 @@
 
 #include <string.h>
 
+#include "absl/strings/str_format.h"
+
 #include <grpc/support/alloc.h>
 #include <grpc/support/log.h>
 #include <grpc/support/string_util.h>
 
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/gpr/useful.h"
+#include "src/core/lib/gprpp/crash.h"
 #include "src/core/lib/gprpp/global_config.h"
 #include "src/core/lib/iomgr/ev_epoll1_linux.h"
 #include "src/core/lib/iomgr/ev_poll_posix.h"
@@ -45,9 +48,9 @@ GPR_GLOBAL_CONFIG_DEFINE_STRING(
     "order first -> last.")
 
 grpc_core::DebugOnlyTraceFlag grpc_polling_trace(
-    false, "polling"); /* Disabled by default */
+    false, "polling");  // Disabled by default
 
-/* Traces fd create/close operations */
+// Traces fd create/close operations
 grpc_core::DebugOnlyTraceFlag grpc_fd_trace(false, "fd_trace");
 grpc_core::DebugOnlyTraceFlag grpc_trace_fd_refcount(false, "fd_refcount");
 grpc_core::DebugOnlyTraceFlag grpc_polling_api_trace(false, "polling_api");
@@ -62,8 +65,8 @@ grpc_core::DebugOnlyTraceFlag grpc_polling_api_trace(false, "polling_api");
 #define GRPC_POLLING_API_TRACE(...)
 #endif  // NDEBUG
 
-/** Default poll() function - a pointer so that it can be overridden by some
- *  tests */
+/// Default poll() function - a pointer so that it can be overridden by some
+/// tests
 #ifndef GPR_AIX
 grpc_poll_function_type grpc_poll_function = poll;
 #else
@@ -144,7 +147,7 @@ static void try_engine(const char* engine) {
   }
 }
 
-/* Call this before calling grpc_event_engine_init() */
+// Call this before calling grpc_event_engine_init()
 void grpc_register_event_engine_factory(const grpc_event_engine_vtable* vtable,
                                         bool add_at_head) {
   const grpc_event_engine_vtable** first_null = nullptr;
@@ -164,8 +167,8 @@ void grpc_register_event_engine_factory(const grpc_event_engine_vtable* vtable,
   *(add_at_head ? first_null : last_null) = vtable;
 }
 
-/*If grpc_event_engine_init() has been called, returns the poll_strategy_name.
- * Otherwise, returns nullptr. */
+// If grpc_event_engine_init() has been called, returns the poll_strategy_name.
+//  Otherwise, returns nullptr.
 const char* grpc_get_poll_strategy_name() { return g_event_engine->name; }
 
 void grpc_event_engine_init(void) {
@@ -187,9 +190,8 @@ void grpc_event_engine_init(void) {
     gpr_free(strings);
 
     if (g_event_engine == nullptr) {
-      gpr_log(GPR_ERROR, "No event engine could be initialized from %s",
-              value.get());
-      abort();
+      grpc_core::Crash(absl::StrFormat(
+          "No event engine could be initialized from %s", value.get()));
     }
   });
   g_event_engine->init_engine();
@@ -198,7 +200,7 @@ void grpc_event_engine_init(void) {
 void grpc_event_engine_shutdown(void) { g_event_engine->shutdown_engine(); }
 
 bool grpc_event_engine_can_track_errors(void) {
-  /* Only track errors if platform supports errqueue. */
+  // Only track errors if platform supports errqueue.
   return grpc_core::KernelSupportsErrqueue() && g_event_engine->can_track_err;
 }
 
@@ -227,6 +229,12 @@ void grpc_fd_orphan(grpc_fd* fd, grpc_closure* on_done, int* release_fd,
   g_event_engine->fd_orphan(fd, on_done, release_fd, reason);
 }
 
+void grpc_fd_set_pre_allocated(grpc_fd* fd) {
+  GRPC_POLLING_API_TRACE("fd_set_pre_allocated(%d)", grpc_fd_wrapped_fd(fd));
+  GRPC_FD_TRACE("fd_set_pre_allocated(%d)", grpc_fd_wrapped_fd(fd));
+  g_event_engine->fd_set_pre_allocated(fd);
+}
+
 void grpc_fd_shutdown(grpc_fd* fd, grpc_error_handle why) {
   GRPC_POLLING_API_TRACE("fd_shutdown(%d)", grpc_fd_wrapped_fd(fd));
   GRPC_FD_TRACE("fd_shutdown(%d)", grpc_fd_wrapped_fd(fd));

data/src/core/lib/iomgr/ev_posix.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_IOMGR_EV_POSIX_H
 #define GRPC_CORE_LIB_IOMGR_EV_POSIX_H
@@ -32,9 +32,8 @@
 
 GPR_GLOBAL_CONFIG_DECLARE_STRING(grpc_poll_strategy);
 
-extern grpc_core::DebugOnlyTraceFlag grpc_fd_trace; /* Disabled by default */
-extern grpc_core::DebugOnlyTraceFlag
-    grpc_polling_trace; /* Disabled by default */
+extern grpc_core::DebugOnlyTraceFlag grpc_fd_trace;       // Disabled by default
+extern grpc_core::DebugOnlyTraceFlag grpc_polling_trace;  // Disabled by default
 
 #define GRPC_FD_TRACE(format, ...)                        \
   if (GRPC_TRACE_FLAG_ENABLED(grpc_fd_trace)) {           \
@@ -92,118 +91,123 @@ typedef struct grpc_event_engine_vtable {
   void (*shutdown_engine)(void);
   bool (*add_closure_to_background_poller)(grpc_closure* closure,
                                            grpc_error_handle error);
+
+  void (*fd_set_pre_allocated)(grpc_fd* fd);
 } grpc_event_engine_vtable;
 
-/* register a new event engine factory */
+// register a new event engine factory
 void grpc_register_event_engine_factory(const grpc_event_engine_vtable* vtable,
                                         bool add_at_head);
 
 void grpc_event_engine_init(void);
 void grpc_event_engine_shutdown(void);
 
-/* Return the name of the poll strategy */
+// Return the name of the poll strategy
 const char* grpc_get_poll_strategy_name();
 
-/* Returns true if polling engine can track errors separately, false otherwise.
- * If this is true, fd can be created with track_err set. After this, error
- * events will be reported using fd_notify_on_error. If it is not set, errors
- * will continue to be reported through fd_notify_on_read and
- * fd_notify_on_write.
- */
+// Returns true if polling engine can track errors separately, false otherwise.
+// If this is true, fd can be created with track_err set. After this, error
+// events will be reported using fd_notify_on_error. If it is not set, errors
+// will continue to be reported through fd_notify_on_read and
+// fd_notify_on_write.
+//
 bool grpc_event_engine_can_track_errors();
 
-/* Returns true if polling engine runs in the background, false otherwise.
- * Currently only 'epollbg' runs in the background.
- */
+// Returns true if polling engine runs in the background, false otherwise.
+// Currently only 'epollbg' runs in the background.
+//
 bool grpc_event_engine_run_in_background();
 
-/* Create a wrapped file descriptor.
-   Requires fd is a non-blocking file descriptor.
-   \a track_err if true means that error events would be tracked separately
-   using grpc_fd_notify_on_error. Currently, valid only for linux systems.
-   This takes ownership of closing fd. */
+// Create a wrapped file descriptor.
+// Requires fd is a non-blocking file descriptor.
+// \a track_err if true means that error events would be tracked separately
+// using grpc_fd_notify_on_error. Currently, valid only for linux systems.
+// This takes ownership of closing fd.
 grpc_fd* grpc_fd_create(int fd, const char* name, bool track_err);
 
-/* Return the wrapped fd, or -1 if it has been released or closed. */
+// Return the wrapped fd, or -1 if it has been released or closed.
 int grpc_fd_wrapped_fd(grpc_fd* fd);
 
-/* Releases fd to be asynchronously destroyed.
-   on_done is called when the underlying file descriptor is definitely close()d.
-   If on_done is NULL, no callback will be made.
-   If release_fd is not NULL, it's set to fd and fd will not be closed.
-   Requires: *fd initialized; no outstanding notify_on_read or
-   notify_on_write.
-   MUST NOT be called with a pollset lock taken */
+// Releases fd to be asynchronously destroyed.
+// on_done is called when the underlying file descriptor is definitely close()d.
+// If on_done is NULL, no callback will be made.
+// If release_fd is not NULL, it's set to fd and fd will not be closed.
+// Requires: *fd initialized; no outstanding notify_on_read or
+// notify_on_write.
+// MUST NOT be called with a pollset lock taken
 void grpc_fd_orphan(grpc_fd* fd, grpc_closure* on_done, int* release_fd,
                     const char* reason);
 
-/* Has grpc_fd_shutdown been called on an fd? */
+// Has grpc_fd_shutdown been called on an fd?
 bool grpc_fd_is_shutdown(grpc_fd* fd);
 
-/* Cause any current and future callbacks to fail. */
+// Cause any current and future callbacks to fail.
 void grpc_fd_shutdown(grpc_fd* fd, grpc_error_handle why);
 
-/* Register read interest, causing read_cb to be called once when fd becomes
-   readable, on deadline specified by deadline, or on shutdown triggered by
-   grpc_fd_shutdown.
-   read_cb will be called with read_cb_arg when *fd becomes readable.
-   read_cb is Called with status of GRPC_CALLBACK_SUCCESS if readable,
-   GRPC_CALLBACK_TIMED_OUT if the call timed out,
-   and CANCELLED if the call was cancelled.
-
-   Requires:This method must not be called before the read_cb for any previous
-   call runs. Edge triggered events are used whenever they are supported by the
-   underlying platform. This means that users must drain fd in read_cb before
-   calling notify_on_read again. Users are also expected to handle spurious
-   events, i.e read_cb is called while nothing can be readable from fd  */
+// Register read interest, causing read_cb to be called once when fd becomes
+// readable, on deadline specified by deadline, or on shutdown triggered by
+// grpc_fd_shutdown.
+// read_cb will be called with read_cb_arg when *fd becomes readable.
+// read_cb is Called with status of GRPC_CALLBACK_SUCCESS if readable,
+// GRPC_CALLBACK_TIMED_OUT if the call timed out,
+// and CANCELLED if the call was cancelled.
+
+// Requires:This method must not be called before the read_cb for any previous
+// call runs. Edge triggered events are used whenever they are supported by the
+// underlying platform. This means that users must drain fd in read_cb before
+// calling notify_on_read again. Users are also expected to handle spurious
+// events, i.e read_cb is called while nothing can be readable from fd
 void grpc_fd_notify_on_read(grpc_fd* fd, grpc_closure* closure);
 
-/* Exactly the same semantics as above, except based on writable events.  */
+// Exactly the same semantics as above, except based on writable events.
 void grpc_fd_notify_on_write(grpc_fd* fd, grpc_closure* closure);
 
-/* Exactly the same semantics as above, except based on error events. track_err
- * needs to have been set on grpc_fd_create */
+// Exactly the same semantics as above, except based on error events. track_err
+// needs to have been set on grpc_fd_create
 void grpc_fd_notify_on_error(grpc_fd* fd, grpc_closure* closure);
 
-/* Forcibly set the fd to be readable, resulting in the closure registered with
- * grpc_fd_notify_on_read being invoked.
- */
+// Forcibly set the fd to be readable, resulting in the closure registered with
+// grpc_fd_notify_on_read being invoked.
+//
 void grpc_fd_set_readable(grpc_fd* fd);
 
-/* Forcibly set the fd to be writable, resulting in the closure registered with
- * grpc_fd_notify_on_write being invoked.
- */
+// Forcibly set the fd to be writable, resulting in the closure registered with
+// grpc_fd_notify_on_write being invoked.
+//
 void grpc_fd_set_writable(grpc_fd* fd);
 
-/* Forcibly set the fd to have errored, resulting in the closure registered with
- * grpc_fd_notify_on_error being invoked.
- */
+// Forcibly set the fd to have errored, resulting in the closure registered with
+// grpc_fd_notify_on_error being invoked.
+//
 void grpc_fd_set_error(grpc_fd* fd);
 
-/* pollset_posix functions */
+// Set the fd to be preallocated
+void grpc_fd_set_pre_allocated(grpc_fd* fd);
+
+// pollset_posix functions
 
-/* Add an fd to a pollset */
+// Add an fd to a pollset
 void grpc_pollset_add_fd(grpc_pollset* pollset, struct grpc_fd* fd);
 
-/* pollset_set_posix functions */
+// pollset_set_posix functions
 
 void grpc_pollset_set_add_fd(grpc_pollset_set* pollset_set, grpc_fd* fd);
 void grpc_pollset_set_del_fd(grpc_pollset_set* pollset_set, grpc_fd* fd);
 
-/* Returns true if the caller is a worker thread for any background poller. */
+// Returns true if the caller is a worker thread for any background poller.
 bool grpc_is_any_background_poller_thread();
 
-/* Returns true if the closure is registered into the background poller. Note
- * that the closure may or may not run yet when this function returns, and the
- * closure should not be blocking or long-running. */
+// Returns true if the closure is registered into the background poller. Note
+// that the closure may or may not run yet when this function returns, and the
+// closure should not be blocking or long-running.
 bool grpc_add_closure_to_background_poller(grpc_closure* closure,
                                            grpc_error_handle error);
 
-/* Shut down all the closures registered in the background poller. */
+// Shut down all the closures registered in the background poller.
 void grpc_shutdown_background_closure();
 
-/* override to allow tests to hook poll() usage */
+// override to allow tests to hook poll() usage
 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_CORE_LIB_IOMGR_EV_POSIX_H

data/src/core/lib/iomgr/ev_windows.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>
 
@@ -25,6 +25,6 @@
 #include "src/core/lib/debug/trace.h"
 
 grpc_core::DebugOnlyTraceFlag grpc_polling_trace(
-    false, "polling"); /* Disabled by default */
+    false, "polling");  // Disabled by default
 
 #endif  // GRPC_WINSOCK_SOCKET

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

@@ -1,28 +1,31 @@
-/*
- *
- * 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 "src/core/lib/iomgr/exec_ctx.h"
 
+#include "absl/strings/str_format.h"
+
 #include <grpc/support/log.h>
 #include <grpc/support/sync.h>
 
+#include "src/core/lib/gprpp/crash.h"
 #include "src/core/lib/iomgr/combiner.h"
 #include "src/core/lib/iomgr/error.h"
 
@@ -53,9 +56,9 @@ static void exec_ctx_sched(grpc_closure* closure) {
 
 namespace grpc_core {
 
-GPR_THREAD_LOCAL(ExecCtx*) ExecCtx::exec_ctx_;
-GPR_THREAD_LOCAL(ApplicationCallbackExecCtx*)
-ApplicationCallbackExecCtx::callback_exec_ctx_;
+thread_local ExecCtx* ExecCtx::exec_ctx_;
+thread_local ApplicationCallbackExecCtx*
+    ApplicationCallbackExecCtx::callback_exec_ctx_;
 
 bool ExecCtx::Flush() {
   bool did_something = false;
@@ -81,18 +84,16 @@ void ExecCtx::Run(const DebugLocation& location, grpc_closure* closure,
                   grpc_error_handle error) {
   (void)location;
   if (closure == nullptr) {
-    GRPC_ERROR_UNREF(error);
     return;
   }
 #ifndef NDEBUG
   if (closure->scheduled) {
-    gpr_log(GPR_ERROR,
-            "Closure already scheduled. (closure: %p, created: [%s:%d], "
-            "previously scheduled at: [%s: %d], newly scheduled at [%s: %d]",
-            closure, closure->file_created, closure->line_created,
-            closure->file_initiated, closure->line_initiated, location.file(),
-            location.line());
-    abort();
+    Crash(absl::StrFormat(
+        "Closure already scheduled. (closure: %p, created: [%s:%d], "
+        "previously scheduled at: [%s: %d], newly scheduled at [%s: %d]",
+        closure, closure->file_created, closure->line_created,
+        closure->file_initiated, closure->line_initiated, location.file(),
+        location.line()));
   }
   closure->scheduled = true;
   closure->file_initiated = location.file();
@@ -111,12 +112,11 @@ void ExecCtx::RunList(const DebugLocation& location, grpc_closure_list* list) {
     grpc_closure* next = c->next_data.next;
 #ifndef NDEBUG
     if (c->scheduled) {
-      gpr_log(GPR_ERROR,
-              "Closure already scheduled. (closure: %p, created: [%s:%d], "
-              "previously scheduled at: [%s: %d], newly scheduled at [%s:%d]",
-              c, c->file_created, c->line_created, c->file_initiated,
-              c->line_initiated, location.file(), location.line());
-      abort();
+      Crash(absl::StrFormat(
+          "Closure already scheduled. (closure: %p, created: [%s:%d], "
+          "previously scheduled at: [%s: %d], newly scheduled at [%s:%d]",
+          c, c->file_created, c->line_created, c->file_initiated,
+          c->line_initiated, location.file(), location.line()));
     }
     c->scheduled = true;
     c->file_initiated = location.file();