grpc 1.50.0 → 1.52.0.pre2

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

@@ -1,33 +1,33 @@
-/*
- *
- * 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_POSIX_H
 #define GRPC_CORE_LIB_IOMGR_TCP_POSIX_H
-/*
-   Low level TCP "bottom half" implementation, for use by transports built on
-   top of a TCP connection.
+//
+// Low level TCP "bottom half" implementation, for use by transports built on
+// top of a TCP connection.
 
-   Note that this file does not (yet) include APIs for creating the socket in
-   the first place.
+// Note that this file does not (yet) include APIs for creating the socket in
+// the first place.
 
-   All calls passing slice transfer ownership of a slice refcount unless
-   otherwise specified.
-*/
+// All calls passing slice transfer ownership of a slice refcount unless
+// otherwise specified.
+//
 
 #include <grpc/support/port_platform.h>
 
@@ -62,6 +62,6 @@ void grpc_tcp_posix_init();
 
 void grpc_tcp_posix_shutdown();
 
-#endif /* GRPC_POSIX_SOCKET_TCP */
+#endif  // GRPC_POSIX_SOCKET_TCP
 
-#endif /* GRPC_CORE_LIB_IOMGR_TCP_POSIX_H */
+#endif  // GRPC_CORE_LIB_IOMGR_TCP_POSIX_H

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