grpc 1.51.0 → 1.52.0.pre2

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

@@ -1,20 +1,20 @@
-/*
- *
- * Copyright 2018 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 2018 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,14 +25,14 @@ grpc_tcp_server_vtable* grpc_tcp_server_impl;
 grpc_error_handle grpc_tcp_server_create(
     grpc_closure* shutdown_complete,
     const grpc_event_engine::experimental::EndpointConfig& config,
-    grpc_tcp_server** server) {
-  return grpc_tcp_server_impl->create(shutdown_complete, config, server);
+    grpc_tcp_server_cb on_accept_cb, void* cb_arg, grpc_tcp_server** server) {
+  return grpc_tcp_server_impl->create(shutdown_complete, config, on_accept_cb,
+                                      cb_arg, server);
 }
 
 void grpc_tcp_server_start(grpc_tcp_server* server,
-                           const std::vector<grpc_pollset*>* pollsets,
-                           grpc_tcp_server_cb on_accept_cb, void* cb_arg) {
-  grpc_tcp_server_impl->start(server, pollsets, on_accept_cb, cb_arg);
+                           const std::vector<grpc_pollset*>* pollsets) {
+  grpc_tcp_server_impl->start(server, pollsets);
 }
 
 grpc_error_handle grpc_tcp_server_add_port(grpc_tcp_server* s,
@@ -73,6 +73,14 @@ void grpc_tcp_server_shutdown_listeners(grpc_tcp_server* s) {
   grpc_tcp_server_impl->shutdown_listeners(s);
 }
 
+int grpc_tcp_server_pre_allocated_fd(grpc_tcp_server* s) {
+  return grpc_tcp_server_impl->pre_allocated_fd(s);
+}
+
+void grpc_tcp_server_set_pre_allocated_fd(grpc_tcp_server* s, int fd) {
+  grpc_tcp_server_impl->set_pre_allocated_fd(s, fd);
+}
+
 void grpc_set_tcp_server_impl(grpc_tcp_server_vtable* impl) {
   grpc_tcp_server_impl = impl;
 }

data/src/core/lib/iomgr/tcp_server.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_TCP_SERVER_H
 #define GRPC_CORE_LIB_IOMGR_TCP_SERVER_H
@@ -25,30 +25,30 @@
 
 #include <grpc/event_engine/endpoint_config.h>
 #include <grpc/grpc.h>
-#include <grpc/impl/codegen/grpc_types.h>
+#include <grpc/impl/grpc_types.h>
 
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/endpoint.h"
 #include "src/core/lib/iomgr/resolve_address.h"
 
-/* Forward decl of grpc_tcp_server */
+// Forward decl of grpc_tcp_server
 typedef struct grpc_tcp_server grpc_tcp_server;
 
 typedef struct grpc_tcp_server_acceptor {
-  /* grpc_tcp_server_cb functions share a ref on from_server that is valid
-     until the function returns. */
+  // grpc_tcp_server_cb functions share a ref on from_server that is valid
+  // until the function returns.
   grpc_tcp_server* from_server;
-  /* Indices that may be passed to grpc_tcp_server_port_fd(). */
+  // Indices that may be passed to grpc_tcp_server_port_fd().
   unsigned port_index;
   unsigned fd_index;
-  /* Data when the connection is passed to tcp_server from external. */
+  // Data when the connection is passed to tcp_server from external.
   bool external_connection;
   int listener_fd;
   grpc_byte_buffer* pending_data;
 } grpc_tcp_server_acceptor;
 
-/* Called for newly connected TCP connections.
-   Takes ownership of acceptor. */
+// Called for newly connected TCP connections.
+// Takes ownership of acceptor.
 typedef void (*grpc_tcp_server_cb)(void* arg, grpc_endpoint* ep,
                                    grpc_pollset* accepting_pollset,
                                    grpc_tcp_server_acceptor* acceptor);
@@ -67,10 +67,9 @@ typedef struct grpc_tcp_server_vtable {
   grpc_error_handle (*create)(
       grpc_closure* shutdown_complete,
       const grpc_event_engine::experimental::EndpointConfig& config,
-      grpc_tcp_server** server);
+      grpc_tcp_server_cb on_accept_cb, void* cb_arg, grpc_tcp_server** server);
   void (*start)(grpc_tcp_server* server,
-                const std::vector<grpc_pollset*>* pollsets,
-                grpc_tcp_server_cb on_accept_cb, void* cb_arg);
+                const std::vector<grpc_pollset*>* pollsets);
   grpc_error_handle (*add_port)(grpc_tcp_server* s,
                                 const grpc_resolved_address* addr,
                                 int* out_port);
@@ -82,69 +81,76 @@ typedef struct grpc_tcp_server_vtable {
                                 grpc_closure* shutdown_starting);
   void (*unref)(grpc_tcp_server* s);
   void (*shutdown_listeners)(grpc_tcp_server* s);
+  int (*pre_allocated_fd)(grpc_tcp_server* s);
+  void (*set_pre_allocated_fd)(grpc_tcp_server* s, int fd);
 } grpc_tcp_server_vtable;
 
-/* Create a server, initially not bound to any ports. The caller owns one ref.
-   If shutdown_complete is not NULL, it will be used by
-   grpc_tcp_server_unref() when the ref count reaches zero.
-   Takes ownership of the slice_allocator_factory. */
+// Create a server, initially not bound to any ports. The caller owns one ref.
+// If shutdown_complete is not NULL, it will be used by
+// grpc_tcp_server_unref() when the ref count reaches zero.
+// Takes ownership of the slice_allocator_factory.
 grpc_error_handle grpc_tcp_server_create(
     grpc_closure* shutdown_complete,
     const grpc_event_engine::experimental::EndpointConfig& config,
-    grpc_tcp_server** server);
+    grpc_tcp_server_cb on_accept_cb, void* cb_arg, grpc_tcp_server** server);
 
-/* Start listening to bound ports */
+// Start listening to bound ports
 void grpc_tcp_server_start(grpc_tcp_server* server,
-                           const std::vector<grpc_pollset*>* pollsets,
-                           grpc_tcp_server_cb on_accept_cb, void* cb_arg);
-
-/* Add a port to the server, returning the newly allocated port on success, or
-   -1 on failure.
-
-   The :: and 0.0.0.0 wildcard addresses are treated identically, accepting
-   both IPv4 and IPv6 connections, but :: is the preferred style.  This usually
-   creates one socket, but possibly two on systems which support IPv6,
-   but not dualstack sockets. */
-/* TODO(ctiller): deprecate this, and make grpc_tcp_server_add_ports to handle
-                  all of the multiple socket port matching logic in one place */
+                           const std::vector<grpc_pollset*>* pollsets);
+
+// Add a port to the server, returning the newly allocated port on success, or
+// -1 on failure.
+
+// The :: and 0.0.0.0 wildcard addresses are treated identically, accepting
+// both IPv4 and IPv6 connections, but :: is the preferred style.  This usually
+// creates one socket, but possibly two on systems which support IPv6,
+// but not dualstack sockets.
+// TODO(ctiller): deprecate this, and make grpc_tcp_server_add_ports to handle
+//                all of the multiple socket port matching logic in one place
 grpc_error_handle grpc_tcp_server_add_port(grpc_tcp_server* s,
                                            const grpc_resolved_address* addr,
                                            int* out_port);
 
-/* Create and return a TcpServerFdHandler so that it can be used by upper layer
-   to hand over an externally connected fd to the grpc server. */
+// Create and return a TcpServerFdHandler so that it can be used by upper layer
+// to hand over an externally connected fd to the grpc server.
 grpc_core::TcpServerFdHandler* grpc_tcp_server_create_fd_handler(
     grpc_tcp_server* s);
 
-/* Number of fds at the given port_index, or 0 if port_index is out of
-   bounds. */
+// Number of fds at the given port_index, or 0 if port_index is out of
+// bounds.
 unsigned grpc_tcp_server_port_fd_count(grpc_tcp_server* s, unsigned port_index);
 
-/* Returns the file descriptor of the Mth (fd_index) listening socket of the Nth
-   (port_index) call to add_port() on this server, or -1 if the indices are out
-   of bounds. The file descriptor remains owned by the server, and will be
-   cleaned up when the ref count reaches zero. */
+// Returns the file descriptor of the Mth (fd_index) listening socket of the Nth
+// (port_index) call to add_port() on this server, or -1 if the indices are out
+// of bounds. The file descriptor remains owned by the server, and will be
+// cleaned up when the ref count reaches zero.
 int grpc_tcp_server_port_fd(grpc_tcp_server* s, unsigned port_index,
                             unsigned fd_index);
 
-/* Ref s and return s. */
+// Ref s and return s.
 grpc_tcp_server* grpc_tcp_server_ref(grpc_tcp_server* s);
 
-/* shutdown_starting is called when ref count has reached zero and the server is
-   about to be destroyed. The server will be deleted after it returns. Calling
-   grpc_tcp_server_ref() from it has no effect. */
+// shutdown_starting is called when ref count has reached zero and the server is
+// about to be destroyed. The server will be deleted after it returns. Calling
+// grpc_tcp_server_ref() from it has no effect.
 void grpc_tcp_server_shutdown_starting_add(grpc_tcp_server* s,
                                            grpc_closure* shutdown_starting);
 
-/* If the refcount drops to zero, enqueue calls on exec_ctx to
-   shutdown_listeners and delete s. */
+// If the refcount drops to zero, enqueue calls on exec_ctx to
+// shutdown_listeners and delete s.
 void grpc_tcp_server_unref(grpc_tcp_server* s);
 
-/* Shutdown the fds of listeners. */
+// Shutdown the fds of listeners.
 void grpc_tcp_server_shutdown_listeners(grpc_tcp_server* s);
 
+/* Get pre-allocated FD for server. -1 if none is set */
+int grpc_tcp_server_pre_allocated_fd(grpc_tcp_server* s);
+
+/* Set pre-allocated FD for server */
+void grpc_tcp_server_set_pre_allocated_fd(grpc_tcp_server* s, int fd);
+
 void grpc_tcp_server_global_init();
 
 void grpc_set_tcp_server_impl(grpc_tcp_server_vtable* impl);
 
-#endif /* GRPC_CORE_LIB_IOMGR_TCP_SERVER_H */
+#endif  // GRPC_CORE_LIB_IOMGR_TCP_SERVER_H

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

@@ -1,22 +1,22 @@
-/*
- *
- * 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.
- *
- */
-
-/* FIXME: "posix" files shouldn't be depending on _GNU_SOURCE */
+//
+//
+// 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.
+//
+//
+
+// FIXME: "posix" files shouldn't be depending on _GNU_SOURCE
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE
 #endif
@@ -51,12 +51,14 @@
 
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/gpr/string.h"
+#include "src/core/lib/gprpp/crash.h"
 #include "src/core/lib/gprpp/memory.h"
 #include "src/core/lib/gprpp/strerror.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/iomgr/resolve_address.h"
 #include "src/core/lib/iomgr/sockaddr.h"
 #include "src/core/lib/iomgr/socket_utils_posix.h"
+#include "src/core/lib/iomgr/systemd_utils.h"
 #include "src/core/lib/iomgr/tcp_posix.h"
 #include "src/core/lib/iomgr/tcp_server.h"
 #include "src/core/lib/iomgr/tcp_server_utils_posix.h"
@@ -69,6 +71,8 @@ using ::grpc_event_engine::experimental::EndpointConfig;
 
 static grpc_error_handle tcp_server_create(grpc_closure* shutdown_complete,
                                            const EndpointConfig& config,
+                                           grpc_tcp_server_cb on_accept_cb,
+                                           void* on_accept_cb_arg,
                                            grpc_tcp_server** server) {
   grpc_tcp_server* s = new grpc_tcp_server;
   s->so_reuseport = grpc_is_socket_reuse_port_supported();
@@ -89,15 +93,17 @@ static grpc_error_handle tcp_server_create(grpc_closure* shutdown_complete,
   s->shutdown_starting.head = nullptr;
   s->shutdown_starting.tail = nullptr;
   s->shutdown_complete = shutdown_complete;
-  s->on_accept_cb = nullptr;
-  s->on_accept_cb_arg = nullptr;
+  s->on_accept_cb = on_accept_cb;
+  s->on_accept_cb_arg = on_accept_cb_arg;
   s->head = nullptr;
   s->tail = nullptr;
   s->nports = 0;
   s->options = TcpOptionsFromEndpointConfig(config);
   s->fd_handler = nullptr;
   GPR_ASSERT(s->options.resource_quota != nullptr);
+  GPR_ASSERT(s->on_accept_cb);
   s->memory_quota = s->options.resource_quota->memory_quota();
+  s->pre_allocated_fd = -1;
   gpr_atm_no_barrier_store(&s->next_pollset_to_assign, 0);
   *server = s;
   return absl::OkStatus();
@@ -134,11 +140,11 @@ static void destroyed_port(void* server, grpc_error_handle /*error*/) {
   }
 }
 
-/* called when all listening endpoints have been shutdown, so no further
-   events will be received on them - at this point it's safe to destroy
-   things */
+// called when all listening endpoints have been shutdown, so no further
+// events will be received on them - at this point it's safe to destroy
+// things
 static void deactivated_all_ports(grpc_tcp_server* s) {
-  /* delete ALL the things */
+  // delete ALL the things
   gpr_mu_lock(&s->mu);
 
   GPR_ASSERT(s->shutdown);
@@ -146,7 +152,10 @@ static void deactivated_all_ports(grpc_tcp_server* s) {
   if (s->head) {
     grpc_tcp_listener* sp;
     for (sp = s->head; sp; sp = sp->next) {
-      grpc_unlink_if_unix_domain_socket(&sp->addr);
+      // Do not unlink if there is a pre-allocated FD
+      if (grpc_tcp_server_pre_allocated_fd(s) <= 0) {
+        grpc_unlink_if_unix_domain_socket(&sp->addr);
+      }
       GRPC_CLOSURE_INIT(&sp->destroyed_closure, destroyed_port, s,
                         grpc_schedule_on_exec_ctx);
       grpc_fd_orphan(sp->emfd, &sp->destroyed_closure, nullptr,
@@ -163,7 +172,7 @@ static void tcp_server_destroy(grpc_tcp_server* s) {
   gpr_mu_lock(&s->mu);
   GPR_ASSERT(!s->shutdown);
   s->shutdown = true;
-  /* shutdown all fd's */
+  // shutdown all fd's
   if (s->active_ports) {
     grpc_tcp_listener* sp;
     for (sp = s->head; sp; sp = sp->next) {
@@ -176,7 +185,7 @@ static void tcp_server_destroy(grpc_tcp_server* s) {
   }
 }
 
-/* event manager callback when reads are ready */
+// event manager callback when reads are ready
 static void on_read(void* arg, grpc_error_handle err) {
   grpc_tcp_listener* sp = static_cast<grpc_tcp_listener*>(arg);
   grpc_pollset* read_notifier_pollset;
@@ -184,13 +193,13 @@ static void on_read(void* arg, grpc_error_handle err) {
     goto error;
   }
 
-  /* loop until accept4 returns EAGAIN, and then re-arm notification */
+  // loop until accept4 returns EAGAIN, and then re-arm notification
   for (;;) {
     grpc_resolved_address addr;
     memset(&addr, 0, sizeof(addr));
     addr.len = static_cast<socklen_t>(sizeof(struct sockaddr_storage));
-    /* Note: If we ever decide to return this address to the user, remember to
-       strip off the ::ffff:0.0.0.0/96 prefix first. */
+    // Note: If we ever decide to return this address to the user, remember to
+    // strip off the ::ffff:0.0.0.0/96 prefix first.
     int fd = grpc_accept4(sp->fd, &addr, 1, 1);
     if (fd < 0) {
       if (errno == EINTR) {
@@ -205,8 +214,8 @@ static void on_read(void* arg, grpc_error_handle err) {
           gpr_log(GPR_ERROR, "Failed accept4: %s",
                   grpc_core::StrError(errno).c_str());
         } else {
-          /* if we have shutdown listeners, accept4 could fail, and we
-             needn't notify users */
+          // if we have shutdown listeners, accept4 could fail, and we
+          // needn't notify users
         }
         gpr_mu_unlock(&sp->server->mu);
         goto error;
@@ -226,14 +235,14 @@ static void on_read(void* arg, grpc_error_handle err) {
       continue;
     }
 
-    /* For UNIX sockets, the accept call might not fill up the member sun_path
-     * of sockaddr_un, so explicitly call getsockname to get it. */
+    // For UNIX sockets, the accept call might not fill up the member sun_path
+    // of sockaddr_un, so explicitly call getpeername to get it.
     if (grpc_is_unix_socket(&addr)) {
       memset(&addr, 0, sizeof(addr));
       addr.len = static_cast<socklen_t>(sizeof(struct sockaddr_storage));
       if (getpeername(fd, reinterpret_cast<struct sockaddr*>(addr.addr),
                       &(addr.len)) < 0) {
-        gpr_log(GPR_ERROR, "Failed getsockname: %s",
+        gpr_log(GPR_ERROR, "Failed getpeername: %s",
                 grpc_core::StrError(errno).c_str());
         close(fd);
         goto error;
@@ -294,7 +303,7 @@ error:
   }
 }
 
-/* Treat :: or 0.0.0.0 as a family-agnostic wildcard. */
+// Treat :: or 0.0.0.0 as a family-agnostic wildcard.
 static grpc_error_handle add_wildcard_addrs_to_server(grpc_tcp_server* s,
                                                       unsigned port_index,
                                                       int requested_port,
@@ -315,7 +324,7 @@ static grpc_error_handle add_wildcard_addrs_to_server(grpc_tcp_server* s,
   }
 
   grpc_sockaddr_make_wildcards(requested_port, &wild4, &wild6);
-  /* Try listening on IPv6 first. */
+  // Try listening on IPv6 first.
   if ((v6_err = grpc_tcp_server_add_addr(s, &wild6, port_index, fd_index,
                                          &dsmode, &sp)) == absl::OkStatus()) {
     ++fd_index;
@@ -324,7 +333,7 @@ static grpc_error_handle add_wildcard_addrs_to_server(grpc_tcp_server* s,
       return absl::OkStatus();
     }
   }
-  /* If we got a v6-only socket or nothing, try adding 0.0.0.0. */
+  // If we got a v6-only socket or nothing, try adding 0.0.0.0.
   grpc_sockaddr_set_port(&wild4, requested_port);
   if ((v4_err = grpc_tcp_server_add_addr(s, &wild4, port_index, fd_index,
                                          &dsmode, &sp2)) == absl::OkStatus()) {
@@ -386,8 +395,8 @@ static grpc_error_handle clone_port(grpc_tcp_listener* listener,
     sp = static_cast<grpc_tcp_listener*>(gpr_malloc(sizeof(grpc_tcp_listener)));
     sp->next = listener->next;
     listener->next = sp;
-    /* sp (the new listener) is a sibling of 'listener' (the original
-       listener). */
+    // sp (the new listener) is a sibling of 'listener' (the original
+    // listener).
     sp->is_sibling = 1;
     sp->sibling = listener->sibling;
     listener->sibling = sp;
@@ -426,10 +435,9 @@ static grpc_error_handle tcp_server_add_port(grpc_tcp_server* s,
   if (s->tail != nullptr) {
     port_index = s->tail->port_index + 1;
   }
-  grpc_unlink_if_unix_domain_socket(addr);
 
-  /* Check if this is a wildcard port, and if so, try to keep the port the same
-     as some previously created listener. */
+  // Check if this is a wildcard port, and if so, try to keep the port the same
+  // as some previously created listener.
   if (requested_port == 0) {
     for (sp = s->head; sp; sp = sp->next) {
       sockname_temp.len =
@@ -449,6 +457,16 @@ static grpc_error_handle tcp_server_add_port(grpc_tcp_server* s,
       }
     }
   }
+
+  /* Check if systemd has pre-allocated valid FDs */
+  set_matching_sd_fds(s, addr, requested_port);
+
+  /* Do not unlink if there are pre-allocated FDs, or it will stop
+     working after the first client connects */
+  if (grpc_tcp_server_pre_allocated_fd(s) <= 0) {
+    grpc_unlink_if_unix_domain_socket(addr);
+  }
+
   if (grpc_sockaddr_is_wildcard(addr, &requested_port)) {
     return add_wildcard_addrs_to_server(s, port_index, requested_port,
                                         out_port);
@@ -463,8 +481,8 @@ static grpc_error_handle tcp_server_add_port(grpc_tcp_server* s,
   return err;
 }
 
-/* Return listener at port_index or NULL. Should only be called with s->mu
-   locked. */
+// Return listener at port_index or NULL. Should only be called with s->mu
+// locked.
 static grpc_tcp_listener* get_port_index(grpc_tcp_server* s,
                                          unsigned port_index) {
   unsigned num_ports = 0;
@@ -505,17 +523,12 @@ static int tcp_server_port_fd(grpc_tcp_server* s, unsigned port_index,
 }
 
 static void tcp_server_start(grpc_tcp_server* s,
-                             const std::vector<grpc_pollset*>* pollsets,
-                             grpc_tcp_server_cb on_accept_cb,
-                             void* on_accept_cb_arg) {
+                             const std::vector<grpc_pollset*>* pollsets) {
   size_t i;
   grpc_tcp_listener* sp;
-  GPR_ASSERT(on_accept_cb);
   gpr_mu_lock(&s->mu);
-  GPR_ASSERT(!s->on_accept_cb);
+  GPR_ASSERT(s->on_accept_cb);
   GPR_ASSERT(s->active_ports == 0);
-  s->on_accept_cb = on_accept_cb;
-  s->on_accept_cb_arg = on_accept_cb_arg;
   s->pollsets = pollsets;
   sp = s->head;
   while (sp != nullptr) {
@@ -571,7 +584,7 @@ static void tcp_server_unref(grpc_tcp_server* s) {
 static void tcp_server_shutdown_listeners(grpc_tcp_server* s) {
   gpr_mu_lock(&s->mu);
   s->shutdown_listeners = true;
-  /* shutdown all fd's */
+  // shutdown all fd's
   if (s->active_ports) {
     grpc_tcp_listener* sp;
     for (sp = s->head; sp; sp = sp->next) {
@@ -581,6 +594,16 @@ static void tcp_server_shutdown_listeners(grpc_tcp_server* s) {
   gpr_mu_unlock(&s->mu);
 }
 
+static int tcp_server_pre_allocated_fd(grpc_tcp_server* s) {
+  return s->pre_allocated_fd;
+}
+
+static void tcp_server_set_pre_allocated_fd(grpc_tcp_server* s, int fd) {
+  gpr_mu_lock(&s->mu);
+  s->pre_allocated_fd = fd;
+  gpr_mu_unlock(&s->mu);
+}
+
 namespace {
 class ExternalConnectionHandler : public grpc_core::TcpServerFdHandler {
  public:
@@ -644,10 +667,17 @@ static grpc_core::TcpServerFdHandler* tcp_server_create_fd_handler(
 }
 
 grpc_tcp_server_vtable grpc_posix_tcp_server_vtable = {
-    tcp_server_create,        tcp_server_start,
-    tcp_server_add_port,      tcp_server_create_fd_handler,
-    tcp_server_port_fd_count, tcp_server_port_fd,
-    tcp_server_ref,           tcp_server_shutdown_starting_add,
-    tcp_server_unref,         tcp_server_shutdown_listeners};
-
-#endif /* GRPC_POSIX_SOCKET_TCP_SERVER */
+    tcp_server_create,
+    tcp_server_start,
+    tcp_server_add_port,
+    tcp_server_create_fd_handler,
+    tcp_server_port_fd_count,
+    tcp_server_port_fd,
+    tcp_server_ref,
+    tcp_server_shutdown_starting_add,
+    tcp_server_unref,
+    tcp_server_shutdown_listeners,
+    tcp_server_pre_allocated_fd,
+    tcp_server_set_pre_allocated_fd};
+
+#endif  // GRPC_POSIX_SOCKET_TCP_SERVER