grpc 1.51.0 → 1.52.0

data/src/core/ext/filters/client_channel/lb_policy/xds/xds_override_host.h

@@ -0,0 +1,60 @@
+//
+// Copyright 2023 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_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_XDS_XDS_OVERRIDE_HOST_H
+#define GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_XDS_XDS_OVERRIDE_HOST_H
+
+#include <grpc/support/port_platform.h>
+
+#include "absl/strings/string_view.h"
+
+#include "src/core/lib/gprpp/ref_counted_ptr.h"
+#include "src/core/lib/gprpp/validation_errors.h"
+#include "src/core/lib/json/json.h"
+#include "src/core/lib/json/json_args.h"
+#include "src/core/lib/json/json_object_loader.h"
+#include "src/core/lib/load_balancing/lb_policy.h"
+
+namespace grpc_core {
+
+// Config for stateful session LB policy.
+class XdsOverrideHostLbConfig : public LoadBalancingPolicy::Config {
+ public:
+  XdsOverrideHostLbConfig() = default;
+
+  XdsOverrideHostLbConfig(const XdsOverrideHostLbConfig&) = delete;
+  XdsOverrideHostLbConfig& operator=(const XdsOverrideHostLbConfig&) = delete;
+
+  XdsOverrideHostLbConfig(XdsOverrideHostLbConfig&& other) = delete;
+  XdsOverrideHostLbConfig& operator=(XdsOverrideHostLbConfig&& other) = delete;
+
+  static absl::string_view Name() { return "xds_override_host_experimental"; }
+
+  absl::string_view name() const override { return Name(); }
+
+  RefCountedPtr<LoadBalancingPolicy::Config> child_config() const {
+    return child_config_;
+  }
+
+  static const JsonLoaderInterface* JsonLoader(const JsonArgs&);
+  void JsonPostLoad(const Json& json, const JsonArgs&,
+                    ValidationErrors* errors);
+
+ private:
+  RefCountedPtr<LoadBalancingPolicy::Config> child_config_;
+};
+}  // namespace grpc_core
+#endif  // GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_XDS_XDS_OVERRIDE_HOST_H

data/src/core/ext/filters/client_channel/lb_policy/xds/xds_wrr_locality.cc

@@ -29,7 +29,7 @@
 #include "absl/strings/string_view.h"
 
 #include <grpc/event_engine/event_engine.h>
-#include <grpc/impl/codegen/connectivity_state.h>
+#include <grpc/impl/connectivity_state.h>
 #include <grpc/support/log.h>
 
 #include "src/core/ext/filters/client_channel/lb_policy/xds/xds_attributes.h"
@@ -127,7 +127,7 @@ class XdsWrrLocalityLb : public LoadBalancingPolicy {
     RefCountedPtr<SubchannelInterface> CreateSubchannel(
         ServerAddress address, const ChannelArgs& args) override;
     void UpdateState(grpc_connectivity_state state, const absl::Status& status,
-                     std::unique_ptr<SubchannelPicker> picker) override;
+                     RefCountedPtr<SubchannelPicker> picker) override;
     void RequestReresolution() override;
     absl::string_view GetAuthority() override;
     grpc_event_engine::experimental::EventEngine* GetEventEngine() override;
@@ -240,7 +240,7 @@ absl::Status XdsWrrLocalityLb::UpdateLocked(UpdateArgs args) {
         child_config.status().ToString()));
     channel_control_helper()->UpdateState(
         GRPC_CHANNEL_TRANSIENT_FAILURE, status,
-        std::make_unique<TransientFailurePicker>(status));
+        MakeRefCounted<TransientFailurePicker>(status));
     return status;
   }
   // Create child policy if needed (i.e., on first update).
@@ -295,7 +295,7 @@ RefCountedPtr<SubchannelInterface> XdsWrrLocalityLb::Helper::CreateSubchannel(
 
 void XdsWrrLocalityLb::Helper::UpdateState(
     grpc_connectivity_state state, const absl::Status& status,
-    std::unique_ptr<SubchannelPicker> picker) {
+    RefCountedPtr<SubchannelPicker> picker) {
   if (GRPC_TRACE_FLAG_ENABLED(grpc_xds_wrr_locality_lb_trace)) {
     gpr_log(
         GPR_INFO,

data/src/core/ext/filters/client_channel/local_subchannel_pool.h

@@ -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.
+//
+//
 
 #ifndef GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LOCAL_SUBCHANNEL_POOL_H
 #define GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LOCAL_SUBCHANNEL_POOL_H
@@ -56,4 +56,4 @@ class LocalSubchannelPool final : public SubchannelPoolInterface {
 
 }  // namespace grpc_core
 
-#endif /* GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LOCAL_SUBCHANNEL_POOL_H */
+#endif  // GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LOCAL_SUBCHANNEL_POOL_H

data/src/core/ext/filters/client_channel/resolver/binder/binder_resolver.cc

@@ -42,7 +42,6 @@
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/gprpp/orphanable.h"
 #include "src/core/lib/iomgr/error.h"
-#include "src/core/lib/iomgr/port.h"
 #include "src/core/lib/iomgr/resolved_address.h"
 #include "src/core/lib/resolver/resolver.h"
 #include "src/core/lib/resolver/resolver_factory.h"

data/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc

@@ -34,7 +34,7 @@
 #include "absl/strings/strip.h"
 #include "absl/types/optional.h"
 
-#include <grpc/impl/codegen/grpc_types.h>
+#include <grpc/grpc.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/log.h>
 
@@ -855,7 +855,7 @@ void grpc_resolver_dns_ares_shutdown() {
   }
 }
 
-#else /* GRPC_ARES == 1 */
+#else  // GRPC_ARES == 1
 
 namespace grpc_core {
 void RegisterAresDnsResolver(CoreConfiguration::Builder*) {}
@@ -865,4 +865,4 @@ void grpc_resolver_dns_ares_init() {}
 
 void grpc_resolver_dns_ares_shutdown() {}
 
-#endif /* GRPC_ARES == 1 */
+#endif  // GRPC_ARES == 1

data/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.h

@@ -1,20 +1,20 @@
-/*
- *
- * Copyright 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 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_EXT_FILTERS_CLIENT_CHANNEL_RESOLVER_DNS_C_ARES_GRPC_ARES_EV_DRIVER_H
 #define GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_RESOLVER_DNS_C_ARES_GRPC_ARES_EV_DRIVER_H
@@ -35,57 +35,56 @@
 
 namespace grpc_core {
 
-/* A wrapped fd that integrates with the grpc iomgr of the current platform.
- * A GrpcPolledFd knows how to create grpc platform-specific iomgr endpoints
- * from "ares_socket_t" sockets, and then sign up for readability/writeability
- * with that poller, and do shutdown and destruction. */
+// A wrapped fd that integrates with the grpc iomgr of the current platform.
+// A GrpcPolledFd knows how to create grpc platform-specific iomgr endpoints
+// from "ares_socket_t" sockets, and then sign up for readability/writeability
+// with that poller, and do shutdown and destruction.
 class GrpcPolledFd {
  public:
   virtual ~GrpcPolledFd() {}
-  /* Called when c-ares library is interested and there's no pending callback */
+  // Called when c-ares library is interested and there's no pending callback
   virtual void RegisterForOnReadableLocked(grpc_closure* read_closure)
       ABSL_EXCLUSIVE_LOCKS_REQUIRED(&grpc_ares_request::mu) = 0;
-  /* Called when c-ares library is interested and there's no pending callback */
+  // Called when c-ares library is interested and there's no pending callback
   virtual void RegisterForOnWriteableLocked(grpc_closure* write_closure)
       ABSL_EXCLUSIVE_LOCKS_REQUIRED(&grpc_ares_request::mu) = 0;
-  /* Indicates if there is data left even after just being read from */
+  // Indicates if there is data left even after just being read from
   virtual bool IsFdStillReadableLocked()
       ABSL_EXCLUSIVE_LOCKS_REQUIRED(&grpc_ares_request::mu) = 0;
-  /* Called once and only once. Must cause cancellation of any pending
-   * read/write callbacks. */
+  // Called once and only once. Must cause cancellation of any pending
+  // read/write callbacks.
   virtual void ShutdownLocked(grpc_error_handle error)
       ABSL_EXCLUSIVE_LOCKS_REQUIRED(&grpc_ares_request::mu) = 0;
-  /* Get the underlying ares_socket_t that this was created from */
+  // Get the underlying ares_socket_t that this was created from
   virtual ares_socket_t GetWrappedAresSocketLocked()
       ABSL_EXCLUSIVE_LOCKS_REQUIRED(&grpc_ares_request::mu) = 0;
-  /* A unique name, for logging */
+  // A unique name, for logging
   virtual const char* GetName() const = 0;
 };
 
-/* A GrpcPolledFdFactory is 1-to-1 with and owned by the
- * ares event driver. It knows how to create GrpcPolledFd's
- * for the current platform, and the ares driver uses it for all of
- * its fd's. */
+// A GrpcPolledFdFactory is 1-to-1 with and owned by the
+// ares event driver. It knows how to create GrpcPolledFd's
+// for the current platform, and the ares driver uses it for all of
+// its fd's.
 class GrpcPolledFdFactory {
  public:
   virtual ~GrpcPolledFdFactory() {}
-  /* Creates a new wrapped fd for the current platform */
+  // Creates a new wrapped fd for the current platform
   virtual GrpcPolledFd* NewGrpcPolledFdLocked(
       ares_socket_t as, grpc_pollset_set* driver_pollset_set)
       ABSL_EXCLUSIVE_LOCKS_REQUIRED(&grpc_ares_request::mu) = 0;
-  /* Optionally configures the ares channel after creation */
+  // Optionally configures the ares channel after creation
   virtual void ConfigureAresChannelLocked(ares_channel channel)
       ABSL_EXCLUSIVE_LOCKS_REQUIRED(&grpc_ares_request::mu) = 0;
 };
 
-/* Creates a new polled fd factory.
- * Note that even though ownership of mu is not transferred, the mu
- * parameter is guaranteed to be alive for the the whole lifetime of
- * the resulting GrpcPolledFdFactory as well as any GrpcPolledFd
- * returned by the factory. */
+// Creates a new polled fd factory.
+// Note that even though ownership of mu is not transferred, the mu
+// parameter is guaranteed to be alive for the the whole lifetime of
+// the resulting GrpcPolledFdFactory as well as any GrpcPolledFd
+// returned by the factory.
 std::unique_ptr<GrpcPolledFdFactory> NewGrpcPolledFdFactory(Mutex* mu);
 
 }  // namespace grpc_core
 
-#endif /* GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_RESOLVER_DNS_C_ARES_GRPC_ARES_EV_DRIVER_H \
-        */
+#endif  // GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_RESOLVER_DNS_C_ARES_GRPC_ARES_EV_DRIVER_H

data/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc

@@ -1,20 +1,20 @@
-/*
- *
- * Copyright 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 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.
+//
+//
 #include <grpc/support/port_platform.h>
 
 #include <memory>
@@ -53,9 +53,9 @@ class GrpcPolledFdPosix : public GrpcPolledFd {
 
   ~GrpcPolledFdPosix() override {
     grpc_pollset_set_del_fd(driver_pollset_set_, fd_);
-    /* c-ares library will close the fd inside grpc_fd. This fd may be picked up
-       immediately by another thread, and should not be closed by the following
-       grpc_fd_orphan. */
+    // c-ares library will close the fd inside grpc_fd. This fd may be picked up
+    // immediately by another thread, and should not be closed by the following
+    // grpc_fd_orphan.
     int phony_release_fd;
     grpc_fd_orphan(fd_, nullptr, &phony_release_fd, "c-ares query finished");
   }
@@ -112,4 +112,4 @@ std::unique_ptr<GrpcPolledFdFactory> NewGrpcPolledFdFactory(Mutex* /* mu */) {
 
 }  // namespace grpc_core
 
-#endif /* GRPC_ARES == 1 && defined(GRPC_POSIX_SOCKET_ARES_EV_DRIVER) */
+#endif  // GRPC_ARES == 1 && defined(GRPC_POSIX_SOCKET_ARES_EV_DRIVER)

data/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc

@@ -1,20 +1,20 @@
-/*
- *
- * Copyright 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 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.
+//
+//
 #include <grpc/support/port_platform.h>
 
 #include "src/core/lib/iomgr/port.h"  // IWYU pragma: keep
@@ -36,6 +36,7 @@
 #include "src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.h"
 #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/iomgr/iocp_windows.h"
 #include "src/core/lib/iomgr/sockaddr_windows.h"
@@ -44,11 +45,11 @@
 #include "src/core/lib/slice/slice.h"
 #include "src/core/lib/slice/slice_internal.h"
 
-/* TODO(apolcyn): remove this hack after fixing upstream.
- * Our grpc/c-ares code on Windows uses the ares_set_socket_functions API,
- * which uses "struct iovec" type, which on Windows is defined inside of
- * a c-ares header that is not public.
- * See https://github.com/c-ares/c-ares/issues/206. */
+// TODO(apolcyn): remove this hack after fixing upstream.
+// Our grpc/c-ares code on Windows uses the ares_set_socket_functions API,
+// which uses "struct iovec" type, which on Windows is defined inside of
+// a c-ares header that is not public.
+// See https://github.com/c-ares/c-ares/issues/206.
 struct iovec {
   void* iov_base;
   size_t iov_len;
@@ -56,12 +57,12 @@ struct iovec {
 
 namespace grpc_core {
 
-/* c-ares reads and takes action on the error codes of the
- * "virtual socket operations" in this file, via the WSAGetLastError
- * APIs. If code in this file wants to set a specific WSA error that
- * c-ares should read, it must do so by calling SetWSAError() on the
- * WSAErrorContext instance passed to it. A WSAErrorContext must only be
- * instantiated at the top of the virtual socket function callstack. */
+// c-ares reads and takes action on the error codes of the
+// "virtual socket operations" in this file, via the WSAGetLastError
+// APIs. If code in this file wants to set a specific WSA error that
+// c-ares should read, it must do so by calling SetWSAError() on the
+// WSAErrorContext instance passed to it. A WSAErrorContext must only be
+// instantiated at the top of the virtual socket function callstack.
 class WSAErrorContext {
  public:
   explicit WSAErrorContext(){};
@@ -72,7 +73,7 @@ class WSAErrorContext {
     }
   }
 
-  /* Disallow copy and assignment operators */
+  // Disallow copy and assignment operators
   WSAErrorContext(const WSAErrorContext&) = delete;
   WSAErrorContext& operator=(const WSAErrorContext&) = delete;
 
@@ -82,15 +83,15 @@ class WSAErrorContext {
   int error_ = 0;
 };
 
-/* c-ares creates its own sockets and is meant to read them when readable and
- * write them when writeable. To fit this socket usage model into the grpc
- * windows poller (which gives notifications when attempted reads and writes are
- * actually fulfilled rather than possible), this GrpcPolledFdWindows class
- * takes advantage of the ares_set_socket_functions API and acts as a virtual
- * socket. It holds its own read and write buffers which are written to and read
- * from c-ares and are used with the grpc windows poller, and it, e.g.,
- * manufactures virtual socket error codes when it e.g. needs to tell the c-ares
- * library to wait for an async read. */
+// c-ares creates its own sockets and is meant to read them when readable and
+// write them when writeable. To fit this socket usage model into the grpc
+// windows poller (which gives notifications when attempted reads and writes are
+// actually fulfilled rather than possible), this GrpcPolledFdWindows class
+// takes advantage of the ares_set_socket_functions API and acts as a virtual
+// socket. It holds its own read and write buffers which are written to and read
+// from c-ares and are used with the grpc windows poller, and it, e.g.,
+// manufactures virtual socket error codes when it e.g. needs to tell the c-ares
+// library to wait for an async read.
 class GrpcPolledFdWindows {
  public:
   enum WriteState {
@@ -282,8 +283,8 @@ class GrpcPolledFdWindows {
     if (GRPC_SLICE_LENGTH(read_buf_) == 0) {
       read_buf_has_data_ = false;
     }
-    /* c-ares overloads this recv_from virtual socket function to receive
-     * data on both UDP and TCP sockets, and from is nullptr for TCP. */
+    // c-ares overloads this recv_from virtual socket function to receive
+    // data on both UDP and TCP sockets, and from is nullptr for TCP.
     if (from != nullptr) {
       GPR_ASSERT(*from_len <= recv_from_source_addr_len_);
       memcpy(from, &recv_from_source_addr_, recv_from_source_addr_len_);
@@ -581,10 +582,10 @@ class GrpcPolledFdWindows {
   void OnIocpReadableLocked(grpc_error_handle error) {
     if (error.ok()) {
       if (winsocket_->read_info.wsa_error != 0) {
-        /* WSAEMSGSIZE would be due to receiving more data
-         * than our read buffer's fixed capacity. Assume that
-         * the connection is TCP and read the leftovers
-         * in subsequent c-ares reads. */
+        // WSAEMSGSIZE would be due to receiving more data
+        // than our read buffer's fixed capacity. Assume that
+        // the connection is TCP and read the leftovers
+        // in subsequent c-ares reads.
         if (winsocket_->read_info.wsa_error != WSAEMSGSIZE) {
           error = GRPC_WSA_ERROR(winsocket_->read_info.wsa_error,
                                  "OnIocpReadableInner");
@@ -683,11 +684,11 @@ struct SockToPolledFdEntry {
   SockToPolledFdEntry* next = nullptr;
 };
 
-/* A SockToPolledFdMap can make ares_socket_t types (SOCKET's on windows)
- * to GrpcPolledFdWindow's, and is used to find the appropriate
- * GrpcPolledFdWindows to handle a virtual socket call when c-ares makes that
- * socket call on the ares_socket_t type. Instances are owned by and one-to-one
- * with a GrpcPolledFdWindows factory and event driver */
+// A SockToPolledFdMap can make ares_socket_t types (SOCKET's on windows)
+// to GrpcPolledFdWindow's, and is used to find the appropriate
+// GrpcPolledFdWindows to handle a virtual socket call when c-ares makes that
+// socket call on the ares_socket_t type. Instances are owned by and one-to-one
+// with a GrpcPolledFdWindows factory and event driver
 class SockToPolledFdMap {
  public:
   explicit SockToPolledFdMap(Mutex* mu) : mu_(mu) {}
@@ -726,12 +727,12 @@ class SockToPolledFdMap {
     abort();
   }
 
-  /* These virtual socket functions are called from within the c-ares
-   * library. These methods generally dispatch those socket calls to the
-   * appropriate methods. The virtual "socket" and "close" methods are
-   * special and instead create/add and remove/destroy GrpcPolledFdWindows
-   * objects.
-   */
+  // These virtual socket functions are called from within the c-ares
+  // library. These methods generally dispatch those socket calls to the
+  // appropriate methods. The virtual "socket" and "close" methods are
+  // special and instead create/add and remove/destroy GrpcPolledFdWindows
+  // objects.
+  //
   static ares_socket_t Socket(int af, int type, int protocol, void* user_data) {
     if (type != SOCK_DGRAM && type != SOCK_STREAM) {
       GRPC_CARES_TRACE_LOG("Socket called with invalid socket type:%d", type);
@@ -815,9 +816,9 @@ const struct ares_socket_functions custom_ares_sock_funcs = {
     &SockToPolledFdMap::SendV /* sendv */,
 };
 
-/* A thin wrapper over a GrpcPolledFdWindows object but with a shorter
-   lifetime. This object releases it's GrpcPolledFdWindows upon destruction,
-   so that c-ares can close it via usual socket teardown. */
+// A thin wrapper over a GrpcPolledFdWindows object but with a shorter
+// lifetime. This object releases it's GrpcPolledFdWindows upon destruction,
+// so that c-ares can close it via usual socket teardown.
 class GrpcPolledFdWindowsWrapper : public GrpcPolledFd {
  public:
   explicit GrpcPolledFdWindowsWrapper(GrpcPolledFdWindows* wrapped)
@@ -879,4 +880,4 @@ std::unique_ptr<GrpcPolledFdFactory> NewGrpcPolledFdFactory(Mutex* mu) {
 
 }  // namespace grpc_core
 
-#endif /* GRPC_ARES == 1 && defined(GPR_WINDOWS) */
+#endif  // GRPC_ARES == 1 && defined(GPR_WINDOWS)