grpc 1.50.0.pre1 → 1.52.0.pre2

data/src/core/lib/gprpp/thd.h

@@ -1,25 +1,25 @@
-/*
- *
- * 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_GPRPP_THD_H
 #define GRPC_CORE_LIB_GPRPP_THD_H
 
-/** Internal thread interface. */
+/// Internal thread interface.
 
 #include <grpc/support/port_platform.h>
 
@@ -168,4 +168,4 @@ class Thread {
 
 }  // namespace grpc_core
 
-#endif /* GRPC_CORE_LIB_GPRPP_THD_H */
+#endif  // GRPC_CORE_LIB_GPRPP_THD_H

data/src/core/lib/gprpp/thd_posix.cc

@@ -1,26 +1,25 @@
-/*
- *
- * 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.
- *
- */
-
-/* Posix implementation for gpr threads. */
+//
+//
+// 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.
+//
+//
+
+// Posix implementation for gpr threads.
 
 #include <grpc/support/port_platform.h>
 
-#include <grpc/impl/codegen/gpr_types.h>
 #include <grpc/support/time.h>
 
 #ifdef GPR_POSIX_SYNC
@@ -44,9 +43,9 @@ class ThreadInternalsPosix;
 
 struct thd_arg {
   ThreadInternalsPosix* thread;
-  void (*body)(void* arg); /* body of a thread */
-  void* arg;               /* argument to a thread */
-  const char* name;        /* name of thread. Can be nullptr. */
+  void (*body)(void* arg);  // body of a thread
+  void* arg;                // argument to a thread
+  const char* name;         // name of thread. Can be nullptr.
   bool joinable;
   bool tracked;
 };
@@ -79,8 +78,8 @@ class ThreadInternalsPosix : public internal::ThreadInternalsInterface {
     gpr_mu_init(&mu_);
     gpr_cv_init(&ready_);
     pthread_attr_t attr;
-    /* don't use gpr_malloc as we may cause an infinite recursion with
-     * the profiling code */
+    // don't use gpr_malloc as we may cause an infinite recursion with
+    // the profiling code
     thd_arg* info = static_cast<thd_arg*>(malloc(sizeof(*info)));
     GPR_ASSERT(info != nullptr);
     info->thread = this;
@@ -114,12 +113,12 @@ class ThreadInternalsPosix : public internal::ThreadInternalsInterface {
                       free(v);
                       if (arg.name != nullptr) {
 #if GPR_APPLE_PTHREAD_NAME
-                        /* Apple supports 64 characters, and will
-                         * truncate if it's longer. */
+                        // Apple supports 64 characters, and will
+                        // truncate if it's longer.
                         pthread_setname_np(arg.name);
 #elif GPR_LINUX_PTHREAD_NAME
-                        /* Linux supports 16 characters max, and will
-                         * error if it's longer. */
+                        // Linux supports 16 characters max, and will
+                        // error if it's longer.
                         char buf[16];
                         size_t buf_len = GPR_ARRAY_SIZE(buf) - 1;
                         strncpy(buf, arg.name, buf_len);
@@ -150,7 +149,7 @@ class ThreadInternalsPosix : public internal::ThreadInternalsInterface {
     GPR_ASSERT(pthread_attr_destroy(&attr) == 0);
 
     if (!(*success)) {
-      /* don't use gpr_free, as this was allocated using malloc (see above) */
+      // don't use gpr_free, as this was allocated using malloc (see above)
       free(info);
       if (options.tracked()) {
         Fork::DecThreadCount();
@@ -208,4 +207,4 @@ gpr_thd_id gpr_thd_currentid(void) {
   return (gpr_thd_id)pthread_self();
 }
 
-#endif /* GPR_POSIX_SYNC */
+#endif  // GPR_POSIX_SYNC

data/src/core/lib/gprpp/thd_windows.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.
- *
- */
-
-/* Windows implementation for gpr threads. */
+//
+//
+// 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.
+//
+//
+
+// Windows implementation for gpr threads.
 
 #include <grpc/support/port_platform.h>
 
@@ -30,7 +30,7 @@
 #include <grpc/support/thd_id.h>
 #include <grpc/support/time.h>
 
-#include "src/core/lib/gpr/tls.h"
+#include "src/core/lib/gprpp/crash.h"
 #include "src/core/lib/gprpp/memory.h"
 #include "src/core/lib/gprpp/thd.h"
 
@@ -38,13 +38,13 @@ namespace {
 class ThreadInternalsWindows;
 struct thd_info {
   ThreadInternalsWindows* thread;
-  void (*body)(void* arg); /* body of a thread */
-  void* arg;               /* argument to a thread */
-  HANDLE join_event;       /* the join event */
-  bool joinable;           /* whether it is joinable */
+  void (*body)(void* arg);  // body of a thread
+  void* arg;                // argument to a thread
+  HANDLE join_event;        // the join event
+  bool joinable;            // whether it is joinable
 };
 
-GPR_THREAD_LOCAL(struct thd_info*) g_thd_info;
+thread_local struct thd_info* g_thd_info;
 
 class ThreadInternalsWindows
     : public grpc_core::internal::ThreadInternalsInterface {
@@ -170,4 +170,4 @@ gpr_thd_id gpr_thd_currentid(void) {
   return reinterpret_cast<gpr_thd_id>(g_thd_info);
 }
 
-#endif /* GPR_WINDOWS */
+#endif  // GPR_WINDOWS

data/src/core/lib/gprpp/time.cc

@@ -18,18 +18,18 @@
 
 #include <atomic>
 #include <chrono>
-#include <cstdint>
 #include <limits>
 #include <string>
 #include <utility>
 
 #include "absl/strings/str_format.h"
 
-#include <grpc/impl/codegen/gpr_types.h>
-#include <grpc/support/log.h>
+#include <grpc/support/time.h>
 
 #include "src/core/lib/gprpp/no_destruct.h"
 
+// IWYU pragma: no_include <ratio>
+
 namespace grpc_core {
 
 namespace {
@@ -50,20 +50,26 @@ GPR_ATTRIBUTE_NOINLINE std::pair<int64_t, gpr_cycle_counter> InitTime() {
   int64_t process_epoch_seconds = 0;
 
   // Check the current time... if we end up with zero, try again after 100ms.
-  // If it doesn't advance after sleeping for 1100ms, crash the process.
-  for (int i = 0; i < 11; i++) {
+  // If it doesn't advance after sleeping for 2100ms, crash the process.
+  for (int i = 0; i < 21; i++) {
     cycles_start = gpr_get_cycle_counter();
     gpr_timespec now = gpr_now(GPR_CLOCK_MONOTONIC);
     cycles_end = gpr_get_cycle_counter();
-    process_epoch_seconds = now.tv_sec - 1;
-    if (process_epoch_seconds != 0) {
+    process_epoch_seconds = now.tv_sec;
+    if (process_epoch_seconds > 1) {
       break;
     }
+    gpr_log(GPR_INFO,
+            "gpr_now(GPR_CLOCK_MONOTONIC) returns a very small number: "
+            "sleeping for 100ms");
     gpr_sleep_until(gpr_time_add(now, gpr_time_from_millis(100, GPR_TIMESPAN)));
   }
 
-  // Time does not seem to be increasing from zero...
-  GPR_ASSERT(process_epoch_seconds != 0);
+  // Check time has increased past 1 second.
+  GPR_ASSERT(process_epoch_seconds > 1);
+  // Fake the epoch to always return >=1 second from our monotonic clock (to
+  // avoid bugs elsewhere)
+  process_epoch_seconds -= 1;
   int64_t expected = 0;
   gpr_cycle_counter process_epoch_cycles = (cycles_start + cycles_end) / 2;
   GPR_ASSERT(process_epoch_cycles != 0);
@@ -142,8 +148,7 @@ int64_t TimespanToMillisRoundDown(gpr_timespec ts) {
 
 }  // namespace
 
-GPR_THREAD_LOCAL(Timestamp::Source*)
-Timestamp::thread_local_time_source_{
+thread_local Timestamp::Source* Timestamp::thread_local_time_source_{
     NoDestructSingleton<GprNowTimeSource>::Get()};
 
 Timestamp ScopedTimeCache::Now() {

data/src/core/lib/gprpp/time.h

@@ -26,13 +26,23 @@
 #include "absl/types/optional.h"
 
 #include <grpc/event_engine/event_engine.h>
-#include <grpc/impl/codegen/gpr_types.h>
+#include <grpc/support/log.h>
 #include <grpc/support/time.h>
 
 #include "src/core/lib/gpr/time_precise.h"
-#include "src/core/lib/gpr/tls.h"
 #include "src/core/lib/gpr/useful.h"
 
+#define GRPC_LOG_EVERY_N_SEC(n, format, ...)                    \
+  do {                                                          \
+    static std::atomic<uint64_t> prev{0};                       \
+    uint64_t now = grpc_core::Timestamp::FromTimespecRoundDown( \
+                       gpr_now(GPR_CLOCK_MONOTONIC))            \
+                       .milliseconds_after_process_epoch();     \
+    if ((now - prev.exchange(now)) > (n)*1000) {                \
+      gpr_log(GPR_INFO, format, __VA_ARGS__);                   \
+    }                                                           \
+  } while (0)
+
 namespace grpc_core {
 
 namespace time_detail {
@@ -150,7 +160,7 @@ class Timestamp {
   explicit constexpr Timestamp(int64_t millis) : millis_(millis) {}
 
   int64_t millis_ = 0;
-  static GPR_THREAD_LOCAL(Timestamp::Source*) thread_local_time_source_;
+  static thread_local Timestamp::Source* thread_local_time_source_;
 };
 
 class ScopedTimeCache final : public Timestamp::ScopedSource {

data/src/core/lib/gprpp/time_averaged_stats.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>
 
@@ -34,16 +34,16 @@ void TimeAveragedStats::AddSample(double value) {
 }
 
 double TimeAveragedStats::UpdateAverage() {
-  /* Start with the current batch: */
+  // Start with the current batch:
   double weighted_sum = batch_total_value_;
   double total_weight = batch_num_samples_;
   if (regress_weight_ > 0) {
-    /* Add in the regression towards init_avg_: */
+    // Add in the regression towards init_avg_:
     weighted_sum += regress_weight_ * init_avg_;
     total_weight += regress_weight_;
   }
   if (persistence_factor_ > 0) {
-    /* Add in the persistence: */
+    // Add in the persistence:
     const double prev_sample_weight =
         persistence_factor_ * aggregate_total_weight_;
     weighted_sum += prev_sample_weight * aggregate_weighted_avg_;

data/src/core/lib/gprpp/time_averaged_stats.h

@@ -1,79 +1,79 @@
-/*
- *
- * 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_GPRPP_TIME_AVERAGED_STATS_H
 #define GRPC_CORE_LIB_GPRPP_TIME_AVERAGED_STATS_H
 
 namespace grpc_core {
 
-/* This tracks a time-decaying weighted average.  It works by collecting
-   batches of samples and then mixing their average into a time-decaying
-   weighted mean.  It is designed for batch operations where we do many adds
-   before updating the average. */
+// This tracks a time-decaying weighted average.  It works by collecting
+// batches of samples and then mixing their average into a time-decaying
+// weighted mean.  It is designed for batch operations where we do many adds
+// before updating the average.
 
 class TimeAveragedStats {
  public:
   TimeAveragedStats(double init_avg, double regress_weight,
                     double persistence_factor);
 
-  /* Add a sample to the current batch. */
+  // Add a sample to the current batch.
   void AddSample(double value);
-  /* Complete a batch and compute the new estimate of the average sample
-     value. */
+  // Complete a batch and compute the new estimate of the average sample
+  // value.
   double UpdateAverage();
 
   double aggregate_weighted_avg() const { return aggregate_weighted_avg_; }
   double aggregate_total_weight() const { return aggregate_total_weight_; }
 
  private:
-  /* The initial average value.  This is the reported average until the first
-     grpc_time_averaged_stats_update_average call.  If a positive regress_weight
-     is used, we also regress towards this value on each update. */
+  // The initial average value.  This is the reported average until the first
+  // grpc_time_averaged_stats_update_average call.  If a positive regress_weight
+  // is used, we also regress towards this value on each update.
   const double init_avg_;
-  /* The sample weight of "init_avg" that is mixed in with each call to
-     grpc_time_averaged_stats_update_average.  If the calls to
-     grpc_time_averaged_stats_add_sample stop, this will cause the average to
-     regress back to the mean.  This should be non-negative.  Set it to 0 to
-     disable the bias.  A value of 1 has the effect of adding in 1 bonus sample
-     with value init_avg to each sample period. */
+  // The sample weight of "init_avg" that is mixed in with each call to
+  // grpc_time_averaged_stats_update_average.  If the calls to
+  // grpc_time_averaged_stats_add_sample stop, this will cause the average to
+  // regress back to the mean.  This should be non-negative.  Set it to 0 to
+  // disable the bias.  A value of 1 has the effect of adding in 1 bonus sample
+  // with value init_avg to each sample period.
   const double regress_weight_;
-  /* This determines the rate of decay of the time-averaging from one period
-     to the next by scaling the aggregate_total_weight of samples from prior
-     periods when combining with the latest period.  It should be in the range
-     [0,1].  A higher value adapts more slowly.  With a value of 0.5, if the
-     batches each have k samples, the samples_in_avg_ will grow to 2 k, so the
-     weighting of the time average will eventually be 1/3 new batch and 2/3
-     old average. */
+  // This determines the rate of decay of the time-averaging from one period
+  // to the next by scaling the aggregate_total_weight of samples from prior
+  // periods when combining with the latest period.  It should be in the range
+  // [0,1].  A higher value adapts more slowly.  With a value of 0.5, if the
+  // batches each have k samples, the samples_in_avg_ will grow to 2 k, so the
+  // weighting of the time average will eventually be 1/3 new batch and 2/3
+  // old average.
   const double persistence_factor_;
 
-  /* The total value of samples since the last UpdateAverage(). */
+  // The total value of samples since the last UpdateAverage().
   double batch_total_value_ = 0;
-  /* The number of samples since the last UpdateAverage(). */
+  // The number of samples since the last UpdateAverage().
   double batch_num_samples_ = 0;
-  /* The time-decayed sum of batch_num_samples_ over previous batches.  This is
-     the "weight" of the old aggregate_weighted_avg_ when updating the
-     average. */
+  // The time-decayed sum of batch_num_samples_ over previous batches.  This is
+  // the "weight" of the old aggregate_weighted_avg_ when updating the
+  // average.
   double aggregate_total_weight_ = 0;
-  /* A time-decayed average of the (batch_total_value_ / batch_num_samples_),
-     computed by decaying the samples_in_avg_ weight in the weighted average. */
+  // A time-decayed average of the (batch_total_value_ / batch_num_samples_),
+  // computed by decaying the samples_in_avg_ weight in the weighted average.
   double aggregate_weighted_avg_ = init_avg_;
 };
 
 }  // namespace grpc_core
 
-#endif /* GRPC_CORE_LIB_GPRPP_TIME_AVERAGED_STATS_H */
+#endif  // GRPC_CORE_LIB_GPRPP_TIME_AVERAGED_STATS_H

data/src/core/lib/gprpp/time_util.h

@@ -21,7 +21,7 @@
 
 #include "absl/time/time.h"
 
-#include <grpc/impl/codegen/gpr_types.h>
+#include <grpc/support/time.h>
 
 namespace grpc_core {
 

data/src/core/lib/gprpp/unique_type_name.h

@@ -32,24 +32,24 @@
 // a registry to avoid name collisions.
 //
 // Expected usage:
-/*
-// Interface has a virtual method that returns a UniqueTypeName.
-class Interface {
- public:
-  virtual ~Interface() = default;
-  virtual UniqueTypeName type() const = 0;
-};
-
-// Implementation uses a static factory instance to return the same
-// UniqueTypeName for every instance.
-class FooImplementation : public Interface {
- public:
-  UniqueTypeName type() const override {
-    static UniqueTypeName::Factory kFactory("Foo");
-    return kFactory.Create();
-  }
-};
-*/
+//
+//// Interface has a virtual method that returns a UniqueTypeName.
+// class Interface {
+// public:
+// virtual ~Interface() = default;
+// virtual UniqueTypeName type() const = 0;
+// };
+
+//// Implementation uses a static factory instance to return the same
+//// UniqueTypeName for every instance.
+// class FooImplementation : public Interface {
+// public:
+// UniqueTypeName type() const override {
+//   static UniqueTypeName::Factory kFactory("Foo");
+//   return kFactory.Create();
+// }
+// };
+//
 
 namespace grpc_core {
 

data/src/core/lib/gprpp/validation_errors.h

@@ -21,6 +21,7 @@
 
 #include <map>
 #include <string>
+#include <utility>
 #include <vector>
 
 #include "absl/status/status.h"
@@ -69,7 +70,23 @@ class ValidationErrors {
         : errors_(errors) {
       errors_->PushField(field_name);
     }
-    ~ScopedField() { errors_->PopField(); }
+
+    // Not copyable.
+    ScopedField(const ScopedField& other) = delete;
+    ScopedField& operator=(const ScopedField& other) = delete;
+
+    // Movable.
+    ScopedField(ScopedField&& other) noexcept
+        : errors_(std::exchange(other.errors_, nullptr)) {}
+    ScopedField& operator=(ScopedField&& other) noexcept {
+      if (errors_ != nullptr) errors_->PopField();
+      errors_ = std::exchange(other.errors_, nullptr);
+      return *this;
+    }
+
+    ~ScopedField() {
+      if (errors_ != nullptr) errors_->PopField();
+    }
 
    private:
     ValidationErrors* errors_;

data/src/core/lib/handshaker/proxy_mapper.h

@@ -1,20 +1,20 @@
-/*
- *
- * Copyright 2017 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 2017 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_HANDSHAKER_PROXY_MAPPER_H
 #define GRPC_CORE_LIB_HANDSHAKER_PROXY_MAPPER_H
@@ -50,4 +50,4 @@ class ProxyMapperInterface {
 
 }  // namespace grpc_core
 
-#endif /* GRPC_CORE_LIB_HANDSHAKER_PROXY_MAPPER_H */
+#endif  // GRPC_CORE_LIB_HANDSHAKER_PROXY_MAPPER_H