grpc 1.52.0 → 1.53.0

data/src/core/lib/resource_quota/arena.h

@@ -22,14 +22,15 @@
 // Tracks the total memory allocated against it, so that future arenas can
 // pre-allocate the right amount of memory
 
-#ifndef GRPC_CORE_LIB_RESOURCE_QUOTA_ARENA_H
-#define GRPC_CORE_LIB_RESOURCE_QUOTA_ARENA_H
+#ifndef GRPC_SRC_CORE_LIB_RESOURCE_QUOTA_ARENA_H
+#define GRPC_SRC_CORE_LIB_RESOURCE_QUOTA_ARENA_H
 
 #include <grpc/support/port_platform.h>
 
 #include <stddef.h>
 
 #include <atomic>
+#include <limits>
 #include <memory>
 #include <new>
 #include <utility>
@@ -48,6 +49,11 @@ namespace grpc_core {
 
 namespace arena_detail {
 
+struct PoolAndSize {
+  size_t alloc_size;
+  size_t pool_index;
+};
+
 template <typename Void, size_t kIndex, size_t kObjectSize,
           size_t... kBucketSize>
 struct PoolIndexForSize;
@@ -81,10 +87,37 @@ constexpr size_t AllocationSizeFromObjectSize(
   return PoolIndexForSize<void, 0, kObjectSize, kBucketSizes...>::kSize;
 }
 
+template <size_t kIndex, size_t... kBucketSizes>
+struct ChoosePoolForAllocationSizeImpl;
+
+template <size_t kIndex, size_t kBucketSize, size_t... kBucketSizes>
+struct ChoosePoolForAllocationSizeImpl<kIndex, kBucketSize, kBucketSizes...> {
+  static PoolAndSize Fn(size_t n) {
+    if (n <= kBucketSize) return {kBucketSize, kIndex};
+    return ChoosePoolForAllocationSizeImpl<kIndex + 1, kBucketSizes...>::Fn(n);
+  }
+};
+
+template <size_t kIndex>
+struct ChoosePoolForAllocationSizeImpl<kIndex> {
+  static PoolAndSize Fn(size_t n) {
+    return PoolAndSize{n, std::numeric_limits<size_t>::max()};
+  }
+};
+
+template <size_t... kBucketSizes>
+PoolAndSize ChoosePoolForAllocationSize(
+    size_t n, absl::integer_sequence<size_t, kBucketSizes...>) {
+  return ChoosePoolForAllocationSizeImpl<0, kBucketSizes...>::Fn(n);
+}
+
 }  // namespace arena_detail
 
 class Arena {
   using PoolSizes = absl::integer_sequence<size_t, 256, 512, 768>;
+  struct FreePoolNode {
+    FreePoolNode* next;
+  };
 
  public:
   // Create an arena, with \a initial_size bytes in the first allocated buffer.
@@ -97,8 +130,14 @@ class Arena {
       size_t initial_size, size_t alloc_size,
       MemoryAllocator* memory_allocator);
 
-  // Destroy an arena, returning the total number of bytes allocated.
-  size_t Destroy();
+  // Destroy an arena.
+  void Destroy();
+
+  // Return the total amount of memory allocated by this arena.
+  size_t TotalUsedBytes() const {
+    return total_used_.load(std::memory_order_relaxed);
+  }
+
   // Allocate \a size bytes from the arena.
   void* Alloc(size_t size) {
     static constexpr size_t base_size =
@@ -133,7 +172,8 @@ class Arena {
 
   class PooledDeleter {
    public:
-    explicit PooledDeleter(Arena* arena) : arena_(arena) {}
+    explicit PooledDeleter(std::atomic<FreePoolNode*>* free_list)
+        : free_list_(free_list) {}
     PooledDeleter() = default;
     template <typename T>
     void operator()(T* p) {
@@ -142,24 +182,57 @@ class Arena {
       // by setting the arena to nullptr.
       // This is a transitional hack and should be removed once promise based
       // filter is removed.
-      if (arena_ != nullptr) arena_->DeletePooled(p);
+      if (free_list_ != nullptr) {
+        p->~T();
+        FreePooled(p, free_list_);
+      }
     }
 
+    bool has_freelist() const { return free_list_ != nullptr; }
+
    private:
-    Arena* arena_;
+    std::atomic<FreePoolNode*>* free_list_;
   };
 
   template <typename T>
   using PoolPtr = std::unique_ptr<T, PooledDeleter>;
 
+  // Make a unique_ptr to T that is allocated from the arena.
+  // When the pointer is released, the memory may be reused for other
+  // MakePooled(.*) calls.
+  // CAUTION: The amount of memory allocated is rounded up to the nearest
+  //          value in Arena::PoolSizes, and so this may pessimize total
+  //          arena size.
   template <typename T, typename... Args>
   PoolPtr<T> MakePooled(Args&&... args) {
+    auto* free_list =
+        &pools_[arena_detail::PoolFromObjectSize<sizeof(T)>(PoolSizes())];
     return PoolPtr<T>(
         new (AllocPooled(
             arena_detail::AllocationSizeFromObjectSize<sizeof(T)>(PoolSizes()),
-            &pools_[arena_detail::PoolFromObjectSize<sizeof(T)>(PoolSizes())]))
-            T(std::forward<Args>(args)...),
-        PooledDeleter(this));
+            free_list)) T(std::forward<Args>(args)...),
+        PooledDeleter(free_list));
+  }
+
+  // Make a unique_ptr to an array of T that is allocated from the arena.
+  // When the pointer is released, the memory may be reused for other
+  // MakePooled(.*) calls.
+  // One can use MakePooledArray<char> to allocate a buffer of bytes.
+  // CAUTION: The amount of memory allocated is rounded up to the nearest
+  //          value in Arena::PoolSizes, and so this may pessimize total
+  //          arena size.
+  template <typename T>
+  PoolPtr<T[]> MakePooledArray(size_t n) {
+    auto where =
+        arena_detail::ChoosePoolForAllocationSize(n * sizeof(T), PoolSizes());
+    if (where.pool_index == std::numeric_limits<size_t>::max()) {
+      return PoolPtr<T[]>(new (Alloc(where.alloc_size)) T[n],
+                          PooledDeleter(nullptr));
+    } else {
+      return PoolPtr<T[]>(
+          new (AllocPooled(where.alloc_size, &pools_[where.pool_index])) T[n],
+          PooledDeleter(&pools_[where.pool_index]));
+    }
   }
 
  private:
@@ -202,17 +275,6 @@ class Arena {
 
   void* AllocZone(size_t size);
 
-  template <typename T>
-  void DeletePooled(T* p) {
-    p->~T();
-    FreePooled(
-        p, &pools_[arena_detail::PoolFromObjectSize<sizeof(T)>(PoolSizes())]);
-  }
-
-  struct FreePoolNode {
-    FreePoolNode* next;
-  };
-
   void* AllocPooled(size_t alloc_size, std::atomic<FreePoolNode*>* head);
   static void FreePooled(void* p, std::atomic<FreePoolNode*>* head);
 
@@ -249,4 +311,4 @@ struct ContextType<Arena> {};
 
 }  // namespace grpc_core
 
-#endif  // GRPC_CORE_LIB_RESOURCE_QUOTA_ARENA_H
+#endif  // GRPC_SRC_CORE_LIB_RESOURCE_QUOTA_ARENA_H

data/src/core/lib/resource_quota/memory_quota.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef GRPC_CORE_LIB_RESOURCE_QUOTA_MEMORY_QUOTA_H
-#define GRPC_CORE_LIB_RESOURCE_QUOTA_MEMORY_QUOTA_H
+#ifndef GRPC_SRC_CORE_LIB_RESOURCE_QUOTA_MEMORY_QUOTA_H
+#define GRPC_SRC_CORE_LIB_RESOURCE_QUOTA_MEMORY_QUOTA_H
 
 #include <grpc/support/port_platform.h>
 
@@ -589,4 +589,4 @@ inline MemoryQuotaRefPtr MakeMemoryQuota(std::string name) {
 
 }  // namespace grpc_core
 
-#endif  // GRPC_CORE_LIB_RESOURCE_QUOTA_MEMORY_QUOTA_H
+#endif  // GRPC_SRC_CORE_LIB_RESOURCE_QUOTA_MEMORY_QUOTA_H

data/src/core/lib/resource_quota/periodic_update.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef GRPC_CORE_LIB_RESOURCE_QUOTA_PERIODIC_UPDATE_H
-#define GRPC_CORE_LIB_RESOURCE_QUOTA_PERIODIC_UPDATE_H
+#ifndef GRPC_SRC_CORE_LIB_RESOURCE_QUOTA_PERIODIC_UPDATE_H
+#define GRPC_SRC_CORE_LIB_RESOURCE_QUOTA_PERIODIC_UPDATE_H
 
 #include <grpc/support/port_platform.h>
 
@@ -68,4 +68,4 @@ class PeriodicUpdate {
 
 }  // namespace grpc_core
 
-#endif  // GRPC_CORE_LIB_RESOURCE_QUOTA_PERIODIC_UPDATE_H
+#endif  // GRPC_SRC_CORE_LIB_RESOURCE_QUOTA_PERIODIC_UPDATE_H

data/src/core/lib/resource_quota/resource_quota.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef GRPC_CORE_LIB_RESOURCE_QUOTA_RESOURCE_QUOTA_H
-#define GRPC_CORE_LIB_RESOURCE_QUOTA_RESOURCE_QUOTA_H
+#ifndef GRPC_SRC_CORE_LIB_RESOURCE_QUOTA_RESOURCE_QUOTA_H
+#define GRPC_SRC_CORE_LIB_RESOURCE_QUOTA_RESOURCE_QUOTA_H
 
 #include <grpc/support/port_platform.h>
 
@@ -71,4 +71,4 @@ inline ResourceQuotaRefPtr MakeResourceQuota(std::string name) {
 
 }  // namespace grpc_core
 
-#endif  // GRPC_CORE_LIB_RESOURCE_QUOTA_RESOURCE_QUOTA_H
+#endif  // GRPC_SRC_CORE_LIB_RESOURCE_QUOTA_RESOURCE_QUOTA_H

data/src/core/lib/resource_quota/thread_quota.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef GRPC_CORE_LIB_RESOURCE_QUOTA_THREAD_QUOTA_H
-#define GRPC_CORE_LIB_RESOURCE_QUOTA_THREAD_QUOTA_H
+#ifndef GRPC_SRC_CORE_LIB_RESOURCE_QUOTA_THREAD_QUOTA_H
+#define GRPC_SRC_CORE_LIB_RESOURCE_QUOTA_THREAD_QUOTA_H
 
 #include <grpc/support/port_platform.h>
 
@@ -58,4 +58,4 @@ using ThreadQuotaPtr = RefCountedPtr<ThreadQuota>;
 
 }  // namespace grpc_core
 
-#endif  // GRPC_CORE_LIB_RESOURCE_QUOTA_THREAD_QUOTA_H
+#endif  // GRPC_SRC_CORE_LIB_RESOURCE_QUOTA_THREAD_QUOTA_H

data/src/core/lib/resource_quota/trace.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef GRPC_CORE_LIB_RESOURCE_QUOTA_TRACE_H
-#define GRPC_CORE_LIB_RESOURCE_QUOTA_TRACE_H
+#ifndef GRPC_SRC_CORE_LIB_RESOURCE_QUOTA_TRACE_H
+#define GRPC_SRC_CORE_LIB_RESOURCE_QUOTA_TRACE_H
 
 #include <grpc/support/port_platform.h>
 
@@ -21,4 +21,4 @@
 
 extern grpc_core::TraceFlag grpc_resource_quota_trace;
 
-#endif  // GRPC_CORE_LIB_RESOURCE_QUOTA_TRACE_H
+#endif  // GRPC_SRC_CORE_LIB_RESOURCE_QUOTA_TRACE_H

data/src/core/lib/security/authorization/authorization_engine.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef GRPC_CORE_LIB_SECURITY_AUTHORIZATION_AUTHORIZATION_ENGINE_H
-#define GRPC_CORE_LIB_SECURITY_AUTHORIZATION_AUTHORIZATION_ENGINE_H
+#ifndef GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_AUTHORIZATION_ENGINE_H
+#define GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_AUTHORIZATION_ENGINE_H
 
 #include <grpc/support/port_platform.h>
 
@@ -41,4 +41,4 @@ class AuthorizationEngine : public RefCounted<AuthorizationEngine> {
 
 }  // namespace grpc_core
 
-#endif  // GRPC_CORE_LIB_SECURITY_AUTHORIZATION_AUTHORIZATION_ENGINE_H
+#endif  // GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_AUTHORIZATION_ENGINE_H

data/src/core/lib/security/authorization/authorization_policy_provider.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef GRPC_CORE_LIB_SECURITY_AUTHORIZATION_AUTHORIZATION_POLICY_PROVIDER_H
-#define GRPC_CORE_LIB_SECURITY_AUTHORIZATION_AUTHORIZATION_POLICY_PROVIDER_H
+#ifndef GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_AUTHORIZATION_POLICY_PROVIDER_H
+#define GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_AUTHORIZATION_POLICY_PROVIDER_H
 
 #include <grpc/support/port_platform.h>
 
@@ -44,4 +44,4 @@ struct grpc_authorization_policy_provider
   virtual AuthorizationEngines engines() = 0;
 };
 
-#endif  // GRPC_CORE_LIB_SECURITY_AUTHORIZATION_AUTHORIZATION_POLICY_PROVIDER_H
+#endif  // GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_AUTHORIZATION_POLICY_PROVIDER_H

data/src/core/lib/security/authorization/evaluate_args.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef GRPC_CORE_LIB_SECURITY_AUTHORIZATION_EVALUATE_ARGS_H
-#define GRPC_CORE_LIB_SECURITY_AUTHORIZATION_EVALUATE_ARGS_H
+#ifndef GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_EVALUATE_ARGS_H
+#define GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_EVALUATE_ARGS_H
 
 #include <grpc/support/port_platform.h>
 
@@ -92,4 +92,4 @@ class EvaluateArgs {
 
 }  // namespace grpc_core
 
-#endif  // GRPC_CORE_LIB_SECURITY_AUTHORIZATION_EVALUATE_ARGS_H
+#endif  // GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_EVALUATE_ARGS_H

data/src/core/lib/security/authorization/grpc_authorization_engine.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef GRPC_CORE_LIB_SECURITY_AUTHORIZATION_GRPC_AUTHORIZATION_ENGINE_H
-#define GRPC_CORE_LIB_SECURITY_AUTHORIZATION_GRPC_AUTHORIZATION_ENGINE_H
+#ifndef GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_GRPC_AUTHORIZATION_ENGINE_H
+#define GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_GRPC_AUTHORIZATION_ENGINE_H
 
 #include <grpc/support/port_platform.h>
 
@@ -66,4 +66,4 @@ class GrpcAuthorizationEngine : public AuthorizationEngine {
 
 }  // namespace grpc_core
 
-#endif  // GRPC_CORE_LIB_SECURITY_AUTHORIZATION_GRPC_AUTHORIZATION_ENGINE_H
+#endif  // GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_GRPC_AUTHORIZATION_ENGINE_H

data/src/core/lib/security/authorization/grpc_server_authz_filter.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef GRPC_CORE_LIB_SECURITY_AUTHORIZATION_GRPC_SERVER_AUTHZ_FILTER_H
-#define GRPC_CORE_LIB_SECURITY_AUTHORIZATION_GRPC_SERVER_AUTHZ_FILTER_H
+#ifndef GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_GRPC_SERVER_AUTHZ_FILTER_H
+#define GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_GRPC_SERVER_AUTHZ_FILTER_H
 
 #include <grpc/support/port_platform.h>
 
@@ -58,4 +58,4 @@ class GrpcServerAuthzFilter final : public ChannelFilter {
 
 }  // namespace grpc_core
 
-#endif  // GRPC_CORE_LIB_SECURITY_AUTHORIZATION_GRPC_SERVER_AUTHZ_FILTER_H
+#endif  // GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_GRPC_SERVER_AUTHZ_FILTER_H

data/src/core/lib/security/authorization/matchers.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef GRPC_CORE_LIB_SECURITY_AUTHORIZATION_MATCHERS_H
-#define GRPC_CORE_LIB_SECURITY_AUTHORIZATION_MATCHERS_H
+#ifndef GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_MATCHERS_H
+#define GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_MATCHERS_H
 
 #include <grpc/support/port_platform.h>
 
@@ -215,4 +215,4 @@ class PolicyAuthorizationMatcher : public AuthorizationMatcher {
 
 }  // namespace grpc_core
 
-#endif  // GRPC_CORE_LIB_SECURITY_AUTHORIZATION_MATCHERS_H
+#endif  // GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_MATCHERS_H

data/src/core/lib/security/authorization/rbac_policy.cc

@@ -17,6 +17,7 @@
 #include "src/core/lib/security/authorization/rbac_policy.h"
 
 #include <algorithm>
+#include <initializer_list>
 #include <utility>
 
 #include "absl/strings/str_format.h"

data/src/core/lib/security/authorization/rbac_policy.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef GRPC_CORE_LIB_SECURITY_AUTHORIZATION_RBAC_POLICY_H
-#define GRPC_CORE_LIB_SECURITY_AUTHORIZATION_RBAC_POLICY_H
+#ifndef GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_RBAC_POLICY_H
+#define GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_RBAC_POLICY_H
 
 #include <grpc/support/port_platform.h>
 
@@ -175,4 +175,4 @@ struct Rbac {
 
 }  // namespace grpc_core
 
-#endif  // GRPC_CORE_LIB_SECURITY_AUTHORIZATION_RBAC_POLICY_H
+#endif  // GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_RBAC_POLICY_H

data/src/core/lib/security/certificate_provider/certificate_provider_factory.h

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_CORE_LIB_SECURITY_CERTIFICATE_PROVIDER_CERTIFICATE_PROVIDER_FACTORY_H
-#define GRPC_CORE_LIB_SECURITY_CERTIFICATE_PROVIDER_CERTIFICATE_PROVIDER_FACTORY_H
+#ifndef GRPC_SRC_CORE_LIB_SECURITY_CERTIFICATE_PROVIDER_CERTIFICATE_PROVIDER_FACTORY_H
+#define GRPC_SRC_CORE_LIB_SECURITY_CERTIFICATE_PROVIDER_CERTIFICATE_PROVIDER_FACTORY_H
 
 #include <grpc/support/port_platform.h>
 
@@ -63,4 +63,4 @@ class CertificateProviderFactory {
 
 }  // namespace grpc_core
 
-#endif  // GRPC_CORE_LIB_SECURITY_CERTIFICATE_PROVIDER_CERTIFICATE_PROVIDER_FACTORY_H
+#endif  // GRPC_SRC_CORE_LIB_SECURITY_CERTIFICATE_PROVIDER_CERTIFICATE_PROVIDER_FACTORY_H

data/src/core/lib/security/certificate_provider/certificate_provider_registry.h

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_CORE_LIB_SECURITY_CERTIFICATE_PROVIDER_CERTIFICATE_PROVIDER_REGISTRY_H
-#define GRPC_CORE_LIB_SECURITY_CERTIFICATE_PROVIDER_CERTIFICATE_PROVIDER_REGISTRY_H
+#ifndef GRPC_SRC_CORE_LIB_SECURITY_CERTIFICATE_PROVIDER_CERTIFICATE_PROVIDER_REGISTRY_H
+#define GRPC_SRC_CORE_LIB_SECURITY_CERTIFICATE_PROVIDER_CERTIFICATE_PROVIDER_REGISTRY_H
 
 #include <grpc/support/port_platform.h>
 
@@ -67,4 +67,4 @@ class CertificateProviderRegistry {
 
 }  // namespace grpc_core
 
-#endif  // GRPC_CORE_LIB_SECURITY_CERTIFICATE_PROVIDER_CERTIFICATE_PROVIDER_REGISTRY_H
+#endif  // GRPC_SRC_CORE_LIB_SECURITY_CERTIFICATE_PROVIDER_CERTIFICATE_PROVIDER_REGISTRY_H

data/src/core/lib/security/context/security_context.h

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_CORE_LIB_SECURITY_CONTEXT_SECURITY_CONTEXT_H
-#define GRPC_CORE_LIB_SECURITY_CONTEXT_SECURITY_CONTEXT_H
+#ifndef GRPC_SRC_CORE_LIB_SECURITY_CONTEXT_SECURITY_CONTEXT_H
+#define GRPC_SRC_CORE_LIB_SECURITY_CONTEXT_SECURITY_CONTEXT_H
 
 #include <grpc/support/port_platform.h>
 
@@ -178,4 +178,4 @@ grpc_auth_context* grpc_auth_context_from_arg(const grpc_arg* arg);
 grpc_auth_context* grpc_find_auth_context_in_args(
     const grpc_channel_args* args);
 
-#endif  // GRPC_CORE_LIB_SECURITY_CONTEXT_SECURITY_CONTEXT_H
+#endif  // GRPC_SRC_CORE_LIB_SECURITY_CONTEXT_SECURITY_CONTEXT_H

data/src/core/lib/security/credentials/alts/alts_credentials.h

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_CORE_LIB_SECURITY_CREDENTIALS_ALTS_ALTS_CREDENTIALS_H
-#define GRPC_CORE_LIB_SECURITY_CREDENTIALS_ALTS_ALTS_CREDENTIALS_H
+#ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_ALTS_ALTS_CREDENTIALS_H
+#define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_ALTS_ALTS_CREDENTIALS_H
 
 #include <grpc/support/port_platform.h>
 
@@ -120,4 +120,4 @@ grpc_server_credentials* grpc_alts_server_credentials_create_customized(
     const grpc_alts_credentials_options* options,
     const char* handshaker_service_url, bool enable_untrusted_alts);
 
-#endif  // GRPC_CORE_LIB_SECURITY_CREDENTIALS_ALTS_ALTS_CREDENTIALS_H
+#endif  // GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_ALTS_ALTS_CREDENTIALS_H

data/src/core/lib/security/credentials/alts/check_gcp_environment.h

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_CORE_LIB_SECURITY_CREDENTIALS_ALTS_CHECK_GCP_ENVIRONMENT_H
-#define GRPC_CORE_LIB_SECURITY_CREDENTIALS_ALTS_CHECK_GCP_ENVIRONMENT_H
+#ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_ALTS_CHECK_GCP_ENVIRONMENT_H
+#define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_ALTS_CHECK_GCP_ENVIRONMENT_H
 
 namespace grpc_core {
 namespace internal {
@@ -54,4 +54,4 @@ bool check_bios_data(const char* bios_data);
 ///
 bool grpc_alts_is_running_on_gcp();
 
-#endif  // GRPC_CORE_LIB_SECURITY_CREDENTIALS_ALTS_CHECK_GCP_ENVIRONMENT_H
+#endif  // GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_ALTS_CHECK_GCP_ENVIRONMENT_H

data/src/core/lib/security/credentials/alts/grpc_alts_credentials_options.h

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_CORE_LIB_SECURITY_CREDENTIALS_ALTS_GRPC_ALTS_CREDENTIALS_OPTIONS_H
-#define GRPC_CORE_LIB_SECURITY_CREDENTIALS_ALTS_GRPC_ALTS_CREDENTIALS_OPTIONS_H
+#ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_ALTS_GRPC_ALTS_CREDENTIALS_OPTIONS_H
+#define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_ALTS_GRPC_ALTS_CREDENTIALS_OPTIONS_H
 
 #include <grpc/support/port_platform.h>
 
@@ -71,4 +71,4 @@ typedef struct grpc_alts_credentials_server_options {
 grpc_alts_credentials_options* grpc_alts_credentials_options_copy(
     const grpc_alts_credentials_options* options);
 
-#endif  // GRPC_CORE_LIB_SECURITY_CREDENTIALS_ALTS_GRPC_ALTS_CREDENTIALS_OPTIONS_H
+#endif  // GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_ALTS_GRPC_ALTS_CREDENTIALS_OPTIONS_H

data/src/core/lib/security/credentials/call_creds_util.h

@@ -14,8 +14,8 @@
 // limitations under the License.
 //
 
-#ifndef GRPC_CORE_LIB_SECURITY_CREDENTIALS_CALL_CREDS_UTIL_H
-#define GRPC_CORE_LIB_SECURITY_CREDENTIALS_CALL_CREDS_UTIL_H
+#ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_CALL_CREDS_UTIL_H
+#define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_CALL_CREDS_UTIL_H
 
 #include <grpc/support/port_platform.h>
 
@@ -40,4 +40,4 @@ grpc_auth_metadata_context MakePluginAuthMetadataContext(
 
 }  // namespace grpc_core
 
-#endif  // GRPC_CORE_LIB_SECURITY_CREDENTIALS_CALL_CREDS_UTIL_H
+#endif  // GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_CALL_CREDS_UTIL_H

data/src/core/lib/security/credentials/channel_creds_registry.h

@@ -14,8 +14,8 @@
 // limitations under the License.
 //
 
-#ifndef GRPC_CORE_LIB_SECURITY_CREDENTIALS_CHANNEL_CREDS_REGISTRY_H
-#define GRPC_CORE_LIB_SECURITY_CREDENTIALS_CHANNEL_CREDS_REGISTRY_H
+#ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_CHANNEL_CREDS_REGISTRY_H
+#define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_CHANNEL_CREDS_REGISTRY_H
 
 #include <grpc/support/port_platform.h>
 
@@ -100,4 +100,4 @@ class ChannelCredsRegistry {
 
 }  // namespace grpc_core
 
-#endif  // GRPC_CORE_LIB_SECURITY_CREDENTIALS_CHANNEL_CREDS_REGISTRY_H
+#endif  // GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_CHANNEL_CREDS_REGISTRY_H

data/src/core/lib/security/credentials/composite/composite_credentials.h

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_CORE_LIB_SECURITY_CREDENTIALS_COMPOSITE_COMPOSITE_CREDENTIALS_H
-#define GRPC_CORE_LIB_SECURITY_CREDENTIALS_COMPOSITE_COMPOSITE_CREDENTIALS_H
+#ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_COMPOSITE_COMPOSITE_CREDENTIALS_H
+#define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_COMPOSITE_COMPOSITE_CREDENTIALS_H
 
 #include <grpc/support/port_platform.h>
 
@@ -128,4 +128,4 @@ class grpc_composite_call_credentials : public grpc_call_credentials {
   CallCredentialsList inner_;
 };
 
-#endif  // GRPC_CORE_LIB_SECURITY_CREDENTIALS_COMPOSITE_COMPOSITE_CREDENTIALS_H
+#endif  // GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_COMPOSITE_COMPOSITE_CREDENTIALS_H

data/src/core/lib/security/credentials/credentials.h

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_CORE_LIB_SECURITY_CREDENTIALS_CREDENTIALS_H
-#define GRPC_CORE_LIB_SECURITY_CREDENTIALS_CREDENTIALS_H
+#ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_CREDENTIALS_H
+#define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_CREDENTIALS_H
 
 #include <grpc/support/port_platform.h>
 
@@ -296,4 +296,4 @@ grpc_server_credentials* grpc_server_credentials_from_arg(const grpc_arg* arg);
 grpc_server_credentials* grpc_find_server_credentials_in_args(
     const grpc_channel_args* args);
 
-#endif  // GRPC_CORE_LIB_SECURITY_CREDENTIALS_CREDENTIALS_H
+#endif  // GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_CREDENTIALS_H

data/src/core/lib/security/credentials/external/aws_external_account_credentials.cc

@@ -19,6 +19,7 @@
 
 #include <string.h>
 
+#include <initializer_list>
 #include <map>
 #include <utility>
 

data/src/core/lib/security/credentials/external/aws_external_account_credentials.h

@@ -14,8 +14,8 @@
 // limitations under the License.
 //
 
-#ifndef GRPC_CORE_LIB_SECURITY_CREDENTIALS_EXTERNAL_AWS_EXTERNAL_ACCOUNT_CREDENTIALS_H
-#define GRPC_CORE_LIB_SECURITY_CREDENTIALS_EXTERNAL_AWS_EXTERNAL_ACCOUNT_CREDENTIALS_H
+#ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_EXTERNAL_AWS_EXTERNAL_ACCOUNT_CREDENTIALS_H
+#define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_EXTERNAL_AWS_EXTERNAL_ACCOUNT_CREDENTIALS_H
 
 #include <grpc/support/port_platform.h>
 
@@ -97,4 +97,4 @@ class AwsExternalAccountCredentials final : public ExternalAccountCredentials {
 
 }  // namespace grpc_core
 
-#endif  // GRPC_CORE_LIB_SECURITY_CREDENTIALS_EXTERNAL_AWS_EXTERNAL_ACCOUNT_CREDENTIALS_H
+#endif  // GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_EXTERNAL_AWS_EXTERNAL_ACCOUNT_CREDENTIALS_H

data/src/core/lib/security/credentials/external/aws_request_signer.cc

@@ -18,6 +18,7 @@
 #include "src/core/lib/security/credentials/external/aws_request_signer.h"
 
 #include <algorithm>
+#include <initializer_list>
 #include <utility>
 #include <vector>
 

data/src/core/lib/security/credentials/external/aws_request_signer.h

@@ -14,8 +14,8 @@
 // limitations under the License.
 //
 
-#ifndef GRPC_CORE_LIB_SECURITY_CREDENTIALS_EXTERNAL_AWS_REQUEST_SIGNER_H
-#define GRPC_CORE_LIB_SECURITY_CREDENTIALS_EXTERNAL_AWS_REQUEST_SIGNER_H
+#ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_EXTERNAL_AWS_REQUEST_SIGNER_H
+#define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_EXTERNAL_AWS_REQUEST_SIGNER_H
 
 #include <grpc/support/port_platform.h>
 
@@ -69,4 +69,4 @@ class AwsRequestSigner {
 
 }  // namespace grpc_core
 
-#endif  // GRPC_CORE_LIB_SECURITY_CREDENTIALS_EXTERNAL_AWS_REQUEST_SIGNER_H
+#endif  // GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_EXTERNAL_AWS_REQUEST_SIGNER_H

data/src/core/lib/security/credentials/external/external_account_credentials.cc

@@ -22,6 +22,7 @@
 #include <string.h>
 
 #include <algorithm>
+#include <initializer_list>
 #include <map>
 #include <memory>
 #include <utility>